summaryrefslogtreecommitdiffstats
path: root/arch/arm/boot/dts/sun9i-a80-optimus.dts
diff options
context:
space:
mode:
authorMaxime Ripard <maxime.ripard@free-electrons.com>2015-01-22 22:10:54 +0100
committerMaxime Ripard <maxime.ripard@free-electrons.com>2015-01-25 18:06:34 +0100
commit117a2cc38ffe0b46bcc6f991a3534b345477439c (patch)
tree7053fbb32c9920c0c3a296bf18c6d83bf65cfb65 /arch/arm/boot/dts/sun9i-a80-optimus.dts
parentARM: dts: sun4i: Add simplefb node with de_fe0-de_be0-lcd0-hdmi pipeline (diff)
downloadlinux-117a2cc38ffe0b46bcc6f991a3534b345477439c.tar.xz
linux-117a2cc38ffe0b46bcc6f991a3534b345477439c.zip
ARM: sunxi: dt: Fix aliases
Commit f77d55a3b56a ("serial: 8250_dw: get index of serial line from DT aliases") made the serial driver now use the serial aliases to get the tty number, pointing out that our aliases have been wrong all along. Remove them from the DTSI and add custom ones in the relevant boards. Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Diffstat (limited to 'arch/arm/boot/dts/sun9i-a80-optimus.dts')
-rw-r--r--arch/arm/boot/dts/sun9i-a80-optimus.dts5
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/sun9i-a80-optimus.dts b/arch/arm/boot/dts/sun9i-a80-optimus.dts
index 506948f582ee..11ec71072e81 100644
--- a/arch/arm/boot/dts/sun9i-a80-optimus.dts
+++ b/arch/arm/boot/dts/sun9i-a80-optimus.dts
@@ -54,6 +54,11 @@
model = "Merrii A80 Optimus Board";
compatible = "merrii,a80-optimus", "allwinner,sun9i-a80";
+ aliases {
+ serial0 = &uart0;
+ serial1 = &uart4;
+ };
+
chosen {
bootargs = "earlyprintk console=ttyS0,115200";
};