Merge tag 'usb-for-v3.12' of git://git.kernel.org/pub/scm/linux/kernel/git/balbi...

[cascardo/linux.git] / drivers / usb / host / ehci-hub.c

diff --git a/drivers/usb/host/ehci-hub.c b/drivers/usb/host/ehci-hub.c
index d0d4cc1..f8b215f 100644 (file)
--- 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);
@@ -436,7 +436,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)) {
@@ -925,7 +925,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);
@@ -1162,12 +1162,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);