arm64: dts: marvell: enable CP110 UTMI PHY usage

Enable support for CP110 UTMI PHY in Armada SoC family platform
device trees.

Signed-off-by: Konstantin Porotchkin <kostap@marvell.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 a7eb4e7..51f3e29 100644 (file)
--- a/arch/arm64/boot/dts/marvell/armada-7040-db.dts
+++ b/arch/arm64/boot/dts/marvell/armada-7040-db.dts
@@ -218,6 +218,10 @@
        };
 };
 
+&cp0_utmi {
+       status = "okay";
+};
+
 &cp0_comphy1 {
        cp0_usbh0_con: connector {
                compatible = "usb-a-connector";
@@ -226,8 +230,9 @@
 };
 
 &cp0_usb3_0 {
-       phys = <&cp0_comphy1 0>;
-       phy-names = "cp0-usb3h0-comphy";
+       phys = <&cp0_comphy1 0>, <&cp0_utmi0>;
+       phy-names = "cp0-usb3h0-comphy", "utmi";
+       dr_mode = "host";
        status = "okay";
 };
 
@@ -239,8 +244,9 @@
 };
 
 &cp0_usb3_1 {
-       phys = <&cp0_comphy4 1>;
-       phy-names = "cp0-usb3h1-comphy";
+       phys = <&cp0_comphy4 1>, <&cp0_utmi1>;
+       phy-names = "cp0-usb3h1-comphy", "utmi";
+       dr_mode = "host";
        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 09fb525..e39e1ef 100644 (file)
--- a/arch/arm64/boot/dts/marvell/armada-8040-db.dts
+++ b/arch/arm64/boot/dts/marvell/armada-8040-db.dts
@@ -154,8 +154,15 @@
 };
 
 /* CON9 on CP0 expansion */
+&cp0_utmi {
+       status = "okay";
+};
+
 &cp0_usb3_0 {
        usb-phy = <&cp0_usb3_0_phy>;
+       phys = <&cp0_utmi0>;
+       phy-names = "utmi";
+       dr_mode = "host";
        status = "okay";
 };
 
@@ -168,8 +175,9 @@
 
 /* CON10 on CP0 expansion */
 &cp0_usb3_1 {
-       phys = <&cp0_comphy4 1>;
-       phy-names = "cp0-usb3h1-comphy";
+       phys = <&cp0_comphy4 1>, <&cp0_utmi1>;
+       phy-names = "usb", "utmi";
+       dr_mode = "host";
        status = "okay";
 };
 
@@ -306,14 +314,23 @@
        };
 };
 
+&cp1_utmi {
+       status = "okay";
+};
+
 /* CON9 on CP1 expansion */
 &cp1_usb3_0 {
        usb-phy = <&cp1_usb3_0_phy>;
+       phys = <&cp1_utmi0>;
+       phy-names = "utmi";
+       dr_mode = "host";
        status = "okay";
 };
 
 /* CON10 on CP1 expansion */
 &cp1_usb3_1 {
+       phys = <&cp1_utmi1>;
+       phy-names = "utmi";
        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 cbcb210..adbfecc 100644 (file)
--- a/arch/arm64/boot/dts/marvell/armada-8040-mcbin.dtsi
+++ b/arch/arm64/boot/dts/marvell/armada-8040-mcbin.dtsi
@@ -259,13 +259,23 @@
        vqmmc-supply = <&v_3_3>;
 };
 
+&cp0_utmi {
+       status = "okay";
+};
+
 &cp0_usb3_0 {
        /* J38? - USB2.0 only */
+       phys = <&cp0_utmi0>;
+       phy-names = "utmi";
+       dr_mode = "host";
        status = "okay";
 };
 
 &cp0_usb3_1 {
        /* J38? - USB2.0 only */
+       phys = <&cp0_utmi1>;
+       phy-names = "utmi";
+       dr_mode = "host";
        status = "okay";
 };
 
@@ -364,9 +374,14 @@
        };
 };
 
+&cp1_utmi {
+       status = "okay";
+};
+
 &cp1_usb3_0 {
        /* CPS Lane 2 - CON7 */
-       phys = <&cp1_comphy2 0>;
-       phy-names = "cp1-usb3h0-comphy";
+       phys = <&cp1_comphy2 0>, <&cp1_utmi0>;
+       phy-names = "cp1-usb3h0-comphy", "utmi";
+       dr_mode = "host";
        status = "okay";
 };

diff --git a/arch/arm64/boot/dts/marvell/cn9130-db.dts b/arch/arm64/boot/dts/marvell/cn9130-db.dts
index 79020e6..2c2af00 100644 (file)
--- a/arch/arm64/boot/dts/marvell/cn9130-db.dts
+++ b/arch/arm64/boot/dts/marvell/cn9130-db.dts
@@ -392,14 +392,22 @@
        };
 };
 
+&cp0_utmi {
+       status = "okay";
+};
+
 &cp0_usb3_0 {
        status = "okay";
        usb-phy = <&cp0_usb3_0_phy0>;
-       phy-names = "usb";
+       phys = <&cp0_utmi0>;
+       phy-names = "utmi";
+       dr_mode = "host";
 };
 
 &cp0_usb3_1 {
        status = "okay";
        usb-phy = <&cp0_usb3_0_phy1>;
-       phy-names = "usb";
+       phys =  <&cp0_utmi1>;
+       phy-names = "utmi";
+       dr_mode = "host";
 };

diff --git a/arch/arm64/boot/dts/marvell/cn9131-db.dts b/arch/arm64/boot/dts/marvell/cn9131-db.dts
index 3c975f9..ba2d4e1 100644 (file)
--- a/arch/arm64/boot/dts/marvell/cn9131-db.dts
+++ b/arch/arm64/boot/dts/marvell/cn9131-db.dts
@@ -193,10 +193,15 @@
 };
 
 /* CON58 */
+&cp1_utmi {
+       status = "okay";
+};
+
 &cp1_usb3_1 {
        status = "okay";
        usb-phy = <&cp1_usb3_0_phy0>;
        /* Generic PHY, providing serdes lanes */
-       phys = <&cp1_comphy3 1>;
-       phy-names = "usb";
+       phys = <&cp1_comphy3 1>, <&cp1_utmi1>;
+       phy-names = "usb", "utmi";
+       dr_mode = "host";
 };

diff --git a/arch/arm64/boot/dts/marvell/cn9132-db.dts b/arch/arm64/boot/dts/marvell/cn9132-db.dts
index 4ef0df3..81fba02 100644 (file)
--- a/arch/arm64/boot/dts/marvell/cn9132-db.dts
+++ b/arch/arm64/boot/dts/marvell/cn9132-db.dts
@@ -205,17 +205,24 @@
        };
 };
 
+&cp2_utmi {
+       status = "okay";
+};
+
 &cp2_usb3_0 {
        status = "okay";
        usb-phy = <&cp2_usb3_0_phy0>;
+       phys = <&cp2_utmi0>;
        phy-names = "usb";
+       dr_mode = "host";
 };
 
 /* SLM-1521-V2, CON11 */
 &cp2_usb3_1 {
        status = "okay";
        usb-phy = <&cp2_usb3_0_phy1>;
-       phy-names = "usb";
        /* Generic PHY, providing serdes lanes */
-       phys = <&cp2_comphy3 1>;
+       phys = <&cp2_comphy3 1>, <&cp2_utmi1>;
+       phy-names = "usb", "utmi";
+       dr_mode = "host";
 };