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

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

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

Pull USB updates from Greg KH:
 "Here's the big USB patchset for 3.18-rc1.  Also in here is the PHY
  tree, as it seems to fit well with the USB tree for various reasons...

  Anyway, lots of little changes in here, all over the place, full
  details in the changelog

  All have been in the linux-next tree for a while with no issues"

* tag 'usb-3.18-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb: (244 commits)
  USB: host: st: fix typo 'CONFIG_USB_EHCI_HCD_ST'
  uas: Reduce number of function arguments for uas_alloc_foo functions
  xhci: Allow xHCI drivers to be built as separate modules
  xhci: Export symbols used by host-controller drivers
  xhci: Check for XHCI_COMP_MODE_QUIRK when disabling D3cold
  xhci: Introduce xhci_init_driver()
  usb: hcd: add generic PHY support
  usb: rename phy to usb_phy in HCD
  usb: gadget: uvc: fix up uvcg_v4l2_get_unmapped_area typo
  USB: host: st: fix ehci/ohci driver selection
  usb: host: ehci-exynos: Remove unnecessary usb-phy support
  usb: core: return -ENOTSUPP for all targeted hosts
  USB: Remove .owner field for driver
  usb: core: log higher level message on malformed LANGID descriptor
  usb: Add LED triggers for USB activity
  usb: Rename usb-common.c
  usb: gadget: Refactor request completion
  usb: gadget: Introduce usb_gadget_giveback_request()
  usb: dwc2/gadget: move phy bus legth initialization
  phy: remove .owner field for drivers using module_platform_driver
  ...
parents 87d7bcee 4ed9a3d4

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

0 → 100644
+12 −0
Original line number Diff line number Diff line 
What:		/config/usb-gadget/gadget/functions/uac1.name

Date:		Sep 2014

KernelVersion:	3.18

Description:

		The attributes:



		audio_buf_size - audio buffer size

		fn_cap - capture pcm device file name

		fn_cntl - control device file name

		fn_play - playback pcm device file name

		req_buf_size - ISO OUT endpoint request buffer size

		req_count - ISO OUT endpoint request count

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

0 → 100644
+12 −0
Original line number Diff line number Diff line 
What:		/config/usb-gadget/gadget/functions/uac2.name

Date:		Sep 2014

KernelVersion:	3.18

Description:

		The attributes:



		c_chmask - capture channel mask

		c_srate - capture sampling rate

		c_ssize - capture sample size (bytes)

		p_chmask - playback channel mask

		p_srate - playback sampling rate

		p_ssize - playback sample size (bytes)

Documentation/ABI/testing/sysfs-class-uwb_rc

+13 −0
Original line number Diff line number Diff line
@@ -43,6 +43,19 @@ Description: 
                Reading returns the currently active channel, or -1 if

                the radio controller is not beaconing.



What:           /sys/class/uwb_rc/uwbN/ASIE

Date:           August 2014

KernelVersion:  3.18

Contact:        linux-usb@vger.kernel.org

Description:



                The application-specific information element (ASIE)

                included in this device's beacon, in space separated

                hex octets.



                Reading returns the current ASIE.  Writing replaces

                the current ASIE with the one written.



What:           /sys/class/uwb_rc/uwbN/scan

Date:           July 2008

KernelVersion:  2.6.27

Documentation/DocBook/usb.tmpl

+1 −1
Original line number Diff line number Diff line
@@ -593,7 +593,7 @@ for (;;) { 
	    Each device has one control endpoint (endpoint zero)

	    which supports a limited RPC style RPC access.

	    Devices are configured

	    by khubd (in the kernel) setting a device-wide

	    by hub_wq (in the kernel) setting a device-wide

	    <emphasis>configuration</emphasis> that affects things

	    like power consumption and basic functionality.

	    The endpoints are part of USB <emphasis>interfaces</emphasis>,

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

0 → 100644
+30 −0
Original line number Diff line number Diff line 
ST STiH407 USB PHY controller



This file documents the dt bindings for the usb picoPHY driver which is the PHY for both USB2 and USB3

host controllers (when controlling usb2/1.1 devices) available on STiH407 SoC family from STMicroelectronics.



Required properties:

- compatible		: should be "st,stih407-usb2-phy"

- reg			: contain the offset and length of the system configuration registers

			  used as glue logic to control & parameter phy

- reg-names		: the names of the system configuration registers in "reg", should be "param" and "reg"

- st,syscfg		: sysconfig register to manage phy parameter at driver level

- resets		: list of phandle and reset specifier pairs. There should be two entries, one

			  for the whole phy and one for the port

- reset-names		: list of reset signal names. Should be "global" and "port"

See: Documentation/devicetree/bindings/reset/st,sti-powerdown.txt

See: Documentation/devicetree/bindings/reset/reset.txt



Example:



usb2_picophy0: usbpicophy@f8 {

	compatible	= "st,stih407-usb2-phy";

	reg		= <0xf8 0x04>,	/* syscfg 5062 */

			  <0xf4 0x04>;	/* syscfg 5061 */

	reg-names	= "param", "ctrl";

	#phy-cells	= <0>;

	st,syscfg	= <&syscfg_core>;

	resets		= <&softreset STIH407_PICOPHY_SOFTRESET>,

			  <&picophyreset STIH407_PICOPHY0_RESET>;

	reset-names	= "global", "port";

};