openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

usb: ohci: sort out dependencies for lpc32xx and omap 

The dependency on the isp1301 driver is not something that
should be in the main OHCI driver but rather the SoC specific
part of it.

This moves the dependency for LPC32xx into USB_OHCI_HCD_LPC32XX,
and changes the 'select ISP1301_OMAP' to a similar 'depends on'.
Since the same dependency exists for the client driver, do the
same change there.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Cc: linux-omap@vger.kernel.org
Acked-by: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Arnd Bergmann 2014-05-08 15:52:20 +02:00 committed by Greg Kroah-Hartman
parent 068413e9b7
commit 38e0c10940
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/usb/gadget/Kconfig
View File

@ -157,7 +157,7 @@ config USB_AT91
config USB_LPC32XX config USB_LPC32XX
tristate "LPC32XX USB Peripheral Controller" tristate "LPC32XX USB Peripheral Controller"
depends on ARCH_LPC32XX depends on ARCH_LPC32XX && I2C
select USB_ISP1301 select USB_ISP1301
help help
This option selects the USB device controller in the LPC32xx SoC. This option selects the USB device controller in the LPC32xx SoC.
@ -226,7 +226,7 @@ config USB_GR_UDC
config USB_OMAP config USB_OMAP
tristate "OMAP USB Device Controller" tristate "OMAP USB Device Controller"
depends on ARCH_OMAP1 depends on ARCH_OMAP1
select ISP1301_OMAP if MACH_OMAP_H2 || MACH_OMAP_H3 depends on ISP1301_OMAP || !(MACH_OMAP_H2 || MACH_OMAP_H3)
help help
Many Texas Instruments OMAP processors have flexible full Many Texas Instruments OMAP processors have flexible full
speed USB device controllers, with support for up to 30 speed USB device controllers, with support for up to 30

4
drivers/usb/host/Kconfig
View File

@ -363,8 +363,6 @@ config USB_MAX3421_HCD
config USB_OHCI_HCD config USB_OHCI_HCD
tristate "OHCI HCD (USB 1.1) support" tristate "OHCI HCD (USB 1.1) support"
select ISP1301_OMAP if MACH_OMAP_H2 || MACH_OMAP_H3
depends on USB_ISP1301 || !ARCH_LPC32XX
---help--- ---help---
The Open Host Controller Interface (OHCI) is a standard for accessing The Open Host Controller Interface (OHCI) is a standard for accessing
USB 1.1 host controller hardware. It does more in hardware than Intel's USB 1.1 host controller hardware. It does more in hardware than Intel's
@ -383,6 +381,7 @@ if USB_OHCI_HCD
config USB_OHCI_HCD_OMAP1 config USB_OHCI_HCD_OMAP1
tristate "OHCI support for OMAP1/2 chips" tristate "OHCI support for OMAP1/2 chips"
depends on ARCH_OMAP1 depends on ARCH_OMAP1
depends on ISP1301_OMAP || !(MACH_OMAP_H2 || MACH_OMAP_H3)
default y default y
---help--- ---help---
Enables support for the OHCI controller on OMAP1/2 chips. Enables support for the OHCI controller on OMAP1/2 chips.
@ -406,6 +405,7 @@ config USB_OHCI_HCD_S3C2410
config USB_OHCI_HCD_LPC32XX config USB_OHCI_HCD_LPC32XX
tristate "Support for LPC on-chip OHCI USB controller" tristate "Support for LPC on-chip OHCI USB controller"
depends on USB_OHCI_HCD && ARCH_LPC32XX depends on USB_OHCI_HCD && ARCH_LPC32XX
depends on USB_ISP1301
default y default y
---help--- ---help---
Enables support for the on-chip OHCI controller on Enables support for the on-chip OHCI controller on