Commit dd163ca3 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'mvebu-fixes-5.4-1' of git://git.infradead.org/linux-mvebu into arm/fixes 

mvebu fixes for 5.4 (part 1)

Fix regression on USB for Turris Mox (Armada 3720 based board)

* tag 'mvebu-fixes-5.4-1' of git://git.infradead.org/linux-mvebu:
  arm64: dts: armada-3720-turris-mox: convert usb-phy to phy-supply

Link: https://lore.kernel.org/r/87blunsm43.fsf@FE-laptop


Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 60c1b3e2 187c195a

arch/arm64/boot/dts/marvell/armada-3720-turris-mox.dts

+7 −6
Original line number Diff line number Diff line
@@ -60,11 +60,6 @@ 
		gpio = <&gpiosb 0 GPIO_ACTIVE_HIGH>;

	};



	usb3_phy: usb3-phy {

		compatible = "usb-nop-xceiv";

		vcc-supply = <&exp_usb3_vbus>;

	};



	vsdc_reg: vsdc-reg {

		compatible = "regulator-gpio";

		regulator-name = "vsdc";
@@ -255,10 +250,16 @@ 
	status = "okay";

};



&comphy2 {

	connector {

		compatible = "usb-a-connector";

		phy-supply = <&exp_usb3_vbus>;

	};

};



&usb3 {

	status = "okay";

	phys = <&comphy2 0>;

	usb-phy = <&usb3_phy>;

};



&mdio {

CRA Git | Maintained and supported by SUSTech CRA and CCSE