diff options
| author |   Kumar Gala <galak@codeaurora.org> | 2014-10-17 04:01:11 -0500 |
|---|---|---|
| committer |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-11-05 19:45:52 -0800 |
| commit | fe655de1718e063bd0b1c7a4305b8eea54d199d9 (patch) | |
| tree | e4166efe78b768c8f9f1857a7930acd4c6e177d4 /drivers/tty/serial/earlycon.c | |
| parent | Merge branch 'tty-linus' into 'tty-testing' (diff) | |
| download | linux-dev-fe655de1718e063bd0b1c7a4305b8eea54d199d9.tar.xz linux-dev-fe655de1718e063bd0b1c7a4305b8eea54d199d9.zip | |
tty/serial: earlycon: Fix print for implied MMIO case
For the case in which we just provide an address as an argument to the
earlycon console type like:
earlycon=msm_serial_dm,0xf991e000
We would report this as an IO port based mapping and not as MMIO. Simple
fix to use the port->iotype to decide which message to print.
Signed-off-by: Kumar Gala <galak@codeaurora.org>
Acked-by: Mark RUtland <mark.rutland@arm.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/tty/serial/earlycon.c')
| -rw-r--r-- | drivers/tty/serial/earlycon.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/tty/serial/earlycon.c b/drivers/tty/serial/earlycon.c index a514ee6f5406..64fe25a4285c 100644 --- a/drivers/tty/serial/earlycon.c +++ b/drivers/tty/serial/earlycon.c @@ -98,7 +98,7 @@ static int __init parse_options(struct earlycon_device *device, strlcpy(device->options, options, length); } - if (mmio || mmio32) + if (port->iotype == UPIO_MEM || port->iotype == UPIO_MEM32) pr_info("Early serial console at MMIO%s 0x%llx (options '%s')\n", mmio32 ? "32" : "", (unsigned long long)port->mapbase, |