drivers/usb: regorganisation

move to linux usb driver organisation

as following

drivers/usb/core
drivers/usb/gadget
drivers/usb/host
drivers/usb/otg

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

13 files changed, 19 insertions, 13 deletions

diff --git a/drivers/usb/Kconfig b/drivers/usb/Kconfig
index 839efeb885..c7b2c52660 100644
--- a/drivers/usb/Kconfig
+++ b/drivers/usb/Kconfig
@@ -3,15 +3,9 @@ menuconfig USB
 
 if USB
 
-config USB_EHCI
-	bool "EHCI driver"
+source drivers/usb/host/Kconfig
 
-config USB_ULPI
-	bool
-
-config USB_ISP1504
-	select USB_ULPI
-	bool "ISP1504 Tranceiver support"
+source drivers/usb/otg/Kconfig
 
 endif
 
diff --git a/drivers/usb/Makefile b/drivers/usb/Makefile
index 57d0bed862..e6f683bb29 100644
--- a/drivers/usb/Makefile
+++ b/drivers/usb/Makefile
@@ -1,6 +1,5 @@
-obj-$(CONFIG_USB)		+= usb.o
-obj-$(CONFIG_USB_EHCI)		+= usb_ehci_core.o
-obj-$(CONFIG_USB_ULPI)		+= ulpi.o
-obj-$(CONFIG_USB_ISP1504)	+= isp1504.o
+obj-$(CONFIG_USB)		+= core/
 obj-$(CONFIG_USB_GADGET)	+= gadget/
+obj-y += host/
+obj-y += otg/
 
diff --git a/drivers/usb/core/Makefile b/drivers/usb/core/Makefile
new file mode 100644
index 0000000000..d49c68dbab
--- /dev/null
+++ b/drivers/usb/core/Makefile
@@ -0,0 +1,2 @@
+
+obj-y += usb.o
diff --git a/drivers/usb/usb.c b/drivers/usb/core/usb.c
index 76e033eb7b..76e033eb7b 100644
--- a/drivers/usb/usb.c
+++ b/drivers/usb/core/usb.c
diff --git a/drivers/usb/host/Kconfig b/drivers/usb/host/Kconfig
new file mode 100644
index 0000000000..e1549e8186
--- /dev/null
+++ b/drivers/usb/host/Kconfig
@@ -0,0 +1,2 @@
+config USB_EHCI
+	bool "EHCI driver"
diff --git a/drivers/usb/host/Makefile b/drivers/usb/host/Makefile
new file mode 100644
index 0000000000..6c48e3aa39
--- /dev/null
+++ b/drivers/usb/host/Makefile
@@ -0,0 +1 @@
+obj-$(CONFIG_USB_EHCI)		+= ehci-hcd.o
diff --git a/drivers/usb/usb_ehci_core.h b/drivers/usb/host/ehci-core.h
index 39e5c5e58c..39e5c5e58c 100644
--- a/drivers/usb/usb_ehci_core.h
+++ b/drivers/usb/host/ehci-core.h
diff --git a/drivers/usb/usb_ehci_core.c b/drivers/usb/host/ehci-hcd.c
index af066de4ba..8995fa3c44 100644
--- a/drivers/usb/usb_ehci_core.c
+++ b/drivers/usb/host/ehci-hcd.c
@@ -34,7 +34,7 @@
 #include <usb/ehci.h>
 #include <asm/mmu.h>
 
-#include "usb_ehci.h"
+#include "ehci.h"
 
 struct ehci_priv {
 	int rootdev;
diff --git a/drivers/usb/usb_ehci.h b/drivers/usb/host/ehci.h
index af4924955f..af4924955f 100644
--- a/drivers/usb/usb_ehci.h
+++ b/drivers/usb/host/ehci.h
diff --git a/drivers/usb/otg/Kconfig b/drivers/usb/otg/Kconfig
new file mode 100644
index 0000000000..0191c87a9b
--- /dev/null
+++ b/drivers/usb/otg/Kconfig
@@ -0,0 +1,6 @@
+config USB_ULPI
+	bool
+
+config USB_ISP1504
+	select USB_ULPI
+	bool "ISP1504 Tranceiver support"
diff --git a/drivers/usb/otg/Makefile b/drivers/usb/otg/Makefile
new file mode 100644
index 0000000000..785f922445
--- /dev/null
+++ b/drivers/usb/otg/Makefile
@@ -0,0 +1,2 @@
+obj-$(CONFIG_USB_ULPI)		+= ulpi.o
+obj-$(CONFIG_USB_ISP1504)	+= isp1504.o
diff --git a/drivers/usb/isp1504.c b/drivers/usb/otg/isp1504.c
index 9ba74b157b..9ba74b157b 100644
--- a/drivers/usb/isp1504.c
+++ b/drivers/usb/otg/isp1504.c
diff --git a/drivers/usb/ulpi.c b/drivers/usb/otg/ulpi.c
index 4a898fb223..4a898fb223 100644
--- a/drivers/usb/ulpi.c
+++ b/drivers/usb/otg/ulpi.c