summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorEmilio López <emilio@elopez.com.ar>2013-03-08 11:18:56 (GMT)
committerMaxime Ripard <maxime.ripard@free-electrons.com>2013-03-29 08:27:01 (GMT)
commit23b5cf31fe5fd1f787f0101ede4ab4fb43e12371 (patch)
treeaf842ba36e19d179c30e78e15145597c067819f9 /arch
parent0dfd1dfc96dee8ac1aacfc836de11ec52300218d (diff)
downloadlinux-23b5cf31fe5fd1f787f0101ede4ab4fb43e12371.tar.xz
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>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/boot/dts/sun4i-a10-cubieboard.dts6
1 files changed, 2 insertions, 4 deletions
diff --git a/arch/arm/boot/dts/sun4i-a10-cubieboard.dts b/arch/arm/boot/dts/sun4i-a10-cubieboard.dts
index cd06a3c..99558f6 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";
};
};