[PATCH 3.19 REGRESSION FIX] ARM: dts: sun6i: ippo-q8h-v5: Fix serial0 alias

[PATCH 3.19 REGRESSION FIX] ARM: dts: sun6i: ippo-q8h-v5: Fix serial0 alias

[Hans de Goede]

Hi Maxime, ChenYu,

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.

Maxime, can you please queue this up as a fix for 3.19 ?

Regards,

Hans

[PATCH] ARM: dts: sun6i: ippo-q8h-v5: Fix serial0 alias

[Hans de Goede]

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-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
---
 arch/arm/boot/dts/sun8i-a23-ippo-q8h-v5.dts | 4 ++++
 1 file changed, 4 insertions(+)

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 7f2117c..32ad808 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";
 	};
-- 
2.1.0

Re: [PATCH] ARM: dts: sun6i: ippo-q8h-v5: Fix serial0 alias

[Maxime Ripard]

[-- Attachment #1: Type: text/plain, Size: 792 bytes --]

On Thu, Dec 25, 2014 at 01:25:19PM +0100, Hans de Goede wrote:
> 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-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>

Applied, thanks!

Maxime

-- 
Maxime Ripard, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]