From: Maxime Ripard <maxime.ripard@free-electrons.com>
Date: Tue, 5 Mar 2013 21:18:03 +0000 (+0100)
Subject: ARM: sunxi: hackberry: Add UART muxing
X-Git-Tag: v3.10-rc1~124^2~7^2~4
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=0dfd1dfc96dee8ac1aacfc836de11ec52300218d;p=linux.git

ARM: sunxi: hackberry: Add UART muxing

We previously relied on the bootloader to do the muxing of the UART for
the Hackberry. Don't rely on it anymore and use pinctrl.

Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Acked-by: Emilio López <emilio@elopez.com.ar>
---

diff --git a/arch/arm/boot/dts/sun4i-a10-hackberry.dts b/arch/arm/boot/dts/sun4i-a10-hackberry.dts
index 9ab6875600bd..20460007a89f 100644
--- a/arch/arm/boot/dts/sun4i-a10-hackberry.dts
+++ b/arch/arm/boot/dts/sun4i-a10-hackberry.dts
@@ -24,6 +24,8 @@ chosen {
 
 	soc {
 		uart0: serial@01c28000 {
+			pinctrl-names = "default";
+			pinctrl-0 = <&uart0_pins_a>;
 			status = "okay";
 		};
 	};