ARM: dts: at91: sam9x60: Define pinctrl node with its label

Define the pinctrl nodes with its label to align with the Linux DT.
Without this change the pinmux nodes are grouped under an additional
'pinctrl' child node which is not identified by the pinctrl driver
when the GPIO banks are made as child nodes of pinctrl node.

Signed-off-by: Balamanikandan Gunasundar <balamanikandan.gunasundar@microchip.com>
Signed-off-by: Manikandan Muralidharan <manikandan.m@microchip.com>
Reviewed-by: Eugen Hristev <eugen.hristev@linaro.org>

diff --git a/arch/arm/dts/sam9x60ek.dts b/arch/arm/dts/sam9x60ek.dts
index 74016f5..3bf45c1 100644 (file)
--- a/arch/arm/dts/sam9x60ek.dts
+++ b/arch/arm/dts/sam9x60ek.dts
@@ -78,75 +78,6 @@
                                        };
                                };
                        };
-
-                       pinctrl {
-                               nand {
-                                       pinctrl_nand_oe_we: nand-oe-we-0 {
-                                               atmel,pins =
-                                                       <AT91_PIOD 0 AT91_PERIPH_A (AT91_PINCTRL_NONE | AT91_PINCTRL_SLEWRATE_DIS)
-                                                        AT91_PIOD 1 AT91_PERIPH_A (AT91_PINCTRL_NONE | AT91_PINCTRL_SLEWRATE_DIS)>;
-                                       };
-
-                                       pinctrl_nand_rb: nand-rb-0 {
-                                               atmel,pins =
-                                                       <AT91_PIOD 5 AT91_PERIPH_GPIO AT91_PINCTRL_PULL_UP>;
-                                       };
-
-                                       pinctrl_nand_cs: nand-cs-0 {
-                                               atmel,pins =
-                                                       <AT91_PIOD 4 AT91_PERIPH_GPIO AT91_PINCTRL_PULL_UP>;
-                                       };
-                               };
-
-                               ebi {
-                                       pinctrl_ebi_data_0_7: ebi-data-lsb-0 {
-                                               atmel,pins =
-                                                       <AT91_PIOD 6 AT91_PERIPH_A (AT91_PINCTRL_NONE | AT91_PINCTRL_SLEWRATE_DIS)
-                                                        AT91_PIOD 7 AT91_PERIPH_A (AT91_PINCTRL_NONE | AT91_PINCTRL_SLEWRATE_DIS)
-                                                        AT91_PIOD 8 AT91_PERIPH_A (AT91_PINCTRL_NONE | AT91_PINCTRL_SLEWRATE_DIS)
-                                                        AT91_PIOD 9 AT91_PERIPH_A (AT91_PINCTRL_NONE | AT91_PINCTRL_SLEWRATE_DIS)
-                                                        AT91_PIOD 10 AT91_PERIPH_A (AT91_PINCTRL_NONE | AT91_PINCTRL_SLEWRATE_DIS)
-                                                        AT91_PIOD 11 AT91_PERIPH_A (AT91_PINCTRL_NONE | AT91_PINCTRL_SLEWRATE_DIS)
-                                                        AT91_PIOD 12 AT91_PERIPH_A (AT91_PINCTRL_NONE | AT91_PINCTRL_SLEWRATE_DIS)
-                                                        AT91_PIOD 13 AT91_PERIPH_A (AT91_PINCTRL_NONE | AT91_PINCTRL_SLEWRATE_DIS)>;
-                                       };
-
-                                       pinctrl_ebi_addr_nand: ebi-addr-0 {
-                                               atmel,pins =
-                                                       <AT91_PIOD 2 AT91_PERIPH_A (AT91_PINCTRL_NONE | AT91_PINCTRL_SLEWRATE_DIS)
-                                                        AT91_PIOD 3 AT91_PERIPH_A (AT91_PINCTRL_NONE | AT91_PINCTRL_SLEWRATE_DIS)>;
-                                       };
-                               };
-
-                               pinctrl_qspi: qspi {
-                                       atmel,pins =
-                                               <AT91_PIOB 19 AT91_PERIPH_A AT91_PINCTRL_NONE
-                                                AT91_PIOB 20 AT91_PERIPH_A AT91_PINCTRL_NONE
-                                                AT91_PIOB 21 AT91_PERIPH_A AT91_PINCTRL_PULL_UP
-                                                AT91_PIOB 22 AT91_PERIPH_A AT91_PINCTRL_PULL_UP
-                                                AT91_PIOB 23 AT91_PERIPH_A AT91_PINCTRL_PULL_UP
-                                                AT91_PIOB 24 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>;
-                               };
-
-                               pinctrl_flx0: flx0_default {
-                                       atmel,pins =
-                                               <AT91_PIOA 0 AT91_PERIPH_A AT91_PINCTRL_NONE
-                                                AT91_PIOA 1 AT91_PERIPH_A AT91_PINCTRL_NONE>;
-                               };
-
-                               pinctrl_onewire_tm_default: onewire_tm_default {
-                                       atmel,pins =
-                                               <AT91_PIOD 14 AT91_PERIPH_GPIO AT91_PINCTRL_PULL_UP>;
-                               };
-
-                               usb1 {
-                                       pinctrl_usb_default: usb_default {
-                                               atmel,pins = <AT91_PIOD 15 AT91_PERIPH_GPIO AT91_PINCTRL_NONE
-                                                               AT91_PIOD 16 AT91_PERIPH_GPIO AT91_PINCTRL_NONE>;
-                                       };
-                               };
-
-                       };
                };
        };
 };
@@ -221,6 +152,79 @@
        status = "okay";
 };
 
+&pinctrl {
+       /* shared pinctrl settings */
+       qspi {
+               pinctrl_qspi: qspi {
+                       atmel,pins =
+                               <AT91_PIOB 19 AT91_PERIPH_A AT91_PINCTRL_NONE
+                                AT91_PIOB 20 AT91_PERIPH_A AT91_PINCTRL_NONE
+                                AT91_PIOB 21 AT91_PERIPH_A AT91_PINCTRL_PULL_UP
+                                AT91_PIOB 22 AT91_PERIPH_A AT91_PINCTRL_PULL_UP
+                                AT91_PIOB 23 AT91_PERIPH_A AT91_PINCTRL_PULL_UP
+                                AT91_PIOB 24 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>;
+               };
+       };
+
+       nand {
+               pinctrl_nand_oe_we: nand-oe-we-0 {
+                       atmel,pins =
+                               <AT91_PIOD 0 AT91_PERIPH_A (AT91_PINCTRL_NONE | AT91_PINCTRL_SLEWRATE_DIS)
+                                AT91_PIOD 1 AT91_PERIPH_A (AT91_PINCTRL_NONE | AT91_PINCTRL_SLEWRATE_DIS)>;
+               };
+
+               pinctrl_nand_rb: nand-rb-0 {
+                       atmel,pins =
+                               <AT91_PIOD 5 AT91_PERIPH_GPIO AT91_PINCTRL_PULL_UP>;
+               };
+
+               pinctrl_nand_cs: nand-cs-0 {
+                       atmel,pins =
+                               <AT91_PIOD 4 AT91_PERIPH_GPIO AT91_PINCTRL_PULL_UP>;
+               };
+       };
+
+       ebi {
+               pinctrl_ebi_data_0_7: ebi-data-lsb-0 {
+                       atmel,pins =
+                               <AT91_PIOD 6 AT91_PERIPH_A (AT91_PINCTRL_NONE | AT91_PINCTRL_SLEWRATE_DIS)
+                                AT91_PIOD 7 AT91_PERIPH_A (AT91_PINCTRL_NONE | AT91_PINCTRL_SLEWRATE_DIS)
+                                AT91_PIOD 8 AT91_PERIPH_A (AT91_PINCTRL_NONE | AT91_PINCTRL_SLEWRATE_DIS)
+                                AT91_PIOD 9 AT91_PERIPH_A (AT91_PINCTRL_NONE | AT91_PINCTRL_SLEWRATE_DIS)
+                                AT91_PIOD 10 AT91_PERIPH_A (AT91_PINCTRL_NONE | AT91_PINCTRL_SLEWRATE_DIS)
+                                AT91_PIOD 11 AT91_PERIPH_A (AT91_PINCTRL_NONE | AT91_PINCTRL_SLEWRATE_DIS)
+                                AT91_PIOD 12 AT91_PERIPH_A (AT91_PINCTRL_NONE | AT91_PINCTRL_SLEWRATE_DIS)
+                                AT91_PIOD 13 AT91_PERIPH_A (AT91_PINCTRL_NONE | AT91_PINCTRL_SLEWRATE_DIS)>;
+               };
+
+               pinctrl_ebi_addr_nand: ebi-addr-0 {
+                       atmel,pins =
+                               <AT91_PIOD 2 AT91_PERIPH_A (AT91_PINCTRL_NONE | AT91_PINCTRL_SLEWRATE_DIS)
+                                AT91_PIOD 3 AT91_PERIPH_A (AT91_PINCTRL_NONE | AT91_PINCTRL_SLEWRATE_DIS)>;
+               };
+       };
+
+       flexcom {
+               pinctrl_flx0: flx0_default {
+                       atmel,pins =
+                               <AT91_PIOA 0 AT91_PERIPH_A AT91_PINCTRL_NONE
+                                AT91_PIOA 1 AT91_PERIPH_A AT91_PINCTRL_NONE>;
+               };
+       };
+
+       pinctrl_onewire_tm_default: onewire_tm_default {
+               atmel,pins =
+                       <AT91_PIOD 14 AT91_PERIPH_GPIO AT91_PINCTRL_PULL_UP>;
+       };
+
+       usb1 {
+               pinctrl_usb_default: usb_default {
+                       atmel,pins = <AT91_PIOD 15 AT91_PERIPH_GPIO AT91_PINCTRL_NONE
+                                     AT91_PIOD 16 AT91_PERIPH_GPIO AT91_PINCTRL_NONE>;
+               };
+       };
+};
+
 &usb1 {
        num-ports = <3>;
        atmel,vbus-gpio = <0