Merge tag 'usb-3.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb (c287322c) · Commits · 戴 / test

Documentation/ABI/testing/configfs-usb-gadget-mass-storage

0 → 100644

+31 −0

Original line number	Diff line number	Diff line
		What: /config/usb-gadget/gadget/functions/mass_storage.name
		Date: Oct 2013
		KenelVersion: 3.13
		Description:
		The attributes:

		stall - Set to permit function to halt bulk endpoints.
		Disabled on some USB devices known not to work
		correctly. You should set it to true.
		num_buffers - Number of pipeline buffers. Valid numbers
		are 2..4. Available only if
		CONFIG_USB_GADGET_DEBUG_FILES is set.

		What: /config/usb-gadget/gadget/functions/mass_storage.name/lun.name
		Date: Oct 2013
		KenelVersion: 3.13
		Description:
		The attributes:

		file - The path to the backing file for the LUN.
		Required if LUN is not marked as removable.
		ro - Flag specifying access to the LUN shall be
		read-only. This is implied if CD-ROM emulation
		is enabled as well as when it was impossible
		to open "filename" in R/W mode.
		removable - Flag specifying that LUN shall be indicated as
		being removable.
		cdrom - Flag specifying that LUN shall be reported as
		being a CD-ROM.
		nofua - Flag specifying that FUA flag
		in SCSI WRITE(10,12)

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

0 → 100644

+66 −0

Original line number	Diff line number	Diff line
		This document explains only the device tree data binding. For general
		information about PHY subsystem refer to Documentation/phy.txt

		PHY device node
		===============

		Required Properties:
		#phy-cells: Number of cells in a PHY specifier; The meaning of all those
		cells is defined by the binding for the phy node. The PHY
		provider can use the values in cells to find the appropriate
		PHY.

		For example:

		phys: phy {
		compatible = "xxx";
		reg = <...>;
		.
		.
		#phy-cells = <1>;
		.
		.
		};

		That node describes an IP block (PHY provider) that implements 2 different PHYs.
		In order to differentiate between these 2 PHYs, an additonal specifier should be
		given while trying to get a reference to it.

		PHY user node
		=============

		Required Properties:
		phys : the phandle for the PHY device (used by the PHY subsystem)
		phy-names : the names of the PHY corresponding to the PHYs present in the
		phys phandle

		Example 1:
		usb1: usb_otg_ss@xxx {
		compatible = "xxx";
		reg = <xxx>;
		.
		.
		phys = <&usb2_phy>, <&usb3_phy>;
		phy-names = "usb2phy", "usb3phy";
		.
		.
		};

		This node represents a controller that uses two PHYs, one for usb2 and one for
		usb3.

		Example 2:
		usb2: usb_otg_ss@xxx {
		compatible = "xxx";
		reg = <xxx>;
		.
		.
		phys = <&phys 1>;
		phy-names = "usbphy";
		.
		.
		};

		This node represents a controller that uses one of the PHYs of the PHY provider
		device defined previously. Note that the phy handle has an additional specifier
		"1" to differentiate between the two PHYs.

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

0 → 100644

+22 −0

Original line number	Diff line number	Diff line
		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;

		For "samsung,s5pv210-mipi-video-phy" compatible PHYs the second cell in
		the PHY specifier identifies the PHY and its meaning is as follows:
		0 - MIPI CSIS 0,
		1 - MIPI DSIM 0,
		2 - MIPI CSIS 1,
		3 - MIPI DSIM 1.

		Samsung EXYNOS SoC series Display Port PHY
		-------------------------------------------------

		Required properties:
		- compatible : should be "samsung,exynos5250-dp-video-phy";
		- reg : offset and length of the Display Port PHY register set;
		- #phy-cells : from the generic PHY bindings, must be 0;

Documentation/devicetree/bindings/usb/msm-hsusb.txt

0 → 100644

+17 −0

Original line number	Diff line number	Diff line
		MSM SoC HSUSB controllers

		EHCI

		Required properties:
		- compatible: Should contain "qcom,ehci-host"
		- regs: offset and length of the register set in the memory map
		- usb-phy: phandle for the PHY device

		Example EHCI controller device node:

		ehci: ehci@f9a55000 {
		compatible = "qcom,ehci-host";
		reg = <0xf9a55000 0x400>;
		usb-phy = <&usb_otg>;
		};

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

+20 −19

Original line number	Diff line number	Diff line
		@@ -3,9 +3,6 @@ OMAP GLUE AND OTHER OMAP SPECIFIC COMPONENTS
		OMAP MUSB GLUE
		- compatible : Should be "ti,omap4-musb" or "ti,omap3-musb"
		- ti,hwmods : must be "usb_otg_hs"
		- ti,has-mailbox : to specify that omap uses an external mailbox
		(in control module) to communicate with the musb core during device connect
		and disconnect.
		- multipoint : Should be "1" indicating the musb controller supports
		multipoint. This is a MUSB configuration-specific setting.
		- num-eps : Specifies the number of endpoints. This is also a
		@@ -19,6 +16,9 @@ OMAP MUSB GLUE
		- power : Should be "50". This signifies the controller can supply up to
		100mA when operating in host mode.
		- usb-phy : the phandle for the PHY device
		- phys : the phandle for the PHY device (used by generic PHY framework)
		- phy-names : the names of the PHY corresponding to the PHYs present in the
		phy phandle.

		Optional properties:
		- ctrl-module : phandle of the control module this glue uses to write to
		@@ -28,11 +28,12 @@ SOC specific device node entry
		usb_otg_hs: usb_otg_hs@4a0ab000 {
		compatible = "ti,omap4-musb";
		ti,hwmods = "usb_otg_hs";
		ti,has-mailbox;
		multipoint = <1>;
		num-eps = <16>;
		ram-bits = <12>;
		ctrl-module = <&omap_control_usb>;
		phys = <&usb2_phy>;
		phy-names = "usb2-phy";
		};

		Board specific device node entry
		@@ -78,22 +79,22 @@ omap_dwc3 {
		OMAP CONTROL USB

		Required properties:
		- compatible: Should be "ti,omap-control-usb"
		- compatible: Should be one of
		"ti,control-phy-otghs" - if it has otghs_control mailbox register as on OMAP4.
		"ti,control-phy-usb2" - if it has Power down bit in control_dev_conf register
		e.g. USB2_PHY on OMAP5.
		"ti,control-phy-pipe3" - if it has DPLL and individual Rx & Tx power control
		e.g. USB3 PHY and SATA PHY on OMAP5.
		"ti,control-phy-dra7usb2" - if it has power down register like USB2 PHY on
		DRA7 platform.
		- reg : Address and length of the register set for the device. It contains
		the address of "control_dev_conf" and "otghs_control" or "phy_power_usb"
		depending upon omap4 or omap5.
		- reg-names: The names of the register addresses corresponding to the registers
		filled in "reg".
		- ti,type: This is used to differentiate whether the control module has
		usb mailbox or usb3 phy power. omap4 has usb mailbox in control module to
		notify events to the musb core and omap5 has usb3 phy power register to
		power on usb3 phy. Should be "1" if it has mailbox and "2" if it has usb3
		phy power.
		the address of "otghs_control" for control-phy-otghs or "power" register
		for other types.
		- reg-names: should be "otghs_control" control-phy-otghs and "power" for
		other types.

		omap_control_usb: omap-control-usb@4a002300 {
		compatible = "ti,omap-control-usb";
		reg = <0x4a002300 0x4>,
		<0x4a00233c 0x4>;
		reg-names = "control_dev_conf", "otghs_control";
		ti,type = <1>;
		compatible = "ti,control-phy-otghs";
		reg = <0x4a00233c 0x4>;
		reg-names = "otghs_control";
		};

Admin message