summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorGreentime Hu <greentime@andestech.com>2017-11-16 19:33:35 +0800
committerGreentime Hu <greentime@andestech.com>2018-02-22 10:44:30 +0800
commitf572a034d9e07157dd07d2b6be3a1459b5574b58 (patch)
tree146c5fecdcc113e31c83610abb91b0fada20ce6d /drivers
parentb3ada9d0ce8d286c8bbbb02fdbddec5036242b42 (diff)
earlycon: add reg-offset to physical address before mapping
It will get the wrong virtual address because port->mapbase is not added the correct reg-offset yet. We have to update it before earlycon_map() is called Signed-off-by: Greentime Hu <greentime@andestech.com> Acked-by: Arnd Bergmann <arnd@arndb.de> Acked-by: Rob Herring <robh@kernel.org> Cc: Peter Hurley <peter@hurleysoftware.com> Cc: stable@vger.kernel.org Fixes: 088da2a17619 ("of: earlycon: Initialize port fields from DT properties")
Diffstat (limited to 'drivers')
-rw-r--r--drivers/tty/serial/earlycon.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/tty/serial/earlycon.c b/drivers/tty/serial/earlycon.c
index 870e84fb6e39..a24278380fec 100644
--- a/drivers/tty/serial/earlycon.c
+++ b/drivers/tty/serial/earlycon.c
@@ -245,11 +245,12 @@ int __init of_setup_earlycon(const struct earlycon_id *match,
}
port->mapbase = addr;
port->uartclk = BASE_BAUD * 16;
- port->membase = earlycon_map(port->mapbase, SZ_4K);
val = of_get_flat_dt_prop(node, "reg-offset", NULL);
if (val)
port->mapbase += be32_to_cpu(*val);
+ port->membase = earlycon_map(port->mapbase, SZ_4K);
+
val = of_get_flat_dt_prop(node, "reg-shift", NULL);
if (val)
port->regshift = be32_to_cpu(*val);