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>

diff --git a/drivers/serial/mpc52xx_uart.c b/drivers/serial/mpc52xx_uart.c
index c4399e23565aca0c986fdecc56fc424dee2c1ee3..126ec7f568ec65bb54c83d4661ec8541db7b86a5 100644 (file)
--- 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 41603d6904335d24fef9d351ffb60ef2f3cb4dcd..9ff9b7db293bba268cab3c4218f26beda963941a 100644 (file)
--- 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 */