USB: remove USB_EHCI_BIG_ENDIAN_{DESC,MMIO} depends on architecture symbol

Just like the OHCI counter part we just can remove the architecture
specific symbols which prevent these configuration symbols from being
selected by platforms/architectures requiring it. The original
implementation did not scale at all since it required each and every
single architecture to be added for these configuration symbols to be
selected. Now it is up to the EHCI driver and/or platform to select
these configuration symbols accordingly.

Acked-by: Alan Stern <[email protected]>
Signed-off-by: Florian Fainelli <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 1cacda426a0ea6699528dd0eeedf83032825e09e..bbddefea77bbb63ad11edfec2931ed4b4972ac0f 100644 (file)
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -549,6 +549,8 @@ config ARCH_IXP4XX
        select GENERIC_CLOCKEVENTS
        select MIGHT_HAVE_PCI
        select NEED_MACH_IO_H
+       select USB_EHCI_BIG_ENDIAN_MMIO
+       select USB_EHCI_BIG_ENDIAN_DESC
        help
          Support for Intel's IXP4XX (XScale) family of processors.
 

diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index 51244bf972718a54876e7ba2ab78ae1790c98e59..3a7b3954ce1b58075cf809a26becc2bb68dec261 100644 (file)
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -404,6 +404,8 @@ config PMC_MSP
        select IRQ_CPU
        select SERIAL_8250
        select SERIAL_8250_CONSOLE
+       select USB_EHCI_BIG_ENDIAN_MMIO
+       select USB_EHCI_BIG_ENDIAN_DESC
        help
          This adds support for the PMC-Sierra family of Multi-Service
          Processor System-On-A-Chips.  These parts include a number
@@ -1433,6 +1435,7 @@ config CPU_CAVIUM_OCTEON
        select CPU_SUPPORTS_HUGEPAGES
        select LIBFDT
        select USE_OF
+       select USB_EHCI_BIG_ENDIAN_MMIO
        help
          The Cavium Octeon processor is a highly integrated chip containing
          many ethernet hardware widgets for networking tasks. The processor

diff --git a/arch/powerpc/platforms/44x/Kconfig b/arch/powerpc/platforms/44x/Kconfig
index 0effe9f5a1eaf56b3c37f6b0b8d9b79a191d7718..7be93367d92f4dccbb4f0c4eeea747b2b0334402 100644 (file)
--- a/arch/powerpc/platforms/44x/Kconfig
+++ b/arch/powerpc/platforms/44x/Kconfig
@@ -274,6 +274,8 @@ config 440EPX
        select IBM_EMAC_EMAC4
        select IBM_EMAC_RGMII
        select IBM_EMAC_ZMII
+       select USB_EHCI_BIG_ENDIAN_MMIO
+       select USB_EHCI_BIG_ENDIAN_DESC
 
 config 440GRX
        bool

diff --git a/arch/powerpc/platforms/512x/Kconfig b/arch/powerpc/platforms/512x/Kconfig
index c16999802ecff6a5b960a1ffae9fba5c83c60f1f..381a592826a214887f29570d3d6b3c69e8fb2369 100644 (file)
--- a/arch/powerpc/platforms/512x/Kconfig
+++ b/arch/powerpc/platforms/512x/Kconfig
@@ -7,6 +7,8 @@ config PPC_MPC512x
        select PPC_PCI_CHOICE
        select FSL_PCI if PCI
        select ARCH_WANT_OPTIONAL_GPIOLIB
+       select USB_EHCI_BIG_ENDIAN_MMIO
+       select USB_EHCI_BIG_ENDIAN_DESC
 
 config MPC5121_ADS
        bool "Freescale MPC5121E ADS"

diff --git a/arch/sparc/Kconfig b/arch/sparc/Kconfig
index 3d361f236308c13cde14286379ec418af3e52990..66dc562950aea8c9b631ca87dce6f23f5d52b430 100644 (file)
--- a/arch/sparc/Kconfig
+++ b/arch/sparc/Kconfig
@@ -407,6 +407,8 @@ config SERIAL_CONSOLE
 config SPARC_LEON
        bool "Sparc Leon processor family"
        depends on SPARC32
+       select USB_EHCI_BIG_ENDIAN_MMIO
+       select USB_EHCI_BIG_ENDIAN_DESC
        ---help---
          If you say Y here if you are running on a SPARC-LEON processor.
          The LEON processor is a synthesizable VHDL model of the

diff --git a/drivers/usb/host/Kconfig b/drivers/usb/host/Kconfig
index 1714c6defd234561a83548362ceb42ac06b5dbe6..436b6828afdd4862233f6afb4abb57e0e9bc7715 100644 (file)
--- a/drivers/usb/host/Kconfig
+++ b/drivers/usb/host/Kconfig
@@ -110,18 +110,11 @@ config USB_EHCI_HCD_PMC_MSP
 
 config USB_EHCI_BIG_ENDIAN_MMIO
        bool
-       depends on USB_EHCI_HCD && (PPC_CELLEB || PPC_PS3 || 440EPX || \
-                                   ARCH_IXP4XX || XPS_USB_HCD_XILINX || \
-                                   PPC_MPC512x || CPU_CAVIUM_OCTEON || \
-                                   PMC_MSP || SPARC_LEON || MIPS_SEAD3)
-       default y
+       depends on USB_EHCI_HCD
 
 config USB_EHCI_BIG_ENDIAN_DESC
        bool
-       depends on USB_EHCI_HCD && (440EPX || ARCH_IXP4XX || XPS_USB_HCD_XILINX || \
-                                   PPC_MPC512x || PMC_MSP || SPARC_LEON || \
-                                   MIPS_SEAD3)
-       default y
+       depends on USB_EHCI_HCD
 
 config XPS_USB_HCD_XILINX
        bool "Use Xilinx usb host EHCI controller core"