diff options
| author | ruchika kharwar <ruchika@ti.com> | 2012-01-11 12:53:42 -0600 |
|---|---|---|
| committer | Ziyann <jaraidaniel@gmail.com> | 2014-10-01 12:55:41 +0200 |
| commit | f2078095e3c4b1c0f65461b598fe05e2d36ad3ad (patch) | |
| tree | 816f3fe7509def2ebc2cff99ce0323a6b1cf460c | |
| parent | b3a70b7c745546dd4594b16c0acecdcf0da59135 (diff) | |
| download | kernel_samsung_tuna-f2078095e3c4b1c0f65461b598fe05e2d36ad3ad.zip kernel_samsung_tuna-f2078095e3c4b1c0f65461b598fe05e2d36ad3ad.tar.gz kernel_samsung_tuna-f2078095e3c4b1c0f65461b598fe05e2d36ad3ad.tar.bz2 | |
OMAP4: USB: Fixed tshut reboot issue
Wakeup enable was set for usbb1_ulpitll_dir.usbb1_ulpiphy_dir. This is also
muxed with gpio 86. When a wakeup event was detected as part of the
gpio runtime resume, it set the gpio 86 event causing a tshut irq event.
We now rely on the wakeup from pin usbb1_ulpitll_dat0.usbb1_ulpiphy_dat0 for
USB wakeup events.
Change-Id: Ic32a976118944e45b91c0bdce6099ab090da3ae7
Signed-off-by: Huzefa Kankroliwala <huzefank@ti.com>
Signed-off-by: Ruchika Kharwar <ruchika@ti.com>
| -rw-r--r-- | arch/arm/mach-omap2/usb-host.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/arch/arm/mach-omap2/usb-host.c b/arch/arm/mach-omap2/usb-host.c index c94fca1..8eeb33d 100644 --- a/arch/arm/mach-omap2/usb-host.c +++ b/arch/arm/mach-omap2/usb-host.c @@ -177,10 +177,7 @@ static struct omap_device_pad port2_phy_pads[] __initdata = { }, { .name = "usbb2_ulpitll_dir.usbb2_ulpiphy_dir", - .flags = OMAP_DEVICE_PAD_REMUX | OMAP_DEVICE_PAD_WAKEUP, - .enable = (OMAP_PIN_INPUT_PULLDOWN | OMAP_MUX_MODE4) & ~(OMAP_WAKEUP_EN), - .idle = OMAP_PIN_INPUT_PULLDOWN | OMAP_WAKEUP_EN - | OMAP_MUX_MODE4, + .enable = OMAP_PIN_INPUT_PULLDOWN | OMAP_MUX_MODE4, }, { .name = "usbb2_ulpitll_nxt.usbb2_ulpiphy_nxt", @@ -190,8 +187,7 @@ static struct omap_device_pad port2_phy_pads[] __initdata = { .name = "usbb2_ulpitll_dat0.usbb2_ulpiphy_dat0", .flags = OMAP_DEVICE_PAD_REMUX | OMAP_DEVICE_PAD_WAKEUP, .enable = (OMAP_PIN_INPUT_PULLDOWN | OMAP_MUX_MODE4) & ~(OMAP_WAKEUP_EN), - .idle = OMAP_PIN_INPUT_PULLDOWN | OMAP_WAKEUP_EN - | OMAP_MUX_MODE4, + .idle = OMAP_PIN_INPUT_PULLDOWN | OMAP_MUX_MODE4, }, { .name = "usbb2_ulpitll_dat1.usbb2_ulpiphy_dat1", |