diff options
author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-12-28 04:16:54 -0500 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-01-05 11:58:36 -0500 |
commit | e8a7ba86ff993311f8712e5b3bb2e3892e82df5f (patch) | |
tree | ae47404d2f51fec56f5417277ccbedda1495a8ba /drivers/serial/amba-pl011.c | |
parent | f6614b7bb405a9b35dd28baea989a749492c46b2 (diff) |
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 { | |||
76 | unsigned int lcrh_rx; /* vendor-specific */ | 76 | unsigned int lcrh_rx; /* vendor-specific */ |
77 | bool oversampling; /* vendor-specific */ | 77 | bool oversampling; /* vendor-specific */ |
78 | bool autorts; | 78 | bool autorts; |
79 | char type[12]; | ||
79 | }; | 80 | }; |
80 | 81 | ||
81 | /* There is by now at least one vendor with differing details, so handle it */ | 82 | /* 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, | |||
622 | 623 | ||
623 | static const char *pl011_type(struct uart_port *port) | 624 | static const char *pl011_type(struct uart_port *port) |
624 | { | 625 | { |
625 | return port->type == PORT_AMBA ? "AMBA/PL011" : NULL; | 626 | struct uart_amba_port *uap = (struct uart_amba_port *)port; |
627 | return uap->port.type == PORT_AMBA ? uap->type : NULL; | ||
626 | } | 628 | } |
627 | 629 | ||
628 | /* | 630 | /* |
@@ -872,6 +874,8 @@ static int pl011_probe(struct amba_device *dev, struct amba_id *id) | |||
872 | uap->port.flags = UPF_BOOT_AUTOCONF; | 874 | uap->port.flags = UPF_BOOT_AUTOCONF; |
873 | uap->port.line = i; | 875 | uap->port.line = i; |
874 | 876 | ||
877 | snprintf(uap->type, sizeof(uap->type), "PL011 rev%u", amba_rev(dev)); | ||
878 | |||
875 | amba_ports[i] = uap; | 879 | amba_ports[i] = uap; |
876 | 880 | ||
877 | amba_set_drvdata(dev, uap); | 881 | amba_set_drvdata(dev, uap); |