ARM: dts: exynos: align pinctrl with dtschema in Exynos5250

Align the pin controller related nodes with dtschema.  No functional
change expected.

Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
Link: https://lore.kernel.org/r/20220111201722.327219-7-krzysztof.kozlowski@canonical.com

diff --git a/arch/arm/boot/dts/exynos5250-arndale.dts b/arch/arm/boot/dts/exynos5250-arndale.dts
index 3583095fbb2a8ddd70a081021fca3b60c350f981..693bf9e481833b37eb35aa484aa71c0ab6301da7 100644 (file)
--- a/arch/arm/boot/dts/exynos5250-arndale.dts
+++ b/arch/arm/boot/dts/exynos5250-arndale.dts
@@ -590,7 +590,7 @@
 };
 
 &pinctrl_0 {
-       s5m8767_irq: s5m8767-irq {
+       s5m8767_irq: s5m8767-irq-pins {
                samsung,pins = "gpx3-2";
                samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
        };

diff --git a/arch/arm/boot/dts/exynos5250-pinctrl.dtsi b/arch/arm/boot/dts/exynos5250-pinctrl.dtsi
index d7d756614edd1f27e125bd7b791a8ae196eba99b..918947a3897e4d344db0e4d88f10e9889e9a04f3 100644 (file)
--- a/arch/arm/boot/dts/exynos5250-pinctrl.dtsi
+++ b/arch/arm/boot/dts/exynos5250-pinctrl.dtsi
@@ -12,7 +12,7 @@
 #include <dt-bindings/pinctrl/samsung.h>
 
 &pinctrl_0 {
-       gpa0: gpa0 {
+       gpa0: gpa0-gpio-bank {
                gpio-controller;
                #gpio-cells = <2>;
 
@@ -20,7 +20,7 @@
                #interrupt-cells = <2>;
        };
 
-       gpa1: gpa1 {
+       gpa1: gpa1-gpio-bank {
                gpio-controller;
                #gpio-cells = <2>;
 
@@ -28,7 +28,7 @@
                #interrupt-cells = <2>;
        };
 
-       gpa2: gpa2 {
+       gpa2: gpa2-gpio-bank {
                gpio-controller;
                #gpio-cells = <2>;
 
@@ -36,7 +36,7 @@
                #interrupt-cells = <2>;
        };
 
-       gpb0: gpb0 {
+       gpb0: gpb0-gpio-bank {
                gpio-controller;
                #gpio-cells = <2>;
 
@@ -44,7 +44,7 @@
                #interrupt-cells = <2>;
        };
 
-       gpb1: gpb1 {
+       gpb1: gpb1-gpio-bank {
                gpio-controller;
                #gpio-cells = <2>;
 
@@ -52,7 +52,7 @@
                #interrupt-cells = <2>;
        };
 
-       gpb2: gpb2 {
+       gpb2: gpb2-gpio-bank {
                gpio-controller;
                #gpio-cells = <2>;
 
@@ -60,7 +60,7 @@
                #interrupt-cells = <2>;
        };
 
-       gpb3: gpb3 {
+       gpb3: gpb3-gpio-bank {
                gpio-controller;
                #gpio-cells = <2>;
 
@@ -68,7 +68,7 @@
                #interrupt-cells = <2>;
        };
 
-       gpc0: gpc0 {
+       gpc0: gpc0-gpio-bank {
                gpio-controller;
                #gpio-cells = <2>;
 
@@ -76,7 +76,7 @@
                #interrupt-cells = <2>;
        };
 
-       gpc1: gpc1 {
+       gpc1: gpc1-gpio-bank {
                gpio-controller;
                #gpio-cells = <2>;
 
@@ -84,7 +84,7 @@
                #interrupt-cells = <2>;
        };
 
-       gpc2: gpc2 {
+       gpc2: gpc2-gpio-bank {
                gpio-controller;
                #gpio-cells = <2>;
 
@@ -92,7 +92,7 @@
                #interrupt-cells = <2>;
        };
 
-       gpc3: gpc3 {
+       gpc3: gpc3-gpio-bank {
                gpio-controller;
                #gpio-cells = <2>;
 
@@ -100,7 +100,7 @@
                #interrupt-cells = <2>;
        };
 
-       gpd0: gpd0 {
+       gpd0: gpd0-gpio-bank {
                gpio-controller;
                #gpio-cells = <2>;
 
@@ -108,7 +108,7 @@
                #interrupt-cells = <2>;
        };
 
-       gpd1: gpd1 {
+       gpd1: gpd1-gpio-bank {
                gpio-controller;
                #gpio-cells = <2>;
 
@@ -116,42 +116,42 @@
                #interrupt-cells = <2>;
        };
 
-       gpy0: gpy0 {
+       gpy0: gpy0-gpio-bank {
                gpio-controller;
                #gpio-cells = <2>;
        };
 
-       gpy1: gpy1 {
+       gpy1: gpy1-gpio-bank {
                gpio-controller;
                #gpio-cells = <2>;
        };
 
-       gpy2: gpy2 {
+       gpy2: gpy2-gpio-bank {
                gpio-controller;
                #gpio-cells = <2>;
        };
 
-       gpy3: gpy3 {
+       gpy3: gpy3-gpio-bank {
                gpio-controller;
                #gpio-cells = <2>;
        };
 
-       gpy4: gpy4 {
+       gpy4: gpy4-gpio-bank {
                gpio-controller;
                #gpio-cells = <2>;
        };
 
-       gpy5: gpy5 {
+       gpy5: gpy5-gpio-bank {
                gpio-controller;
                #gpio-cells = <2>;
        };
 
-       gpy6: gpy6 {
+       gpy6: gpy6-gpio-bank {
                gpio-controller;
                #gpio-cells = <2>;
        };
 
-       gpc4: gpc4 {
+       gpc4: gpc4-gpio-bank {
                gpio-controller;
                #gpio-cells = <2>;
 
@@ -159,7 +159,7 @@
                #interrupt-cells = <2>;
        };
 
-       gpx0: gpx0 {
+       gpx0: gpx0-gpio-bank {
                gpio-controller;
                #gpio-cells = <2>;
 
@@ -170,7 +170,7 @@
                             <26 0>, <26 1>, <27 0>, <27 1>;
        };
 
-       gpx1: gpx1 {
+       gpx1: gpx1-gpio-bank {
                gpio-controller;
                #gpio-cells = <2>;
 
@@ -181,7 +181,7 @@
                             <30 0>, <30 1>, <31 0>, <31 1>;
        };
 
-       gpx2: gpx2 {
+       gpx2: gpx2-gpio-bank {
                gpio-controller;
                #gpio-cells = <2>;
 
@@ -189,7 +189,7 @@
                #interrupt-cells = <2>;
        };
 
-       gpx3: gpx3 {
+       gpx3: gpx3-gpio-bank {
                gpio-controller;
                #gpio-cells = <2>;
 
@@ -197,104 +197,104 @@
                #interrupt-cells = <2>;
        };
 
-       uart0_data: uart0-data {
+       uart0_data: uart0-data-pins {
                samsung,pins = "gpa0-0", "gpa0-1";
                samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
                samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
                samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;
        };
 
-       uart0_fctl: uart0-fctl {
+       uart0_fctl: uart0-fctl-pins {
                samsung,pins = "gpa0-2", "gpa0-3";
                samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
                samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
                samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;
        };
 
-       i2c2_bus: i2c2-bus {
+       i2c2_bus: i2c2-bus-pins {
                samsung,pins = "gpa0-6", "gpa0-7";
                samsung,pin-function = <EXYNOS_PIN_FUNC_3>;
                samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;
                samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;
        };
 
-       i2c2_hs_bus: i2c2-hs-bus {
+       i2c2_hs_bus: i2c2-hs-bus-pins {
                samsung,pins = "gpa0-6", "gpa0-7";
                samsung,pin-function = <EXYNOS_PIN_FUNC_4>;
                samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;
                samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;
        };
 
-       i2c2_gpio_bus: i2c2-gpio-bus {
+       i2c2_gpio_bus: i2c2-gpio-bus-pins {
                samsung,pins = "gpa0-6", "gpa0-7";
                samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
                samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;
        };
 
-       uart2_data: uart2-data {
+       uart2_data: uart2-data-pins {
                samsung,pins = "gpa1-0", "gpa1-1";
                samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
                samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
                samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;
        };
 
-       uart2_fctl: uart2-fctl {
+       uart2_fctl: uart2-fctl-pins {
                samsung,pins = "gpa1-2", "gpa1-3";
                samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
                samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
                samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;
        };
 
-       i2c3_bus: i2c3-bus {
+       i2c3_bus: i2c3-bus-pins {
                samsung,pins = "gpa1-2", "gpa1-3";
                samsung,pin-function = <EXYNOS_PIN_FUNC_3>;
                samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;
                samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;
        };
 
-       i2c3_hs_bus: i2c3-hs-bus {
+       i2c3_hs_bus: i2c3-hs-bus-pins {
                samsung,pins = "gpa1-2", "gpa1-3";
                samsung,pin-function = <EXYNOS_PIN_FUNC_4>;
                samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;
                samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;
        };
 
-       uart3_data: uart3-data {
+       uart3_data: uart3-data-pins {
                samsung,pins = "gpa1-4", "gpa1-5";
                samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
                samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
                samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;
        };
 
-       spi0_bus: spi0-bus {
+       spi0_bus: spi0-bus-pins {
                samsung,pins = "gpa2-0", "gpa2-2", "gpa2-3";
                samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
                samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;
                samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;
        };
 
-       i2c4_bus: i2c4-bus {
+       i2c4_bus: i2c4-bus-pins {
                samsung,pins = "gpa2-0", "gpa2-1";
                samsung,pin-function = <EXYNOS_PIN_FUNC_3>;
                samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;
                samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;
        };
 
-       i2c5_bus: i2c5-bus {
+       i2c5_bus: i2c5-bus-pins {
                samsung,pins = "gpa2-2", "gpa2-3";
                samsung,pin-function = <EXYNOS_PIN_FUNC_3>;
                samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;
                samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;
        };
 
-       spi1_bus: spi1-bus {
+       spi1_bus: spi1-bus-pins {
                samsung,pins = "gpa2-4", "gpa2-6", "gpa2-7";
                samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
                samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;
                samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;
        };
 
-       i2s1_bus: i2s1-bus {
+       i2s1_bus: i2s1-bus-pins {
                samsung,pins = "gpb0-0", "gpb0-1", "gpb0-2", "gpb0-3",
                               "gpb0-4";
                samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
@@ -302,7 +302,7 @@
                samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;
        };
 
-       pcm1_bus: pcm1-bus {
+       pcm1_bus: pcm1-bus-pins {
                samsung,pins = "gpb0-0", "gpb0-1", "gpb0-2", "gpb0-3",
                               "gpb0-4";
                samsung,pin-function = <EXYNOS_PIN_FUNC_3>;
@@ -310,7 +310,7 @@
                samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;
        };
 
-       ac97_bus: ac97-bus {
+       ac97_bus: ac97-bus-pins {
                samsung,pins = "gpb0-0", "gpb0-1", "gpb0-2", "gpb0-3",
                               "gpb0-4";
                samsung,pin-function = <EXYNOS_PIN_FUNC_4>;
@@ -318,7 +318,7 @@
                samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;
        };
 
-       i2s2_bus: i2s2-bus {
+       i2s2_bus: i2s2-bus-pins {
                samsung,pins = "gpb1-0", "gpb1-1", "gpb1-2", "gpb1-3",
                               "gpb1-4";
                samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
@@ -326,7 +326,7 @@
                samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;
        };
 
-       pcm2_bus: pcm2-bus {
+       pcm2_bus: pcm2-bus-pins {
                samsung,pins = "gpb1-0", "gpb1-1", "gpb1-2", "gpb1-3",
                               "gpb1-4";
                samsung,pin-function = <EXYNOS_PIN_FUNC_3>;
@@ -334,280 +334,280 @@
                samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;
        };
 
-       spdif_bus: spdif-bus {
+       spdif_bus: spdif-bus-pins {
                samsung,pins = "gpb1-0", "gpb1-1";
                samsung,pin-function = <EXYNOS_PIN_FUNC_4>;
                samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
                samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;
        };
 
-       spi2_bus: spi2-bus {
+       spi2_bus: spi2-bus-pins {
                samsung,pins = "gpb1-1", "gpb1-3", "gpb1-4";
                samsung,pin-function = <EXYNOS_PIN_FUNC_5>;
                samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;
                samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;
        };
 
-       i2c6_bus: i2c6-bus {
+       i2c6_bus: i2c6-bus-pins {
                samsung,pins = "gpb1-3", "gpb1-4";
                samsung,pin-function = <EXYNOS_PIN_FUNC_4>;
                samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;
                samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;
        };
 
-       pwm0_out: pwm0-out {
+       pwm0_out: pwm0-out-pins {
                samsung,pins = "gpb2-0";
                samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
                samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
                samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;
        };
 
-       pwm1_out: pwm1-out {
+       pwm1_out: pwm1-out-pins {
                samsung,pins = "gpb2-1";
                samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
                samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
                samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;
        };
 
-       pwm2_out: pwm2-out {
+       pwm2_out: pwm2-out-pins {
                samsung,pins = "gpb2-2";
                samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
                samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
                samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;
        };
 
-       pwm3_out: pwm3-out {
+       pwm3_out: pwm3-out-pins {
                samsung,pins = "gpb2-3";
                samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
                samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
                samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;
        };
 
-       i2c7_bus: i2c7-bus {
+       i2c7_bus: i2c7-bus-pins {
                samsung,pins = "gpb2-2", "gpb2-3";
                samsung,pin-function = <EXYNOS_PIN_FUNC_3>;
                samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;
                samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;
        };
 
-       i2c0_bus: i2c0-bus {
+       i2c0_bus: i2c0-bus-pins {
                samsung,pins = "gpb3-0", "gpb3-1";
                samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
                samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;
                samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;
        };
 
-       i2c1_bus: i2c1-bus {
+       i2c1_bus: i2c1-bus-pins {
                samsung,pins = "gpb3-2", "gpb3-3";
                samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
                samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;
                samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;
        };
 
-       i2c0_hs_bus: i2c0-hs-bus {
+       i2c0_hs_bus: i2c0-hs-bus-pins {
                samsung,pins = "gpb3-0", "gpb3-1";
                samsung,pin-function = <EXYNOS_PIN_FUNC_4>;
                samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;
                samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;
        };
 
-       i2c1_hs_bus: i2c1-hs-bus {
+       i2c1_hs_bus: i2c1-hs-bus-pins {
                samsung,pins = "gpb3-2", "gpb3-3";
                samsung,pin-function = <EXYNOS_PIN_FUNC_4>;
                samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;
                samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;
        };
 
-       sd0_clk: sd0-clk {
+       sd0_clk: sd0-clk-pins {
                samsung,pins = "gpc0-0";
                samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
                samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
                samsung,pin-drv = <EXYNOS4_PIN_DRV_LV4>;
        };
 
-       sd0_cmd: sd0-cmd {
+       sd0_cmd: sd0-cmd-pins {
                samsung,pins = "gpc0-1";
                samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
                samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
                samsung,pin-drv = <EXYNOS4_PIN_DRV_LV4>;
        };
 
-       sd0_cd: sd0-cd {
+       sd0_cd: sd0-cd-pins {
                samsung,pins = "gpc0-2";
                samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
                samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;
                samsung,pin-drv = <EXYNOS4_PIN_DRV_LV4>;
        };
 
-       sd0_bus1: sd0-bus-width1 {
+       sd0_bus1: sd0-bus-width1-pins {
                samsung,pins = "gpc0-3";
                samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
                samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;
                samsung,pin-drv = <EXYNOS4_PIN_DRV_LV4>;
        };
 
-       sd0_bus4: sd0-bus-width4 {
+       sd0_bus4: sd0-bus-width4-pins {
                samsung,pins = "gpc0-3", "gpc0-4", "gpc0-5", "gpc0-6";
                samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
                samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;
                samsung,pin-drv = <EXYNOS4_PIN_DRV_LV4>;
        };
 
-       sd0_bus8: sd0-bus-width8 {
+       sd0_bus8: sd0-bus-width8-pins {
                samsung,pins = "gpc1-0", "gpc1-1", "gpc1-2", "gpc1-3";
                samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
                samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;
                samsung,pin-drv = <EXYNOS4_PIN_DRV_LV4>;
        };
 
-       sd1_clk: sd1-clk {
+       sd1_clk: sd1-clk-pins {
                samsung,pins = "gpc2-0";
                samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
                samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
                samsung,pin-drv = <EXYNOS4_PIN_DRV_LV4>;
        };
 
-       sd1_cmd: sd1-cmd {
+       sd1_cmd: sd1-cmd-pins {
                samsung,pins = "gpc2-1";
                samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
                samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
                samsung,pin-drv = <EXYNOS4_PIN_DRV_LV4>;
        };
 
-       sd1_cd: sd1-cd {
+       sd1_cd: sd1-cd-pins {
                samsung,pins = "gpc2-2";
                samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
                samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;
                samsung,pin-drv = <EXYNOS4_PIN_DRV_LV4>;
        };
 
-       sd1_bus1: sd1-bus-width1 {
+       sd1_bus1: sd1-bus-width1-pins {
                samsung,pins = "gpc2-3";
                samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
                samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;
                samsung,pin-drv = <EXYNOS4_PIN_DRV_LV4>;
        };
 
-       sd1_bus4: sd1-bus-width4 {
+       sd1_bus4: sd1-bus-width4-pins {
                samsung,pins = "gpc2-3", "gpc2-4", "gpc2-5", "gpc2-6";
                samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
                samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;
                samsung,pin-drv = <EXYNOS4_PIN_DRV_LV4>;
        };
 
-       sd2_clk: sd2-clk {
+       sd2_clk: sd2-clk-pins {
                samsung,pins = "gpc3-0";
                samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
                samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
                samsung,pin-drv = <EXYNOS4_PIN_DRV_LV4>;
        };
 
-       sd2_cmd: sd2-cmd {
+       sd2_cmd: sd2-cmd-pins {
                samsung,pins = "gpc3-1";
                samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
                samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
                samsung,pin-drv = <EXYNOS4_PIN_DRV_LV4>;
        };
 
-       sd2_cd: sd2-cd {
+       sd2_cd: sd2-cd-pins {
                samsung,pins = "gpc3-2";
                samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
                samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;
                samsung,pin-drv = <EXYNOS4_PIN_DRV_LV4>;
        };
 
-       sd2_bus1: sd2-bus-width1 {
+       sd2_bus1: sd2-bus-width1-pins {
                samsung,pins = "gpc3-3";
                samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
                samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;
                samsung,pin-drv = <EXYNOS4_PIN_DRV_LV4>;
        };
 
-       sd2_bus4: sd2-bus-width4 {
+       sd2_bus4: sd2-bus-width4-pins {
                samsung,pins = "gpc3-3", "gpc3-4", "gpc3-5", "gpc3-6";
                samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
                samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;
                samsung,pin-drv = <EXYNOS4_PIN_DRV_LV4>;
        };
 
-       sd2_bus8: sd2-bus-width8 {
+       sd2_bus8: sd2-bus-width8-pins {
                samsung,pins = "gpc4-3", "gpc4-4", "gpc4-5", "gpc4-6";
                samsung,pin-function = <EXYNOS_PIN_FUNC_3>;
                samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;
                samsung,pin-drv = <EXYNOS4_PIN_DRV_LV4>;
        };
 
-       sd3_clk: sd3-clk {
+       sd3_clk: sd3-clk-pins {
                samsung,pins = "gpc4-0";
                samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
                samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
                samsung,pin-drv = <EXYNOS4_PIN_DRV_LV4>;
        };
 
-       sd3_cmd: sd3-cmd {
+       sd3_cmd: sd3-cmd-pins {
                samsung,pins = "gpc4-1";
                samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
                samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
                samsung,pin-drv = <EXYNOS4_PIN_DRV_LV4>;
        };
 
-       sd3_cd: sd3-cd {
+       sd3_cd: sd3-cd-pins {
                samsung,pins = "gpc4-2";
                samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
                samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;
                samsung,pin-drv = <EXYNOS4_PIN_DRV_LV4>;
        };
 
-       sd3_bus1: sd3-bus-width1 {
+       sd3_bus1: sd3-bus-width1-pins {
                samsung,pins = "gpc4-3";
                samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
                samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;
                samsung,pin-drv = <EXYNOS4_PIN_DRV_LV4>;
        };
 
-       sd3_bus4: sd3-bus-width4 {
+       sd3_bus4: sd3-bus-width4-pins {
                samsung,pins = "gpc4-3", "gpc4-4", "gpc4-5", "gpc4-6";
                samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
                samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;
                samsung,pin-drv = <EXYNOS4_PIN_DRV_LV4>;
        };
 
-       uart1_data: uart1-data {
+       uart1_data: uart1-data-pins {
                samsung,pins = "gpd0-0", "gpd0-1";
                samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
                samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
                samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;
        };
 
-       uart1_fctl: uart1-fctl {
+       uart1_fctl: uart1-fctl-pins {
                samsung,pins = "gpd0-2", "gpd0-3";
                samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
                samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
                samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;
        };
 
-       dp_hpd: dp_hpd {
+       dp_hpd: dp-hpd-pins {
                samsung,pins = "gpx0-7";
                samsung,pin-function = <EXYNOS_PIN_FUNC_3>;
                samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
                samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;
        };
 
-       hdmi_cec: hdmi-cec {
+       hdmi_cec: hdmi-cec-pins {
                samsung,pins = "gpx3-6";
                samsung,pin-function = <EXYNOS_PIN_FUNC_3>;
                samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
                samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;
        };
 
-       hdmi_hpd: hdmi-hpd {
+       hdmi_hpd: hdmi-hpd-pins {
                samsung,pins = "gpx3-7";
                samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
        };
 };
 
 &pinctrl_1 {
-       gpe0: gpe0 {
+       gpe0: gpe0-gpio-bank {
                gpio-controller;
                #gpio-cells = <2>;
 
@@ -615,7 +615,7 @@
                #interrupt-cells = <2>;
        };
 
-       gpe1: gpe1 {
+       gpe1: gpe1-gpio-bank {
                gpio-controller;
                #gpio-cells = <2>;
 
@@ -623,7 +623,7 @@
                #interrupt-cells = <2>;
        };
 
-       gpf0: gpf0 {
+       gpf0: gpf0-gpio-bank {
                gpio-controller;
                #gpio-cells = <2>;
 
@@ -631,7 +631,7 @@
                #interrupt-cells = <2>;
        };
 
-       gpf1: gpf1 {
+       gpf1: gpf1-gpio-bank {
                gpio-controller;
                #gpio-cells = <2>;
 
@@ -639,7 +639,7 @@
                #interrupt-cells = <2>;
        };
 
-       gpg0: gpg0 {
+       gpg0: gpg0-gpio-bank {
                gpio-controller;
                #gpio-cells = <2>;
 
@@ -647,7 +647,7 @@
                #interrupt-cells = <2>;
        };
 
-       gpg1: gpg1 {
+       gpg1: gpg1-gpio-bank {
                gpio-controller;
                #gpio-cells = <2>;
 
@@ -655,7 +655,7 @@
                #interrupt-cells = <2>;
        };
 
-       gpg2: gpg2 {
+       gpg2: gpg2-gpio-bank {
                gpio-controller;
                #gpio-cells = <2>;
 
@@ -663,7 +663,7 @@
                #interrupt-cells = <2>;
        };
 
-       gph0: gph0 {
+       gph0: gph0-gpio-bank {
                gpio-controller;
                #gpio-cells = <2>;
 
@@ -671,7 +671,7 @@
                #interrupt-cells = <2>;
        };
 
-       gph1: gph1 {
+       gph1: gph1-gpio-bank {
                gpio-controller;
                #gpio-cells = <2>;
 
@@ -679,7 +679,7 @@
                #interrupt-cells = <2>;
        };
 
-       cam_gpio_a: cam-gpio-a {
+       cam_gpio_a: cam-gpio-a-pins {
                samsung,pins = "gpe0-0", "gpe0-1", "gpe0-2", "gpe0-3",
                               "gpe0-4", "gpe0-5", "gpe0-6", "gpe0-7",
                               "gpe1-0", "gpe1-1";
@@ -688,7 +688,7 @@
                samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;
        };
 
-       cam_gpio_b: cam-gpio-b {
+       cam_gpio_b: cam-gpio-b-pins {
                samsung,pins = "gpf0-0", "gpf0-1", "gpf0-2", "gpf0-3",
                               "gpf1-0", "gpf1-1", "gpf1-2", "gpf1-3";
                samsung,pin-function = <EXYNOS_PIN_FUNC_3>;
@@ -696,42 +696,42 @@
                samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;
        };
 
-       cam_i2c2_bus: cam-i2c2-bus {
+       cam_i2c2_bus: cam-i2c2-bus-pins {
                samsung,pins = "gpe0-6", "gpe1-0";
                samsung,pin-function = <EXYNOS_PIN_FUNC_4>;
                samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;
                samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;
        };
 
-       cam_spi1_bus: cam-spi1-bus {
+       cam_spi1_bus: cam-spi1-bus-pins {
                samsung,pins = "gpe0-4", "gpe0-5", "gpf0-2", "gpf0-3";
                samsung,pin-function = <EXYNOS_PIN_FUNC_4>;
                samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
                samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;
        };
 
-       cam_i2c1_bus: cam-i2c1-bus {
+       cam_i2c1_bus: cam-i2c1-bus-pins {
                samsung,pins = "gpf0-2", "gpf0-3";
                samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
                samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;
                samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;
        };
 
-       cam_i2c0_bus: cam-i2c0-bus {
+       cam_i2c0_bus: cam-i2c0-bus-pins {
                samsung,pins = "gpf0-0", "gpf0-1";
                samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
                samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;
                samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;
        };
 
-       cam_spi0_bus: cam-spi0-bus {
+       cam_spi0_bus: cam-spi0-bus-pins {
                samsung,pins = "gpf1-0", "gpf1-1", "gpf1-2", "gpf1-3";
                samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
                samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
                samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;
        };
 
-       cam_bayrgb_bus: cam-bayrgb-bus {
+       cam_bayrgb_bus: cam-bayrgb-bus-pins {
                samsung,pins = "gpg0-0", "gpg0-1", "gpg0-2", "gpg0-3",
                               "gpg0-4", "gpg0-5", "gpg0-6", "gpg0-7",
                               "gpg1-0", "gpg1-1", "gpg1-2", "gpg1-3",
@@ -742,7 +742,7 @@
                samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;
        };
 
-       cam_port_a: cam-port-a {
+       cam_port_a: cam-port-a-pins {
                samsung,pins = "gph0-0", "gph0-1", "gph0-2", "gph0-3",
                               "gph1-0", "gph1-1", "gph1-2", "gph1-3",
                               "gph1-4", "gph1-5", "gph1-6", "gph1-7";
@@ -753,7 +753,7 @@
 };
 
 &pinctrl_2 {
-       gpv0: gpv0 {
+       gpv0: gpv0-gpio-bank {
                gpio-controller;
                #gpio-cells = <2>;
 
@@ -761,7 +761,7 @@
                #interrupt-cells = <2>;
        };
 
-       gpv1: gpv1 {
+       gpv1: gpv1-gpio-bank {
                gpio-controller;
                #gpio-cells = <2>;
 
@@ -769,7 +769,7 @@
                #interrupt-cells = <2>;
        };
 
-       gpv2: gpv2 {
+       gpv2: gpv2-gpio-bank {
                gpio-controller;
                #gpio-cells = <2>;
 
@@ -777,7 +777,7 @@
                #interrupt-cells = <2>;
        };
 
-       gpv3: gpv3 {
+       gpv3: gpv3-gpio-bank {
                gpio-controller;
                #gpio-cells = <2>;
 
@@ -785,7 +785,7 @@
                #interrupt-cells = <2>;
        };
 
-       gpv4: gpv4 {
+       gpv4: gpv4-gpio-bank {
                gpio-controller;
                #gpio-cells = <2>;
 
@@ -793,7 +793,7 @@
                #interrupt-cells = <2>;
        };
 
-       c2c_rxd: c2c-rxd {
+       c2c_rxd: c2c-rxd-pins {
                samsung,pins = "gpv0-0", "gpv0-1", "gpv0-2", "gpv0-3",
                               "gpv0-4", "gpv0-5", "gpv0-6", "gpv0-7",
                               "gpv1-0", "gpv1-1", "gpv1-2", "gpv1-3",
@@ -803,7 +803,7 @@
                samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;
        };
 
-       c2c_txd: c2c-txd {
+       c2c_txd: c2c-txd-pins {
                samsung,pins = "gpv2-0", "gpv2-1", "gpv2-2", "gpv2-3",
                               "gpv2-4", "gpv2-5", "gpv2-6", "gpv2-7",
                               "gpv3-0", "gpv3-1", "gpv3-2", "gpv3-3",
@@ -815,7 +815,7 @@
 };
 
 &pinctrl_3 {
-       gpz: gpz {
+       gpz: gpz-gpio-bank {
                gpio-controller;
                #gpio-cells = <2>;
 
@@ -823,7 +823,7 @@
                #interrupt-cells = <2>;
        };
 
-       i2s0_bus: i2s0-bus {
+       i2s0_bus: i2s0-bus-pins {
                samsung,pins = "gpz-0", "gpz-1", "gpz-2", "gpz-3",
                                "gpz-4", "gpz-5", "gpz-6";
                samsung,pin-function = <EXYNOS_PIN_FUNC_2>;

diff --git a/arch/arm/boot/dts/exynos5250-smdk5250.dts b/arch/arm/boot/dts/exynos5250-smdk5250.dts
index 39bbe18145cf242bf3864a4e07e805e70b6ac4db..497fbd009ae519429f64079d6754f96fb51abadf 100644 (file)
--- a/arch/arm/boot/dts/exynos5250-smdk5250.dts
+++ b/arch/arm/boot/dts/exynos5250-smdk5250.dts
@@ -410,7 +410,7 @@
 };
 
 &pinctrl_0 {
-       max77686_irq: max77686-irq {
+       max77686_irq: max77686-irq-pins {
                samsung,pins = "gpx3-2";
                samsung,pin-function = <EXYNOS_PIN_FUNC_F>;
                samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;

diff --git a/arch/arm/boot/dts/exynos5250-snow-common.dtsi b/arch/arm/boot/dts/exynos5250-snow-common.dtsi
index 2335c46873494d19bc9db14698a4b66ff10672bd..f7f5630a620bb3e52859d9f01effdf4ba5cc3f2f 100644 (file)
--- a/arch/arm/boot/dts/exynos5250-snow-common.dtsi
+++ b/arch/arm/boot/dts/exynos5250-snow-common.dtsi
@@ -587,63 +587,63 @@
 };
 
 &pinctrl_0 {
-       wifi_en: wifi-en {
+       wifi_en: wifi-en-pins {
                samsung,pins = "gpx0-1";
                samsung,pin-function = <EXYNOS_PIN_FUNC_OUTPUT>;
                samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
                samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;
        };
 
-       wifi_rst: wifi-rst {
+       wifi_rst: wifi-rst-pins {
                samsung,pins = "gpx0-2";
                samsung,pin-function = <EXYNOS_PIN_FUNC_OUTPUT>;
                samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
                samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;
        };
 
-       power_key_irq: power-key-irq {
+       power_key_irq: power-key-irq-pins {
                samsung,pins = "gpx1-3";
                samsung,pin-function = <EXYNOS_PIN_FUNC_F>;
                samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
                samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;
        };
 
-       ec_irq: ec-irq {
+       ec_irq: ec-irq-pins {
                samsung,pins = "gpx1-6";
                samsung,pin-function = <EXYNOS_PIN_FUNC_INPUT>;
                samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
                samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;
        };
 
-       tps65090_irq: tps65090-irq {
+       tps65090_irq: tps65090-irq-pins {
                samsung,pins = "gpx2-6";
                samsung,pin-function = <EXYNOS_PIN_FUNC_INPUT>;
                samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
                samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;
        };
 
-       usb3_vbus_en: usb3-vbus-en {
+       usb3_vbus_en: usb3-vbus-en-pins {
                samsung,pins = "gpx2-7";
                samsung,pin-function = <EXYNOS_PIN_FUNC_OUTPUT>;
                samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
                samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;
        };
 
-       max77686_irq: max77686-irq {
+       max77686_irq: max77686-irq-pins {
                samsung,pins = "gpx3-2";
                samsung,pin-function = <EXYNOS_PIN_FUNC_INPUT>;
                samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
                samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;
        };
 
-       lid_irq: lid-irq {
+       lid_irq: lid-irq-pins {
                samsung,pins = "gpx3-5";
                samsung,pin-function = <EXYNOS_PIN_FUNC_F>;
                samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
                samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;
        };
 
-       hdmi_hpd_irq: hdmi-hpd-irq {
+       hdmi_hpd_irq: hdmi-hpd-irq-pins {
                samsung,pins = "gpx3-7";
                samsung,pin-function = <EXYNOS_PIN_FUNC_INPUT>;
                samsung,pin-pud = <EXYNOS_PIN_PULL_DOWN>;
@@ -652,14 +652,14 @@
 };
 
 &pinctrl_1 {
-       arb_their_claim: arb-their-claim {
+       arb_their_claim: arb-their-claim-pins {
                samsung,pins = "gpe0-4";
                samsung,pin-function = <EXYNOS_PIN_FUNC_INPUT>;
                samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;
                samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;
        };
 
-       arb_our_claim: arb-our-claim {
+       arb_our_claim: arb-our-claim-pins {
                samsung,pins = "gpf0-3";
                samsung,pin-function = <EXYNOS_PIN_FUNC_OUTPUT>;
                samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;

diff --git a/arch/arm/boot/dts/exynos5250-snow-rev5.dts b/arch/arm/boot/dts/exynos5250-snow-rev5.dts
index f8ca61df698182aae89055252953e49ba418e247..0a47597d6f0de6e33e12a09cb681d8e7b836decd 100644 (file)
--- a/arch/arm/boot/dts/exynos5250-snow-rev5.dts
+++ b/arch/arm/boot/dts/exynos5250-snow-rev5.dts
@@ -47,7 +47,7 @@
 };
 
 &pinctrl_0 {
-       max98090_irq: max98090-irq {
+       max98090_irq: max98090-irq-pins {
                samsung,pins = "gpx0-4";
                samsung,pin-function = <EXYNOS_PIN_FUNC_INPUT>;
                samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;

diff --git a/arch/arm/boot/dts/exynos5250-snow.dts b/arch/arm/boot/dts/exynos5250-snow.dts
index a630bc654a49aff443b9f4cdc431eeea69c1bde1..906aa7aae710af7776d6a04314a5b9e76f44ff3a 100644 (file)
--- a/arch/arm/boot/dts/exynos5250-snow.dts
+++ b/arch/arm/boot/dts/exynos5250-snow.dts
@@ -43,7 +43,7 @@
 };
 
 &pinctrl_0 {
-       max98095_en: max98095-en {
+       max98095_en: max98095-en-pins {
                samsung,pins = "gpx1-7";
                samsung,pin-function = <EXYNOS_PIN_FUNC_INPUT>;
                samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;

diff --git a/arch/arm/boot/dts/exynos5250-spring.dts b/arch/arm/boot/dts/exynos5250-spring.dts
index e0feedcf54bba2763f5f719b34d1503a09c3fdd4..d52b5e4e5870a94cdf7fcf6714e561f7c4fb27c7 100644 (file)
--- a/arch/arm/boot/dts/exynos5250-spring.dts
+++ b/arch/arm/boot/dts/exynos5250-spring.dts
@@ -451,63 +451,63 @@
 };
 
 &pinctrl_0 {
-       s5m8767_dvs: s5m8767-dvs {
+       s5m8767_dvs: s5m8767-dvs-pins {
                samsung,pins = "gpd1-0", "gpd1-1", "gpd1-2";
                samsung,pin-function = <EXYNOS_PIN_FUNC_INPUT>;
                samsung,pin-pud = <EXYNOS_PIN_PULL_DOWN>;
                samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;
        };
 
-       dp_hpd_gpio: dp-hpd {
+       dp_hpd_gpio: dp-hpd-pins {
                samsung,pins = "gpc3-0";
                samsung,pin-function = <EXYNOS_PIN_FUNC_INPUT>;
                samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;
                samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;
        };
 
-       trackpad_irq: trackpad-irq {
+       trackpad_irq: trackpad-irq-pins {
                samsung,pins = "gpx1-2";
                samsung,pin-function = <EXYNOS_PIN_FUNC_F>;
                samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
                samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;
        };
 
-       power_key_irq: power-key-irq {
+       power_key_irq: power-key-irq-pins {
                samsung,pins = "gpx1-3";
                samsung,pin-function = <EXYNOS_PIN_FUNC_F>;
                samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
                samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;
        };
 
-       ec_irq: ec-irq {
+       ec_irq: ec-irq-pins {
                samsung,pins = "gpx1-6";
                samsung,pin-function = <EXYNOS_PIN_FUNC_INPUT>;
                samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
                samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;
        };
 
-       s5m8767_ds: s5m8767-ds {
+       s5m8767_ds: s5m8767-ds-pins {
                samsung,pins = "gpx2-3", "gpx2-4", "gpx2-5";
                samsung,pin-function = <EXYNOS_PIN_FUNC_INPUT>;
                samsung,pin-pud = <EXYNOS_PIN_PULL_DOWN>;
                samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;
        };
 
-       s5m8767_irq: s5m8767-irq {
+       s5m8767_irq: s5m8767-irq-pins {
                samsung,pins = "gpx3-2";
                samsung,pin-function = <EXYNOS_PIN_FUNC_INPUT>;
                samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
                samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;
        };
 
-       lid_irq: lid-irq {
+       lid_irq: lid-irq-pins {
                samsung,pins = "gpx3-5";
                samsung,pin-function = <EXYNOS_PIN_FUNC_F>;
                samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
                samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;
        };
 
-       hdmi_hpd_irq: hdmi-hpd-irq {
+       hdmi_hpd_irq: hdmi-hpd-irq-pins {
                samsung,pins = "gpx3-7";
                samsung,pin-function = <EXYNOS_PIN_FUNC_INPUT>;
                samsung,pin-pud = <EXYNOS_PIN_PULL_DOWN>;
@@ -516,7 +516,7 @@
 };
 
 &pinctrl_1 {
-       hsic_reset: hsic-reset {
+       hsic_reset: hsic-reset-pins {
                samsung,pins = "gpe1-0";
                samsung,pin-function = <EXYNOS_PIN_FUNC_OUTPUT>;
                samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;