| Message ID | 87h7w4wcug.fsf@kernel.org (mailing list archive) |
|---|---|
| State | Mainlined |
| Commit | ca681aa49200422a4144ee376a2079a9f717bf11 |
| Headers | show |
| Series | [GIT,PULL] USB for v5.8 merge window | expand |
On Mon, May 25, 2020 at 01:03:35PM +0300, Felipe Balbi wrote: > > Hi Greg, > > here's my pull request for v5.8 merge window. Note that we have a > conflict in CDNS3 driver. The conflict is all about indentation, I don't > really have an opinion if you want to choose my version or yours, > whichever you choose works for me :-) > > Most patches have been soaking for several weeks now without any > reports. > > Let me know if you want anything to be changed. > > Cheers > > The following changes since commit 0e698dfa282211e414076f9dc7e83c1c288314fd: > > Linux 5.7-rc4 (2020-05-03 14:56:04 -0700) > > are available in the Git repository at: > > git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git tags/usb-for-v5.8 There was a simple conflict in drivers/usb/cdns3/gadget.c that I've fixed up and pushed out. If you could verify I got it right, that would be great. thanks, greg k-h
Hi Greg, Greg Kroah-Hartman <gregkh@linuxfoundation.org> writes: >> here's my pull request for v5.8 merge window. Note that we have a >> conflict in CDNS3 driver. The conflict is all about indentation, I don't >> really have an opinion if you want to choose my version or yours, >> whichever you choose works for me :-) >> >> Most patches have been soaking for several weeks now without any >> reports. >> >> Let me know if you want anything to be changed. >> >> Cheers >> >> The following changes since commit 0e698dfa282211e414076f9dc7e83c1c288314fd: >> >> Linux 5.7-rc4 (2020-05-03 14:56:04 -0700) >> >> are available in the Git repository at: >> >> git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git tags/usb-for-v5.8 > > There was a simple conflict in drivers/usb/cdns3/gadget.c that I've > fixed up and pushed out. If you could verify I got it right, that would > be great. Thanks, it all looks great and I compile tested again just to be sure.
Hi Greg, here's my pull request for v5.8 merge window. Note that we have a conflict in CDNS3 driver. The conflict is all about indentation, I don't really have an opinion if you want to choose my version or yours, whichever you choose works for me :-) Most patches have been soaking for several weeks now without any reports. Let me know if you want anything to be changed. Cheers The following changes since commit 0e698dfa282211e414076f9dc7e83c1c288314fd: Linux 5.7-rc4 (2020-05-03 14:56:04 -0700) are available in the Git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git tags/usb-for-v5.8 for you to fetch changes up to 1c11e74e9079289d8aaccc34b74cbf6463c0b791: usb: dwc3: keystone: Turn on USB3 PHY before controller (2020-05-25 11:10:07 +0300) ---------------------------------------------------------------- USB: changes for v5.8 merge window Rather busy cycle. We have a total 99 non-merge commits going into v5.8 merge window. The majority of the changes are in dwc3 this around (31.7% of all changes). It's composed mostly Thinh's recent updates to get dwc3 to behave correctly with stream transfers. We have also have Roger's for Keystone platforms and Neil's updates for the meson glue layer. Apart from those, we have the usual set of non-critical fixes, new device IDs, spelling fixes all over the place. Signed-off-by: Felipe Balbi <balbi@kernel.org> ---------------------------------------------------------------- Andrey Konovalov (1): USB: dummy-hcd: use configurable endpoint naming scheme Christophe JAILLET (1): usb: gadget: max3420: Add a missing '\n' in a log message Colin Ian King (2): usb: gadget: function: remove redundant assignment to variable 'status' usb: gadget: lpc32xx_udc: don't dereference ep pointer before null check Dinghao Liu (1): usb: cdns3: Fix runtime PM imbalance on error Fabrice Gasnier (4): usb: dwc2: gadget: move gadget resume after the core is in L0 state usb: gadget: u_serial: add suspend resume callbacks usb: gadget: f_serial: add suspend resume callbacks usb: gadget: f_acm: add suspend resume callbacks Gregory CLEMENT (3): usb: gadget: udc: atmel: Don't use DT to configure end point dt-bindings: usb: atmel: Mark EP child node as deprecated ARM: dts: at91: Remove the USB EP child node Jason Yan (6): usb: gadget: udc: remove unused 'driver_desc' usb: gadget: f_fs: remove unneeded semicolon in __ffs_data_got_descs() usb: dwc3: use true,false for dwc->otg_restart_host usb: gadget: net2272: use false for 'use_dma' usb: gadget: udc: remove comparison to bool in mv_u3d_core.c usb: gadget: omap_udc: remove unneeded semicolon Jules Irenge (2): usb: gadget: Add missing annotation for xudc_handle_setup() USB: dummy-hcd: Add missing annotation for set_link_state() Martin Blumenstingl (4): arm64: dts: amlogic: use the new USB control driver for GXL and GXM phy: amlogic: meson-gxl-usb3: remove code for non-existing PHY usb: dwc3: of-simple: remove Amlogic GXL and AXG compatibles dt-bindings: usb: dwc3: remove old DWC3 wrapper Martin Kepplinger (1): usb: dwc3: support continuous runtime PM with dual role Michael Grzeschik (1): usb: gadget: uvc_video: add worker to handle the frame pumping Minas Harutyunyan (1): usb: dwc2: Update Core Reset programming flow. Nagarjuna Kristam (4): usb: gadget: tegra-xudc: Add vbus_draw support dt-bindings: usb: tegra-xudc: Add Tegra194 XUSB controller support usb: gadget: tegra-xudc: Add Tegra194 support usb: gadget: tegra-xudc: add port_speed_quirk Nathan Chancellor (1): USB: gadget: udc: s3c2410_udc: Remove pointless NULL check in s3c2410_udc_nuke Neil Armstrong (10): dt-bindings: usb: amlogic,meson-g12a-usb-ctrl: add the Amlogic GXL and GXM Families USB Glue Bindings usb: dwc3: meson-g12a: specify phy names in soc data usb: dwc3: meson-g12a: handle the phy and glue registers separately usb: dwc3: meson-g12a: get the reset as shared usb: dwc3: meson-g12a: check return of dwc3_meson_g12a_usb_init usb: dwc3: meson-g12a: refactor usb2 phy init usb: dwc3: meson-g12a: refactor usb init usb: dwc3: meson-g12a: support the GXL/GXM DWC3 host phy disconnect usb: dwc3: meson-g12a: add support for GXL and GXM SoCs doc: dt: bindings: usb: dwc3: remove amlogic compatible entries Nishad Kamdar (5): USB: gadget: Use the correct style for SPDX License Identifier USB: dwc3: Use the correct style for SPDX License Identifier USB: dwc2: Use the correct style for SPDX License Identifier USB: mtu3: Use the correct style for SPDX License Identifier usb: renesas_usbhs: Use the correct style for SPDX License Identifier Pawel Laszczak (1): usb: gadget: Fix issue with config_ep_by_speed function Peter Chen (7): usb: cdns3: core: get role switch node from firmware usb: cdns3: delete role_override usb: cdns3: change "cdsn3" to"cdns3" usb: cdns3: change dev_info to dev_dbg for debug message usb: gadget: core: sync interrupt before unbind the udc usb: cdns3: gadget: assign interrupt number to USB gadget structure usb: cdns3: ep0: delete the redundant status stage Qiushi Wu (1): usb: gadget: fix potential double-free in m66592_probe. Roger Quadros (3): dt-bindings: usb: convert keystone-usb.txt to YAML dt-bindings: usb: ti,keystone-dwc3.yaml: Add USB3.0 PHY property usb: dwc3: keystone: Turn on USB3 PHY before controller Sandeep Maheswaram (5): dt-bindings: usb: qcom,dwc3: Convert USB DWC3 bindings dt-bindings: usb: qcom,dwc3: Add compatible for SC7180 dt-bindings: usb: qcom,dwc3: Introduce interconnect properties for Qualcomm DWC3 driver arm64: dts: qcom: sdm845: Add interconnect properties for USB arm64: dts: qcom: sc7180: Add interconnect properties for USB Tang Bin (1): usb: gadget: fsl: Fix a wrong judgment in fsl_udc_probe() Tao Ren (7): usb: gadget: aspeed: improve vhub port irq handling usb: gadget: aspeed: support multiple language strings usb: gadget: add "usb_validate_langid" function usb: gadget: aspeed: allow to set usb strings in device tree usb: gadget: aspeed: allow to set device IDs in device tree usb: gadget: aspeed: fixup usb1 device descriptor at init time dt-bindings: usb: document aspeed vhub device ID/string properties Thinh Nguyen (24): usb: dwc3: gadget: Properly handle ClearFeature(halt) usb: dwc3: gadget: Give back staled requests usb: dwc3: gadget: Remove unnecessary checks usb: dwc3: gadget: Refactor dwc3_gadget_ep_dequeue usb: dwc3: drd: Don't free non-existing irq usb: dwc3: core: Use role-switch default dr_mode usb: dwc3: gadget: Properly handle failed kick_transfer usb: dwc3: gadget: Store resource index of start cmd usb: dwc3: gadget: Issue END_TRANSFER to retry isoc transfer usb: dwc3: gadget: WARN on no-resource status usb: dwc3: gadget: Continue to process pending requests usb: dwc3: Add support for DWC_usb32 IP usb: dwc3: Get MDWIDTH for DWC_usb32 usb: gadget: Introduce usb_request->is_last usb: gadget: f_tcm: Inform last stream request usb: dwc3: gadget: Check for in-progress END_TRANSFER usb: dwc3: gadget: Refactor TRB completion handler usb: dwc3: gadget: Enable XferComplete event usb: dwc3: gadget: Handle XferComplete for streams usb: dwc3: gadget: Wait for transfer completion usb: dwc3: gadget: Don't prepare beyond a transfer usb: dwc3: gadget: Handle stream transfers usb: dwc3: gadget: Use SET_EP_PRIME for NoStream usb: dwc3: gadget: Check for prepared TRBs Wei Yongjun (1): usb: gadget: mass_storage: use module_usb_composite_driver to simplify the code Yu Chen (1): usb: dwc3: Increase timeout for CmdAct cleared by device controller kbuild test robot (1): usb: cdns3: mark local functions static .../devicetree/bindings/phy/meson-gxl-usb3-phy.txt | 31 -- .../devicetree/bindings/usb/amlogic,dwc3.txt | 42 -- .../bindings/usb/amlogic,meson-g12a-usb-ctrl.yaml | 73 +++- .../devicetree/bindings/usb/aspeed,usb-vhub.yaml | 68 +++ .../devicetree/bindings/usb/atmel-usb.txt | 56 +-- Documentation/devicetree/bindings/usb/dwc3.txt | 2 - .../devicetree/bindings/usb/keystone-usb.txt | 56 --- .../devicetree/bindings/usb/nvidia,tegra-xudc.yaml | 2 + .../devicetree/bindings/usb/qcom,dwc3.txt | 104 ----- .../devicetree/bindings/usb/qcom,dwc3.yaml | 167 ++++++++ .../devicetree/bindings/usb/ti,keystone-dwc3.yaml | 77 ++++ arch/arm/boot/dts/at91sam9g45.dtsi | 54 --- arch/arm/boot/dts/at91sam9rl.dtsi | 54 --- arch/arm/boot/dts/at91sam9x5.dtsi | 54 --- arch/arm/boot/dts/sama5d2.dtsi | 120 ------ arch/arm/boot/dts/sama5d3.dtsi | 107 ----- arch/arm/boot/dts/sama5d4.dtsi | 120 ------ .../boot/dts/amlogic/meson-gx-libretech-pc.dtsi | 3 +- .../arm64/boot/dts/amlogic/meson-gx-p23x-q20x.dtsi | 3 +- .../dts/amlogic/meson-gxl-s805x-libretech-ac.dts | 3 +- .../boot/dts/amlogic/meson-gxl-s805x-p241.dts | 3 +- .../dts/amlogic/meson-gxl-s905d-phicomm-n1.dts | 4 + .../boot/dts/amlogic/meson-gxl-s905w-p281.dts | 4 + .../boot/dts/amlogic/meson-gxl-s905w-tx3-mini.dts | 4 + .../dts/amlogic/meson-gxl-s905x-khadas-vim.dts | 4 + .../dts/amlogic/meson-gxl-s905x-libretech-cc.dts | 3 +- .../dts/amlogic/meson-gxl-s905x-nexbox-a95x.dts | 3 +- .../boot/dts/amlogic/meson-gxl-s905x-p212.dtsi | 3 +- arch/arm64/boot/dts/amlogic/meson-gxl.dtsi | 45 +- .../boot/dts/amlogic/meson-gxm-khadas-vim2.dts | 3 +- .../arm64/boot/dts/amlogic/meson-gxm-nexbox-a1.dts | 3 +- arch/arm64/boot/dts/amlogic/meson-gxm-vega-s96.dts | 4 + arch/arm64/boot/dts/amlogic/meson-gxm.dtsi | 7 +- arch/arm64/boot/dts/qcom/sc7180.dtsi | 4 + arch/arm64/boot/dts/qcom/sdm845.dtsi | 8 + drivers/phy/amlogic/Kconfig | 12 - drivers/phy/amlogic/Makefile | 1 - drivers/phy/amlogic/phy-meson-gxl-usb3.c | 283 ------------- drivers/usb/cdns3/cdns3-ti.c | 3 +- drivers/usb/cdns3/core.c | 47 +-- drivers/usb/cdns3/core.h | 2 - drivers/usb/cdns3/drd.c | 4 +- drivers/usb/cdns3/ep0.c | 7 - drivers/usb/cdns3/gadget.c | 35 +- drivers/usb/dwc2/core.c | 23 +- drivers/usb/dwc2/core.h | 6 +- drivers/usb/dwc2/core_intr.c | 7 +- drivers/usb/dwc2/debug.h | 2 +- drivers/usb/dwc2/hcd.h | 2 +- drivers/usb/dwc2/hw.h | 3 +- drivers/usb/dwc2/params.c | 19 - drivers/usb/dwc2/platform.c | 39 ++ drivers/usb/dwc3/core.c | 62 +-- drivers/usb/dwc3/core.h | 83 ++-- drivers/usb/dwc3/debug.h | 4 +- drivers/usb/dwc3/debugfs.c | 14 +- drivers/usb/dwc3/drd.c | 6 +- drivers/usb/dwc3/dwc3-keystone.c | 41 +- drivers/usb/dwc3/dwc3-meson-g12a.c | 420 ++++++++++++++---- drivers/usb/dwc3/dwc3-of-simple.c | 30 +- drivers/usb/dwc3/gadget.c | 469 ++++++++++++++++----- drivers/usb/dwc3/gadget.h | 2 +- drivers/usb/dwc3/host.c | 2 +- drivers/usb/dwc3/io.h | 2 +- drivers/usb/dwc3/trace.h | 2 +- drivers/usb/gadget/composite.c | 78 +++- drivers/usb/gadget/configfs.c | 14 +- drivers/usb/gadget/function/f_acm.c | 16 + drivers/usb/gadget/function/f_eem.c | 2 - drivers/usb/gadget/function/f_fs.c | 2 +- drivers/usb/gadget/function/f_serial.c | 16 + drivers/usb/gadget/function/f_tcm.c | 3 + drivers/usb/gadget/function/f_uvc.h | 2 +- drivers/usb/gadget/function/rndis.h | 2 +- drivers/usb/gadget/function/u_audio.h | 2 +- drivers/usb/gadget/function/u_ecm.h | 2 +- drivers/usb/gadget/function/u_eem.h | 2 +- drivers/usb/gadget/function/u_ether.h | 2 +- drivers/usb/gadget/function/u_ether_configfs.h | 2 +- drivers/usb/gadget/function/u_fs.h | 2 +- drivers/usb/gadget/function/u_gether.h | 2 +- drivers/usb/gadget/function/u_hid.h | 2 +- drivers/usb/gadget/function/u_midi.h | 2 +- drivers/usb/gadget/function/u_ncm.h | 2 +- drivers/usb/gadget/function/u_phonet.h | 2 +- drivers/usb/gadget/function/u_printer.h | 2 +- drivers/usb/gadget/function/u_rndis.h | 2 +- drivers/usb/gadget/function/u_serial.c | 57 ++- drivers/usb/gadget/function/u_serial.h | 4 +- drivers/usb/gadget/function/u_tcm.h | 2 +- drivers/usb/gadget/function/u_uac1.h | 2 +- drivers/usb/gadget/function/u_uac1_legacy.h | 2 +- drivers/usb/gadget/function/u_uac2.h | 2 +- drivers/usb/gadget/function/u_uvc.h | 2 +- drivers/usb/gadget/function/uvc.h | 4 +- drivers/usb/gadget/function/uvc_configfs.h | 2 +- drivers/usb/gadget/function/uvc_v4l2.c | 4 +- drivers/usb/gadget/function/uvc_v4l2.h | 2 +- drivers/usb/gadget/function/uvc_video.c | 76 +--- drivers/usb/gadget/function/uvc_video.h | 4 +- drivers/usb/gadget/legacy/mass_storage.c | 14 +- drivers/usb/gadget/udc/aspeed-vhub/core.c | 16 +- drivers/usb/gadget/udc/aspeed-vhub/hub.c | 236 +++++++++-- drivers/usb/gadget/udc/aspeed-vhub/vhub.h | 12 +- drivers/usb/gadget/udc/atmel_usba_udc.c | 112 +++-- drivers/usb/gadget/udc/atmel_usba_udc.h | 12 + drivers/usb/gadget/udc/core.c | 2 + drivers/usb/gadget/udc/dummy_hcd.c | 27 +- drivers/usb/gadget/udc/fsl_udc_core.c | 4 +- drivers/usb/gadget/udc/gr_udc.c | 1 - drivers/usb/gadget/udc/lpc32xx_udc.c | 11 +- drivers/usb/gadget/udc/m66592-udc.c | 2 +- drivers/usb/gadget/udc/max3420_udc.c | 2 +- drivers/usb/gadget/udc/mv_u3d_core.c | 2 +- drivers/usb/gadget/udc/net2272.c | 2 +- drivers/usb/gadget/udc/omap_udc.c | 2 +- drivers/usb/gadget/udc/s3c2410_udc.c | 4 - drivers/usb/gadget/udc/tegra-xudc.c | 140 ++++++ drivers/usb/gadget/udc/udc-xilinx.c | 1 + drivers/usb/gadget/usbstring.c | 24 ++ drivers/usb/mtu3/mtu3.h | 2 +- drivers/usb/mtu3/mtu3_debug.h | 2 +- drivers/usb/mtu3/mtu3_dr.h | 2 +- drivers/usb/mtu3/mtu3_hw_regs.h | 2 +- drivers/usb/mtu3/mtu3_qmu.h | 2 +- drivers/usb/mtu3/mtu3_trace.h | 2 +- drivers/usb/renesas_usbhs/common.h | 2 +- drivers/usb/renesas_usbhs/fifo.h | 2 +- drivers/usb/renesas_usbhs/mod.h | 2 +- drivers/usb/renesas_usbhs/pipe.h | 2 +- drivers/usb/renesas_usbhs/rcar2.h | 2 +- drivers/usb/renesas_usbhs/rcar3.h | 2 +- drivers/usb/renesas_usbhs/rza.h | 2 +- include/linux/usb/composite.h | 3 + include/linux/usb/gadget.h | 8 + 135 files changed, 2142 insertions(+), 1775 deletions(-) delete mode 100644 Documentation/devicetree/bindings/phy/meson-gxl-usb3-phy.txt delete mode 100644 Documentation/devicetree/bindings/usb/amlogic,dwc3.txt delete mode 100644 Documentation/devicetree/bindings/usb/keystone-usb.txt delete mode 100644 Documentation/devicetree/bindings/usb/qcom,dwc3.txt create mode 100644 Documentation/devicetree/bindings/usb/qcom,dwc3.yaml create mode 100644 Documentation/devicetree/bindings/usb/ti,keystone-dwc3.yaml delete mode 100644 drivers/phy/amlogic/phy-meson-gxl-usb3.c