summaryrefslogtreecommitdiff
path: root/arch/arm
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2013-01-30 09:37:10 -0800
committerOlof Johansson <olof@lixom.net>2013-01-30 09:37:10 -0800
commit825bf91edc0666bcc5d80c29742871fa818a5f84 (patch)
treeacdb1a57998a73ba7d533d69dc981fae7e5f3df4 /arch/arm
parent89e19ffac19498c7de295876fecfd4c8c931bab1 (diff)
parent7d4cfece23f535b60496d88a717a3d7bfca50187 (diff)
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
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/boot/dts/at91sam9x5.dtsi4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/at91sam9x5.dtsi b/arch/arm/boot/dts/at91sam9x5.dtsi
index 8ecca6948d81..0c6009080b88 100644
--- 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 */
};