projects
/
platform
/
kernel
/
linux-starfive.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
d19f1d4
a99d808
)
Merge 5.4-rc6 into usb-next
author
Greg Kroah-Hartman
<gregkh@linuxfoundation.org>
Mon, 4 Nov 2019 05:41:09 +0000
(06:41 +0100)
committer
Greg Kroah-Hartman
<gregkh@linuxfoundation.org>
Mon, 4 Nov 2019 05:41:09 +0000
(06:41 +0100)
We need the USB fixes in here to build on top of.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1
2
drivers/usb/core/config.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/usb/dwc3/Kconfig
patch
|
diff1
|
diff2
|
blob
|
history
drivers/usb/gadget/udc/renesas_usb3.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/usb/renesas_usbhs/mod_gadget.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/usb/storage/scsiglue.c
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
drivers/usb/core/config.c
Simple merge
diff --cc
drivers/usb/dwc3/Kconfig
index cc431376fcd0729bd5455a85ea7aa77a0abd09c6,556a876c7896251811288f99968f8636ecf310b6..0d97e6bfaf36181ae602af958ab5d1b7c7051da6
---
1
/
drivers/usb/dwc3/Kconfig
---
2
/
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
diff --cc
drivers/usb/gadget/udc/renesas_usb3.c
Simple merge
diff --cc
drivers/usb/renesas_usbhs/mod_gadget.c
Simple merge
diff --cc
drivers/usb/storage/scsiglue.c
Simple merge