ARM: at91: dt: switch to pinctrl to pre-processor (c9d0f317) · Commits · e / devices / android_kernel_fairphone_FP5

arch/arm/boot/dts/at91rm9200.dtsi

+76 −75

Original line number	Diff line number	Diff line
		@@ -11,6 +11,7 @@
		*/

		#include "skeleton.dtsi"
		#include <dt-bindings/pinctrl/at91.h>
		#include <dt-bindings/gpio/gpio.h>

		/ {
		@@ -168,227 +169,227 @@
		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 */
		};
		};

arch/arm/boot/dts/at91sam9260.dtsi

+78 −77

Original line number	Diff line number	Diff line
		@@ -9,6 +9,7 @@
		*/

		#include "skeleton.dtsi"
		#include <dt-bindings/pinctrl/at91.h>
		#include <dt-bindings/gpio/gpio.h>

		/ {
		@@ -117,227 +118,227 @@
		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 */
		};
		};

arch/arm/boot/dts/at91sam9263.dtsi

+75 −74

File changed.

Preview size limit exceeded, changes collapsed.

arch/arm/boot/dts/at91sam9263ek.dts

+2 −2

Original line number	Diff line number	Diff line
		@@ -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 */
		};
		};
		};

arch/arm/boot/dts/at91sam9g20ek_2mmc.dts

+1 −1

Original line number	Diff line number	Diff line
		@@ -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 */
		};
		};
		};