diff options
author | Peter Hurley <peter@hurleysoftware.com> | 2016-01-16 15:23:46 -0800 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-02-06 22:07:37 -0800 |
commit | b969398490d940a98cec0aefcafb9877dc122182 (patch) | |
tree | c2b1936ebeccccd88fa3dd766699ed4291c0d0df /drivers/tty/serial/earlycon.c | |
parent | 8e7737393c2fb410ce189c4659498722ef5745f0 (diff) | |
download | linux-stable-b969398490d940a98cec0aefcafb9877dc122182.tar.gz linux-stable-b969398490d940a98cec0aefcafb9877dc122182.tar.bz2 linux-stable-b969398490d940a98cec0aefcafb9877dc122182.zip |
serial: earlycon: Show the earlycon "driver" in banner
Output the earlycon "driver" from the just-parsed console 'name'
and 'index' fields.
NB: ->mapbase is a resource_size_t so use %pa format specifier
Acked-by: Rob Herring <robh@kernel.org>
Signed-off-by: Peter Hurley <peter@hurleysoftware.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 | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/tty/serial/earlycon.c b/drivers/tty/serial/earlycon.c index 36b79f1828ab..067783f0523c 100644 --- a/drivers/tty/serial/earlycon.c +++ b/drivers/tty/serial/earlycon.c @@ -76,16 +76,16 @@ static void __init earlycon_init(struct earlycon_device *device, if (port->iotype == UPIO_MEM || port->iotype == UPIO_MEM16 || port->iotype == UPIO_MEM32 || port->iotype == UPIO_MEM32BE) - pr_info("Early serial console at MMIO%s 0x%llx (options '%s')\n", + pr_info("%s%d at MMIO%s %pa (options '%s')\n", + earlycon->name, earlycon->index, (port->iotype == UPIO_MEM) ? "" : (port->iotype == UPIO_MEM16) ? "16" : (port->iotype == UPIO_MEM32) ? "32" : "32be", - (unsigned long long)port->mapbase, - device->options); + &port->mapbase, device->options); else - pr_info("Early serial console at I/O port 0x%lx (options '%s')\n", - port->iobase, - device->options); + pr_info("%s%d at I/O port 0x%lx (options '%s')\n", + earlycon->name, earlycon->index, + port->iobase, device->options); } static int __init parse_options(struct earlycon_device *device, char *options) |