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>

diff --git a/drivers/tty/serial/earlycon.c b/drivers/tty/serial/earlycon.c
index 36b79f1828abf6074806730dcdb4d94252598b04..067783f0523c5a8a69a63e1333a7d010c1d203f6 100644 (file)
--- 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)