diff -ruPN a/drivers/serial/serial_ns16550.c b/drivers/serial/serial_ns16550.c
--- a/drivers/serial/serial_ns16550.c	2015-05-06 08:51:30.000000000 +0200
+++ b/drivers/serial/serial_ns16550.c	2015-08-21 09:46:32.153096094 +0200
@@ -304,7 +304,7 @@
 
 static __maybe_unused struct ns16550_drvdata omap_drvdata = {
 	.init_port = ns16550_omap_init_port,
-	.linux_console_name = "ttyO",
+	.linux_console_name = "ttyS",
 };
 
 static __maybe_unused struct ns16550_drvdata jz_drvdata = {