Skip to content

Commit

Permalink
usb: isp1760: Move driver from drivers/usb/host/ to drivers/usb/isp1760/
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Laurent Pinchart authored and Felipe Balbi committed Jan 27, 2015
1 parent 0316ca6 commit 7ef077a
Show file tree
Hide file tree
Showing 15 changed files with 29 additions and 26 deletions.
2 changes: 2 additions & 0 deletions drivers/usb/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion drivers/usb/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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/

Expand All @@ -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/
Expand Down
7 changes: 0 additions & 7 deletions drivers/usb/gadget/udc/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
14 changes: 0 additions & 14 deletions drivers/usb/host/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -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---
Expand Down
4 changes: 0 additions & 4 deletions drivers/usb/host/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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
Expand Down
22 changes: 22 additions & 0 deletions drivers/usb/isp1760/Kconfig
Original file line number Diff line number Diff line change
@@ -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.
4 changes: 4 additions & 0 deletions drivers/usb/isp1760/Makefile
Original file line number Diff line number Diff line change
@@ -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
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 comments on commit 7ef077a

Please sign in to comment.