--- /dev/null
+From ec897569ad7dbc6d595873a487c3fac23f463f76 Mon Sep 17 00:00:00 2001
+From: James Hogan <jhogan@kernel.org>
+Date: Wed, 31 Jan 2018 22:24:45 +0000
+Subject: usb: Move USB_UHCI_BIG_ENDIAN_* out of USB_SUPPORT
+
+From: James Hogan <jhogan@kernel.org>
+
+commit ec897569ad7dbc6d595873a487c3fac23f463f76 upstream.
+
+Move the Kconfig symbols USB_UHCI_BIG_ENDIAN_MMIO and
+USB_UHCI_BIG_ENDIAN_DESC out of drivers/usb/host/Kconfig, which is
+conditional upon USB && USB_SUPPORT, so that it can be freely selected
+by platform Kconfig symbols in architecture code.
+
+For example once the MIPS_GENERIC platform selects are fixed in commit
+2e6522c56552 ("MIPS: Fix typo BIG_ENDIAN to CPU_BIG_ENDIAN"), the MIPS
+32r6_defconfig warns like so:
+
+warning: (MIPS_GENERIC) selects USB_UHCI_BIG_ENDIAN_MMIO which has unmet direct dependencies (USB_SUPPORT && USB)
+warning: (MIPS_GENERIC) selects USB_UHCI_BIG_ENDIAN_DESC which has unmet direct dependencies (USB_SUPPORT && USB)
+
+Fixes: 2e6522c56552 ("MIPS: Fix typo BIG_ENDIAN to CPU_BIG_ENDIAN")
+Signed-off-by: James Hogan <jhogan@kernel.org>
+Cc: Corentin Labbe <clabbe.montjoie@gmail.com>
+Cc: Ralf Baechle <ralf@linux-mips.org>
+Cc: Paul Burton <paul.burton@mips.com>
+Cc: linux-usb@vger.kernel.org
+Cc: linux-mips@linux-mips.org
+Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+Patchwork: https://patchwork.linux-mips.org/patch/18559/
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/usb/Kconfig | 8 ++++++++
+ drivers/usb/host/Kconfig | 8 --------
+ 2 files changed, 8 insertions(+), 8 deletions(-)
+
+--- a/drivers/usb/Kconfig
++++ b/drivers/usb/Kconfig
+@@ -19,6 +19,14 @@ config USB_EHCI_BIG_ENDIAN_MMIO
+ config USB_EHCI_BIG_ENDIAN_DESC
+ bool
+
++config USB_UHCI_BIG_ENDIAN_MMIO
++ bool
++ default y if SPARC_LEON
++
++config USB_UHCI_BIG_ENDIAN_DESC
++ bool
++ default y if SPARC_LEON
++
+ menuconfig USB_SUPPORT
+ bool "USB support"
+ depends on HAS_IOMEM
+--- a/drivers/usb/host/Kconfig
++++ b/drivers/usb/host/Kconfig
+@@ -625,14 +625,6 @@ config USB_UHCI_ASPEED
+ bool
+ default y if ARCH_ASPEED
+
+-config USB_UHCI_BIG_ENDIAN_MMIO
+- bool
+- default y if SPARC_LEON
+-
+-config USB_UHCI_BIG_ENDIAN_DESC
+- bool
+- default y if SPARC_LEON
+-
+ config USB_FHCI_HCD
+ tristate "Freescale QE USB Host Controller support"
+ depends on OF_GPIO && QE_GPIO && QUICC_ENGINE