ARM: at91: dt: switch to pinctrl to pre-processor
authorJean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Wed, 24 Apr 2013 00:34:25 +0000 (08:34 +0800)
committerNicolas Ferre <nicolas.ferre@atmel.com>
Fri, 17 May 2013 10:11:39 +0000 (12:11 +0200)
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
18 files changed:
arch/arm/boot/dts/at91rm9200.dtsi
arch/arm/boot/dts/at91sam9260.dtsi
arch/arm/boot/dts/at91sam9263.dtsi
arch/arm/boot/dts/at91sam9263ek.dts
arch/arm/boot/dts/at91sam9g20ek_2mmc.dts
arch/arm/boot/dts/at91sam9g20ek_common.dtsi
arch/arm/boot/dts/at91sam9g45.dtsi
arch/arm/boot/dts/at91sam9m10g45ek.dts
arch/arm/boot/dts/at91sam9n12.dtsi
arch/arm/boot/dts/at91sam9n12ek.dts
arch/arm/boot/dts/at91sam9x25.dtsi
arch/arm/boot/dts/at91sam9x5.dtsi
arch/arm/boot/dts/at91sam9x5cm.dtsi
arch/arm/boot/dts/at91sam9x5ek.dtsi
arch/arm/boot/dts/pm9g45.dts
arch/arm/boot/dts/sama5d3.dtsi
arch/arm/boot/dts/sama5d3xdm.dtsi
arch/arm/boot/dts/sama5d3xmb.dtsi

index 7ebfe6c6c360a17cbfa5a254e467997bc362a538..361a957767c4b17c2747ae14949203e27b465698 100644 (file)
@@ -11,6 +11,7 @@
  */
 
 #include "skeleton.dtsi"
+#include <dt-bindings/pinctrl/at91.h>
 #include <dt-bindings/gpio/gpio.h>
 
 / {
                                dbgu {
                                        pinctrl_dbgu: dbgu-0 {
                                                atmel,pins =
-                                                       <0 30 0x1 0x0   /* PA30 periph A */
-                                                        0 31 0x1 0x1>; /* PA31 periph with pullup */
+                                                       <AT91_PIOA 30 AT91_PERIPH_A AT91_PINCTRL_NONE   /* PA30 periph A */
+                                                        AT91_PIOA 31 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>;      /* PA31 periph with pullup */
                                        };
                                };
 
                                uart0 {
                                        pinctrl_uart0: uart0-0 {
                                                atmel,pins =
-                                                       <0 17 0x1 0x0   /* PA17 periph A */
-                                                        0 18 0x1 0x0>; /* PA18 periph A */
+                                                       <AT91_PIOA 17 AT91_PERIPH_A AT91_PINCTRL_NONE   /* PA17 periph A */
+                                                        AT91_PIOA 18 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* PA18 periph A */
                                        };
 
                                        pinctrl_uart0_rts: uart0_rts-0 {
                                                atmel,pins =
-                                                       <0 20 0x1 0x0>; /* PA20 periph A */
+                                                       <AT91_PIOA 20 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* PA20 periph A */
                                        };
 
                                        pinctrl_uart0_cts: uart0_cts-0 {
                                                atmel,pins =
-                                                       <0 21 0x1 0x0>; /* PA21 periph A */
+                                                       <AT91_PIOA 21 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* PA21 periph A */
                                        };
                                };
 
                                uart1 {
                                        pinctrl_uart1: uart1-0 {
                                                atmel,pins =
-                                                       <1 20 0x1 0x1   /* PB20 periph A with pullup */
-                                                        1 21 0x1 0x0>; /* PB21 periph A */
+                                                       <AT91_PIOB 20 AT91_PERIPH_A AT91_PINCTRL_PULL_UP        /* PB20 periph A with pullup */
+                                                        AT91_PIOB 21 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* PB21 periph A */
                                        };
 
                                        pinctrl_uart1_rts: uart1_rts-0 {
                                                atmel,pins =
-                                                       <1 24 0x1 0x0>; /* PB24 periph A */
+                                                       <AT91_PIOB 24 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* PB24 periph A */
                                        };
 
                                        pinctrl_uart1_cts: uart1_cts-0 {
                                                atmel,pins =
-                                                       <1 26 0x1 0x0>; /* PB26 periph A */
+                                                       <AT91_PIOB 26 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* PB26 periph A */
                                        };
 
                                        pinctrl_uart1_dtr_dsr: uart1_dtr_dsr-0 {
                                                atmel,pins =
-                                                       <1 19 0x1 0x0   /* PB19 periph A */
-                                                        1 25 0x1 0x0>; /* PB25 periph A */
+                                                       <AT91_PIOB 19 AT91_PERIPH_A AT91_PINCTRL_NONE   /* PB19 periph A */
+                                                        AT91_PIOB 25 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* PB25 periph A */
                                        };
 
                                        pinctrl_uart1_dcd: uart1_dcd-0 {
                                                atmel,pins =
-                                                       <1 23 0x1 0x0>; /* PB23 periph A */
+                                                       <AT91_PIOB 23 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* PB23 periph A */
                                        };
 
                                        pinctrl_uart1_ri: uart1_ri-0 {
                                                atmel,pins =
-                                                       <1 18 0x1 0x0>; /* PB18 periph A */
+                                                       <AT91_PIOB 18 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* PB18 periph A */
                                        };
                                };
 
                                uart2 {
                                        pinctrl_uart2: uart2-0 {
                                                atmel,pins =
-                                                       <0 22 0x1 0x0   /* PA22 periph A */
-                                                        0 23 0x1 0x1>; /* PA23 periph A with pullup */
+                                                       <AT91_PIOA 22 AT91_PERIPH_A AT91_PINCTRL_NONE   /* PA22 periph A */
+                                                        AT91_PIOA 23 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>;      /* PA23 periph A with pullup */
                                        };
 
                                        pinctrl_uart2_rts: uart2_rts-0 {
                                                atmel,pins =
-                                                       <0 30 0x2 0x0>; /* PA30 periph B */
+                                                       <AT91_PIOA 30 AT91_PERIPH_B AT91_PINCTRL_NONE>; /* PA30 periph B */
                                        };
 
                                        pinctrl_uart2_cts: uart2_cts-0 {
                                                atmel,pins =
-                                                       <0 31 0x2 0x0>; /* PA31 periph B */
+                                                       <AT91_PIOA 31 AT91_PERIPH_B AT91_PINCTRL_NONE>; /* PA31 periph B */
                                        };
                                };
 
                                uart3 {
                                        pinctrl_uart3: uart3-0 {
                                                atmel,pins =
-                                                       <0 5 0x2 0x1    /* PA5 periph B with pullup */
-                                                        0 6 0x2 0x0>;  /* PA6 periph B */
+                                                       <AT91_PIOA 5 AT91_PERIPH_B AT91_PINCTRL_PULL_UP /* PA5 periph B with pullup */
+                                                        AT91_PIOA 6 AT91_PERIPH_B AT91_PINCTRL_NONE>;  /* PA6 periph B */
                                        };
 
                                        pinctrl_uart3_rts: uart3_rts-0 {
                                                atmel,pins =
-                                                       <1 0 0x2 0x0>;  /* PB0 periph B */
+                                                       <AT91_PIOB 0 AT91_PERIPH_B AT91_PINCTRL_NONE>;  /* PB0 periph B */
                                        };
 
                                        pinctrl_uart3_cts: uart3_cts-0 {
                                                atmel,pins =
-                                                       <1 1 0x2 0x0>;  /* PB1 periph B */
+                                                       <AT91_PIOB 1 AT91_PERIPH_B AT91_PINCTRL_NONE>;  /* PB1 periph B */
                                        };
                                };
 
                                nand {
                                        pinctrl_nand: nand-0 {
                                                atmel,pins =
-                                                       <2 2 0x0 0x1    /* PC2 gpio RDY pin pull_up */
-                                                        1 1 0x0 0x1>;  /* PB1 gpio CD pin pull_up */
+                                                       <AT91_PIOC 2 AT91_PERIPH_GPIO AT91_PINCTRL_PULL_UP      /* PC2 gpio RDY pin pull_up */
+                                                        AT91_PIOB 1 AT91_PERIPH_GPIO AT91_PINCTRL_PULL_UP>;    /* PB1 gpio CD pin pull_up */
                                        };
                                };
 
                                macb {
                                        pinctrl_macb_rmii: macb_rmii-0 {
                                                atmel,pins =
-                                                       <0 7 0x1 0x0    /* PA7 periph A */
-                                                        0 8 0x1 0x0    /* PA8 periph A */
-                                                        0 9 0x1 0x0    /* PA9 periph A */
-                                                        0 10 0x1 0x0   /* PA10 periph A */
-                                                        0 11 0x1 0x0   /* PA11 periph A */
-                                                        0 12 0x1 0x0   /* PA12 periph A */
-                                                        0 13 0x1 0x0   /* PA13 periph A */
-                                                        0 14 0x1 0x0   /* PA14 periph A */
-                                                        0 15 0x1 0x0   /* PA15 periph A */
-                                                        0 16 0x1 0x0>; /* PA16 periph A */
+                                                       <AT91_PIOA 7 AT91_PERIPH_A AT91_PINCTRL_NONE    /* PA7 periph A */
+                                                        AT91_PIOA 8 AT91_PERIPH_A AT91_PINCTRL_NONE    /* PA8 periph A */
+                                                        AT91_PIOA 9 AT91_PERIPH_A AT91_PINCTRL_NONE    /* PA9 periph A */
+                                                        AT91_PIOA 10 AT91_PERIPH_A AT91_PINCTRL_NONE   /* PA10 periph A */
+                                                        AT91_PIOA 11 AT91_PERIPH_A AT91_PINCTRL_NONE   /* PA11 periph A */
+                                                        AT91_PIOA 12 AT91_PERIPH_A AT91_PINCTRL_NONE   /* PA12 periph A */
+                                                        AT91_PIOA 13 AT91_PERIPH_A AT91_PINCTRL_NONE   /* PA13 periph A */
+                                                        AT91_PIOA 14 AT91_PERIPH_A AT91_PINCTRL_NONE   /* PA14 periph A */
+                                                        AT91_PIOA 15 AT91_PERIPH_A AT91_PINCTRL_NONE   /* PA15 periph A */
+                                                        AT91_PIOA 16 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* PA16 periph A */
                                        };
 
                                        pinctrl_macb_rmii_mii: macb_rmii_mii-0 {
                                                atmel,pins =
-                                                       <1 12 0x2 0x0   /* PB12 periph B */
-                                                        1 13 0x2 0x0   /* PB13 periph B */
-                                                        1 14 0x2 0x0   /* PB14 periph B */
-                                                        1 15 0x2 0x0   /* PB15 periph B */
-                                                        1 16 0x2 0x0   /* PB16 periph B */
-                                                        1 17 0x2 0x0   /* PB17 periph B */
-                                                        1 18 0x2 0x0   /* PB18 periph B */
-                                                        1 19 0x2 0x0>; /* PB19 periph B */
+                                                       <AT91_PIOB 12 AT91_PERIPH_B AT91_PINCTRL_NONE   /* PB12 periph B */
+                                                        AT91_PIOB 13 AT91_PERIPH_B AT91_PINCTRL_NONE   /* PB13 periph B */
+                                                        AT91_PIOB 14 AT91_PERIPH_B AT91_PINCTRL_NONE   /* PB14 periph B */
+                                                        AT91_PIOB 15 AT91_PERIPH_B AT91_PINCTRL_NONE   /* PB15 periph B */
+                                                        AT91_PIOB 16 AT91_PERIPH_B AT91_PINCTRL_NONE   /* PB16 periph B */
+                                                        AT91_PIOB 17 AT91_PERIPH_B AT91_PINCTRL_NONE   /* PB17 periph B */
+                                                        AT91_PIOB 18 AT91_PERIPH_B AT91_PINCTRL_NONE   /* PB18 periph B */
+                                                        AT91_PIOB 19 AT91_PERIPH_B AT91_PINCTRL_NONE>; /* PB19 periph B */
                                        };
                                };
 
                                mmc0 {
                                        pinctrl_mmc0_clk: mmc0_clk-0 {
                                                atmel,pins =
-                                                       <0 27 0x1 0x0>; /* PA27 periph A */
+                                                       <AT91_PIOA 27 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* PA27 periph A */
                                        };
 
                                        pinctrl_mmc0_slot0_cmd_dat0: mmc0_slot0_cmd_dat0-0 {
                                                atmel,pins =
-                                                       <0 28 0x1 0x1   /* PA28 periph A with pullup */
-                                                        0 29 0x1 0x1>; /* PA29 periph A with pullup */
+                                                       <AT91_PIOA 28 AT91_PERIPH_A AT91_PINCTRL_PULL_UP        /* PA28 periph A with pullup */
+                                                        AT91_PIOA 29 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>;      /* PA29 periph A with pullup */
                                        };
 
                                        pinctrl_mmc0_slot0_dat1_3: mmc0_slot0_dat1_3-0 {
                                                atmel,pins =
-                                                       <1 3 0x2 0x1    /* PB3 periph B with pullup */
-                                                        1 4 0x2 0x1    /* PB4 periph B with pullup */
-                                                        1 5 0x2 0x1>;  /* PB5 periph B with pullup */
+                                                       <AT91_PIOB 3 AT91_PERIPH_B AT91_PINCTRL_PULL_UP /* PB3 periph B with pullup */
+                                                        AT91_PIOB 4 AT91_PERIPH_B AT91_PINCTRL_PULL_UP /* PB4 periph B with pullup */
+                                                        AT91_PIOB 5 AT91_PERIPH_B AT91_PINCTRL_PULL_UP>;       /* PB5 periph B with pullup */
                                        };
 
                                        pinctrl_mmc0_slot1_cmd_dat0: mmc0_slot1_cmd_dat0-0 {
                                                atmel,pins =
-                                                       <0 8 0x2 0x1    /* PA8 periph B with pullup */
-                                                        0 9 0x2 0x1>;  /* PA9 periph B with pullup */
+                                                       <AT91_PIOA 8 AT91_PERIPH_B AT91_PINCTRL_PULL_UP /* PA8 periph B with pullup */
+                                                        AT91_PIOA 9 AT91_PERIPH_B AT91_PINCTRL_PULL_UP>;       /* PA9 periph B with pullup */
                                        };
 
                                        pinctrl_mmc0_slot1_dat1_3: mmc0_slot1_dat1_3-0 {
                                                atmel,pins =
-                                                       <0 10 0x2 0x1   /* PA10 periph B with pullup */
-                                                        0 11 0x2 0x1   /* PA11 periph B with pullup */
-                                                        0 12 0x2 0x1>; /* PA12 periph B with pullup */
+                                                       <AT91_PIOA 10 AT91_PERIPH_B AT91_PINCTRL_PULL_UP        /* PA10 periph B with pullup */
+                                                        AT91_PIOA 11 AT91_PERIPH_B AT91_PINCTRL_PULL_UP        /* PA11 periph B with pullup */
+                                                        AT91_PIOA 12 AT91_PERIPH_B AT91_PINCTRL_PULL_UP>;      /* PA12 periph B with pullup */
                                        };
                                };
 
                                ssc0 {
                                        pinctrl_ssc0_tx: ssc0_tx-0 {
                                                atmel,pins =
-                                                       <1 0 0x1 0x0    /* PB0 periph A */
-                                                        1 1 0x1 0x0    /* PB1 periph A */
-                                                        1 2 0x1 0x0>;  /* PB2 periph A */
+                                                       <AT91_PIOB 0 AT91_PERIPH_A AT91_PINCTRL_NONE    /* PB0 periph A */
+                                                        AT91_PIOB 1 AT91_PERIPH_A AT91_PINCTRL_NONE    /* PB1 periph A */
+                                                        AT91_PIOB 2 AT91_PERIPH_A AT91_PINCTRL_NONE>;  /* PB2 periph A */
                                        };
 
                                        pinctrl_ssc0_rx: ssc0_rx-0 {
                                                atmel,pins =
-                                                       <1 3 0x1 0x0    /* PB3 periph A */
-                                                        1 4 0x1 0x0    /* PB4 periph A */
-                                                        1 5 0x1 0x0>;  /* PB5 periph A */
+                                                       <AT91_PIOB 3 AT91_PERIPH_A AT91_PINCTRL_NONE    /* PB3 periph A */
+                                                        AT91_PIOB 4 AT91_PERIPH_A AT91_PINCTRL_NONE    /* PB4 periph A */
+                                                        AT91_PIOB 5 AT91_PERIPH_A AT91_PINCTRL_NONE>;  /* PB5 periph A */
                                        };
                                };
 
                                ssc1 {
                                        pinctrl_ssc1_tx: ssc1_tx-0 {
                                                atmel,pins =
-                                                       <1 6 0x1 0x0    /* PB6 periph A */
-                                                        1 7 0x1 0x0    /* PB7 periph A */
-                                                        1 8 0x1 0x0>;  /* PB8 periph A */
+                                                       <AT91_PIOB 6 AT91_PERIPH_A AT91_PINCTRL_NONE    /* PB6 periph A */
+                                                        AT91_PIOB 7 AT91_PERIPH_A AT91_PINCTRL_NONE    /* PB7 periph A */
+                                                        AT91_PIOB 8 AT91_PERIPH_A AT91_PINCTRL_NONE>;  /* PB8 periph A */
                                        };
 
                                        pinctrl_ssc1_rx: ssc1_rx-0 {
                                                atmel,pins =
-                                                       <1 9 0x1 0x0    /* PB9 periph A */
-                                                        1 10 0x1 0x0   /* PB10 periph A */
-                                                        1 11 0x1 0x0>; /* PB11 periph A */
+                                                       <AT91_PIOB 9 AT91_PERIPH_A AT91_PINCTRL_NONE    /* PB9 periph A */
+                                                        AT91_PIOB 10 AT91_PERIPH_A AT91_PINCTRL_NONE   /* PB10 periph A */
+                                                        AT91_PIOB 11 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* PB11 periph A */
                                        };
                                };
 
                                ssc2 {
                                        pinctrl_ssc2_tx: ssc2_tx-0 {
                                                atmel,pins =
-                                                       <1 12 0x1 0x0   /* PB12 periph A */
-                                                        1 13 0x1 0x0   /* PB13 periph A */
-                                                        1 14 0x1 0x0>; /* PB14 periph A */
+                                                       <AT91_PIOB 12 AT91_PERIPH_A AT91_PINCTRL_NONE   /* PB12 periph A */
+                                                        AT91_PIOB 13 AT91_PERIPH_A AT91_PINCTRL_NONE   /* PB13 periph A */
+                                                        AT91_PIOB 14 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* PB14 periph A */
                                        };
 
                                        pinctrl_ssc2_rx: ssc2_rx-0 {
                                                atmel,pins =
-                                                       <1 15 0x1 0x0   /* PB15 periph A */
-                                                        1 16 0x1 0x0   /* PB16 periph A */
-                                                        1 17 0x1 0x0>; /* PB17 periph A */
+                                                       <AT91_PIOB 15 AT91_PERIPH_A AT91_PINCTRL_NONE   /* PB15 periph A */
+                                                        AT91_PIOB 16 AT91_PERIPH_A AT91_PINCTRL_NONE   /* PB16 periph A */
+                                                        AT91_PIOB 17 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* PB17 periph A */
                                        };
                                };
 
                                twi {
                                        pinctrl_twi: twi-0 {
                                                atmel,pins =
-                                                       <0 25 0x1 0x2   /* PA25 periph A with multi drive */
-                                                        0 26 0x1 0x2>; /* PA26 periph A with multi drive */
+                                                       <AT91_PIOA 25 AT91_PERIPH_A AT91_PINCTRL_MULTI_DRIVE    /* PA25 periph A with multi drive */
+                                                        AT91_PIOA 26 AT91_PERIPH_A AT91_PINCTRL_MULTI_DRIVE>;  /* PA26 periph A with multi drive */
                                        };
 
                                        pinctrl_twi_gpio: twi_gpio-0 {
                                                atmel,pins =
-                                                       <0 25 0x0 0x2   /* PA25 GPIO with multi drive */
-                                                        0 26 0x0 0x2>; /* PA26 GPIO with multi drive */
+                                                       <AT91_PIOA 25 AT91_PERIPH_GPIO AT91_PINCTRL_MULTI_DRIVE /* PA25 GPIO with multi drive */
+                                                        AT91_PIOA 26 AT91_PERIPH_GPIO AT91_PINCTRL_MULTI_DRIVE>;       /* PA26 GPIO with multi drive */
                                        };
                                };
 
index 717625d003efe9fdc0e83f2bdf62ab88001b52dc..7edadf348915bacf912e8ade27e4b872ba95a405 100644 (file)
@@ -9,6 +9,7 @@
  */
 
 #include "skeleton.dtsi"
+#include <dt-bindings/pinctrl/at91.h>
 #include <dt-bindings/gpio/gpio.h>
 
 / {
                                dbgu {
                                        pinctrl_dbgu: dbgu-0 {
                                                atmel,pins =
-                                                       <1 14 0x1 0x0   /* PB14 periph A */
-                                                        1 15 0x1 0x1>; /* PB15 periph with pullup */
+                                                       <AT91_PIOB 14 AT91_PERIPH_A AT91_PINCTRL_NONE   /* PB14 periph A */
+                                                        AT91_PIOB 15 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>;      /* PB15 periph with pullup */
                                        };
                                };
 
                                usart0 {
                                        pinctrl_usart0: usart0-0 {
                                                atmel,pins =
-                                                       <1 4 0x1 0x0    /* PB4 periph A */
-                                                        1 5 0x1 0x0>;  /* PB5 periph A */
+                                                       <AT91_PIOB 4 AT91_PERIPH_A AT91_PINCTRL_NONE    /* PB4 periph A */
+                                                        AT91_PIOB 5 AT91_PERIPH_A AT91_PINCTRL_NONE>;  /* PB5 periph A */
                                        };
 
                                        pinctrl_usart0_rts: usart0_rts-0 {
                                                atmel,pins =
-                                                       <1 26 0x1 0x0>; /* PB26 periph A */
+                                                       <AT91_PIOB 26 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* PB26 periph A */
                                        };
 
                                        pinctrl_usart0_cts: usart0_cts-0 {
                                                atmel,pins =
-                                                       <1 27 0x1 0x0>; /* PB27 periph A */
+                                                       <AT91_PIOB 27 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* PB27 periph A */
                                        };
 
                                        pinctrl_usart0_dtr_dsr: usart0_dtr_dsr-0 {
                                                atmel,pins =
-                                                       <1 24 0x1 0x0   /* PB24 periph A */
-                                                        1 22 0x1 0x0>; /* PB22 periph A */
+                                                       <AT91_PIOB 24 AT91_PERIPH_A AT91_PINCTRL_NONE   /* PB24 periph A */
+                                                        AT91_PIOB 22 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* PB22 periph A */
                                        };
 
                                        pinctrl_usart0_dcd: usart0_dcd-0 {
                                                atmel,pins =
-                                                       <1 23 0x1 0x0>; /* PB23 periph A */
+                                                       <AT91_PIOB 23 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* PB23 periph A */
                                        };
 
                                        pinctrl_usart0_ri: usart0_ri-0 {
                                                atmel,pins =
-                                                       <1 25 0x1 0x0>; /* PB25 periph A */
+                                                       <AT91_PIOB 25 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* PB25 periph A */
                                        };
                                };
 
                                usart1 {
                                        pinctrl_usart1: usart1-0 {
                                                atmel,pins =
-                                                       <1 6 0x1 0x1    /* PB6 periph A with pullup */
-                                                        1 7 0x1 0x0>;  /* PB7 periph A */
+                                                       <AT91_PIOB 6 AT91_PERIPH_A AT91_PINCTRL_PULL_UP /* PB6 periph A with pullup */
+                                                        AT91_PIOB 7 AT91_PERIPH_A AT91_PINCTRL_NONE>;  /* PB7 periph A */
                                        };
 
                                        pinctrl_usart1_rts: usart1_rts-0 {
                                                atmel,pins =
-                                                       <1 28 0x1 0x0>; /* PB28 periph A */
+                                                       <AT91_PIOB 28 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* PB28 periph A */
                                        };
 
                                        pinctrl_usart1_cts: usart1_cts-0 {
                                                atmel,pins =
-                                                       <1 29 0x1 0x0>; /* PB29 periph A */
+                                                       <AT91_PIOB 29 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* PB29 periph A */
                                        };
                                };
 
                                usart2 {
                                        pinctrl_usart2: usart2-0 {
                                                atmel,pins =
-                                                       <1 8 0x1 0x1    /* PB8 periph A with pullup */
-                                                        1 9 0x1 0x0>;  /* PB9 periph A */
+                                                       <AT91_PIOB 8 AT91_PERIPH_A AT91_PINCTRL_PULL_UP /* PB8 periph A with pullup */
+                                                        AT91_PIOB 9 AT91_PERIPH_A AT91_PINCTRL_NONE>;  /* PB9 periph A */
                                        };
 
                                        pinctrl_usart2_rts: usart2_rts-0 {
                                                atmel,pins =
-                                                       <0 4 0x1 0x0>;  /* PA4 periph A */
+                                                       <AT91_PIOA 4 AT91_PERIPH_A AT91_PINCTRL_NONE>;  /* PA4 periph A */
                                        };
 
                                        pinctrl_usart2_cts: usart2_cts-0 {
                                                atmel,pins =
-                                                       <0 5 0x1 0x0>;  /* PA5 periph A */
+                                                       <AT91_PIOA 5 AT91_PERIPH_A AT91_PINCTRL_NONE>;  /* PA5 periph A */
                                        };
                                };
 
                                usart3 {
                                        pinctrl_usart3: usart3-0 {
                                                atmel,pins =
-                                                       <1 10 0x1 0x1   /* PB10 periph A with pullup */
-                                                        1 11 0x1 0x0>; /* PB11 periph A */
+                                                       <AT91_PIOB 10 AT91_PERIPH_A AT91_PINCTRL_PULL_UP        /* PB10 periph A with pullup */
+                                                        AT91_PIOB 11 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* PB11 periph A */
                                        };
 
                                        pinctrl_usart3_rts: usart3_rts-0 {
                                                atmel,pins =
-                                                       <2 8 0x2 0x0>;  /* PC8 periph B */
+                                                       <AT91_PIOB 8 AT91_PERIPH_B AT91_PINCTRL_NONE>;  /* PC8 periph B */
                                        };
 
                                        pinctrl_usart3_cts: usart3_cts-0 {
                                                atmel,pins =
-                                                       <2 10 0x2 0x0>; /* PC10 periph B */
+                                                       <AT91_PIOB 10 AT91_PERIPH_B AT91_PINCTRL_NONE>; /* PC10 periph B */
                                        };
                                };
 
                                uart0 {
                                        pinctrl_uart0: uart0-0 {
                                                atmel,pins =
-                                                       <0 31 0x2 0x1   /* PA31 periph B with pullup */
-                                                        0 30 0x2 0x0>; /* PA30 periph B */
+                                                       <AT91_PIOA 31 AT91_PERIPH_B AT91_PINCTRL_PULL_UP        /* PA31 periph B with pullup */
+                                                        AT91_PIOA 30 AT91_PERIPH_B AT91_PINCTRL_NONE>; /* PA30 periph B */
                                        };
                                };
 
                                uart1 {
                                        pinctrl_uart1: uart1-0 {
                                                atmel,pins =
-                                                       <1 12 0x1 0x1   /* PB12 periph A with pullup */
-                                                        1 13 0x1 0x0>; /* PB13 periph A */
+                                                       <AT91_PIOB 12 AT91_PERIPH_A AT91_PINCTRL_PULL_UP        /* PB12 periph A with pullup */
+                                                        AT91_PIOB 13 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* PB13 periph A */
                                        };
                                };
 
                                nand {
                                        pinctrl_nand: nand-0 {
                                                atmel,pins =
-                                                       <2 13 0x0 0x1   /* PC13 gpio RDY pin pull_up */
-                                                        2 14 0x0 0x1>; /* PC14 gpio enable pin pull_up */
+                                                       <AT91_PIOC 13 AT91_PERIPH_GPIO AT91_PINCTRL_PULL_UP     /* PC13 gpio RDY pin pull_up */
+                                                        AT91_PIOC 14 AT91_PERIPH_GPIO AT91_PINCTRL_PULL_UP>;   /* PC14 gpio enable pin pull_up */
                                        };
                                };
 
                                macb {
                                        pinctrl_macb_rmii: macb_rmii-0 {
                                                atmel,pins =
-                                                       <0 12 0x1 0x0   /* PA12 periph A */
-                                                        0 13 0x1 0x0   /* PA13 periph A */
-                                                        0 14 0x1 0x0   /* PA14 periph A */
-                                                        0 15 0x1 0x0   /* PA15 periph A */
-                                                        0 16 0x1 0x0   /* PA16 periph A */
-                                                        0 17 0x1 0x0   /* PA17 periph A */
-                                                        0 18 0x1 0x0   /* PA18 periph A */
-                                                        0 19 0x1 0x0   /* PA19 periph A */
-                                                        0 20 0x1 0x0   /* PA20 periph A */
-                                                        0 21 0x1 0x0>; /* PA21 periph A */
+                                                       <AT91_PIOA 12 AT91_PERIPH_A AT91_PINCTRL_NONE   /* PA12 periph A */
+                                                        AT91_PIOA 13 AT91_PERIPH_A AT91_PINCTRL_NONE   /* PA13 periph A */
+                                                        AT91_PIOA 14 AT91_PERIPH_A AT91_PINCTRL_NONE   /* PA14 periph A */
+                                                        AT91_PIOA 15 AT91_PERIPH_A AT91_PINCTRL_NONE   /* PA15 periph A */
+                                                        AT91_PIOA 16 AT91_PERIPH_A AT91_PINCTRL_NONE   /* PA16 periph A */
+                                                        AT91_PIOA 17 AT91_PERIPH_A AT91_PINCTRL_NONE   /* PA17 periph A */
+                                                        AT91_PIOA 18 AT91_PERIPH_A AT91_PINCTRL_NONE   /* PA18 periph A */
+                                                        AT91_PIOA 19 AT91_PERIPH_A AT91_PINCTRL_NONE   /* PA19 periph A */
+                                                        AT91_PIOA 20 AT91_PERIPH_A AT91_PINCTRL_NONE   /* PA20 periph A */
+                                                        AT91_PIOA 21 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* PA21 periph A */
                                        };
 
                                        pinctrl_macb_rmii_mii: macb_rmii_mii-0 {
                                                atmel,pins =
-                                                       <0 22 0x2 0x0   /* PA22 periph B */
-                                                        0 23 0x2 0x0   /* PA23 periph B */
-                                                        0 24 0x2 0x0   /* PA24 periph B */
-                                                        0 25 0x2 0x0   /* PA25 periph B */
-                                                        0 26 0x2 0x0   /* PA26 periph B */
-                                                        0 27 0x2 0x0   /* PA27 periph B */
-                                                        0 28 0x2 0x0   /* PA28 periph B */
-                                                        0 29 0x2 0x0>; /* PA29 periph B */
+                                                       <AT91_PIOA 22 AT91_PERIPH_B AT91_PINCTRL_NONE   /* PA22 periph B */
+                                                        AT91_PIOA 23 AT91_PERIPH_B AT91_PINCTRL_NONE   /* PA23 periph B */
+                                                        AT91_PIOA 24 AT91_PERIPH_B AT91_PINCTRL_NONE   /* PA24 periph B */
+                                                        AT91_PIOA 25 AT91_PERIPH_B AT91_PINCTRL_NONE   /* PA25 periph B */
+                                                        AT91_PIOA 26 AT91_PERIPH_B AT91_PINCTRL_NONE   /* PA26 periph B */
+                                                        AT91_PIOA 27 AT91_PERIPH_B AT91_PINCTRL_NONE   /* PA27 periph B */
+                                                        AT91_PIOA 28 AT91_PERIPH_B AT91_PINCTRL_NONE   /* PA28 periph B */
+                                                        AT91_PIOA 29 AT91_PERIPH_B AT91_PINCTRL_NONE>; /* PA29 periph B */
                                        };
 
                                        pinctrl_macb_rmii_mii_alt: macb_rmii_mii-1 {
                                                atmel,pins =
-                                                       <0 10 0x2 0x0   /* PA10 periph B */
-                                                        0 11 0x2 0x0   /* PA11 periph B */
-                                                        0 24 0x2 0x0   /* PA24 periph B */
-                                                        0 25 0x2 0x0   /* PA25 periph B */
-                                                        0 26 0x2 0x0   /* PA26 periph B */
-                                                        0 27 0x2 0x0   /* PA27 periph B */
-                                                        0 28 0x2 0x0   /* PA28 periph B */
-                                                        0 29 0x2 0x0>; /* PA29 periph B */
+                                                       <AT91_PIOA 10 AT91_PERIPH_B AT91_PINCTRL_NONE   /* PA10 periph B */
+                                                        AT91_PIOA 11 AT91_PERIPH_B AT91_PINCTRL_NONE   /* PA11 periph B */
+                                                        AT91_PIOA 24 AT91_PERIPH_B AT91_PINCTRL_NONE   /* PA24 periph B */
+                                                        AT91_PIOA 25 AT91_PERIPH_B AT91_PINCTRL_NONE   /* PA25 periph B */
+                                                        AT91_PIOA 26 AT91_PERIPH_B AT91_PINCTRL_NONE   /* PA26 periph B */
+                                                        AT91_PIOA 27 AT91_PERIPH_B AT91_PINCTRL_NONE   /* PA27 periph B */
+                                                        AT91_PIOA 28 AT91_PERIPH_B AT91_PINCTRL_NONE   /* PA28 periph B */
+                                                        AT91_PIOA 29 AT91_PERIPH_B AT91_PINCTRL_NONE>; /* PA29 periph B */
                                        };
                                };
 
                                mmc0 {
                                        pinctrl_mmc0_clk: mmc0_clk-0 {
                                                atmel,pins =
-                                                       <0 8 0x1 0x0>;  /* PA8 periph A */
+                                                       <AT91_PIOA 8 AT91_PERIPH_A AT91_PINCTRL_NONE>;  /* PA8 periph A */
                                        };
 
                                        pinctrl_mmc0_slot0_cmd_dat0: mmc0_slot0_cmd_dat0-0 {
                                                atmel,pins =
-                                                       <0 7 0x1 0x1    /* PA7 periph A with pullup */
-                                                        0 6 0x1 0x1>;  /* PA6 periph A with pullup */
+                                                       <AT91_PIOA 7 AT91_PERIPH_A AT91_PINCTRL_PULL_UP /* PA7 periph A with pullup */
+                                                        AT91_PIOA 6 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>;       /* PA6 periph A with pullup */
                                        };
 
                                        pinctrl_mmc0_slot0_dat1_3: mmc0_slot0_dat1_3-0 {
                                                atmel,pins =
-                                                       <0 9 0x1 0x1    /* PA9 periph A with pullup */
-                                                        0 10 0x1 0x1   /* PA10 periph A with pullup */
-                                                        0 11 0x1 0x1>; /* PA11 periph A with pullup */
+                                                       <AT91_PIOA 9 AT91_PERIPH_A AT91_PINCTRL_PULL_UP /* PA9 periph A with pullup */
+                                                        AT91_PIOA 10 AT91_PERIPH_A AT91_PINCTRL_PULL_UP        /* PA10 periph A with pullup */
+                                                        AT91_PIOA 11 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>;      /* PA11 periph A with pullup */
                                        };
 
                                        pinctrl_mmc0_slot1_cmd_dat0: mmc0_slot1_cmd_dat0-0 {
                                                atmel,pins =
-                                                       <0 1 0x2 0x1    /* PA1 periph B with pullup */
-                                                        0 0 0x2 0x1>;  /* PA0 periph B with pullup */
+                                                       <AT91_PIOA 1 AT91_PERIPH_B AT91_PINCTRL_PULL_UP /* PA1 periph B with pullup */
+                                                        AT91_PIOA 0 AT91_PERIPH_B AT91_PINCTRL_PULL_UP>;       /* PA0 periph B with pullup */
                                        };
 
                                        pinctrl_mmc0_slot1_dat1_3: mmc0_slot1_dat1_3-0 {
                                                atmel,pins =
-                                                       <0 5 0x2 0x1    /* PA5 periph B with pullup */
-                                                        0 4 0x2 0x1    /* PA4 periph B with pullup */
-                                                        0 3 0x2 0x1>;  /* PA3 periph B with pullup */
+                                                       <AT91_PIOA 5 AT91_PERIPH_B AT91_PINCTRL_PULL_UP /* PA5 periph B with pullup */
+                                                        AT91_PIOA 4 AT91_PERIPH_B AT91_PINCTRL_PULL_UP /* PA4 periph B with pullup */
+                                                        AT91_PIOA 3 AT91_PERIPH_B AT91_PINCTRL_PULL_UP>;       /* PA3 periph B with pullup */
                                        };
                                };
 
                                ssc0 {
                                        pinctrl_ssc0_tx: ssc0_tx-0 {
                                                atmel,pins =
-                                                       <1 16 0x1 0x0   /* PB16 periph A */
-                                                        1 17 0x1 0x0   /* PB17 periph A */
-                                                        1 18 0x1 0x0>; /* PB18 periph A */
+                                                       <AT91_PIOB 16 AT91_PERIPH_A AT91_PINCTRL_NONE   /* PB16 periph A */
+                                                        AT91_PIOB 17 AT91_PERIPH_A AT91_PINCTRL_NONE   /* PB17 periph A */
+                                                        AT91_PIOB 18 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* PB18 periph A */
                                        };
 
                                        pinctrl_ssc0_rx: ssc0_rx-0 {
                                                atmel,pins =
-                                                       <1 19 0x1 0x0   /* PB19 periph A */
-                                                        1 20 0x1 0x0   /* PB20 periph A */
-                                                        1 21 0x1 0x0>; /* PB21 periph A */
+                                                       <AT91_PIOB 19 AT91_PERIPH_A AT91_PINCTRL_NONE   /* PB19 periph A */
+                                                        AT91_PIOB 20 AT91_PERIPH_A AT91_PINCTRL_NONE   /* PB20 periph A */
+                                                        AT91_PIOB 21 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* PB21 periph A */
                                        };
                                };
 
                                spi0 {
                                        pinctrl_spi0: spi0-0 {
                                                atmel,pins =
-                                                       <0 0 0x1 0x0    /* PA0 periph A SPI0_MISO pin */
-                                                        0 1 0x1 0x0    /* PA1 periph A SPI0_MOSI pin */
-                                                        0 2 0x1 0x0>;  /* PA2 periph A SPI0_SPCK pin */
+                                                       <AT91_PIOA 0 AT91_PERIPH_A AT91_PINCTRL_NONE    /* PA0 periph A SPI0_MISO pin */
+                                                        AT91_PIOA 1 AT91_PERIPH_A AT91_PINCTRL_NONE    /* PA1 periph A SPI0_MOSI pin */
+                                                        AT91_PIOA 2 AT91_PERIPH_A AT91_PINCTRL_NONE>;  /* PA2 periph A SPI0_SPCK pin */
                                        };
                                };
 
                                spi1 {
                                        pinctrl_spi1: spi1-0 {
                                                atmel,pins =
-                                                       <1 0 0x1 0x0    /* PB0 periph A SPI1_MISO pin */
-                                                        1 1 0x1 0x0    /* PB1 periph A SPI1_MOSI pin */
-                                                        1 2 0x1 0x0>;  /* PB2 periph A SPI1_SPCK pin */
+                                                       <AT91_PIOB 0 AT91_PERIPH_A AT91_PINCTRL_NONE    /* PB0 periph A SPI1_MISO pin */
+                                                        AT91_PIOB 1 AT91_PERIPH_A AT91_PINCTRL_NONE    /* PB1 periph A SPI1_MOSI pin */
+                                                        AT91_PIOB 2 AT91_PERIPH_A AT91_PINCTRL_NONE>;  /* PB2 periph A SPI1_SPCK pin */
                                        };
                                };
 
index 5edfadf2048266800e6ec16ca49a1edd2d04660e..bb4d7ca24b93f8aac61a49befc630f60af2d7e88 100644 (file)
@@ -7,6 +7,7 @@
  */
 
 #include "skeleton.dtsi"
+#include <dt-bindings/pinctrl/at91.h>
 #include <dt-bindings/gpio/gpio.h>
 
 / {
                                dbgu {
                                        pinctrl_dbgu: dbgu-0 {
                                                atmel,pins =
-                                                       <2 30 0x1 0x0   /* PC30 periph A */
-                                                        2 31 0x1 0x1>; /* PC31 periph with pullup */
+                                                       <AT91_PIOC 30 AT91_PERIPH_A AT91_PINCTRL_NONE   /* PC30 periph A */
+                                                        AT91_PIOC 31 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>;      /* PC31 periph with pullup */
                                        };
                                };
 
                                usart0 {
                                        pinctrl_usart0: usart0-0 {
                                                atmel,pins =
-                                                       <0 26 0x1 0x1   /* PA26 periph A with pullup */
-                                                        0 27 0x1 0x0>; /* PA27 periph A */
+                                                       <AT91_PIOA 26 AT91_PERIPH_A AT91_PINCTRL_PULL_UP        /* PA26 periph A with pullup */
+                                                        AT91_PIOA 27 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* PA27 periph A */
                                        };
 
                                        pinctrl_usart0_rts: usart0_rts-0 {
                                                atmel,pins =
-                                                       <0 28 0x1 0x0>; /* PA28 periph A */
+                                                       <AT91_PIOA 28 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* PA28 periph A */
                                        };
 
                                        pinctrl_usart0_cts: usart0_cts-0 {
                                                atmel,pins =
-                                                       <0 29 0x1 0x0>; /* PA29 periph A */
+                                                       <AT91_PIOA 29 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* PA29 periph A */
                                        };
                                };
 
                                usart1 {
                                        pinctrl_usart1: usart1-0 {
                                                atmel,pins =
-                                                       <3 0 0x1 0x1    /* PD0 periph A with pullup */
-                                                        3 1 0x1 0x0>;  /* PD1 periph A */
+                                                       <AT91_PIOD 0 AT91_PERIPH_A AT91_PINCTRL_PULL_UP /* PD0 periph A with pullup */
+                                                        AT91_PIOD 1 AT91_PERIPH_A AT91_PINCTRL_NONE>;  /* PD1 periph A */
                                        };
 
                                        pinctrl_usart1_rts: usart1_rts-0 {
                                                atmel,pins =
-                                                       <3 7 0x2 0x0>;  /* PD7 periph B */
+                                                       <AT91_PIOD 7 AT91_PERIPH_B AT91_PINCTRL_NONE>;  /* PD7 periph B */
                                        };
 
                                        pinctrl_usart1_cts: usart1_cts-0 {
                                                atmel,pins =
-                                                       <3 8 0x2 0x0>;  /* PD8 periph B */
+                                                       <AT91_PIOD 8 AT91_PERIPH_B AT91_PINCTRL_NONE>;  /* PD8 periph B */
                                        };
                                };
 
                                usart2 {
                                        pinctrl_usart2: usart2-0 {
                                                atmel,pins =
-                                                       <3 2 0x1 0x1    /* PD2 periph A with pullup */
-                                                        3 3 0x1 0x0>;  /* PD3 periph A */
+                                                       <AT91_PIOD 2 AT91_PERIPH_A AT91_PINCTRL_PULL_UP /* PD2 periph A with pullup */
+                                                        AT91_PIOD 3 AT91_PERIPH_A AT91_PINCTRL_NONE>;  /* PD3 periph A */
                                        };
 
                                        pinctrl_usart2_rts: usart2_rts-0 {
                                                atmel,pins =
-                                                       <3 5 0x2 0x0>;  /* PD5 periph B */
+                                                       <AT91_PIOD 5 AT91_PERIPH_B AT91_PINCTRL_NONE>;  /* PD5 periph B */
                                        };
 
                                        pinctrl_usart2_cts: usart2_cts-0 {
                                                atmel,pins =
-                                                       <4 6 0x2 0x0>;  /* PD6 periph B */
+                                                       <AT91_PIOD 6 AT91_PERIPH_B AT91_PINCTRL_NONE>;  /* PD6 periph B */
                                        };
                                };
 
                                nand {
                                        pinctrl_nand: nand-0 {
                                                atmel,pins =
-                                                       <0 22 0x0 0x1   /* PA22 gpio RDY pin pull_up*/
-                                                        3 15 0x0 0x1>; /* PD15 gpio enable pin pull_up */
+                                                       <AT91_PIOA 22 AT91_PERIPH_GPIO AT91_PINCTRL_PULL_UP     /* PA22 gpio RDY pin pull_up*/
+                                                        AT91_PIOD 15 AT91_PERIPH_GPIO AT91_PINCTRL_PULL_UP>;   /* PD15 gpio enable pin pull_up */
                                        };
                                };
 
                                macb {
                                        pinctrl_macb_rmii: macb_rmii-0 {
                                                atmel,pins =
-                                                       <2 25 0x2 0x0   /* PC25 periph B */
-                                                        4 21 0x1 0x0   /* PE21 periph A */
-                                                        4 23 0x1 0x0   /* PE23 periph A */
-                                                        4 24 0x1 0x0   /* PE24 periph A */
-                                                        4 25 0x1 0x0   /* PE25 periph A */
-                                                        4 26 0x1 0x0   /* PE26 periph A */
-                                                        4 27 0x1 0x0   /* PE27 periph A */
-                                                        4 28 0x1 0x0   /* PE28 periph A */
-                                                        4 29 0x1 0x0   /* PE29 periph A */
-                                                        4 30 0x1 0x0>; /* PE30 periph A */
+                                                       <AT91_PIOC 25 AT91_PERIPH_B AT91_PINCTRL_NONE   /* PC25 periph B */
+                                                        AT91_PIOE 21 AT91_PERIPH_A AT91_PINCTRL_NONE   /* PE21 periph A */
+                                                        AT91_PIOE 23 AT91_PERIPH_A AT91_PINCTRL_NONE   /* PE23 periph A */
+                                                        AT91_PIOE 24 AT91_PERIPH_A AT91_PINCTRL_NONE   /* PE24 periph A */
+                                                        AT91_PIOE 25 AT91_PERIPH_A AT91_PINCTRL_NONE   /* PE25 periph A */
+                                                        AT91_PIOE 26 AT91_PERIPH_A AT91_PINCTRL_NONE   /* PE26 periph A */
+                                                        AT91_PIOE 27 AT91_PERIPH_A AT91_PINCTRL_NONE   /* PE27 periph A */
+                                                        AT91_PIOE 28 AT91_PERIPH_A AT91_PINCTRL_NONE   /* PE28 periph A */
+                                                        AT91_PIOE 29 AT91_PERIPH_A AT91_PINCTRL_NONE   /* PE29 periph A */
+                                                        AT91_PIOE 30 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* PE30 periph A */
                                        };
 
                                        pinctrl_macb_rmii_mii: macb_rmii_mii-0 {
                                                atmel,pins =
-                                                       <2 20 0x2 0x0   /* PC20 periph B */
-                                                        2 21 0x2 0x0   /* PC21 periph B */
-                                                        2 22 0x2 0x0   /* PC22 periph B */
-                                                        2 23 0x2 0x0   /* PC23 periph B */
-                                                        2 24 0x2 0x0   /* PC24 periph B */
-                                                        2 25 0x2 0x0   /* PC25 periph B */
-                                                        2 27 0x2 0x0   /* PC27 periph B */
-                                                        4 22 0x2 0x0>; /* PE22 periph B */
+                                                       <AT91_PIOC 20 AT91_PERIPH_B AT91_PINCTRL_NONE   /* PC20 periph B */
+                                                        AT91_PIOC 21 AT91_PERIPH_B AT91_PINCTRL_NONE   /* PC21 periph B */
+                                                        AT91_PIOC 22 AT91_PERIPH_B AT91_PINCTRL_NONE   /* PC22 periph B */
+                                                        AT91_PIOC 23 AT91_PERIPH_B AT91_PINCTRL_NONE   /* PC23 periph B */
+                                                        AT91_PIOC 24 AT91_PERIPH_B AT91_PINCTRL_NONE   /* PC24 periph B */
+                                                        AT91_PIOC 25 AT91_PERIPH_B AT91_PINCTRL_NONE   /* PC25 periph B */
+                                                        AT91_PIOC 27 AT91_PERIPH_B AT91_PINCTRL_NONE   /* PC27 periph B */
+                                                        AT91_PIOE 22 AT91_PERIPH_B AT91_PINCTRL_NONE>; /* PE22 periph B */
                                        };
                                };
 
                                mmc0 {
                                        pinctrl_mmc0_clk: mmc0_clk-0 {
                                                atmel,pins =
-                                                       <0 12 0x1 0x0>; /* PA12 periph A */
+                                                       <AT91_PIOA 12 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* PA12 periph A */
                                        };
 
                                        pinctrl_mmc0_slot0_cmd_dat0: mmc0_slot0_cmd_dat0-0 {
                                                atmel,pins =
-                                                       <0 1 0x1 0x1    /* PA1 periph A with pullup */
-                                                        0 0 0x1 0x1>;  /* PA0 periph A with pullup */
+                                                       <AT91_PIOA 1 AT91_PERIPH_A AT91_PINCTRL_PULL_UP /* PA1 periph A with pullup */
+                                                        AT91_PIOA 0 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>;       /* PA0 periph A with pullup */
                                        };
 
                                        pinctrl_mmc0_slot0_dat1_3: mmc0_slot0_dat1_3-0 {
                                                atmel,pins =
-                                                       <0 3 0x1 0x1    /* PA3 periph A with pullup */
-                                                        0 4 0x1 0x1    /* PA4 periph A with pullup */
-                                                        0 5 0x1 0x1>;  /* PA5 periph A with pullup */
+                                                       <AT91_PIOA 3 AT91_PERIPH_A AT91_PINCTRL_PULL_UP /* PA3 periph A with pullup */
+                                                        AT91_PIOA 4 AT91_PERIPH_A AT91_PINCTRL_PULL_UP /* PA4 periph A with pullup */
+                                                        AT91_PIOA 5 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>;       /* PA5 periph A with pullup */
                                        };
 
                                        pinctrl_mmc0_slot1_cmd_dat0: mmc0_slot1_cmd_dat0-0 {
                                                atmel,pins =
-                                                       <0 16 0x1 0x1   /* PA16 periph A with pullup */
-                                                        0 17 0x1 0x1>; /* PA17 periph A with pullup */
+                                                       <AT91_PIOA 16 AT91_PERIPH_A AT91_PINCTRL_PULL_UP        /* PA16 periph A with pullup */
+                                                        AT91_PIOA 17 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>;      /* PA17 periph A with pullup */
                                        };
 
                                        pinctrl_mmc0_slot1_dat1_3: mmc0_slot1_dat1_3-0 {
                                                atmel,pins =
-                                                       <0 18 0x1 0x1   /* PA18 periph A with pullup */
-                                                        0 19 0x1 0x1   /* PA19 periph A with pullup */
-                                                        0 20 0x1 0x1>; /* PA20 periph A with pullup */
+                                                       <AT91_PIOA 18 AT91_PERIPH_A AT91_PINCTRL_PULL_UP        /* PA18 periph A with pullup */
+                                                        AT91_PIOA 19 AT91_PERIPH_A AT91_PINCTRL_PULL_UP        /* PA19 periph A with pullup */
+                                                        AT91_PIOA 20 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>;      /* PA20 periph A with pullup */
                                        };
                                };
 
                                mmc1 {
                                        pinctrl_mmc1_clk: mmc1_clk-0 {
                                                atmel,pins =
-                                                       <0 6 0x1 0x0>;  /* PA6 periph A */
+                                                       <AT91_PIOA 6 AT91_PERIPH_A AT91_PINCTRL_NONE>;  /* PA6 periph A */
                                        };
 
                                        pinctrl_mmc1_slot0_cmd_dat0: mmc1_slot0_cmd_dat0-0 {
                                                atmel,pins =
-                                                       <0 7 0x1 0x1    /* PA7 periph A with pullup */
-                                                        0 8 0x1 0x1>;  /* PA8 periph A with pullup */
+                                                       <AT91_PIOA 7 AT91_PERIPH_A AT91_PINCTRL_PULL_UP /* PA7 periph A with pullup */
+                                                        AT91_PIOA 8 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>;       /* PA8 periph A with pullup */
                                        };
 
                                        pinctrl_mmc1_slot0_dat1_3: mmc1_slot0_dat1_3-0 {
                                                atmel,pins =
-                                                       <0 9 0x1 0x1    /* PA9 periph A with pullup */
-                                                        0 10 0x1 0x1   /* PA10 periph A with pullup */
-                                                        0 11 0x1 0x1>; /* PA11 periph A with pullup */
+                                                       <AT91_PIOA 9 AT91_PERIPH_A AT91_PINCTRL_PULL_UP /* PA9 periph A with pullup */
+                                                        AT91_PIOA 10 AT91_PERIPH_A AT91_PINCTRL_PULL_UP        /* PA10 periph A with pullup */
+                                                        AT91_PIOA 11 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>;      /* PA11 periph A with pullup */
                                        };
 
                                        pinctrl_mmc1_slot1_cmd_dat0: mmc1_slot1_cmd_dat0-0 {
                                                atmel,pins =
-                                                       <0 21 0x1 0x1   /* PA21 periph A with pullup */
-                                                        0 22 0x1 0x1>; /* PA22 periph A with pullup */
+                                                       <AT91_PIOA 21 AT91_PERIPH_A AT91_PINCTRL_PULL_UP        /* PA21 periph A with pullup */
+                                                        AT91_PIOA 22 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>;      /* PA22 periph A with pullup */
                                        };
 
                                        pinctrl_mmc1_slot1_dat1_3: mmc1_slot1_dat1_3-0 {
                                                atmel,pins =
-                                                       <0 23 0x1 0x1   /* PA23 periph A with pullup */
-                                                        0 24 0x1 0x1   /* PA24 periph A with pullup */
-                                                        0 25 0x1 0x1>; /* PA25 periph A with pullup */
+                                                       <AT91_PIOA 23 AT91_PERIPH_A AT91_PINCTRL_PULL_UP        /* PA23 periph A with pullup */
+                                                        AT91_PIOA 24 AT91_PERIPH_A AT91_PINCTRL_PULL_UP        /* PA24 periph A with pullup */
+                                                        AT91_PIOA 25 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>;      /* PA25 periph A with pullup */
                                        };
                                };
 
                                ssc0 {
                                        pinctrl_ssc0_tx: ssc0_tx-0 {
                                                atmel,pins =
-                                                       <1 0 0x2 0x0    /* PB0 periph B */
-                                                        1 1 0x2 0x0    /* PB1 periph B */
-                                                        1 2 0x2 0x0>;  /* PB2 periph B */
+                                                       <AT91_PIOB 0 AT91_PERIPH_B AT91_PINCTRL_NONE    /* PB0 periph B */
+                                                        AT91_PIOB 1 AT91_PERIPH_B AT91_PINCTRL_NONE    /* PB1 periph B */
+                                                        AT91_PIOB 2 AT91_PERIPH_B AT91_PINCTRL_NONE>;  /* PB2 periph B */
                                        };
 
                                        pinctrl_ssc0_rx: ssc0_rx-0 {
                                                atmel,pins =
-                                                       <1 3 0x2 0x0    /* PB3 periph B */
-                                                        1 4 0x2 0x0    /* PB4 periph B */
-                                                        1 5 0x2 0x0>;  /* PB5 periph B */
+                                                       <AT91_PIOB 3 AT91_PERIPH_B AT91_PINCTRL_NONE    /* PB3 periph B */
+                                                        AT91_PIOB 4 AT91_PERIPH_B AT91_PINCTRL_NONE    /* PB4 periph B */
+                                                        AT91_PIOB 5 AT91_PERIPH_B AT91_PINCTRL_NONE>;  /* PB5 periph B */
                                        };
                                };
 
                                ssc1 {
                                        pinctrl_ssc1_tx: ssc1_tx-0 {
                                                atmel,pins =
-                                                       <1 6 0x1 0x0    /* PB6 periph A */
-                                                        1 7 0x1 0x0    /* PB7 periph A */
-                                                        1 8 0x1 0x0>;  /* PB8 periph A */
+                                                       <AT91_PIOB 6 AT91_PERIPH_A AT91_PINCTRL_NONE    /* PB6 periph A */
+                                                        AT91_PIOB 7 AT91_PERIPH_A AT91_PINCTRL_NONE    /* PB7 periph A */
+                                                        AT91_PIOB 8 AT91_PERIPH_A AT91_PINCTRL_NONE>;  /* PB8 periph A */
                                        };
 
                                        pinctrl_ssc1_rx: ssc1_rx-0 {
                                                atmel,pins =
-                                                       <1 9 0x1 0x0    /* PB9 periph A */
-                                                        1 10 0x1 0x0   /* PB10 periph A */
-                                                        1 11 0x1 0x0>; /* PB11 periph A */
+                                                       <AT91_PIOB 9 AT91_PERIPH_A AT91_PINCTRL_NONE    /* PB9 periph A */
+                                                        AT91_PIOB 10 AT91_PERIPH_A AT91_PINCTRL_NONE   /* PB10 periph A */
+                                                        AT91_PIOB 11 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* PB11 periph A */
                                        };
                                };
 
                                spi0 {
                                        pinctrl_spi0: spi0-0 {
                                                atmel,pins =
-                                                       <0 0 0x2 0x0    /* PA0 periph B SPI0_MISO pin */
-                                                        0 1 0x2 0x0    /* PA1 periph B SPI0_MOSI pin */
-                                                        0 2 0x2 0x0>;  /* PA2 periph B SPI0_SPCK pin */
+                                                       <AT91_PIOA 0 AT91_PERIPH_B AT91_PINCTRL_NONE    /* PA0 periph B SPI0_MISO pin */
+                                                        AT91_PIOA 1 AT91_PERIPH_B AT91_PINCTRL_NONE    /* PA1 periph B SPI0_MOSI pin */
+                                                        AT91_PIOA 2 AT91_PERIPH_B AT91_PINCTRL_NONE>;  /* PA2 periph B SPI0_SPCK pin */
                                        };
                                };
 
                                spi1 {
                                        pinctrl_spi1: spi1-0 {
                                                atmel,pins =
-                                                       <1 12 0x1 0x0   /* PB12 periph A SPI1_MISO pin */
-                                                        1 13 0x1 0x0   /* PB13 periph A SPI1_MOSI pin */
-                                                        1 14 0x1 0x0>; /* PB14 periph A SPI1_SPCK pin */
+                                                       <AT91_PIOB 12 AT91_PERIPH_A AT91_PINCTRL_NONE   /* PB12 periph A SPI1_MISO pin */
+                                                        AT91_PIOB 13 AT91_PERIPH_A AT91_PINCTRL_NONE   /* PB13 periph A SPI1_MOSI pin */
+                                                        AT91_PIOB 14 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* PB14 periph A SPI1_SPCK pin */
                                        };
                                };
 
index e1942ec04af3f1b35dd61c7cf7a302f11738da90..eff1afb8130405599e2f68df39922844bf09abd8 100644 (file)
@@ -74,8 +74,8 @@
                                mmc0 {
                                        pinctrl_board_mmc0: mmc0-board {
                                                atmel,pins =
-                                                       <5 18 0x0 0x5   /* PE18 gpio CD pin pull up and deglitch */
-                                                        5 19 0x0 0x1>; /* PE19 gpio WP pin pull up */
+                                                       <AT91_PIOE 18 AT91_PERIPH_GPIO AT91_PINCTRL_PULL_UP_DEGLITCH    /* PE18 gpio CD pin pull up and deglitch */
+                                                        AT91_PIOE 19 AT91_PERIPH_GPIO AT91_PINCTRL_PULL_UP>;   /* PE19 gpio WP pin pull up */
                                        };
                                };
                        };
index ec108b98c04ed4d9affe2777cfdf3303c722ee33..bdb799bad1797026fa43f041cfa0daad12c184c0 100644 (file)
@@ -31,7 +31,7 @@
                                mmc0_slot0 {
                                        pinctrl_board_mmc0_slot0: mmc0_slot0-board {
                                                atmel,pins =
-                                                       <2 2 0x0 0x5>;  /* PC2 gpio CD pin pull up and deglitch */
+                                                       <AT91_PIOC 2 AT91_PERIPH_GPIO AT91_PINCTRL_PULL_UP_DEGLITCH>;   /* PC2 gpio CD pin pull up and deglitch */
                                        };
                                };
                        };
index 79338393caf94ad7c3765ff8c6ea4c90788dd886..c7ffc32918f920207a6f354fa017e91ee7beffc1 100644 (file)
                                board {
                                        pinctrl_pck0_as_mck: pck0_as_mck {
                                                atmel,pins =
-                                                       <2 1 0x2 0x0>;  /* PC1 periph B */
+                                                       <AT91_PIOC 1 AT91_PERIPH_B AT91_PINCTRL_NONE>;  /* PC1 periph B */
                                        };
 
                                };
+
+                               mmc0_slot1 {
+                                       pinctrl_board_mmc0_slot1: mmc0_slot1-board {
+                                               atmel,pins =
+                                                       <AT91_PIOC 9 AT91_PERIPH_GPIO AT91_PINCTRL_PULL_UP_DEGLITCH>;   /* PC9 gpio CD pin pull up and deglitch */
+                                       };
+                               };
                        };
 
                        dbgu: serial@fffff200 {
                                };
                        };
 
-                       pinctrl@fffff400 {
-                               mmc0_slot1 {
-                                       pinctrl_board_mmc0_slot1: mmc0_slot1-board {
-                                               atmel,pins =
-                                                       <2 9 0x0 0x5>;  /* PC9 gpio CD pin pull up and deglitch */
-                                       };
-                               };
-                       };
-
                        ssc0: ssc@fffbc000 {
                                status = "okay";
                                pinctrl-0 = <&pinctrl_ssc0_tx>;
index 5d7c1f79dc4a79b0b680d87994b41656f6a35893..8ba4c71221d9a5194f925561a28ad5acd8ec0433 100644 (file)
@@ -10,6 +10,7 @@
  */
 
 #include "skeleton.dtsi"
+#include <dt-bindings/pinctrl/at91.h>
 #include <dt-bindings/gpio/gpio.h>
 
 / {
                                dbgu {
                                        pinctrl_dbgu: dbgu-0 {
                                                atmel,pins =
-                                                       <1 12 0x1 0x0   /* PB12 periph A */
-                                                        1 13 0x1 0x0>; /* PB13 periph A */
+                                                       <AT91_PIOB 12 AT91_PERIPH_A AT91_PINCTRL_NONE   /* PB12 periph A */
+                                                        AT91_PIOB 13 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* PB13 periph A */
                                        };
                                };
 
                                usart0 {
                                        pinctrl_usart0: usart0-0 {
                                                atmel,pins =
-                                                       <1 19 0x1 0x1   /* PB19 periph A with pullup */
-                                                        1 18 0x1 0x0>; /* PB18 periph A */
+                                                       <AT91_PIOB 19 AT91_PERIPH_A AT91_PINCTRL_PULL_UP        /* PB19 periph A with pullup */
+                                                        AT91_PIOB 18 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* PB18 periph A */
                                        };
 
                                        pinctrl_usart0_rts: usart0_rts-0 {
                                                atmel,pins =
-                                                       <1 17 0x2 0x0>; /* PB17 periph B */
+                                                       <AT91_PIOB 17 AT91_PERIPH_B AT91_PINCTRL_NONE>; /* PB17 periph B */
                                        };
 
                                        pinctrl_usart0_cts: usart0_cts-0 {
                                                atmel,pins =
-                                                       <1 15 0x2 0x0>; /* PB15 periph B */
+                                                       <AT91_PIOB 15 AT91_PERIPH_B AT91_PINCTRL_NONE>; /* PB15 periph B */
                                        };
                                };
 
                                uart1 {
                                        pinctrl_usart1: usart1-0 {
                                                atmel,pins =
-                                                       <1 4 0x1 0x1    /* PB4 periph A with pullup */
-                                                        1 5 0x1 0x0>;  /* PB5 periph A */
+                                                       <AT91_PIOB 4 AT91_PERIPH_A AT91_PINCTRL_PULL_UP /* PB4 periph A with pullup */
+                                                        AT91_PIOB 5 AT91_PERIPH_A AT91_PINCTRL_NONE>;  /* PB5 periph A */
                                        };
 
                                        pinctrl_usart1_rts: usart1_rts-0 {
                                                atmel,pins =
-                                                       <3 16 0x1 0x0>; /* PD16 periph A */
+                                                       <AT91_PIOD 16 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* PD16 periph A */
                                        };
 
                                        pinctrl_usart1_cts: usart1_cts-0 {
                                                atmel,pins =
-                                                       <3 17 0x1 0x0>; /* PD17 periph A */
+                                                       <AT91_PIOD 17 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* PD17 periph A */
                                        };
                                };
 
                                usart2 {
                                        pinctrl_usart2: usart2-0 {
                                                atmel,pins =
-                                                       <1 6 0x1 0x1    /* PB6 periph A with pullup */
-                                                        1 7 0x1 0x0>;  /* PB7 periph A */
+                                                       <AT91_PIOB 6 AT91_PERIPH_A AT91_PINCTRL_PULL_UP /* PB6 periph A with pullup */
+                                                        AT91_PIOB 7 AT91_PERIPH_A AT91_PINCTRL_NONE>;  /* PB7 periph A */
                                        };
 
                                        pinctrl_usart2_rts: usart2_rts-0 {
                                                atmel,pins =
-                                                       <2 9 0x2 0x0>;  /* PC9 periph B */
+                                                       <AT91_PIOC 9 AT91_PERIPH_B AT91_PINCTRL_NONE>;  /* PC9 periph B */
                                        };
 
                                        pinctrl_usart2_cts: usart2_cts-0 {
                                                atmel,pins =
-                                                       <2 11 0x2 0x0>; /* PC11 periph B */
+                                                       <AT91_PIOC 11 AT91_PERIPH_B AT91_PINCTRL_NONE>; /* PC11 periph B */
                                        };
                                };
 
                                usart3 {
                                        pinctrl_usart3: usart3-0 {
                                                atmel,pins =
-                                                       <1 8 0x1 0x1    /* PB9 periph A with pullup */
-                                                        1 9 0x1 0x0>;  /* PB8 periph A */
+                                                       <AT91_PIOB 8 AT91_PERIPH_A AT91_PINCTRL_PULL_UP /* PB9 periph A with pullup */
+                                                        AT91_PIOB 9 AT91_PERIPH_A AT91_PINCTRL_NONE>;  /* PB8 periph A */
                                        };
 
                                        pinctrl_usart3_rts: usart3_rts-0 {
                                                atmel,pins =
-                                                       <0 23 0x2 0x0>; /* PA23 periph B */
+                                                       <AT91_PIOA 23 AT91_PERIPH_B AT91_PINCTRL_NONE>; /* PA23 periph B */
                                        };
 
                                        pinctrl_usart3_cts: usart3_cts-0 {
                                                atmel,pins =
-                                                       <0 24 0x2 0x0>; /* PA24 periph B */
+                                                       <AT91_PIOA 24 AT91_PERIPH_B AT91_PINCTRL_NONE>; /* PA24 periph B */
                                        };
                                };
 
                                nand {
                                        pinctrl_nand: nand-0 {
                                                atmel,pins =
-                                                       <2 8 0x0 0x1    /* PC8 gpio RDY pin pull_up*/
-                                                        2 14 0x0 0x1>; /* PC14 gpio enable pin pull_up */
+                                                       <AT91_PIOC 8 AT91_PERIPH_GPIO AT91_PINCTRL_PULL_UP      /* PC8 gpio RDY pin pull_up*/
+                                                        AT91_PIOC 14 AT91_PERIPH_GPIO AT91_PINCTRL_PULL_UP>;   /* PC14 gpio enable pin pull_up */
                                        };
                                };
 
                                macb {
                                        pinctrl_macb_rmii: macb_rmii-0 {
                                                atmel,pins =
-                                                       <0 10 0x1 0x0   /* PA10 periph A */
-                                                        0 11 0x1 0x0   /* PA11 periph A */
-                                                        0 12 0x1 0x0   /* PA12 periph A */
-                                                        0 13 0x1 0x0   /* PA13 periph A */
-                                                        0 14 0x1 0x0   /* PA14 periph A */
-                                                        0 15 0x1 0x0   /* PA15 periph A */
-                                                        0 16 0x1 0x0   /* PA16 periph A */
-                                                        0 17 0x1 0x0   /* PA17 periph A */
-                                                        0 18 0x1 0x0   /* PA18 periph A */
-                                                        0 19 0x1 0x0>; /* PA19 periph A */
+                                                       <AT91_PIOA 10 AT91_PERIPH_A AT91_PINCTRL_NONE   /* PA10 periph A */
+                                                        AT91_PIOA 11 AT91_PERIPH_A AT91_PINCTRL_NONE   /* PA11 periph A */
+                                                        AT91_PIOA 12 AT91_PERIPH_A AT91_PINCTRL_NONE   /* PA12 periph A */
+                                                        AT91_PIOA 13 AT91_PERIPH_A AT91_PINCTRL_NONE   /* PA13 periph A */
+                                                        AT91_PIOA 14 AT91_PERIPH_A AT91_PINCTRL_NONE   /* PA14 periph A */
+                                                        AT91_PIOA 15 AT91_PERIPH_A AT91_PINCTRL_NONE   /* PA15 periph A */
+                                                        AT91_PIOA 16 AT91_PERIPH_A AT91_PINCTRL_NONE   /* PA16 periph A */
+                                                        AT91_PIOA 17 AT91_PERIPH_A AT91_PINCTRL_NONE   /* PA17 periph A */
+                                                        AT91_PIOA 18 AT91_PERIPH_A AT91_PINCTRL_NONE   /* PA18 periph A */
+                                                        AT91_PIOA 19 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* PA19 periph A */
                                        };
 
                                        pinctrl_macb_rmii_mii: macb_rmii_mii-0 {
                                                atmel,pins =
-                                                       <0 6 0x2 0x0    /* PA6 periph B */
-                                                        0 7 0x2 0x0    /* PA7 periph B */
-                                                        0 8 0x2 0x0    /* PA8 periph B */
-                                                        0 9 0x2 0x0    /* PA9 periph B */
-                                                        0 27 0x2 0x0   /* PA27 periph B */
-                                                        0 28 0x2 0x0   /* PA28 periph B */
-                                                        0 29 0x2 0x0   /* PA29 periph B */
-                                                        0 30 0x2 0x0>; /* PA30 periph B */
+                                                       <AT91_PIOA 6 AT91_PERIPH_B AT91_PINCTRL_NONE    /* PA6 periph B */
+                                                        AT91_PIOA 7 AT91_PERIPH_B AT91_PINCTRL_NONE    /* PA7 periph B */
+                                                        AT91_PIOA 8 AT91_PERIPH_B AT91_PINCTRL_NONE    /* PA8 periph B */
+                                                        AT91_PIOA 9 AT91_PERIPH_B AT91_PINCTRL_NONE    /* PA9 periph B */
+                                                        AT91_PIOA 27 AT91_PERIPH_B AT91_PINCTRL_NONE   /* PA27 periph B */
+                                                        AT91_PIOA 28 AT91_PERIPH_B AT91_PINCTRL_NONE   /* PA28 periph B */
+                                                        AT91_PIOA 29 AT91_PERIPH_B AT91_PINCTRL_NONE   /* PA29 periph B */
+                                                        AT91_PIOA 30 AT91_PERIPH_B AT91_PINCTRL_NONE>; /* PA30 periph B */
                                        };
                                };
 
                                mmc0 {
                                        pinctrl_mmc0_slot0_clk_cmd_dat0: mmc0_slot0_clk_cmd_dat0-0 {
                                                atmel,pins =
-                                                       <0 0 0x1 0x0    /* PA0 periph A */
-                                                        0 1 0x1 0x1    /* PA1 periph A with pullup */
-                                                        0 2 0x1 0x1>;  /* PA2 periph A with pullup */
+                                                       <AT91_PIOA 0 AT91_PERIPH_A AT91_PINCTRL_NONE    /* PA0 periph A */
+                                                        AT91_PIOA 1 AT91_PERIPH_A AT91_PINCTRL_PULL_UP /* PA1 periph A with pullup */
+                                                        AT91_PIOA 2 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>;       /* PA2 periph A with pullup */
                                        };
 
                                        pinctrl_mmc0_slot0_dat1_3: mmc0_slot0_dat1_3-0 {
                                                atmel,pins =
-                                                       <0 3 0x1 0x1    /* PA3 periph A with pullup */
-                                                        0 4 0x1 0x1    /* PA4 periph A with pullup */
-                                                        0 5 0x1 0x1>;  /* PA5 periph A with pullup */
+                                                       <AT91_PIOA 3 AT91_PERIPH_A AT91_PINCTRL_PULL_UP /* PA3 periph A with pullup */
+                                                        AT91_PIOA 4 AT91_PERIPH_A AT91_PINCTRL_PULL_UP /* PA4 periph A with pullup */
+                                                        AT91_PIOA 5 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>;       /* PA5 periph A with pullup */
                                        };
 
                                        pinctrl_mmc0_slot0_dat4_7: mmc0_slot0_dat4_7-0 {
                                                atmel,pins =
-                                                       <0 6 0x1 0x1    /* PA6 periph A with pullup */
-                                                        0 7 0x1 0x1    /* PA7 periph A with pullup */
-                                                        0 8 0x1 0x1    /* PA8 periph A with pullup */
-                                                        0 9 0x1 0x1>;  /* PA9 periph A with pullup */
+                                                       <AT91_PIOA 6 AT91_PERIPH_A AT91_PINCTRL_PULL_UP /* PA6 periph A with pullup */
+                                                        AT91_PIOA 7 AT91_PERIPH_A AT91_PINCTRL_PULL_UP /* PA7 periph A with pullup */
+                                                        AT91_PIOA 8 AT91_PERIPH_A AT91_PINCTRL_PULL_UP /* PA8 periph A with pullup */
+                                                        AT91_PIOA 9 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>;       /* PA9 periph A with pullup */
                                        };
                                };
 
                                mmc1 {
                                        pinctrl_mmc1_slot0_clk_cmd_dat0: mmc1_slot0_clk_cmd_dat0-0 {
                                                atmel,pins =
-                                                       <0 31 0x1 0x0   /* PA31 periph A */
-                                                        0 22 0x1 0x1   /* PA22 periph A with pullup */
-                                                        0 23 0x1 0x1>; /* PA23 periph A with pullup */
+                                                       <AT91_PIOA 31 AT91_PERIPH_A AT91_PINCTRL_NONE   /* PA31 periph A */
+                                                        AT91_PIOA 22 AT91_PERIPH_A AT91_PINCTRL_PULL_UP        /* PA22 periph A with pullup */
+                                                        AT91_PIOA 23 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>;      /* PA23 periph A with pullup */
                                        };
 
                                        pinctrl_mmc1_slot0_dat1_3: mmc1_slot0_dat1_3-0 {
                                                atmel,pins =
-                                                       <0 24 0x1 0x1   /* PA24 periph A with pullup */
-                                                        0 25 0x1 0x1   /* PA25 periph A with pullup */
-                                                        0 26 0x1 0x1>; /* PA26 periph A with pullup */
+                                                       <AT91_PIOA 24 AT91_PERIPH_A AT91_PINCTRL_PULL_UP        /* PA24 periph A with pullup */
+                                                        AT91_PIOA 25 AT91_PERIPH_A AT91_PINCTRL_PULL_UP        /* PA25 periph A with pullup */
+                                                        AT91_PIOA 26 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>;      /* PA26 periph A with pullup */
                                        };
 
                                        pinctrl_mmc1_slot0_dat4_7: mmc1_slot0_dat4_7-0 {
                                                atmel,pins =
-                                                       <0 27 0x1 0x1   /* PA27 periph A with pullup */
-                                                        0 28 0x1 0x1   /* PA28 periph A with pullup */
-                                                        0 29 0x1 0x1   /* PA29 periph A with pullup */
-                                                        0 20 0x1 0x1>; /* PA30 periph A with pullup */
+                                                       <AT91_PIOA 27 AT91_PERIPH_A AT91_PINCTRL_PULL_UP        /* PA27 periph A with pullup */
+                                                        AT91_PIOA 28 AT91_PERIPH_A AT91_PINCTRL_PULL_UP        /* PA28 periph A with pullup */
+                                                        AT91_PIOA 29 AT91_PERIPH_A AT91_PINCTRL_PULL_UP        /* PA29 periph A with pullup */
+                                                        AT91_PIOA 20 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>;      /* PA30 periph A with pullup */
                                        };
                                };
 
                                ssc0 {
                                        pinctrl_ssc0_tx: ssc0_tx-0 {
                                                atmel,pins =
-                                                       <3 0 0x1 0x0    /* PD0 periph A */
-                                                        3 1 0x1 0x0    /* PD1 periph A */
-                                                        3 2 0x1 0x0>;  /* PD2 periph A */
+                                                       <AT91_PIOD 0 AT91_PERIPH_A AT91_PINCTRL_NONE    /* PD0 periph A */
+                                                        AT91_PIOD 1 AT91_PERIPH_A AT91_PINCTRL_NONE    /* PD1 periph A */
+                                                        AT91_PIOD 2 AT91_PERIPH_A AT91_PINCTRL_NONE>;  /* PD2 periph A */
                                        };
 
                                        pinctrl_ssc0_rx: ssc0_rx-0 {
                                                atmel,pins =
-                                                       <3 3 0x1 0x0    /* PD3 periph A */
-                                                        3 4 0x1 0x0    /* PD4 periph A */
-                                                        3 5 0x1 0x0>;  /* PD5 periph A */
+                                                       <AT91_PIOD 3 AT91_PERIPH_A AT91_PINCTRL_NONE    /* PD3 periph A */
+                                                        AT91_PIOD 4 AT91_PERIPH_A AT91_PINCTRL_NONE    /* PD4 periph A */
+                                                        AT91_PIOD 5 AT91_PERIPH_A AT91_PINCTRL_NONE>;  /* PD5 periph A */
                                        };
                                };
 
                                ssc1 {
                                        pinctrl_ssc1_tx: ssc1_tx-0 {
                                                atmel,pins =
-                                                       <3 10 0x1 0x0   /* PD10 periph A */
-                                                        3 11 0x1 0x0   /* PD11 periph A */
-                                                        3 12 0x1 0x0>; /* PD12 periph A */
+                                                       <AT91_PIOD 10 AT91_PERIPH_A AT91_PINCTRL_NONE   /* PD10 periph A */
+                                                        AT91_PIOD 11 AT91_PERIPH_A AT91_PINCTRL_NONE   /* PD11 periph A */
+                                                        AT91_PIOD 12 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* PD12 periph A */
                                        };
 
                                        pinctrl_ssc1_rx: ssc1_rx-0 {
                                                atmel,pins =
-                                                       <3 13 0x1 0x0   /* PD13 periph A */
-                                                        3 14 0x1 0x0   /* PD14 periph A */
-                                                        3 15 0x1 0x0>; /* PD15 periph A */
+                                                       <AT91_PIOD 13 AT91_PERIPH_A AT91_PINCTRL_NONE   /* PD13 periph A */
+                                                        AT91_PIOD 14 AT91_PERIPH_A AT91_PINCTRL_NONE   /* PD14 periph A */
+                                                        AT91_PIOD 15 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* PD15 periph A */
                                        };
                                };
 
                                spi0 {
                                        pinctrl_spi0: spi0-0 {
                                                atmel,pins =
-                                                       <1 0 0x1 0x0    /* PB0 periph A SPI0_MISO pin */
-                                                        1 1 0x1 0x0    /* PB1 periph A SPI0_MOSI pin */
-                                                        1 2 0x1 0x0>;  /* PB2 periph A SPI0_SPCK pin */
+                                                       <AT91_PIOB 0 AT91_PERIPH_A AT91_PINCTRL_NONE    /* PB0 periph A SPI0_MISO pin */
+                                                        AT91_PIOB 1 AT91_PERIPH_A AT91_PINCTRL_NONE    /* PB1 periph A SPI0_MOSI pin */
+                                                        AT91_PIOB 2 AT91_PERIPH_A AT91_PINCTRL_NONE>;  /* PB2 periph A SPI0_SPCK pin */
                                        };
                                };
 
                                spi1 {
                                        pinctrl_spi1: spi1-0 {
                                                atmel,pins =
-                                                       <1 14 0x1 0x0   /* PB14 periph A SPI1_MISO pin */
-                                                        1 15 0x1 0x0   /* PB15 periph A SPI1_MOSI pin */
-                                                        1 16 0x1 0x0>; /* PB16 periph A SPI1_SPCK pin */
+                                                       <AT91_PIOB 14 AT91_PERIPH_A AT91_PINCTRL_NONE   /* PB14 periph A SPI1_MISO pin */
+                                                        AT91_PIOB 15 AT91_PERIPH_A AT91_PINCTRL_NONE   /* PB15 periph A SPI1_MOSI pin */
+                                                        AT91_PIOB 16 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* PB16 periph A SPI1_SPCK pin */
                                        };
                                };
 
index 85e9c5e8b23f20ea8dde7c585ab45fe2856dd040..89c50d108d440674219e668110d9d333ab8c1d3b 100644 (file)
                                mmc0 {
                                        pinctrl_board_mmc0: mmc0-board {
                                                atmel,pins =
-                                                       <3 10 0x0 0x5>; /* PD10 gpio CD pin pull up and deglitch */
+                                                       <AT91_PIOD 10 AT91_PERIPH_GPIO AT91_PINCTRL_PULL_UP_DEGLITCH>;  /* PD10 gpio CD pin pull up and deglitch */
                                        };
                                };
 
                                mmc1 {
                                        pinctrl_board_mmc1: mmc1-board {
                                                atmel,pins =
-                                                       <3 11 0x0 0x5   /* PD11 gpio CD pin pull up and deglitch */
-                                                        3 29 0x0 0x1>; /* PD29 gpio WP pin pull up */
+                                                       <AT91_PIOD 11 AT91_PERIPH_GPIO AT91_PINCTRL_PULL_UP_DEGLITCH    /* PD11 gpio CD pin pull up and deglitch */
+                                                        AT91_PIOD 29 AT91_PERIPH_GPIO AT91_PINCTRL_PULL_UP>;   /* PD29 gpio WP pin pull up */
                                        };
                                };
                        };
index 5205403ca1e37ff1663214e1a9d7d403d5e59cf7..e166e0c53f5e40976ebaa7c2037cef17f801c80b 100644 (file)
@@ -8,6 +8,7 @@
  */
 
 #include "skeleton.dtsi"
+#include <dt-bindings/pinctrl/at91.h>
 #include <dt-bindings/gpio/gpio.h>
 
 / {
                                dbgu {
                                        pinctrl_dbgu: dbgu-0 {
                                                atmel,pins =
-                                                       <0 9 0x1 0x0    /* PA9 periph A */
-                                                        0 10 0x1 0x1>; /* PA10 periph with pullup */
+                                                       <AT91_PIOA 9 AT91_PERIPH_A AT91_PINCTRL_NONE    /* PA9 periph A */
+                                                        AT91_PIOA 10 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>;      /* PA10 periph with pullup */
                                        };
                                };
 
                                usart0 {
                                        pinctrl_usart0: usart0-0 {
                                                atmel,pins =
-                                                       <0 1 0x1 0x1    /* PA1 periph A with pullup */
-                                                        0 0 0x1 0x0>;  /* PA0 periph A */
+                                                       <AT91_PIOA 1 AT91_PERIPH_A AT91_PINCTRL_PULL_UP /* PA1 periph A with pullup */
+                                                        AT91_PIOA 0 AT91_PERIPH_A AT91_PINCTRL_NONE>;  /* PA0 periph A */
                                        };
 
                                        pinctrl_usart0_rts: usart0_rts-0 {
                                                atmel,pins =
-                                                       <0 2 0x1 0x0>;  /* PA2 periph A */
+                                                       <AT91_PIOA 2 AT91_PERIPH_A AT91_PINCTRL_NONE>;  /* PA2 periph A */
                                        };
 
                                        pinctrl_usart0_cts: usart0_cts-0 {
                                                atmel,pins =
-                                                       <0 3 0x1 0x0>;  /* PA3 periph A */
+                                                       <AT91_PIOA 3 AT91_PERIPH_A AT91_PINCTRL_NONE>;  /* PA3 periph A */
                                        };
                                };
 
                                usart1 {
                                        pinctrl_usart1: usart1-0 {
                                                atmel,pins =
-                                                       <0 6 0x1 0x1    /* PA6 periph A with pullup */
-                                                        0 5 0x1 0x0>;  /* PA5 periph A */
+                                                       <AT91_PIOA 6 AT91_PERIPH_A AT91_PINCTRL_PULL_UP /* PA6 periph A with pullup */
+                                                        AT91_PIOA 5 AT91_PERIPH_A AT91_PINCTRL_NONE>;  /* PA5 periph A */
                                        };
                                };
 
                                usart2 {
                                        pinctrl_usart2: usart2-0 {
                                                atmel,pins =
-                                                       <0 8 0x1 0x1    /* PA8 periph A with pullup */
-                                                        0 7 0x1 0x0>;  /* PA7 periph A */
+                                                       <AT91_PIOA 8 AT91_PERIPH_A AT91_PINCTRL_PULL_UP /* PA8 periph A with pullup */
+                                                        AT91_PIOA 7 AT91_PERIPH_A AT91_PINCTRL_NONE>;  /* PA7 periph A */
                                        };
 
                                        pinctrl_usart2_rts: usart2_rts-0 {
                                                atmel,pins =
-                                                       <1 0 0x2 0x0>;  /* PB0 periph B */
+                                                       <AT91_PIOB 0 AT91_PERIPH_B AT91_PINCTRL_NONE>;  /* PB0 periph B */
                                        };
 
                                        pinctrl_usart2_cts: usart2_cts-0 {
                                                atmel,pins =
-                                                       <1 1 0x2 0x0>;  /* PB1 periph B */
+                                                       <AT91_PIOB 1 AT91_PERIPH_B AT91_PINCTRL_NONE>;  /* PB1 periph B */
                                        };
                                };
 
                                usart3 {
                                        pinctrl_usart3: usart3-0 {
                                                atmel,pins =
-                                                       <2 23 0x2 0x1   /* PC23 periph B with pullup */
-                                                        2 22 0x2 0x0>; /* PC22 periph B */
+                                                       <AT91_PIOC 23 AT91_PERIPH_B AT91_PINCTRL_PULL_UP        /* PC23 periph B with pullup */
+                                                        AT91_PIOC 22 AT91_PERIPH_B AT91_PINCTRL_NONE>; /* PC22 periph B */
                                        };
 
                                        pinctrl_usart3_rts: usart3_rts-0 {
                                                atmel,pins =
-                                                       <2 24 0x2 0x0>; /* PC24 periph B */
+                                                       <AT91_PIOC 24 AT91_PERIPH_B AT91_PINCTRL_NONE>; /* PC24 periph B */
                                        };
 
                                        pinctrl_usart3_cts: usart3_cts-0 {
                                                atmel,pins =
-                                                       <2 25 0x2 0x0>; /* PC25 periph B */
+                                                       <AT91_PIOC 25 AT91_PERIPH_B AT91_PINCTRL_NONE>; /* PC25 periph B */
                                        };
                                };
 
                                uart0 {
                                        pinctrl_uart0: uart0-0 {
                                                atmel,pins =
-                                                       <2 9 0x3 0x1    /* PC9 periph C with pullup */
-                                                        2 8 0x3 0x0>;  /* PC8 periph C */
+                                                       <AT91_PIOC 9 AT91_PERIPH_C AT91_PINCTRL_PULL_UP /* PC9 periph C with pullup */
+                                                        AT91_PIOC 8 AT91_PERIPH_C AT91_PINCTRL_NONE>;  /* PC8 periph C */
                                        };
                                };
 
                                uart1 {
                                        pinctrl_uart1: uart1-0 {
                                                atmel,pins =
-                                                       <2 16 0x3 0x1   /* PC17 periph C with pullup */
-                                                        2 17 0x3 0x0>; /* PC16 periph C */
+                                                       <AT91_PIOC 16 AT91_PERIPH_C AT91_PINCTRL_PULL_UP        /* PC17 periph C with pullup */
+                                                        AT91_PIOC 17 AT91_PERIPH_C AT91_PINCTRL_NONE>; /* PC16 periph C */
                                        };
                                };
 
                                nand {
                                        pinctrl_nand: nand-0 {
                                                atmel,pins =
-                                                       <3 5 0x0 0x1    /* PD5 gpio RDY pin pull_up*/
-                                                        3 4 0x0 0x1>;  /* PD4 gpio enable pin pull_up */
+                                                       <AT91_PIOD 5 AT91_PERIPH_GPIO AT91_PINCTRL_PULL_UP      /* PD5 gpio RDY pin pull_up*/
+                                                        AT91_PIOD 4 AT91_PERIPH_GPIO AT91_PINCTRL_PULL_UP>;    /* PD4 gpio enable pin pull_up */
                                        };
                                };
 
                                mmc0 {
                                        pinctrl_mmc0_slot0_clk_cmd_dat0: mmc0_slot0_clk_cmd_dat0-0 {
                                                atmel,pins =
-                                                       <0 17 0x1 0x0   /* PA17 periph A */
-                                                        0 16 0x1 0x1   /* PA16 periph A with pullup */
-                                                        0 15 0x1 0x1>; /* PA15 periph A with pullup */
+                                                       <AT91_PIOA 17 AT91_PERIPH_A AT91_PINCTRL_NONE   /* PA17 periph A */
+                                                        AT91_PIOA 16 AT91_PERIPH_A AT91_PINCTRL_PULL_UP        /* PA16 periph A with pullup */
+                                                        AT91_PIOA 15 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>;      /* PA15 periph A with pullup */
                                        };
 
                                        pinctrl_mmc0_slot0_dat1_3: mmc0_slot0_dat1_3-0 {
                                                atmel,pins =
-                                                       <0 18 0x1 0x1   /* PA18 periph A with pullup */
-                                                        0 19 0x1 0x1   /* PA19 periph A with pullup */
-                                                        0 20 0x1 0x1>; /* PA20 periph A with pullup */
+                                                       <AT91_PIOA 18 AT91_PERIPH_A AT91_PINCTRL_PULL_UP        /* PA18 periph A with pullup */
+                                                        AT91_PIOA 19 AT91_PERIPH_A AT91_PINCTRL_PULL_UP        /* PA19 periph A with pullup */
+                                                        AT91_PIOA 20 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>;      /* PA20 periph A with pullup */
                                        };
 
                                        pinctrl_mmc0_slot0_dat4_7: mmc0_slot0_dat4_7-0 {
                                                atmel,pins =
-                                                       <0 11 0x2 0x1   /* PA11 periph B with pullup */
-                                                        0 12 0x2 0x1   /* PA12 periph B with pullup */
-                                                        0 13 0x2 0x1   /* PA13 periph B with pullup */
-                                                        0 14 0x2 0x1>; /* PA14 periph B with pullup */
+                                                       <AT91_PIOA 11 AT91_PERIPH_B AT91_PINCTRL_PULL_UP        /* PA11 periph B with pullup */
+                                                        AT91_PIOA 12 AT91_PERIPH_B AT91_PINCTRL_PULL_UP        /* PA12 periph B with pullup */
+                                                        AT91_PIOA 13 AT91_PERIPH_B AT91_PINCTRL_PULL_UP        /* PA13 periph B with pullup */
+                                                        AT91_PIOA 14 AT91_PERIPH_B AT91_PINCTRL_PULL_UP>;      /* PA14 periph B with pullup */
                                        };
                                };
 
                                ssc0 {
                                        pinctrl_ssc0_tx: ssc0_tx-0 {
                                                atmel,pins =
-                                                       <0 24 0x2 0x0   /* PA24 periph B */
-                                                        0 25 0x2 0x0   /* PA25 periph B */
-                                                        0 26 0x2 0x0>; /* PA26 periph B */
+                                                       <AT91_PIOA 24 AT91_PERIPH_B AT91_PINCTRL_NONE   /* PA24 periph B */
+                                                        AT91_PIOA 25 AT91_PERIPH_B AT91_PINCTRL_NONE   /* PA25 periph B */
+                                                        AT91_PIOA 26 AT91_PERIPH_B AT91_PINCTRL_NONE>; /* PA26 periph B */
                                        };
 
                                        pinctrl_ssc0_rx: ssc0_rx-0 {
                                                atmel,pins =
-                                                       <0 27 0x2 0x0   /* PA27 periph B */
-                                                        0 28 0x2 0x0   /* PA28 periph B */
-                                                        0 29 0x2 0x0>; /* PA29 periph B */
+                                                       <AT91_PIOA 27 AT91_PERIPH_B AT91_PINCTRL_NONE   /* PA27 periph B */
+                                                        AT91_PIOA 28 AT91_PERIPH_B AT91_PINCTRL_NONE   /* PA28 periph B */
+                                                        AT91_PIOA 29 AT91_PERIPH_B AT91_PINCTRL_NONE>; /* PA29 periph B */
                                        };
                                };
 
                                spi0 {
                                        pinctrl_spi0: spi0-0 {
                                                atmel,pins =
-                                                       <0 11 0x1 0x0   /* PA11 periph A SPI0_MISO pin */
-                                                        0 12 0x1 0x0   /* PA12 periph A SPI0_MOSI pin */
-                                                        0 13 0x1 0x0>; /* PA13 periph A SPI0_SPCK pin */
+                                                       <AT91_PIOA 11 AT91_PERIPH_A AT91_PINCTRL_NONE   /* PA11 periph A SPI0_MISO pin */
+                                                        AT91_PIOA 12 AT91_PERIPH_A AT91_PINCTRL_NONE   /* PA12 periph A SPI0_MOSI pin */
+                                                        AT91_PIOA 13 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* PA13 periph A SPI0_SPCK pin */
                                        };
                                };
 
                                spi1 {
                                        pinctrl_spi1: spi1-0 {
                                                atmel,pins =
-                                                       <0 21 0x2 0x0   /* PA21 periph B SPI1_MISO pin */
-                                                        0 22 0x2 0x0   /* PA22 periph B SPI1_MOSI pin */
-                                                        0 23 0x2 0x0>; /* PA23 periph B SPI1_SPCK pin */
+                                                       <AT91_PIOA 21 AT91_PERIPH_B AT91_PINCTRL_NONE   /* PA21 periph B SPI1_MISO pin */
+                                                        AT91_PIOA 22 AT91_PERIPH_B AT91_PINCTRL_NONE   /* PA22 periph B SPI1_MOSI pin */
+                                                        AT91_PIOA 23 AT91_PERIPH_B AT91_PINCTRL_NONE>; /* PA23 periph B SPI1_SPCK pin */
                                        };
                                };
 
index 8eece27044559832e38578ee4def3477d034975f..2e67cd5e47eb665ea8b1a508cd4ab861dfe40f47 100644 (file)
@@ -63,7 +63,7 @@
                                mmc0 {
                                        pinctrl_board_mmc0: mmc0-board {
                                                atmel,pins =
-                                                       <0 7 0x0 0x5>;  /* PA7 gpio CD pin pull up and deglitch */
+                                                       <AT91_PIOA 7 AT91_PERIPH_GPIO AT91_PINCTRL_PULL_UP_DEGLITCH>;   /* PA7 gpio CD pin pull up and deglitch */
                                        };
                                };
                        };
index 3f78d9b1d790145d7c458ad55c6d942a93ffd677..49e94aba938ff65f5827e1f56bd17fcde898fd38 100644 (file)
                                macb1 {
                                        pinctrl_macb1_rmii: macb1_rmii-0 {
                                                atmel,pins =
-                                                       <2 16 0x2 0x0   /* PC16 periph B */
-                                                        2 18 0x2 0x0   /* PC18 periph B */
-                                                        2 19 0x2 0x0   /* PC19 periph B */
-                                                        2 20 0x2 0x0   /* PC20 periph B */
-                                                        2 21 0x2 0x0   /* PC21 periph B */
-                                                        2 27 0x2 0x0   /* PC27 periph B */
-                                                        2 28 0x2 0x0   /* PC28 periph B */
-                                                        2 29 0x2 0x0   /* PC29 periph B */
-                                                        2 30 0x2 0x0   /* PC30 periph B */
-                                                        2 31 0x2 0x0>; /* PC31 periph B */
+                                                       <AT91_PIOC 16 AT91_PERIPH_B AT91_PINCTRL_NONE   /* PC16 periph B */
+                                                        AT91_PIOC 18 AT91_PERIPH_B AT91_PINCTRL_NONE   /* PC18 periph B */
+                                                        AT91_PIOC 19 AT91_PERIPH_B AT91_PINCTRL_NONE   /* PC19 periph B */
+                                                        AT91_PIOC 20 AT91_PERIPH_B AT91_PINCTRL_NONE   /* PC20 periph B */
+                                                        AT91_PIOC 21 AT91_PERIPH_B AT91_PINCTRL_NONE   /* PC21 periph B */
+                                                        AT91_PIOC 27 AT91_PERIPH_B AT91_PINCTRL_NONE   /* PC27 periph B */
+                                                        AT91_PIOC 28 AT91_PERIPH_B AT91_PINCTRL_NONE   /* PC28 periph B */
+                                                        AT91_PIOC 29 AT91_PERIPH_B AT91_PINCTRL_NONE   /* PC29 periph B */
+                                                        AT91_PIOC 30 AT91_PERIPH_B AT91_PINCTRL_NONE   /* PC30 periph B */
+                                                        AT91_PIOC 31 AT91_PERIPH_B AT91_PINCTRL_NONE>; /* PC31 periph B */
                                        };
                                };
                        };
index 949b8ea2ec0d4a86f48e822e4088d540f320fbc2..cfbf9235e8ae72bdb8d04ff26cbb8ae99d72151a 100644 (file)
@@ -10,6 +10,7 @@
  */
 
 #include "skeleton.dtsi"
+#include <dt-bindings/pinctrl/at91.h>
 #include <dt-bindings/gpio/gpio.h>
 
 / {
                                dbgu {
                                        pinctrl_dbgu: dbgu-0 {
                                                atmel,pins =
-                                                       <0 9 0x1 0x0    /* PA9 periph A */
-                                                        0 10 0x1 0x1>; /* PA10 periph A with pullup */
+                                                       <AT91_PIOA 9 AT91_PERIPH_A AT91_PINCTRL_NONE    /* PA9 periph A */
+                                                        AT91_PIOA 10 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>;      /* PA10 periph A with pullup */
                                        };
                                };
 
                                usart0 {
                                        pinctrl_usart0: usart0-0 {
                                                atmel,pins =
-                                                       <0 0 0x1 0x1    /* PA0 periph A with pullup */
-                                                        0 1 0x1 0x0>;  /* PA1 periph A */
+                                                       <AT91_PIOA 0 AT91_PERIPH_A AT91_PINCTRL_PULL_UP /* PA0 periph A with pullup */
+                                                        AT91_PIOA 1 AT91_PERIPH_A AT91_PINCTRL_NONE>;  /* PA1 periph A */
                                        };
 
                                        pinctrl_usart0_rts: usart0_rts-0 {
                                                atmel,pins =
-                                                       <0 2 0x1 0x0>;  /* PA2 periph A */
+                                                       <AT91_PIOA 2 AT91_PERIPH_A AT91_PINCTRL_NONE>;  /* PA2 periph A */
                                        };
 
                                        pinctrl_usart0_cts: usart0_cts-0 {
                                                atmel,pins =
-                                                       <0 3 0x1 0x0>;  /* PA3 periph A */
+                                                       <AT91_PIOA 3 AT91_PERIPH_A AT91_PINCTRL_NONE>;  /* PA3 periph A */
                                        };
 
                                        pinctrl_usart0_sck: usart0_sck-0 {
                                                atmel,pins =
-                                                       <0 4 0x1 0x0>;  /* PA4 periph A */
+                                                       <AT91_PIOA 4 AT91_PERIPH_A AT91_PINCTRL_NONE>;  /* PA4 periph A */
                                        };
                                };
 
                                usart1 {
                                        pinctrl_usart1: usart1-0 {
                                                atmel,pins =
-                                                       <0 5 0x1 0x1    /* PA5 periph A with pullup */
-                                                        0 6 0x1 0x0>;  /* PA6 periph A */
+                                                       <AT91_PIOA 5 AT91_PERIPH_A AT91_PINCTRL_PULL_UP /* PA5 periph A with pullup */
+                                                        AT91_PIOA 6 AT91_PERIPH_A AT91_PINCTRL_NONE>;  /* PA6 periph A */
                                        };
 
                                        pinctrl_usart1_rts: usart1_rts-0 {
                                                atmel,pins =
-                                                       <2 27 0x3 0x0>; /* PC27 periph C */
+                                                       <AT91_PIOC 27 AT91_PERIPH_C AT91_PINCTRL_NONE>; /* PC27 periph C */
                                        };
 
                                        pinctrl_usart1_cts: usart1_cts-0 {
                                                atmel,pins =
-                                                       <2 28 0x3 0x0>; /* PC28 periph C */
+                                                       <AT91_PIOC 28 AT91_PERIPH_C AT91_PINCTRL_NONE>; /* PC28 periph C */
                                        };
 
                                        pinctrl_usart1_sck: usart1_sck-0 {
                                                atmel,pins =
-                                                       <2 28 0x3 0x0>; /* PC29 periph C */
+                                                       <AT91_PIOC 28 AT91_PERIPH_C AT91_PINCTRL_NONE>; /* PC29 periph C */
                                        };
                                };
 
                                usart2 {
                                        pinctrl_usart2: usart2-0 {
                                                atmel,pins =
-                                                       <0 7 0x1 0x1    /* PA7 periph A with pullup */
-                                                        0 8 0x1 0x0>;  /* PA8 periph A */
+                                                       <AT91_PIOA 7 AT91_PERIPH_A AT91_PINCTRL_PULL_UP /* PA7 periph A with pullup */
+                                                        AT91_PIOA 8 AT91_PERIPH_A AT91_PINCTRL_NONE>;  /* PA8 periph A */
                                        };
 
                                        pinctrl_uart2_rts: uart2_rts-0 {
                                                atmel,pins =
-                                                       <1 0 0x2 0x0>;  /* PB0 periph B */
+                                                       <AT91_PIOB 0 AT91_PERIPH_B AT91_PINCTRL_NONE>;  /* PB0 periph B */
                                        };
 
                                        pinctrl_uart2_cts: uart2_cts-0 {
                                                atmel,pins =
-                                                       <1 1 0x2 0x0>;  /* PB1 periph B */
+                                                       <AT91_PIOB 1 AT91_PERIPH_B AT91_PINCTRL_NONE>;  /* PB1 periph B */
                                        };
 
                                        pinctrl_usart2_sck: usart2_sck-0 {
                                                atmel,pins =
-                                                       <1 2 0x2 0x0>;  /* PB2 periph B */
+                                                       <AT91_PIOB 2 AT91_PERIPH_B AT91_PINCTRL_NONE>;  /* PB2 periph B */
                                        };
                                };
 
                                usart3 {
                                        pinctrl_usart3: usart3-0 {
                                                atmel,pins =
-                                                       <2 22 0x2 0x1   /* PC22 periph B with pullup */
-                                                        2 23 0x2 0x0>; /* PC23 periph B */
+                                                       <AT91_PIOC 22 AT91_PERIPH_B AT91_PINCTRL_PULL_UP        /* PC22 periph B with pullup */
+                                                        AT91_PIOC 23 AT91_PERIPH_B AT91_PINCTRL_NONE>; /* PC23 periph B */
                                        };
 
                                        pinctrl_usart3_rts: usart3_rts-0 {
                                                atmel,pins =
-                                                       <2 24 0x2 0x0>; /* PC24 periph B */
+                                                       <AT91_PIOC 24 AT91_PERIPH_B AT91_PINCTRL_NONE>; /* PC24 periph B */
                                        };
 
                                        pinctrl_usart3_cts: usart3_cts-0 {
                                                atmel,pins =
-                                                       <2 25 0x2 0x0>; /* PC25 periph B */
+                                                       <AT91_PIOC 25 AT91_PERIPH_B AT91_PINCTRL_NONE>; /* PC25 periph B */
                                        };
 
                                        pinctrl_usart3_sck: usart3_sck-0 {
                                                atmel,pins =
-                                                       <2 26 0x2 0x0>; /* PC26 periph B */
+                                                       <AT91_PIOC 26 AT91_PERIPH_B AT91_PINCTRL_NONE>; /* PC26 periph B */
                                        };
                                };
 
                                uart0 {
                                        pinctrl_uart0: uart0-0 {
                                                atmel,pins =
-                                                       <2 8 0x3 0x0    /* PC8 periph C */
-                                                        2 9 0x3 0x1>;  /* PC9 periph C with pullup */
+                                                       <AT91_PIOC 8 AT91_PERIPH_C AT91_PINCTRL_NONE    /* PC8 periph C */
+                                                        AT91_PIOC 9 AT91_PERIPH_C AT91_PINCTRL_PULL_UP>;       /* PC9 periph C with pullup */
                                        };
                                };
 
                                uart1 {
                                        pinctrl_uart1: uart1-0 {
                                                atmel,pins =
-                                                       <2 16 0x3 0x0   /* PC16 periph C */
-                                                        2 17 0x3 0x1>; /* PC17 periph C with pullup */
+                                                       <AT91_PIOC 16 AT91_PERIPH_C AT91_PINCTRL_NONE   /* PC16 periph C */
+                                                        AT91_PIOC 17 AT91_PERIPH_C AT91_PINCTRL_PULL_UP>;      /* PC17 periph C with pullup */
                                        };
                                };
 
                                nand {
                                        pinctrl_nand: nand-0 {
                                                atmel,pins =
-                                                       <3 0 0x1 0x0    /* PD0 periph A Read Enable */
-                                                        3 1 0x1 0x0    /* PD1 periph A Write Enable */
-                                                        3 2 0x1 0x0    /* PD2 periph A Address Latch Enable */
-                                                        3 3 0x1 0x0    /* PD3 periph A Command Latch Enable */
-                                                        3 4 0x0 0x1    /* PD4 gpio Chip Enable pin pull_up */
-                                                        3 5 0x0 0x1    /* PD5 gpio RDY/BUSY pin pull_up */
-                                                        3 6 0x1 0x0    /* PD6 periph A Data bit 0 */
-                                                        3 7 0x1 0x0    /* PD7 periph A Data bit 1 */
-                                                        3 8 0x1 0x0    /* PD8 periph A Data bit 2 */
-                                                        3 9 0x1 0x0    /* PD9 periph A Data bit 3 */
-                                                        3 10 0x1 0x0   /* PD10 periph A Data bit 4 */
-                                                        3 11 0x1 0x0   /* PD11 periph A Data bit 5 */
-                                                        3 12 0x1 0x0   /* PD12 periph A Data bit 6 */
-                                                        3 13 0x1 0x0>; /* PD13 periph A Data bit 7 */
+                                                       <AT91_PIOD 0 AT91_PERIPH_A AT91_PINCTRL_NONE    /* PD0 periph A Read Enable */
+                                                        AT91_PIOD 1 AT91_PERIPH_A AT91_PINCTRL_NONE    /* PD1 periph A Write Enable */
+                                                        AT91_PIOD 2 AT91_PERIPH_A AT91_PINCTRL_NONE    /* PD2 periph A Address Latch Enable */
+                                                        AT91_PIOD 3 AT91_PERIPH_A AT91_PINCTRL_NONE    /* PD3 periph A Command Latch Enable */
+                                                        AT91_PIOD 4 AT91_PERIPH_GPIO AT91_PINCTRL_PULL_UP      /* PD4 gpio Chip Enable pin pull_up */
+                                                        AT91_PIOD 5 AT91_PERIPH_GPIO AT91_PINCTRL_PULL_UP      /* PD5 gpio RDY/BUSY pin pull_up */
+                                                        AT91_PIOD 6 AT91_PERIPH_A AT91_PINCTRL_NONE    /* PD6 periph A Data bit 0 */
+                                                        AT91_PIOD 7 AT91_PERIPH_A AT91_PINCTRL_NONE    /* PD7 periph A Data bit 1 */
+                                                        AT91_PIOD 8 AT91_PERIPH_A AT91_PINCTRL_NONE    /* PD8 periph A Data bit 2 */
+                                                        AT91_PIOD 9 AT91_PERIPH_A AT91_PINCTRL_NONE    /* PD9 periph A Data bit 3 */
+                                                        AT91_PIOD 10 AT91_PERIPH_A AT91_PINCTRL_NONE   /* PD10 periph A Data bit 4 */
+                                                        AT91_PIOD 11 AT91_PERIPH_A AT91_PINCTRL_NONE   /* PD11 periph A Data bit 5 */
+                                                        AT91_PIOD 12 AT91_PERIPH_A AT91_PINCTRL_NONE   /* PD12 periph A Data bit 6 */
+                                                        AT91_PIOD 13 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* PD13 periph A Data bit 7 */
                                        };
 
                                        pinctrl_nand_16bits: nand_16bits-0 {
                                                atmel,pins =
-                                                       <3 14 0x1 0x0   /* PD14 periph A Data bit 8 */
-                                                        3 15 0x1 0x0   /* PD15 periph A Data bit 9 */
-                                                        3 16 0x1 0x0   /* PD16 periph A Data bit 10 */
-                                                        3 17 0x1 0x0   /* PD17 periph A Data bit 11 */
-                                                        3 18 0x1 0x0   /* PD18 periph A Data bit 12 */
-                                                        3 19 0x1 0x0   /* PD19 periph A Data bit 13 */
-                                                        3 20 0x1 0x0   /* PD20 periph A Data bit 14 */
-                                                        3 21 0x1 0x0>; /* PD21 periph A Data bit 15 */
+                                                       <AT91_PIOD 14 AT91_PERIPH_A AT91_PINCTRL_NONE   /* PD14 periph A Data bit 8 */
+                                                        AT91_PIOD 15 AT91_PERIPH_A AT91_PINCTRL_NONE   /* PD15 periph A Data bit 9 */
+                                                        AT91_PIOD 16 AT91_PERIPH_A AT91_PINCTRL_NONE   /* PD16 periph A Data bit 10 */
+                                                        AT91_PIOD 17 AT91_PERIPH_A AT91_PINCTRL_NONE   /* PD17 periph A Data bit 11 */
+                                                        AT91_PIOD 18 AT91_PERIPH_A AT91_PINCTRL_NONE   /* PD18 periph A Data bit 12 */
+                                                        AT91_PIOD 19 AT91_PERIPH_A AT91_PINCTRL_NONE   /* PD19 periph A Data bit 13 */
+                                                        AT91_PIOD 20 AT91_PERIPH_A AT91_PINCTRL_NONE   /* PD20 periph A Data bit 14 */
+                                                        AT91_PIOD 21 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* PD21 periph A Data bit 15 */
                                        };
                                };
 
                                macb0 {
                                        pinctrl_macb0_rmii: macb0_rmii-0 {
                                                atmel,pins =
-                                                       <1 0 0x1 0x0    /* PB0 periph A */
-                                                        1 1 0x1 0x0    /* PB1 periph A */
-                                                        1 2 0x1 0x0    /* PB2 periph A */
-                                                        1 3 0x1 0x0    /* PB3 periph A */
-                                                        1 4 0x1 0x0    /* PB4 periph A */
-                                                        1 5 0x1 0x0    /* PB5 periph A */
-                                                        1 6 0x1 0x0    /* PB6 periph A */
-                                                        1 7 0x1 0x0    /* PB7 periph A */
-                                                        1 9 0x1 0x0    /* PB9 periph A */
-                                                        1 10 0x1 0x0>; /* PB10 periph A */
+                                                       <AT91_PIOB 0 AT91_PERIPH_A AT91_PINCTRL_NONE    /* PB0 periph A */
+                                                        AT91_PIOB 1 AT91_PERIPH_A AT91_PINCTRL_NONE    /* PB1 periph A */
+                                                        AT91_PIOB 2 AT91_PERIPH_A AT91_PINCTRL_NONE    /* PB2 periph A */
+                                                        AT91_PIOB 3 AT91_PERIPH_A AT91_PINCTRL_NONE    /* PB3 periph A */
+                                                        AT91_PIOB 4 AT91_PERIPH_A AT91_PINCTRL_NONE    /* PB4 periph A */
+                                                        AT91_PIOB 5 AT91_PERIPH_A AT91_PINCTRL_NONE    /* PB5 periph A */
+                                                        AT91_PIOB 6 AT91_PERIPH_A AT91_PINCTRL_NONE    /* PB6 periph A */
+                                                        AT91_PIOB 7 AT91_PERIPH_A AT91_PINCTRL_NONE    /* PB7 periph A */
+                                                        AT91_PIOB 9 AT91_PERIPH_A AT91_PINCTRL_NONE    /* PB9 periph A */
+                                                        AT91_PIOB 10 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* PB10 periph A */
                                        };
 
                                        pinctrl_macb0_rmii_mii: macb0_rmii_mii-0 {
                                                atmel,pins =
-                                                       <1 8 0x1 0x0    /* PB8 periph A */
-                                                        1 11 0x1 0x0   /* PB11 periph A */
-                                                        1 12 0x1 0x0   /* PB12 periph A */
-                                                        1 13 0x1 0x0   /* PB13 periph A */
-                                                        1 14 0x1 0x0   /* PB14 periph A */
-                                                        1 15 0x1 0x0   /* PB15 periph A */
-                                                        1 16 0x1 0x0   /* PB16 periph A */
-                                                        1 17 0x1 0x0>; /* PB17 periph A */
+                                                       <AT91_PIOB 8 AT91_PERIPH_A AT91_PINCTRL_NONE    /* PB8 periph A */
+                                                        AT91_PIOB 11 AT91_PERIPH_A AT91_PINCTRL_NONE   /* PB11 periph A */
+                                                        AT91_PIOB 12 AT91_PERIPH_A AT91_PINCTRL_NONE   /* PB12 periph A */
+                                                        AT91_PIOB 13 AT91_PERIPH_A AT91_PINCTRL_NONE   /* PB13 periph A */
+                                                        AT91_PIOB 14 AT91_PERIPH_A AT91_PINCTRL_NONE   /* PB14 periph A */
+                                                        AT91_PIOB 15 AT91_PERIPH_A AT91_PINCTRL_NONE   /* PB15 periph A */
+                                                        AT91_PIOB 16 AT91_PERIPH_A AT91_PINCTRL_NONE   /* PB16 periph A */
+                                                        AT91_PIOB 17 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* PB17 periph A */
                                        };
                                };
 
                                mmc0 {
                                        pinctrl_mmc0_slot0_clk_cmd_dat0: mmc0_slot0_clk_cmd_dat0-0 {
                                                atmel,pins =
-                                                       <0 17 0x1 0x0   /* PA17 periph A */
-                                                        0 16 0x1 0x1   /* PA16 periph A with pullup */
-                                                        0 15 0x1 0x1>; /* PA15 periph A with pullup */
+                                                       <AT91_PIOA 17 AT91_PERIPH_A AT91_PINCTRL_NONE   /* PA17 periph A */
+                                                        AT91_PIOA 16 AT91_PERIPH_A AT91_PINCTRL_PULL_UP        /* PA16 periph A with pullup */
+                                                        AT91_PIOA 15 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>;      /* PA15 periph A with pullup */
                                        };
 
                                        pinctrl_mmc0_slot0_dat1_3: mmc0_slot0_dat1_3-0 {
                                                atmel,pins =
-                                                       <0 18 0x1 0x1   /* PA18 periph A with pullup */
-                                                        0 19 0x1 0x1   /* PA19 periph A with pullup */
-                                                        0 20 0x1 0x1>; /* PA20 periph A with pullup */
+                                                       <AT91_PIOA 18 AT91_PERIPH_A AT91_PINCTRL_PULL_UP        /* PA18 periph A with pullup */
+                                                        AT91_PIOA 19 AT91_PERIPH_A AT91_PINCTRL_PULL_UP        /* PA19 periph A with pullup */
+                                                        AT91_PIOA 20 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>;      /* PA20 periph A with pullup */
                                        };
                                };
 
                                mmc1 {
                                        pinctrl_mmc1_slot0_clk_cmd_dat0: mmc1_slot0_clk_cmd_dat0-0 {
                                                atmel,pins =
-                                                       <0 13 0x2 0x0   /* PA13 periph B */
-                                                        0 12 0x2 0x1   /* PA12 periph B with pullup */
-                                                        0 11 0x2 0x1>; /* PA11 periph B with pullup */
+                                                       <AT91_PIOA 13 AT91_PERIPH_B AT91_PINCTRL_NONE   /* PA13 periph B */
+                                                        AT91_PIOA 12 AT91_PERIPH_B AT91_PINCTRL_PULL_UP        /* PA12 periph B with pullup */
+                                                        AT91_PIOA 11 AT91_PERIPH_B AT91_PINCTRL_PULL_UP>;      /* PA11 periph B with pullup */
                                        };
 
                                        pinctrl_mmc1_slot0_dat1_3: mmc1_slot0_dat1_3-0 {
                                                atmel,pins =
-                                                       <0 2 0x2 0x1    /* PA2 periph B with pullup */
-                                                        0 3 0x2 0x1    /* PA3 periph B with pullup */
-                                                        0 4 0x2 0x1>;  /* PA4 periph B with pullup */
+                                                       <AT91_PIOA 2 AT91_PERIPH_B AT91_PINCTRL_PULL_UP /* PA2 periph B with pullup */
+                                                        AT91_PIOA 3 AT91_PERIPH_B AT91_PINCTRL_PULL_UP /* PA3 periph B with pullup */
+                                                        AT91_PIOA 4 AT91_PERIPH_B AT91_PINCTRL_PULL_UP>;       /* PA4 periph B with pullup */
                                        };
                                };
 
                                ssc0 {
                                        pinctrl_ssc0_tx: ssc0_tx-0 {
                                                atmel,pins =
-                                                       <0 24 0x2 0x0   /* PA24 periph B */
-                                                        0 25 0x2 0x0   /* PA25 periph B */
-                                                        0 26 0x2 0x0>; /* PA26 periph B */
+                                                       <AT91_PIOA 24 AT91_PERIPH_B AT91_PINCTRL_NONE   /* PA24 periph B */
+                                                        AT91_PIOA 25 AT91_PERIPH_B AT91_PINCTRL_NONE   /* PA25 periph B */
+                                                        AT91_PIOA 26 AT91_PERIPH_B AT91_PINCTRL_NONE>; /* PA26 periph B */
                                        };
 
                                        pinctrl_ssc0_rx: ssc0_rx-0 {
                                                atmel,pins =
-                                                       <0 27 0x2 0x0   /* PA27 periph B */
-                                                        0 28 0x2 0x0   /* PA28 periph B */
-                                                        0 29 0x2 0x0>; /* PA29 periph B */
+                                                       <AT91_PIOA 27 AT91_PERIPH_B AT91_PINCTRL_NONE   /* PA27 periph B */
+                                                        AT91_PIOA 28 AT91_PERIPH_B AT91_PINCTRL_NONE   /* PA28 periph B */
+                                                        AT91_PIOA 29 AT91_PERIPH_B AT91_PINCTRL_NONE>; /* PA29 periph B */
                                        };
                                };
 
                                spi0 {
                                        pinctrl_spi0: spi0-0 {
                                                atmel,pins =
-                                                       <0 11 0x1 0x0   /* PA11 periph A SPI0_MISO pin */
-                                                        0 12 0x1 0x0   /* PA12 periph A SPI0_MOSI pin */
-                                                        0 13 0x1 0x0>; /* PA13 periph A SPI0_SPCK pin */
+                                                       <AT91_PIOA 11 AT91_PERIPH_A AT91_PINCTRL_NONE   /* PA11 periph A SPI0_MISO pin */
+                                                        AT91_PIOA 12 AT91_PERIPH_A AT91_PINCTRL_NONE   /* PA12 periph A SPI0_MOSI pin */
+                                                        AT91_PIOA 13 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* PA13 periph A SPI0_SPCK pin */
                                        };
                                };
 
                                spi1 {
                                        pinctrl_spi1: spi1-0 {
                                                atmel,pins =
-                                                       <0 21 0x2 0x0   /* PA21 periph B SPI1_MISO pin */
-                                                        0 22 0x2 0x0   /* PA22 periph B SPI1_MOSI pin */
-                                                        0 23 0x2 0x0>; /* PA23 periph B SPI1_SPCK pin */
+                                                       <AT91_PIOA 21 AT91_PERIPH_B AT91_PINCTRL_NONE   /* PA21 periph B SPI1_MISO pin */
+                                                        AT91_PIOA 22 AT91_PERIPH_B AT91_PINCTRL_NONE   /* PA22 periph B SPI1_MOSI pin */
+                                                        AT91_PIOA 23 AT91_PERIPH_B AT91_PINCTRL_NONE>; /* PA23 periph B SPI1_SPCK pin */
                                        };
                                };
 
                                i2c0 {
                                        pinctrl_i2c0: i2c0-0 {
                                                atmel,pins =
-                                                       <0 30 0x1 0x0   /* PA30 periph A I2C0 data */
-                                                        0 31 0x1 0x0>; /* PA31 periph A I2C0 clock */
+                                                       <AT91_PIOA 30 AT91_PERIPH_A AT91_PINCTRL_NONE   /* PA30 periph A I2C0 data */
+                                                        AT91_PIOA 31 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* PA31 periph A I2C0 clock */
                                        };
                                };
 
                                i2c1 {
                                        pinctrl_i2c1: i2c1-0 {
                                                atmel,pins =
-                                                       <2 0 0x3 0x0    /* PC0 periph C I2C1 data */
-                                                        2 1 0x3 0x0>;  /* PC1 periph C I2C1 clock */
+                                                       <AT91_PIOC 0 AT91_PERIPH_C AT91_PINCTRL_NONE    /* PC0 periph C I2C1 data */
+                                                        AT91_PIOC 1 AT91_PERIPH_C AT91_PINCTRL_NONE>;  /* PC1 periph C I2C1 clock */
                                        };
                                };
 
                                i2c2 {
                                        pinctrl_i2c2: i2c2-0 {
                                                atmel,pins =
-                                                       <1 4 0x2 0x0    /* PB4 periph B I2C2 data */
-                                                        1 5 0x2 0x0>;  /* PB5 periph B I2C2 clock */
+                                                       <AT91_PIOB 4 AT91_PERIPH_B AT91_PINCTRL_NONE    /* PB4 periph B I2C2 data */
+                                                        AT91_PIOB 5 AT91_PERIPH_B AT91_PINCTRL_NONE>;  /* PB5 periph B I2C2 clock */
                                        };
                                };
 
                                i2c_gpio0 {
                                        pinctrl_i2c_gpio0: i2c_gpio0-0 {
                                                atmel,pins =
-                                                       <0 30 0x0 0x2   /* PA30 gpio multidrive I2C0 data */
-                                                        0 31 0x0 0x2>; /* PA31 gpio multidrive I2C0 clock */
+                                                       <AT91_PIOA 30 AT91_PERIPH_GPIO AT91_PINCTRL_MULTI_DRIVE /* PA30 gpio multidrive I2C0 data */
+                                                        AT91_PIOA 31 AT91_PERIPH_GPIO AT91_PINCTRL_MULTI_DRIVE>;       /* PA31 gpio multidrive I2C0 clock */
                                        };
                                };
 
                                i2c_gpio1 {
                                        pinctrl_i2c_gpio1: i2c_gpio1-0 {
                                                atmel,pins =
-                                                       <2 0 0x0 0x2    /* PC0 gpio multidrive I2C1 data */
-                                                        2 1 0x0 0x2>;  /* PC1 gpio multidrive I2C1 clock */
+                                                       <AT91_PIOC 0 AT91_PERIPH_GPIO AT91_PINCTRL_MULTI_DRIVE  /* PC0 gpio multidrive I2C1 data */
+                                                        AT91_PIOC 1 AT91_PERIPH_GPIO AT91_PINCTRL_MULTI_DRIVE>;        /* PC1 gpio multidrive I2C1 clock */
                                        };
                                };
 
                                i2c_gpio2 {
                                        pinctrl_i2c_gpio2: i2c_gpio2-0 {
                                                atmel,pins =
-                                                       <1 4 0x0 0x2    /* PB4 gpio multidrive I2C2 data */
-                                                        1 5 0x0 0x2>;  /* PB5 gpio multidrive I2C2 clock */
+                                                       <AT91_PIOB 4 AT91_PERIPH_GPIO AT91_PINCTRL_MULTI_DRIVE  /* PB4 gpio multidrive I2C2 data */
+                                                        AT91_PIOB 5 AT91_PERIPH_GPIO AT91_PINCTRL_MULTI_DRIVE>;        /* PB5 gpio multidrive I2C2 clock */
                                        };
                                };
 
index 94723c30e99bc002e98d84b1e110e75f4f17252d..4a5ee5cc115a7e416d6b8b64ae3408619222d6ba 100644 (file)
@@ -28,7 +28,7 @@
                        pinctrl@fffff400 {
                                1wire_cm {
                                        pinctrl_1wire_cm: 1wire_cm-0 {
-                                               atmel,pins = <1 18 0x0 0x2>; /* PB18 multidrive, conflicts with led */
+                                               atmel,pins = <AT91_PIOB 18 AT91_PERIPH_GPIO AT91_PINCTRL_MULTI_DRIVE>; /* PB18 multidrive, conflicts with led */
                                        };
                                };
                        };
index 95f88c7c87f39ad75334ad695800f6f33e42769a..19c8ebb303f442e5e3207ae1db57cc08ccd113af 100644 (file)
                                mmc0 {
                                        pinctrl_board_mmc0: mmc0-board {
                                                atmel,pins =
-                                                       <3 15 0x0 0x5>; /* PD15 gpio CD pin pull up and deglitch */
+                                                       <AT91_PIOD 15 AT91_PERIPH_GPIO AT91_PINCTRL_PULL_UP_DEGLITCH>;  /* PD15 gpio CD pin pull up and deglitch */
                                        };
                                };
 
                                mmc1 {
                                        pinctrl_board_mmc1: mmc1-board {
                                                atmel,pins =
-                                                       <3 14 0x0 0x5>; /* PD14 gpio CD pin pull up and deglitch */
+                                                       <AT91_PIOD 14 AT91_PERIPH_GPIO AT91_PINCTRL_PULL_UP_DEGLITCH>;  /* PD14 gpio CD pin pull up and deglitch */
                                        };
                                };
                        };
index 315d9279c9b639b2cb1603cf578cf7610191f7eb..33ffabe9c4c86e293d9d00c63977e411cffb729b 100644 (file)
                                board {
                                        pinctrl_board_nand: nand0-board {
                                                atmel,pins =
-                                                       <3 3 0x0 0x1    /* PD3 gpio RDY pin pull_up*/
-                                                        2 14 0x0 0x1>; /* PC14 gpio enable pin pull_up */
+                                                       <AT91_PIOD 3 AT91_PERIPH_GPIO AT91_PINCTRL_PULL_UP      /* PD3 gpio RDY pin pull_up*/
+                                                        AT91_PIOC 14 AT91_PERIPH_GPIO AT91_PINCTRL_PULL_UP>;   /* PC14 gpio enable pin pull_up */
                                        };
                                };
 
                                mmc {
                                        pinctrl_board_mmc: mmc0-board {
                                                atmel,pins =
-                                                       <3 6 0x0 0x5>;  /* PD6 gpio CD pin pull_up and deglitch */
+                                                       <AT91_PIOD 6 AT91_PERIPH_GPIO AT91_PINCTRL_PULL_UP_DEGLITCH>;   /* PD6 gpio CD pin pull_up and deglitch */
                                        };
                                };
                        };
index 0d65e3d375a36346ccd7792a7874388918cdbbea..05a3380e2b4774902a5c87bb6e54a5c45f1cdcb0 100644 (file)
@@ -9,6 +9,7 @@
  */
 
 #include "skeleton.dtsi"
+#include <dt-bindings/pinctrl/at91.h>
 #include <dt-bindings/gpio/gpio.h>
 
 / {
                                adc0 {
                                        pinctrl_adc0_adtrg: adc0_adtrg {
                                                atmel,pins =
-                                                       <3 19 0x1 0x0>; /* PD19 periph A ADTRG */
+                                                       <AT91_PIOD 19 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* PD19 periph A ADTRG */
                                        };
                                        pinctrl_adc0_ad0: adc0_ad0 {
                                                atmel,pins =
-                                                       <3 20 0x1 0x0>; /* PD20 periph A AD0 */
+                                                       <AT91_PIOD 20 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* PD20 periph A AD0 */
                                        };
                                        pinctrl_adc0_ad1: adc0_ad1 {
                                                atmel,pins =
-                                                       <3 21 0x1 0x0>; /* PD21 periph A AD1 */
+                                                       <AT91_PIOD 21 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* PD21 periph A AD1 */
                                        };
                                        pinctrl_adc0_ad2: adc0_ad2 {
                                                atmel,pins =
-                                                       <3 22 0x1 0x0>; /* PD22 periph A AD2 */
+                                                       <AT91_PIOD 22 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* PD22 periph A AD2 */
                                        };
                                        pinctrl_adc0_ad3: adc0_ad3 {
                                                atmel,pins =
-                                                       <3 23 0x1 0x0>; /* PD23 periph A AD3 */
+                                                       <AT91_PIOD 23 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* PD23 periph A AD3 */
                                        };
                                        pinctrl_adc0_ad4: adc0_ad4 {
                                                atmel,pins =
-                                                       <3 24 0x1 0x0>; /* PD24 periph A AD4 */
+                                                       <AT91_PIOD 24 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* PD24 periph A AD4 */
                                        };
                                        pinctrl_adc0_ad5: adc0_ad5 {
                                                atmel,pins =
-                                                       <3 25 0x1 0x0>; /* PD25 periph A AD5 */
+                                                       <AT91_PIOD 25 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* PD25 periph A AD5 */
                                        };
                                        pinctrl_adc0_ad6: adc0_ad6 {
                                                atmel,pins =
-                                                       <3 26 0x1 0x0>; /* PD26 periph A AD6 */
+                                                       <AT91_PIOD 26 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* PD26 periph A AD6 */
                                        };
                                        pinctrl_adc0_ad7: adc0_ad7 {
                                                atmel,pins =
-                                                       <3 27 0x1 0x0>; /* PD27 periph A AD7 */
+                                                       <AT91_PIOD 27 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* PD27 periph A AD7 */
                                        };
                                        pinctrl_adc0_ad8: adc0_ad8 {
                                                atmel,pins =
-                                                       <3 28 0x1 0x0>; /* PD28 periph A AD8 */
+                                                       <AT91_PIOD 28 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* PD28 periph A AD8 */
                                        };
                                        pinctrl_adc0_ad9: adc0_ad9 {
                                                atmel,pins =
-                                                       <3 29 0x1 0x0>; /* PD29 periph A AD9 */
+                                                       <AT91_PIOD 29 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* PD29 periph A AD9 */
                                        };
                                        pinctrl_adc0_ad10: adc0_ad10 {
                                                atmel,pins =
-                                                       <3 30 0x1 0x0>; /* PD30 periph A AD10, conflicts with PCK0 */
+                                                       <AT91_PIOD 30 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* PD30 periph A AD10, conflicts with PCK0 */
                                        };
                                        pinctrl_adc0_ad11: adc0_ad11 {
                                                atmel,pins =
-                                                       <3 31 0x1 0x0>; /* PD31 periph A AD11, conflicts with PCK1 */
+                                                       <AT91_PIOD 31 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* PD31 periph A AD11, conflicts with PCK1 */
                                        };
                                };
 
                                can0 {
                                        pinctrl_can0_rx_tx: can0_rx_tx {
                                                atmel,pins =
-                                                       <3 14 0x3 0x0   /* PD14 periph C RX, conflicts with SCK0, SPI0_NPCS1 */
-                                                        3 15 0x3 0x0>; /* PD15 periph C TX, conflicts with CTS0, SPI0_NPCS2 */
+                                                       <AT91_PIOD 14 AT91_PERIPH_C AT91_PINCTRL_NONE   /* PD14 periph C RX, conflicts with SCK0, SPI0_NPCS1 */
+                                                        AT91_PIOD 15 AT91_PERIPH_C AT91_PINCTRL_NONE>; /* PD15 periph C TX, conflicts with CTS0, SPI0_NPCS2 */
                                        };
                                };
 
                                can1 {
                                        pinctrl_can1_rx_tx: can1_rx_tx {
                                                atmel,pins =
-                                                       <1 14 0x2 0x0   /* PB14 periph B RX, conflicts with GCRS */
-                                                        1 15 0x2 0x0>; /* PB15 periph B TX, conflicts with GCOL */
+                                                       <AT91_PIOB 14 AT91_PERIPH_B AT91_PINCTRL_NONE   /* PB14 periph B RX, conflicts with GCRS */
+                                                        AT91_PIOB 15 AT91_PERIPH_B AT91_PINCTRL_NONE>; /* PB15 periph B TX, conflicts with GCOL */
                                        };
                                };
 
                                dbgu {
                                        pinctrl_dbgu: dbgu-0 {
                                                atmel,pins =
-                                                       <1 30 0x1 0x0   /* PB30 periph A */
-                                                        1 31 0x1 0x1>; /* PB31 periph A with pullup */
+                                                       <AT91_PIOB 30 AT91_PERIPH_A AT91_PINCTRL_NONE   /* PB30 periph A */
+                                                        AT91_PIOB 31 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>;      /* PB31 periph A with pullup */
                                        };
                                };
 
                                i2c0 {
                                        pinctrl_i2c0: i2c0-0 {
                                                atmel,pins =
-                                                       <0 30 0x1 0x0   /* PA30 periph A TWD0 pin, conflicts with URXD1, ISI_VSYNC */
-                                                        0 31 0x1 0x0>; /* PA31 periph A TWCK0 pin, conflicts with UTXD1, ISI_HSYNC */
+                                                       <AT91_PIOA 30 AT91_PERIPH_A AT91_PINCTRL_NONE   /* PA30 periph A TWD0 pin, conflicts with URXD1, ISI_VSYNC */
+                                                        AT91_PIOA 31 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* PA31 periph A TWCK0 pin, conflicts with UTXD1, ISI_HSYNC */
                                        };
                                };
 
                                i2c1 {
                                        pinctrl_i2c1: i2c1-0 {
                                                atmel,pins =
-                                                       <2 26 0x2 0x0   /* PC26 periph B TWD1 pin, conflicts with SPI1_NPCS1, ISI_D11 */
-                                                        2 27 0x2 0x0>; /* PC27 periph B TWCK1 pin, conflicts with SPI1_NPCS2, ISI_D10 */
+                                                       <AT91_PIOC 26 AT91_PERIPH_B AT91_PINCTRL_NONE   /* PC26 periph B TWD1 pin, conflicts with SPI1_NPCS1, ISI_D11 */
+                                                        AT91_PIOC 27 AT91_PERIPH_B AT91_PINCTRL_NONE>; /* PC27 periph B TWCK1 pin, conflicts with SPI1_NPCS2, ISI_D10 */
                                        };
                                };
 
                                isi {
                                        pinctrl_isi: isi-0 {
                                                atmel,pins =
-                                                       <0 16 0x3 0x0   /* PA16 periph C ISI_D0, conflicts with LCDDAT16 */
-                                                        0 17 0x3 0x0   /* PA17 periph C ISI_D1, conflicts with LCDDAT17 */
-                                                        0 18 0x3 0x0   /* PA18 periph C ISI_D2, conflicts with LCDDAT18, TWD2 */
-                                                        0 19 0x3 0x0   /* PA19 periph C ISI_D3, conflicts with LCDDAT19, TWCK2 */
-                                                        0 20 0x3 0x0   /* PA20 periph C ISI_D4, conflicts with LCDDAT20, PWMH0 */
-                                                        0 21 0x3 0x0   /* PA21 periph C ISI_D5, conflicts with LCDDAT21, PWML0 */
-                                                        0 22 0x3 0x0   /* PA22 periph C ISI_D6, conflicts with LCDDAT22, PWMH1 */
-                                                        0 23 0x3 0x0   /* PA23 periph C ISI_D7, conflicts with LCDDAT23, PWML1 */
-                                                        2 30 0x3 0x0   /* PC30 periph C ISI_PCK, conflicts with UTXD0 */
-                                                        0 31 0x3 0x0   /* PA31 periph C ISI_HSYNC, conflicts with TWCK0, UTXD1 */
-                                                        0 30 0x3 0x0   /* PA30 periph C ISI_VSYNC, conflicts with TWD0, URXD1 */
-                                                        2 29 0x3 0x0   /* PC29 periph C ISI_PD8, conflicts with URXD0, PWMFI2 */
-                                                        2 28 0x3 0x0>; /* PC28 periph C ISI_PD9, conflicts with SPI1_NPCS3, PWMFI0 */
+                                                       <AT91_PIOA 16 AT91_PERIPH_C AT91_PINCTRL_NONE   /* PA16 periph C ISI_D0, conflicts with LCDDAT16 */
+                                                        AT91_PIOA 17 AT91_PERIPH_C AT91_PINCTRL_NONE   /* PA17 periph C ISI_D1, conflicts with LCDDAT17 */
+                                                        AT91_PIOA 18 AT91_PERIPH_C AT91_PINCTRL_NONE   /* PA18 periph C ISI_D2, conflicts with LCDDAT18, TWD2 */
+                                                        AT91_PIOA 19 AT91_PERIPH_C AT91_PINCTRL_NONE   /* PA19 periph C ISI_D3, conflicts with LCDDAT19, TWCK2 */
+                                                        AT91_PIOA 20 AT91_PERIPH_C AT91_PINCTRL_NONE   /* PA20 periph C ISI_D4, conflicts with LCDDAT20, PWMH0 */
+                                                        AT91_PIOA 21 AT91_PERIPH_C AT91_PINCTRL_NONE   /* PA21 periph C ISI_D5, conflicts with LCDDAT21, PWML0 */
+                                                        AT91_PIOA 22 AT91_PERIPH_C AT91_PINCTRL_NONE   /* PA22 periph C ISI_D6, conflicts with LCDDAT22, PWMH1 */
+                                                        AT91_PIOA 23 AT91_PERIPH_C AT91_PINCTRL_NONE   /* PA23 periph C ISI_D7, conflicts with LCDDAT23, PWML1 */
+                                                        AT91_PIOC 30 AT91_PERIPH_C AT91_PINCTRL_NONE   /* PC30 periph C ISI_PCK, conflicts with UTXD0 */
+                                                        AT91_PIOA 31 AT91_PERIPH_C AT91_PINCTRL_NONE   /* PA31 periph C ISI_HSYNC, conflicts with TWCK0, UTXD1 */
+                                                        AT91_PIOA 30 AT91_PERIPH_C AT91_PINCTRL_NONE   /* PA30 periph C ISI_VSYNC, conflicts with TWD0, URXD1 */
+                                                        AT91_PIOC 29 AT91_PERIPH_C AT91_PINCTRL_NONE   /* PC29 periph C ISI_PD8, conflicts with URXD0, PWMFI2 */
+                                                        AT91_PIOC 28 AT91_PERIPH_C AT91_PINCTRL_NONE>; /* PC28 periph C ISI_PD9, conflicts with SPI1_NPCS3, PWMFI0 */
                                        };
                                        pinctrl_isi_pck_as_mck: isi_pck_as_mck-0 {
                                                atmel,pins =
-                                                       <3 31 0x2 0x0>; /* PD31 periph B ISI_MCK */
+                                                       <AT91_PIOD 31 AT91_PERIPH_B AT91_PINCTRL_NONE>; /* PD31 periph B ISI_MCK */
                                        };
                                };
 
                                lcd {
                                        pinctrl_lcd: lcd-0 {
                                                atmel,pins =
-                                                       <0 24 0x1 0x0   /* PA24 periph A LCDPWM */
-                                                        0 26 0x1 0x0   /* PA26 periph A LCDVSYNC */
-                                                        0 27 0x1 0x0   /* PA27 periph A LCDHSYNC */
-                                                        0 25 0x1 0x0   /* PA25 periph A LCDDISP */
-                                                        0 29 0x1 0x0   /* PA29 periph A LCDDEN */
-                                                        0 28 0x1 0x0   /* PA28 periph A LCDPCK */
-                                                        0 0 0x1 0x0    /* PA0 periph A LCDD0 pin */
-                                                        0 1 0x1 0x0    /* PA1 periph A LCDD1 pin */
-                                                        0 2 0x1 0x0    /* PA2 periph A LCDD2 pin */
-                                                        0 3 0x1 0x0    /* PA3 periph A LCDD3 pin */
-                                                        0 4 0x1 0x0    /* PA4 periph A LCDD4 pin */
-                                                        0 5 0x1 0x0    /* PA5 periph A LCDD5 pin */
-                                                        0 6 0x1 0x0    /* PA6 periph A LCDD6 pin */
-                                                        0 7 0x1 0x0    /* PA7 periph A LCDD7 pin */
-                                                        0 8 0x1 0x0    /* PA8 periph A LCDD8 pin */
-                                                        0 9 0x1 0x0    /* PA9 periph A LCDD9 pin */
-                                                        0 10 0x1 0x0   /* PA10 periph A LCDD10 pin */
-                                                        0 11 0x1 0x0   /* PA11 periph A LCDD11 pin */
-                                                        0 12 0x1 0x0   /* PA12 periph A LCDD12 pin */
-                                                        0 13 0x1 0x0   /* PA13 periph A LCDD13 pin */
-                                                        0 14 0x1 0x0   /* PA14 periph A LCDD14 pin */
-                                                        0 15 0x1 0x0   /* PA15 periph A LCDD15 pin */
-                                                        2 14 0x3 0x0   /* PC14 periph C LCDD16 pin */
-                                                        2 13 0x3 0x0   /* PC13 periph C LCDD17 pin */
-                                                        2 12 0x3 0x0   /* PC12 periph C LCDD18 pin */
-                                                        2 11 0x3 0x0   /* PC11 periph C LCDD19 pin */
-                                                        2 10 0x3 0x0   /* PC10 periph C LCDD20 pin */
-                                                        2 15 0x3 0x0   /* PC15 periph C LCDD21 pin */
-                                                        4 27 0x3 0x0   /* PE27 periph C LCDD22 pin */
-                                                        4 28 0x3 0x0>; /* PE28 periph C LCDD23 pin */
+                                                       <AT91_PIOA 24 AT91_PERIPH_A AT91_PINCTRL_NONE   /* PA24 periph A LCDPWM */
+                                                        AT91_PIOA 26 AT91_PERIPH_A AT91_PINCTRL_NONE   /* PA26 periph A LCDVSYNC */
+                                                        AT91_PIOA 27 AT91_PERIPH_A AT91_PINCTRL_NONE   /* PA27 periph A LCDHSYNC */
+                                                        AT91_PIOA 25 AT91_PERIPH_A AT91_PINCTRL_NONE   /* PA25 periph A LCDDISP */
+                                                        AT91_PIOA 29 AT91_PERIPH_A AT91_PINCTRL_NONE   /* PA29 periph A LCDDEN */
+                                                        AT91_PIOA 28 AT91_PERIPH_A AT91_PINCTRL_NONE   /* PA28 periph A LCDPCK */
+                                                        AT91_PIOA 0 AT91_PERIPH_A AT91_PINCTRL_NONE    /* PA0 periph A LCDD0 pin */
+                                                        AT91_PIOA 1 AT91_PERIPH_A AT91_PINCTRL_NONE    /* PA1 periph A LCDD1 pin */
+                                                        AT91_PIOA 2 AT91_PERIPH_A AT91_PINCTRL_NONE    /* PA2 periph A LCDD2 pin */
+                                                        AT91_PIOA 3 AT91_PERIPH_A AT91_PINCTRL_NONE    /* PA3 periph A LCDD3 pin */
+                                                        AT91_PIOA 4 AT91_PERIPH_A AT91_PINCTRL_NONE    /* PA4 periph A LCDD4 pin */
+                                                        AT91_PIOA 5 AT91_PERIPH_A AT91_PINCTRL_NONE    /* PA5 periph A LCDD5 pin */
+                                                        AT91_PIOA 6 AT91_PERIPH_A AT91_PINCTRL_NONE    /* PA6 periph A LCDD6 pin */
+                                                        AT91_PIOA 7 AT91_PERIPH_A AT91_PINCTRL_NONE    /* PA7 periph A LCDD7 pin */
+                                                        AT91_PIOA 8 AT91_PERIPH_A AT91_PINCTRL_NONE    /* PA8 periph A LCDD8 pin */
+                                                        AT91_PIOA 9 AT91_PERIPH_A AT91_PINCTRL_NONE    /* PA9 periph A LCDD9 pin */
+                                                        AT91_PIOA 10 AT91_PERIPH_A AT91_PINCTRL_NONE   /* PA10 periph A LCDD10 pin */
+                                                        AT91_PIOA 11 AT91_PERIPH_A AT91_PINCTRL_NONE   /* PA11 periph A LCDD11 pin */
+                                                        AT91_PIOA 12 AT91_PERIPH_A AT91_PINCTRL_NONE   /* PA12 periph A LCDD12 pin */
+                                                        AT91_PIOA 13 AT91_PERIPH_A AT91_PINCTRL_NONE   /* PA13 periph A LCDD13 pin */
+                                                        AT91_PIOA 14 AT91_PERIPH_A AT91_PINCTRL_NONE   /* PA14 periph A LCDD14 pin */
+                                                        AT91_PIOA 15 AT91_PERIPH_A AT91_PINCTRL_NONE   /* PA15 periph A LCDD15 pin */
+                                                        AT91_PIOC 14 AT91_PERIPH_C AT91_PINCTRL_NONE   /* PC14 periph C LCDD16 pin */
+                                                        AT91_PIOC 13 AT91_PERIPH_C AT91_PINCTRL_NONE   /* PC13 periph C LCDD17 pin */
+                                                        AT91_PIOC 12 AT91_PERIPH_C AT91_PINCTRL_NONE   /* PC12 periph C LCDD18 pin */
+                                                        AT91_PIOC 11 AT91_PERIPH_C AT91_PINCTRL_NONE   /* PC11 periph C LCDD19 pin */
+                                                        AT91_PIOC 10 AT91_PERIPH_C AT91_PINCTRL_NONE   /* PC10 periph C LCDD20 pin */
+                                                        AT91_PIOC 15 AT91_PERIPH_C AT91_PINCTRL_NONE   /* PC15 periph C LCDD21 pin */
+                                                        AT91_PIOE 27 AT91_PERIPH_C AT91_PINCTRL_NONE   /* PE27 periph C LCDD22 pin */
+                                                        AT91_PIOE 28 AT91_PERIPH_C AT91_PINCTRL_NONE>; /* PE28 periph C LCDD23 pin */
                                        };
                                };
 
                                macb0 {
                                        pinctrl_macb0_data_rgmii: macb0_data_rgmii {
                                                atmel,pins =
-                                                       <1 0 0x1 0x0    /* PB0 periph A GTX0, conflicts with PWMH0 */
-                                                        1 1 0x1 0x0    /* PB1 periph A GTX1, conflicts with PWML0 */
-                                                        1 2 0x1 0x0    /* PB2 periph A GTX2, conflicts with TK1 */
-                                                        1 3 0x1 0x0    /* PB3 periph A GTX3, conflicts with TF1 */
-                                                        1 4 0x1 0x0    /* PB4 periph A GRX0, conflicts with PWMH1 */
-                                                        1 5 0x1 0x0    /* PB5 periph A GRX1, conflicts with PWML1 */
-                                                        1 6 0x1 0x0    /* PB6 periph A GRX2, conflicts with TD1 */
-                                                        1 7 0x1 0x0>;  /* PB7 periph A GRX3, conflicts with RK1 */
+                                                       <AT91_PIOB 0 AT91_PERIPH_A AT91_PINCTRL_NONE    /* PB0 periph A GTX0, conflicts with PWMH0 */
+                                                        AT91_PIOB 1 AT91_PERIPH_A AT91_PINCTRL_NONE    /* PB1 periph A GTX1, conflicts with PWML0 */
+                                                        AT91_PIOB 2 AT91_PERIPH_A AT91_PINCTRL_NONE    /* PB2 periph A GTX2, conflicts with TK1 */
+                                                        AT91_PIOB 3 AT91_PERIPH_A AT91_PINCTRL_NONE    /* PB3 periph A GTX3, conflicts with TF1 */
+                                                        AT91_PIOB 4 AT91_PERIPH_A AT91_PINCTRL_NONE    /* PB4 periph A GRX0, conflicts with PWMH1 */
+                                                        AT91_PIOB 5 AT91_PERIPH_A AT91_PINCTRL_NONE    /* PB5 periph A GRX1, conflicts with PWML1 */
+                                                        AT91_PIOB 6 AT91_PERIPH_A AT91_PINCTRL_NONE    /* PB6 periph A GRX2, conflicts with TD1 */
+                                                        AT91_PIOB 7 AT91_PERIPH_A AT91_PINCTRL_NONE>;  /* PB7 periph A GRX3, conflicts with RK1 */
                                        };
                                        pinctrl_macb0_data_gmii: macb0_data_gmii {
                                                atmel,pins =
-                                                       <1 19 0x2 0x0   /* PB19 periph B GTX4, conflicts with MCI1_CDA */
-                                                        1 20 0x2 0x0   /* PB20 periph B GTX5, conflicts with MCI1_DA0 */
-                                                        1 21 0x2 0x0   /* PB21 periph B GTX6, conflicts with MCI1_DA1 */
-                                                        1 22 0x2 0x0   /* PB22 periph B GTX7, conflicts with MCI1_DA2 */
-                                                        1 23 0x2 0x0   /* PB23 periph B GRX4, conflicts with MCI1_DA3 */
-                                                        1 24 0x2 0x0   /* PB24 periph B GRX5, conflicts with MCI1_CK */
-                                                        1 25 0x2 0x0   /* PB25 periph B GRX6, conflicts with SCK1 */
-                                                        1 26 0x2 0x0>; /* PB26 periph B GRX7, conflicts with CTS1 */
+                                                       <AT91_PIOB 19 AT91_PERIPH_B AT91_PINCTRL_NONE   /* PB19 periph B GTX4, conflicts with MCI1_CDA */
+                                                        AT91_PIOB 20 AT91_PERIPH_B AT91_PINCTRL_NONE   /* PB20 periph B GTX5, conflicts with MCI1_DA0 */
+                                                        AT91_PIOB 21 AT91_PERIPH_B AT91_PINCTRL_NONE   /* PB21 periph B GTX6, conflicts with MCI1_DA1 */
+                                                        AT91_PIOB 22 AT91_PERIPH_B AT91_PINCTRL_NONE   /* PB22 periph B GTX7, conflicts with MCI1_DA2 */
+                                                        AT91_PIOB 23 AT91_PERIPH_B AT91_PINCTRL_NONE   /* PB23 periph B GRX4, conflicts with MCI1_DA3 */
+                                                        AT91_PIOB 24 AT91_PERIPH_B AT91_PINCTRL_NONE   /* PB24 periph B GRX5, conflicts with MCI1_CK */
+                                                        AT91_PIOB 25 AT91_PERIPH_B AT91_PINCTRL_NONE   /* PB25 periph B GRX6, conflicts with SCK1 */
+                                                        AT91_PIOB 26 AT91_PERIPH_B AT91_PINCTRL_NONE>; /* PB26 periph B GRX7, conflicts with CTS1 */
                                        };
                                        pinctrl_macb0_signal_rgmii: macb0_signal_rgmii {
                                                atmel,pins =
-                                                       <1 8 0x1 0x0    /* PB8 periph A GTXCK, conflicts with PWMH2 */
-                                                        1 9 0x1 0x0    /* PB9 periph A GTXEN, conflicts with PWML2 */
-                                                        1 11 0x1 0x0   /* PB11 periph A GRXCK, conflicts with RD1 */
-                                                        1 13 0x1 0x0   /* PB13 periph A GRXER, conflicts with PWML3 */
-                                                        1 16 0x1 0x0   /* PB16 periph A GMDC */
-                                                        1 17 0x1 0x0   /* PB17 periph A GMDIO */
-                                                        1 18 0x1 0x0>; /* PB18 periph A G125CK */
+                                                       <AT91_PIOB 8 AT91_PERIPH_A AT91_PINCTRL_NONE    /* PB8 periph A GTXCK, conflicts with PWMH2 */
+                                                        AT91_PIOB 9 AT91_PERIPH_A AT91_PINCTRL_NONE    /* PB9 periph A GTXEN, conflicts with PWML2 */
+                                                        AT91_PIOB 11 AT91_PERIPH_A AT91_PINCTRL_NONE   /* PB11 periph A GRXCK, conflicts with RD1 */
+                                                        AT91_PIOB 13 AT91_PERIPH_A AT91_PINCTRL_NONE   /* PB13 periph A GRXER, conflicts with PWML3 */
+                                                        AT91_PIOB 16 AT91_PERIPH_A AT91_PINCTRL_NONE   /* PB16 periph A GMDC */
+                                                        AT91_PIOB 17 AT91_PERIPH_A AT91_PINCTRL_NONE   /* PB17 periph A GMDIO */
+                                                        AT91_PIOB 18 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* PB18 periph A G125CK */
                                        };
                                        pinctrl_macb0_signal_gmii: macb0_signal_gmii {
                                                atmel,pins =
-                                                       <1 9 0x1 0x0    /* PB9 periph A GTXEN, conflicts with PWML2 */
-                                                        1 10 0x1 0x0   /* PB10 periph A GTXER, conflicts with RF1 */
-                                                        1 11 0x1 0x0   /* PB11 periph A GRXCK, conflicts with RD1 */
-                                                        1 12 0x1 0x0   /* PB12 periph A GRXDV, conflicts with PWMH3 */
-                                                        1 13 0x1 0x0   /* PB13 periph A GRXER, conflicts with PWML3 */
-                                                        1 14 0x1 0x0   /* PB14 periph A GCRS, conflicts with CANRX1 */
-                                                        1 15 0x1 0x0   /* PB15 periph A GCOL, conflicts with CANTX1 */
-                                                        1 16 0x1 0x0   /* PB16 periph A GMDC */
-                                                        1 17 0x1 0x0   /* PB17 periph A GMDIO */
-                                                        1 27 0x2 0x0>; /* PB27 periph B G125CKO */
+                                                       <AT91_PIOB 9 AT91_PERIPH_A AT91_PINCTRL_NONE    /* PB9 periph A GTXEN, conflicts with PWML2 */
+                                                        AT91_PIOB 10 AT91_PERIPH_A AT91_PINCTRL_NONE   /* PB10 periph A GTXER, conflicts with RF1 */
+                                                        AT91_PIOB 11 AT91_PERIPH_A AT91_PINCTRL_NONE   /* PB11 periph A GRXCK, conflicts with RD1 */
+                                                        AT91_PIOB 12 AT91_PERIPH_A AT91_PINCTRL_NONE   /* PB12 periph A GRXDV, conflicts with PWMH3 */
+                                                        AT91_PIOB 13 AT91_PERIPH_A AT91_PINCTRL_NONE   /* PB13 periph A GRXER, conflicts with PWML3 */
+                                                        AT91_PIOB 14 AT91_PERIPH_A AT91_PINCTRL_NONE   /* PB14 periph A GCRS, conflicts with CANRX1 */
+                                                        AT91_PIOB 15 AT91_PERIPH_A AT91_PINCTRL_NONE   /* PB15 periph A GCOL, conflicts with CANTX1 */
+                                                        AT91_PIOB 16 AT91_PERIPH_A AT91_PINCTRL_NONE   /* PB16 periph A GMDC */
+                                                        AT91_PIOB 17 AT91_PERIPH_A AT91_PINCTRL_NONE   /* PB17 periph A GMDIO */
+                                                        AT91_PIOB 27 AT91_PERIPH_B AT91_PINCTRL_NONE>; /* PB27 periph B G125CKO */
                                        };
 
                                };
                                macb1 {
                                        pinctrl_macb1_rmii: macb1_rmii-0 {
                                                atmel,pins =
-                                                       <2 0 0x1 0x0    /* PC0 periph A ETX0, conflicts with TIOA3 */
-                                                        2 1 0x1 0x0    /* PC1 periph A ETX1, conflicts with TIOB3 */
-                                                        2 2 0x1 0x0    /* PC2 periph A ERX0, conflicts with TCLK3 */
-                                                        2 3 0x1 0x0    /* PC3 periph A ERX1, conflicts with TIOA4 */
-                                                        2 4 0x1 0x0    /* PC4 periph A ETXEN, conflicts with TIOB4 */
-                                                        2 5 0x1 0x0    /* PC5 periph A ECRSDV,conflicts with TCLK4 */
-                                                        2 6 0x1 0x0    /* PC6 periph A ERXER, conflicts with TIOA5 */
-                                                        2 7 0x1 0x0    /* PC7 periph A EREFCK, conflicts with TIOB5 */
-                                                        2 8 0x1 0x0    /* PC8 periph A EMDC, conflicts with TCLK5 */
-                                                        2 9 0x1 0x0>;  /* PC9 periph A EMDIO  */
+                                                       <AT91_PIOC 0 AT91_PERIPH_A AT91_PINCTRL_NONE    /* PC0 periph A ETX0, conflicts with TIOA3 */
+                                                        AT91_PIOC 1 AT91_PERIPH_A AT91_PINCTRL_NONE    /* PC1 periph A ETX1, conflicts with TIOB3 */
+                                                        AT91_PIOC 2 AT91_PERIPH_A AT91_PINCTRL_NONE    /* PC2 periph A ERX0, conflicts with TCLK3 */
+                                                        AT91_PIOC 3 AT91_PERIPH_A AT91_PINCTRL_NONE    /* PC3 periph A ERX1, conflicts with TIOA4 */
+                                                        AT91_PIOC 4 AT91_PERIPH_A AT91_PINCTRL_NONE    /* PC4 periph A ETXEN, conflicts with TIOB4 */
+                                                        AT91_PIOC 5 AT91_PERIPH_A AT91_PINCTRL_NONE    /* PC5 periph A ECRSDV,conflicts with TCLK4 */
+                                                        AT91_PIOC 6 AT91_PERIPH_A AT91_PINCTRL_NONE    /* PC6 periph A ERXER, conflicts with TIOA5 */
+                                                        AT91_PIOC 7 AT91_PERIPH_A AT91_PINCTRL_NONE    /* PC7 periph A EREFCK, conflicts with TIOB5 */
+                                                        AT91_PIOC 8 AT91_PERIPH_A AT91_PINCTRL_NONE    /* PC8 periph A EMDC, conflicts with TCLK5 */
+                                                        AT91_PIOC 9 AT91_PERIPH_A AT91_PINCTRL_NONE>;  /* PC9 periph A EMDIO  */
                                        };
                                };
 
                                mmc0 {
                                        pinctrl_mmc0_clk_cmd_dat0: mmc0_clk_cmd_dat0 {
                                                atmel,pins =
-                                                       <3 9 0x1 0x0    /* PD9 periph A MCI0_CK */
-                                                        3 0 0x1 0x1    /* PD0 periph A MCI0_CDA with pullup */
-                                                        3 1 0x1 0x1>;  /* PD1 periph A MCI0_DA0 with pullup */
+                                                       <AT91_PIOD 9 AT91_PERIPH_A AT91_PINCTRL_NONE    /* PD9 periph A MCI0_CK */
+                                                        AT91_PIOD 0 AT91_PERIPH_A AT91_PINCTRL_PULL_UP /* PD0 periph A MCI0_CDA with pullup */
+                                                        AT91_PIOD 1 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>;       /* PD1 periph A MCI0_DA0 with pullup */
                                        };
                                        pinctrl_mmc0_dat1_3: mmc0_dat1_3 {
                                                atmel,pins =
-                                                       <3 2 0x1 0x1    /* PD2 periph A MCI0_DA1 with pullup */
-                                                        3 3 0x1 0x1    /* PD3 periph A MCI0_DA2 with pullup */
-                                                        3 4 0x1 0x1>;  /* PD4 periph A MCI0_DA3 with pullup */
+                                                       <AT91_PIOD 2 AT91_PERIPH_A AT91_PINCTRL_PULL_UP /* PD2 periph A MCI0_DA1 with pullup */
+                                                        AT91_PIOD 3 AT91_PERIPH_A AT91_PINCTRL_PULL_UP /* PD3 periph A MCI0_DA2 with pullup */
+                                                        AT91_PIOD 4 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>;       /* PD4 periph A MCI0_DA3 with pullup */
                                        };
                                        pinctrl_mmc0_dat4_7: mmc0_dat4_7 {
                                                atmel,pins =
-                                                       <3 5 0x1 0x1    /* PD5 periph A MCI0_DA4 with pullup, conflicts with TIOA0, PWMH2 */
-                                                        3 6 0x1 0x1    /* PD6 periph A MCI0_DA5 with pullup, conflicts with TIOB0, PWML2 */
-                                                        3 7 0x1 0x1    /* PD7 periph A MCI0_DA6 with pullup, conlicts with TCLK0, PWMH3 */
-                                                        3 8 0x1 0x1>;  /* PD8 periph A MCI0_DA7 with pullup, conflicts with PWML3 */
+                                                       <AT91_PIOD 5 AT91_PERIPH_A AT91_PINCTRL_PULL_UP /* PD5 periph A MCI0_DA4 with pullup, conflicts with TIOA0, PWMH2 */
+                                                        AT91_PIOD 6 AT91_PERIPH_A AT91_PINCTRL_PULL_UP /* PD6 periph A MCI0_DA5 with pullup, conflicts with TIOB0, PWML2 */
+                                                        AT91_PIOD 7 AT91_PERIPH_A AT91_PINCTRL_PULL_UP /* PD7 periph A MCI0_DA6 with pullup, conlicts with TCLK0, PWMH3 */
+                                                        AT91_PIOD 8 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>;       /* PD8 periph A MCI0_DA7 with pullup, conflicts with PWML3 */
                                        };
                                };
 
                                mmc1 {
                                        pinctrl_mmc1_clk_cmd_dat0: mmc1_clk_cmd_dat0 {
                                                atmel,pins =
-                                                       <1 24 0x1 0x0   /* PB24 periph A MCI1_CK, conflicts with GRX5 */
-                                                        1 19 0x1 0x1   /* PB19 periph A MCI1_CDA with pullup, conflicts with GTX4 */
-                                                        1 20 0x1 0x1>; /* PB20 periph A MCI1_DA0 with pullup, conflicts with GTX5 */
+                                                       <AT91_PIOB 24 AT91_PERIPH_A AT91_PINCTRL_NONE   /* PB24 periph A MCI1_CK, conflicts with GRX5 */
+                                                        AT91_PIOB 19 AT91_PERIPH_A AT91_PINCTRL_PULL_UP        /* PB19 periph A MCI1_CDA with pullup, conflicts with GTX4 */
+                                                        AT91_PIOB 20 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>;      /* PB20 periph A MCI1_DA0 with pullup, conflicts with GTX5 */
                                        };
                                        pinctrl_mmc1_dat1_3: mmc1_dat1_3 {
                                                atmel,pins =
-                                                       <1 21 0x1 0x1   /* PB21 periph A MCI1_DA1 with pullup, conflicts with GTX6 */
-                                                        1 22 0x1 0x1   /* PB22 periph A MCI1_DA2 with pullup, conflicts with GTX7 */
-                                                        1 23 0x1 0x1>; /* PB23 periph A MCI1_DA3 with pullup, conflicts with GRX4 */
+                                                       <AT91_PIOB 21 AT91_PERIPH_A AT91_PINCTRL_PULL_UP        /* PB21 periph A MCI1_DA1 with pullup, conflicts with GTX6 */
+                                                        AT91_PIOB 22 AT91_PERIPH_A AT91_PINCTRL_PULL_UP        /* PB22 periph A MCI1_DA2 with pullup, conflicts with GTX7 */
+                                                        AT91_PIOB 23 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>;      /* PB23 periph A MCI1_DA3 with pullup, conflicts with GRX4 */
                                        };
                                };
 
                                mmc2 {
                                        pinctrl_mmc2_clk_cmd_dat0: mmc2_clk_cmd_dat0 {
                                                atmel,pins =
-                                                       <2 15 0x1 0x0   /* PC15 periph A MCI2_CK, conflicts with PCK2 */
-                                                        2 10 0x1 0x1   /* PC10 periph A MCI2_CDA with pullup */
-                                                        2 11 0x1 0x1>; /* PC11 periph A MCI2_DA0 with pullup */
+                                                       <AT91_PIOC 15 AT91_PERIPH_A AT91_PINCTRL_NONE   /* PC15 periph A MCI2_CK, conflicts with PCK2 */
+                                                        AT91_PIOC 10 AT91_PERIPH_A AT91_PINCTRL_PULL_UP        /* PC10 periph A MCI2_CDA with pullup */
+                                                        AT91_PIOC 11 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>;      /* PC11 periph A MCI2_DA0 with pullup */
                                        };
                                        pinctrl_mmc2_dat1_3: mmc2_dat1_3 {
                                                atmel,pins =
-                                                       <2 12 0x1 0x0   /* PC12 periph A MCI2_DA1 with pullup, conflicts with TIOA1 */
-                                                        2 13 0x1 0x0   /* PC13 periph A MCI2_DA2 with pullup, conflicts with TIOB1 */
-                                                        2 14 0x1 0x0>; /* PC14 periph A MCI2_DA3 with pullup, conflicts with TCLK1 */
+                                                       <AT91_PIOC 12 AT91_PERIPH_A AT91_PINCTRL_NONE   /* PC12 periph A MCI2_DA1 with pullup, conflicts with TIOA1 */
+                                                        AT91_PIOC 13 AT91_PERIPH_A AT91_PINCTRL_NONE   /* PC13 periph A MCI2_DA2 with pullup, conflicts with TIOB1 */
+                                                        AT91_PIOC 14 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* PC14 periph A MCI2_DA3 with pullup, conflicts with TCLK1 */
                                        };
                                };
 
                                nand0 {
                                        pinctrl_nand0_ale_cle: nand0_ale_cle-0 {
                                                atmel,pins =
-                                                       <4 21 0x1 0x1   /* PE21 periph A with pullup */
-                                                        4 22 0x1 0x1>; /* PE22 periph A with pullup */
+                                                       <AT91_PIOE 21 AT91_PERIPH_A AT91_PINCTRL_PULL_UP        /* PE21 periph A with pullup */
+                                                        AT91_PIOE 22 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>;      /* PE22 periph A with pullup */
                                        };
                                };
 
-                               pioA: gpio@fffff200 {
-                                       compatible = "atmel,at91sam9x5-gpio", "atmel,at91rm9200-gpio";
-                                       reg = <0xfffff200 0x100>;
-                                       interrupts = <6 4 1>;
-                                       #gpio-cells = <2>;
-                                       gpio-controller;
-                                       interrupt-controller;
-                                       #interrupt-cells = <2>;
-                               };
-
-                               pioB: gpio@fffff400 {
-                                       compatible = "atmel,at91sam9x5-gpio", "atmel,at91rm9200-gpio";
-                                       reg = <0xfffff400 0x100>;
-                                       interrupts = <7 4 1>;
-                                       #gpio-cells = <2>;
-                                       gpio-controller;
-                                       interrupt-controller;
-                                       #interrupt-cells = <2>;
-                               };
-
-                               pioC: gpio@fffff600 {
-                                       compatible = "atmel,at91sam9x5-gpio", "atmel,at91rm9200-gpio";
-                                       reg = <0xfffff600 0x100>;
-                                       interrupts = <8 4 1>;
-                                       #gpio-cells = <2>;
-                                       gpio-controller;
-                                       interrupt-controller;
-                                       #interrupt-cells = <2>;
-                               };
-
-                               pioD: gpio@fffff800 {
-                                       compatible = "atmel,at91sam9x5-gpio", "atmel,at91rm9200-gpio";
-                                       reg = <0xfffff800 0x100>;
-                                       interrupts = <9 4 1>;
-                                       #gpio-cells = <2>;
-                                       gpio-controller;
-                                       interrupt-controller;
-                                       #interrupt-cells = <2>;
-                               };
-
-                               pioE: gpio@fffffa00 {
-                                       compatible = "atmel,at91sam9x5-gpio", "atmel,at91rm9200-gpio";
-                                       reg = <0xfffffa00 0x100>;
-                                       interrupts = <10 4 1>;
-                                       #gpio-cells = <2>;
-                                       gpio-controller;
-                                       interrupt-controller;
-                                       #interrupt-cells = <2>;
-                               };
-
                                spi0 {
                                        pinctrl_spi0: spi0-0 {
                                                atmel,pins =
-                                                       <3 10 0x1 0x0   /* PD10 periph A SPI0_MISO pin */
-                                                        3 11 0x1 0x0   /* PD11 periph A SPI0_MOSI pin */
-                                                        3 12 0x1 0x0   /* PD12 periph A SPI0_SPCK pin */
-                                                        3 13 0x0 0x0>; /* PD13 GPIO SPI0_NPCS0 pin */
+                                                       <AT91_PIOD 10 AT91_PERIPH_A AT91_PINCTRL_NONE   /* PD10 periph A SPI0_MISO pin */
+                                                        AT91_PIOD 11 AT91_PERIPH_A AT91_PINCTRL_NONE   /* PD11 periph A SPI0_MOSI pin */
+                                                        AT91_PIOD 12 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* PD12 periph A SPI0_SPCK pin */
                                        };
                                };
 
                                spi1 {
                                        pinctrl_spi1: spi1-0 {
                                                atmel,pins =
-                                                       <2 22 0x1 0x0   /* PC22 periph A SPI1_MISO pin */
-                                                        2 23 0x1 0x0   /* PC23 periph A SPI1_MOSI pin */
-                                                        2 24 0x1 0x0   /* PC24 periph A SPI1_SPCK pin */
-                                                        2 25 0x0 0x0>; /* PC25 GPIO SPI1_NPCS0 pin */
+                                                       <AT91_PIOC 22 AT91_PERIPH_A AT91_PINCTRL_NONE   /* PC22 periph A SPI1_MISO pin */
+                                                        AT91_PIOC 23 AT91_PERIPH_A AT91_PINCTRL_NONE   /* PC23 periph A SPI1_MOSI pin */
+                                                        AT91_PIOC 24 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* PC24 periph A SPI1_SPCK pin */
                                        };
                                };
 
                                ssc0 {
                                        pinctrl_ssc0_tx: ssc0_tx {
                                                atmel,pins =
-                                                       <2 16 0x1 0x0   /* PC16 periph A TK0 */
-                                                        2 17 0x1 0x0   /* PC17 periph A TF0 */
-                                                        2 18 0x1 0x0>; /* PC18 periph A TD0 */
+                                                       <AT91_PIOC 16 AT91_PERIPH_A AT91_PINCTRL_NONE   /* PC16 periph A TK0 */
+                                                        AT91_PIOC 17 AT91_PERIPH_A AT91_PINCTRL_NONE   /* PC17 periph A TF0 */
+                                                        AT91_PIOC 18 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* PC18 periph A TD0 */
                                        };
 
                                        pinctrl_ssc0_rx: ssc0_rx {
                                                atmel,pins =
-                                                       <2 19 0x1 0x0   /* PC19 periph A RK0 */
-                                                        2 20 0x1 0x0   /* PC20 periph A RF0 */
-                                                        2 21 0x1 0x0>; /* PC21 periph A RD0 */
+                                                       <AT91_PIOC 19 AT91_PERIPH_A AT91_PINCTRL_NONE   /* PC19 periph A RK0 */
+                                                        AT91_PIOC 20 AT91_PERIPH_A AT91_PINCTRL_NONE   /* PC20 periph A RF0 */
+                                                        AT91_PIOC 21 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* PC21 periph A RD0 */
                                        };
                                };
 
                                ssc1 {
                                        pinctrl_ssc1_tx: ssc1_tx {
                                                atmel,pins =
-                                                       <1 2 0x2 0x0    /* PB2 periph B TK1, conflicts with GTX2 */
-                                                        1 3 0x2 0x0    /* PB3 periph B TF1, conflicts with GTX3 */
-                                                        1 6 0x2 0x0>;  /* PB6 periph B TD1, conflicts with TD1 */
+                                                       <AT91_PIOB 2 AT91_PERIPH_B AT91_PINCTRL_NONE    /* PB2 periph B TK1, conflicts with GTX2 */
+                                                        AT91_PIOB 3 AT91_PERIPH_B AT91_PINCTRL_NONE    /* PB3 periph B TF1, conflicts with GTX3 */
+                                                        AT91_PIOB 6 AT91_PERIPH_B AT91_PINCTRL_NONE>;  /* PB6 periph B TD1, conflicts with TD1 */
                                        };
 
                                        pinctrl_ssc1_rx: ssc1_rx {
                                                atmel,pins =
-                                                       <1 7 0x2 0x0    /* PB7 periph B RK1, conflicts with EREFCK */
-                                                        1 10 0x2 0x0   /* PB10 periph B RF1, conflicts with GTXER */
-                                                        1 11 0x2 0x0>; /* PB11 periph B RD1, conflicts with GRXCK */
+                                                       <AT91_PIOB 7 AT91_PERIPH_B AT91_PINCTRL_NONE    /* PB7 periph B RK1, conflicts with EREFCK */
+                                                        AT91_PIOB 10 AT91_PERIPH_B AT91_PINCTRL_NONE   /* PB10 periph B RF1, conflicts with GTXER */
+                                                        AT91_PIOB 11 AT91_PERIPH_B AT91_PINCTRL_NONE>; /* PB11 periph B RD1, conflicts with GRXCK */
                                        };
                                };
 
                                uart0 {
                                        pinctrl_uart0: uart0-0 {
                                                atmel,pins =
-                                                       <2 29 0x1 0x0   /* PC29 periph A, conflicts with PWMFI2, ISI_D8 */
-                                                        2 30 0x1 0x1>; /* PC30 periph A with pullup, conflicts with ISI_PCK */
+                                                       <AT91_PIOC 29 AT91_PERIPH_A AT91_PINCTRL_NONE   /* PC29 periph A, conflicts with PWMFI2, ISI_D8 */
+                                                        AT91_PIOC 30 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>;      /* PC30 periph A with pullup, conflicts with ISI_PCK */
                                        };
                                };
 
                                uart1 {
                                        pinctrl_uart1: uart1-0 {
                                                atmel,pins =
-                                                       <0 30 0x2 0x0   /* PA30 periph B, conflicts with TWD0, ISI_VSYNC */
-                                                        0 31 0x2 0x1>; /* PA31 periph B with pullup, conflicts with TWCK0, ISI_HSYNC */
+                                                       <AT91_PIOA 30 AT91_PERIPH_B AT91_PINCTRL_NONE   /* PA30 periph B, conflicts with TWD0, ISI_VSYNC */
+                                                        AT91_PIOA 31 AT91_PERIPH_B AT91_PINCTRL_PULL_UP>;      /* PA31 periph B with pullup, conflicts with TWCK0, ISI_HSYNC */
                                        };
                                };
 
                                usart0 {
                                        pinctrl_usart0: usart0-0 {
                                                atmel,pins =
-                                                       <3 17 0x1 0x0   /* PD17 periph A */
-                                                        3 18 0x1 0x1>; /* PD18 periph A with pullup */
+                                                       <AT91_PIOD 17 AT91_PERIPH_A AT91_PINCTRL_NONE   /* PD17 periph A */
+                                                        AT91_PIOD 18 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>;      /* PD18 periph A with pullup */
                                        };
 
                                        pinctrl_usart0_rts_cts: usart0_rts_cts-0 {
                                                atmel,pins =
-                                                       <3 15 0x1 0x0   /* PD15 periph A, conflicts with SPI0_NPCS2, CANTX0 */
-                                                        3 16 0x1 0x0>; /* PD16 periph A, conflicts with SPI0_NPCS3, PWMFI3 */
+                                                       <AT91_PIOD 15 AT91_PERIPH_A AT91_PINCTRL_NONE   /* PD15 periph A, conflicts with SPI0_NPCS2, CANTX0 */
+                                                        AT91_PIOD 16 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* PD16 periph A, conflicts with SPI0_NPCS3, PWMFI3 */
                                        };
                                };
 
                                usart1 {
                                        pinctrl_usart1: usart1-0 {
                                                atmel,pins =
-                                                       <1 28 0x1 0x0   /* PB28 periph A */
-                                                        1 29 0x1 0x1>; /* PB29 periph A with pullup */
+                                                       <AT91_PIOB 28 AT91_PERIPH_A AT91_PINCTRL_NONE   /* PB28 periph A */
+                                                        AT91_PIOB 29 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>;      /* PB29 periph A with pullup */
                                        };
 
                                        pinctrl_usart1_rts_cts: usart1_rts_cts-0 {
                                                atmel,pins =
-                                                       <1 26 0x1 0x0   /* PB26 periph A, conflicts with GRX7 */
-                                                        1 27 0x1 0x0>; /* PB27 periph A, conflicts with G125CKO */
+                                                       <AT91_PIOB 26 AT91_PERIPH_A AT91_PINCTRL_NONE   /* PB26 periph A, conflicts with GRX7 */
+                                                        AT91_PIOB 27 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* PB27 periph A, conflicts with G125CKO */
                                        };
                                };
 
                                usart2 {
                                        pinctrl_usart2: usart2-0 {
                                                atmel,pins =
-                                                       <4 25 0x2 0x0   /* PE25 periph B, conflicts with A25 */
-                                                        4 26 0x2 0x1>; /* PE26 periph B with pullup, conflicts NCS0 */
+                                                       <AT91_PIOE 25 AT91_PERIPH_B AT91_PINCTRL_NONE   /* PE25 periph B, conflicts with A25 */
+                                                        AT91_PIOE 26 AT91_PERIPH_B AT91_PINCTRL_PULL_UP>;      /* PE26 periph B with pullup, conflicts NCS0 */
                                        };
 
                                        pinctrl_usart2_rts_cts: usart2_rts_cts-0 {
                                                atmel,pins =
-                                                       <4 23 0x2 0x0   /* PE23 periph B, conflicts with A23 */
-                                                        4 24 0x2 0x0>; /* PE24 periph B, conflicts with A24 */
+                                                       <AT91_PIOE 23 AT91_PERIPH_B AT91_PINCTRL_NONE   /* PE23 periph B, conflicts with A23 */
+                                                        AT91_PIOE 24 AT91_PERIPH_B AT91_PINCTRL_NONE>; /* PE24 periph B, conflicts with A24 */
                                        };
                                };
 
                                usart3 {
                                        pinctrl_usart3: usart3-0 {
                                                atmel,pins =
-                                                       <4 18 0x2 0x0   /* PE18 periph B, conflicts with A18 */
-                                                        4 19 0x2 0x1>; /* PE19 periph B with pullup, conflicts with A19 */
+                                                       <AT91_PIOE 18 AT91_PERIPH_B AT91_PINCTRL_NONE   /* PE18 periph B, conflicts with A18 */
+                                                        AT91_PIOE 19 AT91_PERIPH_B AT91_PINCTRL_PULL_UP>;      /* PE19 periph B with pullup, conflicts with A19 */
                                        };
 
                                        pinctrl_usart3_rts_cts: usart3_rts_cts-0 {
                                                atmel,pins =
-                                                       <4 16 0x2 0x0   /* PE16 periph B, conflicts with A16 */
-                                                        4 17 0x2 0x0>; /* PE17 periph B, conflicts with A17 */
+                                                       <AT91_PIOE 16 AT91_PERIPH_B AT91_PINCTRL_NONE   /* PE16 periph B, conflicts with A16 */
+                                                        AT91_PIOE 17 AT91_PERIPH_B AT91_PINCTRL_NONE>; /* PE17 periph B, conflicts with A17 */
                                        };
                                };
+
+
+                               pioA: gpio@fffff200 {
+                                       compatible = "atmel,at91sam9x5-gpio", "atmel,at91rm9200-gpio";
+                                       reg = <0xfffff200 0x100>;
+                                       interrupts = <6 4 1>;
+                                       #gpio-cells = <2>;
+                                       gpio-controller;
+                                       interrupt-controller;
+                                       #interrupt-cells = <2>;
+                               };
+
+                               pioB: gpio@fffff400 {
+                                       compatible = "atmel,at91sam9x5-gpio", "atmel,at91rm9200-gpio";
+                                       reg = <0xfffff400 0x100>;
+                                       interrupts = <7 4 1>;
+                                       #gpio-cells = <2>;
+                                       gpio-controller;
+                                       interrupt-controller;
+                                       #interrupt-cells = <2>;
+                               };
+
+                               pioC: gpio@fffff600 {
+                                       compatible = "atmel,at91sam9x5-gpio", "atmel,at91rm9200-gpio";
+                                       reg = <0xfffff600 0x100>;
+                                       interrupts = <8 4 1>;
+                                       #gpio-cells = <2>;
+                                       gpio-controller;
+                                       interrupt-controller;
+                                       #interrupt-cells = <2>;
+                               };
+
+                               pioD: gpio@fffff800 {
+                                       compatible = "atmel,at91sam9x5-gpio", "atmel,at91rm9200-gpio";
+                                       reg = <0xfffff800 0x100>;
+                                       interrupts = <9 4 1>;
+                                       #gpio-cells = <2>;
+                                       gpio-controller;
+                                       interrupt-controller;
+                                       #interrupt-cells = <2>;
+                               };
+
+                               pioE: gpio@fffffa00 {
+                                       compatible = "atmel,at91sam9x5-gpio", "atmel,at91rm9200-gpio";
+                                       reg = <0xfffffa00 0x100>;
+                                       interrupts = <10 4 1>;
+                                       #gpio-cells = <2>;
+                                       gpio-controller;
+                                       interrupt-controller;
+                                       #interrupt-cells = <2>;
+                               };
                        };
 
                        pmc: pmc@fffffc00 {
index 4b8830eb20603c7593618e3fc5c75613025b367b..1c296d6b2f2a7925cd3af7d9b6e73e439d17d25d 100644 (file)
@@ -33,7 +33,7 @@
                                board {
                                        pinctrl_qt1070_irq: qt1070_irq {
                                                atmel,pins =
-                                                       <4 31 0x0 0x5>; /* PE31 GPIO with pull up deglith */
+                                                       <AT91_PIOE 31 AT91_PERIPH_GPIO AT91_PINCTRL_PULL_UP_DEGLITCH>; /* PE31 GPIO with pull up deglith */
                                        };
                                };
                        };
index 205e64c5ddeea4baee62209e3e45067062c17afb..8a9e05d8a4b87dc870bb293eb7b65c26f0241b19 100644 (file)
                                board {
                                        pinctrl_mmc0_cd: mmc0_cd {
                                                atmel,pins =
-                                                       <3 17 0x0 0x5>; /* PD17 GPIO with pullup deglitch */
+                                                       <AT91_PIOD 17 AT91_PERIPH_GPIO AT91_PINCTRL_PULL_UP_DEGLITCH>; /* PD17 GPIO with pullup deglitch */
                                        };
 
                                        pinctrl_mmc1_cd: mmc1_cd {
                                                atmel,pins =
-                                                       <3 18 0x0 0x5>; /* PD18 GPIO with pullup deglitch */
+                                                       <AT91_PIOD 18 AT91_PERIPH_GPIO AT91_PINCTRL_PULL_UP_DEGLITCH>; /* PD18 GPIO with pullup deglitch */
                                        };
 
                                        pinctrl_pck0_as_audio_mck: pck0_as_audio_mck {
                                                atmel,pins =
-                                                       <3 30 0x2 0x0>; /* PD30 periph B */
+                                                       <AT91_PIOD 30 AT91_PERIPH_B AT91_PINCTRL_NONE>; /* PD30 periph B */
                                        };
 
                                        pinctrl_isi_reset: isi_reset-0 {
                                                atmel,pins =
-                                                       <4 24 0x0 0x0>;   /* PE24 gpio */
+                                                       <AT91_PIOE 24 AT91_PERIPH_GPIO AT91_PINCTRL_NONE>;   /* PE24 gpio */
                                        };
 
                                        pinctrl_isi_power: isi_power-0 {
                                                atmel,pins =
-                                                       <4 29 0x0 0x0>; /* PE29 gpio */
+                                                       <AT91_PIOE 29 AT91_PERIPH_GPIO AT91_PINCTRL_NONE>; /* PE29 gpio */
                                        };
 
                                        pinctrl_usba_vbus: usba_vbus {
                                                atmel,pins =
-                                                       <3 29 0x0 0x4>; /* PD29 GPIO with deglitch */
+                                                       <AT91_PIOD 29 AT91_PERIPH_GPIO AT91_PINCTRL_DEGLITCH>; /* PD29 GPIO with deglitch */
                                        };
                                };
                        };