Browse Source

ARM: dts: fsl: Fix improperly quoted stdout-path values

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>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>
Rob Herring 6 years ago
parent
commit
1af6ab3bac
2 changed files with 3 additions and 3 deletions
  1. 1 1
      arch/arm/boot/dts/imx53-ppd.dts
  2. 2 2
      arch/arm/boot/dts/vf610m4-colibri.dts

+ 1 - 1
arch/arm/boot/dts/imx53-ppd.dts

@@ -55,7 +55,7 @@
 	};
 	};
 
 
 	chosen {
 	chosen {
-		stdout-path = "&uart1:115200n8";
+		stdout-path = "serial0:115200n8";
 	};
 	};
 
 
 	memory@70000000 {
 	memory@70000000 {

+ 2 - 2
arch/arm/boot/dts/vf610m4-colibri.dts

@@ -50,8 +50,8 @@
 	compatible = "fsl,vf610m4";
 	compatible = "fsl,vf610m4";
 
 
 	chosen {
 	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 {
 	memory@8c000000 {