Commit f572a034 authored by Greentime Hu's avatar Greentime Hu

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: default avatarGreentime Hu <greentime@andestech.com>
Acked-by: default avatarArnd Bergmann <arnd@arndb.de>
Acked-by: default avatarRob Herring <robh@kernel.org>
Cc: Peter Hurley <peter@hurleysoftware.com>
Cc: stable@vger.kernel.org
Fixes: 088da2a1 ("of: earlycon: Initialize port fields from DT
properties")
parent b3ada9d0
...@@ -245,11 +245,12 @@ int __init of_setup_earlycon(const struct earlycon_id *match, ...@@ -245,11 +245,12 @@ int __init of_setup_earlycon(const struct earlycon_id *match,
} }
port->mapbase = addr; port->mapbase = addr;
port->uartclk = BASE_BAUD * 16; port->uartclk = BASE_BAUD * 16;
port->membase = earlycon_map(port->mapbase, SZ_4K);
val = of_get_flat_dt_prop(node, "reg-offset", NULL); val = of_get_flat_dt_prop(node, "reg-offset", NULL);
if (val) if (val)
port->mapbase += be32_to_cpu(*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); val = of_get_flat_dt_prop(node, "reg-shift", NULL);
if (val) if (val)
port->regshift = be32_to_cpu(*val); port->regshift = be32_to_cpu(*val);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment