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

Commit 825bf91e authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'at91-fixes' of git://github.com/at91linux/linux-at91 into fixes 

From Nicolas Ferre:
Two little Device Tree fixes for USART on at91sam9x5.

* tag 'at91-fixes' of git://github.com/at91linux/linux-at91:
  ARM: at91/at91sam9x5.dtsi: fix usart3 TXD
  ARM: at91: at91sam9x5: fix usart3 pinctrl name
parents 89e19ffa 7d4cfece

arch/arm/boot/dts/at91sam9x5.dtsi

+2 −2
Original line number Original line Diff line number Diff line
@@ -197,9 +197,9 @@ 
				};

				};





				usart3 {

				usart3 {

					pinctrl_uart3: usart3-0 {

					pinctrl_usart3: usart3-0 {

						atmel,pins =

						atmel,pins =

							<2 23 0x2 0x1	/* PC22 periph B with pullup */

							<2 22 0x2 0x1	/* PC22 periph B with pullup */

							 2 23 0x2 0x0>;	/* PC23 periph B */

							 2 23 0x2 0x0>;	/* PC23 periph B */

					};

					};