summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorLaurent Pinchart <laurent.pinchart@ideasonboard.com>2015-01-20 23:56:02 +0100
committerFelipe Balbi <balbi@ti.com>2015-01-27 16:39:38 +0100
commit7ef077a8ad3557f030d0407c4f56c5a0cf1e418a (patch)
treed9096193b4cb402d2b4c381ba5376449d52db18f /drivers
parentusb: isp1760: Add device controller support (diff)
downloadlinux-7ef077a8ad3557f030d0407c4f56c5a0cf1e418a.tar.xz
linux-7ef077a8ad3557f030d0407c4f56c5a0cf1e418a.zip
usb: isp1760: Move driver from drivers/usb/host/ to drivers/usb/isp1760/
Now that this is DRD, it doesn't make sense to keep it under drivers/usb/host. Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Signed-off-by: Felipe Balbi <balbi@ti.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/usb/Kconfig2
-rw-r--r--drivers/usb/Makefile2
-rw-r--r--drivers/usb/gadget/udc/Kconfig7
-rw-r--r--drivers/usb/host/Kconfig14
-rw-r--r--drivers/usb/host/Makefile4
-rw-r--r--drivers/usb/isp1760/Kconfig22
-rw-r--r--drivers/usb/isp1760/Makefile4
-rw-r--r--drivers/usb/isp1760/isp1760-core.c (renamed from drivers/usb/host/isp1760-core.c)0
-rw-r--r--drivers/usb/isp1760/isp1760-core.h (renamed from drivers/usb/host/isp1760-core.h)0
-rw-r--r--drivers/usb/isp1760/isp1760-hcd.c (renamed from drivers/usb/host/isp1760-hcd.c)0
-rw-r--r--drivers/usb/isp1760/isp1760-hcd.h (renamed from drivers/usb/host/isp1760-hcd.h)0
-rw-r--r--drivers/usb/isp1760/isp1760-if.c (renamed from drivers/usb/host/isp1760-if.c)0
-rw-r--r--drivers/usb/isp1760/isp1760-regs.h (renamed from drivers/usb/host/isp1760-regs.h)0
-rw-r--r--drivers/usb/isp1760/isp1760-udc.c (renamed from drivers/usb/host/isp1760-udc.c)0
-rw-r--r--drivers/usb/isp1760/isp1760-udc.h (renamed from drivers/usb/host/isp1760-udc.h)0
15 files changed, 29 insertions, 26 deletions
diff --git a/drivers/usb/Kconfig b/drivers/usb/Kconfig
index ae481c37a208..8ed451dd651e 100644
--- a/drivers/usb/Kconfig
+++ b/drivers/usb/Kconfig
@@ -104,6 +104,8 @@ source "drivers/usb/dwc2/Kconfig"
source "drivers/usb/chipidea/Kconfig"
+source "drivers/usb/isp1760/Kconfig"
+
comment "USB port drivers"
if USB
diff --git a/drivers/usb/Makefile b/drivers/usb/Makefile
index d7be71778059..2f1e2aa42b44 100644
--- a/drivers/usb/Makefile
+++ b/drivers/usb/Makefile
@@ -8,6 +8,7 @@ obj-$(CONFIG_USB) += core/
obj-$(CONFIG_USB_DWC3) += dwc3/
obj-$(CONFIG_USB_DWC2) += dwc2/
+obj-$(CONFIG_USB_ISP1760) += isp1760/
obj-$(CONFIG_USB_MON) += mon/
@@ -23,7 +24,6 @@ obj-$(CONFIG_USB_ISP1362_HCD) += host/
obj-$(CONFIG_USB_U132_HCD) += host/
obj-$(CONFIG_USB_R8A66597_HCD) += host/
obj-$(CONFIG_USB_HWA_HCD) += host/
-obj-$(CONFIG_USB_ISP1760_HCD) += host/
obj-$(CONFIG_USB_IMX21_HCD) += host/
obj-$(CONFIG_USB_FSL_MPH_DR_OF) += host/
obj-$(CONFIG_USB_FUSBH200_HCD) += host/
diff --git a/drivers/usb/gadget/udc/Kconfig b/drivers/usb/gadget/udc/Kconfig
index c9152e260fd4..b8e213eb36cc 100644
--- a/drivers/usb/gadget/udc/Kconfig
+++ b/drivers/usb/gadget/udc/Kconfig
@@ -109,13 +109,6 @@ config USB_GR_UDC
Select this to support Aeroflex Gaisler GRUSBDC cores from the GRLIB
VHDL IP core library.
-config USB_ISP1761_UDC
- boolean "NXP ISP1761 USB Device Controller"
- depends on USB_ISP1760_HCD
- help
- The NXP ISP1761 is a dual-role high-speed USB host and device
- controller.
-
config USB_OMAP
tristate "OMAP USB Device Controller"
depends on ARCH_OMAP1
diff --git a/drivers/usb/host/Kconfig b/drivers/usb/host/Kconfig
index fafc628480e0..3de291b6ac04 100644
--- a/drivers/usb/host/Kconfig
+++ b/drivers/usb/host/Kconfig
@@ -331,20 +331,6 @@ config USB_ISP116X_HCD
To compile this driver as a module, choose M here: the
module will be called isp116x-hcd.
-config USB_ISP1760_HCD
- tristate "ISP 1760 HCD support"
- ---help---
- The ISP1760 chip is a USB 2.0 host controller.
-
- This driver does not support isochronous transfers or OTG.
- This USB controller is usually attached to a non-DMA-Master
- capable bus. NXP's eval kit brings this chip on PCI card
- where the chip itself is behind a PLB to simulate such
- a bus.
-
- To compile this driver as a module, choose M here: the
- module will be called isp1760.
-
config USB_ISP1362_HCD
tristate "ISP1362 HCD support"
---help---
diff --git a/drivers/usb/host/Makefile b/drivers/usb/host/Makefile
index 67d3f1843857..65b0b6a58599 100644
--- a/drivers/usb/host/Makefile
+++ b/drivers/usb/host/Makefile
@@ -5,9 +5,6 @@
# tell define_trace.h where to find the xhci trace header
CFLAGS_xhci-trace.o := -I$(src)
-isp1760-y := isp1760-core.o isp1760-hcd.o isp1760-if.o
-isp1760-$(CONFIG_USB_ISP1761_UDC) += isp1760-udc.o
-
fhci-y := fhci-hcd.o fhci-hub.o fhci-q.o
fhci-y += fhci-mem.o fhci-tds.o fhci-sched.o
@@ -70,7 +67,6 @@ obj-$(CONFIG_USB_SL811_HCD) += sl811-hcd.o
obj-$(CONFIG_USB_SL811_CS) += sl811_cs.o
obj-$(CONFIG_USB_U132_HCD) += u132-hcd.o
obj-$(CONFIG_USB_R8A66597_HCD) += r8a66597-hcd.o
-obj-$(CONFIG_USB_ISP1760_HCD) += isp1760.o
obj-$(CONFIG_USB_HWA_HCD) += hwa-hc.o
obj-$(CONFIG_USB_IMX21_HCD) += imx21-hcd.o
obj-$(CONFIG_USB_FSL_MPH_DR_OF) += fsl-mph-dr-of.o
diff --git a/drivers/usb/isp1760/Kconfig b/drivers/usb/isp1760/Kconfig
new file mode 100644
index 000000000000..c09ab8fa0e10
--- /dev/null
+++ b/drivers/usb/isp1760/Kconfig
@@ -0,0 +1,22 @@
+config USB_ISP1760
+ tristate "NXP ISP 1760/1761 support"
+ depends on USB
+ help
+ Say Y or M here if your system as an ISP1760 USB host controller
+ or an ISP1761 USB dual-role controller.
+
+ This driver does not support isochronous transfers or OTG.
+ This USB controller is usually attached to a non-DMA-Master
+ capable bus. NXP's eval kit brings this chip on PCI card
+ where the chip itself is behind a PLB to simulate such
+ a bus.
+
+ To compile this driver as a module, choose M here: the
+ module will be called isp1760.
+
+config USB_ISP1761_UDC
+ boolean "NXP ISP1761 USB Device Controller"
+ depends on USB_ISP1760 && USB_GADGET
+ help
+ The NXP ISP1761 is a dual-role high-speed USB host and device
+ controller.
diff --git a/drivers/usb/isp1760/Makefile b/drivers/usb/isp1760/Makefile
new file mode 100644
index 000000000000..698ccb0b2c65
--- /dev/null
+++ b/drivers/usb/isp1760/Makefile
@@ -0,0 +1,4 @@
+isp1760-y := isp1760-core.o isp1760-hcd.o isp1760-if.o
+isp1760-$(CONFIG_USB_ISP1761_UDC) += isp1760-udc.o
+
+obj-$(CONFIG_USB_ISP1760) += isp1760.o
diff --git a/drivers/usb/host/isp1760-core.c b/drivers/usb/isp1760/isp1760-core.c
index 727e90ad15bd..727e90ad15bd 100644
--- a/drivers/usb/host/isp1760-core.c
+++ b/drivers/usb/isp1760/isp1760-core.c
diff --git a/drivers/usb/host/isp1760-core.h b/drivers/usb/isp1760/isp1760-core.h
index c70f8368a794..c70f8368a794 100644
--- a/drivers/usb/host/isp1760-core.h
+++ b/drivers/usb/isp1760/isp1760-core.h
diff --git a/drivers/usb/host/isp1760-hcd.c b/drivers/usb/isp1760/isp1760-hcd.c
index 568446c9ce8d..568446c9ce8d 100644
--- a/drivers/usb/host/isp1760-hcd.c
+++ b/drivers/usb/isp1760/isp1760-hcd.c
diff --git a/drivers/usb/host/isp1760-hcd.h b/drivers/usb/isp1760/isp1760-hcd.h
index df7ea3684b77..df7ea3684b77 100644
--- a/drivers/usb/host/isp1760-hcd.h
+++ b/drivers/usb/isp1760/isp1760-hcd.h
diff --git a/drivers/usb/host/isp1760-if.c b/drivers/usb/isp1760/isp1760-if.c
index c2a94c966350..c2a94c966350 100644
--- a/drivers/usb/host/isp1760-if.c
+++ b/drivers/usb/isp1760/isp1760-if.c
diff --git a/drivers/usb/host/isp1760-regs.h b/drivers/usb/isp1760/isp1760-regs.h
index b67095c9a9d4..b67095c9a9d4 100644
--- a/drivers/usb/host/isp1760-regs.h
+++ b/drivers/usb/isp1760/isp1760-regs.h
diff --git a/drivers/usb/host/isp1760-udc.c b/drivers/usb/isp1760/isp1760-udc.c
index 6bfda3082807..6bfda3082807 100644
--- a/drivers/usb/host/isp1760-udc.c
+++ b/drivers/usb/isp1760/isp1760-udc.c
diff --git a/drivers/usb/host/isp1760-udc.h b/drivers/usb/isp1760/isp1760-udc.h
index 4af6ba6eda86..4af6ba6eda86 100644
--- a/drivers/usb/host/isp1760-udc.h
+++ b/drivers/usb/isp1760/isp1760-udc.h