serial: sirf: move to writel for TXFIFO instead of writeb

All SiRFSoC UART registers are in 32-bits. If we use writeb for
TXFIFO, actually all of 32-bits are still written, for TXTIFO,
only low 8-bits are valid, so in prima2&atlas6, this causes no
problem.
But in the new atlas7, using writeb to write UART registers will
cause an imprecise data abort as HW does check the "wrong" writeb.
So move to writel and this also makes the code consistent with
sirfsoc_uart_pio_tx_chars() in which we use writel.

Signed-off-by: Barry Song <Baohua.Song@csr.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/tty/serial/sirfsoc_uart.c b/drivers/tty/serial/sirfsoc_uart.c
index 68b0fd4b9a6a216b50c6a93c483b0a6a266e4c52..845548cf05f82a28e104d96774fea6157f254118 100644 (file)
--- a/drivers/tty/serial/sirfsoc_uart.c
+++ b/drivers/tty/serial/sirfsoc_uart.c
@@ -1228,7 +1228,7 @@ static void sirfsoc_uart_console_putchar(struct uart_port *port, int ch)
        while (rd_regl(port,
                ureg->sirfsoc_tx_fifo_status) & ufifo_st->ff_full(port->line))
                cpu_relax();
-       wr_regb(port, ureg->sirfsoc_tx_fifo_data, ch);
+       wr_regl(port, ureg->sirfsoc_tx_fifo_data, ch);
 }
 
 static void sirfsoc_uart_console_write(struct console *co, const char *s,

diff --git a/drivers/tty/serial/sirfsoc_uart.h b/drivers/tty/serial/sirfsoc_uart.h
index 8a6eddad2f3ca071307d100ae5f759273e6584c7..4280819e18880732000f7869a1c82b5a22607c3a 100644 (file)
--- a/drivers/tty/serial/sirfsoc_uart.h
+++ b/drivers/tty/serial/sirfsoc_uart.h
@@ -441,9 +441,7 @@ struct sirfsoc_uart_port {
 
 /* Register Access Control */
 #define portaddr(port, reg)            ((port)->membase + (reg))
-#define rd_regb(port, reg)             (__raw_readb(portaddr(port, reg)))
 #define rd_regl(port, reg)             (__raw_readl(portaddr(port, reg)))
-#define wr_regb(port, reg, val)                __raw_writeb(val, portaddr(port, reg))
 #define wr_regl(port, reg, val)                __raw_writel(val, portaddr(port, reg))
 
 /* UART Port Mask */