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

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

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

Pull usb/phy/extcon updates from Greg KH:
 "Here is the big USB, and PHY, and extcon, patchsets for 4.9-rc1.

  Full details are in the shortlog, but generally a lot of new hardware
  support, usb gadget updates, and Wolfram's great cleanup of USB error
  message handling, making the kernel image a tad bit smaller.

  All of this has been in linux-next with no reported issues"

* tag 'usb-4.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb: (343 commits)
  Revert "usbtmc: convert to devm_kzalloc"
  USB: serial: cp210x: Add ID for a Juniper console
  usb: Kconfig: using select for USB_COMMON dependency
  bluetooth: bcm203x: don't print error when allocating urb fails
  mmc: host: vub300: don't print error when allocating urb fails
  usb: hub: change CLEAR_FEATURE to SET_FEATURE
  usb: core: Introduce a USB port LED trigger
  USB: bcma: drop Northstar PHY 2.0 initialization code
  usb: core: hcd: add missing header dependencies
  usb: musb: da8xx: fix error handling message in probe
  usb: musb: Fix session based PM for first invalid VBUS
  usb: musb: Fix PM runtime for disconnect after unconfigure
  musb: Export musb_root_disconnect for use in modules
  usb: misc: legousbtower: Fix NULL pointer deference
  cdc-acm: hardening against malicious devices
  Revert "usb: gadget: NCM: Protect dev->port_usb using dev->lock"
  include: extcon: Fix compilation error caused because of incomplete merge
  MAINTAINERS: add tree entry for USB Serial
  phy-twl4030-usb: initialize charging-related stuff via pm_runtime
  phy-twl4030-usb: better handle musb_mailbox() failure
  ...
parents e6dce825 ab21b63e

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";

		};

	};

};