lkml.org 
[lkml]   [2020]   [Feb]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 5.4 150/459] arm64: dts: uDPU: fix broken ethernet
    Date
    From: Russell King <rmk+kernel@armlinux.org.uk>

    [ Upstream commit 1eebac0240580b531954b02c05068051df41142a ]

    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>
    Signed-off-by: Gregory CLEMENT <gregory.clement@bootlin.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    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 bd4aab6092e0f..e31813a4f9722 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
    \
     
     \ /
      Last update: 2020-02-14 17:06    [W:4.048 / U:0.068 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site