From: Emilio López <emilio@elopez.com.ar>
Date: Fri, 8 Mar 2013 11:18:56 +0000 (-0300)
Subject: ARM: sunxi: cubieboard: Add UART muxing
X-Git-Url: http://git.mmlx.us/?a=commitdiff_plain;h=23b5cf31fe5fd1f787f0101ede4ab4fb43e12371;p=linux-edison.git

ARM: sunxi: cubieboard: Add UART muxing

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>
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
---

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