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

f90d6448 · Linus Torvalds <[email protected]> · 2019-03-06 16:48:27 -08:00

Pull USB/PHY updates from Greg KH:
 "Here is the big USB/PHY driver pull request for 5.1-rc1.

  The usual set of gadget driver updates, phy driver updates, xhci
  updates, and typec additions. Also included in here are a lot of small
  cleanups and fixes and driver updates where needed.

  All of these have been in linux-next for a while with no reported
  issues"

* tag 'usb-5.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb: (167 commits)
  wusb: Remove unnecessary static function ckhdid_printf
  usb: core: make default autosuspend delay configurable
  usb: core: Fix typo in description of "authorized_default"
  usb: chipidea: Refactor USB PHY selection and keep a single PHY
  usb: chipidea: Grab the (legacy) USB PHY by phandle first
  usb: chipidea: imx: set power polarity
  dt-bindings: usb: ci-hdrc-usb2: add property power-active-high
  usb: chipidea: imx: remove unused header files
  usb: chipidea: tegra: Fix missed ci_hdrc_remove_device()
  usb: core: add option of only authorizing internal devices
  usb: typec: tps6598x: handle block writes separately with plain-I2C adapters
  usb: xhci: Fix for Enabling USB ROLE SWITCH QUIRK on INTEL_SUNRISEPOINT_LP_XHCI
  usb: xhci: fix build warning - missing prototype
  usb: xhci: dbc: Fixing typo error.
  usb: xhci: remove unused member 'parent' in xhci_regset struct
  xhci: tegra: Prevent error pointer dereference
  USB: serial: option: add Telit ME910 ECM composition
  usb: core: Replace hardcoded check with inline function from usb.h
  usb: core: skip interfaces disabled in devicetree
  usb: typec: mux: remove redundant check on variable match
  ...

Commit: f90d64483ebd394958841f67f8794ab203b319a7
Parents: 67e79a6d · 1c7cf3d5

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

Changes

203 files changed · +2951 −1110

File	Status	Add	Del	Content
Documentation/ABI/testing/sysfs-bus-usb	modified	+1	−1	View file
Documentation/admin-guide/kernel-parameters.txt	modified	+2	−1	View file
Documentation/devicetree/bindings/arm/atmel-sysregs.txt	modified	+1	−0	View file
Documentation/devicetree/bindings/display/bridge/cdns,dsi.txt	modified	+0	−21	View file
Documentation/devicetree/bindings/phy/cdns,dphy.txt	added	+20	−0	View file
Documentation/devicetree/bindings/phy/phy-mvebu-comphy.txt	modified	+53	−12	View file
Documentation/devicetree/bindings/phy/phy-mvebu-utmi.txt	added	+38	−0	View file
Documentation/devicetree/bindings/phy/phy-rockchip-inno-usb2.txt	modified	+2	−0	View file
Documentation/devicetree/bindings/phy/qcom-qmp-phy.txt	modified	+9	−0	View file
Documentation/devicetree/bindings/phy/qcom-qusb2-phy.txt	modified	+1	−0	View file
Documentation/devicetree/bindings/phy/rcar-gen3-phy-usb2.txt	modified	+2	−0	View file
Documentation/devicetree/bindings/phy/ti-phy.txt	modified	+1	−0	View file
Documentation/devicetree/bindings/usb/ci-hdrc-usb2.txt	modified	+1	−0	View file
Documentation/devicetree/bindings/usb/ingenic,jz4740-musb.txt	added	+24	−0	View file
Documentation/devicetree/bindings/usb/keystone-usb.txt	modified	+4	−2	View file
Documentation/devicetree/bindings/usb/qcom,dwc3.txt	modified	+1	−0	View file
Documentation/devicetree/bindings/usb/renesas_usb3.txt	modified	+1	−0	View file
Documentation/devicetree/bindings/usb/renesas_usbhs.txt	modified	+1	−0	View file
Documentation/devicetree/bindings/usb/usb251xb.txt	modified	+4	−0	View file
Documentation/usb/authorization.txt	modified	+3	−1	View file
MAINTAINERS	modified	+8	−0	View file
drivers/base/devcon.c	modified	+59	−3	View file
drivers/phy/broadcom/phy-bcm-sr-pcie.c	modified	+2	−2	View file
drivers/phy/cadence/Kconfig	modified	+12	−1	View file
drivers/phy/cadence/Makefile	modified	+1	−0	View file
drivers/phy/cadence/cdns-dphy.c	added	+391	−0	View file
drivers/phy/freescale/Kconfig	modified	+1	−1	View file
drivers/phy/marvell/Kconfig	modified	+21	−0	View file
drivers/phy/marvell/Makefile	modified	+2	−0	View file
drivers/phy/marvell/phy-armada375-usb2.c	modified	+2	−11	View file
drivers/phy/marvell/phy-mvebu-a3700-comphy.c	added	+318	−0	View file
drivers/phy/marvell/phy-mvebu-a3700-utmi.c	added	+278	−0	View file
drivers/phy/marvell/phy-mvebu-cp110-comphy.c	modified	+0	−2	View file
drivers/phy/marvell/phy-mvebu-sata.c	modified	+2	−7	View file
drivers/phy/phy-core-mipi-dphy.c	modified	+4	−4	View file
drivers/phy/phy-core.c	modified	+1	−11	View file
drivers/phy/qualcomm/phy-qcom-qmp.c	modified	+143	−0	View file
drivers/phy/qualcomm/phy-qcom-qmp.h	modified	+4	−0	View file
drivers/phy/qualcomm/phy-qcom-qusb2.c	modified	+40	−0	View file
drivers/phy/qualcomm/phy-qcom-ufs-i.h	modified	+1	−18	View file
drivers/phy/rockchip/phy-rockchip-inno-usb2.c	modified	+20	−28	View file
drivers/phy/ti/Kconfig	modified	+2	−4	View file
drivers/phy/ti/phy-omap-usb2.c	modified	+64	−41	View file
drivers/platform/x86/intel_cht_int33fe.c	modified	+6	−9	View file
drivers/usb/Kconfig	modified	+1	−0	View file
drivers/usb/README	deleted	+0	−54	View before deletion
drivers/usb/atm/Kconfig	modified	+1	−0	View file
drivers/usb/chipidea/Kconfig	modified	+2	−0	View file
drivers/usb/chipidea/ci_hdrc_imx.c	modified	+2	−4	View file
drivers/usb/chipidea/ci_hdrc_imx.h	modified	+1	−0	View file
drivers/usb/chipidea/ci_hdrc_tegra.c	modified	+1	−0	View file
drivers/usb/chipidea/core.c	modified	+34	−12	View file
drivers/usb/chipidea/usbmisc_imx.c	modified	+7	−0	View file
drivers/usb/class/Kconfig	modified	+1	−0	View file
drivers/usb/class/cdc-wdm.c	modified	+1	−1	View file
drivers/usb/core/Kconfig	modified	+13	−0	View file
drivers/usb/core/config.c	modified	+5	−9	View file
drivers/usb/core/devio.c	modified	+4	−6	View file
drivers/usb/core/driver.c	modified	+19	−4	View file
drivers/usb/core/generic.c	modified	+25	−19	View file
drivers/usb/core/hcd.c	modified	+36	−20	View file
drivers/usb/core/hub.c	modified	+50	−16	View file
drivers/usb/core/hub.h	modified	+2	−0	View file
drivers/usb/core/message.c	modified	+8	−2	View file
drivers/usb/core/phy.c	modified	+28	−0	View file
drivers/usb/core/phy.h	modified	+2	−0	View file
drivers/usb/core/sysfs.c	modified	+4	−1	View file
drivers/usb/core/urb.c	modified	+2	−3	View file
drivers/usb/core/usb.c	modified	+28	−9	View file
drivers/usb/core/usb.h	modified	+8	−2	View file
drivers/usb/dwc2/Kconfig	modified	+2	−0	View file
drivers/usb/dwc2/gadget.c	modified	+78	−36	View file
drivers/usb/dwc2/hcd.c	modified	+1	−3	View file
drivers/usb/dwc3/Kconfig	modified	+5	−3	View file
drivers/usb/dwc3/core.h	modified	+9	−3	View file
drivers/usb/dwc3/debug.h	modified	+85	−71	View file
drivers/usb/dwc3/drd.c	modified	+7	−2	View file
drivers/usb/dwc3/dwc3-haps.c	modified	+9	−0	View file
drivers/usb/dwc3/dwc3-keystone.c	modified	+10	−1	View file
drivers/usb/dwc3/dwc3-qcom.c	modified	+1	−0	View file
drivers/usb/dwc3/gadget.c	modified	+34	−31	View file
drivers/usb/dwc3/gadget.h	modified	+2	−2	View file
drivers/usb/dwc3/trace.h	modified	+5	−5	View file
drivers/usb/gadget/Kconfig	modified	+1	−0	View file
drivers/usb/gadget/epautoconf.c	modified	+24	−17	View file
drivers/usb/gadget/function/f_fs.c	modified	+12	−0	View file
drivers/usb/gadget/function/f_uac1.c	modified	+6	−4	View file
drivers/usb/gadget/function/u_ecm.h	modified	+1	−1	View file
drivers/usb/gadget/function/u_eem.h	modified	+1	−1	View file
drivers/usb/gadget/function/u_ether_configfs.h	modified	+1	−1	View file
drivers/usb/gadget/function/u_fs.h	modified	+1	−1	View file
drivers/usb/gadget/function/u_gether.h	modified	+1	−1	View file
drivers/usb/gadget/function/u_hid.h	modified	+1	−1	View file
drivers/usb/gadget/function/u_midi.h	modified	+1	−1	View file
drivers/usb/gadget/function/u_ncm.h	modified	+1	−1	View file
drivers/usb/gadget/function/u_printer.h	modified	+1	−1	View file
drivers/usb/gadget/function/u_rndis.h	modified	+1	−1	View file
drivers/usb/gadget/function/u_serial.c	modified	+14	−21	View file
drivers/usb/gadget/function/u_uac2.h	modified	+1	−1	View file
drivers/usb/gadget/function/u_uvc.h	modified	+1	−1	View file
drivers/usb/gadget/function/uvc.h	modified	+2	−0	View file
drivers/usb/gadget/function/uvc_configfs.c	modified	+1	−9	View file
drivers/usb/gadget/function/uvc_configfs.h	modified	+1	−1	View file
drivers/usb/gadget/function/uvc_v4l2.h	modified	+1	−1	View file
drivers/usb/gadget/function/uvc_video.h	modified	+1	−1	View file
drivers/usb/gadget/legacy/Kconfig	modified	+1	−0	View file
drivers/usb/gadget/legacy/inode.c	modified	+20	−20	View file
drivers/usb/gadget/u_f.c	modified	+1	−1	View file
drivers/usb/gadget/u_f.h	modified	+1	−1	View file
drivers/usb/gadget/u_os_desc.h	modified	+1	−1	View file
drivers/usb/gadget/udc/Kconfig	modified	+1	−0	View file
drivers/usb/gadget/udc/aspeed-vhub/epn.c	modified	+1	−1	View file
drivers/usb/gadget/udc/aspeed-vhub/hub.c	modified	+1	−1	View file
drivers/usb/gadget/udc/bdc/Kconfig	modified	+2	−0	View file
drivers/usb/gadget/udc/bdc/bdc_cmd.c	modified	+2	−2	View file
drivers/usb/gadget/udc/core.c	modified	+4	−4	View file
drivers/usb/gadget/udc/fotg210-udc.c	modified	+4	−7	View file
drivers/usb/gadget/udc/net2280.c	modified	+3	−3	View file
drivers/usb/gadget/udc/renesas_usb3.c	modified	+4	−0	View file
drivers/usb/gadget/udc/snps_udc_core.c	modified	+8	−9	View file
drivers/usb/host/Kconfig	modified	+4	−4	View file
drivers/usb/host/ehci-fsl.c	modified	+42	−27	View file
drivers/usb/host/ehci-orion.c	modified	+21	−23	View file
drivers/usb/host/fsl-mph-dr-of.c	modified	+6	−0	View file
drivers/usb/host/ohci-at91.c	modified	+5	−2	View file
drivers/usb/host/oxu210hp-hcd.c	modified	+2	−8	View file
drivers/usb/host/u132-hcd.c	modified	+4	−2	View file
drivers/usb/host/whci/Kbuild → drivers/usb/host/whci/Makefile	renamed	+2	−0	View file
drivers/usb/host/xhci-dbgcap.c	modified	+3	−3	View file
drivers/usb/host/xhci-debugfs.h	modified	+0	−1	View file
drivers/usb/host/xhci-mem.c	modified	+1	−1	View file
drivers/usb/host/xhci-mvebu.c	modified	+11	−0	View file
drivers/usb/host/xhci-mvebu.h	modified	+6	−0	View file
drivers/usb/host/xhci-pci.c	modified	+1	−0	View file
drivers/usb/host/xhci-plat.c	modified	+7	−0	View file
drivers/usb/host/xhci-tegra.c	modified	+2	−2	View file
drivers/usb/host/xhci.c	modified	+1	−2	View file
drivers/usb/image/Kconfig	modified	+1	−0	View file
drivers/usb/isp1760/Kconfig	modified	+2	−0	View file
drivers/usb/misc/Kconfig	modified	+1	−0	View file
drivers/usb/misc/ftdi-elan.c	modified	+0	−26	View file
drivers/usb/misc/sisusbvga/Kconfig	modified	+1	−0	View file
drivers/usb/misc/sisusbvga/Makefile	modified	+2	−1	View file
drivers/usb/misc/sisusbvga/sisusb.c	modified	+16	−16	View file
drivers/usb/misc/sisusbvga/sisusb.h	modified	+1	−14	View file
drivers/usb/misc/sisusbvga/sisusb_con.c	modified	+51	−76	View file
drivers/usb/misc/sisusbvga/sisusb_init.c	modified	+0	−5	View file
drivers/usb/misc/usb251xb.c	modified	+13	−2	View file
drivers/usb/misc/usb3503.c	modified	+30	−8	View file
drivers/usb/misc/usbtest.c	modified	+24	−4	View file
drivers/usb/mon/Kconfig	modified	+1	−0	View file
drivers/usb/mtu3/Kconfig	modified	+2	−0	View file
drivers/usb/musb/Kconfig	modified	+3	−2	View file
drivers/usb/musb/jz4740.c	modified	+10	−0	View file
drivers/usb/musb/musb_host.c	modified	+2	−2	View file
drivers/usb/phy/Kconfig	modified	+1	−0	View file
drivers/usb/phy/phy-twl6030-usb.c	modified	+1	−1	View file
drivers/usb/renesas_usbhs/mod_host.c	modified	+1	−1	View file
drivers/usb/renesas_usbhs/rcar3.c	modified	+1	−1	View file
drivers/usb/renesas_usbhs/rza.c	modified	+1	−1	View file
drivers/usb/roles/Kconfig	modified	+2	−0	View file
drivers/usb/roles/Makefile	modified	+2	−0	View file
drivers/usb/roles/class.c	modified	+18	−3	View file
drivers/usb/serial/Kconfig	modified	+1	−0	View file
drivers/usb/serial/cp210x.c	modified	+111	−19	View file
drivers/usb/serial/ftdi_sio.c	modified	+2	−0	View file
drivers/usb/serial/ftdi_sio_ids.h	modified	+6	−0	View file
drivers/usb/serial/option.c	modified	+2	−0	View file
drivers/usb/storage/Kconfig	modified	+1	−0	View file
drivers/usb/storage/karma.c	modified	+2	−0	View file
drivers/usb/typec/Kconfig	modified	+1	−0	View file
drivers/usb/typec/altmodes/Kconfig	modified	+1	−0	View file
drivers/usb/typec/altmodes/Makefile	modified	+2	−0	View file
drivers/usb/typec/altmodes/displayport.c	modified	+0	−4	View file
drivers/usb/typec/class.c	modified	+24	−9	View file
drivers/usb/typec/mux.c	modified	+79	−15	View file
drivers/usb/typec/mux/Kconfig	modified	+2	−0	View file
drivers/usb/typec/tcpm/Kconfig	modified	+2	−0	View file
drivers/usb/typec/tcpm/tcpm.c	modified	+5	−63	View file
drivers/usb/typec/tps6598x.c	modified	+69	−10	View file
drivers/usb/typec/ucsi/Kconfig	modified	+2	−0	View file
drivers/usb/typec/ucsi/debug.h	deleted	+0	−65	View before deletion
drivers/usb/typec/ucsi/trace.c	modified	+59	−0	View file
drivers/usb/typec/ucsi/trace.h	modified	+5	−2	View file
drivers/usb/usbip/Kconfig	modified	+2	−0	View file
drivers/usb/usbip/vhci_hcd.c	modified	+4	−2	View file
drivers/usb/usbip/vudc_dev.c	modified	+2	−1	View file
drivers/usb/wusbcore/Kconfig	modified	+1	−0	View file
drivers/usb/wusbcore/cbaf.c	modified	+4	−11	View file
drivers/usb/wusbcore/dev-sysfs.c	modified	+2	−3	View file
drivers/usb/wusbcore/devconnect.c	modified	+1	−1	View file
drivers/usb/wusbcore/wa-xfer.c	modified	+7	−8	View file
drivers/usb/wusbcore/wusbhc.c	modified	+1	−5	View file
drivers/uwb/drp-ie.c	modified	+2	−3	View file
include/linux/device.h	modified	+6	−0	View file
include/linux/fsl_devices.h	modified	+4	−3	View file
include/linux/phy/phy-mipi-dphy.h	modified	+6	−7	View file
include/linux/usb/hcd.h	modified	+7	−3	View file
include/linux/usb/role.h	modified	+2	−0	View file
include/linux/usb/tcpm.h	modified	+0	−6	View file
include/linux/usb/typec_dp.h	modified	+4	−0	View file
include/linux/usb/typec_mux.h	modified	+2	−1	View file
include/linux/usb/wusb.h	modified	+0	−16	View file

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

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 559baa5..614d216 100644
--- a/Documentation/ABI/testing/sysfs-bus-usb
+++ b/Documentation/ABI/testing/sysfs-bus-usb
@@ -186,7 +186,7 @@ Contact:	Lan Tianyu <[email protected]>
 Description:
 		Some platforms provide usb port connect types through ACPI.
 		This attribute is to expose these information to user space.
-		The file will read "hotplug", "wired" and "not used" if the
+		The file will read "hotplug", "hardwired" and "not used" if the
 		information is available, and "unknown" otherwise.
 
 What:		/sys/bus/usb/devices/.../(hub interface)/portX/location

Documentation/admin-guide/kernel-parameters.txt

View file

diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt
index 879afb4..a422560 100644
--- a/Documentation/admin-guide/kernel-parameters.txt
+++ b/Documentation/admin-guide/kernel-parameters.txt
@@ -4718,7 +4718,8 @@
 	usbcore.authorized_default=
 			[USB] Default USB device authorization:
 			(default -1 = authorized except for wireless USB,
-			0 = not authorized, 1 = authorized)
+			0 = not authorized, 1 = authorized, 2 = authorized
+			if device connected to internal port)
 
 	usbcore.autosuspend=
 			[USB] The autosuspend time delay (in seconds) used

Documentation/devicetree/bindings/arm/atmel-sysregs.txt

View file

diff --git a/Documentation/devicetree/bindings/arm/atmel-sysregs.txt b/Documentation/devicetree/bindings/arm/atmel-sysregs.txt
index 14f319f..3363d9a 100644
--- a/Documentation/devicetree/bindings/arm/atmel-sysregs.txt
+++ b/Documentation/devicetree/bindings/arm/atmel-sysregs.txt
@@ -147,6 +147,7 @@ required properties:
 - compatible: Should be "atmel,<chip>-sfr", "syscon" or
 	"atmel,<chip>-sfrbu", "syscon"
   <chip> can be "sama5d3", "sama5d4" or "sama5d2".
+  It also can be "microchip,sam9x60-sfr", "syscon".
 - reg: Should contain registers location and length
 
 	sfr@f0038000 {

Documentation/devicetree/bindings/display/bridge/cdns,dsi.txt

View file

diff --git a/Documentation/devicetree/bindings/display/bridge/cdns,dsi.txt b/Documentation/devicetree/bindings/display/bridge/cdns,dsi.txt
index f5725bb..525a4bf 100644
--- a/Documentation/devicetree/bindings/display/bridge/cdns,dsi.txt
+++ b/Documentation/devicetree/bindings/display/bridge/cdns,dsi.txt
@@ -31,28 +31,7 @@ Required subnodes:
 - one subnode per DSI device connected on the DSI bus. Each DSI device should
   contain a reg property encoding its virtual channel.
 
-Cadence DPHY
-============
-
-Cadence DPHY block.
-
-Required properties:
-- compatible: should be set to "cdns,dphy".
-- reg: physical base address and length of the DPHY registers.
-- clocks: DPHY reference clocks.
-- clock-names: must contain "psm" and "pll_ref".
-- #phy-cells: must be set to 0.
-
-
 Example:
-	dphy0: dphy@fd0e0000{
-		compatible = "cdns,dphy";
-		reg = <0x0 0xfd0e0000 0x0 0x1000>;
-		clocks = <&psm_clk>, <&pll_ref_clk>;
-		clock-names = "psm", "pll_ref";
-		#phy-cells = <0>;
-	};
-
 	dsi0: dsi@fd0c0000 {
 		compatible = "cdns,dsi";
 		reg = <0x0 0xfd0c0000 0x0 0x1000>;

Documentation/devicetree/bindings/phy/cdns,dphy.txt

View file

diff --git a/Documentation/devicetree/bindings/phy/cdns,dphy.txt b/Documentation/devicetree/bindings/phy/cdns,dphy.txt
new file mode 100644
index 0000000..1095bc4
--- /dev/null
+++ b/Documentation/devicetree/bindings/phy/cdns,dphy.txt
@@ -0,0 +1,20 @@
+Cadence DPHY
+============
+
+Cadence DPHY block.
+
+Required properties:
+- compatible: should be set to "cdns,dphy".
+- reg: physical base address and length of the DPHY registers.
+- clocks: DPHY reference clocks.
+- clock-names: must contain "psm" and "pll_ref".
+- #phy-cells: must be set to 0.
+
+Example:
+	dphy0: dphy@fd0e0000{
+		compatible = "cdns,dphy";
+		reg = <0x0 0xfd0e0000 0x0 0x1000>;
+		clocks = <&psm_clk>, <&pll_ref_clk>;
+		clock-names = "psm", "pll_ref";
+		#phy-cells = <0>;
+	};

Documentation/devicetree/bindings/phy/phy-mvebu-comphy.txt

View file

diff --git a/Documentation/devicetree/bindings/phy/phy-mvebu-comphy.txt b/Documentation/devicetree/bindings/phy/phy-mvebu-comphy.txt
index bfcf803..cf2cd86 100644
--- a/Documentation/devicetree/bindings/phy/phy-mvebu-comphy.txt
+++ b/Documentation/devicetree/bindings/phy/phy-mvebu-comphy.txt
@@ -1,16 +1,27 @@
-mvebu comphy driver
--------------------
+MVEBU comphy drivers
+--------------------
 
-A comphy controller can be found on Marvell Armada 7k/8k on the CP110. It
-provides a number of shared PHYs used by various interfaces (network, sata,
-usb, PCIe...).
+COMPHY controllers can be found on the following Marvell MVEBU SoCs:
+* Armada 7k/8k (on the CP110)
+* Armada 3700
+It provides a number of shared PHYs used by various interfaces (network, SATA,
+USB, PCIe...).
 
 Required properties:
 
-- compatible: should be "marvell,comphy-cp110"
-- reg: should contain the comphy register location and length.
-- marvell,system-controller: should contain a phandle to the
-                             system controller node.
+- compatible: should be one of:
+  * "marvell,comphy-cp110" for Armada 7k/8k
+  * "marvell,comphy-a3700" for Armada 3700
+- reg: should contain the COMPHY register(s) location(s) and length(s).
+  * 1 entry for Armada 7k/8k
+  * 4 entries for Armada 3700 along with the corresponding reg-names
+    properties, memory areas are:
+    * Generic COMPHY registers
+    * Lane 1 (PCIe/GbE)
+    * Lane 0 (USB3/GbE)
+    * Lane 2 (SATA/USB3)
+- marvell,system-controller: should contain a phandle to the system
+			     controller node (only for Armada 7k/8k)
 - #address-cells: should be 1.
 - #size-cells: should be 0.
 
@@ -18,11 +29,11 @@ A sub-node is required for each comphy lane provided by the comphy.
 
 Required properties (child nodes):
 
-- reg: comphy lane number.
-- #phy-cells : from the generic phy bindings, must be 1. Defines the
+- reg: COMPHY lane number.
+- #phy-cells : from the generic PHY bindings, must be 1. Defines the
                input port to use for a given comphy lane.
 
-Example:
+Examples:
 
 	cpm_comphy: phy@120000 {
 		compatible = "marvell,comphy-cp110";
@@ -41,3 +52,33 @@ Example:
 			#phy-cells = <1>;
 		};
 	};
+
+	comphy: phy@18300 {
+		compatible = "marvell,comphy-a3700";
+		reg = <0x18300 0x300>,
+		<0x1F000 0x400>,
+		<0x5C000 0x400>,
+		<0xe0178 0x8>;
+		reg-names = "comphy",
+		"lane1_pcie_gbe",
+		"lane0_usb3_gbe",
+		"lane2_sata_usb3";
+		#address-cells = <1>;
+		#size-cells = <0>;
+
+
+		comphy0: phy@0 {
+			reg = <0>;
+			#phy-cells = <1>;
+		};
+
+		comphy1: phy@1 {
+			reg = <1>;
+			#phy-cells = <1>;
+		};
+
+		comphy2: phy@2 {
+			reg = <2>;
+			#phy-cells = <1>;
+		};
+	};

Documentation/devicetree/bindings/phy/phy-mvebu-utmi.txt

View file

diff --git a/Documentation/devicetree/bindings/phy/phy-mvebu-utmi.txt b/Documentation/devicetree/bindings/phy/phy-mvebu-utmi.txt
new file mode 100644
index 0000000..aa99cee
--- /dev/null
+++ b/Documentation/devicetree/bindings/phy/phy-mvebu-utmi.txt
@@ -0,0 +1,38 @@
+MVEBU A3700 UTMI PHY
+--------------------
+
+USB2 UTMI+ PHY controllers can be found on the following Marvell MVEBU SoCs:
+* Armada 3700
+
+On Armada 3700, there are two USB controllers, one is compatible with the USB2
+and USB3 specifications and supports OTG. The other one is USB2 compliant and
+only supports host mode. Both of these controllers come with a slightly
+different UTMI PHY.
+
+Required Properties:
+
+- compatible: Should be one of:
+	      * "marvell,a3700-utmi-host-phy" for the PHY connected to
+	        the USB2 host-only controller.
+	      * "marvell,a3700-utmi-otg-phy" for the PHY connected to
+	        the USB3 and USB2 OTG capable controller.
+- reg: PHY IP register range.
+- marvell,usb-misc-reg: handle on the "USB miscellaneous registers" shared
+			region covering registers related to both the host
+			controller and the PHY.
+- #phy-cells: Standard property (Documentation: phy-bindings.txt) Should be 0.
+
+
+Example:
+
+	usb2_utmi_host_phy: phy@5f000 {
+		compatible = "marvell,armada-3700-utmi-host-phy";
+		reg = <0x5f000 0x800>;
+		marvell,usb-misc-reg = <&usb2_syscon>;
+		#phy-cells = <0>;
+	};
+
+	usb2_syscon: system-controller@5f800 {
+		compatible = "marvell,armada-3700-usb2-host-misc", "syscon";
+		reg = <0x5f800 0x800>;
+	};

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

View file

diff --git a/Documentation/devicetree/bindings/phy/phy-rockchip-inno-usb2.txt b/Documentation/devicetree/bindings/phy/phy-rockchip-inno-usb2.txt
index 074a7b3..00639ba 100644
--- a/Documentation/devicetree/bindings/phy/phy-rockchip-inno-usb2.txt
+++ b/Documentation/devicetree/bindings/phy/phy-rockchip-inno-usb2.txt
@@ -23,6 +23,8 @@ Optional properties:
 		 register files". When set driver will request its
 		 phandle as one companion-grf for some special SoCs
 		 (e.g RV1108).
+ - extcon : phandle to the extcon device providing the cable state for
+		 the otg phy.
 
 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,

Documentation/devicetree/bindings/phy/qcom-qmp-phy.txt

View file

diff --git a/Documentation/devicetree/bindings/phy/qcom-qmp-phy.txt b/Documentation/devicetree/bindings/phy/qcom-qmp-phy.txt
index 41a1074..5d181fc 100644
--- a/Documentation/devicetree/bindings/phy/qcom-qmp-phy.txt
+++ b/Documentation/devicetree/bindings/phy/qcom-qmp-phy.txt
@@ -9,6 +9,8 @@ Required properties:
 	       "qcom,ipq8074-qmp-pcie-phy" for PCIe phy on IPQ8074
 	       "qcom,msm8996-qmp-pcie-phy" for 14nm PCIe phy on msm8996,
 	       "qcom,msm8996-qmp-usb3-phy" for 14nm USB3 phy on msm8996,
+	       "qcom,msm8998-qmp-usb3-phy" for USB3 QMP V3 phy on msm8998,
+	       "qcom,msm8998-qmp-ufs-phy" for UFS QMP phy on msm8998,
 	       "qcom,sdm845-qmp-usb3-phy" for USB3 QMP V3 phy on sdm845,
 	       "qcom,sdm845-qmp-usb3-uni-phy" for USB3 QMP V3 UNI phy on sdm845,
 	       "qcom,sdm845-qmp-ufs-phy" for UFS QMP phy on sdm845.
@@ -42,6 +44,10 @@ Required properties:
 			"aux", "cfg_ahb", "ref".
 		For "qcom,msm8996-qmp-usb3-phy" must contain:
 			"aux", "cfg_ahb", "ref".
+		For "qcom,msm8998-qmp-usb3-phy" must contain:
+			"aux", "cfg_ahb", "ref".
+		For "qcom,msm8998-qmp-ufs-phy" must contain:
+			"ref", "ref_aux".
 		For "qcom,sdm845-qmp-usb3-phy" must contain:
 			"aux", "cfg_ahb", "ref", "com_aux".
 		For "qcom,sdm845-qmp-usb3-uni-phy" must contain:
@@ -61,6 +67,9 @@ Required properties:
 			"phy", "common", "cfg".
 		For "qcom,msm8996-qmp-usb3-phy" must contain
 			"phy", "common".
+		For "qcom,msm8998-qmp-usb3-phy" must contain
+			"phy", "common".
+		For "qcom,msm8998-qmp-ufs-phy": no resets are listed.
 		For "qcom,sdm845-qmp-usb3-phy" must contain:
 			"phy", "common".
 		For "qcom,sdm845-qmp-usb3-uni-phy" must contain:

Documentation/devicetree/bindings/phy/qcom-qusb2-phy.txt

View file

diff --git a/Documentation/devicetree/bindings/phy/qcom-qusb2-phy.txt b/Documentation/devicetree/bindings/phy/qcom-qusb2-phy.txt
index 03025d9..fe29f9e 100644
--- a/Documentation/devicetree/bindings/phy/qcom-qusb2-phy.txt
+++ b/Documentation/devicetree/bindings/phy/qcom-qusb2-phy.txt
@@ -6,6 +6,7 @@ QUSB2 controller supports LS/FS/HS usb connectivity on Qualcomm chipsets.
 Required properties:
  - compatible: compatible list, contains
 	       "qcom,msm8996-qusb2-phy" for 14nm PHY on msm8996,
+	       "qcom,msm8998-qusb2-phy" for 10nm PHY on msm8998,
 	       "qcom,sdm845-qusb2-phy" for 10nm PHY on sdm845.
 
  - reg: offset and length of the PHY register set.

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
index de7b539..ad9c290 100644
--- a/Documentation/devicetree/bindings/phy/rcar-gen3-phy-usb2.txt
+++ b/Documentation/devicetree/bindings/phy/rcar-gen3-phy-usb2.txt
@@ -6,6 +6,8 @@ This file provides information on what the device node for the R-Car generation
 Required properties:
 - compatible: "renesas,usb2-phy-r8a774a1" if the device is a part of an R8A774A1
 	      SoC.
+	      "renesas,usb2-phy-r8a774c0" if the device is a part of an R8A774C0
+	      SoC.
 	      "renesas,usb2-phy-r8a7795" if the device is a part of an R8A7795
 	      SoC.
 	      "renesas,usb2-phy-r8a7796" if the device is a part of an R8A7796

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 57dfda8..8f93c3b 100644
--- a/Documentation/devicetree/bindings/phy/ti-phy.txt
+++ b/Documentation/devicetree/bindings/phy/ti-phy.txt
@@ -35,6 +35,7 @@ Required properties:
 	       DRA7x
 	       Should be "ti,dra7x-usb2-phy2" for the 2nd instance of USB2 PHY
 	       in DRA7x
+	       Should be "ti,am654-usb2" for the USB2 PHYs on AM654.
  - 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.

Documentation/devicetree/bindings/usb/ci-hdrc-usb2.txt

View file

diff --git a/Documentation/devicetree/bindings/usb/ci-hdrc-usb2.txt b/Documentation/devicetree/bindings/usb/ci-hdrc-usb2.txt
index adae823..a254386 100644
--- a/Documentation/devicetree/bindings/usb/ci-hdrc-usb2.txt
+++ b/Documentation/devicetree/bindings/usb/ci-hdrc-usb2.txt
@@ -93,6 +93,7 @@ i.mx specific properties
 - over-current-active-low: over current signal polarity is active low.
 - over-current-active-high: over current signal polarity is active high.
   It's recommended to specify the over current polarity.
+- power-active-high: power signal polarity is active high
 - external-vbus-divider: enables off-chip resistor divider for Vbus
 
 Example:

Documentation/devicetree/bindings/usb/ingenic,jz4740-musb.txt

View file

diff --git a/Documentation/devicetree/bindings/usb/ingenic,jz4740-musb.txt b/Documentation/devicetree/bindings/usb/ingenic,jz4740-musb.txt
new file mode 100644
index 0000000..620355c
--- /dev/null
+++ b/Documentation/devicetree/bindings/usb/ingenic,jz4740-musb.txt
@@ -0,0 +1,24 @@
+Ingenic JZ4740 MUSB driver
+
+Required properties:
+
+- compatible: Must be "ingenic,jz4740-musb"
+- reg: Address range of the UDC register set
+- interrupts: IRQ number related to the UDC hardware
+- interrupt-names: must be "mc"
+- clocks: phandle to the "udc" clock
+- clock-names: must be "udc"
+
+Example:
+
+udc: usb@13040000 {
+	compatible = "ingenic,jz4740-musb";
+	reg = <0x13040000 0x10000>;
+
+	interrupt-parent = <&intc>;
+	interrupts = <24>;
+	interrupt-names = "mc";
+
+	clocks = <&cgu JZ4740_CLK_UDC>;
+	clock-names = "udc";
+};

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

View file

diff --git a/Documentation/devicetree/bindings/usb/keystone-usb.txt b/Documentation/devicetree/bindings/usb/keystone-usb.txt
index f96e09f..77df82e 100644
--- a/Documentation/devicetree/bindings/usb/keystone-usb.txt
+++ b/Documentation/devicetree/bindings/usb/keystone-usb.txt
@@ -3,7 +3,9 @@ TI Keystone Soc USB Controller
 DWC3 GLUE
 
 Required properties:
- - compatible: should be "ti,keystone-dwc3".
+ - compatible: should be
+		"ti,keystone-dwc3" for Keystone 2 SoCs
+		"ti,am654-dwc3" for AM654 SoC
  - #address-cells, #size-cells : should be '1' if the device has sub-nodes
    with 'reg' property.
  - reg : Address and length of the register set for the USB subsystem on
@@ -21,7 +23,7 @@ SoCs only:
 - clock-names:		Must be "usb".
 
 
-The following are mandatory properties for Keystone 2 66AK2G SoCs only:
+The following are mandatory properties for 66AK2G and AM654:
 
 - power-domains:	Should contain a phandle to a PM domain provider node
 			and an args specifier containing the USB device id

Documentation/devicetree/bindings/usb/qcom,dwc3.txt

View file

diff --git a/Documentation/devicetree/bindings/usb/qcom,dwc3.txt b/Documentation/devicetree/bindings/usb/qcom,dwc3.txt
index 95afdcf..cb695aa 100644
--- a/Documentation/devicetree/bindings/usb/qcom,dwc3.txt
+++ b/Documentation/devicetree/bindings/usb/qcom,dwc3.txt
@@ -4,6 +4,7 @@ Required properties:
 - compatible:		Compatible list, contains
 			"qcom,dwc3"
 			"qcom,msm8996-dwc3" for msm8996 SOC.
+			"qcom,msm8998-dwc3" for msm8998 SOC.
 			"qcom,sdm845-dwc3" for sdm845 SOC.
 - reg:			Offset and length of register set for QSCRATCH wrapper
 - power-domains:	specifies a phandle to PM domain provider node

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
index d366555..35039e7 100644
--- a/Documentation/devicetree/bindings/usb/renesas_usb3.txt
+++ b/Documentation/devicetree/bindings/usb/renesas_usb3.txt
@@ -3,6 +3,7 @@ Renesas Electronics USB3.0 Peripheral driver
 Required properties:
   - compatible: Must contain one of the following:
 	- "renesas,r8a774a1-usb3-peri"
+	- "renesas,r8a774c0-usb3-peri"
 	- "renesas,r8a7795-usb3-peri"
 	- "renesas,r8a7796-usb3-peri"
 	- "renesas,r8a77965-usb3-peri"

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 90719f5..d93b6a1 100644
--- a/Documentation/devicetree/bindings/usb/renesas_usbhs.txt
+++ b/Documentation/devicetree/bindings/usb/renesas_usbhs.txt
@@ -7,6 +7,7 @@ Required properties:
 	- "renesas,usbhs-r8a7744" for r8a7744 (RZ/G1N) compatible device
 	- "renesas,usbhs-r8a7745" for r8a7745 (RZ/G1E) compatible device
 	- "renesas,usbhs-r8a774a1" for r8a774a1 (RZ/G2M) compatible device
+	- "renesas,usbhs-r8a774c0" for r8a774c0 (RZ/G2E) 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

Documentation/devicetree/bindings/usb/usb251xb.txt

View file

diff --git a/Documentation/devicetree/bindings/usb/usb251xb.txt b/Documentation/devicetree/bindings/usb/usb251xb.txt
index 168ff81..17915f6 100644
--- a/Documentation/devicetree/bindings/usb/usb251xb.txt
+++ b/Documentation/devicetree/bindings/usb/usb251xb.txt
@@ -64,6 +64,8 @@ Optional properties :
  - power-on-time-ms : Specifies the time it takes from the time the host
 	initiates the power-on sequence to a port until the port has adequate
 	power. The value is given in ms in a 0 - 510 range (default is 100ms).
+ - swap-dx-lanes : Specifies the ports which will swap the differential-pair
+	(D+/D-), default is not-swapped.
 
 Examples:
 	usb2512b@2c {
@@ -81,4 +83,6 @@ Examples:
 		manufacturer = "Foo";
 		product = "Foo-Bar";
 		serial = "1234567890A";
+		/* correct misplaced usb connectors on port 1,2 */
+		swap-dx-lanes = <1 2>;
 	};

Documentation/usb/authorization.txt

View file

diff --git a/Documentation/usb/authorization.txt b/Documentation/usb/authorization.txt
index f901ec7..9dd1dc7 100644
--- a/Documentation/usb/authorization.txt
+++ b/Documentation/usb/authorization.txt
@@ -34,7 +34,9 @@ $ echo 1 > /sys/bus/usb/devices/usbX/authorized_default
 By default, Wired USB devices are authorized by default to
 connect. Wireless USB hosts deauthorize by default all new connected
 devices (this is so because we need to do an authentication phase
-before authorizing).
+before authorizing). Writing "2" to the authorized_default attribute
+causes kernel to only authorize by default devices connected to internal
+USB ports.
 
 
 Example system lockdown (lame)

MAINTAINERS

View file

diff --git a/MAINTAINERS b/MAINTAINERS
index 060f4ff..ae76b58 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -9178,6 +9178,14 @@ F:	drivers/gpu/drm/armada/
 F:	include/uapi/drm/armada_drm.h
 F:	Documentation/devicetree/bindings/display/armada/
 
+MARVELL ARMADA 3700 PHY DRIVERS
+M:	Miquel Raynal <[email protected]>
+S:	Maintained
+F:	drivers/phy/marvell/phy-mvebu-a3700-comphy.c
+F:	drivers/phy/marvell/phy-mvebu-a3700-utmi.c
+F:	Documentation/devicetree/bindings/phy/phy-mvebu-comphy.txt
+F:	Documentation/devicetree/bindings/phy/phy-mvebu-utmi.txt
+
 MARVELL CRYPTO DRIVER
 M:	Boris Brezillon <[email protected]>
 M:	Arnaud Ebalard <[email protected]>

drivers/base/devcon.c

View file

diff --git a/drivers/base/devcon.c b/drivers/base/devcon.c
index d427e80..04db9ae 100644
--- a/drivers/base/devcon.c
+++ b/drivers/base/devcon.c
@@ -7,10 +7,37 @@
  */
 
 #include <linux/device.h>
+#include <linux/property.h>
 
 static DEFINE_MUTEX(devcon_lock);
 static LIST_HEAD(devcon_list);
 
+typedef void *(*devcon_match_fn_t)(struct device_connection *con, int ep,
+				   void *data);
+
+static void *
+fwnode_graph_devcon_match(struct fwnode_handle *fwnode, const char *con_id,
+			  void *data, devcon_match_fn_t match)
+{
+	struct device_connection con = { .id = con_id };
+	struct fwnode_handle *ep;
+	void *ret;
+
+	fwnode_graph_for_each_endpoint(fwnode, ep) {
+		con.fwnode = fwnode_graph_get_remote_port_parent(ep);
+		if (!fwnode_device_is_available(con.fwnode))
+			continue;
+
+		ret = match(&con, -1, data);
+		fwnode_handle_put(con.fwnode);
+		if (ret) {
+			fwnode_handle_put(ep);
+			return ret;
+		}
+	}
+	return NULL;
+}
+
 /**
  * device_connection_find_match - Find physical connection to a device
  * @dev: Device with the connection
@@ -23,10 +50,9 @@ static LIST_HEAD(devcon_list);
  * caller is expecting to be returned.
  */
 void *device_connection_find_match(struct device *dev, const char *con_id,
-			       void *data,
-			       void *(*match)(struct device_connection *con,
-					      int ep, void *data))
+				   void *data, devcon_match_fn_t match)
 {
+	struct fwnode_handle *fwnode = dev_fwnode(dev);
 	const char *devname = dev_name(dev);
 	struct device_connection *con;
 	void *ret = NULL;
@@ -35,6 +61,12 @@ void *device_connection_find_match(struct device *dev, const char *con_id,
 	if (!match)
 		return NULL;
 
+	if (fwnode) {
+		ret = fwnode_graph_devcon_match(fwnode, con_id, data, match);
+		if (ret)
+			return ret;
+	}
+
 	mutex_lock(&devcon_lock);
 
 	list_for_each_entry(con, &devcon_list, list) {
@@ -75,12 +107,36 @@ static struct bus_type *generic_match_buses[] = {
 	NULL,
 };
 
+static int device_fwnode_match(struct device *dev, void *fwnode)
+{
+	return dev_fwnode(dev) == fwnode;
+}
+
+static void *device_connection_fwnode_match(struct device_connection *con)
+{
+	struct bus_type *bus;
+	struct device *dev;
+
+	for (bus = generic_match_buses[0]; bus; bus++) {
+		dev = bus_find_device(bus, NULL, (void *)con->fwnode,
+				      device_fwnode_match);
+		if (dev && !strncmp(dev_name(dev), con->id, strlen(con->id)))
+			return dev;
+
+		put_device(dev);
+	}
+	return NULL;
+}
+
 /* This tries to find the device from the most common bus types by name. */
 static void *generic_match(struct device_connection *con, int ep, void *data)
 {
 	struct bus_type *bus;
 	struct device *dev;
 
+	if (con->fwnode)
+		return device_connection_fwnode_match(con);
+
 	for (bus = generic_match_buses[0]; bus; bus++) {
 		dev = bus_find_device_by_name(bus, NULL, con->endpoint[ep]);
 		if (dev)

drivers/phy/broadcom/phy-bcm-sr-pcie.c

View file

diff --git a/drivers/phy/broadcom/phy-bcm-sr-pcie.c b/drivers/phy/broadcom/phy-bcm-sr-pcie.c
index c10e95f..96a3af1 100644
--- a/drivers/phy/broadcom/phy-bcm-sr-pcie.c
+++ b/drivers/phy/broadcom/phy-bcm-sr-pcie.c
@@ -78,8 +78,8 @@ struct sr_pcie_phy_core {
 static const u8 pipemux_table[] = {
 	/* PIPEMUX = 0, EP 1x16 */
 	0x00,
-	/* PIPEMUX = 1, EP 2x8 */
-	0x00,
+	/* PIPEMUX = 1, EP 1x8 + RC 1x8, core 7 */
+	0x80,
 	/* PIPEMUX = 2, EP 4x4 */
 	0x00,
 	/* PIPEMUX = 3, RC 2x8, cores 0, 7 */

drivers/phy/cadence/Kconfig

View file

diff --git a/drivers/phy/cadence/Kconfig b/drivers/phy/cadence/Kconfig
index 2b8c085..31f18b6 100644
--- a/drivers/phy/cadence/Kconfig
+++ b/drivers/phy/cadence/Kconfig
@@ -1,6 +1,7 @@
 #
 # Phy drivers for Cadence PHYs
 #

This diff is incomplete. Download the complete patch.