44 lines
1.8 KiB
Diff
44 lines
1.8 KiB
Diff
From a9199e8ab6d6fb105aa251d6bf2192e7eafac8ee Mon Sep 17 00:00:00 2001
|
|
From: Ajay Kumar Gupta <ajay.gupta-l0cyMroinI0@public.gmane.org>
|
|
Date: Tue, 24 Mar 2009 17:22:53 -0700
|
|
Subject: [PATCH] USB: musb: only turn off vbus in OTG hosts
|
|
|
|
Except on DaVinci, VBUS is now switched off as part of idling the
|
|
USB link (after a_wait_bcon) whenever a device is disconnected
|
|
from host. This is correct for OTG hosts, where either SRP or
|
|
an ID interrupt could turn VBUS on again.
|
|
|
|
However, for non-OTG hosts there's no way to turn VBUS on again,
|
|
so the host becomes unusable. And the procfs entry which once
|
|
allowed a manual workaround for this is now gone.
|
|
|
|
This patch adds an is_otg_enabled() check before scheduling the
|
|
switch-off timer in disconnect path, supporting a "classic host"
|
|
mode where SRP is unavailable.
|
|
|
|
[ dbrownell-Rn4VEauK+AKRv+LV9MX5uipxlwaOVQ5f@public.gmane.org: tweak patch description ]
|
|
|
|
Signed-off-by: Ajay Kumar Gupta <ajay.gupta-l0cyMroinI0@public.gmane.org>
|
|
Signed-off-by: David Brownell <dbrownell-Rn4VEauK+AKRv+LV9MX5uipxlwaOVQ5f@public.gmane.org>
|
|
Signed-off-by: Greg Kroah-Hartman <gregkh-l3A5Bk7waGM@public.gmane.org>
|
|
---
|
|
drivers/usb/musb/musb_core.c | 2 +-
|
|
1 files changed, 1 insertions(+), 1 deletions(-)
|
|
|
|
diff --git a/drivers/usb/musb/musb_core.c b/drivers/usb/musb/musb_core.c
|
|
index af77e46..338cd16 100644
|
|
--- a/drivers/usb/musb/musb_core.c
|
|
+++ b/drivers/usb/musb/musb_core.c
|
|
@@ -769,7 +769,7 @@ static irqreturn_t musb_stage2_irq(struct musb *musb, u8 int_usb,
|
|
case OTG_STATE_A_SUSPEND:
|
|
usb_hcd_resume_root_hub(musb_to_hcd(musb));
|
|
musb_root_disconnect(musb);
|
|
- if (musb->a_wait_bcon != 0)
|
|
+ if (musb->a_wait_bcon != 0 && is_otg_enabled(musb))
|
|
musb_platform_try_idle(musb, jiffies
|
|
+ msecs_to_jiffies(musb->a_wait_bcon));
|
|
break;
|
|
--
|
|
1.6.0.4
|
|
|