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

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

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

Pull USB updates from Greg KH:
 "Here is the big USB driver update for 3.17-rc1.

  Loads of gadget driver changes in here, including some big file
  movements to make things easier to manage over time.  There's also the
  usual xhci and uas driver updates, and a handful of other changes in
  here.  The changelog has the full details.

  All of these have been in linux-next for a while"

* tag 'usb-3.17-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb: (211 commits)
  USB: devio: fix issue with log flooding
  uas: Log a warning when we cannot use uas because the hcd lacks streams
  uas: Only complain about missing sg if all other checks succeed
  xhci: Add missing checks for xhci_alloc_command failure
  xhci: Rename Asrock P67 pci product-id to EJ168
  xhci: Blacklist using streams on the Etron EJ168 controller
  uas: Limit qdepth to 32 when connected over usb-2
  uwb/whci: use correct structure type name in sizeof
  usb-core bInterval quirk
  USB: serial: ftdi_sio: Add support for new Xsens devices
  USB: serial: ftdi_sio: Annotate the current Xsens PID assignments
  usb: chipidea: debug: fix sparse non static symbol warnings
  usb: ci_hdrc_imx doc: fsl,usbphy is required
  usb: ci_hdrc_imx: Return -EINVAL for missing USB PHY
  usb: core: allow zero packet flag for interrupt urbs
  usb: lvstest: Fix sparse warnings generated by kbuild test bot
  USB: core: hcd-pci: free IRQ before disabling PCI device when shutting down
  phy: miphy365x: Represent each PHY channel as a DT subnode
  phy: miphy365x: Provide support for the MiPHY356x Generic PHY
  phy: miphy365x: Add Device Tree bindings for the MiPHY365x
  ...
parents 79eb238c d310d05f

Documentation/ABI/stable/sysfs-bus-usb

+7 −7
Original line number Diff line number Diff line
@@ -3,13 +3,13 @@ Date: May 2007 
KernelVersion:	2.6.23

Contact:	Alan Stern <stern@rowland.harvard.edu>

Description:

		If CONFIG_USB_PERSIST is set, then each USB device directory

		will contain a file named power/persist.  The file holds a

		boolean value (0 or 1) indicating whether or not the

		"USB-Persist" facility is enabled for the device.  Since the

		facility is inherently dangerous, it is disabled by default

		for all devices except hubs.  For more information, see

		Documentation/usb/persist.txt.

		USB device directories can contain a file named power/persist.

		The file holds a boolean value (0 or 1) indicating whether or

		not the "USB-Persist" facility is enabled for the device.  For

		hubs this facility is always enabled and their device

		directories will not contain this file.



		For more information, see Documentation/usb/persist.txt.



What:		/sys/bus/usb/devices/.../power/autosuspend

Date:		March 2007

Documentation/ABI/testing/sysfs-bus-usb-lvstest

0 → 100644
+47 −0
Original line number Diff line number Diff line 
Link Layer Validation Device is a standard device for testing of Super

Speed Link Layer tests. These nodes are available in sysfs only when lvs

driver is bound with root hub device.



What:		/sys/bus/usb/devices/.../get_dev_desc

Date:		March 2014

Contact:	Pratyush Anand <pratyush.anand@st.com>

Description:

		Write to this node to issue "Get Device Descriptor"

		for Link Layer Validation device. It is needed for TD.7.06.



What:		/sys/bus/usb/devices/.../u1_timeout

Date:		March 2014

Contact:	Pratyush Anand <pratyush.anand@st.com>

Description:

		Set "U1 timeout" for the downstream port where Link Layer

		Validation device is connected. Timeout value must be between 0

		and 127. It is needed for TD.7.18, TD.7.19, TD.7.20 and TD.7.21.



What:		/sys/bus/usb/devices/.../u2_timeout

Date:		March 2014

Contact:	Pratyush Anand <pratyush.anand@st.com>

Description:

		Set "U2 timeout" for the downstream port where Link Layer

		Validation device is connected. Timeout value must be between 0

		and 127. It is needed for TD.7.18, TD.7.19, TD.7.20 and TD.7.21.



What:		/sys/bus/usb/devices/.../hot_reset

Date:		March 2014

Contact:	Pratyush Anand <pratyush.anand@st.com>

Description:

		Write to this node to issue "Reset" for Link Layer Validation

		device. It is needed for TD.7.29, TD.7.31, TD.7.34 and TD.7.35.



What:		/sys/bus/usb/devices/.../u3_entry

Date:		March 2014

Contact:	Pratyush Anand <pratyush.anand@st.com>

Description:

		Write to this node to issue "U3 entry" for Link Layer

		Validation device. It is needed for TD.7.35 and TD.7.36.



What:		/sys/bus/usb/devices/.../u3_exit

Date:		March 2014

Contact:	Pratyush Anand <pratyush.anand@st.com>

Description:

		Write to this node to issue "U3 exit" for Link Layer

		Validation device. It is needed for TD.7.36.

Documentation/DocBook/gadget.tmpl

+5 −5
Original line number Diff line number Diff line
@@ -556,11 +556,11 @@ been converted to this framework. 
Near-term plans include converting all of them, except for "gadgetfs".

</para>



!Edrivers/usb/gadget/f_acm.c

!Edrivers/usb/gadget/f_ecm.c

!Edrivers/usb/gadget/f_subset.c

!Edrivers/usb/gadget/f_obex.c

!Edrivers/usb/gadget/f_serial.c

!Edrivers/usb/gadget/function/f_acm.c

!Edrivers/usb/gadget/function/f_ecm.c

!Edrivers/usb/gadget/function/f_subset.c

!Edrivers/usb/gadget/function/f_obex.c

!Edrivers/usb/gadget/function/f_serial.c



</sect1>

Documentation/devicetree/bindings/phy/berlin-sata-phy.txt

0 → 100644
+34 −0
Original line number Diff line number Diff line 
Berlin SATA PHY

---------------



Required properties:

- compatible: should be "marvell,berlin2q-sata-phy"

- address-cells: should be 1

- size-cells: should be 0

- phy-cells: from the generic PHY bindings, must be 1

- reg: address and length of the register

- clocks: reference to the clock entry



Sub-nodes:

Each PHY should be represented as a sub-node.



Sub-nodes required properties:

- reg: the PHY number



Example:

	sata_phy: phy@f7e900a0 {

		compatible = "marvell,berlin2q-sata-phy";

		reg = <0xf7e900a0 0x200>;

		clocks = <&chip CLKID_SATA>;

		#address-cells = <1>;

		#size-cells = <0>;

		#phy-cells = <1>;



		sata-phy@0 {

			reg = <0>;

		};



		sata-phy@1 {

			reg = <1>;

		};

	};

Documentation/devicetree/bindings/phy/hix5hd2-phy.txt

0 → 100644
+22 −0
Original line number Diff line number Diff line 
Hisilicon hix5hd2 SATA PHY

-----------------------



Required properties:

- compatible: should be "hisilicon,hix5hd2-sata-phy"

- reg: offset and length of the PHY registers

- #phy-cells: must be 0

Refer to phy/phy-bindings.txt for the generic PHY binding properties



Optional Properties:

- hisilicon,peripheral-syscon: phandle of syscon used to control peripheral.

- hisilicon,power-reg: offset and bit number within peripheral-syscon,

	register of controlling sata power supply.



Example:

	sata_phy: phy@f9900000 {

		compatible = "hisilicon,hix5hd2-sata-phy";

		reg = <0xf9900000 0x10000>;

		#phy-cells = <0>;

		hisilicon,peripheral-syscon = <&peripheral_ctrl>;

		hisilicon,power-reg = <0x8 10>;

	};