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

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-9-krzysztof.kozlowski@canonical.com

diff --git a/arch/arm/boot/dts/exynos5410-odroidxu.dts b/arch/arm/boot/dts/exynos5410-odroidxu.dts
index 9f2200dd5b43e6f13e62133bab85ca26b3241cac..ca121859b1241627a260fca3db53f4b27bb5ad2c 100644 (file)
--- a/arch/arm/boot/dts/exynos5410-odroidxu.dts
+++ b/arch/arm/boot/dts/exynos5410-odroidxu.dts
@@ -547,14 +547,14 @@
 };
 
 &pinctrl_0 {
-       emmc_nrst_pin: emmc-nrst {
+       emmc_nrst_pin: emmc-nrst-pins {
                samsung,pins = "gpd1-0";
                samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
                samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
                samsung,pin-drv = <EXYNOS5420_PIN_DRV_LV1>;
        };
 
-       sd2_wp: sd2-wp {
+       sd2_wp: sd2-wp-pins {
                samsung,pins = "gpm5-0";
                samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
                /* Pin is floating so be sure to disable write-protect */
@@ -562,14 +562,14 @@
                samsung,pin-drv = <EXYNOS5420_PIN_DRV_LV4>;
        };
 
-       pmic_dvs_2: pmic-dvs-2 {
+       pmic_dvs_2: pmic-dvs-2-pins {
                samsung,pins = "gpx0-0", "gpx0-1";
                samsung,pin-function = <EXYNOS_PIN_FUNC_OUTPUT>;
                samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
                samsung,pin-drv = <EXYNOS5420_PIN_DRV_LV1>;
        };
 
-       pmic_dvs_1: pmic-dvs-1 {
+       pmic_dvs_1: pmic-dvs-1-pins {
                samsung,pins = "gpx0-2";
                samsung,pin-function = <EXYNOS_PIN_FUNC_OUTPUT>;
                samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
@@ -577,7 +577,7 @@
                samsung,pin-val = <1>;
        };
 
-       max77802_irq: max77802-irq {
+       max77802_irq: max77802-irq-pins {
                samsung,pins = "gpx0-4";
                samsung,pin-function = <EXYNOS_PIN_FUNC_F>;
                samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;

diff --git a/arch/arm/boot/dts/exynos5410-pinctrl.dtsi b/arch/arm/boot/dts/exynos5410-pinctrl.dtsi
index 9599ba8ba7988505f9262c3092872b68930af67f..6c7814b4372ef73d8d7693e49a51a19bedf703de 100644 (file)
--- a/arch/arm/boot/dts/exynos5410-pinctrl.dtsi
+++ b/arch/arm/boot/dts/exynos5410-pinctrl.dtsi
@@ -9,7 +9,7 @@
 #include <dt-bindings/pinctrl/samsung.h>
 
 &pinctrl_0 {
-       gpa0: gpa0 {
+       gpa0: gpa0-gpio-bank {
                gpio-controller;
                #gpio-cells = <2>;
 
@@ -17,7 +17,7 @@
                #interrupt-cells = <2>;
        };
 
-       gpa1: gpa1 {
+       gpa1: gpa1-gpio-bank {
                gpio-controller;
                #gpio-cells = <2>;
 
@@ -25,7 +25,7 @@
                #interrupt-cells = <2>;
        };
 
-       gpa2: gpa2 {
+       gpa2: gpa2-gpio-bank {
                gpio-controller;
                #gpio-cells = <2>;
 
@@ -33,7 +33,7 @@
                #interrupt-cells = <2>;
        };
 
-       gpb0: gpb0 {
+       gpb0: gpb0-gpio-bank {
                gpio-controller;
                #gpio-cells = <2>;
 
@@ -41,7 +41,7 @@
                #interrupt-cells = <2>;
        };
 
-       gpb1: gpb1 {
+       gpb1: gpb1-gpio-bank {
                gpio-controller;
                #gpio-cells = <2>;
 
@@ -49,7 +49,7 @@
                #interrupt-cells = <2>;
        };
 
-       gpb2: gpb2 {
+       gpb2: gpb2-gpio-bank {
                gpio-controller;
                #gpio-cells = <2>;
 
@@ -57,7 +57,7 @@
                #interrupt-cells = <2>;
        };
 
-       gpb3: gpb3 {
+       gpb3: gpb3-gpio-bank {
                gpio-controller;
                #gpio-cells = <2>;
 
@@ -65,7 +65,7 @@
                #interrupt-cells = <2>;
        };
 
-       gpc0: gpc0 {
+       gpc0: gpc0-gpio-bank {
                gpio-controller;
                #gpio-cells = <2>;
 
@@ -73,7 +73,7 @@
                #interrupt-cells = <2>;
        };
 
-       gpc3: gpc3 {
+       gpc3: gpc3-gpio-bank {
                gpio-controller;
                #gpio-cells = <2>;
 
@@ -81,7 +81,7 @@
                #interrupt-cells = <2>;
        };
 
-       gpc1: gpc1 {
+       gpc1: gpc1-gpio-bank {
                gpio-controller;
                #gpio-cells = <2>;
 
@@ -89,7 +89,7 @@
                #interrupt-cells = <2>;
        };
 
-       gpc2: gpc2 {
+       gpc2: gpc2-gpio-bank {
                gpio-controller;
                #gpio-cells = <2>;
 
@@ -97,12 +97,12 @@
                #interrupt-cells = <2>;
        };
 
-       gpm5: gpm5 {
+       gpm5: gpm5-gpio-bank {
                gpio-controller;
                #gpio-cells = <2>;
        };
 
-       gpd1: gpd1 {
+       gpd1: gpd1-gpio-bank {
                gpio-controller;
                #gpio-cells = <2>;
 
@@ -110,7 +110,7 @@
                #interrupt-cells = <2>;
        };
 
-       gpe0: gpe0 {
+       gpe0: gpe0-gpio-bank {
                gpio-controller;
                #gpio-cells = <2>;
 
@@ -118,7 +118,7 @@
                #interrupt-cells = <2>;
        };
 
-       gpe1: gpe1 {
+       gpe1: gpe1-gpio-bank {
                gpio-controller;
                #gpio-cells = <2>;
 
@@ -126,7 +126,7 @@
                #interrupt-cells = <2>;
        };
 
-       gpf0: gpf0 {
+       gpf0: gpf0-gpio-bank {
                gpio-controller;
                #gpio-cells = <2>;
 
@@ -134,7 +134,7 @@
                #interrupt-cells = <2>;
        };
 
-       gpf1: gpf1 {
+       gpf1: gpf1-gpio-bank {
                gpio-controller;
                #gpio-cells = <2>;
 
@@ -142,7 +142,7 @@
                #interrupt-cells = <2>;
        };
 
-       gpg0: gpg0 {
+       gpg0: gpg0-gpio-bank {
                gpio-controller;
                #gpio-cells = <2>;
 
@@ -150,7 +150,7 @@
                #interrupt-cells = <2>;
        };
 
-       gpg1: gpg1 {
+       gpg1: gpg1-gpio-bank {
                gpio-controller;
                #gpio-cells = <2>;
 
@@ -158,7 +158,7 @@
                #interrupt-cells = <2>;
        };
 
-       gpg2: gpg2 {
+       gpg2: gpg2-gpio-bank {
                gpio-controller;
                #gpio-cells = <2>;
 
@@ -166,7 +166,7 @@
                #interrupt-cells = <2>;
        };
 
-       gph0: gph0 {
+       gph0: gph0-gpio-bank {
                gpio-controller;
                #gpio-cells = <2>;
 
@@ -174,7 +174,7 @@
                #interrupt-cells = <2>;
        };
 
-       gph1: gph1 {
+       gph1: gph1-gpio-bank {
                gpio-controller;
                #gpio-cells = <2>;
 
@@ -182,52 +182,52 @@
                #interrupt-cells = <2>;
        };
 
-       gpm7: gpm7 {
+       gpm7: gpm7-gpio-bank {
                gpio-controller;
                #gpio-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>;
        };
 
-       gpy7: gpy7 {
+       gpy7: gpy7-gpio-bank {
                gpio-controller;
                #gpio-cells = <2>;
        };
 
-       gpx0: gpx0 {
+       gpx0: gpx0-gpio-bank {
                gpio-controller;
                #gpio-cells = <2>;
 
@@ -244,7 +244,7 @@
                             <27 1>;
        };
 
-       gpx1: gpx1 {
+       gpx1: gpx1-gpio-bank {
                gpio-controller;
                #gpio-cells = <2>;
 
@@ -261,7 +261,7 @@
                             <31 1>;
        };
 
-       gpx2: gpx2 {
+       gpx2: gpx2-gpio-bank {
                gpio-controller;
                #gpio-cells = <2>;
 
@@ -269,7 +269,7 @@
                #interrupt-cells = <2>;
        };
 
-       gpx3: gpx3 {
+       gpx3: gpx3-gpio-bank {
                gpio-controller;
                #gpio-cells = <2>;
 
@@ -277,210 +277,210 @@
                #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 = <EXYNOS5420_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 = <EXYNOS5420_PIN_DRV_LV1>;
        };
 
-       uart1_data: uart1-data {
+       uart1_data: uart1-data-pins {
                samsung,pins = "gpa0-4", "gpa0-5";
                samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
                samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
                samsung,pin-drv = <EXYNOS5420_PIN_DRV_LV1>;
        };
 
-       uart1_fctl: uart1-fctl {
+       uart1_fctl: uart1-fctl-pins {
                samsung,pins = "gpa0-6", "gpa0-7";
                samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
                samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
                samsung,pin-drv = <EXYNOS5420_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 = <EXYNOS5420_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 = <EXYNOS5420_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 = <EXYNOS5420_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 = <EXYNOS5420_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 = <EXYNOS5420_PIN_DRV_LV1>;
        };
 
-       i2c4_hs_bus: i2c4-hs-bus {
+       i2c4_hs_bus: i2c4-hs-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 = <EXYNOS5420_PIN_DRV_LV1>;
        };
 
-       i2c5_hs_bus: i2c5-hs-bus {
+       i2c5_hs_bus: i2c5-hs-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 = <EXYNOS5420_PIN_DRV_LV1>;
        };
 
-       i2c6_hs_bus: i2c6-hs-bus {
+       i2c6_hs_bus: i2c6-hs-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 = <EXYNOS5420_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 = <EXYNOS5420_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 = <EXYNOS5420_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 = <EXYNOS5420_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 = <EXYNOS5420_PIN_DRV_LV1>;
        };
 
-       i2c7_hs_bus: i2c7-hs-bus {
+       i2c7_hs_bus: i2c7-hs-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 = <EXYNOS5420_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 = <EXYNOS5420_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 = <EXYNOS5420_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 = <EXYNOS5420_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 = <EXYNOS5420_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 = <EXYNOS5420_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 = <EXYNOS5420_PIN_DRV_LV4>;
        };
 
-       sd0_bus4: sd0-bus-width4 {
+       sd0_bus4: sd0-bus-width4-pins {
                samsung,pins = "gpc0-4", "gpc0-5", "gpc0-6";
                samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
                samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;
                samsung,pin-drv = <EXYNOS5420_PIN_DRV_LV4>;
        };
 
-       sd2_clk: sd2-clk {
+       sd2_clk: sd2-clk-pins {
                samsung,pins = "gpc2-0";
                samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
                samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
                samsung,pin-drv = <EXYNOS5420_PIN_DRV_LV4>;
        };
 
-       sd2_cmd: sd2-cmd {
+       sd2_cmd: sd2-cmd-pins {
                samsung,pins = "gpc2-1";
                samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
                samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
                samsung,pin-drv = <EXYNOS5420_PIN_DRV_LV4>;
        };
 
-       sd2_cd: sd2-cd {
+       sd2_cd: sd2-cd-pins {
                samsung,pins = "gpc2-2";
                samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
                samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;
                samsung,pin-drv = <EXYNOS5420_PIN_DRV_LV4>;
        };
 
-       sd2_bus1: sd2-bus-width1 {
+       sd2_bus1: sd2-bus-width1-pins {
                samsung,pins = "gpc2-3";
                samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
                samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;
                samsung,pin-drv = <EXYNOS5420_PIN_DRV_LV4>;
        };
 
-       sd2_bus4: sd2-bus-width4 {
+       sd2_bus4: sd2-bus-width4-pins {
                samsung,pins = "gpc2-4", "gpc2-5", "gpc2-6";
                samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
                samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;
                samsung,pin-drv = <EXYNOS5420_PIN_DRV_LV4>;
        };
 
-       sd0_bus8: sd0-bus-width8 {
+       sd0_bus8: sd0-bus-width8-pins {
                samsung,pins = "gpc3-0", "gpc3-1", "gpc3-2", "gpc3-3";
                samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
                samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;
@@ -489,7 +489,7 @@
 };
 
 &pinctrl_1 {
-       gpj0: gpj0 {
+       gpj0: gpj0-gpio-bank {
                gpio-controller;
                #gpio-cells = <2>;
 
@@ -497,7 +497,7 @@
                #interrupt-cells = <2>;
        };
 
-       gpj1: gpj1 {
+       gpj1: gpj1-gpio-bank {
                gpio-controller;
                #gpio-cells = <2>;
 
@@ -505,7 +505,7 @@
                #interrupt-cells = <2>;
        };
 
-       gpj2: gpj2 {
+       gpj2: gpj2-gpio-bank {
                gpio-controller;
                #gpio-cells = <2>;
 
@@ -513,7 +513,7 @@
                #interrupt-cells = <2>;
        };
 
-       gpj3: gpj3 {
+       gpj3: gpj3-gpio-bank {
                gpio-controller;
                #gpio-cells = <2>;
 
@@ -521,7 +521,7 @@
                #interrupt-cells = <2>;
        };
 
-       gpj4: gpj4 {
+       gpj4: gpj4-gpio-bank {
                gpio-controller;
                #gpio-cells = <2>;
 
@@ -529,7 +529,7 @@
                #interrupt-cells = <2>;
        };
 
-       gpk0: gpk0 {
+       gpk0: gpk0-gpio-bank {
                gpio-controller;
                #gpio-cells = <2>;
 
@@ -537,7 +537,7 @@
                #interrupt-cells = <2>;
        };
 
-       gpk1: gpk1 {
+       gpk1: gpk1-gpio-bank {
                gpio-controller;
                #gpio-cells = <2>;
 
@@ -545,7 +545,7 @@
                #interrupt-cells = <2>;
        };
 
-       gpk2: gpk2 {
+       gpk2: gpk2-gpio-bank {
                gpio-controller;
                #gpio-cells = <2>;
 
@@ -553,7 +553,7 @@
                #interrupt-cells = <2>;
        };
 
-       gpk3: gpk3 {
+       gpk3: gpk3-gpio-bank {
                gpio-controller;
                #gpio-cells = <2>;
 
@@ -561,28 +561,28 @@
                #interrupt-cells = <2>;
        };
 
-       usb3_1_oc: usb3-1-oc {
+       usb3_1_oc: usb3-1-oc-pins {
                samsung,pins = "gpk2-4", "gpk2-5";
                samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
                samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;
                samsung,pin-drv = <EXYNOS5420_PIN_DRV_LV1>;
        };
 
-       usb3_1_vbusctrl: usb3-1-vbusctrl {
+       usb3_1_vbusctrl: usb3-1-vbusctrl-pins {
                samsung,pins = "gpk2-6", "gpk2-7";
                samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
                samsung,pin-pud = <EXYNOS_PIN_PULL_DOWN>;
                samsung,pin-drv = <EXYNOS5420_PIN_DRV_LV1>;
        };
 
-       usb3_0_oc: usb3-0-oc {
+       usb3_0_oc: usb3-0-oc-pins {
                samsung,pins = "gpk3-0", "gpk3-1";
                samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
                samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;
                samsung,pin-drv = <EXYNOS5420_PIN_DRV_LV1>;
        };
 
-       usb3_0_vbusctrl: usb3-0-vbusctrl {
+       usb3_0_vbusctrl: usb3-0-vbusctrl-pins {
                samsung,pins = "gpk3-2", "gpk3-3";
                samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
                samsung,pin-pud = <EXYNOS_PIN_PULL_DOWN>;
@@ -591,7 +591,7 @@
 };
 
 &pinctrl_2 {
-       gpv0: gpv0 {
+       gpv0: gpv0-gpio-bank {
                gpio-controller;
                #gpio-cells = <2>;
 
@@ -599,7 +599,7 @@
                #interrupt-cells = <2>;
        };
 
-       gpv1: gpv1 {
+       gpv1: gpv1-gpio-bank {
                gpio-controller;
                #gpio-cells = <2>;
 
@@ -607,7 +607,7 @@
                #interrupt-cells = <2>;
        };
 
-       gpv2: gpv2 {
+       gpv2: gpv2-gpio-bank {
                gpio-controller;
                #gpio-cells = <2>;
 
@@ -615,7 +615,7 @@
                #interrupt-cells = <2>;
        };
 
-       gpv3: gpv3 {
+       gpv3: gpv3-gpio-bank {
                gpio-controller;
                #gpio-cells = <2>;
 
@@ -623,7 +623,7 @@
                #interrupt-cells = <2>;
        };
 
-       gpv4: gpv4 {
+       gpv4: gpv4-gpio-bank {
                gpio-controller;
                #gpio-cells = <2>;
 
@@ -633,7 +633,7 @@
 };
 
 &pinctrl_3 {
-       gpz: gpz {
+       gpz: gpz-gpio-bank {
                gpio-controller;
                #gpio-cells = <2>;
 
@@ -641,7 +641,7 @@
                #interrupt-cells = <2>;
        };
 
-       audi2s0_bus: audi2s0-bus {
+       audi2s0_bus: audi2s0-bus-pins {
                samsung,pins = "gpz-0", "gpz-1", "gpz-2", "gpz-3",
                                "gpz-4";
                samsung,pin-function = <2>;

diff --git a/arch/arm/boot/dts/exynos5410-smdk5410.dts b/arch/arm/boot/dts/exynos5410-smdk5410.dts
index 2a3ade77a2de39cd1bc5b0ce78befc0963d9fe0a..5b2e567809aef0a4fd531aeea5846d70d1938fbe 100644 (file)
--- a/arch/arm/boot/dts/exynos5410-smdk5410.dts
+++ b/arch/arm/boot/dts/exynos5410-smdk5410.dts
@@ -66,14 +66,14 @@
 };
 
 &pinctrl_0 {
-       srom_ctl: srom-ctl {
+       srom_ctl: srom-ctl-pins {
                samsung,pins = "gpy0-3", "gpy0-4", "gpy0-5",
                               "gpy1-0", "gpy1-1", "gpy1-2", "gpy1-3";
                samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
                samsung,pin-drv = <EXYNOS5420_PIN_DRV_LV1>;
        };
 
-       srom_ebi: srom-ebi {
+       srom_ebi: srom-ebi-pins {
                samsung,pins = "gpy3-0", "gpy3-1", "gpy3-2", "gpy3-3",
                               "gpy3-4", "gpy3-5", "gpy3-6", "gpy3-7",
                               "gpy5-0", "gpy5-1", "gpy5-2", "gpy5-3",