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
git-mirror · Jan 30, 2013 · 825bf91 · 825bf91
2 parents 89e19ff + 7d4cfec
commit 825bf91
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/arch/arm/boot/dts/at91sam9x5.dtsi b/arch/arm/boot/dts/at91sam9x5.dtsi
@@ -197,9 +197,9 @@
 				};
 
 				usart3 {
-					pinctrl_uart3: usart3-0 {
+					pinctrl_usart3: usart3-0 {
 						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 */
 					};