mvebu: set kernel testing version to 5.4
[openwrt/staging/chunkeey.git] / target / linux / mvebu / patches-5.4 / 544-arm64-dts-uDPU-fix-comphy-definitions.patch
1 From 9c222a1d78a1700220e38feb270f00d2ddd3c5ab Mon Sep 17 00:00:00 2001
2 From: Russell King <rmk+kernel@armlinux.org.uk>
3 Date: Wed, 6 Nov 2019 13:44:21 +0000
4 Subject: [PATCH 657/660] arm64: dts: uDPU: fix comphy definitions
5
6 The uDPU uses both ethernet controllers, which ties up COMPHY 0 for
7 eth1 and COMPHY 1 for eth0, with no USB3 comphy. The addition of
8 COMPHY support made the kernel override the setup by the boot loader
9 breaking this platform. Delete the USB3 COMPHY definition at platform
10 level, and add phy specifications for the ethernet channels.
11
12 Fixes: bd3d25b07342 ("arm64: dts: marvell: armada-37xx: link USB hosts with their PHYs")
13 Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
14 ---
15 arch/arm64/boot/dts/marvell/armada-3720-uDPU.dts | 2 ++
16 1 file changed, 2 insertions(+)
17
18 --- a/arch/arm64/boot/dts/marvell/armada-3720-uDPU.dts
19 +++ b/arch/arm64/boot/dts/marvell/armada-3720-uDPU.dts
20 @@ -143,6 +143,7 @@
21 status = "okay";
22 phy-mode = "sgmii";
23 managed = "in-band-status";
24 + phys = <&comphy1 0>;
25 sfp = <&sfp_eth0>;
26 };
27
28 @@ -150,6 +151,7 @@
29 status = "okay";
30 phy-mode = "sgmii";
31 managed = "in-band-status";
32 + phys = <&comphy0 1>;
33 sfp = <&sfp_eth1>;
34 };
35