From 8aa106cf43fff5c05c14cff09071e95fc0a22996 Mon Sep 17 00:00:00 2001
From: Zoltan Herpai <wigyori@uid0.hu>
Date: Wed, 17 Jul 2013 22:49:16 +0000
Subject: [PATCH] imx23: ChipIdea changes

 - move ci_hdrc into generic modules
 - add separate package for imx-specific modules

Signed-off-by: Zoltan HERPAI <wigyori@uid0.hu>

SVN-Revision: 37384
---
 package/kernel/linux/modules/usb.mk | 19 +++++++++++++++++++
 target/linux/imx23/modules.mk       | 23 +++++++++--------------
 2 files changed, 28 insertions(+), 14 deletions(-)

diff --git a/package/kernel/linux/modules/usb.mk b/package/kernel/linux/modules/usb.mk
index 0fa99ccb79b..10c82803d75 100644
--- a/package/kernel/linux/modules/usb.mk
+++ b/package/kernel/linux/modules/usb.mk
@@ -1023,3 +1023,22 @@ $(call KernelPackage/usbip/Default)
   $(call AddDepends/usb)
 endef
 $(eval $(call KernelPackage,usbip-server))
+
+define KernelPackage/usb-chipidea
+    TITLE:=Support for ChipIdea controllers
+    KCONFIG:= \
+	CONFIG_USB_CHIPIDEA \
+	CONFIG_USB_CHIPIDEA_HOST=y \
+	CONFIG_USB_CHIPIDEA_DEBUG=y
+    FILES:=\
+	$(LINUX_DIR)/drivers/usb/chipidea/ci_hdrc.ko
+    AUTOLOAD:=$(call AutoLoad,51,ci_hdrc,1)
+    $(call AddDepends/usb)
+endef
+
+define KernelPackage/usb-chipidea/description
+    Kernel support for USB ChipIdea controllers
+endef
+
+$(eval $(call KernelPackage,usb-chipidea,1))
+
diff --git a/target/linux/imx23/modules.mk b/target/linux/imx23/modules.mk
index fb81cef91ca..edc4c67c178 100644
--- a/target/linux/imx23/modules.mk
+++ b/target/linux/imx23/modules.mk
@@ -33,32 +33,27 @@ endef
 
 $(eval $(call KernelPackage,wdt-stmp3xxx))
 
-define KernelPackage/usb-chipidea
-    TITLE:=Support for ChipIdea controllers
-    DEPENDS:=@TARGET_imx23
-    KCONFIG:= \
-	CONFIG_USB_CHIPIDEA \
-	CONFIG_USB_CHIPIDEA_HOST=y \
-	CONFIG_USB_CHIPIDEA_DEBUG=y
+define KernelPackage/usb-chipidea-imx
+    TITLE:=Support for ChipIdea controllers on i.MX
+    DEPENDS:=+kmod-usb-chipidea
     FILES:=\
-	$(LINUX_DIR)/drivers/usb/chipidea/ci_hdrc.ko \
 	$(LINUX_DIR)/drivers/usb/chipidea/ci13xxx_imx.ko
-    AUTOLOAD:=$(call AutoLoad,51,ci_hdrc ci13xxx_imx,1)
+    AUTOLOAD:=$(call AutoLoad,52,ci13xxx_imx,1)
     $(call AddDepends/usb)
 endef
 
-define KernelPackage/usb-chipidea/description
-    Kernel support for USB ChipIdea controllers
+define KernelPackage/usb-chipidea-imx/description
+    Kernel support for USB ChipIdea controllers on i.MX
 endef
 
-$(eval $(call KernelPackage,usb-chipidea,1))
+$(eval $(call KernelPackage,usb-chipidea-imx,1))
 
 define KernelPackage/usb-mxs-phy
     TITLE:=Support for Freescale MXS USB PHY controllers
-    DEPENDS:=+kmod-usb-chipidea
+    DEPENDS:=+kmod-usb-chipidea-imx
     KCONFIG:= \
 	CONFIG_USB_MXS_PHY
-	FILES:=$(LINUX_DIR)/drivers/usb/phy/phy-mxs-usb.ko
+    FILES:=$(LINUX_DIR)/drivers/usb/phy/phy-mxs-usb.ko
     AUTOLOAD:=$(call AutoLoad,50,phy-mxs-usb,1)
     $(call AddDepends/usb)
 endef