From 65a0fe0488fb93e3af9643cdac88f856744f702f Mon Sep 17 00:00:00 2001 From: Robert Nelson Date: Mon, 28 Jan 2013 09:43:36 -0600 Subject: [PATCH 1/2] ARM: at91: at91sam9x5: fix usart3 pinctrl name The renaming of pinctrl_uart3 to pinctrl_usart3 was missed in commit 9e3129e (ARM: at91: fix usart/uart namimg in pinctrl). Signed-off-by: Robert Nelson Signed-off-by: Nicolas Ferre --- arch/arm/boot/dts/at91sam9x5.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/boot/dts/at91sam9x5.dtsi b/arch/arm/boot/dts/at91sam9x5.dtsi index 8ecca6948d81..464e34ffed6c 100644 --- a/arch/arm/boot/dts/at91sam9x5.dtsi +++ b/arch/arm/boot/dts/at91sam9x5.dtsi @@ -197,7 +197,7 @@ }; usart3 { - pinctrl_uart3: usart3-0 { + pinctrl_usart3: usart3-0 { atmel,pins = <2 23 0x2 0x1 /* PC22 periph B with pullup */ 2 23 0x2 0x0>; /* PC23 periph B */ From 7d4cfece23f535b60496d88a717a3d7bfca50187 Mon Sep 17 00:00:00 2001 From: Douglas Gilbert Date: Wed, 30 Jan 2013 10:09:17 +0100 Subject: [PATCH 2/2] ARM: at91/at91sam9x5.dtsi: fix usart3 TXD Comment for usart3 TXD (TXD3) is correct, dt code is wrong. Signed-off-by: Douglas Gilbert Signed-off-by: Nicolas Ferre --- arch/arm/boot/dts/at91sam9x5.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/boot/dts/at91sam9x5.dtsi b/arch/arm/boot/dts/at91sam9x5.dtsi index 464e34ffed6c..0c6009080b88 100644 --- a/arch/arm/boot/dts/at91sam9x5.dtsi +++ b/arch/arm/boot/dts/at91sam9x5.dtsi @@ -199,7 +199,7 @@ usart3 { 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 */ };