On 03/09/2012 02:31 PM, Paul Gortmaker wrote:
It seems that the current trend is to have the USB subsystem
"know" which arch are ECHI and OHCI, versus having the board
manually select the values.
I think the opposite is true, which is why the OCTEON code is in its
current state.
Unless Greg KH overrides me, I would have to say NACK.
David Daney
The current defconfig for Cavium
produces the following:
warning: (MIPS_ALCHEMY&& CAVIUM_OCTEON_REFERENCE_BOARD&&
SOC_AR71XX&& SOC_AR724X&& SOC_AR913X&& SOC_AR933X) selects
USB_ARCH_HAS_EHCI which has unmet direct dependencies (USB_SUPPORT)
There are a few other boards that suffix the ARCH_HAS selects
with "if USB_SUPPORT", but the selection of enabling the support
doesn't really change whether the arch has it or not, so go with
the solution that lets the subsystem choose.
Signed-off-by: Paul Gortmaker<paul.gortmaker@xxxxxxxxxxxxx>
diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index ce30e2f..9bad52b 100644
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -741,8 +741,6 @@ config CAVIUM_OCTEON_REFERENCE_BOARD
select HW_HAS_PCI
select ARCH_SUPPORTS_MSI
select ZONE_DMA32
- select USB_ARCH_HAS_OHCI
- select USB_ARCH_HAS_EHCI
select HOLES_IN_ZONE
help
This option supports all of the Octeon reference boards from Cavium
diff --git a/drivers/usb/Kconfig b/drivers/usb/Kconfig
index cc96a8e..143c3d5 100644
--- a/drivers/usb/Kconfig
+++ b/drivers/usb/Kconfig
@@ -55,6 +55,7 @@ config USB_ARCH_HAS_OHCI
# MIPS:
default y if MIPS_ALCHEMY
default y if MACH_JZ4740
+ default y if CAVIUM_OCTEON_REFERENCE_BOARD
# more:
default PCI
@@ -77,6 +78,7 @@ config USB_ARCH_HAS_EHCI
default y if SPARC_LEON
default y if ARCH_MMP
default y if MACH_LOONGSON1
+ default y if CAVIUM_OCTEON_REFERENCE_BOARD
default PCI
# some non-PCI HCDs implement xHCI
