[v2] ARM: dts: fsl: Fix improperly quoted stdout-path values

Message ID 20181031010230.6723-1-robh@kernel.org
State New
Headers show
Series
  • [v2] ARM: dts: fsl: Fix improperly quoted stdout-path values
Related show

Commit Message

Rob Herring Oct. 31, 2018, 1:02 a.m.
A quoted label reference doesn't expand to the node path and is taken as
a literal string. Dropping the quotes can fix this unless the baudrate
string is appended in which case we have to use the alias.

At least on VF610, the problem was masked by setting the console in
bootargs. Use the alias syntax with baudrate parameter so we can drop
setting the console in bootargs.

Cc: Shawn Guo <shawnguo@kernel.org>
Cc: Sascha Hauer <s.hauer@pengutronix.de>
Cc: Pengutronix Kernel Team <kernel@pengutronix.de>
Cc: NXP Linux Team <linux-imx@nxp.com>
Cc: Mark Rutland <mark.rutland@arm.com>
Reviewed-by: Fabio Estevam <festevam@gmail.com>

Reviewed-by: Stefan Agner <stefan@agner.ch>

Signed-off-by: Rob Herring <robh@kernel.org>

---
v2:
- Fix missing closing quote in vf610m4-colibri.dts

 arch/arm/boot/dts/imx53-ppd.dts       | 2 +-
 arch/arm/boot/dts/vf610m4-colibri.dts | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

-- 
2.19.1

Comments

Shawn Guo Nov. 4, 2018, 2:37 p.m. | #1
On Tue, Oct 30, 2018 at 08:02:30PM -0500, Rob Herring wrote:
> A quoted label reference doesn't expand to the node path and is taken as

> a literal string. Dropping the quotes can fix this unless the baudrate

> string is appended in which case we have to use the alias.

> 

> At least on VF610, the problem was masked by setting the console in

> bootargs. Use the alias syntax with baudrate parameter so we can drop

> setting the console in bootargs.

> 

> Cc: Shawn Guo <shawnguo@kernel.org>

> Cc: Sascha Hauer <s.hauer@pengutronix.de>

> Cc: Pengutronix Kernel Team <kernel@pengutronix.de>

> Cc: NXP Linux Team <linux-imx@nxp.com>

> Cc: Mark Rutland <mark.rutland@arm.com>

> Reviewed-by: Fabio Estevam <festevam@gmail.com>

> Reviewed-by: Stefan Agner <stefan@agner.ch>

> Signed-off-by: Rob Herring <robh@kernel.org>


Applied, thanks.

Patch

diff --git a/arch/arm/boot/dts/imx53-ppd.dts b/arch/arm/boot/dts/imx53-ppd.dts
index cdb90bee7b4a..f202396e3f2a 100644
--- a/arch/arm/boot/dts/imx53-ppd.dts
+++ b/arch/arm/boot/dts/imx53-ppd.dts
@@ -55,7 +55,7 @@ 
 	};
 
 	chosen {
-		stdout-path = "&uart1:115200n8";
+		stdout-path = "serial0:115200n8";
 	};
 
 	memory@70000000 {
diff --git a/arch/arm/boot/dts/vf610m4-colibri.dts b/arch/arm/boot/dts/vf610m4-colibri.dts
index 41ec66a96990..ca6249558760 100644
--- a/arch/arm/boot/dts/vf610m4-colibri.dts
+++ b/arch/arm/boot/dts/vf610m4-colibri.dts
@@ -50,8 +50,8 @@ 
 	compatible = "fsl,vf610m4";
 
 	chosen {
-		bootargs = "console=ttyLP2,115200 clk_ignore_unused init=/linuxrc rw";
-		stdout-path = "&uart2";
+		bootargs = "clk_ignore_unused init=/linuxrc rw";
+		stdout-path = "serial2:115200";
 	};
 
 	memory@8c000000 {