aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb/host/ehci-hub.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/usb/host/ehci-hub.c')
-rw-r--r--drivers/usb/host/ehci-hub.c14
1 files changed, 7 insertions, 7 deletions
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,
183 spin_lock_irq(&ehci->lock); 183 spin_lock_irq(&ehci->lock);
184 184
185 /* clear phy low-power mode before changing wakeup flags */ 185 /* clear phy low-power mode before changing wakeup flags */
186 if (ehci->has_hostpc) { 186 if (ehci->has_tdi_phy_lpm) {
187 port = HCS_N_PORTS(ehci->hcs_params); 187 port = HCS_N_PORTS(ehci->hcs_params);
188 while (port--) { 188 while (port--) {
189 u32 __iomem *hostpc_reg = &ehci->regs->hostpc[port]; 189 u32 __iomem *hostpc_reg = &ehci->regs->hostpc[port];
@@ -217,7 +217,7 @@ static void ehci_adjust_port_wakeup_flags(struct ehci_hcd *ehci,
217 } 217 }
218 218
219 /* enter phy low-power mode again */ 219 /* enter phy low-power mode again */
220 if (ehci->has_hostpc) { 220 if (ehci->has_tdi_phy_lpm) {
221 port = HCS_N_PORTS(ehci->hcs_params); 221 port = HCS_N_PORTS(ehci->hcs_params);
222 while (port--) { 222 while (port--) {
223 u32 __iomem *hostpc_reg = &ehci->regs->hostpc[port]; 223 u32 __iomem *hostpc_reg = &ehci->regs->hostpc[port];
@@ -309,7 +309,7 @@ static int ehci_bus_suspend (struct usb_hcd *hcd)
309 } 309 }
310 } 310 }
311 311
312 if (changed && ehci->has_hostpc) { 312 if (changed && ehci->has_tdi_phy_lpm) {
313 spin_unlock_irq(&ehci->lock); 313 spin_unlock_irq(&ehci->lock);
314 msleep(5); /* 5 ms for HCD to enter low-power mode */ 314 msleep(5); /* 5 ms for HCD to enter low-power mode */
315 spin_lock_irq(&ehci->lock); 315 spin_lock_irq(&ehci->lock);
@@ -435,7 +435,7 @@ static int ehci_bus_resume (struct usb_hcd *hcd)
435 goto shutdown; 435 goto shutdown;
436 436
437 /* clear phy low-power mode before resume */ 437 /* clear phy low-power mode before resume */
438 if (ehci->bus_suspended && ehci->has_hostpc) { 438 if (ehci->bus_suspended && ehci->has_tdi_phy_lpm) {
439 i = HCS_N_PORTS(ehci->hcs_params); 439 i = HCS_N_PORTS(ehci->hcs_params);
440 while (i--) { 440 while (i--) {
441 if (test_bit(i, &ehci->bus_suspended)) { 441 if (test_bit(i, &ehci->bus_suspended)) {
@@ -788,7 +788,7 @@ static int ehci_hub_control (
788 goto error; 788 goto error;
789 789
790 /* clear phy low-power mode before resume */ 790 /* clear phy low-power mode before resume */
791 if (ehci->has_hostpc) { 791 if (ehci->has_tdi_phy_lpm) {
792 temp1 = ehci_readl(ehci, hostpc_reg); 792 temp1 = ehci_readl(ehci, hostpc_reg);
793 ehci_writel(ehci, temp1 & ~HOSTPC_PHCD, 793 ehci_writel(ehci, temp1 & ~HOSTPC_PHCD,
794 hostpc_reg); 794 hostpc_reg);
@@ -1032,12 +1032,12 @@ static int ehci_hub_control (
1032 1032
1033 /* After above check the port must be connected. 1033 /* After above check the port must be connected.
1034 * Set appropriate bit thus could put phy into low power 1034 * Set appropriate bit thus could put phy into low power
1035 * mode if we have hostpc feature 1035 * mode if we have tdi_phy_lpm feature
1036 */ 1036 */
1037 temp &= ~PORT_WKCONN_E; 1037 temp &= ~PORT_WKCONN_E;
1038 temp |= PORT_WKDISC_E | PORT_WKOC_E; 1038 temp |= PORT_WKDISC_E | PORT_WKOC_E;
1039 ehci_writel(ehci, temp | PORT_SUSPEND, status_reg); 1039 ehci_writel(ehci, temp | PORT_SUSPEND, status_reg);
1040 if (ehci->has_hostpc) { 1040 if (ehci->has_tdi_phy_lpm) {
1041 spin_unlock_irqrestore(&ehci->lock, flags); 1041 spin_unlock_irqrestore(&ehci->lock, flags);
1042 msleep(5);/* 5ms for HCD enter low pwr mode */ 1042 msleep(5);/* 5ms for HCD enter low pwr mode */
1043 spin_lock_irqsave(&ehci->lock, flags); 1043 spin_lock_irqsave(&ehci->lock, flags);