phy: marvell: cp110: update utmi phy connection type

UTMI_PHY_TO_USB_HOST was used in USB3 UTMI dts node only, but there will
be USB2 UTMI dts node for some SoCs that have got USB2 controller, so rename
TO_USB_HOST to TO_USB3_HOST to distinguish TO_USB2_HOST in later on patches.

Signed-off-by: zachary <zhangzg@marvell.com>
Signed-off-by: Stefan Roese <sr@denx.de>
Signed-off-by: Igal Liberman <igall@marvell.com>
Reviewed-by: Stefan Roese <sr@denx.de>

diff --git a/arch/arm/dts/armada-cp110-master.dtsi b/arch/arm/dts/armada-cp110-master.dtsi
index 56c1a1232cc6d0503c35b5aafcfdd25fee7d0045..8c336f2c38fd0ba0277c4a9e4b3f38c35af3de92 100644 (file)
--- a/arch/arm/dts/armada-cp110-master.dtsi
+++ b/arch/arm/dts/armada-cp110-master.dtsi
@@ -253,7 +253,7 @@
                                reg = <0x580000 0x1000>,        /* utmi-unit */
                                      <0x440420 0x4>,           /* usb-cfg */
                                      <0x440440 0x4>;           /* utmi-cfg */
-                               utmi-port = <UTMI_PHY_TO_USB_HOST0>;
+                               utmi-port = <UTMI_PHY_TO_USB3_HOST0>;
                                status = "disabled";
                        };
 
@@ -262,7 +262,7 @@
                                reg = <0x581000 0x1000>,        /* utmi-unit */
                                      <0x440420 0x4>,           /* usb-cfg */
                                      <0x440444 0x4>;           /* utmi-cfg */
-                               utmi-port = <UTMI_PHY_TO_USB_HOST1>;
+                               utmi-port = <UTMI_PHY_TO_USB3_HOST1>;
                                status = "disabled";
                        };
 

diff --git a/arch/arm/dts/armada-cp110-slave.dtsi b/arch/arm/dts/armada-cp110-slave.dtsi
index 58763914496f8832cd13388648be10642080af5d..0cdb3d3ae3d67ef0bef154448a5ab981e67c4009 100644 (file)
--- a/arch/arm/dts/armada-cp110-slave.dtsi
+++ b/arch/arm/dts/armada-cp110-slave.dtsi
@@ -254,7 +254,7 @@
                                reg = <0x580000 0x1000>,        /* utmi-unit */
                                      <0x440420 0x4>,           /* usb-cfg */
                                      <0x440440 0x4>;           /* utmi-cfg */
-                               utmi-port = <UTMI_PHY_TO_USB_HOST0>;
+                               utmi-port = <UTMI_PHY_TO_USB3_HOST0>;
                                status = "disabled";
                        };
                };

diff --git a/drivers/phy/marvell/comphy_cp110.c b/drivers/phy/marvell/comphy_cp110.c
index 70554fe0cbff8df171408eb5866047b30c66c04f..8bec0abf75d8e998b20e00b2681ae420b424cd38 100644 (file)
--- a/drivers/phy/marvell/comphy_cp110.c
+++ b/drivers/phy/marvell/comphy_cp110.c
@@ -1304,7 +1304,7 @@ static void comphy_utmi_power_down(u32 utmi_index, void __iomem *utmi_base_addr,
         * If UTMI connected to USB Device, configure mux prior to PHY init
         * (Device can be connected to UTMI0 or to UTMI1)
         */
-       if (utmi_phy_port == UTMI_PHY_TO_USB_DEVICE0) {
+       if (utmi_phy_port == UTMI_PHY_TO_USB3_DEVICE0) {
                debug("stage:  UTMI %d - Enable Device mode and configure UTMI mux\n",
                      utmi_index);
                /* USB3 Device UTMI enable */
@@ -1496,7 +1496,8 @@ static void comphy_utmi_phy_init(u32 utmi_phy_count,
                        continue;
                }
                printf("UTMI PHY %d initialized to ", i);
-               if (cp110_utmi_data[i].utmi_phy_port == UTMI_PHY_TO_USB_DEVICE0)
+               if (cp110_utmi_data[i].utmi_phy_port ==
+                   UTMI_PHY_TO_USB3_DEVICE0)
                        printf("USB Device\n");
                else
                        printf("USB Host%d\n",

diff --git a/include/dt-bindings/comphy/comphy_data.h b/include/dt-bindings/comphy/comphy_data.h
index 8fd578aeaf75653832096ef26262fda7167242e4..d127388371bc40ecae300f7ce5daa73ace018e31 100644 (file)
--- a/include/dt-bindings/comphy/comphy_data.h
+++ b/include/dt-bindings/comphy/comphy_data.h
@@ -52,9 +52,9 @@
 #define PHY_POLARITY_ALL_INVERT                \
        (PHY_POLARITY_TXD_INVERT | PHY_POLARITY_RXD_INVERT)
 
-#define UTMI_PHY_TO_USB_HOST0          0
-#define UTMI_PHY_TO_USB_HOST1          1
-#define UTMI_PHY_TO_USB_DEVICE0                2
+#define UTMI_PHY_TO_USB3_HOST0         0
+#define UTMI_PHY_TO_USB3_HOST1         1
+#define UTMI_PHY_TO_USB3_DEVICE0       2
 #define UTMI_PHY_INVALID               0xff
 
 #endif /* _COMPHY_DATA_H_ */