* [PATCH, RESEND] usb: musb: fix Kconfig regression
@ 2015-02-27 23:19 Arnd Bergmann
2015-02-27 23:51 ` Aaro Koskinen
0 siblings, 1 reply; 2+ messages in thread
From: Arnd Bergmann @ 2015-02-27 23:19 UTC (permalink / raw)
To: linux-usb, Felipe Balbi
Cc: gregkh, linux-arm-kernel, Tony Lindgren, Aaro Koskinen,
ivo.g.dimitrov.75, khilman, sre, kernel list, sre, Sakari Ailus,
Pavel Machek, pali.rohar, linux-omap, patrikbachan
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.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Fixes: ca784be36cc725 ("usb: start using the control module driver")
Acked-by: Acked-by: Pavel Machek <pavel@ucw.cz>
Cc: <stable@vger.kernel.org> # v3.9+
---
Same patch as first time, now with correct recipient and with Pavel's
Ack added.
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
^ permalink raw reply related [flat|nested] 2+ messages in thread* Re: [PATCH, RESEND] usb: musb: fix Kconfig regression
2015-02-27 23:19 [PATCH, RESEND] usb: musb: fix Kconfig regression Arnd Bergmann
@ 2015-02-27 23:51 ` Aaro Koskinen
0 siblings, 0 replies; 2+ messages in thread
From: Aaro Koskinen @ 2015-02-27 23:51 UTC (permalink / raw)
To: Arnd Bergmann
Cc: linux-usb, Felipe Balbi, gregkh, linux-arm-kernel, Tony Lindgren,
ivo.g.dimitrov.75, khilman, sre, kernel list, sre, Sakari Ailus,
Pavel Machek, pali.rohar, linux-omap, patrikbachan
Hi,
On Sat, Feb 28, 2015 at 12:19:41AM +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.
>
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> Fixes: ca784be36cc725 ("usb: start using the control module driver")
> Acked-by: Acked-by: Pavel Machek <pavel@ucw.cz>
> Cc: <stable@vger.kernel.org> # 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:
Tested-by: Aaro Koskinen <aaro.koskinen@iki.fi>
Thanks,
A.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2015-02-27 23:51 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-02-27 23:19 [PATCH, RESEND] usb: musb: fix Kconfig regression Arnd Bergmann
2015-02-27 23:51 ` Aaro Koskinen
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox