aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/arch/arm64/boot/dts/marvell/armada-8040-clearfog-gt-8k.dts
diff options
context:
space:
mode:
authorMiquel Raynal <miquel.raynal@bootlin.com>2019-07-31 14:21:26 +0200
committerGregory CLEMENT <gregory.clement@bootlin.com>2019-08-27 16:30:03 +0200
commit96018a6fafb158036372cfd9e6046b352485f143 (patch)
tree138d3504d20b1a96dac57ad39b6a172232054e0c /arch/arm64/boot/dts/marvell/armada-8040-clearfog-gt-8k.dts
parentarm64: dts: marvell: Add 7k/8k PHYs in PCIe nodes (diff)
downloadwireguard-linux-96018a6fafb158036372cfd9e6046b352485f143.tar.xz
wireguard-linux-96018a6fafb158036372cfd9e6046b352485f143.zip
arm64: dts: marvell: Convert 7k/8k usb-phy properties to phy-supply
Update Aramda 7k/8k DTs to use the phy-supply property of the (recent) generic PHY framework instead of the (legacy) usb-phy preperty. Both enable the supply when the PHY is enabled. The COMPHY nodes only provide SERDES lanes configuration. The power supply that is represented by the phy-supply property is just a regulator wired to the USB connector, hence the creation of connector nodes as child of the COMPHY nodes and the supply attached to it. Cc: Martin Blumenstingl <martin.blumenstingl@googlemail.com> Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com> Signed-off-by: Gregory CLEMENT <gregory.clement@bootlin.com>
Diffstat (limited to 'arch/arm64/boot/dts/marvell/armada-8040-clearfog-gt-8k.dts')
-rw-r--r--arch/arm64/boot/dts/marvell/armada-8040-clearfog-gt-8k.dts13
1 files changed, 7 insertions, 6 deletions
diff --git a/arch/arm64/boot/dts/marvell/armada-8040-clearfog-gt-8k.dts b/arch/arm64/boot/dts/marvell/armada-8040-clearfog-gt-8k.dts
index bcb0421c7ac0..bd881497b872 100644
--- a/arch/arm64/boot/dts/marvell/armada-8040-clearfog-gt-8k.dts
+++ b/arch/arm64/boot/dts/marvell/armada-8040-clearfog-gt-8k.dts
@@ -51,11 +51,6 @@
status = "okay";
};
- usb3h0_phy: usb3_phy0 {
- compatible = "usb-nop-xceiv";
- vcc-supply = <&v_5v0_usb3_hst_vbus>;
- };
-
sfp_cp0_eth0: sfp-cp0-eth0 {
compatible = "sff,sfp";
i2c-bus = <&cp0_i2c1>;
@@ -474,8 +469,14 @@
};
};
+&cp1_comphy2 {
+ cp1_usbh0_con: connector {
+ compatible = "usb-a-connector";
+ phy-supply = <&v_5v0_usb3_hst_vbus>;
+ };
+};
+
&cp1_usb3_0 {
- usb-phy = <&usb3h0_phy>;
phys = <&cp1_comphy2 0>;
phy-names = "cp1-usb3h0-comphy";
status = "okay";