ChangeSet 1.2000.12.3, 2004/10/21 13:28:41-07:00, [EMAIL PROTECTED]
[PATCH] USB: usb/hcd kconfig updates
This updates the dependencies of the HCDs and host-side USB so that:
- Options for PCI-only HCDs (UHCI and, for now, EHCI) only appear
systems that actually have PCI.
- Adding non-PCI bus glue support for another OHCI adapter doesn't
need involve changing the main USB Kconfig anymore.
- Minor tweaks to the OMAP support, so OMAP 17xx and 24xx don't need
additional Kconfig changes and so the H3/17xx gets the ISP1301 too.
This still tries to hide host-side USB config options on systems that
don't offer USB. While currently convenient, that's a losing proposition
in the long term: host controllers on chips like SL811 and TD243 can be
put onto any custom board.
Signed-off-by: David Brownell <[EMAIL PROTECTED]>
Signed-off-by: Greg Kroah-Hartman <[EMAIL PROTECTED]>
drivers/usb/Kconfig | 2 +-
drivers/usb/host/Kconfig | 26 ++++++++++++++++++++++----
2 files changed, 23 insertions(+), 5 deletions(-)
diff -Nru a/drivers/usb/Kconfig b/drivers/usb/Kconfig
--- a/drivers/usb/Kconfig 2004-10-22 16:13:06 -07:00
+++ b/drivers/usb/Kconfig 2004-10-22 16:13:06 -07:00
@@ -7,7 +7,7 @@
# ARM SA1111 chips have a non-PCI based "OHCI-compatible" USB host interface.
config USB
tristate "Support for Host-side USB"
- depends on PCI || SA1111 || ARCH_OMAP1510 || ARCH_OMAP1610 || ARCH_LH7A404 ||
PXA27x
+ depends on USB_ARCH_HAS_HCD
---help---
Universal Serial Bus (USB) is a specification for a serial bus
subsystem which offers higher speeds and more features than the
diff -Nru a/drivers/usb/host/Kconfig b/drivers/usb/host/Kconfig
--- a/drivers/usb/host/Kconfig 2004-10-22 16:13:06 -07:00
+++ b/drivers/usb/host/Kconfig 2004-10-22 16:13:06 -07:00
@@ -1,3 +1,21 @@
+# Host-side USB depends on having a host controller
+# NOTE: dummy_hcd is always an option, but it's ignored here ...
+# NOTE: SL-811 option should be board-specific ...
+config USB_ARCH_HAS_HCD
+ boolean
+ default y if USB_ARCH_HAS_OHCI
+ default y if ARM # SL-811
+ default PCI
+
+# many non-PCI hcds implement OHCI
+config USB_ARCH_HAS_OHCI
+ boolean
+ default y if SA1111
+ default y if ARCH_OMAP
+ default y if ARCH_LH7A404
+ default y if PXA27x
+ default PCI
+
#
# USB Host Controller Drivers
#
@@ -6,7 +24,7 @@
config USB_EHCI_HCD
tristate "EHCI HCD (USB 2.0) support"
- depends on USB
+ depends on USB && PCI
---help---
The Enhanced Host Controller Interface (EHCI) is standard for USB 2.0
"high speed" (480 Mbit/sec, 60 Mbyte/sec) host controller hardware.
@@ -51,8 +69,8 @@
config USB_OHCI_HCD
tristate "OHCI HCD support"
- depends on USB
- select ISP1301_OMAP if MACH_OMAP_H2
+ depends on USB && USB_ARCH_HAS_OHCI
+ select ISP1301_OMAP if MACH_OMAP_H2 || MACH_OMAP_H3
---help---
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
@@ -68,7 +86,7 @@
config USB_UHCI_HCD
tristate "UHCI HCD (most Intel and VIA) support"
- depends on USB
+ depends on USB && PCI
---help---
The Universal Host Controller Interface is a standard by Intel for
accessing the USB hardware in the PC (which is also called the USB
-------------------------------------------------------
This SF.net email is sponsored by: IT Product Guide on ITManagersJournal
Use IT products in your business? Tell us what you think of them. Give us
Your Opinions, Get Free ThinkGeek Gift Certificates! Click to find out more
http://productguide.itmanagersjournal.com/guidepromo.tmpl
_______________________________________________
[EMAIL PROTECTED]
To unsubscribe, use the last form field at:
https://lists.sourceforge.net/lists/listinfo/linux-usb-devel
