diff options
| author | Bastien Curutchet <bastien.curutchet@bootlin.com> | 2024-05-28 12:20:25 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2024-06-04 15:44:11 +0200 |
| commit | 608662dd6081f6d3149ecd250b1054d3eb2b7d2d (patch) | |
| tree | 540e6493bc820a20ffa415d653082e93f5dc0bdd | |
| parent | Revert "usb: musb: da8xx: Set phy in OTG mode by default" (diff) | |
| download | linux-608662dd6081f6d3149ecd250b1054d3eb2b7d2d.tar.xz linux-608662dd6081f6d3149ecd250b1054d3eb2b7d2d.zip | |
usb: musb: da8xx: Remove try_idle implementation from host-only mode
The idle_state is not meant for host-only mode. When the device acts as a
host, it fails to exit the idle state once entered. This prevents new
USB gadgets from being detected once plugged in.
Commit 032ec49f5351 ("usb: musb: drop useless board_mode usage") removed
a is_otg_enabled() check in the try_idle() that prevented from entering
idle_state. This was removed because at that time it was not possible to
select host-only mode with CONFIG_USB_MUSB_HOST so dual role was always
set.
Add #ifndef CONFIG_USB_MUSB_HOST around try_idle() callback to prevent
from entering idle_state when host-only mode has been selected.
Signed-off-by: Bastien Curutchet <bastien.curutchet@bootlin.com>
Link: https://lore.kernel.org/r/20240528102026.40136-4-bastien.curutchet@bootlin.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/usb/musb/da8xx.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/usb/musb/da8xx.c b/drivers/usb/musb/da8xx.c index 1681f9fba3da..c5cf733673a2 100644 --- a/drivers/usb/musb/da8xx.c +++ b/drivers/usb/musb/da8xx.c @@ -191,7 +191,7 @@ static void otg_timer(struct timer_list *t) spin_unlock_irqrestore(&musb->lock, flags); } -static void da8xx_musb_try_idle(struct musb *musb, unsigned long timeout) +static void __maybe_unused da8xx_musb_try_idle(struct musb *musb, unsigned long timeout) { static unsigned long last_timer; @@ -476,7 +476,10 @@ static const struct musb_platform_ops da8xx_ops = { .disable = da8xx_musb_disable, .set_mode = da8xx_musb_set_mode, + +#ifndef CONFIG_USB_MUSB_HOST .try_idle = da8xx_musb_try_idle, +#endif .set_vbus = da8xx_musb_set_vbus, }; |