667f6c7f49
Manually rebased patches:
bcm27xx/patches-5.4/950-0135-spi-spi-bcm2835-Disable-forced-software-CS.patch
generic-backport/744-v5.5-net-sfp-soft-status-and-control-support.patch
layerscape/patches-5.4/819-uart-0005-tty-serial-fsl_lpuart-enable-dma-mode-for-imx8qxp.patch
mvebu/patches-5.4/521-arm64-dts-marvell-espressobin-Add-ethernet-switch-al.patch
Removed:
layerscape/patches-5.4/819-uart-0012-tty-serial-lpuart-add-LS1028A-support.patch
All modifications made by update_kernel.sh
Build system: x86_64
Build-tested: ipq806x/R7800, ath79/generic, bcm27xx/bcm2711,
lantiq/Easybox 904 xDSL, x86_64
Run-tested: ipq806x/R7800, lantiq/Easybox 904 xDSL, x86_64
No dmesg regressions, everything functional
Signed-off-by: John Audia <graysky@archlinux.us>
Co-developed-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
29 lines
1.1 KiB
Diff
29 lines
1.1 KiB
Diff
From 392865cdcca83fbc9624725e505feb31dda7e67a Mon Sep 17 00:00:00 2001
|
|
From: Andy Duan <fugang.duan@nxp.com>
|
|
Date: Mon, 28 Jan 2019 14:29:14 +0800
|
|
Subject: [PATCH] MLK-18137: fsl_lpuart: Fix loopback mode
|
|
|
|
Register offset needs to be applied on mapbase also.
|
|
dma_tx/rx_request use the physical address of UARTDATA.
|
|
Register offset is currently only applied to membase (the
|
|
corresponding virtual addr) but not on mapbase.
|
|
|
|
Reviewed-by: Leonard Crestez <leonard.crestez@nxp.com>
|
|
Acked-by: Fugang Duan <fugang.duan@nxp.com>
|
|
Signed-off-by: Adriana Reus <adriana.reus@nxp.com>
|
|
---
|
|
drivers/tty/serial/fsl_lpuart.c | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
--- a/drivers/tty/serial/fsl_lpuart.c
|
|
+++ b/drivers/tty/serial/fsl_lpuart.c
|
|
@@ -2476,7 +2476,7 @@ static int lpuart_probe(struct platform_
|
|
return PTR_ERR(sport->port.membase);
|
|
|
|
sport->port.membase += sdata->reg_off;
|
|
- sport->port.mapbase = res->start;
|
|
+ sport->port.mapbase = res->start + sdata->reg_off;
|
|
sport->port.dev = &pdev->dev;
|
|
sport->port.type = PORT_LPUART;
|
|
sport->devtype = sdata->devtype;
|