After upgrading kernel, the commit 211565b10099("serial: pl011:
UPSTAT_AUTORTS requires .throttle/unthrottle") is involved from
mainline upstream. But it confilts with previous commit 0f0f7d7ea173
("tty: amba-pl011: Add un/throttle support") that is from SDK repo.
So, remove the SDK code and keep the upstream code to avoid the
building issue.Signed-off-by: Meng Li <[email protected]> --- drivers/tty/serial/amba-pl011.c | 30 ++---------------------------- 1 file changed, 2 insertions(+), 28 deletions(-) diff --git a/drivers/tty/serial/amba-pl011.c b/drivers/tty/serial/amba-pl011.c index 602d11ed00b5..740389fa601b 100644 --- a/drivers/tty/serial/amba-pl011.c +++ b/drivers/tty/serial/amba-pl011.c @@ -1360,32 +1360,6 @@ static void pl011_start_tx(struct uart_port *port) pl011_start_tx_pio(uap); } -static void pl011_throttle(struct uart_port *port) -{ - struct uart_amba_port *uap = - container_of(port, struct uart_amba_port, port); - unsigned long flags; - - spin_lock_irqsave(&uap->port.lock, flags); - uap->im &= ~(UART011_RTIM | UART011_RXIM); - pl011_write(uap->im, uap, REG_IMSC); - spin_unlock_irqrestore(&uap->port.lock, flags); -} - -static void pl011_unthrottle(struct uart_port *port) -{ - struct uart_amba_port *uap = - container_of(port, struct uart_amba_port, port); - unsigned long flags; - - spin_lock_irqsave(&uap->port.lock, flags); - uap->im |= UART011_RTIM; - if (!pl011_dma_rx_running(uap)) - uap->im |= UART011_RXIM; - pl011_write(uap->im, uap, REG_IMSC); - spin_unlock_irqrestore(&uap->port.lock, flags); -} - static void pl011_stop_rx(struct uart_port *port) { struct uart_amba_port *uap = @@ -2310,8 +2284,8 @@ static const struct uart_ops amba_pl011_pops = { .stop_tx = pl011_stop_tx, .start_tx = pl011_start_tx, .stop_rx = pl011_stop_rx, - .throttle = pl011_throttle, - .unthrottle = pl011_unthrottle, + .throttle = pl011_throttle_rx, + .unthrottle = pl011_unthrottle_rx, .enable_ms = pl011_enable_ms, .break_ctl = pl011_break_ctl, .startup = pl011_startup, -- 2.36.1
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#11559): https://lists.yoctoproject.org/g/linux-yocto/message/11559 Mute This Topic: https://lists.yoctoproject.org/mt/93032794/21656 Group Owner: [email protected] Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
