Home Explore Help
Register Sign In
phyus
/
linux-vybrid_public
8
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

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>
Paul Mundt 14 years ago
parent
6e9d447606
commit
e3e9887ee9
2 changed files with 5 additions and 6 deletions
Split View Show Diff Stats
  1. 5 0
      arch/sh/Kconfig
  2. 0 6
      drivers/usb/Kconfig

+ 5 - 0
arch/sh/Kconfig
View File 

@@ -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"

+ 0 - 6
drivers/usb/Kconfig
View File 

@@ -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.