| From: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= <u.kleine-koenig@pengutronix.de> |
| Date: Thu, 25 Jan 2018 14:30:43 +0100 |
| Subject: serial: altera: ensure port->regshift is honored consistently |
| MIME-Version: 1.0 |
| Content-Type: text/plain; charset=UTF-8 |
| Content-Transfer-Encoding: 8bit |
| |
| commit 0e254963b6ba4d63ac911e79537fea38dd03dc50 upstream. |
| |
| Most register accesses in the altera driver honor port->regshift by |
| using altera_uart_writel(). There are a few accesses however that were |
| missed when the driver was converted to use port->regshift and some |
| others were added later in commit 4d9d7d896d77 ("serial: altera_uart: |
| add earlycon support"). |
| |
| Fixes: 2780ad42f5fe ("tty: serial: altera_uart: Use port->regshift to store bus shift") |
| Signed-off-by: Uwe Kleine-Kรถnig <u.kleine-koenig@pengutronix.de> |
| Acked-by: Tobias Klauser <tklauser@distanz.ch> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| [bwh: Backported to 3.16: Drop changes in altera_uart_earlycon_setup()] |
| Signed-off-by: Ben Hutchings <ben@decadent.org.uk> |
| --- |
| drivers/tty/serial/altera_uart.c | 12 ++++++------ |
| 1 file changed, 6 insertions(+), 6 deletions(-) |
| |
| --- a/drivers/tty/serial/altera_uart.c |
| +++ b/drivers/tty/serial/altera_uart.c |
| @@ -335,7 +335,7 @@ static int altera_uart_startup(struct ua |
| |
| /* Enable RX interrupts now */ |
| pp->imr = ALTERA_UART_CONTROL_RRDY_MSK; |
| - writel(pp->imr, port->membase + ALTERA_UART_CONTROL_REG); |
| + altera_uart_writel(port, pp->imr, ALTERA_UART_CONTROL_REG); |
| |
| spin_unlock_irqrestore(&port->lock, flags); |
| |
| @@ -351,7 +351,7 @@ static void altera_uart_shutdown(struct |
| |
| /* Disable all interrupts now */ |
| pp->imr = 0; |
| - writel(pp->imr, port->membase + ALTERA_UART_CONTROL_REG); |
| + altera_uart_writel(port, pp->imr, ALTERA_UART_CONTROL_REG); |
| |
| spin_unlock_irqrestore(&port->lock, flags); |
| |
| @@ -441,7 +441,7 @@ static void altera_uart_console_putc(str |
| ALTERA_UART_STATUS_TRDY_MSK)) |
| cpu_relax(); |
| |
| - writel(c, port->membase + ALTERA_UART_TXDATA_REG); |
| + altera_uart_writel(port, c, ALTERA_UART_TXDATA_REG); |
| } |
| |
| static void altera_uart_console_write(struct console *co, const char *s, |
