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

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

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

Pull USB updates from Greg KH:
 "Here's the big set of USB and PHY patches for 3.19-rc1.

  The normal churn in the USB gadget area is in here, as well as xhci
  and other individual USB driver updates.  The PHY tree is also in
  here, as there were dependancies on the USB tree.

  All of these have been in linux-next"

* tag 'usb-3.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb: (351 commits)
  arm: omap3: twl: remove usb phy init data
  usbip: fix error handling in stub_probe()
  usb: gadget: udc: missing curly braces
  USB: mos7720: delete some unneeded code
  wusb: replace memset by memzero_explicit
  usbip: remove unneeded structure
  usb: xhci: fix comment for PORT_DEV_REMOVE
  xhci: don't use the same variable for stopped and halted rings current TD
  xhci: clear extra bits from slot context when setting max exit latency
  xhci: cleanup finish_td function
  USB: adutux: NULL dereferences on disconnect
  usb: chipidea: fix platform_no_drv_owner.cocci warnings
  usb: chipidea: Fixed a few typos in comments
  Documentation: bindings: add doc for the USB2 ChipIdea USB driver
  usb: chipidea: add a usb2 driver for ci13xxx
  usb: chipidea: fix phy handling
  usb: chipidea: remove duplicate dev_set_drvdata for host_start
  usb: chipidea: parameter 'mode' isn't needed for hw_device_reset
  usb: chipidea: add controller reset API
  usb: chipidea: remove flag CI_HDRC_REQUIRE_TRANSCEIVER
  ...
parents 7a02d089 81e1dadf

Documentation/ABI/stable/sysfs-class-udc

0 → 100644
+93 −0
Original line number Diff line number Diff line 
What:		/sys/class/udc/<udc>/a_alt_hnp_support

Date:		June 2011

KernelVersion:	3.1

Contact:	Felipe Balbi <balbi@kernel.org>

Description:

		Indicates if an OTG A-Host supports HNP at an alternate port.

Users:



What:		/sys/class/udc/<udc>/a_hnp_support

Date:		June 2011

KernelVersion:	3.1

Contact:	Felipe Balbi <balbi@kernel.org>

Description:

		Indicates if an OTG A-Host supports HNP at this port.

Users:



What:		/sys/class/udc/<udc>/b_hnp_enable

Date:		June 2011

KernelVersion:	3.1

Contact:	Felipe Balbi <balbi@kernel.org>

Description:

		Indicates if an OTG A-Host enabled HNP support.

Users:



What:		/sys/class/udc/<udc>/current_speed

Date:		June 2011

KernelVersion:	3.1

Contact:	Felipe Balbi <balbi@kernel.org>

Description:

		Indicates the current negotiated speed at this port.

Users:



What:		/sys/class/udc/<udc>/is_a_peripheral

Date:		June 2011

KernelVersion:	3.1

Contact:	Felipe Balbi <balbi@kernel.org>

Description:

		Indicates that this port is the default Host on an OTG session

		but HNP was used to switch roles.

Users:



What:		/sys/class/udc/<udc>/is_otg

Date:		June 2011

KernelVersion:	3.1

Contact:	Felipe Balbi <balbi@kernel.org>

Description:

		Indicates that this port support OTG.

Users:



What:		/sys/class/udc/<udc>/maximum_speed

Date:		June 2011

KernelVersion:	3.1

Contact:	Felipe Balbi <balbi@kernel.org>

Description:

		Indicates the maximum USB speed supported by this port.

Users:



What:		/sys/class/udc/<udc>/maximum_speed

Date:		June 2011

KernelVersion:	3.1

Contact:	Felipe Balbi <balbi@kernel.org>

Description:

		Indicates the maximum USB speed supported by this port.

Users:



What:		/sys/class/udc/<udc>/soft_connect

Date:		June 2011

KernelVersion:	3.1

Contact:	Felipe Balbi <balbi@kernel.org>

Description:

		Allows users to disconnect data pullup resistors thus causing a

		logical disconnection from the USB Host.

Users:



What:		/sys/class/udc/<udc>/srp

Date:		June 2011

KernelVersion:	3.1

Contact:	Felipe Balbi <balbi@kernel.org>

Description:

		Allows users to manually start Session Request Protocol.

Users:



What:		/sys/class/udc/<udc>/state

Date:		June 2011

KernelVersion:	3.1

Contact:	Felipe Balbi <balbi@kernel.org>

Description:

		Indicates current state of the USB Device Controller. Valid

		states are: 'not-attached', 'attached', 'powered',

		'reconnecting', 'unauthenticated', 'default', 'addressed',

		'configured', and 'suspended'; however not all USB Device

		Controllers support reporting all states.

Users:

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

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

Date:		Nov 2014

KernelVersion:	3.19

Description:

		The attributes:



		protocol	- HID protocol to use

		report_desc	- blob corresponding to HID report descriptors

				except the data passed through /dev/hidg<N>

		report_length	- HID report length

		subclass	- HID device subclass to use

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

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

Date:		Nov 2014

KernelVersion:	3.19

Description:

		The attributes:



		index		- index value for the USB MIDI adapter

		id		- ID string for the USB MIDI adapter

		buflen		- MIDI buffer length

		qlen		- USB read request queue length

		in_ports	- number of MIDI input ports

		out_ports	- number of MIDI output ports

Documentation/devicetree/bindings/ata/marvell.txt

+6 −0
Original line number Diff line number Diff line
@@ -6,11 +6,17 @@ Required Properties: 
- interrupts    : Interrupt controller is using

- nr-ports      : Number of SATA ports in use.



Optional Properties:

- phys		: List of phandles to sata phys

- phy-names	: Should be "0", "1", etc, one number per phandle



Example:



	sata@80000 {

		compatible = "marvell,orion-sata";

		reg = <0x80000 0x5000>;

		interrupts = <21>;

		phys = <&sata_phy0>, <&sata_phy1>;

		phy-names = "0", "1";

		nr-ports = <2>;

	}

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

+3 −1
Original line number Diff line number Diff line
@@ -2,7 +2,9 @@ Berlin SATA PHY 
---------------



Required properties:

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

- compatible: should be one of

    "marvell,berlin2-sata-phy"

    "marvell,berlin2q-sata-phy"

- address-cells: should be 1

- size-cells: should be 0

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