summaryrefslogtreecommitdiffstats
path: root/arch/arm/boot
diff options
context:
space:
mode:
authorMaxime Ripard <maxime.ripard@free-electrons.com>2013-06-22 23:57:27 +0200
committerMaxime Ripard <maxime.ripard@free-electrons.com>2013-08-22 00:19:17 +0200
commit69fb3c047e720a317757f54be08679ab7caeaf91 (patch)
tree9b724529fb7b6fee48198483c8a09093502049fb /arch/arm/boot
parentARM: sun6i: Add UART0 muxing options (diff)
downloadlinux-69fb3c047e720a317757f54be08679ab7caeaf91.tar.xz
linux-69fb3c047e720a317757f54be08679ab7caeaf91.zip
ARM: sun6i: colombus: Add uart0 muxing
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Diffstat (limited to 'arch/arm/boot')
-rw-r--r--arch/arm/boot/dts/sun6i-a31-colombus.dts2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/sun6i-a31-colombus.dts b/arch/arm/boot/dts/sun6i-a31-colombus.dts
index 99c4b1847cab..e5adae30899b 100644
--- a/arch/arm/boot/dts/sun6i-a31-colombus.dts
+++ b/arch/arm/boot/dts/sun6i-a31-colombus.dts
@@ -24,6 +24,8 @@
soc@01c00000 {
uart0: serial@01c28000 {
+ pinctrl-names = "default";
+ pinctrl-0 = <&uart0_pins_a>;
status = "okay";
};
};