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

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

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

Felipe writes:

usb: changes for v4.15 merge window

Not much going on this time around. With only 51 non-merge commits,
this was one of the smallest pull requests from the Gadget tree.

Most of the changes are in the mtu3 driver which added support for
36-bit DMA, support for USB 3.1 and support for dual-role (along with
some non-critical fixes).

The dwc2 driver got a few improvements to how we handle gadget state
tracking and also added support for STM32F7xx devices.

Other than that, we just some minor non-critical fixes and
improvements all over the place.
parents 0520d37b ce2b21a4

Documentation/devicetree/bindings/usb/dwc2.txt

+2 −0
Original line number Diff line number Diff line
@@ -19,6 +19,8 @@ Required properties: 
  configured in FS mode;

  - "st,stm32f4x9-hsotg": The DWC2 USB HS controller instance in STM32F4x9 SoCs

  configured in HS mode;

  - "st,stm32f7xx-hsotg": The DWC2 USB HS controller instance in STM32F7xx SoCs

    configured in HS mode;

- reg : Should contain 1 register range (address and length)

- interrupts : Should contain 1 interrupt

- clocks: clock provider specifier

Documentation/devicetree/bindings/usb/mediatek,mtu3.txt

+10 −9
Original line number Diff line number Diff line
@@ -14,9 +14,9 @@ Required properties: 
 - vusb33-supply : regulator of USB avdd3.3v

 - clocks : a list of phandle + clock-specifier pairs, one for each

	entry in clock-names

 - clock-names : must contain "sys_ck" and "ref_ck" for clock of controller;

	"wakeup_deb_p0" and "wakeup_deb_p1" are optional, they are

	depends on "mediatek,enable-wakeup"

 - clock-names : must contain "sys_ck" for clock of controller,

	the following clocks are optional:

	"ref_ck", "mcu_ck" and "dam_ck";

 - phys : a list of phandle + phy specifier pairs

 - dr_mode : should be one of "host", "peripheral" or "otg",

	refer to usb/generic.txt
@@ -30,9 +30,10 @@ Optional properties: 
	when supports dual-role mode.

 - vbus-supply : reference to the VBUS regulator, needed when supports

	dual-role mode.

 - pinctl-names : a pinctrl state named "default" must be defined,

	"id_float" and "id_ground" are optinal which depends on

	"mediatek,enable-manual-drd"

 - pinctrl-names : a pinctrl state named "default" is optional, and need be

	defined if auto drd switch is enabled, that means the property dr_mode

	is set as "otg", and meanwhile the property "mediatek,enable-manual-drd"

	is not set.

 - pinctrl-0 : pin control group

	See: Documentation/devicetree/bindings/pinctrl/pinctrl-bindings.txt
@@ -44,6 +45,8 @@ Optional properties: 
 - mediatek,enable-wakeup : supports ip sleep wakeup used by host mode

 - mediatek,syscon-wakeup : phandle to syscon used to access USB wakeup

	control register, it depends on "mediatek,enable-wakeup".

 - mediatek,u3p-dis-msk : mask to disable u3ports, bit0 for u3port0,

	bit1 for u3port1, ... etc;



Sub-nodes:

The xhci should be added as subnode to mtu3 as shown in the following example
@@ -63,9 +66,7 @@ ssusb: usb@11271000 { 
	clocks = <&topckgen CLK_TOP_USB30_SEL>, <&clk26m>,

		 <&pericfg CLK_PERI_USB0>,

		 <&pericfg CLK_PERI_USB1>;

	clock-names = "sys_ck", "ref_ck",

		      "wakeup_deb_p0",

		      "wakeup_deb_p1";

	clock-names = "sys_ck", "ref_ck";

	vusb33-supply = <&mt6397_vusb_reg>;

	vbus-supply = <&usb_p0_vbus>;

	extcon = <&extcon_usb>;

Documentation/devicetree/bindings/usb/renesas_usb3.txt

+4 −0
Original line number Diff line number Diff line
@@ -15,6 +15,10 @@ Required properties: 
  - interrupts: Interrupt specifier for the USB3.0 Peripheral

  - clocks: clock phandle and specifier pair



Optional properties:

  - phys: phandle + phy specifier pair

  - phy-names: must be "usb"



Example of R-Car H3 ES1.x:

	usb3_peri0: usb@ee020000 {

		compatible = "renesas,r8a7795-usb3-peri",

Documentation/devicetree/bindings/usb/renesas_usbhs.txt

+4 −1
Original line number Diff line number Diff line
@@ -3,6 +3,8 @@ Renesas Electronics USBHS driver 
Required properties:

  - compatible: Must contain one or more of the following:



	- "renesas,usbhs-r8a7743" for r8a7743 (RZ/G1M) compatible device

	- "renesas,usbhs-r8a7745" for r8a7745 (RZ/G1E) compatible device

	- "renesas,usbhs-r8a7790" for r8a7790 (R-Car H2) compatible device

	- "renesas,usbhs-r8a7791" for r8a7791 (R-Car M2-W) compatible device

	- "renesas,usbhs-r8a7792" for r8a7792 (R-Car V2H) compatible device
@@ -10,7 +12,8 @@ Required properties: 
	- "renesas,usbhs-r8a7794" for r8a7794 (R-Car E2) compatible device

	- "renesas,usbhs-r8a7795" for r8a7795 (R-Car H3) compatible device

	- "renesas,usbhs-r8a7796" for r8a7796 (R-Car M3-W) compatible device

	- "renesas,rcar-gen2-usbhs" for R-Car Gen2 compatible device

	- "renesas,usbhs-r8a77995" for r8a77995 (R-Car D3) compatible device

	- "renesas,rcar-gen2-usbhs" for R-Car Gen2 or RZ/G1 compatible devices

	- "renesas,rcar-gen3-usbhs" for R-Car Gen3 compatible device



	When compatible with the generic version, nodes must list the

drivers/usb/dwc2/core.h

+4 −0
Original line number Diff line number Diff line
@@ -395,6 +395,9 @@ enum dwc2_ep0_state { 
 *                           (default when phy_type is UTMI+ or ULPI)

 *                       1 - 6 MHz

 *                           (default when phy_type is Full Speed)

 * @oc_disable:		Flag to disable overcurrent condition.

 *			0 - Allow overcurrent condition to get detected

 *			1 - Disable overcurrent condtion to get detected

 * @ts_dline:           Enable Term Select Dline pulsing

 *                       0 - No (default)

 *                       1 - Yes
@@ -492,6 +495,7 @@ struct dwc2_core_params { 
	bool dma_desc_fs_enable;

	bool host_support_fs_ls_low_power;

	bool host_ls_low_power_phy_clk;

	bool oc_disable;



	u8 host_channels;

	u16 host_rx_fifo_size;