Commit 6c90bbd0 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull USB fixes from Greg KH:
 "Here are a lot of small USB driver fixes for 5.4-rc3.

  syzbot has stepped up its testing of the USB driver stack, now able to
  trigger fun race conditions between disconnect and probe functions.
  Because of that we have a lot of fixes in here from Johan and others
  fixing these reported issues that have been around since almost all
  time.

  We also are just deleting the rio500 driver, making all of the syzbot
  bugs found in it moot as it turns out no one has been using it for
  years as there is a userspace version that is being used instead.

  There are also a number of other small fixes in here, all resolving
  reported issues or regressions.

  All have been in linux-next without any reported issues"

* tag 'usb-5.4-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb: (65 commits)
  USB: yurex: fix NULL-derefs on disconnect
  USB: iowarrior: use pr_err()
  USB: iowarrior: drop redundant iowarrior mutex
  USB: iowarrior: drop redundant disconnect mutex
  USB: iowarrior: fix use-after-free after driver unbind
  USB: iowarrior: fix use-after-free on release
  USB: iowarrior: fix use-after-free on disconnect
  USB: chaoskey: fix use-after-free on release
  USB: adutux: fix use-after-free on release
  USB: ldusb: fix NULL-derefs on driver unbind
  USB: legousbtower: fix use-after-free on release
  usb: cdns3: Fix for incorrect DMA mask.
  usb: cdns3: fix cdns3_core_init_role()
  usb: cdns3: gadget: Fix full-speed mode
  USB: usb-skeleton: drop redundant in-urb check
  USB: usb-skeleton: fix use-after-free after driver unbind
  USB: usb-skeleton: fix NULL-deref on disconnect
  usb:cdns3: Fix for CV CH9 running with g_zero driver.
  usb: dwc3: Remove dev_err() on platform_get_irq() failure
  usb: dwc3: Switch to platform_get_irq_byname_optional()
  ...
parents 328fefad aafb00a9

Documentation/devicetree/bindings/usb/amlogic,dwc3.txt

+2 −2
Original line number Diff line number Diff line
@@ -85,8 +85,8 @@ A child node must exist to represent the core DWC2 IP block. The name of 
the node is not important. The content of the node is defined in dwc2.txt.



PHY documentation is provided in the following places:

- Documentation/devicetree/bindings/phy/meson-g12a-usb2-phy.txt

- Documentation/devicetree/bindings/phy/meson-g12a-usb3-pcie-phy.txt

- Documentation/devicetree/bindings/phy/amlogic,meson-g12a-usb2-phy.yaml

- Documentation/devicetree/bindings/phy/amlogic,meson-g12a-usb3-pcie-phy.yaml



Example device nodes:

	usb: usb@ffe09000 {

Documentation/devicetree/bindings/usb/generic-ehci.yaml

+6 −1
Original line number Diff line number Diff line
@@ -63,7 +63,11 @@ properties: 
    description:

      Set this flag to force EHCI reset after resume.



  phys: true

  phys:

    description: PHY specifier for the USB PHY



  phy-names:

    const: usb



required:

  - compatible
@@ -89,6 +93,7 @@ examples: 
        interrupts = <39>;

        clocks = <&ahb_gates 1>;

        phys = <&usbphy 1>;

        phy-names = "usb";

    };



...

Documentation/devicetree/bindings/usb/generic-ohci.yaml

+6 −1
Original line number Diff line number Diff line
@@ -67,7 +67,11 @@ properties: 
    description:

      Overrides the detected port count



  phys: true

  phys:

    description: PHY specifier for the USB PHY



  phy-names:

    const: usb



required:

  - compatible
@@ -84,6 +88,7 @@ examples: 
          interrupts = <64>;

          clocks = <&usb_clk 6>, <&ahb_gates 2>;

          phys = <&usbphy 1>;

          phy-names = "usb";

      };



...

Documentation/devicetree/bindings/usb/mediatek,mtk-xhci.txt

+2 −2
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ Required properties: 
	"dma_ck": dma_bus clock for data transfer by DMA,

	"xhci_ck": controller clock



 - phys : see usb-hcd.txt in the current directory

 - phys : see usb-hcd.yaml in the current directory



Optional properties:

 - wakeup-source : enable USB remote wakeup;
@@ -53,7 +53,7 @@ Optional properties: 
	See: Documentation/devicetree/bindings/pinctrl/pinctrl-bindings.txt

 - imod-interval-ns: default interrupt moderation interval is 5000ns



additionally the properties from usb-hcd.txt (in the current directory) are

additionally the properties from usb-hcd.yaml (in the current directory) are

supported.



Example:

Documentation/devicetree/bindings/usb/mediatek,mtu3.txt

+2 −2
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ Required properties: 
 - clock-names : must contain "sys_ck" for clock of controller,

	the following clocks are optional:

	"ref_ck", "mcu_ck" and "dma_ck";

 - phys : see usb-hcd.txt in the current directory

 - phys : see usb-hcd.yaml in the current directory

 - dr_mode : should be one of "host", "peripheral" or "otg",

	refer to usb/generic.txt
@@ -60,7 +60,7 @@ Optional properties: 
 - mediatek,u3p-dis-msk : mask to disable u3ports, bit0 for u3port0,

	bit1 for u3port1, ... etc;



additionally the properties from usb-hcd.txt (in the current directory) are

additionally the properties from usb-hcd.yaml (in the current directory) are

supported.



Sub-nodes:

CRA Git | Maintained and supported by SUSTech CRA and CCSE