From e5e6f6872c7a6e2b15295574ecab8391c03808cd Mon Sep 17 00:00:00 2001 From: Sai Pavan Boddu Date: Mon, 6 Mar 2017 18:17:19 +0530 Subject: arm: zynq: Add device-type property for zynq ethernet phy nodes Mention device-type = "ethernet-phy", as qemu will need this in absence of compatible. Signed-off-by: Sai Pavan Boddu Signed-off-by: Michal Simek --- arch/arm/boot/dts/zynq-parallella.dts | 1 + 1 file changed, 1 insertion(+) (limited to 'arch/arm/boot/dts/zynq-parallella.dts') diff --git a/arch/arm/boot/dts/zynq-parallella.dts b/arch/arm/boot/dts/zynq-parallella.dts index 64a6390fc501..77f6f10bf685 100644 --- a/arch/arm/boot/dts/zynq-parallella.dts +++ b/arch/arm/boot/dts/zynq-parallella.dts @@ -54,6 +54,7 @@ compatible = "ethernet-phy-id0141.0e90", "ethernet-phy-ieee802.3-c22"; reg = <0>; + device_type = "ethernet-phy"; marvell,reg-init = <0x3 0x10 0xff00 0x1e>, <0x3 0x11 0xfff0 0xa>; }; -- cgit From 21ad06cc9e6399f64447ab316d92142bff7a17dd Mon Sep 17 00:00:00 2001 From: Michal Simek Date: Tue, 16 Feb 2016 09:49:27 +0100 Subject: arm: zynq: Remove earlycon from bootargs Earlyconsole is used for early kernel debugging that's why this option shouldn't be enabled by default. Earlyconsole is partially copying the part of the bootlog after "bootconsole [uart0] disabled". Signed-off-by: Michal Simek --- arch/arm/boot/dts/zynq-parallella.dts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'arch/arm/boot/dts/zynq-parallella.dts') diff --git a/arch/arm/boot/dts/zynq-parallella.dts b/arch/arm/boot/dts/zynq-parallella.dts index 77f6f10bf685..0144acfa9793 100644 --- a/arch/arm/boot/dts/zynq-parallella.dts +++ b/arch/arm/boot/dts/zynq-parallella.dts @@ -34,7 +34,7 @@ }; chosen { - bootargs = "earlycon root=/dev/mmcblk0p2 rootfstype=ext4 rw rootwait"; + bootargs = "root=/dev/mmcblk0p2 rootfstype=ext4 rw rootwait"; stdout-path = "serial0:115200n8"; }; }; -- cgit