2020-04-10 02:47:05 +00:00
|
|
|
From 1b00d871c9aaa05583b50abb5ba7dfb4ed8bc4f1 Mon Sep 17 00:00:00 2001
|
|
|
|
From: Peng Fan <peng.fan@nxp.com>
|
|
|
|
Date: Mon, 16 Dec 2019 15:53:00 +0800
|
|
|
|
Subject: [PATCH] LF-484 tty: serial: lpuart: support UPIO_MEM32 for lpuart32
|
|
|
|
|
|
|
|
"earlycon" no need to specify the value string since it uses
|
|
|
|
stdout-path parameters. However when earlycon and normal console
|
|
|
|
are not using the same uart port, we need specify value string
|
|
|
|
to earlycon, this is what we need to do when support dual linux
|
|
|
|
using jailhouse hypervisor. The 2nd linux will use the uart
|
|
|
|
of the 1st linux as earlycon.
|
|
|
|
|
|
|
|
earlycon=lpuart32,mmio32,0x5a060010,115200 not work for i.MX8QXP.
|
|
|
|
It is because lpuart32_early_console_setup not support little endian.
|
|
|
|
|
|
|
|
Since the original code is to support UPIO_MEM32BE, so if not
|
|
|
|
UPIO_MEM32, we still take it as UPIO_MEM32BE
|
|
|
|
|
|
|
|
Acked-by: Fugang Duan <fugang.duan@nxp.com>
|
|
|
|
Signed-off-by: Peng Fan <peng.fan@nxp.com>
|
|
|
|
---
|
|
|
|
drivers/tty/serial/fsl_lpuart.c | 4 +++-
|
|
|
|
1 file changed, 3 insertions(+), 1 deletion(-)
|
|
|
|
|
|
|
|
--- a/drivers/tty/serial/fsl_lpuart.c
|
|
|
|
+++ b/drivers/tty/serial/fsl_lpuart.c
|
kernel: bump 5.4 to 5.4.73
Removed upstreamed patches:
generic/pending-5.4
445-mtd-spinand-gigadevice-Only-one-dummy-byte-in-QUA.patch
446-mtd-spinand-gigadevice-Add-QE-Bit.patch
pistachio/patches-5.4
150-pwm-img-Fix-null-pointer-access-in-probe.patch
Manually rebased:
layerscape/patches-5.4
801-audio-0011-Revert-ASoC-fsl_sai-add-of_match-data.patch
801-audio-0039-MLK-16224-6-ASoC-fsl_sai-fix-DSD-suspend-resume.patch
801-audio-0073-MLK-21957-3-ASoC-fsl_sai-add-bitcount-and-timestamp-.patch
820-usb-0009-usb-dwc3-Add-workaround-for-host-mode-VBUS-glitch-wh.patch
All modifications made by update_kernel.sh
Build system: x86_64
Build-tested: ipq806x/R7800, ath79/generic, bcm27xx/bcm2711,
mvebu (mamba, rango), x86_64, ramips/mt7621
Run-tested: ipq806x/R7800, mvebu (mamba, rango), x86_64, ramips (RT-AC57U)
No dmesg regressions, everything functional
Signed-off-by: John Audia <graysky@archlinux.us>
[alter 820-usb-0009-usb-dwc3-Add-workaround-for-host-mode-VBUS-glitch-wh]
Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
2020-10-31 11:35:12 +00:00
|
|
|
@@ -2598,7 +2598,9 @@ static int __init lpuart32_early_console
|
2020-04-10 02:47:05 +00:00
|
|
|
if (!device->port.membase)
|
|
|
|
return -ENODEV;
|
|
|
|
|
|
|
|
- device->port.iotype = UPIO_MEM32BE;
|
|
|
|
+ if (device->port.iotype != UPIO_MEM32)
|
|
|
|
+ device->port.iotype = UPIO_MEM32BE;
|
|
|
|
+
|
|
|
|
device->con->write = lpuart32_early_write;
|
|
|
|
return 0;
|
|
|
|
}
|