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

Commit 3032f8c5 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'usb-4.16-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb 

Pull USB fixes from Greg KH:
 "Here are a small clump of USB fixes for 4.16-rc6.

  Nothing major, just a number of fixes in lots of different drivers, as
  well as a PHY driver fix that snuck into this tree. Full details are
  in the shortlog.

  All of these have been in linux-next with no reported issues"

* tag 'usb-4.16-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb: (22 commits)
  usb: musb: Fix external abort in musb_remove on omap2430
  phy: qcom-ufs: add MODULE_LICENSE tag
  usb: typec: tcpm: fusb302: Do not log an error on -EPROBE_DEFER
  USB: OHCI: Fix NULL dereference in HCDs using HCD_LOCAL_MEM
  usbip: vudc: fix null pointer dereference on udc->lock
  xhci: Fix front USB ports on ASUS PRIME B350M-A
  usb: host: xhci-plat: revert "usb: host: xhci-plat: enable clk in resume timing"
  usb: usbmon: Read text within supplied buffer size
  usb: host: xhci-rcar: add support for r8a77965
  USB: storage: Add JMicron bridge 152d:2567 to unusual_devs.h
  usb: xhci: dbc: Fix lockdep warning
  xhci: fix endpoint context tracer output
  Revert "typec: tcpm: Only request matching pdos"
  usb: musb: call pm_runtime_{get,put}_sync before reading vbus registers
  usb: quirks: add control message delay for 1b1c:1b20
  uas: fix comparison for error code
  usb: gadget: udc: renesas_usb3: add binging for r8a77965
  usb: renesas_usbhs: add binding for r8a77965
  usb: dwc2: fix STM32F7 USB OTG HS compatible
  dt-bindings: usb: fix the STM32F7 DWC2 OTG HS core binding
  ...
parents 6560ca4a 94e46a4f

Documentation/devicetree/bindings/usb/dwc2.txt

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ Required properties: 
  configured in FS mode;

  - "st,stm32f4x9-hsotg": The DWC2 USB HS controller instance in STM32F4x9 SoCs

  configured in HS mode;

  - "st,stm32f7xx-hsotg": The DWC2 USB HS controller instance in STM32F7xx SoCs

  - "st,stm32f7-hsotg": The DWC2 USB HS controller instance in STM32F7 SoCs

    configured in HS mode;

- reg : Should contain 1 register range (address and length)

- interrupts : Should contain 1 interrupt

Documentation/devicetree/bindings/usb/renesas_usb3.txt

+1 −0
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ Required properties: 
  - compatible: Must contain one of the following:

	- "renesas,r8a7795-usb3-peri"

	- "renesas,r8a7796-usb3-peri"

	- "renesas,r8a77965-usb3-peri"

	- "renesas,rcar-gen3-usb3-peri" for a generic R-Car Gen3 compatible

	  device

Documentation/devicetree/bindings/usb/renesas_usbhs.txt

+1 −0
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ Required properties: 
	- "renesas,usbhs-r8a7794" for r8a7794 (R-Car E2) compatible device

	- "renesas,usbhs-r8a7795" for r8a7795 (R-Car H3) compatible device

	- "renesas,usbhs-r8a7796" for r8a7796 (R-Car M3-W) compatible device

	- "renesas,usbhs-r8a77965" for r8a77965 (R-Car M3-N) compatible device

	- "renesas,usbhs-r8a77995" for r8a77995 (R-Car D3) compatible device

	- "renesas,usbhs-r7s72100" for r7s72100 (RZ/A1) compatible device

	- "renesas,rcar-gen2-usbhs" for R-Car Gen2 or RZ/G1 compatible devices

Documentation/devicetree/bindings/usb/usb-xhci.txt

+1 −0
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ Required properties: 
    - "renesas,xhci-r8a7793" for r8a7793 SoC

    - "renesas,xhci-r8a7795" for r8a7795 SoC

    - "renesas,xhci-r8a7796" for r8a7796 SoC

    - "renesas,xhci-r8a77965" for r8a77965 SoC

    - "renesas,rcar-gen2-xhci" for a generic R-Car Gen2 or RZ/G1 compatible

      device

    - "renesas,rcar-gen3-xhci" for a generic R-Car Gen3 compatible device

drivers/phy/qualcomm/phy-qcom-ufs.c

+5 −0
Original line number Diff line number Diff line
@@ -675,3 +675,8 @@ int ufs_qcom_phy_power_off(struct phy *generic_phy) 
	return 0;

}

EXPORT_SYMBOL_GPL(ufs_qcom_phy_power_off);



MODULE_AUTHOR("Yaniv Gardi <ygardi@codeaurora.org>");

MODULE_AUTHOR("Vivek Gautam <vivek.gautam@codeaurora.org>");

MODULE_DESCRIPTION("Universal Flash Storage (UFS) QCOM PHY");

MODULE_LICENSE("GPL v2");