serial: 8250_uniphier: fix dl_read and dl_write functions

masahir0y · gregkh · commit 7be047e035dc · 2015-12-12T21:42:31.000-08:00
The register offset must be shifted by regshift, otherwise the baudrate is not set. I missed the issue probably because the divisor register was already set by the boot loader. Fixes: 1a8d290 ("serial: 8250_uniphier: add UniPhier serial driver") Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
diff --git a/drivers/tty/serial/8250/8250_uniphier.c b/drivers/tty/serial/8250/8250_uniphier.c
@@ -115,12 +115,16 @@ static void uniphier_serial_out(struct uart_port *p, int offset, int value)
  */
 static int uniphier_serial_dl_read(struct uart_8250_port *up)
 {
-	return readl(up->port.membase + UNIPHIER_UART_DLR);
+	int offset = UNIPHIER_UART_DLR << up->port.regshift;
+
+	return readl(up->port.membase + offset);
 }
 
 static void uniphier_serial_dl_write(struct uart_8250_port *up, int value)
 {
-	writel(value, up->port.membase + UNIPHIER_UART_DLR);
+	int offset = UNIPHIER_UART_DLR << up->port.regshift;
+
+	writel(value, up->port.membase + offset);
 }
 
 static int uniphier_of_serial_setup(struct device *dev, struct uart_port *port,

Original file line number	Diff line number	Diff line change
`@@ -115,12 +115,16 @@ static void uniphier_serial_out(struct uart_port *p, int offset, int value)`
`115`	`115`	`*/`
`116`	`116`	`static int uniphier_serial_dl_read(struct uart_8250_port *up)`
`117`	`117`	`{`
`118`		`- return readl(up->port.membase + UNIPHIER_UART_DLR);`
	`118`	`+ int offset = UNIPHIER_UART_DLR << up->port.regshift;`
	`119`	`+`
	`120`	`+ return readl(up->port.membase + offset);`
`119`	`121`	`}`
`120`	`122`
`121`	`123`	`static void uniphier_serial_dl_write(struct uart_8250_port *up, int value)`
`122`	`124`	`{`
`123`		`- writel(value, up->port.membase + UNIPHIER_UART_DLR);`
	`125`	`+ int offset = UNIPHIER_UART_DLR << up->port.regshift;`
	`126`	`+`
	`127`	`+ writel(value, up->port.membase + offset);`
`124`	`128`	`}`
`125`	`129`
`126`	`130`	`static int uniphier_of_serial_setup(struct device dev, struct uart_port port,`