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

237f38c3 · Linus Torvalds <[email protected]> · 2016-01-13 09:26:40 -08:00

Pull USB updates from Greg KH:
 "Here is the big USB drivers update for 4.5-rc1.

  Lots of gadget driver updates and fixes, like usual, and a mix of
  other USB driver updates as well.  Full details in the shortlog.  All
  of these have been in linux-next for a while"

* tag 'usb-4.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb: (191 commits)
  MAINTAINERS: change my email address
  USB: usbmon: remove assignment from IS_ERR argument
  USB: mxu11x0: drop redundant function name from error messages
  USB: mxu11x0: fix debug-message typos
  USB: mxu11x0: rename usb-serial driver
  USB: mxu11x0: fix modem-control handling on B0-transitions
  USB: mxu11x0: fix memory leak on firmware download
  USB: mxu11x0: fix memory leak in port-probe error path
  USB: serial: add Moxa UPORT 11x0 driver
  USB: cp210x: add ID for ELV Marble Sound Board 1
  usb: chipidea: otg: use usb autosuspend to suspend bus for HNP
  usb: chipidea: host: set host to be null after hcd is freed
  usb: chipidea: removing of_find_property
  usb: chipidea: implement platform shutdown callback
  usb: chipidea: clean up CONFIG_USB_CHIPIDEA_DEBUG reference
  usb: chipidea: delete static debug support
  usb: chipidea: support debugfs without CONFIG_USB_CHIPIDEA_DEBUG
  usb: chipidea: udc: improve error handling on _hardware_enqueue
  usb: chipidea: udc: _ep_queue and _hw_queue cleanup
  usb: dwc3: of-simple: fix build warning on !PM
  ...

Commit: 237f38c3b3ab08eadecc89b7c9647b1cdb996bbe
Parents: 67990608 · 60d77b3d

Merge commit. Changes below are compared with the first parent: 67990608.

Changes

174 files changed · +9140 −2046

File	Status	Add	Del	Content
Documentation/ABI/testing/configfs-usb-gadget-sourcesink	modified	+2	−0	View file
Documentation/ABI/testing/sysfs-bus-usb	modified	+20	−7	View file
Documentation/devicetree/bindings/phy/brcm,brcmstb-sata-phy.txt	modified	+1	−0	View file
Documentation/devicetree/bindings/phy/phy-hi6220-usb.txt	added	+16	−0	View file
Documentation/devicetree/bindings/phy/rcar-gen3-phy-usb2.txt	added	+39	−0	View file
Documentation/devicetree/bindings/phy/rockchip-usb-phy.txt	modified	+5	−1	View file
Documentation/devicetree/bindings/phy/sun4i-usb-phy.txt	modified	+1	−0	View file
Documentation/devicetree/bindings/phy/ti-phy.txt	modified	+17	−3	View file
Documentation/devicetree/bindings/usb/dwc2.txt	modified	+1	−0	View file
Documentation/devicetree/bindings/usb/dwc3-xilinx.txt	added	+33	−0	View file
Documentation/devicetree/bindings/usb/mt8173-xhci.txt	added	+51	−0	View file
Documentation/devicetree/bindings/usb/renesas_usb3.txt	added	+23	−0	View file
Documentation/devicetree/bindings/usb/renesas_usbhs.txt	modified	+16	−6	View file
Documentation/devicetree/bindings/usb/usb-xhci.txt	modified	+2	−2	View file
Documentation/kernel-parameters.txt	modified	+6	−2	View file
Documentation/usb/chipidea.txt	modified	+2	−2	View file
Documentation/usb/gadget-testing.txt	modified	+3	−1	View file
Documentation/usb/power-management.txt	modified	+6	−5	View file
MAINTAINERS	modified	+8	−2	View file
arch/arm64/boot/dts/mediatek/mt8173-evb.dts	modified	+16	−0	View file
arch/arm64/boot/dts/mediatek/mt8173.dtsi	modified	+42	−0	View file
drivers/phy/Kconfig	modified	+18	−2	View file
drivers/phy/Makefile	modified	+2	−0	View file
drivers/phy/phy-berlin-usb.c	modified	+0	−3	View file
drivers/phy/phy-brcmstb-sata.c	modified	+37	−10	View file
drivers/phy/phy-hi6220-usb.c	added	+168	−0	View file
drivers/phy/phy-mt65xx-usb3.c	modified	+101	−5	View file
drivers/phy/phy-omap-usb2.c	modified	+76	−18	View file
drivers/phy/phy-rcar-gen3-usb2.c	added	+378	−0	View file
drivers/phy/phy-rockchip-usb.c	modified	+225	−62	View file
drivers/phy/phy-sun4i-usb.c	modified	+109	−49	View file
drivers/phy/phy-ti-pipe3.c	modified	+217	−85	View file
drivers/phy/phy-twl4030-usb.c	modified	+16	−16	View file
drivers/usb/chipidea/Kconfig	modified	+0	−5	View file
drivers/usb/chipidea/Makefile	modified	+1	−4	View file
drivers/usb/chipidea/ci.h	modified	+3	−0	View file
drivers/usb/chipidea/ci_hdrc_imx.c	modified	+6	−0	View file
drivers/usb/chipidea/ci_hdrc_msm.c	modified	+2	−1	View file
drivers/usb/chipidea/core.c	modified	+22	−37	View file
drivers/usb/chipidea/debug.c	modified	+0	−1	View file
drivers/usb/chipidea/debug.h	deleted	+0	−30	View before deletion
drivers/usb/chipidea/host.c	modified	+2	−0	View file
drivers/usb/chipidea/otg_fsm.c	modified	+18	−8	View file
drivers/usb/chipidea/udc.c	modified	+21	−10	View file
drivers/usb/common/common.c	modified	+54	−6	View file
drivers/usb/core/devio.c	modified	+21	−4	View file
drivers/usb/core/hcd.c	modified	+2	−2	View file
drivers/usb/core/hub.c	modified	+52	−16	View file
drivers/usb/core/hub.h	modified	+4	−1	View file
drivers/usb/core/port.c	modified	+88	−1	View file
drivers/usb/core/sysfs.c	modified	+26	−5	View file
drivers/usb/core/usb.c	modified	+0	−5	View file
drivers/usb/dwc2/core.c	modified	+344	−85	View file
drivers/usb/dwc2/core.h	modified	+63	−3	View file
drivers/usb/dwc2/core_intr.c	modified	+25	−28	View file
drivers/usb/dwc2/gadget.c	modified	+25	−84	View file
drivers/usb/dwc2/hcd.c	modified	+121	−7	View file
drivers/usb/dwc2/hcd.h	modified	+19	−12	View file
drivers/usb/dwc2/hcd_ddma.c	modified	+200	−40	View file
drivers/usb/dwc2/hcd_intr.c	modified	+23	−16	View file
drivers/usb/dwc2/hcd_queue.c	modified	+1	−1	View file
drivers/usb/dwc2/hw.h	modified	+0	−4	View file
drivers/usb/dwc2/platform.c	modified	+136	−22	View file
drivers/usb/dwc3/Kconfig	modified	+9	−8	View file
drivers/usb/dwc3/Makefile	modified	+1	−1	View file
drivers/usb/dwc3/core.c	modified	+5	−3	View file
drivers/usb/dwc3/core.h	modified	+3	−0	View file
drivers/usb/dwc3/dwc3-of-simple.c	added	+180	−0	View file
drivers/usb/dwc3/dwc3-qcom.c	deleted	+0	−130	View before deletion
drivers/usb/dwc3/ep0.c	modified	+7	−5	View file
drivers/usb/dwc3/gadget.c	modified	+89	−44	View file
drivers/usb/dwc3/trace.h	modified	+10	−1	View file
drivers/usb/gadget/Kconfig	modified	+6	−0	View file
drivers/usb/gadget/configfs.c	modified	+16	−13	View file
drivers/usb/gadget/function/f_midi.c	modified	+130	−62	View file
drivers/usb/gadget/function/f_sourcesink.c	modified	+110	−39	View file
drivers/usb/gadget/function/g_zero.h	modified	+6	−1	View file
drivers/usb/gadget/function/u_ether.c	modified	+4	−14	View file
drivers/usb/gadget/function/u_serial.c	modified	+258	−0	View file
drivers/usb/gadget/legacy/acm_ms.c	modified	+1	−1	View file
drivers/usb/gadget/legacy/audio.c	modified	+1	−1	View file
drivers/usb/gadget/legacy/cdc2.c	modified	+1	−1	View file
drivers/usb/gadget/legacy/ether.c	modified	+1	−1	View file
drivers/usb/gadget/legacy/g_ffs.c	modified	+1	−1	View file
drivers/usb/gadget/legacy/gmidi.c	modified	+2	−10	View file
drivers/usb/gadget/legacy/hid.c	modified	+1	−1	View file
drivers/usb/gadget/legacy/inode.c	modified	+1	−2	View file
drivers/usb/gadget/legacy/mass_storage.c	modified	+1	−1	View file
drivers/usb/gadget/legacy/multi.c	modified	+1	−1	View file
drivers/usb/gadget/legacy/ncm.c	modified	+1	−1	View file
drivers/usb/gadget/legacy/nokia.c	modified	+1	−1	View file
drivers/usb/gadget/legacy/printer.c	modified	+1	−1	View file
drivers/usb/gadget/legacy/serial.c	modified	+1	−1	View file
drivers/usb/gadget/legacy/tcm_usb_gadget.c	modified	+1	−1	View file
drivers/usb/gadget/legacy/webcam.c	modified	+1	−1	View file
drivers/usb/gadget/legacy/zero.c	modified	+13	−1	View file
drivers/usb/gadget/u_f.c	modified	+0	−1	View file
drivers/usb/gadget/u_f.h	modified	+8	−2	View file
drivers/usb/gadget/udc/Kconfig	modified	+11	−0	View file
drivers/usb/gadget/udc/Makefile	modified	+1	−0	View file
drivers/usb/gadget/udc/bcm63xx_udc.c	modified	+2	−5	View file
drivers/usb/gadget/udc/gr_udc.c	modified	+1	−2	View file
drivers/usb/gadget/udc/lpc32xx_udc.c	modified	+11	−24	View file
drivers/usb/gadget/udc/renesas_usb3.c	added	+1975	−0	View file
drivers/usb/gadget/udc/s3c-hsudc.c	modified	+1	−1	View file
drivers/usb/gadget/udc/udc-core.c	modified	+45	−34	View file
drivers/usb/host/Kconfig	modified	+9	−0	View file
drivers/usb/host/Makefile	modified	+4	−0	View file
drivers/usb/host/bcma-hcd.c	modified	+10	−11	View file
drivers/usb/host/ehci-dbg.c	modified	+11	−4	View file
drivers/usb/host/ehci-hcd.c	modified	+1	−1	View file
drivers/usb/host/ehci-mem.c	modified	+5	−13	View file
drivers/usb/host/ehci-msm.c	modified	+2	−2	View file
drivers/usb/host/ehci-q.c	modified	+7	−2	View file
drivers/usb/host/ehci.h	modified	+1	−0	View file
drivers/usb/host/fhci-tds.c	modified	+1	−1	View file
drivers/usb/host/ohci-hcd.c	modified	+2	−2	View file
drivers/usb/host/ohci-pxa27x.c	modified	+7	−7	View file
drivers/usb/host/oxu210hp-hcd.c	modified	+3	−5	View file
drivers/usb/host/pci-quirks.c	modified	+9	−16	View file
drivers/usb/host/u132-hcd.c	modified	+1	−1	View file
drivers/usb/host/uhci-q.c	modified	+1	−2	View file
drivers/usb/host/whci/qset.c	modified	+2	−3	View file
drivers/usb/host/xhci-ext-caps.h	modified	+28	−55	View file
drivers/usb/host/xhci-hub.c	modified	+1	−1	View file
drivers/usb/host/xhci-mem.c	modified	+30	−51	View file
drivers/usb/host/xhci-mtk-sch.c	added	+415	−0	View file
drivers/usb/host/xhci-mtk.c	added	+763	−0	View file
drivers/usb/host/xhci-mtk.h	added	+162	−0	View file
drivers/usb/host/xhci-pci.c	modified	+0	−1	View file
drivers/usb/host/xhci-plat.c	modified	+62	−26	View file
drivers/usb/host/xhci-plat.h	added	+39	−0	View file
drivers/usb/host/xhci-rcar.c	modified	+30	−14	View file
drivers/usb/host/xhci-rcar.h	modified	+3	−0	View file
drivers/usb/host/xhci-ring.c	modified	+11	−5	View file
drivers/usb/host/xhci.c	modified	+23	−2	View file
drivers/usb/host/xhci.h	modified	+4	−0	View file
drivers/usb/misc/usbtest.c	modified	+149	−84	View file
drivers/usb/mon/mon_bin.c	modified	+9	−8	View file
drivers/usb/mon/mon_main.c	modified	+1	−1	View file
drivers/usb/mon/mon_text.c	modified	+9	−6	View file
drivers/usb/musb/musb_core.c	modified	+38	−10	View file
drivers/usb/musb/musb_core.h	modified	+2	−0	View file
drivers/usb/musb/musb_gadget.c	modified	+2	−3	View file
drivers/usb/musb/omap2430.c	modified	+17	−13	View file
drivers/usb/phy/Kconfig	modified	+1	−13	View file
drivers/usb/phy/Makefile	modified	+0	−1	View file
drivers/usb/phy/phy-am335x-control.c	modified	+12	−4	View file
drivers/usb/phy/am35x-phy-control.h → drivers/usb/phy/phy-am335x-control.h	renamed	+5	−3	View file
drivers/usb/phy/phy-am335x.c	modified	+11	−6	View file
drivers/usb/phy/phy-rcar-usb.c	deleted	+0	−247	View before deletion
drivers/usb/phy/phy-twl6030-usb.c	modified	+15	−15	View file
drivers/usb/renesas_usbhs/common.c	modified	+43	−35	View file
drivers/usb/renesas_usbhs/mod_gadget.c	modified	+12	−7	View file
drivers/usb/renesas_usbhs/mod_host.c	modified	+6	−5	View file
drivers/usb/renesas_usbhs/pipe.c	modified	+26	−86	View file
drivers/usb/renesas_usbhs/pipe.h	modified	+0	−1	View file
drivers/usb/serial/Kconfig	modified	+16	−0	View file
drivers/usb/serial/Makefile	modified	+1	−0	View file
drivers/usb/serial/cp210x.c	modified	+163	−24	View file
drivers/usb/serial/io_edgeport.c	modified	+14	−21	View file
drivers/usb/serial/mos7840.c	modified	+1	−1	View file
drivers/usb/serial/mxu11x0.c	added	+986	−0	View file
drivers/usb/storage/uas.c	modified	+24	−24	View file
drivers/uwb/uwbd.c	modified	+0	−1	View file
include/linux/phy/omap_usb.h	modified	+23	−0	View file
include/linux/platform_data/usb-rcar-phy.h	deleted	+0	−28	View before deletion
include/linux/usb.h	modified	+4	−2	View file
include/linux/usb/gadget.h	modified	+9	−2	View file
include/linux/usb/hcd.h	modified	+2	−2	View file
include/linux/usb/musb-omap.h	deleted	+0	−30	View before deletion
include/linux/usb/musb.h	modified	+15	−0	View file
include/linux/usb/of.h	modified	+6	−0	View file
include/linux/usb/renesas_usbhs.h	modified	+16	−2	View file

Only the first 600 diff lines are shown. Download the complete patch.

Documentation/ABI/testing/configfs-usb-gadget-sourcesink

View file

diff --git a/Documentation/ABI/testing/configfs-usb-gadget-sourcesink b/Documentation/ABI/testing/configfs-usb-gadget-sourcesink
index bc7ff73..f56335a 100644
--- a/Documentation/ABI/testing/configfs-usb-gadget-sourcesink
+++ b/Documentation/ABI/testing/configfs-usb-gadget-sourcesink
@@ -10,3 +10,5 @@ Description:
 		isoc_mult	- 0..2 (hs/ss only)
 		isoc_maxburst	- 0..15 (ss only)
 		buflen		- buffer length
+		bulk_qlen	- depth of queue for bulk
+		iso_qlen	- depth of queue for iso

Documentation/ABI/testing/sysfs-bus-usb

View file

diff --git a/Documentation/ABI/testing/sysfs-bus-usb b/Documentation/ABI/testing/sysfs-bus-usb
index 3a4abfc..0bd731c 100644
--- a/Documentation/ABI/testing/sysfs-bus-usb
+++ b/Documentation/ABI/testing/sysfs-bus-usb
@@ -134,19 +134,21 @@ Description:
 		enabled for the device. Developer can write y/Y/1 or n/N/0 to
 		the file to enable/disable the feature.
 
-What:		/sys/bus/usb/devices/.../power/usb3_hardware_lpm
-Date:		June 2015
+What:		/sys/bus/usb/devices/.../power/usb3_hardware_lpm_u1
+		/sys/bus/usb/devices/.../power/usb3_hardware_lpm_u2
+Date:		November 2015
 Contact:	Kevin Strasser <[email protected]>
+		Lu Baolu <[email protected]>
 Description:
 		If CONFIG_PM is set and a USB 3.0 lpm-capable device is plugged
 		in to a xHCI host which supports link PM, it will check if U1
 		and U2 exit latencies have been set in the BOS descriptor; if
-		the check is is passed and the host supports USB3 hardware LPM,
+		the check is passed and the host supports USB3 hardware LPM,
 		USB3 hardware LPM will be enabled for the device and the USB
-		device directory will contain a file named
-		power/usb3_hardware_lpm. The file holds a string value (enable
-		or disable) indicating whether or not USB3 hardware LPM is
-		enabled for the device.
+		device directory will contain two files named
+		power/usb3_hardware_lpm_u1 and power/usb3_hardware_lpm_u2. These
+		files hold a string value (enable or disable) indicating whether
+		or not USB3 hardware LPM U1 or U2 is enabled for the device.
 
 What:		/sys/bus/usb/devices/.../removable
 Date:		February 2012
@@ -187,6 +189,17 @@ Description:
 		The file will read "hotplug", "wired" and "not used" if the
 		information is available, and "unknown" otherwise.
 
+What:		/sys/bus/usb/devices/.../(hub interface)/portX/usb3_lpm_permit
+Date:		November 2015
+Contact:	Lu Baolu <[email protected]>
+Description:
+		Some USB3.0 devices are not friendly to USB3 LPM.  usb3_lpm_permit
+		attribute allows enabling/disabling usb3 lpm of a port. It takes
+		effect both before and after a usb device is enumerated. Supported
+		values are "0" if both u1 and u2 are NOT permitted, "u1" if only u1
+		is permitted, "u2" if only u2 is permitted, "u1_u2" if both u1 and
+		u2 are permitted.
+
 What:		/sys/bus/usb/devices/.../power/usb2_lpm_l1_timeout
 Date:		May 2013
 Contact:	Mathias Nyman <[email protected]>

Documentation/devicetree/bindings/phy/brcm,brcmstb-sata-phy.txt

View file

diff --git a/Documentation/devicetree/bindings/phy/brcm,brcmstb-sata-phy.txt b/Documentation/devicetree/bindings/phy/brcm,brcmstb-sata-phy.txt
index 7f81ef9..d87ab7c 100644
--- a/Documentation/devicetree/bindings/phy/brcm,brcmstb-sata-phy.txt
+++ b/Documentation/devicetree/bindings/phy/brcm,brcmstb-sata-phy.txt
@@ -2,6 +2,7 @@
 
 Required properties:
 - compatible: should be one or more of
+     "brcm,bcm7425-sata-phy"
      "brcm,bcm7445-sata-phy"
      "brcm,phy-sata3"
 - address-cells: should be 1

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

View file

diff --git a/Documentation/devicetree/bindings/phy/phy-hi6220-usb.txt b/Documentation/devicetree/bindings/phy/phy-hi6220-usb.txt
new file mode 100644
index 0000000..f17a56e
--- /dev/null
+++ b/Documentation/devicetree/bindings/phy/phy-hi6220-usb.txt
@@ -0,0 +1,16 @@
+Hisilicon hi6220 usb PHY
+-----------------------
+
+Required properties:
+- compatible: should be "hisilicon,hi6220-usb-phy"
+- #phy-cells: must be 0
+- hisilicon,peripheral-syscon: phandle of syscon used to control phy.
+Refer to phy/phy-bindings.txt for the generic PHY binding properties
+
+Example:
+	usb_phy: usbphy {
+		compatible = "hisilicon,hi6220-usb-phy";
+		#phy-cells = <0>;
+		phy-supply = <&fixed_5v_hub>;
+		hisilicon,peripheral-syscon = <&sys_ctrl>;
+	};

Documentation/devicetree/bindings/phy/rcar-gen3-phy-usb2.txt

View file

diff --git a/Documentation/devicetree/bindings/phy/rcar-gen3-phy-usb2.txt b/Documentation/devicetree/bindings/phy/rcar-gen3-phy-usb2.txt
new file mode 100644
index 0000000..2390e4e
--- /dev/null
+++ b/Documentation/devicetree/bindings/phy/rcar-gen3-phy-usb2.txt
@@ -0,0 +1,39 @@
+* Renesas R-Car generation 3 USB 2.0 PHY
+
+This file provides information on what the device node for the R-Car generation
+3 USB 2.0 PHY contains.
+
+Required properties:
+- compatible: "renesas,usb2-phy-r8a7795" if the device is a part of an R8A7795
+	      SoC.
+- reg: offset and length of the partial USB 2.0 Host register block.
+- reg-names: must be "usb2_host".
+- clocks: clock phandle and specifier pair(s).
+- #phy-cells: see phy-bindings.txt in the same directory, must be <0>.
+
+Optional properties:
+To use a USB channel where USB 2.0 Host and HSUSB (USB 2.0 Peripheral) are
+combined, the device tree node should set HSUSB properties to reg and reg-names
+properties. This is because HSUSB has registers to select USB 2.0 host or
+peripheral at that channel:
+- reg: offset and length of the partial HSUSB register block.
+- reg-names: must be "hsusb".
+- interrupts: interrupt specifier for the PHY.
+
+Example (R-Car H3):
+
+	usb-phy@ee080200 {
+		compatible = "renesas,usb2-phy-r8a7795";
+		reg = <0 0xee080200 0 0x700>, <0 0xe6590100 0 0x100>;
+		reg-names = "usb2_host", "hsusb";
+		interrupts = <GIC_SPI 108 IRQ_TYPE_LEVEL_HIGH>;
+		clocks = <&mstp7_clks R8A7795_CLK_EHCI0>,
+			 <&mstp7_clks R8A7795_CLK_HSUSB>;
+	};
+
+	usb-phy@ee0a0200 {
+		compatible = "renesas,usb2-phy-r8a7795";
+		reg = <0 0xee0a0200 0 0x700>;
+		reg-names = "usb2_host";
+		clocks = <&mstp7_clks R8A7795_CLK_EHCI0>;
+	};

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

View file

diff --git a/Documentation/devicetree/bindings/phy/rockchip-usb-phy.txt b/Documentation/devicetree/bindings/phy/rockchip-usb-phy.txt
index 826454a..68498d5 100644
--- a/Documentation/devicetree/bindings/phy/rockchip-usb-phy.txt
+++ b/Documentation/devicetree/bindings/phy/rockchip-usb-phy.txt
@@ -1,7 +1,10 @@
 ROCKCHIP USB2 PHY
 
 Required properties:
- - compatible: rockchip,rk3288-usb-phy
+ - compatible: matching the soc type, one of
+     "rockchip,rk3066a-usb-phy"
+     "rockchip,rk3188-usb-phy"
+     "rockchip,rk3288-usb-phy"
  - rockchip,grf : phandle to the syscon managing the "general
    register files"
  - #address-cells: should be 1
@@ -21,6 +24,7 @@ required properties:
 Optional Properties:
 - clocks : phandle + clock specifier for the phy clocks
 - clock-names: string, clock name, must be "phyclk"
+- #clock-cells: for users of the phy-pll, should be 0
 
 Example:
 

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

View file

diff --git a/Documentation/devicetree/bindings/phy/sun4i-usb-phy.txt b/Documentation/devicetree/bindings/phy/sun4i-usb-phy.txt
index 0cebf74..95736d7 100644
--- a/Documentation/devicetree/bindings/phy/sun4i-usb-phy.txt
+++ b/Documentation/devicetree/bindings/phy/sun4i-usb-phy.txt
@@ -9,6 +9,7 @@ Required properties:
   * allwinner,sun7i-a20-usb-phy
   * allwinner,sun8i-a23-usb-phy
   * allwinner,sun8i-a33-usb-phy
+  * allwinner,sun8i-h3-usb-phy
 - reg : a list of offset + length pairs
 - reg-names :
   * "phy_ctrl"

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

View file

diff --git a/Documentation/devicetree/bindings/phy/ti-phy.txt b/Documentation/devicetree/bindings/phy/ti-phy.txt
index 9cf9446..a3b3945 100644
--- a/Documentation/devicetree/bindings/phy/ti-phy.txt
+++ b/Documentation/devicetree/bindings/phy/ti-phy.txt
@@ -31,6 +31,8 @@ OMAP USB2 PHY
 
 Required properties:
  - compatible: Should be "ti,omap-usb2"
+	       Should be "ti,dra7x-usb2-phy2" for the 2nd instance of USB2 PHY
+	       in DRA7x
  - reg : Address and length of the register set for the device.
  - #phy-cells: determine the number of cells that should be given in the
    phandle while referencing this phy.
@@ -40,10 +42,14 @@ Required properties:
    * "wkupclk" - wakeup clock.
    * "refclk" - reference clock (optional).
 
-Optional properties:
+Deprecated properties:
  - ctrl-module : phandle of the control module used by PHY driver to power on
    the PHY.
 
+Recommended properies:
+- syscon-phy-power : phandle/offset pair. Phandle to the system control
+  module and the register offset to power on/off the PHY.
+
 This is usually a subnode of ocp2scp to which it is connected.
 
 usb2phy@4a0ad080 {
@@ -77,14 +83,22 @@ Required properties:
    * "div-clk" - apll clock
 
 Optional properties:
- - ctrl-module : phandle of the control module used by PHY driver to power on
-   the PHY.
  - id: If there are multiple instance of the same type, in order to
    differentiate between each instance "id" can be used (e.g., multi-lane PCIe
    PHY). If "id" is not provided, it is set to default value of '1'.
  - syscon-pllreset: Handle to system control region that contains the
    CTRL_CORE_SMA_SW_0 register and register offset to the CTRL_CORE_SMA_SW_0
    register that contains the SATA_PLL_SOFT_RESET bit. Only valid for sata_phy.
+ - syscon-pcs : phandle/offset pair. Phandle to the system control module and the
+   register offset to write the PCS delay value.
+
+Deprecated properties:
+ - ctrl-module : phandle of the control module used by PHY driver to power on
+   the PHY.
+
+Recommended properies:
+ - syscon-phy-power : phandle/offset pair. Phandle to the system control
+   module and the register offset to power on/off the PHY.
 
 This is usually a subnode of ocp2scp to which it is connected.
 

Documentation/devicetree/bindings/usb/dwc2.txt

View file

diff --git a/Documentation/devicetree/bindings/usb/dwc2.txt b/Documentation/devicetree/bindings/usb/dwc2.txt
index fd132cb..2213682 100644
--- a/Documentation/devicetree/bindings/usb/dwc2.txt
+++ b/Documentation/devicetree/bindings/usb/dwc2.txt
@@ -4,6 +4,7 @@ Platform DesignWare HS OTG USB 2.0 controller
 Required properties:
 - compatible : One of:
   - brcm,bcm2835-usb: The DWC2 USB controller instance in the BCM2835 SoC.
+  - hisilicon,hi6220-usb: The DWC2 USB controller instance in the hi6220 SoC.
   - rockchip,rk3066-usb: The DWC2 USB controller instance in the rk3066 Soc;
   - "rockchip,rk3188-usb", "rockchip,rk3066-usb", "snps,dwc2": for rk3188 Soc;
   - "rockchip,rk3288-usb", "rockchip,rk3066-usb", "snps,dwc2": for rk3288 Soc;

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

View file

diff --git a/Documentation/devicetree/bindings/usb/dwc3-xilinx.txt b/Documentation/devicetree/bindings/usb/dwc3-xilinx.txt
new file mode 100644
index 0000000..30361b3
--- /dev/null
+++ b/Documentation/devicetree/bindings/usb/dwc3-xilinx.txt
@@ -0,0 +1,33 @@
+Xilinx SuperSpeed DWC3 USB SoC controller
+
+Required properties:
+- compatible:	Should contain "xlnx,zynqmp-dwc3"
+- clocks:	A list of phandles for the clocks listed in clock-names
+- clock-names:	Should contain the following:
+  "bus_clk"	 Master/Core clock, have to be >= 125 MHz for SS
+		 operation and >= 60MHz for HS operation
+
+  "ref_clk"	 Clock source to core during PHY power down
+
+Required child node:
+A child node must exist to represent the core DWC3 IP block. The name of
+the node is not important. The content of the node is defined in dwc3.txt.
+
+Example device node:
+
+		usb@0 {
+			#address-cells = <0x2>;
+			#size-cells = <0x1>;
+			status = "okay";
+			compatible = "xlnx,zynqmp-dwc3";
+			clock-names = "bus_clk" "ref_clk";
+			clocks = <&clk125>, <&clk125>;
+			ranges;
+
+			dwc3@fe200000 {
+				compatible = "snps,dwc3";
+				reg = <0x0 0xfe200000 0x40000>;
+				interrupts = <0x0 0x41 0x4>;
+				dr_mode = "host";
+			};
+		};

Documentation/devicetree/bindings/usb/mt8173-xhci.txt

View file

diff --git a/Documentation/devicetree/bindings/usb/mt8173-xhci.txt b/Documentation/devicetree/bindings/usb/mt8173-xhci.txt
new file mode 100644
index 0000000..b3a7ffa
--- /dev/null
+++ b/Documentation/devicetree/bindings/usb/mt8173-xhci.txt
@@ -0,0 +1,51 @@
+MT8173 xHCI
+
+The device node for Mediatek SOC USB3.0 host controller
+
+Required properties:
+ - compatible : should contain "mediatek,mt8173-xhci"
+ - reg : specifies physical base address and size of the registers,
+	the first one for MAC, the second for IPPC
+ - interrupts : interrupt used by the controller
+ - power-domains : a phandle to USB power domain node to control USB's
+	mtcmos
+ - 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": for clock of xHCI MAC
+	"wakeup_deb_p0": for USB wakeup debounce clock of port0
+	"wakeup_deb_p1": for USB wakeup debounce clock of port1
+
+ - phys : a list of phandle + phy specifier pairs
+
+Optional properties:
+ - mediatek,wakeup-src : 1: ip sleep wakeup mode; 2: line state wakeup
+	mode;
+ - mediatek,syscon-wakeup : phandle to syscon used to access USB wakeup
+	control register, it depends on "mediatek,wakeup-src".
+ - vbus-supply : reference to the VBUS regulator;
+ - usb3-lpm-capable : supports USB3.0 LPM
+
+Example:
+usb30: usb@11270000 {
+	compatible = "mediatek,mt8173-xhci";
+	reg = <0 0x11270000 0 0x1000>,
+	      <0 0x11280700 0 0x0100>;
+	interrupts = <GIC_SPI 115 IRQ_TYPE_LEVEL_LOW>;
+	power-domains = <&scpsys MT8173_POWER_DOMAIN_USB>;
+	clocks = <&topckgen CLK_TOP_USB30_SEL>,
+		 <&pericfg CLK_PERI_USB0>,
+		 <&pericfg CLK_PERI_USB1>;
+	clock-names = "sys_ck",
+		      "wakeup_deb_p0",
+		      "wakeup_deb_p1";
+	phys = <&phy_port0 PHY_TYPE_USB3>,
+	       <&phy_port1 PHY_TYPE_USB2>;
+	vusb33-supply = <&mt6397_vusb_reg>;
+	vbus-supply = <&usb_p1_vbus>;
+	usb3-lpm-capable;
+	mediatek,syscon-wakeup = <&pericfg>;
+	mediatek,wakeup-src = <1>;
+};

Documentation/devicetree/bindings/usb/renesas_usb3.txt

View file

diff --git a/Documentation/devicetree/bindings/usb/renesas_usb3.txt b/Documentation/devicetree/bindings/usb/renesas_usb3.txt
new file mode 100644
index 0000000..8d52766
--- /dev/null
+++ b/Documentation/devicetree/bindings/usb/renesas_usb3.txt
@@ -0,0 +1,23 @@
+Renesas Electronics USB3.0 Peripheral driver
+
+Required properties:
+  - compatible: Must contain one of the following:
+	- "renesas,r8a7795-usb3-peri"
+  - reg: Base address and length of the register for the USB3.0 Peripheral
+  - interrupts: Interrupt specifier for the USB3.0 Peripheral
+  - clocks: clock phandle and specifier pair
+
+Example:
+	usb3_peri0: usb@ee020000 {
+		compatible = "renesas,r8a7795-usb3-peri";
+		reg = <0 0xee020000 0 0x400>;
+		interrupts = <GIC_SPI 104 IRQ_TYPE_LEVEL_HIGH>;
+		clocks = <&cpg CPG_MOD 328>;
+	};
+
+	usb3_peri1: usb@ee060000 {
+		compatible = "renesas,r8a7795-usb3-peri";
+		reg = <0 0xee060000 0 0x400>;
+		interrupts = <GIC_SPI 100 IRQ_TYPE_LEVEL_HIGH>;
+		clocks = <&cpg CPG_MOD 327>;
+	};

Documentation/devicetree/bindings/usb/renesas_usbhs.txt

View file

diff --git a/Documentation/devicetree/bindings/usb/renesas_usbhs.txt b/Documentation/devicetree/bindings/usb/renesas_usbhs.txt
index 7d48f63..b604056 100644
--- a/Documentation/devicetree/bindings/usb/renesas_usbhs.txt
+++ b/Documentation/devicetree/bindings/usb/renesas_usbhs.txt
@@ -1,11 +1,21 @@
 Renesas Electronics USBHS driver
 
 Required properties:
-  - compatible: Must contain one of the following:
-	- "renesas,usbhs-r8a7790"
-	- "renesas,usbhs-r8a7791"
-	- "renesas,usbhs-r8a7794"
-	- "renesas,usbhs-r8a7795"
+  - compatible: Must contain one or more of the following:
+
+	- "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
+	- "renesas,usbhs-r8a7793" for r8a7793 (R-Car M2-N) compatible device
+	- "renesas,usbhs-r8a7794" for r8a7794 (R-Car E2) compatible device
+	- "renesas,usbhs-r8a7795" for r8a7795 (R-Car H3) compatible device
+	- "renesas,rcar-gen2-usbhs" for R-Car Gen2 compatible device
+	- "renesas,rcar-gen3-usbhs" for R-Car Gen3 compatible device
+
+	When compatible with the generic version, nodes must list the
+	SoC-specific version corresponding to the platform first followed
+	by the generic version.
+
   - reg: Base address and length of the register for the USBHS
   - interrupts: Interrupt specifier for the USBHS
   - clocks: A list of phandle + clock specifier pairs
@@ -22,7 +32,7 @@ Optional properties:
 
 Example:
 	usbhs: usb@e6590000 {
-		compatible = "renesas,usbhs-r8a7790";
+		compatible = "renesas,usbhs-r8a7790", "renesas,rcar-gen2-usbhs";
 		reg = <0 0xe6590000 0 0x100>;
 		interrupts = <0 107 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&mstp7_clks R8A7790_CLK_HSUSB>;

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

View file

diff --git a/Documentation/devicetree/bindings/usb/usb-xhci.txt b/Documentation/devicetree/bindings/usb/usb-xhci.txt
index 86f67f0..0825732 100644
--- a/Documentation/devicetree/bindings/usb/usb-xhci.txt
+++ b/Documentation/devicetree/bindings/usb/usb-xhci.txt
@@ -3,8 +3,8 @@ USB xHCI controllers
 Required properties:
   - compatible: should be one of "generic-xhci",
     "marvell,armada-375-xhci", "marvell,armada-380-xhci",
-    "renesas,xhci-r8a7790", "renesas,xhci-r8a7791" (deprecated:
-    "xhci-platform").
+    "renesas,xhci-r8a7790", "renesas,xhci-r8a7791", "renesas,xhci-r8a7793",
+    "renesas,xhci-r8a7795" (deprecated: "xhci-platform").
   - reg: should contain address and length of the standard XHCI
     register set for the device.
   - interrupts: one XHCI interrupt should be described here.

Documentation/kernel-parameters.txt

View file

diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index 1a8169b..8b9fc65 100644
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -2584,8 +2584,6 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
 
 	notsc		[BUGS=X86-32] Disable Time Stamp Counter
 
-	nousb		[USB] Disable the USB subsystem
-
 	nowatchdog	[KNL] Disable both lockup detectors, i.e.
                         soft-lockup and NMI watchdog (hard-lockup).
 
@@ -3900,6 +3898,10 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
 	usbcore.usbfs_snoop=
 			[USB] Set to log all usbfs traffic (default 0 = off).
 
+	usbcore.usbfs_snoop_max=
+			[USB] Maximum number of bytes to snoop in each URB
+			(default = 65536).
+
 	usbcore.blinkenlights=
 			[USB] Set to cycle leds on hubs (default 0 = off).
 
@@ -3920,6 +3922,8 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
                         USB_REQ_GET_DESCRIPTOR request in milliseconds
 			(default 5000 = 5.0 seconds).
 
+	usbcore.nousb	[USB] Disable the USB subsystem
+
 	usbhid.mousepoll=
 			[USBHID] The interval which mice are to be polled at.
 

Documentation/usb/chipidea.txt

View file

diff --git a/Documentation/usb/chipidea.txt b/Documentation/usb/chipidea.txt
index 3f848c1..05f735a 100644
--- a/Documentation/usb/chipidea.txt
+++ b/Documentation/usb/chipidea.txt
@@ -7,8 +7,8 @@ with 2 Freescale i.MX6Q sabre SD boards.
 ---------------------------------------
 Select CONFIG_USB_OTG_FSM, rebuild kernel Image and modules.
 If you want to check some internal variables for otg fsm,
-select CONFIG_USB_CHIPIDEA_DEBUG, there are 2 files which
-can show otg fsm variables and some controller registers value:
+mount debugfs, there are 2 files which can show otg fsm
+variables and some controller registers value:
 cat /sys/kernel/debug/ci_hdrc.0/otg
 cat /sys/kernel/debug/ci_hdrc.0/registers
 

Documentation/usb/gadget-testing.txt

View file

diff --git a/Documentation/usb/gadget-testing.txt b/Documentation/usb/gadget-testing.txt
index b24d3ef..5819605 100644
--- a/Documentation/usb/gadget-testing.txt
+++ b/Documentation/usb/gadget-testing.txt
@@ -434,7 +434,7 @@ On host: serialc -v <vendorID> -p <productID> -i<interface#> -a1 -s1024 \
 
 where seriald and serialc are Felipe's utilities found here:
 
-https://git.gitorious.org/usb/usb-tools.git master
+https://github.com/felipebalbi/usb-tools.git master
 
 12. PHONET function
 ===================
@@ -579,6 +579,8 @@ The SOURCESINK function provides these attributes in its function directory:
 	isoc_mult	- 0..2 (hs/ss only)
 	isoc_maxburst	- 0..15 (ss only)
 	bulk_buflen	- buffer length
+	bulk_qlen	- depth of queue for bulk
+	iso_qlen	- depth of queue for iso
 
 Testing the SOURCESINK function
 -------------------------------

Documentation/usb/power-management.txt

View file

diff --git a/Documentation/usb/power-management.txt b/Documentation/usb/power-management.txt
index 4a15c90..0a94ffe 100644
--- a/Documentation/usb/power-management.txt
+++ b/Documentation/usb/power-management.txt
@@ -537,17 +537,18 @@ relevant attribute files are usb2_hardware_lpm and usb3_hardware_lpm.
 		can write y/Y/1 or n/N/0 to the file to	enable/disable
 		USB2 hardware LPM manually. This is for	test purpose mainly.
 
-	power/usb3_hardware_lpm
+	power/usb3_hardware_lpm_u1
+	power/usb3_hardware_lpm_u2
 
 		When a USB 3.0 lpm-capable device is plugged in to a
 		xHCI host which supports link PM, it will check if U1
 		and U2 exit latencies have been set in the BOS
 		descriptor; if the check is is passed and the host
 		supports USB3 hardware LPM, USB3 hardware LPM will be
-		enabled for the device and this file will be created.
-		The file holds a string value (enable or disable)
-		indicating whether or not USB3 hardware LPM is
-		enabled for the device.
+		enabled for the device and these files will be created.
+		The files hold a string value (enable or disable)
+		indicating whether or not USB3 hardware LPM U1 or U2
+		is enabled for the device.
 
 	USB Port Power Control
 	----------------------

MAINTAINERS

View file

diff --git a/MAINTAINERS b/MAINTAINERS
index ded9640..795846f 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2767,7 +2767,7 @@ S:	Maintained
 F:	Documentation/zh_CN/
 
 CHIPIDEA USB HIGH SPEED DUAL ROLE CONTROLLER
-M:	Peter Chen <[email protected]>
+M:	Peter Chen <[email protected]>
 T:	git git://git.kernel.org/pub/scm/linux/kernel/git/peter.chen/usb.git
 L:	[email protected]
 S:	Maintained
@@ -8992,6 +8992,12 @@ L:	[email protected]
 F:	drivers/net/ethernet/renesas/
 F:	include/linux/sh_eth.h
 
+RENESAS USB2 PHY DRIVER
+M:	Yoshihiro Shimoda <[email protected]>
+L:	[email protected]
+S:	Maintained
+F:	drivers/phy/phy-rcar-gen3-usb2.c
+
 RESET CONTROLLER FRAMEWORK
 M:	Philipp Zabel <[email protected]>
 S:	Maintained
@@ -11188,7 +11194,7 @@ F:	Documentation/usb/ohci.txt
 F:	drivers/usb/host/ohci*
 
 USB OTG FSM (Finite State Machine)
-M:	Peter Chen <[email protected]>
+M:	Peter Chen <[email protected]>
 T:	git git://git.kernel.org/pub/scm/linux/kernel/git/peter.chen/usb.git
 L:	[email protected]
 S:	Maintained

arch/arm64/boot/dts/mediatek/mt8173-evb.dts

View file

diff --git a/arch/arm64/boot/dts/mediatek/mt8173-evb.dts b/arch/arm64/boot/dts/mediatek/mt8173-evb.dts
index 811cb76..9b1482a 100644
--- a/arch/arm64/boot/dts/mediatek/mt8173-evb.dts
+++ b/arch/arm64/boot/dts/mediatek/mt8173-evb.dts
@@ -13,6 +13,7 @@
  */
 
 /dts-v1/;
+#include <dt-bindings/gpio/gpio.h>
 #include "mt8173.dtsi"
 
 / {
@@ -32,6 +33,15 @@
 	};
 
 	chosen { };
+
+	usb_p1_vbus: regulator@0 {
+		compatible = "regulator-fixed";
+		regulator-name = "usb_vbus";
+		regulator-min-microvolt = <5000000>;
+		regulator-max-microvolt = <5000000>;
+		gpio = <&pio 130 GPIO_ACTIVE_HIGH>;
+		enable-active-high;
+	};
 };
 
 &i2c1 {
@@ -408,3 +418,9 @@
 &uart0 {
 	status = "okay";
 };
+
+&usb30 {
+	vusb33-supply = <&mt6397_vusb_reg>;
+	vbus-supply = <&usb_p1_vbus>;
+	mediatek,wakeup-src = <1>;
+};

arch/arm64/boot/dts/mediatek/mt8173.dtsi

View file

diff --git a/arch/arm64/boot/dts/mediatek/mt8173.dtsi b/arch/arm64/boot/dts/mediatek/mt8173.dtsi
index 4dd5f93..c1fd275 100644
--- a/arch/arm64/boot/dts/mediatek/mt8173.dtsi
+++ b/arch/arm64/boot/dts/mediatek/mt8173.dtsi
@@ -14,6 +14,7 @@
 #include <dt-bindings/clock/mt8173-clk.h>
 #include <dt-bindings/interrupt-controller/irq.h>

This diff is incomplete. Download the complete patch.