2020-04-10 02:47:05 +00:00
|
|
|
From 5b05462e88dc87d83566d04dd196b4f3d9dc0eef Mon Sep 17 00:00:00 2001
|
|
|
|
From: Fugang Duan <fugang.duan@nxp.com>
|
|
|
|
Date: Mon, 28 Jan 2019 10:12:52 +0800
|
|
|
|
Subject: [PATCH] tty: serial: fsl_lpuart: add modem device reset
|
|
|
|
|
|
|
|
Add modem device reset, wthether to reset depend on dts configuration.
|
|
|
|
|
|
|
|
Signed-off-by: Fugang Duan <fugang.duan@nxp.com>
|
|
|
|
---
|
|
|
|
drivers/tty/serial/fsl_lpuart.c | 10 ++++++++++
|
|
|
|
1 file changed, 10 insertions(+)
|
|
|
|
|
|
|
|
--- a/drivers/tty/serial/fsl_lpuart.c
|
|
|
|
+++ b/drivers/tty/serial/fsl_lpuart.c
|
|
|
|
@@ -22,6 +22,7 @@
|
|
|
|
#include <linux/of_dma.h>
|
|
|
|
#include <linux/pm_domain.h>
|
|
|
|
#include <linux/pm_runtime.h>
|
|
|
|
+#include <linux/reset.h>
|
|
|
|
#include <linux/serial_core.h>
|
|
|
|
#include <linux/slab.h>
|
|
|
|
#include <linux/tty_flip.h>
|
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
|
|
|
@@ -1542,8 +1543,17 @@ static void lpuart32_configure(struct lp
|
2020-04-10 02:47:05 +00:00
|
|
|
static int lpuart32_startup(struct uart_port *port)
|
|
|
|
{
|
|
|
|
struct lpuart_port *sport = container_of(port, struct lpuart_port, port);
|
|
|
|
+ struct tty_port *tty_port = &sport->port.state->port;
|
|
|
|
unsigned long flags;
|
|
|
|
unsigned long temp;
|
|
|
|
+ int ret;
|
|
|
|
+
|
|
|
|
+ /* some modem may need reset */
|
|
|
|
+ if (!tty_port_suspended(tty_port)) {
|
|
|
|
+ ret = device_reset(sport->port.dev);
|
|
|
|
+ if (ret && ret != -ENOENT)
|
|
|
|
+ return ret;
|
|
|
|
+ }
|
|
|
|
|
|
|
|
/* determine FIFO size */
|
|
|
|
temp = lpuart32_read(&sport->port, UARTFIFO);
|