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

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

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

Pull USB patches from Greg KH:
 "Here's the big pull request for the USB driver tree for 3.20-rc1.

  Nothing major happening here, just lots of gadget driver updates, new
  device ids, and a bunch of cleanups.

  All of these have been in linux-next for a while with no reported
  issues"

* tag 'usb-3.20-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb: (299 commits)
  usb: musb: fix device hotplug behind hub
  usb: dwc2: Fix a bug in reading the endpoint directions from reg.
  staging: emxx_udc: fix the build error
  usb: Retry port status check on resume to work around RH bugs
  Revert "usb: Reset USB-3 devices on USB-3 link bounce"
  uhci-hub: use HUB_CHAR_*
  usb: kconfig: replace PPC_OF with PPC
  ehci-pci: disable for Intel MID platforms (update)
  usb: gadget: Kconfig: use bool instead of boolean
  usb: musb: blackfin: remove incorrect __exit_p()
  USB: fix use-after-free bug in usb_hcd_unlink_urb()
  ehci-pci: disable for Intel MID platforms
  usb: host: pci_quirks: joing string literals
  USB: add flag for HCDs that can't receive wakeup requests (isp1760-hcd)
  USB: usbfs: allow URBs to be reaped after disconnection
  cdc-acm: kill unnecessary messages
  cdc-acm: add sanity checks
  usb: phy: phy-generic: Fix USB PHY gpio reset
  usb: dwc2: fix USB core dependencies
  usb: renesas_usbhs: fix NULL pointer dereference in dma_release_channel()
  ...
parents 8c988ae7 4d4bac44

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

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

Date:		Dec 2014

KernelVersion:	3.20

Description:	UVC function directory



		streaming_maxburst	- 0..15 (ss only)

		streaming_maxpacket	- 1..1023 (fs), 1..3072 (hs/ss)

		streaming_interval	- 1..16



What:		/config/usb-gadget/gadget/functions/uvc.name/control

Date:		Dec 2014

KernelVersion:	3.20

Description:	Control descriptors



What:		/config/usb-gadget/gadget/functions/uvc.name/control/class

Date:		Dec 2014

KernelVersion:	3.20

Description:	Class descriptors



What:		/config/usb-gadget/gadget/functions/uvc.name/control/class/ss

Date:		Dec 2014

KernelVersion:	3.20

Description:	Super speed control class descriptors



What:		/config/usb-gadget/gadget/functions/uvc.name/control/class/fs

Date:		Dec 2014

KernelVersion:	3.20

Description:	Full speed control class descriptors



What:		/config/usb-gadget/gadget/functions/uvc.name/control/terminal

Date:		Dec 2014

KernelVersion:	3.20

Description:	Terminal descriptors



What:		/config/usb-gadget/gadget/functions/uvc.name/control/terminal/output

Date:		Dec 2014

KernelVersion:	3.20

Description:	Output terminal descriptors



What:		/config/usb-gadget/gadget/functions/uvc.name/control/terminal/output/default

Date:		Dec 2014

KernelVersion:	3.20

Description:	Default output terminal descriptors



		All attributes read only:

		iTerminal	- index of string descriptor

		bSourceID 	- id of the terminal to which this terminal

				is connected

		bAssocTerminal	- id of the input terminal to which this output

				terminal is associated

		wTerminalType	- terminal type

		bTerminalID	- a non-zero id of this terminal



What:		/config/usb-gadget/gadget/functions/uvc.name/control/terminal/camera

Date:		Dec 2014

KernelVersion:	3.20

Description:	Camera terminal descriptors



What:		/config/usb-gadget/gadget/functions/uvc.name/control/terminal/camera/default

Date:		Dec 2014

KernelVersion:	3.20

Description:	Default camera terminal descriptors



		All attributes read only:

		bmControls		- bitmap specifying which controls are

					supported for the video stream

		wOcularFocalLength	- the value of Locular

		wObjectiveFocalLengthMax- the value of Lmin

		wObjectiveFocalLengthMin- the value of Lmax

		iTerminal		- index of string descriptor

		bAssocTerminal		- id of the output terminal to which

					this terminal is connected

		wTerminalType		- terminal type

		bTerminalID		- a non-zero id of this terminal



What:		/config/usb-gadget/gadget/functions/uvc.name/control/processing

Date:		Dec 2014

KernelVersion:	3.20

Description:	Processing unit descriptors



What:		/config/usb-gadget/gadget/functions/uvc.name/control/processing/default

Date:		Dec 2014

KernelVersion:	3.20

Description:	Default processing unit descriptors



		All attributes read only:

		iProcessing	- index of string descriptor

		bmControls	- bitmap specifying which controls are

				supported for the video stream

		wMaxMultiplier	- maximum digital magnification x100

		bSourceID	- id of the terminal to which this unit is

				connected

		bUnitID		- a non-zero id of this unit



What:		/config/usb-gadget/gadget/functions/uvc.name/control/header

Date:		Dec 2014

KernelVersion:	3.20

Description:	Control header descriptors



What:		/config/usb-gadget/gadget/functions/uvc.name/control/header/name

Date:		Dec 2014

KernelVersion:	3.20

Description:	Specific control header descriptors



dwClockFrequency

bcdUVC

What:		/config/usb-gadget/gadget/functions/uvc.name/streaming

Date:		Dec 2014

KernelVersion:	3.20

Description:	Streaming descriptors



What:		/config/usb-gadget/gadget/functions/uvc.name/streaming/class

Date:		Dec 2014

KernelVersion:	3.20

Description:	Streaming class descriptors



What:		/config/usb-gadget/gadget/functions/uvc.name/streaming/class/ss

Date:		Dec 2014

KernelVersion:	3.20

Description:	Super speed streaming class descriptors



What:		/config/usb-gadget/gadget/functions/uvc.name/streaming/class/hs

Date:		Dec 2014

KernelVersion:	3.20

Description:	High speed streaming class descriptors



What:		/config/usb-gadget/gadget/functions/uvc.name/streaming/class/fs

Date:		Dec 2014

KernelVersion:	3.20

Description:	Full speed streaming class descriptors



What:		/config/usb-gadget/gadget/functions/uvc.name/streaming/color_matching

Date:		Dec 2014

KernelVersion:	3.20

Description:	Color matching descriptors



What:		/config/usb-gadget/gadget/functions/uvc.name/streaming/color_matching/default

Date:		Dec 2014

KernelVersion:	3.20

Description:	Default color matching descriptors



		All attributes read only:

		bMatrixCoefficients	- matrix used to compute luma and

					chroma values from the color primaries

		bTransferCharacteristics- optoelectronic transfer

					characteristic of the source picutre,

					also called the gamma function

		bColorPrimaries		- color primaries and the reference

					white



What:		/config/usb-gadget/gadget/functions/uvc.name/streaming/mjpeg

Date:		Dec 2014

KernelVersion:	3.20

Description:	MJPEG format descriptors



What:		/config/usb-gadget/gadget/functions/uvc.name/streaming/mjpeg/name

Date:		Dec 2014

KernelVersion:	3.20

Description:	Specific MJPEG format descriptors



		All attributes read only,

		except bmaControls and bDefaultFrameIndex:

		bmaControls		- this format's data for bmaControls in

					the streaming header

		bmInterfaceFlags	- specifies interlace information,

					read-only

		bAspectRatioY		- the X dimension of the picture aspect

					ratio, read-only

		bAspectRatioX		- the Y dimension of the picture aspect

					ratio, read-only

		bmFlags			- characteristics of this format,

					read-only

		bDefaultFrameIndex	- optimum frame index for this stream



What:		/config/usb-gadget/gadget/functions/uvc.name/streaming/mjpeg/name/name

Date:		Dec 2014

KernelVersion:	3.20

Description:	Specific MJPEG frame descriptors



		dwFrameInterval		- indicates how frame interval can be

					programmed; a number of values

					separated by newline can be specified

		dwDefaultFrameInterval	- the frame interval the device would

					like to use as default

		dwMaxVideoFrameBufferSize- the maximum number of bytes the

					compressor will produce for a video

					frame or still image

		dwMaxBitRate		- the maximum bit rate at the shortest

					frame interval in bps

		dwMinBitRate		- the minimum bit rate at the longest

					frame interval in bps

		wHeight			- height of decoded bitmap frame in px

		wWidth			- width of decoded bitmam frame in px

		bmCapabilities		- still image support, fixed frame-rate

					support



What:		/config/usb-gadget/gadget/functions/uvc.name/streaming/uncompressed

Date:		Dec 2014

KernelVersion:	3.20

Description:	Uncompressed format descriptors



What:		/config/usb-gadget/gadget/functions/uvc.name/streaming/uncompressed/name

Date:		Dec 2014

KernelVersion:	3.20

Description:	Specific uncompressed format descriptors



		bmaControls		- this format's data for bmaControls in

					the streaming header

		bmInterfaceFlags	- specifies interlace information,

					read-only

		bAspectRatioY		- the X dimension of the picture aspect

					ratio, read-only

		bAspectRatioX		- the Y dimension of the picture aspect

					ratio, read-only

		bDefaultFrameIndex	- optimum frame index for this stream

		bBitsPerPixel		- number of bits per pixel used to

					specify color in the decoded video

					frame

		guidFormat		- globally unique id used to identify

					stream-encoding format



What:		/config/usb-gadget/gadget/functions/uvc.name/streaming/uncompressed/name/name

Date:		Dec 2014

KernelVersion:	3.20

Description:	Specific uncompressed frame descriptors



		dwFrameInterval		- indicates how frame interval can be

					programmed; a number of values

					separated by newline can be specified

		dwDefaultFrameInterval	- the frame interval the device would

					like to use as default

		dwMaxVideoFrameBufferSize- the maximum number of bytes the

					compressor will produce for a video

					frame or still image

		dwMaxBitRate		- the maximum bit rate at the shortest

					frame interval in bps

		dwMinBitRate		- the minimum bit rate at the longest

					frame interval in bps

		wHeight			- height of decoded bitmap frame in px

		wWidth			- width of decoded bitmam frame in px

		bmCapabilities		- still image support, fixed frame-rate

					support



What:		/config/usb-gadget/gadget/functions/uvc.name/streaming/header

Date:		Dec 2014

KernelVersion:	3.20

Description:	Streaming header descriptors



What:		/config/usb-gadget/gadget/functions/uvc.name/streaming/header/name

Date:		Dec 2014

KernelVersion:	3.20

Description:	Specific streaming header descriptors



		All attributes read only:

		bTriggerUsage		- how the host software will respond to

					a hardware trigger interrupt event

		bTriggerSupport		- flag specifying if hardware

					triggering is supported

		bStillCaptureMethod	- method of still image caputre

					supported

		bTerminalLink		- id of the output terminal to which

					the video endpoint of this interface

					is connected

		bmInfo			- capabilities of this video streaming

					interface

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

+16 −27
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ Required properties (port (child) node): 
		  filled in "reg". It can also contain the offset of the system configuration

		  registers used as glue-logic to setup the device for SATA/PCIe or USB3

		  devices.

- st,syscfg	: Offset of the parent configuration register.

- resets	: phandle to the parent reset controller.

- reset-names	: Associated name must be "miphy-sw-rst".
@@ -54,18 +55,12 @@ example: 
			phy_port0: port@9b22000 {

				reg = <0x9b22000 0xff>,

				      <0x9b09000 0xff>,

				      <0x9b04000 0xff>,

				      <0x114 0x4>, /* sysctrl MiPHY cntrl */

				      <0x818 0x4>, /* sysctrl MiPHY status*/

				      <0xe0  0x4>, /* sysctrl PCIe */

				      <0xec  0x4>; /* sysctrl SATA */

				      <0x9b04000 0xff>;

				reg-names = "sata-up",

					    "pcie-up",

					    "pipew",

					    "miphy-ctrl-glue",

					    "miphy-status-glue",

					    "pcie-glue",

					    "sata-glue";

					    "pipew";



				st,syscfg = <0x114 0x818 0xe0 0xec>;

				#phy-cells = <1>;

				st,osc-rdy;

				reset-names = "miphy-sw-rst";
@@ -75,18 +70,13 @@ example: 
			phy_port1: port@9b2a000 {

				reg = <0x9b2a000 0xff>,

				      <0x9b19000 0xff>,

				      <0x9b14000 0xff>,

				      <0x118 0x4>,

				      <0x81c 0x4>,

				      <0xe4  0x4>,

				      <0xf0  0x4>;

				      <0x9b14000 0xff>;

				reg-names = "sata-up",

					    "pcie-up",

					    "pipew",

					    "miphy-ctrl-glue",

					    "miphy-status-glue",

					    "pcie-glue",

					    "sata-glue";

					    "pipew";



				st,syscfg = <0x118 0x81c 0xe4 0xf0>;



				#phy-cells = <1>;

				st,osc-force-ext;

				reset-names = "miphy-sw-rst";
@@ -95,13 +85,12 @@ example: 


			phy_port2: port@8f95000 {

				reg = <0x8f95000 0xff>,

				      <0x8f90000 0xff>,

				      <0x11c 0x4>,

				      <0x820 0x4>;

				      <0x8f90000 0xff>;

				reg-names = "pipew",

				    "usb3-up",

				    "miphy-ctrl-glue",

				    "miphy-status-glue";

					    "usb3-up";



				st,syscfg = <0x11c 0x820>;



				#phy-cells = <1>;

				reset-names = "miphy-sw-rst";

				resets = <&softreset STIH407_MIPHY2_SOFTRESET>;
@@ -125,4 +114,4 @@ example: 


Macro definitions for the supported miphy configuration can be found in:



include/dt-bindings/phy/phy-miphy28lp.h
 
include/dt-bindings/phy/phy.h

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

0 → 100644
+37 −0
Original line number Diff line number Diff line 
ROCKCHIP USB2 PHY



Required properties:

 - compatible: rockchip,rk3288-usb-phy

 - rockchip,grf : phandle to the syscon managing the "general

   register files"

 - #address-cells: should be 1

 - #size-cells: should be 0



Sub-nodes:

Each PHY should be represented as a sub-node.



Sub-nodes

required properties:

- #phy-cells: should be 0

- reg: PHY configure reg address offset in GRF

		"0x320" - for PHY attach to OTG controller

		"0x334" - for PHY attach to HOST0 controller

		"0x348" - for PHY attach to HOST1 controller



Optional Properties:

- clocks : phandle + clock specifier for the phy clocks

- clock-names: string, clock name, must be "phyclk"



Example:



usbphy: phy {

	compatible = "rockchip,rk3288-usb-phy";

	rockchip,grf = <&grf>;

	#address-cells = <1>;

	#size-cells = <0>;



	usbphy0: usb-phy0 {

		#phy-cells = <0>;

		reg = <0x320>;

	};

};

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

+1 −1
Original line number Diff line number Diff line
@@ -3,8 +3,8 @@ Samsung S5P/EXYNOS SoC series MIPI CSIS/DSIM DPHY 


Required properties:

- compatible : should be "samsung,s5pv210-mipi-video-phy";

- reg : offset and length of the MIPI DPHY register set;

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

- syscon - phandle to the PMU system controller;



For "samsung,s5pv210-mipi-video-phy" compatible PHYs the second cell in

the PHY specifier identifies the PHY and its meaning is as follows:

Documentation/devicetree/bindings/usb/atmel-usb.txt

+4 −1
Original line number Diff line number Diff line
@@ -51,7 +51,10 @@ usb1: gadget@fffa4000 { 
Atmel High-Speed USB device controller



Required properties:

 - compatible: Should be "atmel,at91sam9rl-udc"

 - compatible: Should be one of the following

	       "at91sam9rl-udc"

	       "at91sam9g45-udc"

	       "sama5d3-udc"

 - reg: Address and length of the register set for the device

 - interrupts: Should contain usba interrupt

 - ep childnode: To specify the number of endpoints and their properties.