From 9c222a1d78a1700220e38feb270f00d2ddd3c5ab Mon Sep 17 00:00:00 2001 From: Russell King Date: Wed, 6 Nov 2019 13:44:21 +0000 Subject: [PATCH 657/660] arm64: dts: uDPU: fix comphy definitions The uDPU uses both ethernet controllers, which ties up COMPHY 0 for eth1 and COMPHY 1 for eth0, with no USB3 comphy. The addition of COMPHY support made the kernel override the setup by the boot loader breaking this platform. Delete the USB3 COMPHY definition at platform level, and add phy specifications for the ethernet channels. Fixes: bd3d25b07342 ("arm64: dts: marvell: armada-37xx: link USB hosts with their PHYs") Signed-off-by: Russell King --- arch/arm64/boot/dts/marvell/armada-3720-uDPU.dts | 2 ++ 1 file changed, 2 insertions(+) --- a/arch/arm64/boot/dts/marvell/armada-3720-uDPU.dts +++ b/arch/arm64/boot/dts/marvell/armada-3720-uDPU.dts @@ -143,6 +143,7 @@ status = "okay"; phy-mode = "sgmii"; managed = "in-band-status"; + phys = <&comphy1 0>; sfp = <&sfp_eth0>; }; @@ -150,6 +151,7 @@ status = "okay"; phy-mode = "sgmii"; managed = "in-band-status"; + phys = <&comphy0 1>; sfp = <&sfp_eth1>; };