Commit 4ff12049 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull USB updates from Greg KH:
 "Here's the big USB and PHY patchset for 4.3-rc1.

  As usual, the majority of the changes are in the USB gadget portion of
  the tree, lots of little changes all over the place for bugs and new
  hardware.  Other than that, the normal mix of new hardware support and
  bugfixes.

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

* tag 'usb-4.3-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb: (261 commits)
  USB: qcserial: add HP lt4111 LTE/EV-DO/HSPA+ Gobi 4G Module
  USB: ftdi_sio: Added custom PID for CustomWare products
  USB: usb_wwan: silence read errors on disconnect
  USB: option: silence interrupt errors
  USB: symbolserial: Correct transferred data size
  USB: symbolserial: Use usb_get_serial_port_data
  usb: misc: usbtest: format max packet size for iso transfer
  usb: host: ehci-sys: delete useless bus_to_hcd conversion
  Revert "usb: interface authorization: Declare authorized attribute"
  Revert "usb: interface authorization: Introduces the default interface authorization"
  Revert "usb: interface authorization: Control interface probing and claiming"
  Revert "usb: interface authorization: Introduces the USB interface authorization"
  Revert "usb: interface authorization: SysFS part of USB interface authorization"
  Revert "usb: interface authorization: Documentation part"
  Revert "usb: interface authorization: Use a flag for the default device authorization"
  usb: core: hub: Removed some warnings generated by checkpatch.pl
  USB: host: ohci-at91: merge loops in ohci_hcd_at91_drv_probe
  USB: host: ohci-at91: merge ohci_at91_of_init in ohci_hcd_at91_drv_probe
  USB: host: ohci-at91: depend on OF
  USB: host: ohci-at91: move at91_usbh_data definition in c file
  ...
parents c2078402 44840dec

Documentation/ABI/testing/configfs-usb-gadget-loopback

+1 −1
Original line number Diff line number Diff line
@@ -5,4 +5,4 @@ Description: 
		The attributes:



		qlen		- depth of loopback queue

		bulk_buflen	- buffer length
 
		buflen		- buffer length

Documentation/ABI/testing/configfs-usb-gadget-sourcesink

+1 −1
Original line number Diff line number Diff line
@@ -9,4 +9,4 @@ Description: 
		isoc_maxpacket	- 0 - 1023 (fs), 0 - 1024 (hs/ss)

		isoc_mult	- 0..2 (hs/ss only)

		isoc_maxburst	- 0..15 (ss only)

		qlen		- buffer length
 
		buflen		- buffer length

Documentation/ABI/testing/sysfs-bus-usb

+14 −0
Original line number Diff line number Diff line
@@ -114,6 +114,20 @@ Description: 
		enabled for the device. Developer can write y/Y/1 or n/N/0 to

		the file to enable/disable the feature.



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

Date:		June 2015

Contact:	Kevin Strasser <kevin.strasser@linux.intel.com>

Description:

		If CONFIG_PM is set and a USB 3.0 lpm-capable device is plugged

		in to a xHCI host which supports link PM, it will check if U1

		and U2 exit latencies have been set in the BOS descriptor; if

		the check is is passed and the host supports USB3 hardware LPM,

		USB3 hardware LPM will be enabled for the device and the USB

		device directory will contain a file named

		power/usb3_hardware_lpm. The file holds a string value (enable

		or disable) indicating whether or not USB3 hardware LPM is

		enabled for the device.



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

Date:		February 2012

Contact:	Matthew Garrett <mjg@redhat.com>

Documentation/devicetree/bindings/phy/phy-lpc18xx-usb-otg.txt

0 → 100644
+26 −0
Original line number Diff line number Diff line 
NXP LPC18xx/43xx internal USB OTG PHY binding

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



This file contains documentation for the internal USB OTG PHY found

in NXP LPC18xx and LPC43xx SoCs.



Required properties:

- compatible	: must be "nxp,lpc1850-usb-otg-phy"

- clocks	: must be exactly one entry

See: Documentation/devicetree/bindings/clock/clock-bindings.txt

- #phy-cells	: must be 0 for this phy

See: Documentation/devicetree/bindings/phy/phy-bindings.txt



The phy node must be a child of the creg syscon node.



Example:

creg: syscon@40043000 {

	compatible = "nxp,lpc1850-creg", "syscon", "simple-mfd";

	reg = <0x40043000 0x1000>;



	usb0_otg_phy: phy@004 {

		compatible = "nxp,lpc1850-usb-otg-phy";

		clocks = <&ccu1 CLK_USB0>;

		#phy-cells = <0>;

	};

};

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

+20 −2
Original line number Diff line number Diff line
@@ -7,6 +7,8 @@ Required properties: 
  * allwinner,sun5i-a13-usb-phy

  * allwinner,sun6i-a31-usb-phy

  * allwinner,sun7i-a20-usb-phy

  * allwinner,sun8i-a23-usb-phy

  * allwinner,sun8i-a33-usb-phy

- reg : a list of offset + length pairs

- reg-names :

  * "phy_ctrl"
@@ -17,12 +19,21 @@ Required properties: 
- clock-names :

  * "usb_phy" for sun4i, sun5i or sun7i

  * "usb0_phy", "usb1_phy" and "usb2_phy" for sun6i

  * "usb0_phy", "usb1_phy" for sun8i

- resets : a list of phandle + reset specifier pairs

- reset-names :

  * "usb0_reset"

  * "usb1_reset"

  * "usb2_reset" for sun4i, sun6i or sun7i



Optional properties:

- usb0_id_det-gpios : gpio phandle for reading the otg id pin value

- usb0_vbus_det-gpios : gpio phandle for detecting the presence of usb0 vbus

- usb0_vbus_power-supply: power-supply phandle for usb0 vbus presence detect

- usb0_vbus-supply : regulator phandle for controller usb0 vbus

- usb1_vbus-supply : regulator phandle for controller usb1 vbus

- usb2_vbus-supply : regulator phandle for controller usb2 vbus



Example:

	usbphy: phy@0x01c13400 {

		#phy-cells = <1>;
@@ -32,6 +43,13 @@ Example: 
		reg-names = "phy_ctrl", "pmu1", "pmu2";

		clocks = <&usb_clk 8>;

		clock-names = "usb_phy";

		resets = <&usb_clk 1>, <&usb_clk 2>;

		reset-names = "usb1_reset", "usb2_reset";

		resets = <&usb_clk 0>, <&usb_clk 1>, <&usb_clk 2>;

		reset-names = "usb0_reset", "usb1_reset", "usb2_reset";

		pinctrl-names = "default";

		pinctrl-0 = <&usb0_id_detect_pin>, <&usb0_vbus_detect_pin>;

		usb0_id_det-gpios = <&pio 7 19 GPIO_ACTIVE_HIGH>; /* PH19 */

		usb0_vbus_det-gpios = <&pio 7 22 GPIO_ACTIVE_HIGH>; /* PH22 */

		usb0_vbus-supply = <&reg_usb0_vbus>;

		usb1_vbus-supply = <&reg_usb1_vbus>;

		usb2_vbus-supply = <&reg_usb2_vbus>;

	};

CRA Git | Maintained and supported by SUSTech CRA and CCSE