diff options
| author | Stefan Roese <sr@denx.de> | 2017-04-24 18:45:23 +0300 |
|---|---|---|
| committer | Stefan Roese <sr@denx.de> | 2017-05-09 13:38:18 +0200 |
| commit | e89acc4bf1bfa9239e03a737ed8967ffcc71f5f7 (patch) | |
| tree | 070c872679edb243648ad5e78e6db07faedce1f6 | |
| parent | 7dda98e0da22a5275f374a40660f57a85a9af94e (diff) | |
| download | u-boot-e89acc4bf1bfa9239e03a737ed8967ffcc71f5f7.tar.gz | |
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>
| -rw-r--r-- | arch/arm/dts/armada-cp110-master.dtsi | 4 | ||||
| -rw-r--r-- | arch/arm/dts/armada-cp110-slave.dtsi | 2 | ||||
| -rw-r--r-- | drivers/phy/marvell/comphy_cp110.c | 5 | ||||
| -rw-r--r-- | include/dt-bindings/comphy/comphy_data.h | 6 |
4 files changed, 9 insertions, 8 deletions
diff --git a/arch/arm/dts/armada-cp110-master.dtsi b/arch/arm/dts/armada-cp110-master.dtsi index 56c1a1232c..8c336f2c38 100644 --- 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 5876391449..0cdb3d3ae3 100644 --- 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 70554fe0cb..8bec0abf75 100644 --- 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 8fd578aeaf..d127388371 100644 --- 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_ */ |