| Message ID | 7445620.7S2XydQea5@wuerfel (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Fri, Feb 27, 2015 at 09:12:45PM +0100, Arnd Bergmann wrote: > 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. > > This changes the dependency to allow OMAP_CONTROL_PHY to > be disabled, but to disallow USB_MUSB_OMAP2PLUS from being > built-in if OMAP_CONTROL_PHY is a loadable module. > > Signed-off-by: Arnd Bergmann <arnd@arndb.de> > Fixes: ca784be36cc725 ("usb: start using the control module driver") > Cc: <stable@vger.kernel.org> # v3.9+ > Cc: Felipe Balbi <balbi@ti.com> please resend with linux-usb in Cc and myself in Cc too ;-)
On Fri 2015-02-27 21:12:45, Arnd Bergmann wrote: > 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. > > This changes the dependency to allow OMAP_CONTROL_PHY to > be disabled, but to disallow USB_MUSB_OMAP2PLUS from being > built-in if OMAP_CONTROL_PHY is a loadable module. > > Signed-off-by: Arnd Bergmann <arnd@arndb.de> > Fixes: ca784be36cc725 ("usb: start using the control module driver") > Cc: <stable@vger.kernel.org> # v3.9+ > Cc: Felipe Balbi <balbi@ti.com> Acked-by: Pavel Machek <pavel@ucw.cz>
diff --git a/drivers/usb/musb/Kconfig b/drivers/usb/musb/Kconfig index 14e1628483d9..39db8b603627 100644 --- a/drivers/usb/musb/Kconfig +++ b/drivers/usb/musb/Kconfig @@ -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
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. This changes the dependency to allow OMAP_CONTROL_PHY to be disabled, but to disallow USB_MUSB_OMAP2PLUS from being built-in if OMAP_CONTROL_PHY is a loadable module. Signed-off-by: Arnd Bergmann <arnd@arndb.de> Fixes: ca784be36cc725 ("usb: start using the control module driver") Cc: <stable@vger.kernel.org> # v3.9+ Cc: Felipe Balbi <balbi@ti.com> -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html