Home Explore Help
Sign In
GfA
/
linux_kernel
5
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

MIPS: Octeon: Set OHCI and EHCI MMIO byte order to match CPU

The Octeon OHCI is now supported by the ohci-platform driver, and
USB_OCTEON_OHCI is marked as deprecated.  However, it is currently
still necessary to enable it in order to select
USB_OHCI_BIG_ENDIAN_MMIO.  Make CPU_CAVIUM_OCTEON select that as well,
so that USB_OCTEON_OHCI is really obsolete.

The old ohci-octeon and ehci-octeon drivers also only enabled big-endian
MMIO in case the CPU was big-endian.  Make the selections of
USB_EHCI_BIG_ENDIAN_MMIO and USB_OHCI_BIG_ENDIAN_MMIO conditional, to
match this.

Fixes: 2193dda5eec6 ("USB: host: Remove ehci-octeon and ohci-octeon drivers")
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Cc: Alan Stern <stern@rowland.harvard.edu>
Cc: linux-mips@linux-mips.org
Cc: David Daney <david.daney@cavium.com>
Cc: Chandrakala Chavva <cchavva@caviumnetworks.com>
Cc: Paul Martin <paul.martin@codethink.co.uk>
Patchwork: https://patchwork.linux-mips.org/patch/10178/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Ben Hutchings 10 years ago
parent
ca668a2da4
commit
df115f3ee9
2 changed files with 4 additions and 3 deletions
Split View Show Diff Stats
  1. 2 1
      arch/mips/Kconfig
  2. 2 2
      drivers/usb/host/Kconfig

+ 2 - 1
arch/mips/Kconfig
View File 

@@ -1574,7 +1574,8 @@ config CPU_CAVIUM_OCTEON
 
 	select WEAK_ORDERING
 
 	select CPU_SUPPORTS_HIGHMEM
 
 	select CPU_SUPPORTS_HUGEPAGES
 
-	select USB_EHCI_BIG_ENDIAN_MMIO
 
+	select USB_EHCI_BIG_ENDIAN_MMIO if CPU_BIG_ENDIAN
 
+	select USB_OHCI_BIG_ENDIAN_MMIO if CPU_BIG_ENDIAN
 
 	select MIPS_L1_CACHE_SHIFT_7
 
 	help
 
 	  The Cavium Octeon processor is a highly integrated chip containing

+ 2 - 2
drivers/usb/host/Kconfig
View File 

@@ -295,7 +295,7 @@ config USB_OCTEON_EHCI
 
 	bool "Octeon on-chip EHCI support (DEPRECATED)"
 
 	depends on CAVIUM_OCTEON_SOC
 
 	default n
 
-	select USB_EHCI_BIG_ENDIAN_MMIO
 
+	select USB_EHCI_BIG_ENDIAN_MMIO if CPU_BIG_ENDIAN
 
 	select USB_EHCI_HCD_PLATFORM
 
 	help
 
 	  This option is deprecated now and the driver was removed, use
 
@@ -568,7 +568,7 @@ config USB_OCTEON_OHCI
 
 	bool "Octeon on-chip OHCI support (DEPRECATED)"
 
 	depends on CAVIUM_OCTEON_SOC
 
 	default USB_OCTEON_EHCI
 
-	select USB_OHCI_BIG_ENDIAN_MMIO
 
+	select USB_OHCI_BIG_ENDIAN_MMIO if CPU_BIG_ENDIAN
 
 	select USB_OHCI_LITTLE_ENDIAN
 
 	select USB_OHCI_HCD_PLATFORM
 
 	help