diff options
| author | Wolfram Sang <w.sang@pengutronix.de> | 2010-11-12 19:47:47 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-11-16 12:50:18 -0800 |
| commit | e44dcb6c377529805bbaae505d5b333daab69111 (patch) | |
| tree | 364a994a250c177c40f7a8ce3cb5eefafed03fb5 | |
| parent | 597c606f560cf7ef6029152fa7574bddbfb0252f (diff) | |
| download | kernel_samsung_smdk4412-e44dcb6c377529805bbaae505d5b333daab69111.zip kernel_samsung_smdk4412-e44dcb6c377529805bbaae505d5b333daab69111.tar.gz kernel_samsung_smdk4412-e44dcb6c377529805bbaae505d5b333daab69111.tar.bz2 | |
serial: mpc52xx: make printout for type more generic
The printout for the type should be just "5xxx", so 512x users won't
wonder why they have a mpc52xx-type UART.
Signed-off-by: Wolfram Sang <w.sang@pengutronix.de>
Cc: Grant Likely <grant.likely@secretlab.ca>
Cc: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| -rw-r--r-- | drivers/serial/mpc52xx_uart.c | 6 | ||||
| -rw-r--r-- | include/linux/serial_core.h | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/drivers/serial/mpc52xx_uart.c b/drivers/serial/mpc52xx_uart.c index c4399e2..126ec7f 100644 --- a/drivers/serial/mpc52xx_uart.c +++ b/drivers/serial/mpc52xx_uart.c @@ -838,7 +838,11 @@ mpc52xx_uart_set_termios(struct uart_port *port, struct ktermios *new, static const char * mpc52xx_uart_type(struct uart_port *port) { - return port->type == PORT_MPC52xx ? "MPC52xx PSC" : NULL; + /* + * We keep using PORT_MPC52xx for historic reasons although it applies + * for MPC512x, too, but print "MPC5xxx" to not irritate users + */ + return port->type == PORT_MPC52xx ? "MPC5xxx PSC" : NULL; } static void diff --git a/include/linux/serial_core.h b/include/linux/serial_core.h index 41603d6..9ff9b7d 100644 --- a/include/linux/serial_core.h +++ b/include/linux/serial_core.h @@ -95,7 +95,7 @@ /* PPC CPM type number */ #define PORT_CPM 58 -/* MPC52xx type numbers */ +/* MPC52xx (and MPC512x) type numbers */ #define PORT_MPC52xx 59 /* IBM icom */ |