Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 692989c3 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'at91-ab-4.17-dt2' of... 

Merge tag 'at91-ab-4.17-dt2' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/abelloni/linux into next/dt

Pull "AT91 DT for 4.17 #2" from Alexandre Belloni:

Pinctrl fixes, the UART pullups were discussed back in 2016.

* tag 'at91-ab-4.17-dt2' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/abelloni/linux:
  ARM: dts: at91sam9260: pullup rx on usart0
  ARM: dts: at91rm9200: pullup rx on uart0
  ARM: dts: at91: fixes uart pinctrl, set pullup on rx, clear pullup on tx
  ARM: dts: at91: at91sam9g25: fix mux-mask pinctrl property
parents 11293cb7 26f2cacd

arch/arm/boot/dts/at91rm9200.dtsi

+8 −8
Original line number Diff line number Diff line
@@ -493,8 +493,8 @@ 
				uart0 {

					pinctrl_uart0: uart0-0 {

						atmel,pins =

							<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 17 AT91_PERIPH_A AT91_PINCTRL_NONE

							 AT91_PIOA 18 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>;

					};



					pinctrl_uart0_cts: uart0_cts-0 {
@@ -511,8 +511,8 @@ 
				uart1 {

					pinctrl_uart1: uart1-0 {

						atmel,pins =

							<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 */

							<AT91_PIOB 20 AT91_PERIPH_A AT91_PINCTRL_NONE

							 AT91_PIOB 21 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>;

					};



					pinctrl_uart1_rts: uart1_rts-0 {
@@ -545,8 +545,8 @@ 
				uart2 {

					pinctrl_uart2: uart2-0 {

						atmel,pins =

							<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 */

							<AT91_PIOA 22 AT91_PERIPH_A AT91_PINCTRL_PULL_UP

							 AT91_PIOA 23 AT91_PERIPH_A AT91_PINCTRL_NONE>;

					};



					pinctrl_uart2_rts: uart2_rts-0 {
@@ -563,8 +563,8 @@ 
				uart3 {

					pinctrl_uart3: uart3-0 {

						atmel,pins =

							<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 */

							<AT91_PIOA 5 AT91_PERIPH_B AT91_PINCTRL_NONE

							 AT91_PIOA 6 AT91_PERIPH_B AT91_PINCTRL_PULL_UP>;

					};



					pinctrl_uart3_rts: uart3_rts-0 {

arch/arm/boot/dts/at91sam9260.dtsi

+12 −12
Original line number Diff line number Diff line
@@ -434,8 +434,8 @@ 
				usart0 {

					pinctrl_usart0: usart0-0 {

						atmel,pins =

							<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 4 AT91_PERIPH_A AT91_PINCTRL_NONE

							 AT91_PIOB 5 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>;

					};



					pinctrl_usart0_rts: usart0_rts-0 {
@@ -468,8 +468,8 @@ 
				usart1 {

					pinctrl_usart1: usart1-0 {

						atmel,pins =

							<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 */

							<AT91_PIOB 6 AT91_PERIPH_A AT91_PINCTRL_NONE

							 AT91_PIOB 7 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>;

					};



					pinctrl_usart1_rts: usart1_rts-0 {
@@ -486,8 +486,8 @@ 
				usart2 {

					pinctrl_usart2: usart2-0 {

						atmel,pins =

							<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 */

							<AT91_PIOB 8 AT91_PERIPH_A AT91_PINCTRL_NONE

							 AT91_PIOB 9 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>;

					};



					pinctrl_usart2_rts: usart2_rts-0 {
@@ -504,8 +504,8 @@ 
				usart3 {

					pinctrl_usart3: usart3-0 {

						atmel,pins =

							<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 */

							<AT91_PIOB 10 AT91_PERIPH_A AT91_PINCTRL_NONE

							 AT91_PIOB 11 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>;

					};



					pinctrl_usart3_rts: usart3_rts-0 {
@@ -522,16 +522,16 @@ 
				uart0 {

					pinctrl_uart0: uart0-0 {

						atmel,pins =

							<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 */

							<AT91_PIOA 31 AT91_PERIPH_B AT91_PINCTRL_NONE

							 AT91_PIOA 30 AT91_PERIPH_B AT91_PINCTRL_PULL_UP>;

					};

				};



				uart1 {

					pinctrl_uart1: uart1-0 {

						atmel,pins =

							<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 */

							<AT91_PIOB 12 AT91_PERIPH_A AT91_PINCTRL_NONE

							 AT91_PIOB 13 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>;

					};

				};

arch/arm/boot/dts/at91sam9261.dtsi

+6 −6
Original line number Diff line number Diff line
@@ -328,8 +328,8 @@ 
				usart0 {

					pinctrl_usart0: usart0-0 {

						atmel,pins =

							<AT91_PIOC 8 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>,

							<AT91_PIOC 9 AT91_PERIPH_A AT91_PINCTRL_NONE>;

							<AT91_PIOC 8 AT91_PERIPH_A AT91_PINCTRL_NONE>,

							<AT91_PIOC 9 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>;

					};



					pinctrl_usart0_rts: usart0_rts-0 {
@@ -346,8 +346,8 @@ 
				usart1 {

					pinctrl_usart1: usart1-0 {

						atmel,pins =

							<AT91_PIOC 12 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>,

							<AT91_PIOC 13 AT91_PERIPH_A AT91_PINCTRL_NONE>;

							<AT91_PIOC 12 AT91_PERIPH_A AT91_PINCTRL_NONE>,

							<AT91_PIOC 13 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>;

					};



					pinctrl_usart1_rts: usart1_rts-0 {
@@ -364,8 +364,8 @@ 
				usart2 {

					pinctrl_usart2: usart2-0 {

						atmel,pins =

							<AT91_PIOC 14 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>,

							<AT91_PIOC 15 AT91_PERIPH_A AT91_PINCTRL_NONE>;

							<AT91_PIOC 14 AT91_PERIPH_A AT91_PINCTRL_NONE>,

							<AT91_PIOC 15 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>;

					};



					pinctrl_usart2_rts: usart2_rts-0 {

arch/arm/boot/dts/at91sam9263.dtsi

+6 −6
Original line number Diff line number Diff line
@@ -437,8 +437,8 @@ 
				usart0 {

					pinctrl_usart0: usart0-0 {

						atmel,pins =

							<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 */

							<AT91_PIOA 26 AT91_PERIPH_A AT91_PINCTRL_NONE

							 AT91_PIOA 27 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>;

					};



					pinctrl_usart0_rts: usart0_rts-0 {
@@ -455,8 +455,8 @@ 
				usart1 {

					pinctrl_usart1: usart1-0 {

						atmel,pins =

							<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 */

							<AT91_PIOD 0 AT91_PERIPH_A AT91_PINCTRL_NONE

							 AT91_PIOD 1 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>;

					};



					pinctrl_usart1_rts: usart1_rts-0 {
@@ -473,8 +473,8 @@ 
				usart2 {

					pinctrl_usart2: usart2-0 {

						atmel,pins =

							<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 */

							<AT91_PIOD 2 AT91_PERIPH_A AT91_PINCTRL_NONE

							 AT91_PIOD 3 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>;

					};



					pinctrl_usart2_rts: usart2_rts-0 {

arch/arm/boot/dts/at91sam9g25.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ 
				atmel,mux-mask = <

				      /*    A         B          C     */

				       0xffffffff 0xffe0399f 0xc000001c  /* pioA */

				       0x0007ffff 0x8000fe3f 0x00000000  /* pioB */

				       0x0007ffff 0x00047e3f 0x00000000  /* pioB */

				       0x80000000 0x07c0ffff 0xb83fffff  /* pioC */

				       0x003fffff 0x003f8000 0x00000000  /* pioD */

				      >;