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

Documentation/ABI/testing/sysfs-class-led-trigger-usbport

0 → 100644

+12 −0

Original line number	Diff line number	Diff line
		What: /sys/class/leds/<led>/ports/<port>
		Date: September 2016
		KernelVersion: 4.9
		Contact: linux-leds@vger.kernel.org
		linux-usb@vger.kernel.org
		Description:
		Every dir entry represents a single USB port that can be
		selected for the USB port trigger. Selecting ports makes trigger
		observing them for any connected devices and lighting on LED if
		there are any.
		Echoing "1" value selects USB port. Echoing "0" unselects it.
		Current state can be also read.

Documentation/devicetree/bindings/extcon/qcom,pm8941-misc.txt

0 → 100644

+41 −0

Original line number	Diff line number	Diff line
		Qualcomm's PM8941 USB ID Extcon device

		Some Qualcomm PMICs have a "misc" module that can be used to detect when
		the USB ID pin has been pulled low or high.

		PROPERTIES

		- compatible:
		Usage: required
		Value type: <string>
		Definition: Should contain "qcom,pm8941-misc";

		- reg:
		Usage: required
		Value type: <u32>
		Definition: Should contain the offset to the misc address space

		- interrupts:
		Usage: required
		Value type: <prop-encoded-array>
		Definition: Should contain the usb id interrupt

		- interrupt-names:
		Usage: required
		Value type: <stringlist>
		Definition: Should contain the string "usb_id" for the usb id interrupt

		Example:

		pmic {
		usb_id: misc@900 {
		compatible = "qcom,pm8941-misc";
		reg = <0x900>;
		interrupts = <0x0 0x9 0 IRQ_TYPE_EDGE_BOTH>;
		interrupt-names = "usb_id";
		};
		}

		usb-controller {
		extcon = <&usb_id>;
		};

Documentation/devicetree/bindings/phy/bcm-ns-usb3-phy.txt

0 → 100644

+23 −0

Original line number	Diff line number	Diff line
		Driver for Broadcom Northstar USB 3.0 PHY

		Required properties:

		- compatible: one of: "brcm,ns-ax-usb3-phy", "brcm,ns-bx-usb3-phy".
		- reg: register mappings for DMP (Device Management Plugin) and ChipCommon B
		MMI.
		- reg-names: "dmp" and "ccb-mii"

		Initialization of USB 3.0 PHY depends on Northstar version. There are currently
		three known series: Ax, Bx and Cx.
		Known A0: BCM4707 rev 0
		Known B0: BCM4707 rev 4, BCM53573 rev 2
		Known B1: BCM4707 rev 6
		Known C0: BCM47094 rev 0

		Example:
		usb3-phy {
		compatible = "brcm,ns-ax-usb3-phy";
		reg = <0x18105000 0x1000>, <0x18003000 0x1000>;
		reg-names = "dmp", "ccb-mii";
		#phy-cells = <0>;
		};

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

+10 −0

Original line number	Diff line number	Diff line
		@@ -12,6 +12,16 @@ Required properties:
		- interrupts: Should contain phy interrupt
		- fsl,anatop: phandle for anatop register, it is only for imx6 SoC series

		Optional properties:
		- fsl,tx-cal-45-dn-ohms: Integer [30-55]. Resistance (in ohms) of switchable
		high-speed trimming resistor connected in parallel with the 45 ohm resistor
		that terminates the DN output signal. Default: 45
		- fsl,tx-cal-45-dp-ohms: Integer [30-55]. Resistance (in ohms) of switchable
		high-speed trimming resistor connected in parallel with the 45 ohm resistor
		that terminates the DP output signal. Default: 45
		- fsl,tx-d-cal: Integer [79-119]. Current trimming value (as a percentage) of
		the 17.78mA TX reference current. Default: 100

		Example:
		usbphy1: usbphy@020c9000 {
		compatible = "fsl,imx6q-usbphy", "fsl,imx23-usbphy";

Documentation/devicetree/bindings/phy/phy-rockchip-inno-usb2.txt

0 → 100644

+64 −0

Original line number	Diff line number	Diff line
		ROCKCHIP USB2.0 PHY WITH INNO IP BLOCK

		Required properties (phy (parent) node):
		- compatible : should be one of the listed compatibles:
		* "rockchip,rk3366-usb2phy"
		* "rockchip,rk3399-usb2phy"
		- reg : the address offset of grf for usb-phy configuration.
		- #clock-cells : should be 0.
		- clock-output-names : specify the 480m output clock name.

		Optional properties:
		- clocks : phandle + phy specifier pair, for the input clock of phy.
		- clock-names : input clock name of phy, must be "phyclk".

		Required nodes : a sub-node is required for each port the phy provides.
		The sub-node name is used to identify host or otg port,
		and shall be the following entries:
		* "otg-port" : the name of otg port.
		* "host-port" : the name of host port.

		Required properties (port (child) node):
		- #phy-cells : must be 0. See ./phy-bindings.txt for details.
		- interrupts : specify an interrupt for each entry in interrupt-names.
		- interrupt-names : a list which shall be the following entries:
		* "otg-id" : for the otg id interrupt.
		* "otg-bvalid" : for the otg vbus interrupt.
		* "linestate" : for the host/otg linestate interrupt.

		Optional properties:
		- phy-supply : phandle to a regulator that provides power to VBUS.
		See ./phy-bindings.txt for details.

		Example:

		grf: syscon@ff770000 {
		compatible = "rockchip,rk3366-grf", "syscon", "simple-mfd";
		#address-cells = <1>;
		#size-cells = <1>;

		...

		u2phy: usb2-phy@700 {
		compatible = "rockchip,rk3366-usb2phy";
		reg = <0x700 0x2c>;
		#clock-cells = <0>;
		clock-output-names = "sclk_otgphy0_480m";

		u2phy_otg: otg-port {
		#phy-cells = <0>;
		interrupts = <GIC_SPI 93 IRQ_TYPE_LEVEL_HIGH>,
		<GIC_SPI 94 IRQ_TYPE_LEVEL_HIGH>,
		<GIC_SPI 95 IRQ_TYPE_LEVEL_HIGH>;
		interrupt-names = "otg-id", "otg-bvalid", "linestate";
		status = "okay";
		};

		u2phy_host: host-port {
		#phy-cells = <0>;
		interrupts = <GIC_SPI 96 IRQ_TYPE_LEVEL_HIGH>;
		interrupt-names = "linestate";
		status = "okay";
		};
		};
		};

Admin message