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

Commit e152813f authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge tag 'usb-for-v4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb into usb-next 



Felipe writes:

usb: patches for v4.2 merge window

- dwc2 adds hibernation support
- preparation for sunxi glue to musb driver
- new ULPI bus
- new ULPI PHY driver for TUSB1210
- musb patches to support multiple DMA engines on same binary
- support for R-Car E2 on renesas_usbhs

Signed-off-by: default avatarFelipe Balbi <balbi@ti.com>
parents 74db22cb e18b7975

Documentation/devicetree/bindings/power/twl-charger.txt

+10 −0
Original line number Original line Diff line number Diff line 
TWL BCI (Battery Charger Interface)

TWL BCI (Battery Charger Interface)





The battery charger needs to interact with the USB phy in order

to know when charging is permissible, and when there is a connection

or disconnection.



The choice of phy cannot be configured at a hardware level, so there

is no value in explicit configuration in device-tree.  Rather

if there is a sibling of the BCI node which is compatible with

"ti,twl4030-usb", then that is used to determine when and how

use USB power for charging.



Required properties:

Required properties:

- compatible:

- compatible:

  - "ti,twl4030-bci"

  - "ti,twl4030-bci"

Documentation/devicetree/bindings/usb/dwc3-st.txt

+3 −4
Original line number Original line Diff line number Diff line
@@ -49,8 +49,7 @@ st_dwc3: dwc3@8f94000 { 
	st,syscfg	= <&syscfg_core>;

	st,syscfg	= <&syscfg_core>;

	resets		= <&powerdown STIH407_USB3_POWERDOWN>,

	resets		= <&powerdown STIH407_USB3_POWERDOWN>,

			  <&softreset STIH407_MIPHY2_SOFTRESET>;

			  <&softreset STIH407_MIPHY2_SOFTRESET>;

	reset-names	= "powerdown",

	reset-names	= "powerdown", "softreset";

			  "softreset";

	#address-cells	= <1>;

	#address-cells	= <1>;

	#size-cells	= <1>;

	#size-cells	= <1>;

	pinctrl-names	= "default";

	pinctrl-names	= "default";
@@ -62,7 +61,7 @@ st_dwc3: dwc3@8f94000 { 
		reg		= <0x09900000 0x100000>;

		reg		= <0x09900000 0x100000>;

		interrupts	= <GIC_SPI 155 IRQ_TYPE_NONE>;

		interrupts	= <GIC_SPI 155 IRQ_TYPE_NONE>;

		dr_mode		= "host";

		dr_mode		= "host";

		phys-names      = "usb2-phy", "usb3-phy";

		phy-names	= "usb2-phy", "usb3-phy";

		phys            = <&usb2_picophy2>, <&phy_port2 MIPHY_TYPE_USB>;

		phys		= <&usb2_picophy2>, <&phy_port2 PHY_TYPE_USB3>;

	};

	};

};
 
};

Documentation/devicetree/bindings/usb/dwc3.txt

+2 −0
Original line number Original line Diff line number Diff line
@@ -38,6 +38,8 @@ Optional properties: 
 - snps,is-utmi-l1-suspend: true when DWC3 asserts output signal

 - snps,is-utmi-l1-suspend: true when DWC3 asserts output signal

			utmi_l1_suspend_n, false when asserts utmi_sleep_n

			utmi_l1_suspend_n, false when asserts utmi_sleep_n

 - snps,hird-threshold: HIRD threshold

 - snps,hird-threshold: HIRD threshold

 - snps,hsphy_interface: High-Speed PHY interface selection between "utmi" for

   UTMI+ and "ulpi" for ULPI when the DWC_USB3_HSPHY_INTERFACE has value 3.





This is usually a subnode to DWC3 glue to which it is connected.

This is usually a subnode to DWC3 glue to which it is connected.

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

+11 −0
Original line number Original line Diff line number Diff line
@@ -69,6 +69,17 @@ Optional properties: 
                (no, min, max) where each value represents either a voltage

                (no, min, max) where each value represents either a voltage

                in microvolts or a value corresponding to voltage corner.

                in microvolts or a value corresponding to voltage corner.





- qcom,manual-pullup: If present, vbus is not routed to USB controller/phy

                and controller driver therefore enables pull-up explicitly

                before starting controller using usbcmd run/stop bit.



- extcon:       phandles to external connector devices. First phandle

                should point to external connector, which provide "USB"

                cable events, the second should point to external connector

                device, which provide "USB-HOST" cable events. If one of

                the external connector devices is not required empty <0>

                phandle should be specified.



Example HSUSB OTG controller device node:

Example HSUSB OTG controller device node:





    usb@f9a55000 {

    usb@f9a55000 {

Documentation/devicetree/bindings/usb/renesas_usbhs.txt

+3 −4
Original line number Original line Diff line number Diff line
@@ -4,6 +4,7 @@ Required properties: 
  - compatible: Must contain one of the following:

  - compatible: Must contain one of the following:

	- "renesas,usbhs-r8a7790"

	- "renesas,usbhs-r8a7790"

	- "renesas,usbhs-r8a7791"

	- "renesas,usbhs-r8a7791"

	- "renesas,usbhs-r8a7794"

  - reg: Base address and length of the register for the USBHS

  - reg: Base address and length of the register for the USBHS

  - interrupts: Interrupt specifier for the USBHS

  - interrupts: Interrupt specifier for the USBHS

  - clocks: A list of phandle + clock specifier pairs

  - clocks: A list of phandle + clock specifier pairs
@@ -15,10 +16,8 @@ Optional properties: 
  - phys: phandle + phy specifier pair

  - phys: phandle + phy specifier pair

  - phy-names: must be "usb"

  - phy-names: must be "usb"

  - dmas: Must contain a list of references to DMA specifiers.

  - dmas: Must contain a list of references to DMA specifiers.

  - dma-names : Must contain a list of DMA names:

  - dma-names : named "ch%d", where %d is the channel number ranging from zero

   - tx0 ... tx<n>

                to the number of channels (DnFIFOs) minus one.

   - rx0 ... rx<n>

    - This <n> means DnFIFO in USBHS module.





Example:

Example:

	usbhs: usb@e6590000 {

	usbhs: usb@e6590000 {