Skip to contentSkip to conversation

usb: musb: fix Kconfig regression

PATCH RESEND In review Arnd Bergmann 2 participants 2 messages Feb 27, 2015

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH RESEND 1/1 usb: musb: fix Kconfig regression

A recent bug fix I did that was marked for stable backports introduced a slightly wrong dependency on CONFIG_OMAP_CONTROL_PHY.

I was missing the fact that the PHY driver already stubs out the omap_control_usb_set_mode, and we only need to add a dependency to prevent the musb-omap2430 driver from being built-in when the phy driver is a loadable module, but we should not prevent it from being built altogether when the phy driver is disabled.

Fixes ca784be36cc725 ("usb: start using the control module driver")
Cc <[email protected]> # v3.9+

---
Same patch as first time, now with correct recipient and with Pavel's Ack added.

drivers/usb/musb/Kconfig +2 -1
index 14e1628483d9..39db8b603627 100644
@@ -79,7 +79,8 @@ config USB_MUSB_TUSB6010
 
 config USB_MUSB_OMAP2PLUS
 	tristate "OMAP2430 and onwards"
-	depends on ARCH_OMAP2PLUS && USB && OMAP_CONTROL_PHY
+	depends on ARCH_OMAP2PLUS && USB
+	depends on OMAP_CONTROL_PHY || !OMAP_CONTROL_PHY
 	select GENERIC_PHY
 
 config USB_MUSB_AM35X
Tested-by on v1 1/1
#1 lore raw

Hi,

Quoted 9 lines · Arnd Bergmann

A recent bug fix I did that was marked for stable backports introduced a slightly wrong dependency on CONFIG_OMAP_CONTROL_PHY.

I was missing the fact that the PHY driver already stubs out the omap_control_usb_set_mode, and we only need to add a dependency to prevent the musb-omap2430 driver from being built-in when the phy driver is a loadable module, but we should not prevent it from being built altogether when the phy driver is disabled.

Quoted 4 lines
Fixes ca784be36cc725 ("usb: start using the control module driver")
Cc <[email protected]> # v3.9+

This patch allows me to disable redundant CONFIG_OMAP_CONTROL_PHY from 4.0-rc1 .config and still get a working USB on Nokia N9. So:

Thanks,

A.