merged.
Bruce
In message: [linux-yocto v5.10/standard/bcm-2xxx-rpi][PATCH] Revert "tty:
amba-pl011: Add un/throttle support"
on 11/11/2022 Li Wang wrote:
> This reverts commit 54bfe5ed51939790f8b95eccc39cbc86d7b89138 comes
> from sdk, and the linux kernel upstream already override:
> 211565b100993c90b53bf40851eacaefc830cfe0
>
> Signed-off-by: Li Wang <li.w...@windriver.com>
> ---
> 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 83072fa14ac3..a5442347d1fa 100644
> --- a/drivers/tty/serial/amba-pl011.c
> +++ b/drivers/tty/serial/amba-pl011.c
> @@ -1317,32 +1317,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 =
> @@ -2186,8 +2160,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.23.0
>
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#11892):
https://lists.yoctoproject.org/g/linux-yocto/message/11892
Mute This Topic: https://lists.yoctoproject.org/mt/94955030/21656
Group Owner: linux-yocto+ow...@lists.yoctoproject.org
Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
