|
|
@@ -59,7 +59,7 @@ Reviewed-by: Robin Gong <[email protected]>
|
|
|
.set_termios = lpuart32_set_termios,
|
|
|
.type = lpuart_type,
|
|
|
.request_port = lpuart_request_port,
|
|
|
-@@ -2766,6 +2783,11 @@ static int lpuart_probe(struct platform_
|
|
|
+@@ -2769,6 +2786,11 @@ static int lpuart_probe(struct platform_
|
|
|
if (ret)
|
|
|
goto failed_irq_request;
|
|
|
|
|
|
@@ -71,7 +71,7 @@ Reviewed-by: Robin Gong <[email protected]>
|
|
|
ret = uart_add_one_port(&lpuart_reg, &sport->port);
|
|
|
if (ret)
|
|
|
goto failed_attach_port;
|
|
|
-@@ -2800,6 +2822,9 @@ static int lpuart_probe(struct platform_
|
|
|
+@@ -2803,6 +2825,9 @@ static int lpuart_probe(struct platform_
|
|
|
failed_reset:
|
|
|
uart_remove_one_port(&lpuart_reg, &sport->port);
|
|
|
failed_attach_port:
|
|
|
@@ -81,7 +81,7 @@ Reviewed-by: Robin Gong <[email protected]>
|
|
|
failed_irq_request:
|
|
|
lpuart_disable_clks(sport);
|
|
|
failed_clock_enable:
|
|
|
-@@ -2826,15 +2851,41 @@ static int lpuart_remove(struct platform
|
|
|
+@@ -2829,15 +2854,41 @@ static int lpuart_remove(struct platform
|
|
|
if (sport->dma_rx_chan)
|
|
|
dma_release_channel(sport->dma_rx_chan);
|
|
|
|
|
|
@@ -123,7 +123,7 @@ Reviewed-by: Robin Gong <[email protected]>
|
|
|
|
|
|
if (lpuart_is_32(sport)) {
|
|
|
/* disable Rx/Tx and interrupts */
|
|
|
-@@ -2848,10 +2899,14 @@ static int lpuart_suspend(struct device
|
|
|
+@@ -2851,10 +2902,14 @@ static int lpuart_suspend(struct device
|
|
|
writeb(temp, sport->port.membase + UARTCR2);
|
|
|
}
|
|
|
|
|
|
@@ -138,7 +138,7 @@ Reviewed-by: Robin Gong <[email protected]>
|
|
|
|
|
|
if (sport->lpuart_dma_rx_use) {
|
|
|
/*
|
|
|
-@@ -2882,9 +2937,6 @@ static int lpuart_suspend(struct device
|
|
|
+@@ -2885,9 +2940,6 @@ static int lpuart_suspend(struct device
|
|
|
dmaengine_terminate_all(sport->dma_tx_chan);
|
|
|
}
|
|
|
|
|
|
@@ -148,7 +148,7 @@ Reviewed-by: Robin Gong <[email protected]>
|
|
|
return 0;
|
|
|
}
|
|
|
|
|
|
-@@ -2892,9 +2944,11 @@ static int lpuart_resume(struct device *
|
|
|
+@@ -2895,9 +2947,11 @@ static int lpuart_resume(struct device *
|
|
|
{
|
|
|
struct lpuart_port *sport = dev_get_drvdata(dev);
|
|
|
bool irq_wake = irqd_is_wakeup_set(irq_get_irq_data(sport->port.irq));
|
|
|
@@ -162,7 +162,7 @@ Reviewed-by: Robin Gong <[email protected]>
|
|
|
|
|
|
if (lpuart_is_32(sport))
|
|
|
lpuart32_setup_watermark_enable(sport);
|
|
|
-@@ -2915,13 +2969,23 @@ static int lpuart_resume(struct device *
|
|
|
+@@ -2918,13 +2972,23 @@ static int lpuart_resume(struct device *
|
|
|
if (lpuart_is_32(sport))
|
|
|
lpuart32_configure(sport);
|
|
|
|
|
|
@@ -188,7 +188,7 @@ Reviewed-by: Robin Gong <[email protected]>
|
|
|
|
|
|
static struct platform_driver lpuart_driver = {
|
|
|
.probe = lpuart_probe,
|
|
|
-@@ -2929,7 +2993,7 @@ static struct platform_driver lpuart_dri
|
|
|
+@@ -2932,7 +2996,7 @@ static struct platform_driver lpuart_dri
|
|
|
.driver = {
|
|
|
.name = "fsl-lpuart",
|
|
|
.of_match_table = lpuart_dt_ids,
|