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

Commit 42e3a58b authored by Linus Torvalds's avatar Linus Torvalds
Browse files
Pull USB driver updates from Greg KH:
 "Here's the big USB (and PHY) driver patchset for 4.1-rc1.

  Everything here has been in linux-next, and the full details are below
  in the shortlog.  Nothing major, just the normal round of new
  drivers,api updates, and other changes, mostly in the USB gadget area,
  as usual"

* tag 'usb-4.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb: (252 commits)
  drivers/usb/core: devio.c: Removed an uneeded space before tab
  usb: dwc2: host: sleep USB_RESUME_TIMEOUT during resume
  usb: chipidea: debug: add low power mode check before print registers
  usb: chipidea: udc: bypass pullup DP when gadget connect in OTG fsm mode
  usb: core: hub: use new USB_RESUME_TIMEOUT
  usb: isp1760: hcd: use new USB_RESUME_TIMEOUT
  usb: dwc2: hcd: use new USB_RESUME_TIMEOUT
  usb: host: sl811: use new USB_RESUME_TIMEOUT
  usb: host: r8a66597: use new USB_RESUME_TIMEOUT
  usb: host: oxu210hp: use new USB_RESUME_TIMEOUT
  usb: host: fusbh200: use new USB_RESUME_TIMEOUT
  usb: host: fotg210: use new USB_RESUME_TIMEOUT
  usb: host: isp116x: use new USB_RESUME_TIMEOUT
  usb: musb: use new USB_RESUME_TIMEOUT
  usb: host: uhci: use new USB_RESUME_TIMEOUT
  usb: host: ehci: use new USB_RESUME_TIMEOUT
  usb: host: xhci: use new USB_RESUME_TIMEOUT
  usb: define a generic USB_RESUME_TIMEOUT macro
  usb: musb: dsps: fix build on i386 when COMPILE_TEST is set
  ehci-hub: use USB_DT_HUB
  ...
parents 4fd48b45 00fe52de
Loading
Loading
Loading
Loading
+9 −0
Original line number Diff line number Diff line
What:		/config/usb-gadget/gadget/functions/printer.name
Date:		Apr 2015
KernelVersion:	4.1
Description:
		The attributes:

		pnp_string	- Data to be passed to the host in pnp string
		q_len		- Number of requests per endpoint
+24 −0
Original line number Diff line number Diff line
Device tree binding documentation for am816x USB PHY
=========================

Required properties:
- compatible : should be "ti,dm816x-usb-phy"
- reg : offset and length of the PHY register set.
- reg-names : name for the phy registers
- clocks : phandle to the clock
- clock-names : name of the clock
- syscon: phandle for the syscon node to access misc registers
- #phy-cells : from the generic PHY bindings, must be 1
- syscon: phandle for the syscon node to access misc registers

Example:

usb_phy0: usb-phy@20 {
	compatible = "ti,dm8168-usb-phy";
	reg = <0x20 0x8>;
	reg-names = "phy";
	clocks = <&main_fapll 6>;
	clock-names = "refclk";
	#phy-cells = <0>;
	syscon = <&scm_conf>;
};
+4 −4
Original line number Diff line number Diff line
@@ -20,8 +20,8 @@ Required nodes : A sub-node is required for each channel the controller
Required properties (port (child) node):
- #phy-cells 	: Should be 1 (See second example)
		  Cell after port phandle is device type from:
			- MIPHY_TYPE_SATA
			- MIPHY_TYPE_PCI
			- PHY_TYPE_SATA
			- PHY_TYPE_PCI
- reg        	: Address and length of register sets for each device in
		  "reg-names"
- reg-names     : The names of the register addresses corresponding to the
@@ -68,10 +68,10 @@ property, containing a phandle to the phy port node and a device type.

Example:

#include <dt-bindings/phy/phy-miphy365x.h>
#include <dt-bindings/phy/phy.h>

	sata0: sata@fe380000 {
		...
		phys	  = <&phy_port0 MIPHY_TYPE_SATA>;
		phys	  = <&phy_port0 PHY_TYPE_SATA>;
		...
	};
+2 −1
Original line number Diff line number Diff line
@@ -128,6 +128,7 @@ Required properties:
- compatible : Should be set to one of the following supported values:
	- "samsung,exynos5250-usbdrd-phy" - for exynos5250 SoC,
	- "samsung,exynos5420-usbdrd-phy" - for exynos5420 SoC.
	- "samsung,exynos5433-usbdrd-phy" - for exynos5433 SoC.
	- "samsung,exynos7-usbdrd-phy" - for exynos7 SoC.
- reg : Register offset and length of USB DRD PHY register set;
- clocks: Clock IDs array as required by the controller
@@ -139,7 +140,7 @@ Required properties:
	       PHY operations, associated by phy name. It is used to
	       determine bit values for clock settings register.
	       For Exynos5420 this is given as 'sclk_usbphy30' in CMU.
	- optional clocks: Exynos7 SoC has now following additional
	- optional clocks: Exynos5433 & Exynos7 SoC has now following additional
			   gate clocks available:
			   - phy_pipe: for PIPE3 phy
			   - phy_utmi: for UTMI+ phy
+38 −0
Original line number Diff line number Diff line
Allwinner sun9i USB PHY
-----------------------

Required properties:
- compatible : should be one of
  * allwinner,sun9i-a80-usb-phy
- reg : a list of offset + length pairs
- #phy-cells : from the generic phy bindings, must be 0
- phy_type : "hsic" for HSIC usage;
	     other values or absence of this property indicates normal USB
- clocks : phandle + clock specifier for the phy clocks
- clock-names : depending on the "phy_type" property,
  * "phy" for normal USB
  * "hsic_480M", "hsic_12M" for HSIC
- resets : a list of phandle + reset specifier pairs
- reset-names : depending on the "phy_type" property,
  * "phy" for normal USB
  * "hsic" for HSIC

Optional Properties:
- phy-supply : from the generic phy bindings, a phandle to a regulator that
	       provides power to VBUS.

It is recommended to list all clocks and resets available.
The driver will only use those matching the phy_type.

Example:
	usbphy1: phy@00a01800 {
		compatible = "allwinner,sun9i-a80-usb-phy";
		reg = <0x00a01800 0x4>;
		clocks = <&usb_phy_clk 2>, <&usb_phy_clk 10>,
		       <&usb_phy_clk 3>;
		clock-names = "hsic_480M", "hsic_12M", "phy";
		resets = <&usb_phy_clk 18>, <&usb_phy_clk 19>;
		reset-names = "hsic", "phy";
		status = "disabled";
		#phy-cells = <0>;
	};
Loading