diff options
| author | Hans de Goede <hdegoede@redhat.com> | 2014-12-25 13:25:19 +0100 |
|---|---|---|
| committer | Maxime Ripard <maxime.ripard@free-electrons.com> | 2015-01-06 10:52:55 +0100 |
| commit | 6ba8bbe8e283674bd9737bcb31a9c55ba4f8fbee (patch) | |
| tree | 4df77b5af476cbf9f8abfad2b0ca33b5ae821833 /arch | |
| parent | ARM: dts: sunxi: Fix usb-phy support for sun4i/sun5i (diff) | |
| download | linux-6ba8bbe8e283674bd9737bcb31a9c55ba4f8fbee.tar.xz linux-6ba8bbe8e283674bd9737bcb31a9c55ba4f8fbee.zip | |
ARM: dts: sun6i: ippo-q8h-v5: Fix serial0 alias
The Ippo q8h has its serial console connected to the r-uart. Adjust the
serial0 alias to match.
This fixes the kernel serial console no longer working since 3.19-rc1, because
8250_dw.c now honors dt aliases, causing the serial console to be ttyS5 rather
then being ttyS0, as it was in 3.18 and before.
Note that adjusting bootargs instead is not an acceptable fix, because
console=ttyS0,115200 is used by a lot of bootscripts, etc. and this should
continue to work.
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/boot/dts/sun8i-a23-ippo-q8h-v5.dts | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/sun8i-a23-ippo-q8h-v5.dts b/arch/arm/boot/dts/sun8i-a23-ippo-q8h-v5.dts index 7f2117ce6985..32ad80804dbb 100644 --- a/arch/arm/boot/dts/sun8i-a23-ippo-q8h-v5.dts +++ b/arch/arm/boot/dts/sun8i-a23-ippo-q8h-v5.dts @@ -55,6 +55,10 @@ model = "Ippo Q8H Dual Core Tablet (v5)"; compatible = "ippo,q8h-v5", "allwinner,sun8i-a23"; + aliases { + serial0 = &r_uart; + }; + chosen { bootargs = "earlyprintk console=ttyS0,115200"; }; |