[PATCH 3.13.y-ckt 056/143] usb: musb: add omap-control dependency

Kamal Mostafa kamal at canonical.com
Tue Mar 31 19:47:01 UTC 2015

3.13.11-ckt18 -stable review patch.  If anyone has any objections, please let me know.


From: Arnd Bergmann <arnd at arndb.de>

commit fbba7db3990cb707ff91cd6507d53a0a730afe97 upstream.

The omap musb front-end calls into the phy driver directly
instead of using a generic phy interface, which causes a link
error when the specific driver is not built-in:

drivers/built-in.o: In function `omap2430_musb_disable':
usb/musb/omap2430.c:480: undefined reference to `omap_control_usb_set_mode'
drivers/built-in.o: In function `omap2430_musb_enable':
usb/musb/omap2430.c:466: undefined reference to `omap_control_usb_set_mode'
usb/musb/omap2430.c:447: undefined reference to `omap_control_usb_set_mode'
drivers/built-in.o: In function `omap_musb_set_mailbox':
usb/musb/omap2430.c:273: undefined reference to `omap_control_usb_set_mode'
usb/musb/omap2430.c:304: undefined reference to `omap_control_usb_set_mode'
drivers/built-in.o:(.debug_addr+0xbd9e0): more undefined references to `omap_control_usb_set_mode' follow

This adds an explicit dependency.

Signed-off-by: Arnd Bergmann <arnd at arndb.de>
Fixes: ca784be36cc725 ("usb: start using the control module driver")
Signed-off-by: Felipe Balbi <balbi at ti.com>
Signed-off-by: Kamal Mostafa <kamal at canonical.com>
 drivers/usb/musb/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/usb/musb/Kconfig b/drivers/usb/musb/Kconfig
index a70f46f..ddcbcdd 100644
--- a/drivers/usb/musb/Kconfig
+++ b/drivers/usb/musb/Kconfig
@@ -74,7 +74,7 @@ config USB_MUSB_TUSB6010
 	tristate "OMAP2430 and onwards"
-	depends on ARCH_OMAP2PLUS && USB
 	select GENERIC_PHY
 config USB_MUSB_AM35X

More information about the kernel-team mailing list