@@ -326,12 +326,6 @@ static void pl011_writew(struct uart_amba_port *uap, int val, int index)
writew_relaxed(val, uap->port.membase + uap->reg_lut[index]);
}
-static void pl011_writeb(struct uart_amba_port *uap, u8 val, int index)
-{
- WARN_ON(index > REG_NR);
- writeb_relaxed(val, uap->port.membase + uap->reg_lut[index]);
-}
-
/*
* Reads up to 256 characters from the FIFO or until it's empty and
* inserts them into the TTY layer. Returns the number of characters
@@ -2351,10 +2345,10 @@ static void pl011_putc(struct uart_port *port, int c)
struct uart_amba_port *uap =
container_of(port, struct uart_amba_port, port);
- while (pl011_readw(uap, REG_FR) & UART01x_FR_TXFF)
+ while (readw_relaxed(port->membase + UART01x_FR) & UART01x_FR_TXFF)
;
- pl011_writeb(uap, c, REG_DR);
- while (pl011_readw(uap, REG_FR) & uap->fr_busy)
+ writeb_relaxed(c, port->membase + UART01x_DR);
+ while (readw_relaxed(port->membase + UART01x_FR) & uap->fr_busy)
;
}
Commit 7b753f318d14 ("uart: pl011: Introduce register accessor") mistakenly used the register LUT i/o accessors for the pl011 earlycon. Since the port has not been probed at earlycon time, the struct uart_amba_port (and register LUTs) are uninitialized. Use direct register addressing for pl011 earlycon; other h/w supported by the amba-pl011 driver should declare an alternate earlycon. Signed-off-by: Peter Hurley <peter@hurleysoftware.com> Signed-off-by: Jun Nie <jun.nie@linaro.org> --- drivers/tty/serial/amba-pl011.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-)