From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Mon, 4 Nov 2019 05:41:09 +0000 (+0100)
Subject: Merge 5.4-rc6 into usb-next
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=16c8373ecf7b3c723a8e765d798ea413bc8345a6;p=linux.git

Merge 5.4-rc6 into usb-next

We need the USB fixes in here to build on top of.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

16c8373ecf7b3c723a8e765d798ea413bc8345a6
diff --cc drivers/usb/dwc3/Kconfig
index cc431376fcd07,556a876c78962..0d97e6bfaf361
--- a/drivers/usb/dwc3/Kconfig
+++ b/drivers/usb/dwc3/Kconfig
@@@ -102,8 -102,9 +102,9 @@@ config USB_DWC3_MESON_G12
         depends on ARCH_MESON || COMPILE_TEST
         default USB_DWC3
         select USB_ROLE_SWITCH
+ 	select REGMAP_MMIO
         help
 -         Support USB2/3 functionality in Amlogic G12A platforms.
 +	 Support USB2/3 functionality in Amlogic G12A platforms.
  	 Say 'Y' or 'M' if you have one such device.
  
  config USB_DWC3_OF_SIMPLE