diff options
| author | Ruslan Bilovol <ruslan.bilovol@ti.com> | 2012-08-15 12:13:10 +0300 |
|---|---|---|
| committer | Gerrit Code Review <gerrit2@git.omapzoom.org> | 2012-10-05 10:56:56 -0500 |
| commit | 47d2b147f1dc5204e3e9872c88176dd6ad4cabcd (patch) | |
| tree | 4e0e5988b49437e4feccf9d5aca7095b2f782235 /drivers/usb/host | |
| parent | f04ffa699bafefdc797df04b01a1610f4daba7d5 (diff) | |
| download | kernel_samsung_espresso10-47d2b147f1dc5204e3e9872c88176dd6ad4cabcd.zip kernel_samsung_espresso10-47d2b147f1dc5204e3e9872c88176dd6ad4cabcd.tar.gz kernel_samsung_espresso10-47d2b147f1dc5204e3e9872c88176dd6ad4cabcd.tar.bz2 | |
Revert "HACK: fix ehci suspend/resume failure"
This reverts commit 4288c066b40204f8b3b09e5b8c9c2754ce92c5d9.
Conflicts:
drivers/usb/host/ehci-hub.c
Revert this hack for implementing new SW WA in correct place
Change-Id: I958271dfb454801437065299977228be76d0b956
Signed-off-by: Ruslan Bilovol <ruslan.bilovol@ti.com>
Diffstat (limited to 'drivers/usb/host')
| -rw-r--r-- | drivers/usb/host/ehci-hub.c | 24 |
1 files changed, 0 insertions, 24 deletions
diff --git a/drivers/usb/host/ehci-hub.c b/drivers/usb/host/ehci-hub.c index 50547ad..0840575 100644 --- a/drivers/usb/host/ehci-hub.c +++ b/drivers/usb/host/ehci-hub.c @@ -1192,30 +1192,6 @@ static int ehci_hub_control ( temp |= PORT_WKDISC_E | PORT_WKOC_E; ehci_writel(ehci, temp | PORT_SUSPEND, status_reg); - /* - * Special workaround sequence: - * - Set suspend bit - * - Wait 4ms for suspend to take effect - * - alternatively read the line state - * in PORTSC - * - switch to internal 60 MHz clock - * - wait 1ms - * - switch back to external clock - */ - { - u32 temp_reg; - mdelay(4); - temp_reg = omap_readl(L3INIT_HSUSBHOST_CLKCTRL); - temp_reg |= 1 << 8; - temp_reg &= ~(1 << 24); - omap_writel(temp_reg, L3INIT_HSUSBHOST_CLKCTRL); - - mdelay(1); - temp_reg &= ~(1 << 8); - temp_reg |= 1 << 24; - omap_writel(temp_reg, L3INIT_HSUSBHOST_CLKCTRL); - } - if (hostpc_reg) { spin_unlock_irqrestore(&ehci->lock, flags); msleep(5);/* 5ms for HCD enter low pwr mode */ |