diff options
| author | Russell King | 2010-12-28 10:16:54 +0100 |
|---|---|---|
| committer | Russell King | 2011-01-05 17:58:36 +0100 |
| commit | e8a7ba86ff993311f8712e5b3bb2e3892e82df5f (patch) | |
| tree | ae47404d2f51fec56f5417277ccbedda1495a8ba /drivers/serial/amba-pl011.c | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6 (diff) | |
| download | kernel-qcow2-linux-e8a7ba86ff993311f8712e5b3bb2e3892e82df5f.tar.gz kernel-qcow2-linux-e8a7ba86ff993311f8712e5b3bb2e3892e82df5f.tar.xz kernel-qcow2-linux-e8a7ba86ff993311f8712e5b3bb2e3892e82df5f.zip | |
ARM: PL011: include revision number in boot-time port printk
Include the revision number of the PL011 primecell in the boot-time
port printk to allow proper identification of the peripheral.
Acked-by: Linus Walleij <linus.walleij@stericsson.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'drivers/serial/amba-pl011.c')
| -rw-r--r-- | drivers/serial/amba-pl011.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/serial/amba-pl011.c b/drivers/serial/amba-pl011.c index 6ca7a44f29c2..2c07939be02c 100644 --- a/drivers/serial/amba-pl011.c +++ b/drivers/serial/amba-pl011.c @@ -76,6 +76,7 @@ struct uart_amba_port { unsigned int lcrh_rx; /* vendor-specific */ bool oversampling; /* vendor-specific */ bool autorts; + char type[12]; }; /* There is by now at least one vendor with differing details, so handle it */ @@ -622,7 +623,8 @@ pl011_set_termios(struct uart_port *port, struct ktermios *termios, static const char *pl011_type(struct uart_port *port) { - return port->type == PORT_AMBA ? "AMBA/PL011" : NULL; + struct uart_amba_port *uap = (struct uart_amba_port *)port; + return uap->port.type == PORT_AMBA ? uap->type : NULL; } /* @@ -872,6 +874,8 @@ static int pl011_probe(struct amba_device *dev, struct amba_id *id) uap->port.flags = UPF_BOOT_AUTOCONF; uap->port.line = i; + snprintf(uap->type, sizeof(uap->type), "PL011 rev%u", amba_rev(dev)); + amba_ports[i] = uap; amba_set_drvdata(dev, uap); |