Skip to content

Commit 0fef198

Browse files
juhosggclement
authored andcommitted
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 53a2d95 ("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: 53a2d95 ("usb: core: add phy notify connect and disconnect") Signed-off-by: Gabor Juhos <j4g8y7@gmail.com> Signed-off-by: Gregory CLEMENT <gregory.clement@bootlin.com>
1 parent 2ff6cc9 commit 0fef198

2 files changed

Lines changed: 2 additions & 2 deletions

File tree

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@
161161
&usb3 {
162162
status = "okay";
163163
phys = <&usb2_utmi_otg_phy>;
164-
phy-names = "usb2-utmi-otg-phy";
164+
phy-names = "usb2-phy";
165165
};
166166

167167
&uart0 {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -372,7 +372,7 @@
372372
interrupts = <GIC_SPI 3 IRQ_TYPE_LEVEL_HIGH>;
373373
clocks = <&sb_periph_clk 12>;
374374
phys = <&comphy0 0>, <&usb2_utmi_otg_phy>;
375-
phy-names = "usb3-phy", "usb2-utmi-otg-phy";
375+
phy-names = "usb3-phy", "usb2-phy";
376376
status = "disabled";
377377
};
378378

0 commit comments

Comments
 (0)