diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2010-12-01 15:58:58 +0900 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2010-12-01 15:58:58 +0900 |
| commit | e3e9887ee9de36d8e2bef972ad74a42abd7a44c4 (patch) | |
| tree | ea0c29e07ca348cb1889dd75606b1123ef05b52e | |
| parent | 6e9d4476063a820764ec063bf683379c38ea1e18 (diff) | |
sh: Convert to USB_ARCH_HAS_OHCI/EHCI selects.
This switches over to selects for the subtypes to enable OHCI/EHCI
support explicitly rather than littering the usb Kconfig with subtype
dependencies.
Suggested-by: David Daney <ddaney@caviumnetworks.com>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| -rw-r--r-- | arch/sh/Kconfig | 5 | ||||
| -rw-r--r-- | drivers/usb/Kconfig | 6 |
2 files changed, 5 insertions, 6 deletions
diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig index 5c075f562eb..e0e2234341f 100644 --- a/arch/sh/Kconfig +++ b/arch/sh/Kconfig @@ -344,6 +344,7 @@ config CPU_SUBTYPE_SH7720 select CPU_SH3 select CPU_HAS_DSP select SYS_SUPPORTS_CMT + select USB_ARCH_HAS_OHCI help Select SH7720 if you have a SH3-DSP SH7720 CPU. @@ -352,6 +353,7 @@ config CPU_SUBTYPE_SH7721 select CPU_SH3 select CPU_HAS_DSP select SYS_SUPPORTS_CMT + select USB_ARCH_HAS_OHCI help Select SH7721 if you have a SH3-DSP SH7721 CPU. @@ -429,6 +431,7 @@ config CPU_SUBTYPE_SH7757 config CPU_SUBTYPE_SH7763 bool "Support SH7763 processor" select CPU_SH4A + select USB_ARCH_HAS_OHCI help Select SH7763 if you have a SH4A SH7763(R5S77631) CPU. @@ -453,6 +456,8 @@ config CPU_SUBTYPE_SH7786 select CPU_SHX3 select CPU_HAS_PTEAEX select GENERIC_CLOCKEVENTS_BROADCAST if SMP + select USB_ARCH_HAS_OHCI + select USB_ARCH_HAS_EHCI config CPU_SUBTYPE_SHX3 bool "Support SH-X3 processor" diff --git a/drivers/usb/Kconfig b/drivers/usb/Kconfig index 22a917302e3..703a33b46e7 100644 --- a/drivers/usb/Kconfig +++ b/drivers/usb/Kconfig @@ -47,11 +47,6 @@ config USB_ARCH_HAS_OHCI # MIPS: default y if MIPS_ALCHEMY default y if MACH_JZ4740 - # SH: - default y if CPU_SUBTYPE_SH7720 - default y if CPU_SUBTYPE_SH7721 - default y if CPU_SUBTYPE_SH7763 - default y if CPU_SUBTYPE_SH7786 # more: default PCI @@ -66,7 +61,6 @@ config USB_ARCH_HAS_EHCI default y if ARCH_AT91SAM9G45 default y if ARCH_MXC default y if ARCH_OMAP3 - default y if CPU_SUBTYPE_SH7786 default PCI # ARM SA1111 chips have a non-PCI based "OHCI-compatible" USB host interface. |