Commit 0fef1984 authored by Gabor Juhos's avatar Gabor Juhos Committed by Gregory CLEMENT
Browse files

arm64: dts: marvell: armada-37xx: use 'usb2-phy' in USB3 controller's phy-names 

Instead of the generic 'usb2-phy' name, the Armada 37xx device trees
are using a custom 'usb2-utmi-otg-phy' name for the USB2 PHY in the USB3
controller node. Since commit 53a2d95d ("usb: core: add phy notify
connect and disconnect"), this triggers a bug [1] in the USB core which
causes double use of the USB3 PHY.

Change the PHY name to 'usb2-phy' in the SoC and in the uDPU specific
dtsi files in order to avoid triggering the bug and also to keep the
names in line with the ones used by other platforms.

Link: https://lore.kernel.org/r/20260330-usb-avoid-usb3-phy-double-use-v1-1-d2113aecb535@gmail.com

 # [1]
Fixes: 53a2d95d ("usb: core: add phy notify connect and disconnect")
Signed-off-by: default avatarGabor Juhos <j4g8y7@gmail.com>
Signed-off-by: default avatarGregory CLEMENT <gregory.clement@bootlin.com>
parent 2ff6cc99

arch/arm64/boot/dts/marvell/armada-3720-uDPU.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -161,7 +161,7 @@ &eth1 { 
&usb3 {

	status = "okay";

	phys = <&usb2_utmi_otg_phy>;

	phy-names = "usb2-utmi-otg-phy";

	phy-names = "usb2-phy";

};



&uart0 {

arch/arm64/boot/dts/marvell/armada-37xx.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -372,7 +372,7 @@ usb3: usb@58000 { 
				interrupts = <GIC_SPI 3 IRQ_TYPE_LEVEL_HIGH>;

				clocks = <&sb_periph_clk 12>;

				phys = <&comphy0 0>, <&usb2_utmi_otg_phy>;

				phy-names = "usb3-phy", "usb2-utmi-otg-phy";

				phy-names = "usb3-phy", "usb2-phy";

				status = "disabled";

			};