Due to the patch conflict of 7e221e7441f1 commit
("tty: serial: lpuart: enable wakeup source for lpuart"),
the compilation error is caused, so this patch is used
to resolve this conflict.Signed-off-by: Xiaolei Wang <[email protected]> --- drivers/tty/serial/fsl_lpuart.c | 20 -------------------- 1 file changed, 20 deletions(-) diff --git a/drivers/tty/serial/fsl_lpuart.c b/drivers/tty/serial/fsl_lpuart.c index 39a7a06d64de..1967f18d8cb7 100644 --- a/drivers/tty/serial/fsl_lpuart.c +++ b/drivers/tty/serial/fsl_lpuart.c @@ -3153,23 +3153,6 @@ static int __maybe_unused lpuart_suspend(struct device *dev) if (lpuart_uport_is_active(sport)) { spin_lock_irqsave(&sport->port.lock, flags); - - /* uart_suspend_port() might set wakeup flag */ - irq_wake = irqd_is_wakeup_set(irq_get_irq_data(sport->port.irq)); - - if (sport->lpuart_dma_rx_use) { - /* - * EDMA driver during suspend will forcefully release any - * non-idle DMA channels. If port wakeup is enabled or if port - * is console port or 'no_console_suspend' is set the Rx DMA - * cannot resume as expected, hence gracefully release the - * Rx DMA path before suspend and start Rx DMA path on resume. - */ - if (irq_wake) { - lpuart_dma_rx_free(&sport->port); - } - - /* Disable Rx DMA to use UART port as wakeup source */ if (lpuart_is_32(sport)) { temp = lpuart32_read(&sport->port, UARTCTRL); temp &= ~(UARTCTRL_TE | UARTCTRL_TIE | UARTCTRL_TCIE); @@ -3179,9 +3162,6 @@ static int __maybe_unused lpuart_suspend(struct device *dev) temp &= ~(UARTCR2_TE | UARTCR2_TIE | UARTCR2_TCIE); writeb(temp, sport->port.membase + UARTCR2); } - - if (sport->lpuart_dma_rx_use) - sport->dma_rx_chan_active = false; spin_unlock_irqrestore(&sport->port.lock, flags); if (sport->lpuart_dma_rx_use) { -- 2.25.1
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#12347): https://lists.yoctoproject.org/g/linux-yocto/message/12347 Mute This Topic: https://lists.yoctoproject.org/mt/98118744/21656 Group Owner: [email protected] Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
