summaryrefslogtreecommitdiffstats
path: root/arch/arm/boot/dts/zynq-parallella.dts
diff options
context:
space:
mode:
authorMichal Simek <michal.simek@xilinx.com>2015-02-11 13:06:36 +0100
committerMichal Simek <michal.simek@xilinx.com>2015-05-28 08:44:56 +0200
commit2221043b75cf572b77450f56203b4fb77d51fc90 (patch)
treeff774e728296f3ac60dbc6d68f5fc356bd79caad /arch/arm/boot/dts/zynq-parallella.dts
parentARM: dts: zynq: Add missing alias node for zybo and parallella (diff)
downloadlinux-2221043b75cf572b77450f56203b4fb77d51fc90.tar.xz
linux-2221043b75cf572b77450f56203b4fb77d51fc90.zip
ARM: dts: zynq: Fix stdout-path and bootargs
parallella - Remove linux,stdout-path. Use stdout-path to identify kernel console Signed-off-by: Michal Simek <michal.simek@xilinx.com> Acked-by: Mark Rutland <mark.rutland@arm.com>
Diffstat (limited to 'arch/arm/boot/dts/zynq-parallella.dts')
-rw-r--r--arch/arm/boot/dts/zynq-parallella.dts4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/zynq-parallella.dts b/arch/arm/boot/dts/zynq-parallella.dts
index 0ebd2107022b..9efd16cb2859 100644
--- a/arch/arm/boot/dts/zynq-parallella.dts
+++ b/arch/arm/boot/dts/zynq-parallella.dts
@@ -34,8 +34,8 @@
};
chosen {
- bootargs = "console=ttyPS0,115200 earlyprintk root=/dev/mmcblk0p2 rootfstype=ext4 rw rootwait";
- linux,stdout-path = "/amba/serial@e0001000";
+ bootargs = "earlyprintk root=/dev/mmcblk0p2 rootfstype=ext4 rw rootwait";
+ stdout-path = "serial0:115200n8";
};
};