aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaxime Ripard <[email protected]>2014-10-28 22:41:29 +0100
committerMaxime Ripard <[email protected]>2014-11-23 16:53:02 +0100
commitb8d2fef2706e04c3df1dd49d3a7f0b5626fe763c (patch)
tree18be16980667ccba944fdcfd00629da95f2c0321
parent51be8c81fe9f72aebdcc25b297b1ac2000283a3f (diff)
ARM: sun9i: optimus: Set UART0 muxing
Enable the UART0 muxing, as set up by the bootloader. Signed-off-by: Maxime Ripard <[email protected]> Acked-by: Linus Walleij <[email protected]>
-rw-r--r--arch/arm/boot/dts/sun9i-a80-optimus.dts2
-rw-r--r--arch/arm/boot/dts/sun9i-a80.dtsi7
2 files changed, 9 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/sun9i-a80-optimus.dts b/arch/arm/boot/dts/sun9i-a80-optimus.dts
index 3a70fdf8877e..5d9bc80afef2 100644
--- a/arch/arm/boot/dts/sun9i-a80-optimus.dts
+++ b/arch/arm/boot/dts/sun9i-a80-optimus.dts
@@ -60,6 +60,8 @@
soc {
uart0: serial@07000000 {
+ pinctrl-names = "default";
+ pinctrl-0 = <&uart0_pins_a>;
status = "okay";
};
};
diff --git a/arch/arm/boot/dts/sun9i-a80.dtsi b/arch/arm/boot/dts/sun9i-a80.dtsi
index fe9832a2d8b8..da680cf195e2 100644
--- a/arch/arm/boot/dts/sun9i-a80.dtsi
+++ b/arch/arm/boot/dts/sun9i-a80.dtsi
@@ -351,6 +351,13 @@
#interrupt-cells = <2>;
#size-cells = <0>;
#gpio-cells = <3>;
+
+ uart0_pins_a: uart0@0 {
+ allwinner,pins = "PH12", "PH13";
+ allwinner,function = "uart0";
+ allwinner,drive = <0>;
+ allwinner,pull = <0>;
+ };
};
uart0: serial@07000000 {