Commit b533c868 authored by Kukjin Kim's avatar Kukjin Kim

ARM: dts: fix compatible value for exynos pinctrl

Fix the incorrect compatible property value of pinctrl for EXYNOS4 SoCs.

Cc: Thomas Abraham <thomas.ab@samsung.com>
Acked-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Cc: Grant Likely <grant.likely@secretlab.ca>
Signed-off-by: default avatarKukjin Kim <kgene.kim@samsung.com>
parent f6925432
...@@ -7,9 +7,9 @@ on-chip controllers onto these pads. ...@@ -7,9 +7,9 @@ on-chip controllers onto these pads.
Required Properties: Required Properties:
- compatible: should be one of the following. - compatible: should be one of the following.
- "samsung,pinctrl-exynos4210": for Exynos4210 compatible pin-controller. - "samsung,exynos4210-pinctrl": for Exynos4210 compatible pin-controller.
- "samsung,pinctrl-exynos4x12": for Exynos4x12 compatible pin-controller. - "samsung,exynos4x12-pinctrl": for Exynos4x12 compatible pin-controller.
- "samsung,pinctrl-exynos5250": for Exynos5250 compatible pin-controller. - "samsung,exynos5250-pinctrl": for Exynos5250 compatible pin-controller.
- reg: Base address of the pin controller hardware module and length of - reg: Base address of the pin controller hardware module and length of
the address space it occupies. the address space it occupies.
...@@ -142,7 +142,7 @@ the following format 'pinctrl{n}' where n is a unique number for the alias. ...@@ -142,7 +142,7 @@ the following format 'pinctrl{n}' where n is a unique number for the alias.
Example: A pin-controller node with pin banks: Example: A pin-controller node with pin banks:
pinctrl_0: pinctrl@11400000 { pinctrl_0: pinctrl@11400000 {
compatible = "samsung,pinctrl-exynos4210"; compatible = "samsung,exynos4210-pinctrl";
reg = <0x11400000 0x1000>; reg = <0x11400000 0x1000>;
interrupts = <0 47 0>; interrupts = <0 47 0>;
...@@ -185,7 +185,7 @@ Example: A pin-controller node with pin banks: ...@@ -185,7 +185,7 @@ Example: A pin-controller node with pin banks:
Example 1: A pin-controller node with pin groups. Example 1: A pin-controller node with pin groups.
pinctrl_0: pinctrl@11400000 { pinctrl_0: pinctrl@11400000 {
compatible = "samsung,pinctrl-exynos4210"; compatible = "samsung,exynos4210-pinctrl";
reg = <0x11400000 0x1000>; reg = <0x11400000 0x1000>;
interrupts = <0 47 0>; interrupts = <0 47 0>;
...@@ -230,7 +230,7 @@ Example 1: A pin-controller node with pin groups. ...@@ -230,7 +230,7 @@ Example 1: A pin-controller node with pin groups.
Example 2: A pin-controller node with external wakeup interrupt controller node. Example 2: A pin-controller node with external wakeup interrupt controller node.
pinctrl_1: pinctrl@11000000 { pinctrl_1: pinctrl@11000000 {
compatible = "samsung,pinctrl-exynos4210"; compatible = "samsung,exynos4210-pinctrl";
reg = <0x11000000 0x1000>; reg = <0x11000000 0x1000>;
interrupts = <0 46 0> interrupts = <0 46 0>
......
...@@ -48,13 +48,13 @@ combiner:interrupt-controller@10440000 { ...@@ -48,13 +48,13 @@ combiner:interrupt-controller@10440000 {
}; };
pinctrl_0: pinctrl@11400000 { pinctrl_0: pinctrl@11400000 {
compatible = "samsung,pinctrl-exynos4210"; compatible = "samsung,exynos4210-pinctrl";
reg = <0x11400000 0x1000>; reg = <0x11400000 0x1000>;
interrupts = <0 47 0>; interrupts = <0 47 0>;
}; };
pinctrl_1: pinctrl@11000000 { pinctrl_1: pinctrl@11000000 {
compatible = "samsung,pinctrl-exynos4210"; compatible = "samsung,exynos4210-pinctrl";
reg = <0x11000000 0x1000>; reg = <0x11000000 0x1000>;
interrupts = <0 46 0>; interrupts = <0 46 0>;
...@@ -66,7 +66,7 @@ wakup_eint: wakeup-interrupt-controller { ...@@ -66,7 +66,7 @@ wakup_eint: wakeup-interrupt-controller {
}; };
pinctrl_2: pinctrl@03860000 { pinctrl_2: pinctrl@03860000 {
compatible = "samsung,pinctrl-exynos4210"; compatible = "samsung,exynos4210-pinctrl";
reg = <0x03860000 0x1000>; reg = <0x03860000 0x1000>;
}; };
......
...@@ -37,13 +37,13 @@ combiner:interrupt-controller@10440000 { ...@@ -37,13 +37,13 @@ combiner:interrupt-controller@10440000 {
}; };
pinctrl_0: pinctrl@11400000 { pinctrl_0: pinctrl@11400000 {
compatible = "samsung,pinctrl-exynos4x12"; compatible = "samsung,exynos4x12-pinctrl";
reg = <0x11400000 0x1000>; reg = <0x11400000 0x1000>;
interrupts = <0 47 0>; interrupts = <0 47 0>;
}; };
pinctrl_1: pinctrl@11000000 { pinctrl_1: pinctrl@11000000 {
compatible = "samsung,pinctrl-exynos4x12"; compatible = "samsung,exynos4x12-pinctrl";
reg = <0x11000000 0x1000>; reg = <0x11000000 0x1000>;
interrupts = <0 46 0>; interrupts = <0 46 0>;
...@@ -55,14 +55,14 @@ wakup_eint: wakeup-interrupt-controller { ...@@ -55,14 +55,14 @@ wakup_eint: wakeup-interrupt-controller {
}; };
pinctrl_2: pinctrl@03860000 { pinctrl_2: pinctrl@03860000 {
compatible = "samsung,pinctrl-exynos4x12"; compatible = "samsung,exynos4x12-pinctrl";
reg = <0x03860000 0x1000>; reg = <0x03860000 0x1000>;
interrupt-parent = <&combiner>; interrupt-parent = <&combiner>;
interrupts = <10 0>; interrupts = <10 0>;
}; };
pinctrl_3: pinctrl@106E0000 { pinctrl_3: pinctrl@106E0000 {
compatible = "samsung,pinctrl-exynos4x12"; compatible = "samsung,exynos4x12-pinctrl";
reg = <0x106E0000 0x1000>; reg = <0x106E0000 0x1000>;
interrupts = <0 72 0>; interrupts = <0 72 0>;
}; };
......
...@@ -1031,8 +1031,8 @@ static int __init exynos_init_irq_eint(void) ...@@ -1031,8 +1031,8 @@ static int __init exynos_init_irq_eint(void)
* interrupt support code here can be completely removed. * interrupt support code here can be completely removed.
*/ */
static const struct of_device_id exynos_pinctrl_ids[] = { static const struct of_device_id exynos_pinctrl_ids[] = {
{ .compatible = "samsung,pinctrl-exynos4210", }, { .compatible = "samsung,exynos4210-pinctrl", },
{ .compatible = "samsung,pinctrl-exynos4x12", }, { .compatible = "samsung,exynos4x12-pinctrl", },
}; };
struct device_node *pctrl_np, *wkup_np; struct device_node *pctrl_np, *wkup_np;
const char *wkup_compat = "samsung,exynos4210-wakeup-eint"; const char *wkup_compat = "samsung,exynos4210-wakeup-eint";
......
...@@ -3023,8 +3023,8 @@ static __init int samsung_gpiolib_init(void) ...@@ -3023,8 +3023,8 @@ static __init int samsung_gpiolib_init(void)
*/ */
struct device_node *pctrl_np; struct device_node *pctrl_np;
static const struct of_device_id exynos_pinctrl_ids[] = { static const struct of_device_id exynos_pinctrl_ids[] = {
{ .compatible = "samsung,pinctrl-exynos4210", }, { .compatible = "samsung,exynos4210-pinctrl", },
{ .compatible = "samsung,pinctrl-exynos4x12", }, { .compatible = "samsung,exynos4x12-pinctrl", },
{ .compatible = "samsung,exynos5440-pinctrl", }, { .compatible = "samsung,exynos5440-pinctrl", },
}; };
for_each_matching_node(pctrl_np, exynos_pinctrl_ids) for_each_matching_node(pctrl_np, exynos_pinctrl_ids)
......
...@@ -947,9 +947,9 @@ static int samsung_pinctrl_probe(struct platform_device *pdev) ...@@ -947,9 +947,9 @@ static int samsung_pinctrl_probe(struct platform_device *pdev)
} }
static const struct of_device_id samsung_pinctrl_dt_match[] = { static const struct of_device_id samsung_pinctrl_dt_match[] = {
{ .compatible = "samsung,pinctrl-exynos4210", { .compatible = "samsung,exynos4210-pinctrl",
.data = (void *)exynos4210_pin_ctrl }, .data = (void *)exynos4210_pin_ctrl },
{ .compatible = "samsung,pinctrl-exynos4x12", { .compatible = "samsung,exynos4x12-pinctrl",
.data = (void *)exynos4x12_pin_ctrl }, .data = (void *)exynos4x12_pin_ctrl },
{}, {},
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment