realtek: use generic earlycon setup on 5.15

Use generic earlycon on Linux Kernel instead of initialization in platform
setup.
And also, drop bootargs with console= parameter from I-O DATA BSH-G24MB. It
uses 115200bps as baud-rate, the same as default in rtl838x.dtsi.

Signed-off-by: INAGAKI Hiroshi <musashino.open@gmail.com>
Signed-off-by: Olliver Schinagl <oliver@schinagl.nl>

diff --git a/target/linux/realtek/dts-5.15/rtl8382_iodata_bsh-g24mb.dts b/target/linux/realtek/dts-5.15/rtl8382_iodata_bsh-g24mb.dts
index d19960c108628546d86a8334cade121e60f797c9..8ea28ed2fde48b0a54485fc7ea97ea94ca9e9742 100644 (file)
--- a/target/linux/realtek/dts-5.15/rtl8382_iodata_bsh-g24mb.dts
+++ b/target/linux/realtek/dts-5.15/rtl8382_iodata_bsh-g24mb.dts
@@ -16,10 +16,6 @@
                led-upgrade = &led_sys_loop;
        };
 
-       chosen {
-               bootargs = "console=ttyS0,115200";
-       };
-
        memory@0 {
                device_type = "memory";
                reg = <0x0 0x8000000>;

diff --git a/target/linux/realtek/dts-5.15/rtl838x.dtsi b/target/linux/realtek/dts-5.15/rtl838x.dtsi
index 64e13e1ff37af88a294d5e85a378a2a785965ca6..13ba6450b2d6f03174cab87cadf114c6a57138f7 100644 (file)
--- a/target/linux/realtek/dts-5.15/rtl838x.dtsi
+++ b/target/linux/realtek/dts-5.15/rtl838x.dtsi
@@ -117,8 +117,14 @@
                };
        };
 
+       aliases {
+               serial0 = &uart0;
+               serial1 = &uart1;
+       };
+
        chosen {
-               bootargs = "console=ttyS0,115200";
+               bootargs = "earlycon";
+               stdout-path = "serial0:115200n8";
        };
 
        cpuintc: cpuintc {

diff --git a/target/linux/realtek/dts-5.15/rtl838x_hpe_1920.dtsi b/target/linux/realtek/dts-5.15/rtl838x_hpe_1920.dtsi
index 8e29af62bbf48826490846b84b6bf828fd576934..e18f61345ea38a6637642ff5c334e4f06f561c31 100644 (file)
--- a/target/linux/realtek/dts-5.15/rtl838x_hpe_1920.dtsi
+++ b/target/linux/realtek/dts-5.15/rtl838x_hpe_1920.dtsi
@@ -5,7 +5,7 @@
 
 / {
        chosen {
-               bootargs = "console=ttyS0,38400";
+               stdout-path = "serial0:38400n8";
        };
 
        memory@0 {

diff --git a/target/linux/realtek/dts-5.15/rtl8393_tplink_sg2452p-v4.dts b/target/linux/realtek/dts-5.15/rtl8393_tplink_sg2452p-v4.dts
index b7300cfcbee8c5ae8f9484f2833c7b422c43df50..d2221c1d2f04609d018447a137f8b171dbe5d5a4 100644 (file)
--- a/target/linux/realtek/dts-5.15/rtl8393_tplink_sg2452p-v4.dts
+++ b/target/linux/realtek/dts-5.15/rtl8393_tplink_sg2452p-v4.dts
@@ -24,7 +24,7 @@
        };
 
        chosen {
-               bootargs = "console=ttyS0,38400";
+               stdout-path = "serial0:38400n8";
        };
 
        keys {

diff --git a/target/linux/realtek/dts-5.15/rtl839x.dtsi b/target/linux/realtek/dts-5.15/rtl839x.dtsi
index 91d6e17a9ea1b78dfcd0deb84760519d453d8fbd..3f87f5622e23df2206b0ebacfaefca9def2a0966 100644 (file)
--- a/target/linux/realtek/dts-5.15/rtl839x.dtsi
+++ b/target/linux/realtek/dts-5.15/rtl839x.dtsi
@@ -142,8 +142,14 @@
                };
        };
 
+       aliases {
+               serial0 = &uart0;
+               serial1 = &uart1;
+       };
+
        chosen {
-               bootargs = "console=ttyS0,115200";
+               bootargs = "earlycon";
+               stdout-path = "serial0:115200n8";
        };
 
        cpuintc: cpuintc {

diff --git a/target/linux/realtek/dts-5.15/rtl83xx_panasonic_mxxeg-pn28xx0k.dtsi b/target/linux/realtek/dts-5.15/rtl83xx_panasonic_mxxeg-pn28xx0k.dtsi
index fb2aa18d218ac02e44cd2925b295edbc42cfef5d..f04e98b9cfec45afc4dba57f87f74ce8e6c45d72 100644 (file)
--- a/target/linux/realtek/dts-5.15/rtl83xx_panasonic_mxxeg-pn28xx0k.dtsi
+++ b/target/linux/realtek/dts-5.15/rtl83xx_panasonic_mxxeg-pn28xx0k.dtsi
@@ -6,7 +6,7 @@
 
 / {
        chosen {
-               bootargs = "console=ttyS0,9600";
+               stdout-path = "serial0:9600n8";
        };
 
        memory@0 {

diff --git a/target/linux/realtek/dts-5.15/rtl930x.dtsi b/target/linux/realtek/dts-5.15/rtl930x.dtsi
index fdec626c9a803d1d98f24afbb96675162cd02628..9b0a5781a2630bba222496b26901003dcfc1b1a0 100644 (file)
--- a/target/linux/realtek/dts-5.15/rtl930x.dtsi
+++ b/target/linux/realtek/dts-5.15/rtl930x.dtsi
@@ -24,8 +24,14 @@
                reg = <0x0 0x8000000>;
        };
 
+       aliases {
+               serial0 = &uart0;
+               serial1 = &uart1;
+       };
+
        chosen {
-               bootargs = "console=ttyS0,115200";
+               bootargs = "earlycon";
+               stdout-path = "serial0:115200n8";
        };
 
        cpuintc: cpuintc {

diff --git a/target/linux/realtek/dts-5.15/rtl931x.dtsi b/target/linux/realtek/dts-5.15/rtl931x.dtsi
index a5166141e6fd028f54ecf8f66ab222f82a938725..e7e7840a22348b4c23ff2376afff3360f762941a 100644 (file)
--- a/target/linux/realtek/dts-5.15/rtl931x.dtsi
+++ b/target/linux/realtek/dts-5.15/rtl931x.dtsi
@@ -28,9 +28,15 @@
                device_type = "memory";
                reg = <0x0 0x10000000>;
        };
-       
+
+       aliases {
+               serial0 = &uart0;
+               serial1 = &uart1;
+       };
+
        chosen {
-               bootargs = "console=ttyS0,115200";
+               bootargs = "earlycon";
+               stdout-path = "serial0:115200n8";
        };
 
        lx_clk: lx_clk {

diff --git a/target/linux/realtek/files-5.15/arch/mips/rtl838x/prom.c b/target/linux/realtek/files-5.15/arch/mips/rtl838x/prom.c
index abf594aa0401863503ca7aaf0a25db5e1cc3cd93..0c98af954859e1add904e5840d5f558cd0d8c58c 100644 (file)
--- a/target/linux/realtek/files-5.15/arch/mips/rtl838x/prom.c
+++ b/target/linux/realtek/files-5.15/arch/mips/rtl838x/prom.c
@@ -117,9 +117,6 @@ void __init prom_init(void)
 {
        uint32_t model;
 
-       /* uart0 */
-       setup_8250_early_printk_port(0xb8002000, 2, 0);
-
        model = sw_r32(RTL838X_MODEL_NAME_INFO);
        pr_info("RTL838X model is %x\n", model);
        model = model >> 16 & 0xFFFF;