[usb]: additional musb fixups

Signed-off-by: Imre Kaloz <kaloz@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@39554 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/package/kernel/linux/modules/usb.mk b/package/kernel/linux/modules/usb.mk
index 5ece8ff..30e7fe9 100644 (file)
--- a/package/kernel/linux/modules/usb.mk
+++ b/package/kernel/linux/modules/usb.mk
@@ -36,7 +36,7 @@ define AddDepends/usb
 endef
 
 
-define KernelPackage/musb-hdrc
+define KernelPackage/usb-musb-hdrc
   TITLE:=Support for Mentor Graphics silicon dual role USB
   KCONFIG:= \
        CONFIG_USB_MUSB_HDRC \
@@ -47,21 +47,57 @@ define KernelPackage/musb-hdrc
        CONFIG_USB_MUSB_GADGET=n \
        CONFIG_USB_MUSB_HOST=n \
        CONFIG_USB_MUSB_DEBUG=y
-  DEPENDS:=@(TARGET_omap||TARGET_omap24xx) +kmod-usb-gadget
+  DEPENDS:= \
+       @(TARGET_omap||TARGET_omap24xx) +kmod-usb-gadget \
+       +TARGET_omap24xx:kmod-usb-musb-tusb6010 \
+       +TARGET_omap:kmod-usb-musb-platformglue
   FILES:=$(LINUX_DIR)/drivers/usb/musb/musb_hdrc.ko
   AUTOLOAD:=$(call AutoLoad,46,musb_hdrc)
   $(call AddDepends/usb)
 endef
 
-define KernelPackage/musb-hdrc/description
+define KernelPackage/usb-musb-hdrc/description
   Kernel support for Mentor Graphics silicon dual role USB device.
 endef
 
-$(eval $(call KernelPackage,musb-hdrc))
+$(eval $(call KernelPackage,usb-musb-hdrc))
 
 
+define KernelPackage/usb-musb-platformglue
+  TITLE:=MUSB platform glue layer
+  KCONFIG:= \
+       CONFIG_USB_MUSB_TUSB6010=n \
+       USB_MUSB_OMAP2PLUS \
+       USB_MUSB_AM35X \
+       USB_MUSB_DSPS=n\
+       USB_MUSB_UX500=n
+#  DEPENDS:=+kmod-usb-musb-hdrc
+  $(call AddDepends/usb)
+endef
+
+define KernelPackage/usb-musb-platformglue/description
+  MUSB platform glue modules
+endef
+
+$(eval $(call KernelPackage,usb-musb-platformglue))
+
+
+define KernelPackage/usb-musb-tusb6010
+  TITLE:=Support for TUSB 6010
+  KCONFIG:= \
+       CONFIG_USB_MUSB_TUSB6010
+#  DEPENDS:=+kmod-usb-musb-hdrc +kmod-usb-nop-usb-xceiv
+  $(call AddDepends/usb)
+endef
+
+define KernelPackage/usb-musb-tusb6010/description
+  TUSB6010 support
+endef
+
+$(eval $(call KernelPackage,usb-musb-tusb6010))
+
 
-define KernelPackage/nop-usb-xceiv
+define KernelPackage/usb-nop-usb-xceiv
   TITLE:=Support for USB OTG NOP transceiver
   KCONFIG:= \
        CONFIG_NOP_USB_XCEIV
@@ -71,11 +107,11 @@ define KernelPackage/nop-usb-xceiv
   $(call AddDepends/usb)
 endef
 
-define KernelPackage/nop-usb-xceiv/description
+define KernelPackage/usb-nop-usb-xceiv/description
   Support for USB OTG NOP transceiver
 endef
 
-$(eval $(call KernelPackage,nop-usb-xceiv))
+$(eval $(call KernelPackage,usb-nop-usb-xceiv))
 
 
 define KernelPackage/usb-gadget

diff --git a/target/linux/omap24xx/modules.mk b/target/linux/omap24xx/modules.mk
index 4c73ab7..6de8e86 100644 (file)
--- a/target/linux/omap24xx/modules.mk
+++ b/target/linux/omap24xx/modules.mk
@@ -63,22 +63,6 @@ endef
 $(eval $(call KernelPackage,n810bm))
 
 
-define KernelPackage/tusb6010
-  TITLE:=Support for TUSB 6010
-  KCONFIG:= \
-       CONFIG_USB_MUSB_TUSB6010 \
-       CONFIG_USB_TUSB6010=y
-  DEPENDS:=+kmod-musb-hdrc +kmod-nop-usb-xceiv
-  $(call AddDepends/usb)
-endef
-
-define KernelPackage/tusb6010/description
-  TUSB6010 support
-endef
-
-$(eval $(call KernelPackage,tusb6010))
-
-
 define KernelPackage/usb-tahvo
   TITLE:=Support for Tahvo (Nokia n810) USB
   KCONFIG:= \
@@ -86,7 +70,7 @@ define KernelPackage/usb-tahvo
        CONFIG_CBUS_TAHVO_USB_HOST_BY_DEFAULT=n \
        CONFIG_USB_OHCI_HCD_OMAP1=y \
        CONFIG_USB_GADGET_DEBUG_FS=n
-  DEPENDS:=@TARGET_omap24xx +kmod-tusb6010 +kmod-usb-gadget
+  DEPENDS:=@TARGET_omap24xx +kmod-usb-musb-tusb6010
   FILES:=$(LINUX_DIR)/drivers/cbus/tahvo-usb.ko
   AUTOLOAD:=$(call AutoLoad,45,tahvo-usb)
   $(call AddDepends/usb)