Skip to content

Commit

Permalink
ARM: dts: fsl: Fix improperly quoted stdout-path values
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Rob Herring authored and Shawn Guo committed Nov 5, 2018
1 parent 438ad09 commit 1af6ab3
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion arch/arm/boot/dts/imx53-ppd.dts
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
};

chosen {
stdout-path = "&uart1:115200n8";
stdout-path = "serial0:115200n8";
};

memory@70000000 {
Expand Down
4 changes: 2 additions & 2 deletions arch/arm/boot/dts/vf610m4-colibri.dts
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down

0 comments on commit 1af6ab3

Please sign in to comment.