env: ti: boot: Use ttyS2 instead of ttyO2

ttyO2 console enables legacy CONFIG_SERIAL_OMAP driver in kernel.
Nowadays it's preferred to use the generic CONFIG_SERIAL_8250_OMAP
driver, which being enabled via ttyS2 console. Both drivers are enabled
in multi_v7_defconfig and in omap2plus_defconfig, for compatibility
reasons. Let's switch to ttyS2 console, to be sure that standard 8250
serial driver is used.

Similar behavior can be also achieved by enabling
CONFIG_SERIAL_8250_OMAP_TTYO_FIXUP option in kernel, but it's better not
to rely on that, as it can be disabled or removed after transitional
period.

Right now on DRA7/AM57x platforms the 8250-omap driver is being probed
first, and omap-serial driver is only probed if the first one failed.
It can be seen from uart3 definition in arch/arm/boot/dts/dra7-l4.dtsi:

    compatible = "ti,dra742-uart", "ti,omap4-uart";

So the kernel already uses 8250 driver. This change basically allows
kernel developers to throw away the omap-serial driver and associated
compatibility options. Similar discussions [1,2] have started several
years ago, so it should be safe to do that now.

[1] https://patchwork.kernel.org/patch/6198471/
[2] http://processors.wiki.ti.com/index.php/Sitara_Linux_UART_-_Switching_to_8250_Driver

Signed-off-by: Sam Protsenko <semen.protsenko@linaro.org>
Reviewed-by: Andrew F. Davis <afd@ti.com>
[trini: Update omap5_uevm]
Signed-off-by: Tom Rini <trini@konsulko.com>

diff --git a/include/configs/am57xx_evm.h b/include/configs/am57xx_evm.h
index 45fd21878c5082debef62f2d29aa7111c3ed430b..e181b30564cd93ff250b1aace093ab038c2cb503 100644 (file)
--- a/include/configs/am57xx_evm.h
+++ b/include/configs/am57xx_evm.h
@@ -24,7 +24,7 @@
 
 #define CONFIG_SYS_BOOTM_LEN           SZ_64M
 
-#define CONSOLEDEV                     "ttyO2"
+#define CONSOLEDEV                     "ttyS2"
 #define CONFIG_SYS_NS16550_COM1                UART1_BASE      /* Base EVM has UART0 */
 #define CONFIG_SYS_NS16550_COM2                UART2_BASE      /* UART2 */
 #define CONFIG_SYS_NS16550_COM3                UART3_BASE      /* UART3 */

diff --git a/include/configs/dra7xx_evm.h b/include/configs/dra7xx_evm.h
index 9c8141de2e709747146f6cde9e9903a86bc4a29a..7ec6e691c7dcc45c65d3334ae02c8b05453e15a1 100644 (file)
--- a/include/configs/dra7xx_evm.h
+++ b/include/configs/dra7xx_evm.h
@@ -26,9 +26,9 @@
 #endif
 
 #if (CONFIG_CONS_INDEX == 1)
-#define CONSOLEDEV                     "ttyO0"
+#define CONSOLEDEV                     "ttyS0"
 #elif (CONFIG_CONS_INDEX == 3)
-#define CONSOLEDEV                     "ttyO2"
+#define CONSOLEDEV                     "ttyS2"
 #endif
 #define CONFIG_SYS_NS16550_COM1                UART1_BASE      /* Base EVM has UART0 */
 #define CONFIG_SYS_NS16550_COM2                UART2_BASE      /* UART2 */

diff --git a/include/configs/omap5_uevm.h b/include/configs/omap5_uevm.h
index 27e47327d30e1923e874e4c18fff13f9c13d1a08..3710a71ae94ec482231c8ae9c6a999d057dd594f 100644 (file)
--- a/include/configs/omap5_uevm.h
+++ b/include/configs/omap5_uevm.h
@@ -53,7 +53,7 @@
 
 /* USB Networking options */
 
-#define CONSOLEDEV             "ttyO2"
+#define CONSOLEDEV             "ttyS2"
 
 #define CONFIG_SCSI_AHCI_PLAT
 #define CONFIG_SYS_SCSI_MAX_SCSI_ID    1

diff --git a/include/environment/ti/boot.h b/include/environment/ti/boot.h
index 54e9b2de4d1296eed772e076bfbfcdebe8bd050f..e55a4aec57c5f3f96f7bf9b3f8cca2a95a6c1f91 100644 (file)
--- a/include/environment/ti/boot.h
+++ b/include/environment/ti/boot.h
@@ -10,7 +10,7 @@
 #define __TI_BOOT_H
 
 #ifndef CONSOLEDEV
-#define CONSOLEDEV "ttyO2"
+#define CONSOLEDEV "ttyS2"
 #endif
 
 #define VBMETA_PART_SIZE               (64 * 1024)