Skip to contentSkip to conversation

ARM: dts: exynos: Use stdout-path property instead of console in bootargs

PATCH In review Krzysztof Kozlowski 2 participants 4 messages Apr 8, 2019 – Apr 9, 2019

Subsystems (2)
lore
Share & tools
lore

Krzysztof Kozlowski

author maintainer
#0 lore raw

PATCH 1/2 ARM: dts: exynos: Use stdout-path property instead of console in bootargs

Replacing bootargs with stdout-path property in chosen node allows using early console by adding just 'earlycon' parameter to the kernel command line.

---
 arch/arm/boot/dts/exynos4412-trats2.dts    | 3 ++-
 arch/arm/boot/dts/exynos5250-smdk5250.dts  | 3 ++-
 arch/arm/boot/dts/exynos5260-xyref5260.dts | 2 +-
 arch/arm/boot/dts/exynos5410-smdk5410.dts  | 2 +-
 arch/arm/boot/dts/exynos5420-smdk5420.dts  | 3 ++-
 5 files changed, 8 insertions(+), 5 deletions(-)
arch/arm/boot/dts/exynos4412-trats2.dts +2 -1
index 327ee980d3a5..aac533933c61 100644
@@ -22,6 +22,7 @@
 	};
 
 	chosen {
-		bootargs = "console=ttySAC2,115200N8 root=/dev/mmcblk0p5 rootwait earlyprintk panic=5";
+		bootargs = "root=/dev/mmcblk0p5 rootwait earlyprintk panic=5";
+		stdout-path = "serial2:115200n8";
 	};
 };
arch/arm/boot/dts/exynos5250-smdk5250.dts +2 -1
index d5e66189ed2a..6dc96948a9cc 100644
@@ -24,7 +24,8 @@
 	};
 
 	chosen {
-		bootargs = "root=/dev/ram0 rw ramdisk=8192 initrd=0x41000000,8M console=ttySAC2,115200 init=/linuxrc";
+		bootargs = "root=/dev/ram0 rw ramdisk=8192 initrd=0x41000000,8M init=/linuxrc";
+		stdout-path = "serial2:115200n8";
 	};
 
 	vdd: fixed-regulator-vdd {
arch/arm/boot/dts/exynos5260-xyref5260.dts +1 -1
index fa19c59b2fb6..36a2b77eeb9d 100644
@@ -19,7 +19,7 @@
 	};
 
 	chosen {
-		bootargs = "console=ttySAC2,115200";
+		stdout-path = "serial2:115200n8";
 	};
 
 	fin_pll: xxti {
arch/arm/boot/dts/exynos5410-smdk5410.dts +1 -1
index 8fc8c841d34b..dffa5e3ed90c 100644
@@ -19,7 +19,7 @@
 	};
 
 	chosen {
-		bootargs = "console=ttySAC2,115200";
+		stdout-path = "serial2:115200n8";
 	};
 
 	fin_pll: xxti {
arch/arm/boot/dts/exynos5420-smdk5420.dts +2 -1
index 3cf905047893..8240e5186972 100644
@@ -21,7 +21,8 @@
 	};
 
 	chosen {
-		bootargs = "console=ttySAC2,115200 init=/linuxrc";
+		bootargs = "init=/linuxrc";
+		stdout-path = "serial2:115200n8";
 	};
 
 	fixed-rate-clocks {
Signature · 1 line
2.17.1
author maintainer
#1 lore raw

PATCH 2/2 ARM: dts: exynos: Remove console argument from bootargs

Remove the "console=ttySAC..." argument from DTSes having a proper stdout-path property. To make the code functionally equivalent, add the serial port baud rate and parity.

---
 arch/arm/boot/dts/exynos4210-origen.dts         | 4 ++--
 arch/arm/boot/dts/exynos4210-smdkv310.dts       | 4 ++--
 arch/arm/boot/dts/exynos4210-trats.dts          | 4 ++--
 arch/arm/boot/dts/exynos4210-universal_c210.dts | 4 ++--
 arch/arm/boot/dts/exynos4412-origen.dts         | 3 +--
 arch/arm/boot/dts/exynos4412-smdk4412.dts       | 4 ++--
 6 files changed, 11 insertions(+), 12 deletions(-)
arch/arm/boot/dts/exynos4210-origen.dts +2 -2
index dd9ec05eb0f7..36b1edea254a 100644
@@ -30,8 +30,8 @@
 	};
 
 	chosen {
-		bootargs ="root=/dev/ram0 rw ramdisk=8192 initrd=0x41000000,8M console=ttySAC2,115200 init=/linuxrc";
-		stdout-path = &serial_2;
+		bootargs = "root=/dev/ram0 rw ramdisk=8192 initrd=0x41000000,8M init=/linuxrc";
+		stdout-path = "serial2:115200n8";
 	};
 
 	mmc_reg: voltage-regulator {
arch/arm/boot/dts/exynos4210-smdkv310.dts +2 -2
index 7a3e621edede..77fc11e593ad 100644
@@ -26,8 +26,8 @@
 	};
 
 	chosen {
-		bootargs = "root=/dev/ram0 rw ramdisk=8192 initrd=0x41000000,8M console=ttySAC1,115200 init=/linuxrc";
-		stdout-path = &serial_1;
+		bootargs = "root=/dev/ram0 rw ramdisk=8192 initrd=0x41000000,8M init=/linuxrc";
+		stdout-path = "serial1:115200n8";
 	};
 
 	fixed-rate-clocks {
arch/arm/boot/dts/exynos4210-trats.dts +2 -2
index 8dbc47d627a5..6882480dbaf7 100644
@@ -26,8 +26,8 @@
 	};
 
 	chosen {
-		bootargs = "console=ttySAC2,115200N8 root=/dev/mmcblk0p5 rootwait earlyprintk panic=5";
-		stdout-path = &serial_2;
+		bootargs = "root=/dev/mmcblk0p5 rootwait earlyprintk panic=5";
+		stdout-path = "serial2:115200n8";
 	};
 
 	regulators {
arch/arm/boot/dts/exynos4210-universal_c210.dts +2 -2
index 5c3d98654f13..07d64a8f82e3 100644
@@ -24,8 +24,8 @@
 	};
 
 	chosen {
-		bootargs = "console=ttySAC2,115200N8 root=/dev/mmcblk0p5 rw rootwait earlyprintk panic=5 maxcpus=1";
-		stdout-path = &serial_2;
+		bootargs = "root=/dev/mmcblk0p5 rw rootwait earlyprintk panic=5 maxcpus=1";
+		stdout-path = "serial2:115200n8";
 	};
 
 
arch/arm/boot/dts/exynos4412-origen.dts +1 -2
index 346f71932457..698de4345d16 100644
@@ -25,8 +25,7 @@
 	};
 
 	chosen {
-		bootargs ="console=ttySAC2,115200";
-		stdout-path = &serial_2;
+		stdout-path = "serial2:115200n8";
 	};
 
 	firmware@203f000 {
arch/arm/boot/dts/exynos4412-smdk4412.dts +2 -2
index 5c5c2887c14f..e70fb6e601f0 100644
@@ -23,8 +23,8 @@
 	};
 
 	chosen {
-		bootargs ="root=/dev/ram0 rw ramdisk=8192 initrd=0x41000000,8M console=ttySAC1,115200 init=/linuxrc";
-		stdout-path = &serial_1;
+		bootargs = "root=/dev/ram0 rw ramdisk=8192 initrd=0x41000000,8M init=/linuxrc";
+		stdout-path = "serial1:115200n8";
 	};
 
 	fixed-rate-clocks {
Signature · 1 line
2.17.1