summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorDouglas Gilbert <dgilbert@interlog.com>2013-04-04 18:19:55 +0200
committerNicolas Ferre <nicolas.ferre@atmel.com>2013-04-04 18:31:17 +0200
commitf10491fff07dcced77f8ab1b3bc1f8e18715bfb9 (patch)
tree0c803ce75979837748fde0217acf65f74dd6cb02 /arch
parent4b50da658e603ca122a7834b3b14118053b40008 (diff)
downloadop-kernel-dev-f10491fff07dcced77f8ab1b3bc1f8e18715bfb9.zip
op-kernel-dev-f10491fff07dcced77f8ab1b3bc1f8e18715bfb9.tar.gz
ARM: at91/at91sam9260.dtsi: fix u(s)art pinctrl encoding
Signed-off-by: Douglas Gilbert <dgilbert@interlog.com> [nicolas.ferre@atmel.com: fix rts/cts for usart3] Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com> Cc: stable <stable@vger.kernel.org> [3.8+]
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/boot/dts/at91sam9260.dtsi16
1 files changed, 8 insertions, 8 deletions
diff --git a/arch/arm/boot/dts/at91sam9260.dtsi b/arch/arm/boot/dts/at91sam9260.dtsi
index 367a604..3e2adfb 100644
--- a/arch/arm/boot/dts/at91sam9260.dtsi
+++ b/arch/arm/boot/dts/at91sam9260.dtsi
@@ -158,8 +158,8 @@
usart1 {
pinctrl_usart1: usart1-0 {
atmel,pins =
- <2 6 0x1 0x1 /* PB6 periph A with pullup */
- 2 7 0x1 0x0>; /* PB7 periph A */
+ <1 6 0x1 0x1 /* PB6 periph A with pullup */
+ 1 7 0x1 0x0>; /* PB7 periph A */
};
pinctrl_usart1_rts: usart1_rts-0 {
@@ -194,18 +194,18 @@
usart3 {
pinctrl_usart3: usart3-0 {
atmel,pins =
- <2 10 0x1 0x1 /* PB10 periph A with pullup */
- 2 11 0x1 0x0>; /* PB11 periph A */
+ <1 10 0x1 0x1 /* PB10 periph A with pullup */
+ 1 11 0x1 0x0>; /* PB11 periph A */
};
pinctrl_usart3_rts: usart3_rts-0 {
atmel,pins =
- <3 8 0x2 0x0>; /* PB8 periph B */
+ <2 8 0x2 0x0>; /* PC8 periph B */
};
pinctrl_usart3_cts: usart3_cts-0 {
atmel,pins =
- <3 10 0x2 0x0>; /* PB10 periph B */
+ <2 10 0x2 0x0>; /* PC10 periph B */
};
};
@@ -220,8 +220,8 @@
uart1 {
pinctrl_uart1: uart1-0 {
atmel,pins =
- <2 12 0x1 0x1 /* PB12 periph A with pullup */
- 2 13 0x1 0x0>; /* PB13 periph A */
+ <1 12 0x1 0x1 /* PB12 periph A with pullup */
+ 1 13 0x1 0x0>; /* PB13 periph A */
};
};
OpenPOWER on IntegriCloud