From: INAGAKI Hiroshi <musashino.open@gmail.com>
Date: Thu, 29 Sep 2022 04:13:22 +0000 (+0900)
Subject: realtek: use generic earlycon setup on 5.15
X-Git-Tag: v23.05.0-rc1~1107
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=3cfa465387ee75451d59a37a3a198bba2deed3ed;p=openwrt%2Fstaging%2Fhauke.git

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 d19960c108..8ea28ed2fd 100644
--- 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 64e13e1ff3..13ba6450b2 100644
--- 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 8e29af62bb..e18f61345e 100644
--- 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 b7300cfcbe..d2221c1d2f 100644
--- 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 91d6e17a9e..3f87f5622e 100644
--- 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 fb2aa18d21..f04e98b9cf 100644
--- 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 fdec626c9a..9b0a5781a2 100644
--- 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 a5166141e6..e7e7840a22 100644
--- 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 abf594aa04..0c98af9548 100644
--- 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;