ARM: dts: am33xx: Add missing serial console speed

Without a serial console speed specified in chosen/stdout-path in the
DTB, the serial console uses the default speed of the serial driver,
unless explicitly overridden in a legacy console= kernel command-line
parameter.

After dropping "ti,omap3-uart" from the list of compatible values in DT,
AM33xx serial ports can no longer be used with the legacy OMAP serial
driver, but only with the OMAP-flavored 8250 serial driver (which is
mutually-exclusive with the former).  However, replacing
CONFIG_SERIAL_OMAP=y by CONFIG_SERIAL_8250_OMAP=y (with/without enabling
CONFIG_SERIAL_8250_OMAP_TTYO_FIXUP) may not be sufficient to restore
serial console functionality: the legacy OMAP serial driver defaults to
115200 bps, while the 8250 serial driver defaults to 9600 bps, causing
no visible output on the serial console when no appropriate console=
kernel command-line parameter is specified.

Fix this for all AM33xx boards by adding ":115200n8" to
chosen/stdout-path.  This requires replacing the "&uartN" reference by
the corresponding "serialN" DT alias.

Fixes: ca8be8fc2c306efb ("ARM: dts: am33xx-l4: fix UART compatible")
Fixes: 077e1cde78c3f904 ("ARM: omap2plus_defconfig: Enable 8250_OMAP")
Closes: https://lore.kernel.org/CAMuHMdUb7Jb2=GqK3=Rn+Gv5G9KogcQieqDvjDCkJA4zyX4VcA@mail.gmail.com
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Reviewed-by: Matti Vaittinen <mazziesaccount@gmail.com>
Tested-by: Matti Vaittinen <mazziesaccount@gmail.com>
Reviewed-by: Bruno Thomsen <bruno.thomsen@gmail.com>
Link: https://lore.kernel.org/r/63cef5c3643d359e8ec13366ca79377f12dd73b1.1759398641.git.geert+renesas@glider.be
Signed-off-by: Kevin Hilman <khilman@baylibre.com>

diff --git a/arch/arm/boot/dts/ti/omap/am335x-bone-common.dtsi b/arch/arm/boot/dts/ti/omap/am335x-bone-common.dtsi
index ad1e60a9b6fde8f92cae2283c609b393c4ce3811..b75dabfa56ae7605eb0ab8037c2f666b28726341 100644 (file)
--- a/arch/arm/boot/dts/ti/omap/am335x-bone-common.dtsi
+++ b/arch/arm/boot/dts/ti/omap/am335x-bone-common.dtsi
@@ -16,7 +16,7 @@
        };
 
        chosen {
-               stdout-path = &uart0;
+               stdout-path = "serial0:115200n8";
        };
 
        leds {

diff --git a/arch/arm/boot/dts/ti/omap/am335x-boneblue.dts b/arch/arm/boot/dts/ti/omap/am335x-boneblue.dts
index f579df4c2c540dd7f6a688ad4a6d9bf0d1e6fc5b..d430f0bef16537822ae474c51bdc70c7b23f133a 100644 (file)
--- a/arch/arm/boot/dts/ti/omap/am335x-boneblue.dts
+++ b/arch/arm/boot/dts/ti/omap/am335x-boneblue.dts
@@ -13,7 +13,7 @@
        compatible = "ti,am335x-bone-blue", "ti,am33xx";
 
        chosen {
-               stdout-path = &uart0;
+               stdout-path = "serial0:115200n8";
        };
 
        leds {

diff --git a/arch/arm/boot/dts/ti/omap/am335x-chiliboard.dts b/arch/arm/boot/dts/ti/omap/am335x-chiliboard.dts
index 648e97fe1dfd5e5b821ced946d6219c497dd1d29..ae5bc589849722f5a8b4178fb3c60b2bfc74a517 100644 (file)
--- a/arch/arm/boot/dts/ti/omap/am335x-chiliboard.dts
+++ b/arch/arm/boot/dts/ti/omap/am335x-chiliboard.dts
@@ -12,7 +12,7 @@
                     "ti,am33xx";
 
        chosen {
-               stdout-path = &uart0;
+               stdout-path = "serial0:115200n8";
        };
 
        leds {

diff --git a/arch/arm/boot/dts/ti/omap/am335x-evm.dts b/arch/arm/boot/dts/ti/omap/am335x-evm.dts
index 20222f82f21bfd9d9709d2f508ea752313822b36..856fa1191ed24ea323c18e142b58a338d68eabbf 100644 (file)
--- a/arch/arm/boot/dts/ti/omap/am335x-evm.dts
+++ b/arch/arm/boot/dts/ti/omap/am335x-evm.dts
@@ -23,7 +23,7 @@
        };
 
        chosen {
-               stdout-path = &uart0;
+               stdout-path = "serial0:115200n8";
        };
 
        vbat: fixedregulator0 {

diff --git a/arch/arm/boot/dts/ti/omap/am335x-evmsk.dts b/arch/arm/boot/dts/ti/omap/am335x-evmsk.dts
index eba888dcd60e7fa23c7ba905896286f774ba311f..d8baccdf8bc46302ede2f233b619ee2063990d52 100644 (file)
--- a/arch/arm/boot/dts/ti/omap/am335x-evmsk.dts
+++ b/arch/arm/boot/dts/ti/omap/am335x-evmsk.dts
@@ -30,7 +30,7 @@
        };
 
        chosen {
-               stdout-path = &uart0;
+               stdout-path = "serial0:115200n8";
        };
 
        vbat: fixedregulator0 {

diff --git a/arch/arm/boot/dts/ti/omap/am335x-guardian.dts b/arch/arm/boot/dts/ti/omap/am335x-guardian.dts
index 4b070e634b28100bf36201b2de3a549d6cd0f69d..6ce3a2d029eedc8c7a5bcfc31a4730dc4e4ff9fd 100644 (file)
--- a/arch/arm/boot/dts/ti/omap/am335x-guardian.dts
+++ b/arch/arm/boot/dts/ti/omap/am335x-guardian.dts
@@ -14,7 +14,7 @@
        compatible = "bosch,am335x-guardian", "ti,am33xx";
 
        chosen {
-               stdout-path = &uart0;
+               stdout-path = "serial0:115200n8";
                tick-timer = &timer2;
        };
 

diff --git a/arch/arm/boot/dts/ti/omap/am335x-icev2.dts b/arch/arm/boot/dts/ti/omap/am335x-icev2.dts
index 6f0f4fba043b96e95fd2e413674ee26bafe562cf..ba488bba6925dec3a2aef9c3e77a2a5a3cdd471b 100644 (file)
--- a/arch/arm/boot/dts/ti/omap/am335x-icev2.dts
+++ b/arch/arm/boot/dts/ti/omap/am335x-icev2.dts
@@ -22,7 +22,7 @@
        };
 
        chosen {
-               stdout-path = &uart3;
+               stdout-path = "serial3:115200n8";
        };
 
        vbat: fixedregulator0 {

diff --git a/arch/arm/boot/dts/ti/omap/am335x-myirtech-myd.dts b/arch/arm/boot/dts/ti/omap/am335x-myirtech-myd.dts
index 06a352f98b220bc4164b5c293ead8063bd581b3c..476a6bdaf43f38e41b8244201876c9b8f8c68abb 100644 (file)
--- a/arch/arm/boot/dts/ti/omap/am335x-myirtech-myd.dts
+++ b/arch/arm/boot/dts/ti/omap/am335x-myirtech-myd.dts
@@ -15,7 +15,7 @@
        compatible = "myir,myd-am335x", "myir,myc-am335x", "ti,am33xx";
 
        chosen {
-               stdout-path = &uart0;
+               stdout-path = "serial0:115200n8";
        };
 
        clk12m: clk12m {

diff --git a/arch/arm/boot/dts/ti/omap/am335x-osd3358-sm-red.dts b/arch/arm/boot/dts/ti/omap/am335x-osd3358-sm-red.dts
index d28d3972884765047b92d802723a15e175828b0a..23caaaabf35134a60f7c9d8a872d5ab416b1e625 100644 (file)
--- a/arch/arm/boot/dts/ti/omap/am335x-osd3358-sm-red.dts
+++ b/arch/arm/boot/dts/ti/omap/am335x-osd3358-sm-red.dts
@@ -147,7 +147,7 @@
        };
 
        chosen {
-               stdout-path = &uart0;
+               stdout-path = "serial0:115200n8";
        };
 
        leds {

diff --git a/arch/arm/boot/dts/ti/omap/am335x-pdu001.dts b/arch/arm/boot/dts/ti/omap/am335x-pdu001.dts
index c9ccb9de21ad7b104522b0f8393a3a572ce90230..9f611debc209072c157a8208a97ac45752410da8 100644 (file)
--- a/arch/arm/boot/dts/ti/omap/am335x-pdu001.dts
+++ b/arch/arm/boot/dts/ti/omap/am335x-pdu001.dts
@@ -21,7 +21,7 @@
        compatible = "ti,am33xx";
 
        chosen {
-               stdout-path = &uart3;
+               stdout-path = "serial3:115200n8";
        };
 
        cpus {

diff --git a/arch/arm/boot/dts/ti/omap/am335x-pocketbeagle.dts b/arch/arm/boot/dts/ti/omap/am335x-pocketbeagle.dts
index 78ce860e59b3de4f2ead85806d85d5dd69148cff..24d9f90fad01f76848b417dc750f79f8bcf3482c 100644 (file)
--- a/arch/arm/boot/dts/ti/omap/am335x-pocketbeagle.dts
+++ b/arch/arm/boot/dts/ti/omap/am335x-pocketbeagle.dts
@@ -15,7 +15,7 @@
        compatible = "ti,am335x-pocketbeagle", "ti,am335x-bone", "ti,am33xx";
 
        chosen {
-               stdout-path = &uart0;
+               stdout-path = "serial0:115200n8";
        };
 
        leds {

diff --git a/arch/arm/boot/dts/ti/omap/am335x-sl50.dts b/arch/arm/boot/dts/ti/omap/am335x-sl50.dts
index f3524e5ee43e276d14809316d97680ecc269cca9..1dc4e344efd63e4edd60cd56100903e62a519898 100644 (file)
--- a/arch/arm/boot/dts/ti/omap/am335x-sl50.dts
+++ b/arch/arm/boot/dts/ti/omap/am335x-sl50.dts
@@ -25,7 +25,7 @@
        };
 
        chosen {
-               stdout-path = &uart0;
+               stdout-path = "serial0:115200n8";
        };
 
        leds {