* [PATCH 1/2] arm64: dts: uDPU: fix broken ethernet
@ 2019-11-16 11:06 Russell King
2019-12-09 14:37 ` Gregory CLEMENT
0 siblings, 1 reply; 2+ messages in thread
From: Russell King @ 2019-11-16 11:06 UTC (permalink / raw)
To: Gregory Clement, Vladimir Vid
Cc: Jason Cooper, Andrew Lunn, Sebastian Hesselbarth, Rob Herring,
Mark Rutland, linux-arm-kernel, devicetree
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 by assuming that COMPHY 0 was always used for
USB3. 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 <rmk+kernel@armlinux.org.uk>
---
arch/arm64/boot/dts/marvell/armada-3720-uDPU.dts | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/arch/arm64/boot/dts/marvell/armada-3720-uDPU.dts b/arch/arm64/boot/dts/marvell/armada-3720-uDPU.dts
index bd4aab6092e0..e31813a4f972 100644
--- a/arch/arm64/boot/dts/marvell/armada-3720-uDPU.dts
+++ b/arch/arm64/boot/dts/marvell/armada-3720-uDPU.dts
@@ -143,6 +143,7 @@
phy-mode = "sgmii";
status = "okay";
managed = "in-band-status";
+ phys = <&comphy1 0>;
sfp = <&sfp_eth0>;
};
@@ -150,11 +151,14 @@
phy-mode = "sgmii";
status = "okay";
managed = "in-band-status";
+ phys = <&comphy0 1>;
sfp = <&sfp_eth1>;
};
&usb3 {
status = "okay";
+ phys = <&usb2_utmi_otg_phy>;
+ phy-names = "usb2-utmi-otg-phy";
};
&uart0 {
--
2.20.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH 1/2] arm64: dts: uDPU: fix broken ethernet
2019-11-16 11:06 [PATCH 1/2] arm64: dts: uDPU: fix broken ethernet Russell King
@ 2019-12-09 14:37 ` Gregory CLEMENT
0 siblings, 0 replies; 2+ messages in thread
From: Gregory CLEMENT @ 2019-12-09 14:37 UTC (permalink / raw)
To: Russell King, Vladimir Vid
Cc: Jason Cooper, Andrew Lunn, Sebastian Hesselbarth, Rob Herring,
Mark Rutland, linux-arm-kernel, devicetree
Russell King <rmk+kernel@armlinux.org.uk> writes:
> 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 by assuming that COMPHY 0 was always used for
> USB3. 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 <rmk+kernel@armlinux.org.uk>
Applied on mvebu/dt64
Thanks,
Gregory
> ---
> arch/arm64/boot/dts/marvell/armada-3720-uDPU.dts | 4 ++++
> 1 file changed, 4 insertions(+)
>
> diff --git a/arch/arm64/boot/dts/marvell/armada-3720-uDPU.dts b/arch/arm64/boot/dts/marvell/armada-3720-uDPU.dts
> index bd4aab6092e0..e31813a4f972 100644
> --- a/arch/arm64/boot/dts/marvell/armada-3720-uDPU.dts
> +++ b/arch/arm64/boot/dts/marvell/armada-3720-uDPU.dts
> @@ -143,6 +143,7 @@
> phy-mode = "sgmii";
> status = "okay";
> managed = "in-band-status";
> + phys = <&comphy1 0>;
> sfp = <&sfp_eth0>;
> };
>
> @@ -150,11 +151,14 @@
> phy-mode = "sgmii";
> status = "okay";
> managed = "in-band-status";
> + phys = <&comphy0 1>;
> sfp = <&sfp_eth1>;
> };
>
> &usb3 {
> status = "okay";
> + phys = <&usb2_utmi_otg_phy>;
> + phy-names = "usb2-utmi-otg-phy";
> };
>
> &uart0 {
> --
> 2.20.1
>
--
Gregory Clement, Bootlin
Embedded Linux and Kernel engineering
http://bootlin.com
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2019-12-09 14:37 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-11-16 11:06 [PATCH 1/2] arm64: dts: uDPU: fix broken ethernet Russell King
2019-12-09 14:37 ` Gregory CLEMENT
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).