[1/2] arm64: dts: uDPU: fix broken ethernet
diff mbox series

Message ID E1iVvuq-0002sd-KR@rmk-PC.armlinux.org.uk
State New
Headers show
Series
  • [1/2] arm64: dts: uDPU: fix broken ethernet
Related show

Commit Message

Russell King Nov. 16, 2019, 11:06 a.m. UTC
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(+)

Comments

Gregory CLEMENT Dec. 9, 2019, 2:37 p.m. UTC | #1
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
>

Patch
diff mbox series

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 {