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

Commit b7545b79 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull USB updates from Greg KH:
 "Here's the big USB driver update for 4.8-rc1.  Lots of the normal
  stuff in here, musb, gadget, xhci, and other updates and fixes.  All
  of the details are in the shortlog.

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

* tag 'usb-4.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb: (169 commits)
  cdc-acm: beautify probe()
  cdc-wdm: use the common CDC parser
  cdc-acm: cleanup error handling
  cdc-acm: use the common parser
  usbnet: move the CDC parser into USB core
  usb: musb: sunxi: Simplify dr_mode handling
  usb: musb: sunxi: make unexported symbols static
  usb: musb: cppi41: add dma channel tracepoints
  usb: musb: cppi41: move struct cppi41_dma_channel to header
  usb: musb: cleanup cppi_dma header
  usb: musb: gadget: add usb-request tracepoints
  usb: musb: host: add urb tracepoints
  usb: musb: add tracepoints to dump interrupt events
  usb: musb: add tracepoints for register access
  usb: musb: dsps: use musb register read/write wrappers instead
  usb: musb: switch dev_dbg to tracepoints
  usb: musb: add tracepoints support for debugging
  usb: quirks: Add no-lpm quirk for Elan
  phy: rcar-gen3-usb2: fix mutex_lock calling in interrupt
  phy: rockhip-usb: use devm_add_action_or_reset()
  ...
parents 721413af cb42b63d

Documentation/devicetree/bindings/phy/phy-da8xx-usb.txt

0 → 100644
+40 −0
Original line number Diff line number Diff line 
TI DA8xx/OMAP-L1xx/AM18xx USB PHY



Required properties:

 - compatible: must be "ti,da830-usb-phy".

 - #phy-cells: must be 1.



This device controls the PHY for both the USB 1.1 OHCI and USB 2.0 OTG

controllers on DA8xx SoCs. Consumers of this device should use index 0 for

the USB 2.0 phy device and index 1 for the USB 1.1 phy device.



It also requires a "syscon" node with compatible = "ti,da830-cfgchip", "syscon"

to access the CFGCHIP2 register.



Example:



	cfgchip: cfgchip@1417c {

		compatible = "ti,da830-cfgchip", "syscon";

		reg = <0x1417c 0x14>;

	};



	usb_phy: usb-phy {

		compatible = "ti,da830-usb-phy";

		#phy-cells = <1>;

	};



	usb20: usb@200000 {

		compatible = "ti,da830-musb";

		reg = <0x200000 0x1000>;

		interrupts = <58>;

		phys = <&usb_phy 0>;

		phy-names = "usb-phy";

	};



	usb11: usb@225000 {

		compatible = "ti,da830-ohci";

		reg = <0x225000 0x1000>;

		interrupts = <59>;

		phys = <&usb_phy 1>;

		phy-names = "usb-phy";

	};

Documentation/devicetree/bindings/phy/rockchip-usb-phy.txt

+17 −10
Original line number Diff line number Diff line
@@ -5,11 +5,13 @@ Required properties: 
     "rockchip,rk3066a-usb-phy"

     "rockchip,rk3188-usb-phy"

     "rockchip,rk3288-usb-phy"

 - rockchip,grf : phandle to the syscon managing the "general

   register files"

 - #address-cells: should be 1

 - #size-cells: should be 0



Deprecated properties:

 - rockchip,grf : phandle to the syscon managing the "general

   register files" - phy should be a child of the GRF instead



Sub-nodes:

Each PHY should be represented as a sub-node.
@@ -28,9 +30,13 @@ Optional Properties: 


Example:



grf: syscon@ff770000 {

	compatible = "rockchip,rk3288-grf", "syscon", "simple-mfd";



...



	usbphy: phy {

		compatible = "rockchip,rk3288-usb-phy";

	rockchip,grf = <&grf>;

		#address-cells = <1>;

		#size-cells = <0>;
@@ -39,3 +45,4 @@ usbphy: phy { 
			reg = <0x320>;

		};

	};

};

Documentation/devicetree/bindings/usb/ci-hdrc-usb2.txt

+1 −1
Original line number Diff line number Diff line
@@ -93,7 +93,7 @@ Example: 
		phys = <&usb_phy0>;

		phy-names = "usb-phy";

		vbus-supply = <&reg_usb0_vbus>;

		gadget-itc-setting = <0x4>; /* 4 micro-frames */

		itc-setting = <0x4>; /* 4 micro-frames */

		 /* Incremental burst of unspecified length */

		ahb-burst-config = <0x0>;

		tx-burst-size-dword = <0x10>; /* 64 bytes */

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

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ Optional properties: 
- clocks : a list of phandle + clock specifier pairs

- phys : phandle + phy specifier pair

- phy-names : "usb"

- resets : phandle + reset specifier pair

- resets : a list of phandle + reset specifier pairs



Example:

arch/arm/boot/dts/sama5d2.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -232,7 +232,7 @@ 
		};



		usb1: ohci@00400000 {

			compatible = "atmel,at91rm9200-ohci", "usb-ohci";

			compatible = "atmel,sama5d2-ohci", "usb-ohci";

			reg = <0x00400000 0x100000>;

			interrupts = <41 IRQ_TYPE_LEVEL_HIGH 2>;

			clocks = <&uhphs_clk>, <&uhphs_clk>, <&uhpck>;