3 files changed, 9 insertions, 7 deletions

diff --git a/drivers/usb/chipidea/host.c b/drivers/usb/chipidea/host.c
index 40d0fda4f66c..9b3aaf132bc3 100644
--- a/drivers/usb/chipidea/host.c
+++ b/drivers/usb/chipidea/host.c
@@ -63,6 +63,7 @@ static int host_start(struct ci_hdrc *ci)
         ehci = hcd_to_ehci(hcd);
         ehci->caps = ci->hw_bank.cap;
         ehci->has_hostpc = ci->hw_bank.lpm;
+        ehci->has_tdi_phy_lpm = ci->hw_bank.lpm;
 
         ret = usb_add_hcd(hcd, 0, 0);
         if (ret)
diff --git a/drivers/usb/host/ehci-hub.c b/drivers/usb/host/ehci-hub.c
index 6dce37555c4f..6280bd269e12 100644
--- a/drivers/usb/host/ehci-hub.c
+++ b/drivers/usb/host/ehci-hub.c
@@ -183,7 +183,7 @@ static void ehci_adjust_port_wakeup_flags(struct ehci_hcd *ehci,
         spin_lock_irq(&ehci->lock);
 
         /* clear phy low-power mode before changing wakeup flags */
-        if (ehci->has_hostpc) {
+        if (ehci->has_tdi_phy_lpm) {
                 port = HCS_N_PORTS(ehci->hcs_params);
                 while (port--) {
                         u32 __iomem     *hostpc_reg = &ehci->regs->hostpc[port];
@@ -217,7 +217,7 @@ static void ehci_adjust_port_wakeup_flags(struct ehci_hcd *ehci,
         }
 
         /* enter phy low-power mode again */
-        if (ehci->has_hostpc) {
+        if (ehci->has_tdi_phy_lpm) {
                 port = HCS_N_PORTS(ehci->hcs_params);
                 while (port--) {
                         u32 __iomem     *hostpc_reg = &ehci->regs->hostpc[port];
@@ -309,7 +309,7 @@ static int ehci_bus_suspend (struct usb_hcd *hcd)
                 }
         }
 
-        if (changed && ehci->has_hostpc) {
+        if (changed && ehci->has_tdi_phy_lpm) {
                 spin_unlock_irq(&ehci->lock);
                 msleep(5);      /* 5 ms for HCD to enter low-power mode */
                 spin_lock_irq(&ehci->lock);
@@ -435,7 +435,7 @@ static int ehci_bus_resume (struct usb_hcd *hcd)
                 goto shutdown;
 
         /* clear phy low-power mode before resume */
-        if (ehci->bus_suspended && ehci->has_hostpc) {
+        if (ehci->bus_suspended && ehci->has_tdi_phy_lpm) {
                 i = HCS_N_PORTS(ehci->hcs_params);
                 while (i--) {
                         if (test_bit(i, &ehci->bus_suspended)) {
@@ -788,7 +788,7 @@ static int ehci_hub_control (
                                 goto error;
 
                         /* clear phy low-power mode before resume */
-                        if (ehci->has_hostpc) {
+                        if (ehci->has_tdi_phy_lpm) {
                                 temp1 = ehci_readl(ehci, hostpc_reg);
                                 ehci_writel(ehci, temp1 & ~HOSTPC_PHCD,
                                                 hostpc_reg);
@@ -1032,12 +1032,12 @@ static int ehci_hub_control (
 
                         /* After above check the port must be connected.
                          * Set appropriate bit thus could put phy into low power
-                         * mode if we have hostpc feature
+                         * mode if we have tdi_phy_lpm feature
                          */
                         temp &= ~PORT_WKCONN_E;
                         temp |= PORT_WKDISC_E | PORT_WKOC_E;
                         ehci_writel(ehci, temp | PORT_SUSPEND, status_reg);
-                        if (ehci->has_hostpc) {
+                        if (ehci->has_tdi_phy_lpm) {
                                 spin_unlock_irqrestore(&ehci->lock, flags);
                                 msleep(5);/* 5ms for HCD enter low pwr mode */
                                 spin_lock_irqsave(&ehci->lock, flags);
diff --git a/drivers/usb/host/ehci.h b/drivers/usb/host/ehci.h
index 64f9a08e959c..d034d94a7fea 100644
--- a/drivers/usb/host/ehci.h
+++ b/drivers/usb/host/ehci.h
@@ -210,6 +210,7 @@ struct ehci_hcd {			/* one per controller */
         #define OHCI_HCCTRL_LEN         0x4
         __hc32                  *ohci_hcctrl_reg;
         unsigned                has_hostpc:1;
+        unsigned                has_tdi_phy_lpm:1;
         unsigned                has_ppcd:1; /* support per-port change bits */
         u8                      sbrn;           /* packed release number */