Patchwork ARM: sunxi: cubieboard: Add UART muxing

login
register
mail settings
Submitter Emilio López
Date March 8, 2013, 11:18 a.m.
Message ID <1362741536-12632-1-git-send-email-emilio@elopez.com.ar>
Download mbox | patch
Permalink /patch/226089/
State New
Headers show

Comments

Emilio López - March 8, 2013, 11:18 a.m.
We previously relied on the bootloader to do the muxing of the UART for
the Cubieboard. Don't rely on it anymore and use pinctrl.

Also remove uart1, as it is not enabled by default and it's not exposed
on the board headers.

Signed-off-by: Emilio López <emilio@elopez.com.ar>
---

This is a followup patch to Maxime Ripard's "Extend UART support for 
Allwinner SoCs" series.

 arch/arm/boot/dts/sun4i-a10-cubieboard.dts | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)
Maxime Ripard - March 29, 2013, 8:27 a.m.
Le 08/03/2013 12:18, Emilio López a écrit :
> We previously relied on the bootloader to do the muxing of the UART for
> the Cubieboard. Don't rely on it anymore and use pinctrl.
> 
> Also remove uart1, as it is not enabled by default and it's not exposed
> on the board headers.

Applied, thanks.

Maxime

Patch

diff --git a/arch/arm/boot/dts/sun4i-a10-cubieboard.dts b/arch/arm/boot/dts/sun4i-a10-cubieboard.dts
index 88e2dc1..dc760d0 100644
--- a/arch/arm/boot/dts/sun4i-a10-cubieboard.dts
+++ b/arch/arm/boot/dts/sun4i-a10-cubieboard.dts
@@ -37,10 +37,8 @@ 
 		};
 
 		uart0: uart@01c28000 {
-			status = "okay";
-		};
-
-		uart1: uart@01c28400 {
+			pinctrl-names = "default";
+			pinctrl-0 = <&uart0_pins_a>;
 			status = "okay";
 		};
 	};