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: Linus Walleij <linus.walleij@linaro.org>
Cc: Grant Likely <grant.likely@secretlab.ca>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>

diff --git a/Documentation/devicetree/bindings/pinctrl/samsung-pinctrl.txt b/Documentation/devicetree/bindings/pinctrl/samsung-pinctrl.txt
index e97a27856b214d85268eb3bc4070403a5484681a..4598a47aa0cd130d1a01ab78027c867fb8a5f971 100644 (file)
--- a/Documentation/devicetree/bindings/pinctrl/samsung-pinctrl.txt
+++ b/Documentation/devicetree/bindings/pinctrl/samsung-pinctrl.txt
@@ -7,9 +7,9 @@ on-chip controllers onto these pads.
 
 Required Properties:
 - compatible: should be one of the following.
-  - "samsung,pinctrl-exynos4210": for Exynos4210 compatible pin-controller.
-  - "samsung,pinctrl-exynos4x12": for Exynos4x12 compatible pin-controller.
-  - "samsung,pinctrl-exynos5250": for Exynos5250 compatible pin-controller.
+  - "samsung,exynos4210-pinctrl": for Exynos4210 compatible pin-controller.
+  - "samsung,exynos4x12-pinctrl": for Exynos4x12 compatible pin-controller.
+  - "samsung,exynos5250-pinctrl": for Exynos5250 compatible pin-controller.
 
 - reg: Base address of the pin controller hardware module and length of
   the address space it occupies.
@@ -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:
 
        pinctrl_0: pinctrl@11400000 {
-               compatible = "samsung,pinctrl-exynos4210";
+               compatible = "samsung,exynos4210-pinctrl";
                reg = <0x11400000 0x1000>;
                interrupts = <0 47 0>;
 
@@ -185,7 +185,7 @@ Example: A pin-controller node with pin banks:
 Example 1: A pin-controller node with pin groups.
 
        pinctrl_0: pinctrl@11400000 {
-               compatible = "samsung,pinctrl-exynos4210";
+               compatible = "samsung,exynos4210-pinctrl";
                reg = <0x11400000 0x1000>;
                interrupts = <0 47 0>;
 
@@ -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.
 
        pinctrl_1: pinctrl@11000000 {
-               compatible = "samsung,pinctrl-exynos4210";
+               compatible = "samsung,exynos4210-pinctrl";
                reg = <0x11000000 0x1000>;
                interrupts = <0 46 0>
 

diff --git a/arch/arm/boot/dts/exynos4210.dtsi b/arch/arm/boot/dts/exynos4210.dtsi
index e31bfc4a6f097233fa5e20fa870726d302c4b3a4..2feffc70814cb9223f052528752be9abeb66c07a 100644 (file)
--- a/arch/arm/boot/dts/exynos4210.dtsi
+++ b/arch/arm/boot/dts/exynos4210.dtsi
@@ -48,13 +48,13 @@
        };
 
        pinctrl_0: pinctrl@11400000 {
-               compatible = "samsung,pinctrl-exynos4210";
+               compatible = "samsung,exynos4210-pinctrl";
                reg = <0x11400000 0x1000>;
                interrupts = <0 47 0>;
        };
 
        pinctrl_1: pinctrl@11000000 {
-               compatible = "samsung,pinctrl-exynos4210";
+               compatible = "samsung,exynos4210-pinctrl";
                reg = <0x11000000 0x1000>;
                interrupts = <0 46 0>;
 
@@ -66,7 +66,7 @@
        };
 
        pinctrl_2: pinctrl@03860000 {
-               compatible = "samsung,pinctrl-exynos4210";
+               compatible = "samsung,exynos4210-pinctrl";
                reg = <0x03860000 0x1000>;
        };
 

diff --git a/arch/arm/boot/dts/exynos4x12.dtsi b/arch/arm/boot/dts/exynos4x12.dtsi
index 179a62e46c9d40b5e2259f5bc63f49879705cb59..9a87806949093e717b1084e1704f14db33767e06 100644 (file)
--- a/arch/arm/boot/dts/exynos4x12.dtsi
+++ b/arch/arm/boot/dts/exynos4x12.dtsi
@@ -37,13 +37,13 @@
        };
 
        pinctrl_0: pinctrl@11400000 {
-               compatible = "samsung,pinctrl-exynos4x12";
+               compatible = "samsung,exynos4x12-pinctrl";
                reg = <0x11400000 0x1000>;
                interrupts = <0 47 0>;
        };
 
        pinctrl_1: pinctrl@11000000 {
-               compatible = "samsung,pinctrl-exynos4x12";
+               compatible = "samsung,exynos4x12-pinctrl";
                reg = <0x11000000 0x1000>;
                interrupts = <0 46 0>;
 
@@ -55,14 +55,14 @@
        };
 
        pinctrl_2: pinctrl@03860000 {
-               compatible = "samsung,pinctrl-exynos4x12";
+               compatible = "samsung,exynos4x12-pinctrl";
                reg = <0x03860000 0x1000>;
                interrupt-parent = <&combiner>;
                interrupts = <10 0>;
        };
 
        pinctrl_3: pinctrl@106E0000 {
-               compatible = "samsung,pinctrl-exynos4x12";
+               compatible = "samsung,exynos4x12-pinctrl";
                reg = <0x106E0000 0x1000>;
                interrupts = <0 72 0>;
        };

diff --git a/arch/arm/mach-exynos/common.c b/arch/arm/mach-exynos/common.c
index 1a89824a5f781bfef84f7afc9167c41874198798..e07da6e186a3acfed8e09c784abba10897ded1c9 100644 (file)
--- a/arch/arm/mach-exynos/common.c
+++ b/arch/arm/mach-exynos/common.c
@@ -1031,8 +1031,8 @@ static int __init exynos_init_irq_eint(void)
         * interrupt support code here can be completely removed.
         */
        static const struct of_device_id exynos_pinctrl_ids[] = {
-               { .compatible = "samsung,pinctrl-exynos4210", },
-               { .compatible = "samsung,pinctrl-exynos4x12", },
+               { .compatible = "samsung,exynos4210-pinctrl", },
+               { .compatible = "samsung,exynos4x12-pinctrl", },
        };
        struct device_node *pctrl_np, *wkup_np;
        const char *wkup_compat = "samsung,exynos4210-wakeup-eint";

diff --git a/drivers/gpio/gpio-samsung.c b/drivers/gpio/gpio-samsung.c
index d03a606227c1815ba31484d8d3d5ec92b259b39a..b2016ed941ac250178cadcb69a4e0112faf95832 100644 (file)
--- a/drivers/gpio/gpio-samsung.c
+++ b/drivers/gpio/gpio-samsung.c
@@ -3023,8 +3023,8 @@ static __init int samsung_gpiolib_init(void)
        */
        struct device_node *pctrl_np;
        static const struct of_device_id exynos_pinctrl_ids[] = {
-               { .compatible = "samsung,pinctrl-exynos4210", },
-               { .compatible = "samsung,pinctrl-exynos4x12", },
+               { .compatible = "samsung,exynos4210-pinctrl", },
+               { .compatible = "samsung,exynos4x12-pinctrl", },
                { .compatible = "samsung,exynos5440-pinctrl", },
        };
        for_each_matching_node(pctrl_np, exynos_pinctrl_ids)

diff --git a/drivers/pinctrl/pinctrl-samsung.c b/drivers/pinctrl/pinctrl-samsung.c
index fd7b24cd89084d923dd2cc1cc2a581695a040deb..044d2da34e4e4033363340b0340523a1a8445b13 100644 (file)
--- a/drivers/pinctrl/pinctrl-samsung.c
+++ b/drivers/pinctrl/pinctrl-samsung.c
@@ -947,9 +947,9 @@ static int samsung_pinctrl_probe(struct platform_device *pdev)
 }
 
 static const struct of_device_id samsung_pinctrl_dt_match[] = {
-       { .compatible = "samsung,pinctrl-exynos4210",
+       { .compatible = "samsung,exynos4210-pinctrl",
                .data = (void *)exynos4210_pin_ctrl },
-       { .compatible = "samsung,pinctrl-exynos4x12",
+       { .compatible = "samsung,exynos4x12-pinctrl",
                .data = (void *)exynos4x12_pin_ctrl },
        {},
 };