Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit df115f3e authored by Ben Hutchings's avatar Ben Hutchings Committed by Ralf Baechle
Browse files

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: 2193dda5 ("USB: host: Remove ehci-octeon and ohci-octeon drivers")
Signed-off-by: default avatarBen 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: default avatarRalf Baechle <ralf@linux-mips.org>
parent ca668a2d

arch/mips/Kconfig

+2 −1
Original line number Original line Diff line number Diff line
@@ -1574,7 +1574,8 @@ config CPU_CAVIUM_OCTEON 
	select WEAK_ORDERING

	select WEAK_ORDERING

	select CPU_SUPPORTS_HIGHMEM

	select CPU_SUPPORTS_HIGHMEM

	select CPU_SUPPORTS_HUGEPAGES

	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

	select MIPS_L1_CACHE_SHIFT_7

	help

	help

	  The Cavium Octeon processor is a highly integrated chip containing

	  The Cavium Octeon processor is a highly integrated chip containing

drivers/usb/host/Kconfig

+2 −2
Original line number Original line Diff line number Diff line
@@ -295,7 +295,7 @@ config USB_OCTEON_EHCI 
	bool "Octeon on-chip EHCI support (DEPRECATED)"

	bool "Octeon on-chip EHCI support (DEPRECATED)"

	depends on CAVIUM_OCTEON_SOC

	depends on CAVIUM_OCTEON_SOC

	default n

	default n

	select USB_EHCI_BIG_ENDIAN_MMIO

	select USB_EHCI_BIG_ENDIAN_MMIO if CPU_BIG_ENDIAN

	select USB_EHCI_HCD_PLATFORM

	select USB_EHCI_HCD_PLATFORM

	help

	help

	  This option is deprecated now and the driver was removed, use

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

	bool "Octeon on-chip OHCI support (DEPRECATED)"

	depends on CAVIUM_OCTEON_SOC

	depends on CAVIUM_OCTEON_SOC

	default USB_OCTEON_EHCI

	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_LITTLE_ENDIAN

	select USB_OHCI_HCD_PLATFORM

	select USB_OHCI_HCD_PLATFORM

	help

	help