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>

diff --git a/arch/arm64/boot/dts/marvell/armada-7040-db.dts b/arch/arm64/boot/dts/marvell/armada-7040-db.dts
index d1160edf57e0ce19e8afd9d959bcf39339ce2590..a7eb4e7697a25a73c8aea1de38de6c851bdcacbf 100644 (file)
--- a/arch/arm64/boot/dts/marvell/armada-7040-db.dts
+++ b/arch/arm64/boot/dts/marvell/armada-7040-db.dts
@@ -73,16 +73,6 @@
                gpio = <&expander0 1 GPIO_ACTIVE_HIGH>;
                vin-supply = <&cp0_exp_usb3_1_current_regulator>;
        };
-
-       cp0_usb3_0_phy: cp0-usb3-0-phy {
-               compatible = "usb-nop-xceiv";
-               vcc-supply = <&cp0_reg_usb3_0_vbus>;
-       };
-
-       cp0_usb3_1_phy: cp0-usb3-1-phy {
-               compatible = "usb-nop-xceiv";
-               vcc-supply = <&cp0_reg_usb3_1_vbus>;
-       };
 };
 
 &i2c0 {
@@ -228,15 +218,27 @@
        };
 };
 
+&cp0_comphy1 {
+       cp0_usbh0_con: connector {
+               compatible = "usb-a-connector";
+               phy-supply = <&cp0_reg_usb3_0_vbus>;
+       };
+};
+
 &cp0_usb3_0 {
-       usb-phy = <&cp0_usb3_0_phy>;
        phys = <&cp0_comphy1 0>;
        phy-names = "cp0-usb3h0-comphy";
        status = "okay";
 };
 
+&cp0_comphy4 {
+       cp0_usbh1_con: connector {
+               compatible = "usb-a-connector";
+               phy-supply = <&cp0_reg_usb3_1_vbus>;
+       };
+};
+
 &cp0_usb3_1 {
-       usb-phy = <&cp0_usb3_1_phy>;
        phys = <&cp0_comphy4 1>;
        phy-names = "cp0-usb3h1-comphy";
        status = "okay";

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 bcb0421c7ac0522ebd22eeebe2b08392b997bfec..bd881497b8729c7f6f6b304454dfbb12a91752a3 100644 (file)
--- 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";

diff --git a/arch/arm64/boot/dts/marvell/armada-8040-db.dts b/arch/arm64/boot/dts/marvell/armada-8040-db.dts
index 9746969e8da91186a826418513d5db616d1a3531..09fb5256f1db12ef8dca938b4d3c82322cb2619e 100644 (file)
--- a/arch/arm64/boot/dts/marvell/armada-8040-db.dts
+++ b/arch/arm64/boot/dts/marvell/armada-8040-db.dts
@@ -54,11 +54,6 @@
                vcc-supply = <&cp0_reg_usb3_0_vbus>;
        };
 
-       cp0_usb3_1_phy: cp0-usb3-1-phy {
-               compatible = "usb-nop-xceiv";
-               vcc-supply = <&cp0_reg_usb3_1_vbus>;
-       };
-
        cp1_reg_usb3_0_vbus: cp1-usb3-0-vbus {
                compatible = "regulator-fixed";
                regulator-name = "cp1-usb3h0-vbus";
@@ -164,9 +159,15 @@
        status = "okay";
 };
 
+&cp0_comphy4 {
+       cp0_usbh1_con: connector {
+               compatible = "usb-a-connector";
+               phy-supply = <&cp0_reg_usb3_1_vbus>;
+       };
+};
+
 /* CON10 on CP0 expansion */
 &cp0_usb3_1 {
-       usb-phy = <&cp0_usb3_1_phy>;
        phys = <&cp0_comphy4 1>;
        phy-names = "cp0-usb3h1-comphy";
        status = "okay";

diff --git a/arch/arm64/boot/dts/marvell/armada-8040-mcbin.dtsi b/arch/arm64/boot/dts/marvell/armada-8040-mcbin.dtsi
index a2c099a12e55b364d3fd470433e739d633e65045..d250f4b2bfedbd45662f29b1eb04793a21765985 100644 (file)
--- a/arch/arm64/boot/dts/marvell/armada-8040-mcbin.dtsi
+++ b/arch/arm64/boot/dts/marvell/armada-8040-mcbin.dtsi
@@ -61,11 +61,6 @@
                status = "okay";
        };
 
-       usb3h0_phy: usb3_phy0 {
-               compatible = "usb-nop-xceiv";
-               vcc-supply = <&v_5v0_usb3_hst_vbus>;
-       };
-
        sfp_eth0: sfp-eth0 {
                /* CON15,16 - CPM lane 4 */
                compatible = "sff,sfp";
@@ -360,9 +355,15 @@
        };
 };
 
+&cp1_comphy2 {
+       cp1_usbh0_con: connector {
+               compatible = "usb-a-connector";
+               phy-supply = <&v_5v0_usb3_hst_vbus>;
+       };
+};
+
 &cp1_usb3_0 {
        /* CPS Lane 2 - CON7 */
-       usb-phy = <&usb3h0_phy>;
        phys = <&cp1_comphy2 0>;
        phy-names = "cp1-usb3h0-comphy";
        status = "okay";