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

Pull USB/PHY updates from Greg KH:
 "Here is the big USB/PHY driver patches for 4.20-rc1

  Lots of USB changes in here, primarily in these areas:

   - typec updates and new drivers

   - new PHY drivers

   - dwc2 driver updates and additions (this old core keeps getting
     added to new devices.)

   - usbtmc major update based on the industry group coming together and
     working to add new features and performance to the driver.

   - USB gadget additions for new features

   - USB gadget configfs updates

   - chipidea driver updates

   - other USB gadget updates

   - USB serial driver updates

   - renesas driver updates

   - xhci driver updates

   - other tiny USB driver updates

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

* tag 'usb-4.20-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb: (229 commits)
  usb: phy: ab8500: silence some uninitialized variable warnings
  usb: xhci: tegra: Add genpd support
  usb: xhci: tegra: Power-off power-domains on removal
  usbip:vudc: BUG kmalloc-2048 (Not tainted): Poison overwritten
  usbip: tools: fix atoi() on non-null terminated string
  USB: misc: appledisplay: fix backlight update_status return code
  phy: phy-pxa-usb: add a new driver
  usb: host: add DT bindings for faraday fotg2
  usb: host: ohci-at91: fix request of irq for optional gpio
  usb/early: remove set but not used variable 'remain_length'
  usb: typec: Fix copy/paste on typec_set_vconn_role() kerneldoc
  usb: typec: tcpm: Report back negotiated PPS voltage and current
  USB: core: remove set but not used variable 'udev'
  usb: core: fix memory leak on port_dev_path allocation
  USB: net2280: Remove ->disconnect() callback from net2280_pullup()
  usb: dwc2: disable power_down on rockchip devices
  usb: gadget: udc: renesas_usb3: add support for r8a77990
  dt-bindings: usb: renesas_usb3: add bindings for r8a77990
  usb: gadget: udc: renesas_usb3: Add r8a774a1 support
  USB: serial: cypress_m8: remove set but not used variable 'iflag'
  ...

181 files changed, 8787 insertions, 2189 deletions

diff --git a/Documentation/ABI/stable/sysfs-driver-usb-usbtmc b/Documentation/ABI/stable/sysfs-driver-usb-usbtmc
index e960cd027e1e..a9e123ba32cd 100644
--- a/Documentation/ABI/stable/sysfs-driver-usb-usbtmc
+++ b/Documentation/ABI/stable/sysfs-driver-usb-usbtmc
@@ -25,38 +25,3 @@ Description:
                 4.2.2.
 
                 The files are read only.
-
-
-What:           /sys/bus/usb/drivers/usbtmc/*/TermChar
-Date:           August 2008
-Contact:        Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-Description:
-                This file is the TermChar value to be sent to the USB TMC
-                device as described by the document, "Universal Serial Bus Test
-                and Measurement Class Specification
-                (USBTMC) Revision 1.0" as published by the USB-IF.
-
-                Note that the TermCharEnabled file determines if this value is
-                sent to the device or not.
-
-
-What:           /sys/bus/usb/drivers/usbtmc/*/TermCharEnabled
-Date:           August 2008
-Contact:        Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-Description:
-                This file determines if the TermChar is to be sent to the
-                device on every transaction or not.  For more details about
-                this, please see the document, "Universal Serial Bus Test and
-                Measurement Class Specification (USBTMC) Revision 1.0" as
-                published by the USB-IF.
-
-
-What:           /sys/bus/usb/drivers/usbtmc/*/auto_abort
-Date:           August 2008
-Contact:        Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-Description:
-                This file determines if the transaction of the USB TMC
-                device is to be automatically aborted if there is any error.
-                For more details about this, please see the document,
-                "Universal Serial Bus Test and Measurement Class Specification
-                (USBTMC) Revision 1.0" as published by the USB-IF.
diff --git a/Documentation/ABI/testing/configfs-usb-gadget-uvc b/Documentation/ABI/testing/configfs-usb-gadget-uvc
index 9281e2aa38df..809765bd9573 100644
--- a/Documentation/ABI/testing/configfs-usb-gadget-uvc
+++ b/Documentation/ABI/testing/configfs-usb-gadget-uvc
@@ -12,6 +12,10 @@ Date:		Dec 2014
 KernelVersion:  4.0
 Description:    Control descriptors
 
+                All attributes read only:
+                bInterfaceNumber        - USB interface number for this
+                                          streaming interface
+
 What:           /config/usb-gadget/gadget/functions/uvc.name/control/class
 Date:           Dec 2014
 KernelVersion:  4.0
@@ -109,6 +113,10 @@ Date:		Dec 2014
 KernelVersion:  4.0
 Description:    Streaming descriptors
 
+                All attributes read only:
+                bInterfaceNumber        - USB interface number for this
+                                          streaming interface
+
 What:           /config/usb-gadget/gadget/functions/uvc.name/streaming/class
 Date:           Dec 2014
 KernelVersion:  4.0
@@ -160,6 +168,10 @@ Description:	Specific MJPEG format descriptors
 
                 All attributes read only,
                 except bmaControls and bDefaultFrameIndex:
+                bFormatIndex            - unique id for this format descriptor;
+                                        only defined after parent header is
+                                        linked into the streaming class;
+                                        read-only
                 bmaControls             - this format's data for bmaControls in
                                         the streaming header
                 bmInterfaceFlags        - specifies interlace information,
@@ -177,6 +189,10 @@ Date:		Dec 2014
 KernelVersion:  4.0
 Description:    Specific MJPEG frame descriptors
 
+                bFrameIndex             - unique id for this framedescriptor;
+                                        only defined after parent format is
+                                        linked into the streaming header;
+                                        read-only
                 dwFrameInterval         - indicates how frame interval can be
                                         programmed; a number of values
                                         separated by newline can be specified
@@ -204,6 +220,10 @@ Date:		Dec 2014
 KernelVersion:  4.0
 Description:    Specific uncompressed format descriptors
 
+                bFormatIndex            - unique id for this format descriptor;
+                                        only defined after parent header is
+                                        linked into the streaming class;
+                                        read-only
                 bmaControls             - this format's data for bmaControls in
                                         the streaming header
                 bmInterfaceFlags        - specifies interlace information,
@@ -224,6 +244,10 @@ Date:		Dec 2014
 KernelVersion:  4.0
 Description:    Specific uncompressed frame descriptors
 
+                bFrameIndex             - unique id for this framedescriptor;
+                                        only defined after parent format is
+                                        linked into the streaming header;
+                                        read-only
                 dwFrameInterval         - indicates how frame interval can be
                                         programmed; a number of values
                                         separated by newline can be specified
diff --git a/Documentation/ABI/testing/sysfs-bus-usb b/Documentation/ABI/testing/sysfs-bus-usb
index 08d456e07b53..559baa5c418c 100644
--- a/Documentation/ABI/testing/sysfs-bus-usb
+++ b/Documentation/ABI/testing/sysfs-bus-usb
@@ -189,6 +189,16 @@ 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/location
+Date:           October 2018
+Contact:        Bjørn Mork <bjorn@mork.no>
+Description:
+                Some platforms provide usb port physical location through
+                firmware. This is used by the kernel to pair up logical ports
+                mapping to the same physical connector. The attribute exposes the
+                raw location value as a hex integer.
+
+
 What:           /sys/bus/usb/devices/.../(hub interface)/portX/quirks
 Date:           May 2018
 Contact:        Nicolas Boichat <drinkcat@chromium.org>
@@ -219,7 +229,14 @@ Description:
                 ports and report them to the kernel. This attribute is to expose
                 the number of over-current situation occurred on a specific port
                 to user space. This file will contain an unsigned 32 bit value
-                which wraps to 0 after its maximum is reached.
+                which wraps to 0 after its maximum is reached. This file supports
+                poll() for monitoring changes to this value in user space.
+
+                Any time this value changes the corresponding hub device will send a
+                udev event with the following attributes:
+
+                OVER_CURRENT_PORT=/sys/bus/usb/devices/.../(hub interface)/portX
+                OVER_CURRENT_COUNT=[current value of this sysfs attribute]
 
 What:           /sys/bus/usb/devices/.../(hub interface)/portX/usb3_lpm_permit
 Date:           November 2015
diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt
index e129cd8a6dcc..8022d902e770 100644
--- a/Documentation/admin-guide/kernel-parameters.txt
+++ b/Documentation/admin-guide/kernel-parameters.txt
@@ -4623,7 +4623,8 @@
 
         usbcore.old_scheme_first=
                         [USB] Start with the old device initialization
-                        scheme (default 0 = off).
+                        scheme,  applies only to low and full-speed devices
+                         (default 0 = off).
 
         usbcore.usbfs_memory_mb=
                         [USB] Memory limit (in MB) for buffers allocated by
diff --git a/Documentation/devicetree/bindings/connector/usb-connector.txt b/Documentation/devicetree/bindings/connector/usb-connector.txt
index 8855bfcfd778..d90e17e2428b 100644
--- a/Documentation/devicetree/bindings/connector/usb-connector.txt
+++ b/Documentation/devicetree/bindings/connector/usb-connector.txt
@@ -29,15 +29,15 @@ Required properties for usb-c-connector with power delivery support:
   in "Universal Serial Bus Power Delivery Specification" chapter 6.4.1.2
   Source_Capabilities Message, the order of each entry(PDO) should follow
   the PD spec chapter 6.4.1. Required for power source and power dual role.
-  User can specify the source PDO array via PDO_FIXED/BATT/VAR() defined in
-  dt-bindings/usb/pd.h.
+  User can specify the source PDO array via PDO_FIXED/BATT/VAR/PPS_APDO()
+  defined in dt-bindings/usb/pd.h.
 - sink-pdos: An array of u32 with each entry providing supported power
   sink data object(PDO), the detailed bit definitions of PDO can be found
   in "Universal Serial Bus Power Delivery Specification" chapter 6.4.1.3
   Sink Capabilities Message, the order of each entry(PDO) should follow
   the PD spec chapter 6.4.1. Required for power sink and power dual role.
-  User can specify the sink PDO array via PDO_FIXED/BATT/VAR() defined in
-  dt-bindings/usb/pd.h.
+  User can specify the sink PDO array via PDO_FIXED/BATT/VAR/PPS_APDO() defined
+  in dt-bindings/usb/pd.h.
 - op-sink-microwatt: Sink required operating power in microwatt, if source
   can't offer the power, Capability Mismatch is set. Required for power
   sink and power dual role.
diff --git a/Documentation/devicetree/bindings/phy/brcm-sata-phy.txt b/Documentation/devicetree/bindings/phy/brcm-sata-phy.txt
index 0aced97d8092..b640845fec67 100644
--- a/Documentation/devicetree/bindings/phy/brcm-sata-phy.txt
+++ b/Documentation/devicetree/bindings/phy/brcm-sata-phy.txt
@@ -8,6 +8,7 @@ Required properties:
      "brcm,iproc-nsp-sata-phy"
      "brcm,phy-sata3"
      "brcm,iproc-sr-sata-phy"
+     "brcm,bcm63138-sata-phy"
 - address-cells: should be 1
 - size-cells: should be 0
 - reg: register ranges for the PHY PCB interface
diff --git a/Documentation/devicetree/bindings/phy/phy-cadence-dp.txt b/Documentation/devicetree/bindings/phy/phy-cadence-dp.txt
new file mode 100644
index 000000000000..7f49fd54ebc1
--- /dev/null
+++ b/Documentation/devicetree/bindings/phy/phy-cadence-dp.txt
@@ -0,0 +1,30 @@
+Cadence MHDP DisplayPort SD0801 PHY binding
+===========================================
+
+This binding describes the Cadence SD0801 PHY hardware included with
+the Cadence MHDP DisplayPort controller.
+
+-------------------------------------------------------------------------------
+Required properties (controller (parent) node):
+- compatible    : Should be "cdns,dp-phy"
+- reg           : Defines the following sets of registers in the parent
+                  mhdp device:
+                        - Offset of the DPTX PHY configuration registers
+                        - Offset of the SD0801 PHY configuration registers
+- #phy-cells    : from the generic PHY bindings, must be 0.
+
+Optional properties:
+- num_lanes     : Number of DisplayPort lanes to use (1, 2 or 4)
+- max_bit_rate  : Maximum DisplayPort link bit rate to use, in Mbps (2160,
+                  2430, 2700, 3240, 4320, 5400 or 8100)
+-------------------------------------------------------------------------------
+
+Example:
+        dp_phy: phy@f0fb030a00 {
+                compatible = "cdns,dp-phy";
+                reg = <0xf0 0xfb030a00 0x0 0x00000040>,
+                      <0xf0 0xfb500000 0x0 0x00100000>;
+                num_lanes = <4>;
+                max_bit_rate = <8100>;
+                #phy-cells = <0>;
+        };
diff --git a/Documentation/devicetree/bindings/phy/phy-rockchip-inno-hdmi.txt b/Documentation/devicetree/bindings/phy/phy-rockchip-inno-hdmi.txt
new file mode 100644
index 000000000000..710cccd5ee56
--- /dev/null
+++ b/Documentation/devicetree/bindings/phy/phy-rockchip-inno-hdmi.txt
@@ -0,0 +1,43 @@
+ROCKCHIP HDMI PHY WITH INNO IP BLOCK
+
+Required properties:
+ - compatible : should be one of the listed compatibles:
+        * "rockchip,rk3228-hdmi-phy",
+        * "rockchip,rk3328-hdmi-phy";
+ - reg : Address and length of the hdmi phy control register set
+ - clocks : phandle + clock specifier for the phy clocks
+ - clock-names : string, clock name, must contain "sysclk" for system
+          control and register configuration, "refoclk" for crystal-
+          oscillator reference PLL clock input and "refpclk" for pclk-
+          based refeference PLL clock input.
+ - #clock-cells: should be 0.
+ - clock-output-names : shall be the name for the output clock.
+ - interrupts : phandle + interrupt specified for the hdmiphy interrupt
+ - #phy-cells : must be 0. See ./phy-bindings.txt for details.
+
+Optional properties for rk3328-hdmi-phy:
+ - nvmem-cells = phandle + nvmem specifier for the cpu-version efuse
+ - nvmem-cell-names : "cpu-version" to read the chip version, required
+          for adjustment to some frequency settings
+
+Example:
+        hdmi_phy: hdmi-phy@12030000 {
+                compatible = "rockchip,rk3228-hdmi-phy";
+                reg = <0x12030000 0x10000>;
+                #phy-cells = <0>;
+                clocks = <&cru PCLK_HDMI_PHY>, <&xin24m>, <&cru DCLK_HDMIPHY>;
+                clock-names = "sysclk", "refoclk", "refpclk";
+                #clock-cells = <0>;
+                clock-output-names = "hdmi_phy";
+                status = "disabled";
+        };
+
+Then the PHY can be used in other nodes such as:
+
+        hdmi: hdmi@200a0000 {
+                compatible = "rockchip,rk3228-dw-hdmi";
+                ...
+                phys = <&hdmi_phy>;
+                phy-names = "hdmi";
+                ...
+        };
diff --git a/Documentation/devicetree/bindings/phy/qcom-qmp-phy.txt b/Documentation/devicetree/bindings/phy/qcom-qmp-phy.txt
index 0c7629e88bf3..adf20b2bdf71 100644
--- a/Documentation/devicetree/bindings/phy/qcom-qmp-phy.txt
+++ b/Documentation/devicetree/bindings/phy/qcom-qmp-phy.txt
@@ -10,16 +10,20 @@ Required properties:
                "qcom,msm8996-qmp-pcie-phy" for 14nm PCIe phy on msm8996,
                "qcom,msm8996-qmp-usb3-phy" for 14nm USB3 phy on msm8996,
                "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-usb3-uni-phy" for USB3 QMP V3 UNI phy on sdm845,
+               "qcom,sdm845-qmp-ufs-phy" for UFS QMP phy on sdm845.
 
- - reg:
-   - For "qcom,sdm845-qmp-usb3-phy":
-     - index 0: address and length of register set for PHY's common serdes
-       block.
-     - named register "dp_com" (using reg-names): address and length of the
-       DP_COM control block.
-   - For all others:
-     - offset and length of register set for PHY's common serdes block.
+- reg:
+  - index 0: address and length of register set for PHY's common
+             serdes block.
+  - index 1: address and length of the DP_COM control block (for
+             "qcom,sdm845-qmp-usb3-phy" only).
+
+- reg-names:
+  - For "qcom,sdm845-qmp-usb3-phy":
+    - Should be: "reg-base", "dp_com"
+  - For all others:
+    - The reg-names property shouldn't be defined.
 
  - #clock-cells: must be 1
     - Phy pll outputs a bunch of clocks for Tx, Rx and Pipe
@@ -35,6 +39,7 @@ Required properties:
                 "aux" for phy aux clock,
                 "ref" for 19.2 MHz ref clk,
                 "com_aux" for phy common block aux clock,
+                "ref_aux" for phy reference aux clock,
                 For "qcom,msm8996-qmp-pcie-phy" must contain:
                         "aux", "cfg_ahb", "ref".
                 For "qcom,msm8996-qmp-usb3-phy" must contain:
diff --git a/Documentation/devicetree/bindings/phy/rcar-gen3-phy-usb2.txt b/Documentation/devicetree/bindings/phy/rcar-gen3-phy-usb2.txt
index fb4a204da2bf..de7b5393c163 100644
--- a/Documentation/devicetree/bindings/phy/rcar-gen3-phy-usb2.txt
+++ b/Documentation/devicetree/bindings/phy/rcar-gen3-phy-usb2.txt
@@ -1,10 +1,12 @@
 * 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.
+3 and RZ/G2 USB 2.0 PHY contain.
 
 Required properties:
-- compatible: "renesas,usb2-phy-r8a7795" if the device is a part of an R8A7795
+- compatible: "renesas,usb2-phy-r8a774a1" if the device is a part of an R8A774A1
+              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
               SoC.
@@ -14,7 +16,8 @@ Required properties:
               R8A77990 SoC.
               "renesas,usb2-phy-r8a77995" if the device is a part of an
               R8A77995 SoC.
-              "renesas,rcar-gen3-usb2-phy" for a generic R-Car Gen3 compatible device.
+              "renesas,rcar-gen3-usb2-phy" for a generic R-Car Gen3 or RZ/G2
+              compatible device.
 
               When compatible with the generic version, nodes must list the
               SoC-specific version corresponding to the platform first
@@ -31,6 +34,8 @@ channel as USB OTG:
 - interrupts: interrupt specifier for the PHY.
 - vbus-supply: Phandle to a regulator that provides power to the VBUS. This
                regulator will be managed during the PHY power on/off sequence.
+- renesas,no-otg-pins: boolean, specify when a board does not provide proper
+                       otg pins.
 
 Example (R-Car H3):
 
diff --git a/Documentation/devicetree/bindings/phy/rcar-gen3-phy-usb3.txt b/Documentation/devicetree/bindings/phy/rcar-gen3-phy-usb3.txt
index 47dd296ecead..9d9826609c2f 100644
--- a/Documentation/devicetree/bindings/phy/rcar-gen3-phy-usb3.txt
+++ b/Documentation/devicetree/bindings/phy/rcar-gen3-phy-usb3.txt
@@ -1,20 +1,22 @@
 * Renesas R-Car generation 3 USB 3.0 PHY
 
 This file provides information on what the device node for the R-Car generation
-3 USB 3.0 PHY contains.
+3 and RZ/G2 USB 3.0 PHY contain.
 If you want to enable spread spectrum clock (ssc), you should use USB_EXTAL
 instead of USB3_CLK. However, if you don't want to these features, you don't
 need this driver.
 
 Required properties:
-- compatible: "renesas,r8a7795-usb3-phy" if the device is a part of an R8A7795
+- compatible: "renesas,r8a774a1-usb3-phy" if the device is a part of an R8A774A1
+              SoC.
+              "renesas,r8a7795-usb3-phy" if the device is a part of an R8A7795
               SoC.
               "renesas,r8a7796-usb3-phy" if the device is a part of an R8A7796
               SoC.
               "renesas,r8a77965-usb3-phy" if the device is a part of an
               R8A77965 SoC.
-              "renesas,rcar-gen3-usb3-phy" for a generic R-Car Gen3 compatible
-              device.
+              "renesas,rcar-gen3-usb3-phy" for a generic R-Car Gen3 or RZ/G2
+              compatible device.
 
               When compatible with the generic version, nodes must list the
               SoC-specific version corresponding to the platform first
diff --git a/Documentation/devicetree/bindings/phy/uniphier-pcie-phy.txt b/Documentation/devicetree/bindings/phy/uniphier-pcie-phy.txt
new file mode 100644
index 000000000000..1889d3b89d68
--- /dev/null
+++ b/Documentation/devicetree/bindings/phy/uniphier-pcie-phy.txt
@@ -0,0 +1,31 @@
+Socionext UniPhier PCIe PHY bindings
+
+This describes the devicetree bindings for PHY interface built into
+PCIe controller implemented on Socionext UniPhier SoCs.
+
+Required properties:
+- compatible: Should contain one of the following:
+    "socionext,uniphier-ld20-pcie-phy" - for LD20 PHY
+    "socionext,uniphier-pxs3-pcie-phy" - for PXs3 PHY
+- reg: Specifies offset and length of the register set for the device.
+- #phy-cells: Must be zero.
+- clocks: A phandle to the clock gate for PCIe glue layer including
+        this phy.
+- resets: A phandle to the reset line for PCIe glue layer including
+        this phy.
+
+Optional properties:
+- socionext,syscon: A phandle to system control to set configurations
+        for phy.
+
+Refer to phy/phy-bindings.txt for the generic PHY binding properties.
+
+Example:
+        pcie_phy: phy@66038000 {
+                compatible = "socionext,uniphier-ld20-pcie-phy";
+                reg = <0x66038000 0x4000>;
+                #phy-cells = <0>;
+                clocks = <&sys_clk 24>;
+                resets = <&sys_rst 24>;
+                socionext,syscon = <&soc_glue>;
+        };
diff --git a/Documentation/devicetree/bindings/phy/uniphier-usb2-phy.txt b/Documentation/devicetree/bindings/phy/uniphier-usb2-phy.txt
new file mode 100644
index 000000000000..b43b28250cc0
--- /dev/null
+++ b/Documentation/devicetree/bindings/phy/uniphier-usb2-phy.txt
@@ -0,0 +1,45 @@
+Socionext UniPhier USB2 PHY
+
+This describes the devicetree bindings for PHY interface built into
+USB2 controller implemented on Socionext UniPhier SoCs.
+
+Pro4 SoC has both USB2 and USB3 host controllers, however, this USB3
+controller doesn't include its own High-Speed PHY. This needs to specify
+USB2 PHY instead of USB3 HS-PHY.
+
+Required properties:
+- compatible: Should contain one of the following:
+    "socionext,uniphier-pro4-usb2-phy" - for Pro4 SoC
+    "socionext,uniphier-ld11-usb2-phy" - for LD11 SoC
+
+Sub-nodes:
+Each PHY should be represented as a sub-node.
+
+Sub-nodes required properties:
+- #phy-cells: Should be 0.
+- reg: The number of the PHY.
+
+Sub-nodes optional properties:
+- vbus-supply: A phandle to the regulator for USB VBUS.
+
+Refer to phy/phy-bindings.txt for the generic PHY binding properties.
+
+Example:
+        soc-glue@5f800000 {
+                ...
+                usb-phy {
+                        compatible = "socionext,uniphier-ld11-usb2-phy";
+                        usb_phy0: phy@0 {
+                                reg = <0>;
+                                #phy-cells = <0>;
+                        };
+                        ...
+                };
+        };
+
+        usb@5a800100 {
+                compatible = "socionext,uniphier-ehci", "generic-ehci";
+                ...
+                phy-names = "usb";
+                phys = <&usb_phy0>;
+        };
diff --git a/Documentation/devicetree/bindings/phy/uniphier-usb3-hsphy.txt b/Documentation/devicetree/bindings/phy/uniphier-usb3-hsphy.txt
new file mode 100644
index 000000000000..e8d8086a7ae9
--- /dev/null
+++ b/Documentation/devicetree/bindings/phy/uniphier-usb3-hsphy.txt
@@ -0,0 +1,69 @@
+Socionext UniPhier USB3 High-Speed (HS) PHY
+
+This describes the devicetree bindings for PHY interfaces built into
+USB3 controller implemented on Socionext UniPhier SoCs.
+Although the controller includes High-Speed PHY and Super-Speed PHY,
+this describes about High-Speed PHY.
+
+Required properties:
+- compatible: Should contain one of the following:
+    "socionext,uniphier-pro4-usb3-hsphy" - for Pro4 SoC
+    "socionext,uniphier-pxs2-usb3-hsphy" - for PXs2 SoC
+    "socionext,uniphier-ld20-usb3-hsphy" - for LD20 SoC
+    "socionext,uniphier-pxs3-usb3-hsphy" - for PXs3 SoC
+- reg: Specifies offset and length of the register set for the device.
+- #phy-cells: Should be 0.
+- clocks: A list of phandles to the clock gate for USB3 glue layer.
+        According to the clock-names, appropriate clocks are required.
+- clock-names: Should contain the following:
+    "gio", "link" - for Pro4 SoC
+    "phy", "phy-ext", "link" - for PXs3 SoC, "phy-ext" is optional.
+    "phy", "link" - for others
+- resets: A list of phandles to the reset control for USB3 glue layer.
+        According to the reset-names, appropriate resets are required.
+- reset-names: Should contain the following:
+    "gio", "link" - for Pro4 SoC
+    "phy", "link" - for others
+
+Optional properties:
+- vbus-supply: A phandle to the regulator for USB VBUS.
+- nvmem-cells: Phandles to nvmem cell that contains the trimming data.
+        Available only for HS-PHY implemented on LD20 and PXs3, and
+        if unspecified, default value is used.
+- nvmem-cell-names: Should be the following names, which correspond to
+        each nvmem-cells.
+        All of the 3 parameters associated with the following names are
+        required for each port, if any one is omitted, the trimming data
+        of the port will not be set at all.
+    "rterm", "sel_t", "hs_i" - Each cell name for phy parameters
+
+Refer to phy/phy-bindings.txt for the generic PHY binding properties.
+
+Example:
+
+        usb-glue@65b00000 {
+                compatible = "socionext,uniphier-ld20-dwc3-glue",
+                             "simple-mfd";
+                #address-cells = <1>;
+                #size-cells = <1>;
+                ranges = <0 0x65b00000 0x400>;
+
+                usb_vbus0: regulator {
+                        ...
+                };
+
+                usb_hsphy0: hs-phy@200 {
+                        compatible = "socionext,uniphier-ld20-usb3-hsphy";
+                        reg = <0x200 0x10>;
+                        #phy-cells = <0>;
+                        clock-names = "link", "phy";
+                        clocks = <&sys_clk 14>, <&sys_clk 16>;
+                        reset-names = "link", "phy";
+                        resets = <&sys_rst 14>, <&sys_rst 16>;
+                        vbus-supply = <&usb_vbus0>;
+                        nvmem-cell-names = "rterm", "sel_t", "hs_i";
+                        nvmem-cells = <&usb_rterm0>, <&usb_sel_t0>,
+                                      <&usb_hs_i0>;
+                };
+                ...
+        };
diff --git a/Documentation/devicetree/bindings/phy/uniphier-usb3-ssphy.txt b/Documentation/devicetree/bindings/phy/uniphier-usb3-ssphy.txt
new file mode 100644
index 000000000000..490b815445e8
--- /dev/null
+++ b/Documentation/devicetree/bindings/phy/uniphier-usb3-ssphy.txt
@@ -0,0 +1,57 @@
+Socionext UniPhier USB3 Super-Speed (SS) PHY
+
+This describes the devicetree bindings for PHY interfaces built into
+USB3 controller implemented on Socionext UniPhier SoCs.
+Although the controller includes High-Speed PHY and Super-Speed PHY,
+this describes about Super-Speed PHY.
+
+Required properties:
+- compatible: Should contain one of the following:
+    "socionext,uniphier-pro4-usb3-ssphy" - for Pro4 SoC
+    "socionext,uniphier-pxs2-usb3-ssphy" - for PXs2 SoC
+    "socionext,uniphier-ld20-usb3-ssphy" - for LD20 SoC
+    "socionext,uniphier-pxs3-usb3-ssphy" - for PXs3 SoC
+- reg: Specifies offset and length of the register set for the device.
+- #phy-cells: Should be 0.
+- clocks: A list of phandles to the clock gate for USB3 glue layer.
+        According to the clock-names, appropriate clocks are required.
+- clock-names:
+    "gio", "link" - for Pro4 SoC
+    "phy", "phy-ext", "link" - for PXs3 SoC, "phy-ext" is optional.
+    "phy", "link" - for others
+- resets: A list of phandles to the reset control for USB3 glue layer.
+        According to the reset-names, appropriate resets are required.
+- reset-names:
+    "gio", "link" - for Pro4 SoC
+    "phy", "link" - for others
+
+Optional properties:
+- vbus-supply: A phandle to the regulator for USB VBUS.
+
+Refer to phy/phy-bindings.txt for the generic PHY binding properties.
+
+Example:
+
+        usb-glue@65b00000 {
+                compatible = "socionext,uniphier-ld20-dwc3-glue",
+                             "simple-mfd";
+                #address-cells = <1>;
+                #size-cells = <1>;
+                ranges = <0 0x65b00000 0x400>;
+
+                usb_vbus0: regulator {
+                        ...
+                };
+
+                usb_ssphy0: ss-phy@300 {
+                        compatible = "socionext,uniphier-ld20-usb3-ssphy";
+                        reg = <0x300 0x10>;
+                        #phy-cells = <0>;
+                        clock-names = "link", "phy";
+                        clocks = <&sys_clk 14>, <&sys_clk 16>;
+                        reset-names = "link", "phy";
+                        resets = <&sys_rst 14>, <&sys_rst 16>;
+                        vbus-supply = <&usb_vbus0>;
+                };
+                ...
+        };
diff --git a/Documentation/devicetree/bindings/usb/ci-hdrc-usb2.txt b/Documentation/devicetree/bindings/usb/ci-hdrc-usb2.txt
index 2e9318151df7..529e51879fb2 100644
--- a/Documentation/devicetree/bindings/usb/ci-hdrc-usb2.txt
+++ b/Documentation/devicetree/bindings/usb/ci-hdrc-usb2.txt
@@ -80,6 +80,8 @@ Optional properties:
   controller. It's expected that a mux state of 0 indicates device mode and a
   mux state of 1 indicates host mode.
 - mux-control-names: Shall be "usb_switch" if mux-controls is specified.
+- pinctrl-names: Names for optional pin modes in "default", "host", "device"
+- pinctrl-n: alternate pin modes
 
 i.mx specific properties
 - fsl,usbmisc: phandler of non-core register device, with one
diff --git a/Documentation/devicetree/bindings/usb/dwc3.txt b/Documentation/devicetree/bindings/usb/dwc3.txt
index 3e4c38b806ac..636630fb92d7 100644
--- a/Documentation/devicetree/bindings/usb/dwc3.txt
+++ b/Documentation/devicetree/bindings/usb/dwc3.txt
@@ -19,6 +19,7 @@ Exception for clocks:
     "cavium,octeon-7130-usb-uctl"
     "qcom,dwc3"
     "samsung,exynos5250-dwusb3"
+    "samsung,exynos5433-dwusb3"
     "samsung,exynos7-dwusb3"
     "sprd,sc9860-dwc3"
     "st,stih407-dwc3"
diff --git a/Documentation/devicetree/bindings/usb/ehci-mv.txt b/Documentation/devicetree/bindings/usb/ehci-mv.txt
new file mode 100644
index 000000000000..335589895763
--- /dev/null
+++ b/Documentation/devicetree/bindings/usb/ehci-mv.txt
@@ -0,0 +1,23 @@
+* Marvell PXA/MMP EHCI controller.
+
+Required properties:
+
+- compatible: must be "marvell,pxau2o-ehci"
+- reg: physical base addresses of the controller and length of memory mapped region
+- interrupts: one EHCI controller interrupt should be described here
+- clocks: phandle list of usb clocks
+- clock-names: should be "USBCLK"
+- phys: phandle for the PHY device
+- phy-names: should be "usb"
+
+Example:
+
+        ehci0: usb-ehci@d4208000 {
+                compatible = "marvell,pxau2o-ehci";
+                reg = <0xd4208000 0x200>;
+                interrupts = <44>;
+                clocks = <&soc_clocks MMP2_CLK_USB>;
+                clock-names = "USBCLK";
+                phys = <&usb_otg_phy>;
+                phy-names = "usb";
+        };
diff --git a/Documentation/devicetree/bindings/usb/exynos-usb.txt b/Documentation/devicetree/bindings/usb/exynos-usb.txt
index c97374315049..b7111f43fa59 100644
--- a/Documentation/devicetree/bindings/usb/exynos-usb.txt
+++ b/Documentation/devicetree/bindings/usb/exynos-usb.txt
@@ -83,6 +83,8 @@ Required properties:
  - compatible: should be one of the following -
                "samsung,exynos5250-dwusb3": for USB 3.0 DWC3 controller on
                                             Exynos5250/5420.
+               "samsung,exynos5433-dwusb3": for USB 3.0 DWC3 controller on
+                                            Exynos5433.
                "samsung,exynos7-dwusb3": for USB 3.0 DWC3 controller on Exynos7.
  - #address-cells, #size-cells : should be '1' if the device has sub-nodes
                                  with 'reg' property.
diff --git a/Documentation/devicetree/bindings/usb/faraday,fotg210.txt b/Documentation/devicetree/bindings/usb/faraday,fotg210.txt
new file mode 100644
index 000000000000..06a2286e2054
--- /dev/null
+++ b/Documentation/devicetree/bindings/usb/faraday,fotg210.txt
@@ -0,0 +1,35 @@
+Faraday FOTG Host controller
+
+This OTG-capable USB host controller is found in Cortina Systems
+Gemini and other SoC products.
+
+Required properties:
+- compatible: should be one of:
+  "faraday,fotg210"
+  "cortina,gemini-usb", "faraday,fotg210"
+- reg: should contain one register range i.e. start and length
+- interrupts: description of the interrupt line
+
+Optional properties:
+- clocks: should contain the IP block clock
+- clock-names: should be "PCLK" for the IP block clock
+
+Required properties for "cortina,gemini-usb" compatible:
+- syscon: a phandle to the system controller to access PHY registers
+
+Optional properties for "cortina,gemini-usb" compatible:
+- cortina,gemini-mini-b: boolean property that indicates that a Mini-B
+  OTG connector is in use
+- wakeup-source: see power/wakeup-source.txt
+
+Example for Gemini:
+
+usb@68000000 {
+        compatible = "cortina,gemini-usb", "faraday,fotg210";
+        reg = <0x68000000 0x1000>;
+        interrupts = <10 IRQ_TYPE_LEVEL_HIGH>;
+        clocks = <&cc 12>;
+        clock-names = "PCLK";
+        syscon = <&syscon>;
+        wakeup-source;
+};
diff --git a/Documentation/devicetree/bindings/usb/fcs,fusb302.txt b/Documentation/devicetree/bindings/usb/fcs,fusb302.txt
index 6087dc7f209e..a5d011d2efc8 100644
--- a/Documentation/devicetree/bindings/usb/fcs,fusb302.txt
+++ b/Documentation/devicetree/bindings/usb/fcs,fusb302.txt
@@ -5,10 +5,19 @@ Required properties :
 - reg                    : I2C slave address
 - interrupts             : Interrupt specifier
 
-Optional properties :
-- fcs,operating-sink-microwatt :
-                           Minimum amount of power accepted from a sink
-                           when negotiating
+Required sub-node:
+- connector : The "usb-c-connector" attached to the FUSB302 IC. The bindings
+  of the connector node are specified in:
+
+        Documentation/devicetree/bindings/connector/usb-connector.txt
+
+Deprecated properties :
+- fcs,max-sink-microvolt : Maximum sink voltage accepted by port controller
+- fcs,max-sink-microamp : Maximum sink current accepted by port controller
+- fcs,max-sink-microwatt : Maximum sink power accepted by port controller
+- fcs,operating-sink-microwatt : Minimum amount of power accepted from a sink
+  when negotiating
+
 
 Example:
 
@@ -17,7 +26,16 @@ fusb302: typec-portc@54 {
         reg = <0x54>;
         interrupt-parent = <&nmi_intc>;
         interrupts = <0 IRQ_TYPE_LEVEL_LOW>;
-        fcs,max-sink-microvolt = <12000000>;
-        fcs,max-sink-microamp = <3000000>;
-        fcs,max-sink-microwatt = <36000000>;
+
+        usb_con: connector {
+                compatible = "usb-c-connector";
+                label = "USB-C";
+                power-role = "dual";
+                try-power-role = "sink";
+                source-pdos = <PDO_FIXED(5000, 3000, PDO_FIXED_USB_COMM)>;
+                sink-pdos = <PDO_FIXED(5000, 3000, PDO_FIXED_USB_COMM)
+                             PDO_VAR(3000, 12000, 3000)
+                             PDO_PPS_APDO(3000, 11000, 3000)>;
+                op-sink-microwatt = <10000000>;
+        };
 };
diff --git a/Documentation/devicetree/bindings/usb/renesas_usb3.txt b/Documentation/devicetree/bindings/usb/renesas_usb3.txt
index 2c071bb5801e..d366555166d0 100644
--- a/Documentation/devicetree/bindings/usb/renesas_usb3.txt
+++ b/Documentation/devicetree/bindings/usb/renesas_usb3.txt
@@ -2,11 +2,13 @@ Renesas Electronics USB3.0 Peripheral driver
 
 Required properties:
   - compatible: Must contain one of the following:
+        - "renesas,r8a774a1-usb3-peri"
         - "renesas,r8a7795-usb3-peri"
         - "renesas,r8a7796-usb3-peri"
         - "renesas,r8a77965-usb3-peri"
-        - "renesas,rcar-gen3-usb3-peri" for a generic R-Car Gen3 compatible
-          device
+        - "renesas,r8a77990-usb3-peri"
+        - "renesas,rcar-gen3-usb3-peri" for a generic R-Car Gen3 or RZ/G2
+          compatible device
 
     When compatible with the generic version, nodes must list the
     SoC-specific version corresponding to the platform first
diff --git a/Documentation/devicetree/bindings/usb/renesas_usbhs.txt b/Documentation/devicetree/bindings/usb/renesas_usbhs.txt
index 43960faf5a88..90719f501852 100644
--- a/Documentation/devicetree/bindings/usb/renesas_usbhs.txt
+++ b/Documentation/devicetree/bindings/usb/renesas_usbhs.txt
@@ -4,7 +4,9 @@ Required properties:
   - compatible: Must contain one or more of the following:
 
         - "renesas,usbhs-r8a7743" for r8a7743 (RZ/G1M) compatible device
+        - "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-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
@@ -13,10 +15,11 @@ Required properties:
         - "renesas,usbhs-r8a7795" for r8a7795 (R-Car H3) compatible device
         - "renesas,usbhs-r8a7796" for r8a7796 (R-Car M3-W) compatible device
         - "renesas,usbhs-r8a77965" for r8a77965 (R-Car M3-N) compatible device
+        - "renesas,usbhs-r8a77990" for r8a77990 (R-Car E3) compatible device
         - "renesas,usbhs-r8a77995" for r8a77995 (R-Car D3) compatible device
         - "renesas,usbhs-r7s72100" for r7s72100 (RZ/A1) 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
+        - "renesas,rcar-gen3-usbhs" for R-Car Gen3 or RZ/G2 compatible devices
         - "renesas,rza1-usbhs" for RZ/A1 compatible device
 
         When compatible with the generic version, nodes must list the
@@ -25,7 +28,11 @@ Required properties:
 
   - 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
+  - clocks: A list of phandle + clock specifier pairs.
+            - In case of "renesas,rcar-gen3-usbhs", two clocks are required.
+              First clock should be peripheral and second one should be host.
+            - In case of except above, one clock is required. First clock
+              should be peripheral.
 
 Optional properties:
   - renesas,buswait: Integer to use BUSWAIT register
diff --git a/Documentation/devicetree/bindings/usb/usb-ehci.txt b/Documentation/devicetree/bindings/usb/usb-ehci.txt
index 0f1b75386207..406252d14c6b 100644
--- a/Documentation/devicetree/bindings/usb/usb-ehci.txt
+++ b/Documentation/devicetree/bindings/usb/usb-ehci.txt
@@ -15,7 +15,11 @@ Optional properties:
  - needs-reset-on-resume : boolean, set this to force EHCI reset after resume
  - has-transaction-translator : boolean, set this if EHCI have a Transaction
                                 Translator built into the root hub.
- - clocks : a list of phandle + clock specifier pairs
+ - clocks : a list of phandle + clock specifier pairs. In case of Renesas
+            R-Car Gen3 SoCs:
+            - if a host only channel: first clock should be host.
+            - if a USB DRD channel: first clock should be host and second one
+                                    should be peripheral.
  - phys : see usb-hcd.txt in the current directory
  - resets : phandle + reset specifier pair
 
diff --git a/Documentation/devicetree/bindings/usb/usb-ohci.txt b/Documentation/devicetree/bindings/usb/usb-ohci.txt
index a8d2103d1f3d..aaaa5255c972 100644
--- a/Documentation/devicetree/bindings/usb/usb-ohci.txt
+++ b/Documentation/devicetree/bindings/usb/usb-ohci.txt
@@ -12,7 +12,11 @@ Optional properties:
 - no-big-frame-no : boolean, set if frame_no lives in bits [15:0] of HCCA
 - remote-wakeup-connected: remote wakeup is wired on the platform
 - num-ports : u32, to override the detected port count
-- clocks : a list of phandle + clock specifier pairs
+- clocks : a list of phandle + clock specifier pairs. In case of Renesas
+           R-Car Gen3 SoCs:
+           - if a host only channel: first clock should be host.
+           - if a USB DRD channel: first clock should be host and second one
+                                   should be peripheral.
 - phys : see usb-hcd.txt in the current directory
 - resets : a list of phandle + reset specifier pairs
 
diff --git a/Documentation/devicetree/bindings/usb/usb-xhci.txt b/Documentation/devicetree/bindings/usb/usb-xhci.txt
index ac4cd0d6195a..fea8b1545751 100644
--- a/Documentation/devicetree/bindings/usb/usb-xhci.txt
+++ b/Documentation/devicetree/bindings/usb/usb-xhci.txt
@@ -8,6 +8,8 @@ Required properties:
     - "marvell,armada-375-xhci" for Armada 375 SoCs
     - "marvell,armada-380-xhci" for Armada 38x SoCs
     - "renesas,xhci-r8a7743" for r8a7743 SoC
+    - "renesas,xhci-r8a7744" for r8a7744 SoC
+    - "renesas,xhci-r8a774a1" for r8a774a1 SoC
     - "renesas,xhci-r8a7790" for r8a7790 SoC
     - "renesas,xhci-r8a7791" for r8a7791 SoC
     - "renesas,xhci-r8a7793" for r8a7793 SoC
@@ -17,7 +19,8 @@ Required properties:
     - "renesas,xhci-r8a77990" for r8a77990 SoC
     - "renesas,rcar-gen2-xhci" for a generic R-Car Gen2 or RZ/G1 compatible
       device
-    - "renesas,rcar-gen3-xhci" for a generic R-Car Gen3 compatible device
+    - "renesas,rcar-gen3-xhci" for a generic R-Car Gen3 or RZ/G2 compatible
+      device
     - "xhci-platform" (deprecated)
 
     When compatible with the generic version, nodes must list the
diff --git a/Documentation/ioctl/ioctl-number.txt b/Documentation/ioctl/ioctl-number.txt
index 13a7c999c04a..d05d93761653 100644
--- a/Documentation/ioctl/ioctl-number.txt
+++ b/Documentation/ioctl/ioctl-number.txt
@@ -201,7 +201,7 @@ Code  Seq#(hex)	Include File		Comments
 'X'     01      linux/pktcdvd.h         conflict!
 'Y'     all     linux/cyclades.h
 'Z'     14-15   drivers/message/fusion/mptctl.h
-'['     00-07   linux/usb/tmc.h         USB Test and Measurement Devices
+'['     00-3F   linux/usb/tmc.h         USB Test and Measurement Devices
                                         <mailto:gregkh@linuxfoundation.org>
 'a'     all     linux/atm*.h, linux/sonet.h     ATM on linux
                                         <http://lrcwww.epfl.ch/>
diff --git a/MAINTAINERS b/MAINTAINERS
index bd702ad56c7f..554941e05171 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -15443,6 +15443,12 @@ F:	Documentation/driver-api/usb/typec_bus.rst
 F:      drivers/usb/typec/altmodes/
 F:      include/linux/usb/typec_altmode.h
 
+USB TYPEC PORT CONTROLLER DRIVERS
+M:      Guenter Roeck <linux@roeck-us.net>
+L:      linux-usb@vger.kernel.org
+S:      Maintained
+F:      drivers/usb/typec/tcpm/
+
 USB UHCI DRIVER
 M:      Alan Stern <stern@rowland.harvard.edu>
 L:      linux-usb@vger.kernel.org
diff --git a/arch/arm/mach-mmp/devices.c b/arch/arm/mach-mmp/devices.c
index 671c7a09ab3d..0fca63c80e1a 100644
--- a/arch/arm/mach-mmp/devices.c
+++ b/arch/arm/mach-mmp/devices.c
@@ -277,21 +277,12 @@ struct platform_device pxa168_device_u2o = {
 
 #if IS_ENABLED(CONFIG_USB_EHCI_MV_U2O)
 struct resource pxa168_u2oehci_resources[] = {
-        /* regbase */
         [0] = {
-                .start  = PXA168_U2O_REGBASE + U2x_CAPREGS_OFFSET,
+                .start  = PXA168_U2O_REGBASE,
                 .end    = PXA168_U2O_REGBASE + USB_REG_RANGE,
                 .flags  = IORESOURCE_MEM,
-                .name   = "capregs",
         },
-        /* phybase */
         [1] = {
-                .start  = PXA168_U2O_PHYBASE,
-                .end    = PXA168_U2O_PHYBASE + USB_PHY_RANGE,
-                .flags  = IORESOURCE_MEM,
-                .name   = "phyregs",
-        },
-        [2] = {
                 .start  = IRQ_PXA168_USB1,
                 .end    = IRQ_PXA168_USB1,
                 .flags  = IORESOURCE_IRQ,
diff --git a/drivers/media/usb/em28xx/em28xx-audio.c b/drivers/media/usb/em28xx/em28xx-audio.c
index 8e799ae1df69..67481fc82445 100644
--- a/drivers/media/usb/em28xx/em28xx-audio.c
+++ b/drivers/media/usb/em28xx/em28xx-audio.c
@@ -116,6 +116,7 @@ static void em28xx_audio_isocirq(struct urb *urb)
                 stride = runtime->frame_bits >> 3;
 
                 for (i = 0; i < urb->number_of_packets; i++) {
+                        unsigned long flags;
                         int length =
                             urb->iso_frame_desc[i].actual_length / stride;
                         cp = (unsigned char *)urb->transfer_buffer +
@@ -137,7 +138,7 @@ static void em28xx_audio_isocirq(struct urb *urb)
                                        length * stride);
                         }
 
-                        snd_pcm_stream_lock(substream);
+                        snd_pcm_stream_lock_irqsave(substream, flags);
 
                         dev->adev.hwptr_done_capture += length;
                         if (dev->adev.hwptr_done_capture >=
@@ -153,7 +154,7 @@ static void em28xx_audio_isocirq(struct urb *urb)
                                 period_elapsed = 1;
                         }
 
-                        snd_pcm_stream_unlock(substream);
+                        snd_pcm_stream_unlock_irqrestore(substream, flags);
                 }
                 if (period_elapsed)
                         snd_pcm_period_elapsed(substream);
diff --git a/drivers/media/usb/em28xx/em28xx-core.c b/drivers/media/usb/em28xx/em28xx-core.c
index 5657f8710ca6..2b8c84a5c9a8 100644
--- a/drivers/media/usb/em28xx/em28xx-core.c
+++ b/drivers/media/usb/em28xx/em28xx-core.c
@@ -777,6 +777,7 @@ EXPORT_SYMBOL_GPL(em28xx_set_mode);
 static void em28xx_irq_callback(struct urb *urb)
 {
         struct em28xx *dev = urb->context;
+        unsigned long flags;
         int i;
 
         switch (urb->status) {
@@ -793,9 +794,9 @@ static void em28xx_irq_callback(struct urb *urb)
         }
 
         /* Copy data from URB */
-        spin_lock(&dev->slock);
+        spin_lock_irqsave(&dev->slock, flags);
         dev->usb_ctl.urb_data_copy(dev, urb);
-        spin_unlock(&dev->slock);
+        spin_unlock_irqrestore(&dev->slock, flags);
 
         /* Reset urb buffers */
         for (i = 0; i < urb->number_of_packets; i++) {
diff --git a/drivers/media/usb/tm6000/tm6000-video.c b/drivers/media/usb/tm6000/tm6000-video.c
index 96055de6e8ce..7d268f2404e1 100644
--- a/drivers/media/usb/tm6000/tm6000-video.c
+++ b/drivers/media/usb/tm6000/tm6000-video.c
@@ -419,6 +419,7 @@ static void tm6000_irq_callback(struct urb *urb)
 {
         struct tm6000_dmaqueue  *dma_q = urb->context;
         struct tm6000_core *dev = container_of(dma_q, struct tm6000_core, vidq);
+        unsigned long flags;
         int i;
 
         switch (urb->status) {
@@ -436,9 +437,9 @@ static void tm6000_irq_callback(struct urb *urb)
                 break;
         }
 
-        spin_lock(&dev->slock);
+        spin_lock_irqsave(&dev->slock, flags);
         tm6000_isoc_copy(urb);
-        spin_unlock(&dev->slock);
+        spin_unlock_irqrestore(&dev->slock, flags);
 
         /* Reset urb buffers */
         for (i = 0; i < urb->number_of_packets; i++) {
diff --git a/drivers/phy/Kconfig b/drivers/phy/Kconfig
index c89d3effd99d..60f949e2a684 100644
--- a/drivers/phy/Kconfig
+++ b/drivers/phy/Kconfig
@@ -43,6 +43,7 @@ config PHY_XGENE
 source "drivers/phy/allwinner/Kconfig"
 source "drivers/phy/amlogic/Kconfig"
 source "drivers/phy/broadcom/Kconfig"
+source "drivers/phy/cadence/Kconfig"
 source "drivers/phy/hisilicon/Kconfig"
 source "drivers/phy/lantiq/Kconfig"
 source "drivers/phy/marvell/Kconfig"
@@ -54,6 +55,7 @@ source "drivers/phy/ralink/Kconfig"
 source "drivers/phy/renesas/Kconfig"
 source "drivers/phy/rockchip/Kconfig"
 source "drivers/phy/samsung/Kconfig"
+source "drivers/phy/socionext/Kconfig"
 source "drivers/phy/st/Kconfig"
 source "drivers/phy/tegra/Kconfig"
 source "drivers/phy/ti/Kconfig"
diff --git a/drivers/phy/Makefile b/drivers/phy/Makefile
index ce8339ff0022..0301e25d07c1 100644
--- a/drivers/phy/Makefile
+++ b/drivers/phy/Makefile
@@ -15,6 +15,7 @@ obj-$(CONFIG_ARCH_RENESAS)		+= renesas/
 obj-$(CONFIG_ARCH_ROCKCHIP)             += rockchip/
 obj-$(CONFIG_ARCH_TEGRA)                += tegra/
 obj-y                                   += broadcom/    \
+                                           cadence/     \
                                            hisilicon/   \
                                            marvell/     \
                                            motorola/    \
@@ -22,5 +23,6 @@ obj-y					+= broadcom/	\
                                            qualcomm/    \
                                            ralink/      \
                                            samsung/     \
+                                           socionext/   \
                                            st/          \
                                            ti/
diff --git a/drivers/phy/broadcom/Kconfig b/drivers/phy/broadcom/Kconfig
index 8786a9674471..aa917a61071d 100644
--- a/drivers/phy/broadcom/Kconfig
+++ b/drivers/phy/broadcom/Kconfig
@@ -60,7 +60,8 @@ config PHY_NS2_USB_DRD
 
 config PHY_BRCM_SATA
         tristate "Broadcom SATA PHY driver"
-        depends on ARCH_BRCMSTB || ARCH_BCM_IPROC || BMIPS_GENERIC || COMPILE_TEST
+        depends on ARCH_BRCMSTB || ARCH_BCM_IPROC || BMIPS_GENERIC || \
+                   ARCH_BCM_63XX || COMPILE_TEST
         depends on OF
         select GENERIC_PHY
         default ARCH_BCM_IPROC
diff --git a/drivers/phy/broadcom/phy-bcm-cygnus-pcie.c b/drivers/phy/broadcom/phy-bcm-cygnus-pcie.c
index 0f4ac5d63cff..b074682d9dd8 100644
--- a/drivers/phy/broadcom/phy-bcm-cygnus-pcie.c
+++ b/drivers/phy/broadcom/phy-bcm-cygnus-pcie.c
@@ -153,8 +153,8 @@ static int cygnus_pcie_phy_probe(struct platform_device *pdev)
                 struct cygnus_pcie_phy *p;
 
                 if (of_property_read_u32(child, "reg", &id)) {
-                        dev_err(dev, "missing reg property for %s\n",
-                                child->name);
+                        dev_err(dev, "missing reg property for %pOFn\n",
+                                child);
                         ret = -EINVAL;
                         goto put_child;
                 }
diff --git a/drivers/phy/broadcom/phy-brcm-sata.c b/drivers/phy/broadcom/phy-brcm-sata.c
index 8708ea3b4d6d..0f4a06ff7fd3 100644
--- a/drivers/phy/broadcom/phy-brcm-sata.c
+++ b/drivers/phy/broadcom/phy-brcm-sata.c
@@ -47,6 +47,7 @@ enum brcm_sata_phy_version {
         BRCM_SATA_PHY_IPROC_NS2,
         BRCM_SATA_PHY_IPROC_NSP,
         BRCM_SATA_PHY_IPROC_SR,
+        BRCM_SATA_PHY_DSL_28NM,
 };
 
 enum brcm_sata_phy_rxaeq_mode {
@@ -96,7 +97,10 @@ enum sata_phy_regs {
         PLLCONTROL_0_FREQ_DET_RESTART           = BIT(13),
         PLLCONTROL_0_FREQ_MONITOR               = BIT(12),
         PLLCONTROL_0_SEQ_START                  = BIT(15),
+        PLL_CAP_CHARGE_TIME                     = 0x83,
+        PLL_VCO_CAL_THRESH                      = 0x84,
         PLL_CAP_CONTROL                         = 0x85,
+        PLL_FREQ_DET_TIME                       = 0x86,
         PLL_ACTRL2                              = 0x8b,
         PLL_ACTRL2_SELDIV_MASK                  = 0x1f,
         PLL_ACTRL2_SELDIV_SHIFT                 = 9,
@@ -106,6 +110,9 @@ enum sata_phy_regs {
         PLL1_ACTRL2                             = 0x82,
         PLL1_ACTRL3                             = 0x83,
         PLL1_ACTRL4                             = 0x84,
+        PLL1_ACTRL5                             = 0x85,
+        PLL1_ACTRL6                             = 0x86,
+        PLL1_ACTRL7                             = 0x87,
 
         TX_REG_BANK                             = 0x070,
         TX_ACTRL0                               = 0x80,
@@ -119,6 +126,8 @@ enum sata_phy_regs {
         AEQ_FRC_EQ_FORCE                        = BIT(0),
         AEQ_FRC_EQ_FORCE_VAL                    = BIT(1),
         AEQRX_REG_BANK_1                        = 0xe0,
+        AEQRX_SLCAL0_CTRL0                      = 0x82,
+        AEQRX_SLCAL1_CTRL0                      = 0x86,
 
         OOB_REG_BANK                            = 0x150,
         OOB1_REG_BANK                           = 0x160,
@@ -168,6 +177,7 @@ static inline void __iomem *brcm_sata_pcb_base(struct brcm_sata_port *port)
         switch (priv->version) {
         case BRCM_SATA_PHY_STB_28NM:
         case BRCM_SATA_PHY_IPROC_NS2:
+        case BRCM_SATA_PHY_DSL_28NM:
                 size = SATA_PCB_REG_28NM_SPACE_SIZE;
                 break;
         case BRCM_SATA_PHY_STB_40NM:
@@ -482,6 +492,61 @@ static int brcm_sr_sata_init(struct brcm_sata_port *port)
         return 0;
 }
 
+static int brcm_dsl_sata_init(struct brcm_sata_port *port)
+{
+        void __iomem *base = brcm_sata_pcb_base(port);
+        struct device *dev = port->phy_priv->dev;
+        unsigned int try;
+        u32 tmp;
+
+        brcm_sata_phy_wr(base, PLL1_REG_BANK, PLL1_ACTRL7, 0, 0x873);
+
+        brcm_sata_phy_wr(base, PLL1_REG_BANK, PLL1_ACTRL6, 0, 0xc000);
+
+        brcm_sata_phy_wr(base, PLL_REG_BANK_0, PLL_REG_BANK_0_PLLCONTROL_0,
+                         0, 0x3089);
+        usleep_range(1000, 2000);
+
+        brcm_sata_phy_wr(base, PLL_REG_BANK_0, PLL_REG_BANK_0_PLLCONTROL_0,
+                         0, 0x3088);
+        usleep_range(1000, 2000);
+
+        brcm_sata_phy_wr(base, AEQRX_REG_BANK_1, AEQRX_SLCAL0_CTRL0,
+                         0, 0x3000);
+
+        brcm_sata_phy_wr(base, AEQRX_REG_BANK_1, AEQRX_SLCAL1_CTRL0,
+                         0, 0x3000);
+        usleep_range(1000, 2000);
+
+        brcm_sata_phy_wr(base, PLL_REG_BANK_0, PLL_CAP_CHARGE_TIME, 0, 0x32);
+
+        brcm_sata_phy_wr(base, PLL_REG_BANK_0, PLL_VCO_CAL_THRESH, 0, 0xa);
+
+        brcm_sata_phy_wr(base, PLL_REG_BANK_0, PLL_FREQ_DET_TIME, 0, 0x64);
+        usleep_range(1000, 2000);
+
+        /* Acquire PLL lock */
+        try = 50;
+        while (try) {
+                tmp = brcm_sata_phy_rd(base, BLOCK0_REG_BANK,
+                                       BLOCK0_XGXSSTATUS);
+                if (tmp & BLOCK0_XGXSSTATUS_PLL_LOCK)
+                        break;
+                msleep(20);
+                try--;
+        };
+
+        if (!try) {
+                /* PLL did not lock; give up */
+                dev_err(dev, "port%d PLL did not lock\n", port->portnum);
+                return -ETIMEDOUT;
+        }
+
+        dev_dbg(dev, "port%d initialized\n", port->portnum);
+
+        return 0;
+}
+
 static int brcm_sata_phy_init(struct phy *phy)
 {
         int rc;
@@ -501,6 +566,9 @@ static int brcm_sata_phy_init(struct phy *phy)
         case BRCM_SATA_PHY_IPROC_SR:
                 rc = brcm_sr_sata_init(port);
                 break;
+        case BRCM_SATA_PHY_DSL_28NM:
+                rc = brcm_dsl_sata_init(port);
+                break;
         default:
                 rc = -ENODEV;
         }
@@ -552,6 +620,8 @@ static const struct of_device_id brcm_sata_phy_of_match[] = {
           .data = (void *)BRCM_SATA_PHY_IPROC_NSP },
         { .compatible   = "brcm,iproc-sr-sata-phy",
           .data = (void *)BRCM_SATA_PHY_IPROC_SR },
+        { .compatible   = "brcm,bcm63138-sata-phy",
+          .data = (void *)BRCM_SATA_PHY_DSL_28NM },
         {},
 };
 MODULE_DEVICE_TABLE(of, brcm_sata_phy_of_match);
@@ -600,8 +670,8 @@ static int brcm_sata_phy_probe(struct platform_device *pdev)
                 struct brcm_sata_port *port;
 
                 if (of_property_read_u32(child, "reg", &id)) {
-                        dev_err(dev, "missing reg property in node %s\n",
-                                        child->name);
+                        dev_err(dev, "missing reg property in node %pOFn\n",
+                                        child);
                         ret = -EINVAL;
                         goto put_child;
                 }
diff --git a/drivers/phy/broadcom/phy-brcm-usb.c b/drivers/phy/broadcom/phy-brcm-usb.c
index d1dab36fa5b7..f59b1dc30399 100644
--- a/drivers/phy/broadcom/phy-brcm-usb.c
+++ b/drivers/phy/broadcom/phy-brcm-usb.c
@@ -372,10 +372,8 @@ static int brcm_usb_phy_probe(struct platform_device *pdev)
         clk_disable(priv->usb_30_clk);
 
         phy_provider = devm_of_phy_provider_register(dev, brcm_usb_phy_xlate);
-        if (IS_ERR(phy_provider))
-                return PTR_ERR(phy_provider);
 
-        return 0;
+        return PTR_ERR_OR_ZERO(phy_provider);
 }
 
 #ifdef CONFIG_PM_SLEEP
diff --git a/drivers/phy/cadence/Kconfig b/drivers/phy/cadence/Kconfig
new file mode 100644
index 000000000000..57fff7de4031
--- /dev/null
+++ b/drivers/phy/cadence/Kconfig
@@ -0,0 +1,10 @@
+#
+# Phy driver for Cadence MHDP DisplayPort controller
+#
+config PHY_CADENCE_DP
+        tristate "Cadence MHDP DisplayPort PHY driver"
+        depends on OF
+        depends on HAS_IOMEM
+        select GENERIC_PHY
+        help
+          Support for Cadence MHDP DisplayPort PHY.
diff --git a/drivers/phy/cadence/Makefile b/drivers/phy/cadence/Makefile
new file mode 100644
index 000000000000..e5b0a11cf28a
--- /dev/null
+++ b/drivers/phy/cadence/Makefile
@@ -0,0 +1 @@
+obj-$(CONFIG_PHY_CADENCE_DP)    += phy-cadence-dp.o
diff --git a/drivers/phy/cadence/phy-cadence-dp.c b/drivers/phy/cadence/phy-cadence-dp.c
new file mode 100644
index 000000000000..bc10cb264b7a
--- /dev/null
+++ b/drivers/phy/cadence/phy-cadence-dp.c
@@ -0,0 +1,541 @@
+// SPDX-License-Identifier: GPL-2.0-only
+/*
+ * Cadence MHDP DisplayPort SD0801 PHY driver.
+ *
+ * Copyright 2018 Cadence Design Systems, Inc.
+ *
+ */
+
+#include <linux/delay.h>
+#include <linux/err.h>
+#include <linux/io.h>
+#include <linux/iopoll.h>
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/of.h>
+#include <linux/of_address.h>
+#include <linux/of_device.h>
+#include <linux/phy/phy.h>
+#include <linux/platform_device.h>
+
+#define DEFAULT_NUM_LANES       2
+#define MAX_NUM_LANES           4
+#define DEFAULT_MAX_BIT_RATE    8100 /* in Mbps */
+
+#define POLL_TIMEOUT_US         2000
+#define LANE_MASK               0x7
+
+/*
+ * register offsets from DPTX PHY register block base (i.e MHDP
+ * register base + 0x30a00)
+ */
+#define PHY_AUX_CONFIG                  0x00
+#define PHY_AUX_CTRL                    0x04
+#define PHY_RESET                       0x20
+#define PHY_PMA_XCVR_PLLCLK_EN          0x24
+#define PHY_PMA_XCVR_PLLCLK_EN_ACK      0x28
+#define PHY_PMA_XCVR_POWER_STATE_REQ    0x2c
+#define PHY_POWER_STATE_LN_0    0x0000
+#define PHY_POWER_STATE_LN_1    0x0008
+#define PHY_POWER_STATE_LN_2    0x0010
+#define PHY_POWER_STATE_LN_3    0x0018
+#define PHY_PMA_XCVR_POWER_STATE_ACK    0x30
+#define PHY_PMA_CMN_READY               0x34
+#define PHY_PMA_XCVR_TX_VMARGIN         0x38
+#define PHY_PMA_XCVR_TX_DEEMPH          0x3c
+
+/*
+ * register offsets from SD0801 PHY register block base (i.e MHDP
+ * register base + 0x500000)
+ */
+#define CMN_SSM_BANDGAP_TMR             0x00084
+#define CMN_SSM_BIAS_TMR                0x00088
+#define CMN_PLLSM0_PLLPRE_TMR           0x000a8
+#define CMN_PLLSM0_PLLLOCK_TMR          0x000b0
+#define CMN_PLLSM1_PLLPRE_TMR           0x000c8
+#define CMN_PLLSM1_PLLLOCK_TMR          0x000d0
+#define CMN_BGCAL_INIT_TMR              0x00190
+#define CMN_BGCAL_ITER_TMR              0x00194
+#define CMN_IBCAL_INIT_TMR              0x001d0
+#define CMN_PLL0_VCOCAL_INIT_TMR        0x00210
+#define CMN_PLL0_VCOCAL_ITER_TMR        0x00214
+#define CMN_PLL0_VCOCAL_REFTIM_START    0x00218
+#define CMN_PLL0_VCOCAL_PLLCNT_START    0x00220
+#define CMN_PLL0_INTDIV_M0              0x00240
+#define CMN_PLL0_FRACDIVL_M0            0x00244
+#define CMN_PLL0_FRACDIVH_M0            0x00248
+#define CMN_PLL0_HIGH_THR_M0            0x0024c
+#define CMN_PLL0_DSM_DIAG_M0            0x00250
+#define CMN_PLL0_LOCK_PLLCNT_START      0x00278
+#define CMN_PLL1_VCOCAL_INIT_TMR        0x00310
+#define CMN_PLL1_VCOCAL_ITER_TMR        0x00314
+#define CMN_PLL1_DSM_DIAG_M0            0x00350
+#define CMN_TXPUCAL_INIT_TMR            0x00410
+#define CMN_TXPUCAL_ITER_TMR            0x00414
+#define CMN_TXPDCAL_INIT_TMR            0x00430
+#define CMN_TXPDCAL_ITER_TMR            0x00434
+#define CMN_RXCAL_INIT_TMR              0x00450
+#define CMN_RXCAL_ITER_TMR              0x00454
+#define CMN_SD_CAL_INIT_TMR             0x00490
+#define CMN_SD_CAL_ITER_TMR             0x00494
+#define CMN_SD_CAL_REFTIM_START         0x00498
+#define CMN_SD_CAL_PLLCNT_START         0x004a0
+#define CMN_PDIAG_PLL0_CTRL_M0          0x00680
+#define CMN_PDIAG_PLL0_CLK_SEL_M0       0x00684
+#define CMN_PDIAG_PLL0_CP_PADJ_M0       0x00690
+#define CMN_PDIAG_PLL0_CP_IADJ_M0       0x00694
+#define CMN_PDIAG_PLL0_FILT_PADJ_M0     0x00698
+#define CMN_PDIAG_PLL0_CP_PADJ_M1       0x006d0
+#define CMN_PDIAG_PLL0_CP_IADJ_M1       0x006d4
+#define CMN_PDIAG_PLL1_CLK_SEL_M0       0x00704
+#define XCVR_DIAG_PLLDRC_CTRL           0x10394
+#define XCVR_DIAG_HSCLK_SEL             0x10398
+#define XCVR_DIAG_HSCLK_DIV             0x1039c
+#define TX_PSC_A0                       0x10400
+#define TX_PSC_A1                       0x10404
+#define TX_PSC_A2                       0x10408
+#define TX_PSC_A3                       0x1040c
+#define RX_PSC_A0                       0x20000
+#define RX_PSC_A1                       0x20004
+#define RX_PSC_A2                       0x20008
+#define RX_PSC_A3                       0x2000c
+#define PHY_PLL_CFG                     0x30038
+
+struct cdns_dp_phy {
+        void __iomem *base;     /* DPTX registers base */
+        void __iomem *sd_base; /* SD0801 registers base */
+        u32 num_lanes; /* Number of lanes to use */
+        u32 max_bit_rate; /* Maximum link bit rate to use (in Mbps) */
+        struct device *dev;
+};
+
+static int cdns_dp_phy_init(struct phy *phy);
+static void cdns_dp_phy_run(struct cdns_dp_phy *cdns_phy);
+static void cdns_dp_phy_wait_pma_cmn_ready(struct cdns_dp_phy *cdns_phy);
+static void cdns_dp_phy_pma_cfg(struct cdns_dp_phy *cdns_phy);
+static void cdns_dp_phy_pma_cmn_cfg_25mhz(struct cdns_dp_phy *cdns_phy);
+static void cdns_dp_phy_pma_lane_cfg(struct cdns_dp_phy *cdns_phy,
+                                         unsigned int lane);
+static void cdns_dp_phy_pma_cmn_vco_cfg_25mhz(struct cdns_dp_phy *cdns_phy);
+static void cdns_dp_phy_pma_cmn_rate(struct cdns_dp_phy *cdns_phy);
+static void cdns_dp_phy_write_field(struct cdns_dp_phy *cdns_phy,
+                                        unsigned int offset,
+                                        unsigned char start_bit,
+                                        unsigned char num_bits,
+                                        unsigned int val);
+
+static const struct phy_ops cdns_dp_phy_ops = {
+        .init           = cdns_dp_phy_init,
+        .owner          = THIS_MODULE,
+};
+
+static int cdns_dp_phy_init(struct phy *phy)
+{
+        unsigned char lane_bits;
+
+        struct cdns_dp_phy *cdns_phy = phy_get_drvdata(phy);
+
+        writel(0x0003, cdns_phy->base + PHY_AUX_CTRL); /* enable AUX */
+
+        /* PHY PMA registers configuration function */
+        cdns_dp_phy_pma_cfg(cdns_phy);
+
+        /*
+         * Set lines power state to A0
+         * Set lines pll clk enable to 0
+         */
+
+        cdns_dp_phy_write_field(cdns_phy, PHY_PMA_XCVR_POWER_STATE_REQ,
+                                PHY_POWER_STATE_LN_0, 6, 0x0000);
+
+        if (cdns_phy->num_lanes >= 2) {
+                cdns_dp_phy_write_field(cdns_phy,
+                                        PHY_PMA_XCVR_POWER_STATE_REQ,
+                                        PHY_POWER_STATE_LN_1, 6, 0x0000);
+
+                if (cdns_phy->num_lanes == 4) {
+                        cdns_dp_phy_write_field(cdns_phy,
+                                                PHY_PMA_XCVR_POWER_STATE_REQ,
+                                                PHY_POWER_STATE_LN_2, 6, 0);
+                        cdns_dp_phy_write_field(cdns_phy,
+                                                PHY_PMA_XCVR_POWER_STATE_REQ,
+                                                PHY_POWER_STATE_LN_3, 6, 0);
+                }
+        }
+
+        cdns_dp_phy_write_field(cdns_phy, PHY_PMA_XCVR_PLLCLK_EN,
+                                0, 1, 0x0000);
+
+        if (cdns_phy->num_lanes >= 2) {
+                cdns_dp_phy_write_field(cdns_phy, PHY_PMA_XCVR_PLLCLK_EN,
+                                        1, 1, 0x0000);
+                if (cdns_phy->num_lanes == 4) {
+                        cdns_dp_phy_write_field(cdns_phy,
+                                                PHY_PMA_XCVR_PLLCLK_EN,
+                                                2, 1, 0x0000);
+                        cdns_dp_phy_write_field(cdns_phy,
+                                                PHY_PMA_XCVR_PLLCLK_EN,
+                                                3, 1, 0x0000);
+                }
+        }
+
+        /*
+         * release phy_l0*_reset_n and pma_tx_elec_idle_ln_* based on
+         * used lanes
+         */
+        lane_bits = (1 << cdns_phy->num_lanes) - 1;
+        writel(((0xF & ~lane_bits) << 4) | (0xF & lane_bits),
+                   cdns_phy->base + PHY_RESET);
+
+        /* release pma_xcvr_pllclk_en_ln_*, only for the master lane */
+        writel(0x0001, cdns_phy->base + PHY_PMA_XCVR_PLLCLK_EN);
+
+        /* PHY PMA registers configuration functions */
+        cdns_dp_phy_pma_cmn_vco_cfg_25mhz(cdns_phy);
+        cdns_dp_phy_pma_cmn_rate(cdns_phy);
+
+        /* take out of reset */
+        cdns_dp_phy_write_field(cdns_phy, PHY_RESET, 8, 1, 1);
+        cdns_dp_phy_wait_pma_cmn_ready(cdns_phy);
+        cdns_dp_phy_run(cdns_phy);
+
+        return 0;
+}
+
+static void cdns_dp_phy_wait_pma_cmn_ready(struct cdns_dp_phy *cdns_phy)
+{
+        unsigned int reg;
+        int ret;
+
+        ret = readl_poll_timeout(cdns_phy->base + PHY_PMA_CMN_READY, reg,
+                                 reg & 1, 0, 500);
+        if (ret == -ETIMEDOUT)
+                dev_err(cdns_phy->dev,
+                        "timeout waiting for PMA common ready\n");
+}
+
+static void cdns_dp_phy_pma_cfg(struct cdns_dp_phy *cdns_phy)
+{
+        unsigned int i;
+
+        /* PMA common configuration */
+        cdns_dp_phy_pma_cmn_cfg_25mhz(cdns_phy);
+
+        /* PMA lane configuration to deal with multi-link operation */
+        for (i = 0; i < cdns_phy->num_lanes; i++)
+                cdns_dp_phy_pma_lane_cfg(cdns_phy, i);
+}
+
+static void cdns_dp_phy_pma_cmn_cfg_25mhz(struct cdns_dp_phy *cdns_phy)
+{
+        /* refclock registers - assumes 25 MHz refclock */
+        writel(0x0019, cdns_phy->sd_base + CMN_SSM_BIAS_TMR);
+        writel(0x0032, cdns_phy->sd_base + CMN_PLLSM0_PLLPRE_TMR);
+        writel(0x00D1, cdns_phy->sd_base + CMN_PLLSM0_PLLLOCK_TMR);
+        writel(0x0032, cdns_phy->sd_base + CMN_PLLSM1_PLLPRE_TMR);
+        writel(0x00D1, cdns_phy->sd_base + CMN_PLLSM1_PLLLOCK_TMR);
+        writel(0x007D, cdns_phy->sd_base + CMN_BGCAL_INIT_TMR);
+        writel(0x007D, cdns_phy->sd_base + CMN_BGCAL_ITER_TMR);
+        writel(0x0019, cdns_phy->sd_base + CMN_IBCAL_INIT_TMR);
+        writel(0x001E, cdns_phy->sd_base + CMN_TXPUCAL_INIT_TMR);
+        writel(0x0006, cdns_phy->sd_base + CMN_TXPUCAL_ITER_TMR);
+        writel(0x001E, cdns_phy->sd_base + CMN_TXPDCAL_INIT_TMR);
+        writel(0x0006, cdns_phy->sd_base + CMN_TXPDCAL_ITER_TMR);
+        writel(0x02EE, cdns_phy->sd_base + CMN_RXCAL_INIT_TMR);
+        writel(0x0006, cdns_phy->sd_base + CMN_RXCAL_ITER_TMR);
+        writel(0x0002, cdns_phy->sd_base + CMN_SD_CAL_INIT_TMR);
+        writel(0x0002, cdns_phy->sd_base + CMN_SD_CAL_ITER_TMR);
+        writel(0x000E, cdns_phy->sd_base + CMN_SD_CAL_REFTIM_START);
+        writel(0x012B, cdns_phy->sd_base + CMN_SD_CAL_PLLCNT_START);
+        /* PLL registers */
+        writel(0x0409, cdns_phy->sd_base + CMN_PDIAG_PLL0_CP_PADJ_M0);
+        writel(0x1001, cdns_phy->sd_base + CMN_PDIAG_PLL0_CP_IADJ_M0);
+        writel(0x0F08, cdns_phy->sd_base + CMN_PDIAG_PLL0_FILT_PADJ_M0);
+        writel(0x0004, cdns_phy->sd_base + CMN_PLL0_DSM_DIAG_M0);
+        writel(0x00FA, cdns_phy->sd_base + CMN_PLL0_VCOCAL_INIT_TMR);
+        writel(0x0004, cdns_phy->sd_base + CMN_PLL0_VCOCAL_ITER_TMR);
+        writel(0x00FA, cdns_phy->sd_base + CMN_PLL1_VCOCAL_INIT_TMR);
+        writel(0x0004, cdns_phy->sd_base + CMN_PLL1_VCOCAL_ITER_TMR);
+        writel(0x0318, cdns_phy->sd_base + CMN_PLL0_VCOCAL_REFTIM_START);
+}
+
+static void cdns_dp_phy_pma_cmn_vco_cfg_25mhz(struct cdns_dp_phy *cdns_phy)
+{
+        /* Assumes 25 MHz refclock */
+        switch (cdns_phy->max_bit_rate) {
+                /* Setting VCO for 10.8GHz */
+        case 2700:
+        case 5400:
+                writel(0x01B0, cdns_phy->sd_base + CMN_PLL0_INTDIV_M0);
+                writel(0x0000, cdns_phy->sd_base + CMN_PLL0_FRACDIVL_M0);
+                writel(0x0002, cdns_phy->sd_base + CMN_PLL0_FRACDIVH_M0);
+                writel(0x0120, cdns_phy->sd_base + CMN_PLL0_HIGH_THR_M0);
+                break;
+                /* Setting VCO for 9.72GHz */
+        case 2430:
+        case 3240:
+                writel(0x0184, cdns_phy->sd_base + CMN_PLL0_INTDIV_M0);
+                writel(0xCCCD, cdns_phy->sd_base + CMN_PLL0_FRACDIVL_M0);
+                writel(0x0002, cdns_phy->sd_base + CMN_PLL0_FRACDIVH_M0);
+                writel(0x0104, cdns_phy->sd_base + CMN_PLL0_HIGH_THR_M0);
+                break;
+                /* Setting VCO for 8.64GHz */
+        case 2160:
+        case 4320:
+                writel(0x0159, cdns_phy->sd_base + CMN_PLL0_INTDIV_M0);
+                writel(0x999A, cdns_phy->sd_base + CMN_PLL0_FRACDIVL_M0);
+                writel(0x0002, cdns_phy->sd_base + CMN_PLL0_FRACDIVH_M0);
+                writel(0x00E7, cdns_phy->sd_base + CMN_PLL0_HIGH_THR_M0);
+                break;
+                /* Setting VCO for 8.1GHz */
+        case 8100:
+                writel(0x0144, cdns_phy->sd_base + CMN_PLL0_INTDIV_M0);
+                writel(0x0000, cdns_phy->sd_base + CMN_PLL0_FRACDIVL_M0);
+                writel(0x0002, cdns_phy->sd_base + CMN_PLL0_FRACDIVH_M0);
+                writel(0x00D8, cdns_phy->sd_base + CMN_PLL0_HIGH_THR_M0);
+                break;
+        }
+
+        writel(0x0002, cdns_phy->sd_base + CMN_PDIAG_PLL0_CTRL_M0);
+        writel(0x0318, cdns_phy->sd_base + CMN_PLL0_VCOCAL_PLLCNT_START);
+}
+
+static void cdns_dp_phy_pma_cmn_rate(struct cdns_dp_phy *cdns_phy)
+{
+        unsigned int clk_sel_val = 0;
+        unsigned int hsclk_div_val = 0;
+        unsigned int i;
+
+        /* 16'h0000 for single DP link configuration */
+        writel(0x0000, cdns_phy->sd_base + PHY_PLL_CFG);
+
+        switch (cdns_phy->max_bit_rate) {
+        case 1620:
+                clk_sel_val = 0x0f01;
+                hsclk_div_val = 2;
+                break;
+        case 2160:
+        case 2430:
+        case 2700:
+                clk_sel_val = 0x0701;
+                 hsclk_div_val = 1;
+                break;
+        case 3240:
+                clk_sel_val = 0x0b00;
+                hsclk_div_val = 2;
+                break;
+        case 4320:
+        case 5400:
+                clk_sel_val = 0x0301;
+                hsclk_div_val = 0;
+                break;
+        case 8100:
+                clk_sel_val = 0x0200;
+                hsclk_div_val = 0;
+                break;
+        }
+
+        writel(clk_sel_val, cdns_phy->sd_base + CMN_PDIAG_PLL0_CLK_SEL_M0);
+
+        /* PMA lane configuration to deal with multi-link operation */
+        for (i = 0; i < cdns_phy->num_lanes; i++) {
+                writel(hsclk_div_val,
+                       cdns_phy->sd_base + (XCVR_DIAG_HSCLK_DIV | (i<<11)));
+        }
+}
+
+static void cdns_dp_phy_pma_lane_cfg(struct cdns_dp_phy *cdns_phy,
+                                     unsigned int lane)
+{
+        unsigned int lane_bits = (lane & LANE_MASK) << 11;
+
+        /* Writing Tx/Rx Power State Controllers registers */
+        writel(0x00FB, cdns_phy->sd_base + (TX_PSC_A0 | lane_bits));
+        writel(0x04AA, cdns_phy->sd_base + (TX_PSC_A2 | lane_bits));
+        writel(0x04AA, cdns_phy->sd_base + (TX_PSC_A3 | lane_bits));
+        writel(0x0000, cdns_phy->sd_base + (RX_PSC_A0 | lane_bits));
+        writel(0x0000, cdns_phy->sd_base + (RX_PSC_A2 | lane_bits));
+        writel(0x0000, cdns_phy->sd_base + (RX_PSC_A3 | lane_bits));
+
+        writel(0x0001, cdns_phy->sd_base + (XCVR_DIAG_PLLDRC_CTRL | lane_bits));
+        writel(0x0000, cdns_phy->sd_base + (XCVR_DIAG_HSCLK_SEL | lane_bits));
+}
+
+static void cdns_dp_phy_run(struct cdns_dp_phy *cdns_phy)
+{
+        unsigned int read_val;
+        u32 write_val1 = 0;
+        u32 write_val2 = 0;
+        u32 mask = 0;
+        int ret;
+
+        /*
+         * waiting for ACK of pma_xcvr_pllclk_en_ln_*, only for the
+         * master lane
+         */
+        ret = readl_poll_timeout(cdns_phy->base + PHY_PMA_XCVR_PLLCLK_EN_ACK,
+                                 read_val, read_val & 1, 0, POLL_TIMEOUT_US);
+        if (ret == -ETIMEDOUT)
+                dev_err(cdns_phy->dev,
+                        "timeout waiting for link PLL clock enable ack\n");
+
+        ndelay(100);
+
+        switch (cdns_phy->num_lanes) {
+
+        case 1: /* lane 0 */
+                write_val1 = 0x00000004;
+                write_val2 = 0x00000001;
+                mask = 0x0000003f;
+                break;
+        case 2: /* lane 0-1 */
+                write_val1 = 0x00000404;
+                write_val2 = 0x00000101;
+                mask = 0x00003f3f;
+                break;
+        case 4: /* lane 0-3 */
+                write_val1 = 0x04040404;
+                write_val2 = 0x01010101;
+                mask = 0x3f3f3f3f;
+                break;
+        }
+
+        writel(write_val1, cdns_phy->base + PHY_PMA_XCVR_POWER_STATE_REQ);
+
+        ret = readl_poll_timeout(cdns_phy->base + PHY_PMA_XCVR_POWER_STATE_ACK,
+                                 read_val, (read_val & mask) == write_val1, 0,
+                                 POLL_TIMEOUT_US);
+        if (ret == -ETIMEDOUT)
+                dev_err(cdns_phy->dev,
+                        "timeout waiting for link power state ack\n");
+
+        writel(0, cdns_phy->base + PHY_PMA_XCVR_POWER_STATE_REQ);
+        ndelay(100);
+
+        writel(write_val2, cdns_phy->base + PHY_PMA_XCVR_POWER_STATE_REQ);
+
+        ret = readl_poll_timeout(cdns_phy->base + PHY_PMA_XCVR_POWER_STATE_ACK,
+                                 read_val, (read_val & mask) == write_val2, 0,
+                                 POLL_TIMEOUT_US);
+        if (ret == -ETIMEDOUT)
+                dev_err(cdns_phy->dev,
+                        "timeout waiting for link power state ack\n");
+
+        writel(0, cdns_phy->base + PHY_PMA_XCVR_POWER_STATE_REQ);
+        ndelay(100);
+}
+
+static void cdns_dp_phy_write_field(struct cdns_dp_phy *cdns_phy,
+                                    unsigned int offset,
+                                    unsigned char start_bit,
+                                    unsigned char num_bits,
+                                    unsigned int val)
+{
+        unsigned int read_val;
+
+        read_val = readl(cdns_phy->base + offset);
+        writel(((val << start_bit) | (read_val & ~(((1 << num_bits) - 1) <<
+                start_bit))), cdns_phy->base + offset);
+}
+
+static int cdns_dp_phy_probe(struct platform_device *pdev)
+{
+        struct resource *regs;
+        struct cdns_dp_phy *cdns_phy;
+        struct device *dev = &pdev->dev;
+        struct phy_provider *phy_provider;
+        struct phy *phy;
+        int err;
+
+        cdns_phy = devm_kzalloc(dev, sizeof(*cdns_phy), GFP_KERNEL);
+        if (!cdns_phy)
+                return -ENOMEM;
+
+        cdns_phy->dev = &pdev->dev;
+
+        phy = devm_phy_create(dev, NULL, &cdns_dp_phy_ops);
+        if (IS_ERR(phy)) {
+                dev_err(dev, "failed to create DisplayPort PHY\n");
+                return PTR_ERR(phy);
+        }
+
+        regs = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+        cdns_phy->base = devm_ioremap_resource(&pdev->dev, regs);
+        if (IS_ERR(cdns_phy->base))
+                return PTR_ERR(cdns_phy->base);
+
+        regs = platform_get_resource(pdev, IORESOURCE_MEM, 1);
+        cdns_phy->sd_base = devm_ioremap_resource(&pdev->dev, regs);
+        if (IS_ERR(cdns_phy->sd_base))
+                return PTR_ERR(cdns_phy->sd_base);
+
+        err = device_property_read_u32(dev, "num_lanes",
+                                       &(cdns_phy->num_lanes));
+        if (err)
+                cdns_phy->num_lanes = DEFAULT_NUM_LANES;
+
+        switch (cdns_phy->num_lanes) {
+        case 1:
+        case 2:
+        case 4:
+                /* valid number of lanes */
+                break;
+        default:
+                dev_err(dev, "unsupported number of lanes: %d\n",
+                        cdns_phy->num_lanes);
+                return -EINVAL;
+        }
+
+        err = device_property_read_u32(dev, "max_bit_rate",
+                   &(cdns_phy->max_bit_rate));
+        if (err)
+                cdns_phy->max_bit_rate = DEFAULT_MAX_BIT_RATE;
+
+        switch (cdns_phy->max_bit_rate) {
+        case 2160:
+        case 2430:
+        case 2700:
+        case 3240:
+        case 4320:
+        case 5400:
+        case 8100:
+                /* valid bit rate */
+                break;
+        default:
+                dev_err(dev, "unsupported max bit rate: %dMbps\n",
+                        cdns_phy->max_bit_rate);
+                return -EINVAL;
+        }
+
+        phy_set_drvdata(phy, cdns_phy);
+
+        phy_provider = devm_of_phy_provider_register(dev, of_phy_simple_xlate);
+
+        dev_info(dev, "%d lanes, max bit rate %d.%03d Gbps\n",
+                 cdns_phy->num_lanes,
+                 cdns_phy->max_bit_rate / 1000,
+                 cdns_phy->max_bit_rate % 1000);
+
+        return PTR_ERR_OR_ZERO(phy_provider);
+}
+
+static const struct of_device_id cdns_dp_phy_of_match[] = {
+        {
+                .compatible = "cdns,dp-phy"
+        },
+        {}
+};
+MODULE_DEVICE_TABLE(of, cdns_dp_phy_of_match);
+
+static struct platform_driver cdns_dp_phy_driver = {
+        .probe  = cdns_dp_phy_probe,
+        .driver = {
+                .name   = "cdns-dp-phy",
+                .of_match_table = cdns_dp_phy_of_match,
+        }
+};
+module_platform_driver(cdns_dp_phy_driver);
+
+MODULE_AUTHOR("Cadence Design Systems, Inc.");
+MODULE_DESCRIPTION("Cadence MHDP PHY driver");
+MODULE_LICENSE("GPL v2");
diff --git a/drivers/phy/lantiq/phy-lantiq-rcu-usb2.c b/drivers/phy/lantiq/phy-lantiq-rcu-usb2.c
index 986224fca9e9..f9e0dd19ff26 100644
--- a/drivers/phy/lantiq/phy-lantiq-rcu-usb2.c
+++ b/drivers/phy/lantiq/phy-lantiq-rcu-usb2.c
@@ -156,7 +156,6 @@ static int ltq_rcu_usb2_of_parse(struct ltq_rcu_usb2_priv *priv,
 {
         struct device *dev = priv->dev;
         const __be32 *offset;
-        int ret;
 
         priv->reg_bits = of_device_get_match_data(dev);
 
@@ -196,10 +195,8 @@ static int ltq_rcu_usb2_of_parse(struct ltq_rcu_usb2_priv *priv,
         }
 
         priv->phy_reset = devm_reset_control_get_optional(dev, "phy");
-        if (IS_ERR(priv->phy_reset))
-                return PTR_ERR(priv->phy_reset);
 
-        return 0;
+        return PTR_ERR_OR_ZERO(priv->phy_reset);
 }
 
 static int ltq_rcu_usb2_phy_probe(struct platform_device *pdev)
diff --git a/drivers/phy/marvell/Kconfig b/drivers/phy/marvell/Kconfig
index 68e321225400..6fb4b56e4c14 100644
--- a/drivers/phy/marvell/Kconfig
+++ b/drivers/phy/marvell/Kconfig
@@ -59,3 +59,14 @@ config PHY_PXA_28NM_USB2
           The PHY driver will be used by Marvell udc/ehci/otg driver.
 
           To compile this driver as a module, choose M here.
+
+config PHY_PXA_USB
+        tristate "Marvell PXA USB PHY Driver"
+        depends on ARCH_PXA || ARCH_MMP
+        select GENERIC_PHY
+        help
+          Enable this to support Marvell PXA USB PHY driver for Marvell
+          SoC. This driver will do the PHY initialization and shutdown.
+          The PHY driver will be used by Marvell udc/ehci/otg driver.
+
+          To compile this driver as a module, choose M here.
diff --git a/drivers/phy/marvell/Makefile b/drivers/phy/marvell/Makefile
index 5c3ec5d10e0d..3975b144f8ec 100644
--- a/drivers/phy/marvell/Makefile
+++ b/drivers/phy/marvell/Makefile
@@ -6,3 +6,4 @@ obj-$(CONFIG_PHY_MVEBU_CP110_COMPHY)	+= phy-mvebu-cp110-comphy.o
 obj-$(CONFIG_PHY_MVEBU_SATA)            += phy-mvebu-sata.o
 obj-$(CONFIG_PHY_PXA_28NM_HSIC)         += phy-pxa-28nm-hsic.o
 obj-$(CONFIG_PHY_PXA_28NM_USB2)         += phy-pxa-28nm-usb2.o
+obj-$(CONFIG_PHY_PXA_USB)               += phy-pxa-usb.o
diff --git a/drivers/phy/marvell/phy-berlin-sata.c b/drivers/phy/marvell/phy-berlin-sata.c
index c1bb6725e48f..a91fc67fc4e0 100644
--- a/drivers/phy/marvell/phy-berlin-sata.c
+++ b/drivers/phy/marvell/phy-berlin-sata.c
@@ -231,14 +231,14 @@ static int phy_berlin_sata_probe(struct platform_device *pdev)
                 struct phy_berlin_desc *phy_desc;
 
                 if (of_property_read_u32(child, "reg", &phy_id)) {
-                        dev_err(dev, "missing reg property in node %s\n",
-                                child->name);
+                        dev_err(dev, "missing reg property in node %pOFn\n",
+                                child);
                         ret = -EINVAL;
                         goto put_child;
                 }
 
                 if (phy_id >= ARRAY_SIZE(phy_berlin_power_down_bits)) {
-                        dev_err(dev, "invalid reg in node %s\n", child->name);
+                        dev_err(dev, "invalid reg in node %pOFn\n", child);
                         ret = -EINVAL;
                         goto put_child;
                 }
diff --git a/drivers/phy/marvell/phy-pxa-usb.c b/drivers/phy/marvell/phy-pxa-usb.c
new file mode 100644
index 000000000000..87ff7550b912
--- /dev/null
+++ b/drivers/phy/marvell/phy-pxa-usb.c
@@ -0,0 +1,345 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * Copyright (C) 2011 Marvell International Ltd. All rights reserved.
+ * Copyright (C) 2018 Lubomir Rintel <lkundrak@v3.sk>
+ */
+
+#include <dt-bindings/phy/phy.h>
+#include <linux/clk.h>
+#include <linux/delay.h>
+#include <linux/io.h>
+#include <linux/module.h>
+#include <linux/of_address.h>
+#include <linux/phy/phy.h>
+#include <linux/platform_device.h>
+
+/* phy regs */
+#define UTMI_REVISION           0x0
+#define UTMI_CTRL               0x4
+#define UTMI_PLL                0x8
+#define UTMI_TX                 0xc
+#define UTMI_RX                 0x10
+#define UTMI_IVREF              0x14
+#define UTMI_T0                 0x18
+#define UTMI_T1                 0x1c
+#define UTMI_T2                 0x20
+#define UTMI_T3                 0x24
+#define UTMI_T4                 0x28
+#define UTMI_T5                 0x2c
+#define UTMI_RESERVE            0x30
+#define UTMI_USB_INT            0x34
+#define UTMI_DBG_CTL            0x38
+#define UTMI_OTG_ADDON          0x3c
+
+/* For UTMICTRL Register */
+#define UTMI_CTRL_USB_CLK_EN                    (1 << 31)
+/* pxa168 */
+#define UTMI_CTRL_SUSPEND_SET1                  (1 << 30)
+#define UTMI_CTRL_SUSPEND_SET2                  (1 << 29)
+#define UTMI_CTRL_RXBUF_PDWN                    (1 << 24)
+#define UTMI_CTRL_TXBUF_PDWN                    (1 << 11)
+
+#define UTMI_CTRL_INPKT_DELAY_SHIFT             30
+#define UTMI_CTRL_INPKT_DELAY_SOF_SHIFT         28
+#define UTMI_CTRL_PU_REF_SHIFT                  20
+#define UTMI_CTRL_ARC_PULLDN_SHIFT              12
+#define UTMI_CTRL_PLL_PWR_UP_SHIFT              1
+#define UTMI_CTRL_PWR_UP_SHIFT                  0
+
+/* For UTMI_PLL Register */
+#define UTMI_PLL_PLLCALI12_SHIFT                29
+#define UTMI_PLL_PLLCALI12_MASK                 (0x3 << 29)
+
+#define UTMI_PLL_PLLVDD18_SHIFT                 27
+#define UTMI_PLL_PLLVDD18_MASK                  (0x3 << 27)
+
+#define UTMI_PLL_PLLVDD12_SHIFT                 25
+#define UTMI_PLL_PLLVDD12_MASK                  (0x3 << 25)
+
+#define UTMI_PLL_CLK_BLK_EN_SHIFT               24
+#define CLK_BLK_EN                              (0x1 << 24)
+#define PLL_READY                               (0x1 << 23)
+#define KVCO_EXT                                (0x1 << 22)
+#define VCOCAL_START                            (0x1 << 21)
+
+#define UTMI_PLL_KVCO_SHIFT                     15
+#define UTMI_PLL_KVCO_MASK                      (0x7 << 15)
+
+#define UTMI_PLL_ICP_SHIFT                      12
+#define UTMI_PLL_ICP_MASK                       (0x7 << 12)
+
+#define UTMI_PLL_FBDIV_SHIFT                    4
+#define UTMI_PLL_FBDIV_MASK                     (0xFF << 4)
+
+#define UTMI_PLL_REFDIV_SHIFT                   0
+#define UTMI_PLL_REFDIV_MASK                    (0xF << 0)
+
+/* For UTMI_TX Register */
+#define UTMI_TX_REG_EXT_FS_RCAL_SHIFT           27
+#define UTMI_TX_REG_EXT_FS_RCAL_MASK            (0xf << 27)
+
+#define UTMI_TX_REG_EXT_FS_RCAL_EN_SHIFT        26
+#define UTMI_TX_REG_EXT_FS_RCAL_EN_MASK         (0x1 << 26)
+
+#define UTMI_TX_TXVDD12_SHIFT                   22
+#define UTMI_TX_TXVDD12_MASK                    (0x3 << 22)
+
+#define UTMI_TX_CK60_PHSEL_SHIFT                17
+#define UTMI_TX_CK60_PHSEL_MASK                 (0xf << 17)
+
+#define UTMI_TX_IMPCAL_VTH_SHIFT                14
+#define UTMI_TX_IMPCAL_VTH_MASK                 (0x7 << 14)
+
+#define REG_RCAL_START                          (0x1 << 12)
+
+#define UTMI_TX_LOW_VDD_EN_SHIFT                11
+
+#define UTMI_TX_AMP_SHIFT                       0
+#define UTMI_TX_AMP_MASK                        (0x7 << 0)
+
+/* For UTMI_RX Register */
+#define UTMI_REG_SQ_LENGTH_SHIFT                15
+#define UTMI_REG_SQ_LENGTH_MASK                 (0x3 << 15)
+
+#define UTMI_RX_SQ_THRESH_SHIFT                 4
+#define UTMI_RX_SQ_THRESH_MASK                  (0xf << 4)
+
+#define UTMI_OTG_ADDON_OTG_ON                   (1 << 0)
+
+enum pxa_usb_phy_version {
+        PXA_USB_PHY_MMP2,
+        PXA_USB_PHY_PXA910,
+        PXA_USB_PHY_PXA168,
+};
+
+struct pxa_usb_phy {
+        struct phy *phy;
+        void __iomem *base;
+        enum pxa_usb_phy_version version;
+};
+
+/*****************************************************************************
+ * The registers read/write routines
+ *****************************************************************************/
+
+static unsigned int u2o_get(void __iomem *base, unsigned int offset)
+{
+        return readl_relaxed(base + offset);
+}
+
+static void u2o_set(void __iomem *base, unsigned int offset,
+                unsigned int value)
+{
+        u32 reg;
+
+        reg = readl_relaxed(base + offset);
+        reg |= value;
+        writel_relaxed(reg, base + offset);
+        readl_relaxed(base + offset);
+}
+
+static void u2o_clear(void __iomem *base, unsigned int offset,
+                unsigned int value)
+{
+        u32 reg;
+
+        reg = readl_relaxed(base + offset);
+        reg &= ~value;
+        writel_relaxed(reg, base + offset);
+        readl_relaxed(base + offset);
+}
+
+static void u2o_write(void __iomem *base, unsigned int offset,
+                unsigned int value)
+{
+        writel_relaxed(value, base + offset);
+        readl_relaxed(base + offset);
+}
+
+static int pxa_usb_phy_init(struct phy *phy)
+{
+        struct pxa_usb_phy *pxa_usb_phy = phy_get_drvdata(phy);
+        void __iomem *base = pxa_usb_phy->base;
+        int loops;
+
+        dev_info(&phy->dev, "initializing Marvell PXA USB PHY");
+
+        /* Initialize the USB PHY power */
+        if (pxa_usb_phy->version == PXA_USB_PHY_PXA910) {
+                u2o_set(base, UTMI_CTRL, (1<<UTMI_CTRL_INPKT_DELAY_SOF_SHIFT)
+                        | (1<<UTMI_CTRL_PU_REF_SHIFT));
+        }
+
+        u2o_set(base, UTMI_CTRL, 1<<UTMI_CTRL_PLL_PWR_UP_SHIFT);
+        u2o_set(base, UTMI_CTRL, 1<<UTMI_CTRL_PWR_UP_SHIFT);
+
+        /* UTMI_PLL settings */
+        u2o_clear(base, UTMI_PLL, UTMI_PLL_PLLVDD18_MASK
+                | UTMI_PLL_PLLVDD12_MASK | UTMI_PLL_PLLCALI12_MASK
+                | UTMI_PLL_FBDIV_MASK | UTMI_PLL_REFDIV_MASK
+                | UTMI_PLL_ICP_MASK | UTMI_PLL_KVCO_MASK);
+
+        u2o_set(base, UTMI_PLL, 0xee<<UTMI_PLL_FBDIV_SHIFT
+                | 0xb<<UTMI_PLL_REFDIV_SHIFT | 3<<UTMI_PLL_PLLVDD18_SHIFT
+                | 3<<UTMI_PLL_PLLVDD12_SHIFT | 3<<UTMI_PLL_PLLCALI12_SHIFT
+                | 1<<UTMI_PLL_ICP_SHIFT | 3<<UTMI_PLL_KVCO_SHIFT);
+
+        /* UTMI_TX */
+        u2o_clear(base, UTMI_TX, UTMI_TX_REG_EXT_FS_RCAL_EN_MASK
+                | UTMI_TX_TXVDD12_MASK | UTMI_TX_CK60_PHSEL_MASK
+                | UTMI_TX_IMPCAL_VTH_MASK | UTMI_TX_REG_EXT_FS_RCAL_MASK
+                | UTMI_TX_AMP_MASK);
+        u2o_set(base, UTMI_TX, 3<<UTMI_TX_TXVDD12_SHIFT
+                | 4<<UTMI_TX_CK60_PHSEL_SHIFT | 4<<UTMI_TX_IMPCAL_VTH_SHIFT
+                | 8<<UTMI_TX_REG_EXT_FS_RCAL_SHIFT | 3<<UTMI_TX_AMP_SHIFT);
+
+        /* UTMI_RX */
+        u2o_clear(base, UTMI_RX, UTMI_RX_SQ_THRESH_MASK
+                | UTMI_REG_SQ_LENGTH_MASK);
+        u2o_set(base, UTMI_RX, 7<<UTMI_RX_SQ_THRESH_SHIFT
+                | 2<<UTMI_REG_SQ_LENGTH_SHIFT);
+
+        /* UTMI_IVREF */
+        if (pxa_usb_phy->version == PXA_USB_PHY_PXA168) {
+                /*
+                 * fixing Microsoft Altair board interface with NEC hub issue -
+                 * Set UTMI_IVREF from 0x4a3 to 0x4bf
+                 */
+                u2o_write(base, UTMI_IVREF, 0x4bf);
+        }
+
+        /* toggle VCOCAL_START bit of UTMI_PLL */
+        udelay(200);
+        u2o_set(base, UTMI_PLL, VCOCAL_START);
+        udelay(40);
+        u2o_clear(base, UTMI_PLL, VCOCAL_START);
+
+        /* toggle REG_RCAL_START bit of UTMI_TX */
+        udelay(400);
+        u2o_set(base, UTMI_TX, REG_RCAL_START);
+        udelay(40);
+        u2o_clear(base, UTMI_TX, REG_RCAL_START);
+        udelay(400);
+
+        /* Make sure PHY PLL is ready */
+        loops = 0;
+        while ((u2o_get(base, UTMI_PLL) & PLL_READY) == 0) {
+                mdelay(1);
+                loops++;
+                if (loops > 100) {
+                        dev_warn(&phy->dev, "calibrate timeout, UTMI_PLL %x\n",
+                                                u2o_get(base, UTMI_PLL));
+                        break;
+                }
+        }
+
+        if (pxa_usb_phy->version == PXA_USB_PHY_PXA168) {
+                u2o_set(base, UTMI_RESERVE, 1 << 5);
+                /* Turn on UTMI PHY OTG extension */
+                u2o_write(base, UTMI_OTG_ADDON, 1);
+        }
+
+        return 0;
+
+}
+
+static int pxa_usb_phy_exit(struct phy *phy)
+{
+        struct pxa_usb_phy *pxa_usb_phy = phy_get_drvdata(phy);
+        void __iomem *base = pxa_usb_phy->base;
+
+        dev_info(&phy->dev, "deinitializing Marvell PXA USB PHY");
+
+        if (pxa_usb_phy->version == PXA_USB_PHY_PXA168)
+                u2o_clear(base, UTMI_OTG_ADDON, UTMI_OTG_ADDON_OTG_ON);
+
+        u2o_clear(base, UTMI_CTRL, UTMI_CTRL_RXBUF_PDWN);
+        u2o_clear(base, UTMI_CTRL, UTMI_CTRL_TXBUF_PDWN);
+        u2o_clear(base, UTMI_CTRL, UTMI_CTRL_USB_CLK_EN);
+        u2o_clear(base, UTMI_CTRL, 1<<UTMI_CTRL_PWR_UP_SHIFT);
+        u2o_clear(base, UTMI_CTRL, 1<<UTMI_CTRL_PLL_PWR_UP_SHIFT);
+
+        return 0;
+}
+
+static const struct phy_ops pxa_usb_phy_ops = {
+        .init   = pxa_usb_phy_init,
+        .exit   = pxa_usb_phy_exit,
+        .owner  = THIS_MODULE,
+};
+
+static const struct of_device_id pxa_usb_phy_of_match[] = {
+        {
+                .compatible = "marvell,mmp2-usb-phy",
+                .data = (void *)PXA_USB_PHY_MMP2,
+        }, {
+                .compatible = "marvell,pxa910-usb-phy",
+                .data = (void *)PXA_USB_PHY_PXA910,
+        }, {
+                .compatible = "marvell,pxa168-usb-phy",
+                .data = (void *)PXA_USB_PHY_PXA168,
+        },
+        { },
+};
+MODULE_DEVICE_TABLE(of, pxa_usb_phy_of_match);
+
+static int pxa_usb_phy_probe(struct platform_device *pdev)
+{
+        struct device *dev = &pdev->dev;
+        struct resource *resource;
+        struct pxa_usb_phy *pxa_usb_phy;
+        struct phy_provider *provider;
+        const struct of_device_id *of_id;
+
+        pxa_usb_phy = devm_kzalloc(dev, sizeof(struct pxa_usb_phy), GFP_KERNEL);
+        if (!pxa_usb_phy)
+                return -ENOMEM;
+
+        of_id = of_match_node(pxa_usb_phy_of_match, dev->of_node);
+        if (of_id)
+                pxa_usb_phy->version = (enum pxa_usb_phy_version)of_id->data;
+        else
+                pxa_usb_phy->version = PXA_USB_PHY_MMP2;
+
+        resource = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+        pxa_usb_phy->base = devm_ioremap_resource(dev, resource);
+        if (IS_ERR(pxa_usb_phy->base)) {
+                dev_err(dev, "failed to remap PHY regs\n");
+                return PTR_ERR(pxa_usb_phy->base);
+        }
+
+        pxa_usb_phy->phy = devm_phy_create(dev, NULL, &pxa_usb_phy_ops);
+        if (IS_ERR(pxa_usb_phy->phy)) {
+                dev_err(dev, "failed to create PHY\n");
+                return PTR_ERR(pxa_usb_phy->phy);
+        }
+
+        phy_set_drvdata(pxa_usb_phy->phy, pxa_usb_phy);
+        provider = devm_of_phy_provider_register(dev, of_phy_simple_xlate);
+        if (IS_ERR(provider)) {
+                dev_err(dev, "failed to register PHY provider\n");
+                return PTR_ERR(provider);
+        }
+
+        if (!dev->of_node) {
+                phy_create_lookup(pxa_usb_phy->phy, "usb", "mv-udc");
+                phy_create_lookup(pxa_usb_phy->phy, "usb", "pxa-u2oehci");
+                phy_create_lookup(pxa_usb_phy->phy, "usb", "mv-otg");
+        }
+
+        dev_info(dev, "Marvell PXA USB PHY");
+        return 0;
+}
+
+static struct platform_driver pxa_usb_phy_driver = {
+        .probe          = pxa_usb_phy_probe,
+        .driver         = {
+                .name   = "pxa-usb-phy",
+                .of_match_table = pxa_usb_phy_of_match,
+        },
+};
+module_platform_driver(pxa_usb_phy_driver);
+
+MODULE_AUTHOR("Lubomir Rintel <lkundrak@v3.sk>");
+MODULE_DESCRIPTION("Marvell PXA USB PHY Driver");
+MODULE_LICENSE("GPL v2");
diff --git a/drivers/phy/qualcomm/Kconfig b/drivers/phy/qualcomm/Kconfig
index 632a0e73ee10..32f7d34eb784 100644
--- a/drivers/phy/qualcomm/Kconfig
+++ b/drivers/phy/qualcomm/Kconfig
@@ -50,6 +50,23 @@ config PHY_QCOM_UFS
         help
           Support for UFS PHY on QCOM chipsets.
 
+if PHY_QCOM_UFS
+
+config PHY_QCOM_UFS_14NM
+        tristate
+        default PHY_QCOM_UFS
+        help
+          Support for 14nm UFS QMP phy present on QCOM chipsets.
+
+config PHY_QCOM_UFS_20NM
+        tristate
+        default PHY_QCOM_UFS
+        depends on BROKEN
+        help
+          Support for 20nm UFS QMP phy present on QCOM chipsets.
+
+endif
+
 config PHY_QCOM_USB_HS
         tristate "Qualcomm USB HS PHY module"
         depends on USB_ULPI_BUS
diff --git a/drivers/phy/qualcomm/Makefile b/drivers/phy/qualcomm/Makefile
index deb831f453ae..c56efd3af205 100644
--- a/drivers/phy/qualcomm/Makefile
+++ b/drivers/phy/qualcomm/Makefile
@@ -5,7 +5,7 @@ obj-$(CONFIG_PHY_QCOM_IPQ806X_SATA)	+= phy-qcom-ipq806x-sata.o
 obj-$(CONFIG_PHY_QCOM_QMP)              += phy-qcom-qmp.o
 obj-$(CONFIG_PHY_QCOM_QUSB2)            += phy-qcom-qusb2.o
 obj-$(CONFIG_PHY_QCOM_UFS)              += phy-qcom-ufs.o
-obj-$(CONFIG_PHY_QCOM_UFS)              += phy-qcom-ufs-qmp-14nm.o
-obj-$(CONFIG_PHY_QCOM_UFS)              += phy-qcom-ufs-qmp-20nm.o
+obj-$(CONFIG_PHY_QCOM_UFS_14NM)         += phy-qcom-ufs-qmp-14nm.o
+obj-$(CONFIG_PHY_QCOM_UFS_20NM)         += phy-qcom-ufs-qmp-20nm.o
 obj-$(CONFIG_PHY_QCOM_USB_HS)           += phy-qcom-usb-hs.o
 obj-$(CONFIG_PHY_QCOM_USB_HSIC)         += phy-qcom-usb-hsic.o
diff --git a/drivers/phy/qualcomm/phy-qcom-qmp.c b/drivers/phy/qualcomm/phy-qcom-qmp.c
index 4c470104a0d6..a83332411026 100644
--- a/drivers/phy/qualcomm/phy-qcom-qmp.c
+++ b/drivers/phy/qualcomm/phy-qcom-qmp.c
@@ -156,6 +156,11 @@ static const unsigned int qmp_v3_usb3phy_regs_layout[] = {
         [QPHY_PCS_LFPS_RXTERM_IRQ_STATUS] = 0x170,
 };
 
+static const unsigned int sdm845_ufsphy_regs_layout[] = {
+        [QPHY_START_CTRL]               = 0x00,
+        [QPHY_PCS_READY_STATUS]         = 0x160,
+};
+
 static const struct qmp_phy_init_tbl msm8996_pcie_serdes_tbl[] = {
         QMP_PHY_INIT_CFG(QSERDES_COM_BIAS_EN_CLKBUFLR_EN, 0x1c),
         QMP_PHY_INIT_CFG(QSERDES_COM_CLK_ENABLE1, 0x10),
@@ -601,6 +606,83 @@ static const struct qmp_phy_init_tbl qmp_v3_usb3_uniphy_pcs_tbl[] = {
         QMP_PHY_INIT_CFG(QPHY_V3_PCS_REFGEN_REQ_CONFIG2, 0x60),
 };
 
+static const struct qmp_phy_init_tbl sdm845_ufsphy_serdes_tbl[] = {
+        QMP_PHY_INIT_CFG(QSERDES_V3_COM_SYS_CLK_CTRL, 0x02),
+        QMP_PHY_INIT_CFG(QSERDES_V3_COM_BIAS_EN_CLKBUFLR_EN, 0x04),
+        QMP_PHY_INIT_CFG(QSERDES_V3_COM_BG_TIMER, 0x0a),
+        QMP_PHY_INIT_CFG(QSERDES_V3_COM_PLL_IVCO, 0x07),
+        QMP_PHY_INIT_CFG(QSERDES_V3_COM_CMN_CONFIG, 0x06),
+        QMP_PHY_INIT_CFG(QSERDES_V3_COM_SYSCLK_EN_SEL, 0xd5),
+        QMP_PHY_INIT_CFG(QSERDES_V3_COM_RESETSM_CNTRL, 0x20),
+        QMP_PHY_INIT_CFG(QSERDES_V3_COM_CLK_SELECT, 0x30),
+        QMP_PHY_INIT_CFG(QSERDES_V3_COM_HSCLK_SEL, 0x00),
+        QMP_PHY_INIT_CFG(QSERDES_V3_COM_LOCK_CMP_EN, 0x01),
+        QMP_PHY_INIT_CFG(QSERDES_V3_COM_VCO_TUNE_CTRL, 0x00),
+        QMP_PHY_INIT_CFG(QSERDES_V3_COM_CORE_CLK_EN, 0x00),
+        QMP_PHY_INIT_CFG(QSERDES_V3_COM_VCO_TUNE_MAP, 0x04),
+        QMP_PHY_INIT_CFG(QSERDES_V3_COM_SVS_MODE_CLK_SEL, 0x05),
+        QMP_PHY_INIT_CFG(QSERDES_V3_COM_VCO_TUNE_INITVAL1, 0xff),
+        QMP_PHY_INIT_CFG(QSERDES_V3_COM_VCO_TUNE_INITVAL2, 0x00),
+        QMP_PHY_INIT_CFG(QSERDES_V3_COM_DEC_START_MODE0, 0x82),
+        QMP_PHY_INIT_CFG(QSERDES_V3_COM_CP_CTRL_MODE0, 0x06),
+        QMP_PHY_INIT_CFG(QSERDES_V3_COM_PLL_RCTRL_MODE0, 0x16),
+        QMP_PHY_INIT_CFG(QSERDES_V3_COM_PLL_CCTRL_MODE0, 0x36),
+        QMP_PHY_INIT_CFG(QSERDES_V3_COM_INTEGLOOP_GAIN0_MODE0, 0x3f),
+        QMP_PHY_INIT_CFG(QSERDES_V3_COM_INTEGLOOP_GAIN1_MODE0, 0x00),
+        QMP_PHY_INIT_CFG(QSERDES_V3_COM_VCO_TUNE1_MODE0, 0xda),
+        QMP_PHY_INIT_CFG(QSERDES_V3_COM_VCO_TUNE2_MODE0, 0x01),
+        QMP_PHY_INIT_CFG(QSERDES_V3_COM_LOCK_CMP1_MODE0, 0xff),
+        QMP_PHY_INIT_CFG(QSERDES_V3_COM_LOCK_CMP2_MODE0, 0x0c),
+        QMP_PHY_INIT_CFG(QSERDES_V3_COM_DEC_START_MODE1, 0x98),
+        QMP_PHY_INIT_CFG(QSERDES_V3_COM_CP_CTRL_MODE1, 0x06),
+        QMP_PHY_INIT_CFG(QSERDES_V3_COM_PLL_RCTRL_MODE1, 0x16),
+        QMP_PHY_INIT_CFG(QSERDES_V3_COM_PLL_CCTRL_MODE1, 0x36),
+        QMP_PHY_INIT_CFG(QSERDES_V3_COM_INTEGLOOP_GAIN0_MODE1, 0x3f),
+        QMP_PHY_INIT_CFG(QSERDES_V3_COM_INTEGLOOP_GAIN1_MODE1, 0x00),
+        QMP_PHY_INIT_CFG(QSERDES_V3_COM_VCO_TUNE1_MODE1, 0xc1),
+        QMP_PHY_INIT_CFG(QSERDES_V3_COM_VCO_TUNE2_MODE1, 0x00),
+        QMP_PHY_INIT_CFG(QSERDES_V3_COM_LOCK_CMP1_MODE1, 0x32),
+        QMP_PHY_INIT_CFG(QSERDES_V3_COM_LOCK_CMP2_MODE1, 0x0f),
+
+        /* Rate B */
+        QMP_PHY_INIT_CFG(QSERDES_V3_COM_VCO_TUNE_MAP, 0x44),
+};
+
+static const struct qmp_phy_init_tbl sdm845_ufsphy_tx_tbl[] = {
+        QMP_PHY_INIT_CFG(QSERDES_V3_TX_LANE_MODE_1, 0x06),
+        QMP_PHY_INIT_CFG(QSERDES_V3_TX_RES_CODE_LANE_OFFSET_TX, 0x04),
+        QMP_PHY_INIT_CFG(QSERDES_V3_TX_RES_CODE_LANE_OFFSET_RX, 0x07),
+};
+
+static const struct qmp_phy_init_tbl sdm845_ufsphy_rx_tbl[] = {
+        QMP_PHY_INIT_CFG(QSERDES_V3_RX_SIGDET_LVL, 0x24),
+        QMP_PHY_INIT_CFG(QSERDES_V3_RX_SIGDET_CNTRL, 0x0f),
+        QMP_PHY_INIT_CFG(QSERDES_V3_RX_SIGDET_DEGLITCH_CNTRL, 0x1e),
+        QMP_PHY_INIT_CFG(QSERDES_V3_RX_RX_INTERFACE_MODE, 0x40),
+        QMP_PHY_INIT_CFG(QSERDES_V3_RX_UCDR_FASTLOCK_FO_GAIN, 0x0b),
+        QMP_PHY_INIT_CFG(QSERDES_V3_RX_RX_TERM_BW, 0x5b),
+        QMP_PHY_INIT_CFG(QSERDES_V3_RX_RX_EQU_ADAPTOR_CNTRL2, 0x06),
+        QMP_PHY_INIT_CFG(QSERDES_V3_RX_RX_EQU_ADAPTOR_CNTRL3, 0x04),
+        QMP_PHY_INIT_CFG(QSERDES_V3_RX_RX_EQU_ADAPTOR_CNTRL4, 0x1b),
+        QMP_PHY_INIT_CFG(QSERDES_V3_RX_UCDR_SVS_SO_GAIN_HALF, 0x04),
+        QMP_PHY_INIT_CFG(QSERDES_V3_RX_UCDR_SVS_SO_GAIN_QUARTER, 0x04),
+        QMP_PHY_INIT_CFG(QSERDES_V3_RX_UCDR_SVS_SO_GAIN, 0x04),
+        QMP_PHY_INIT_CFG(QSERDES_V3_RX_UCDR_SO_SATURATION_AND_ENABLE, 0x4b),
+        QMP_PHY_INIT_CFG(QSERDES_V3_RX_UCDR_PI_CONTROLS, 0x81),
+        QMP_PHY_INIT_CFG(QSERDES_V3_RX_UCDR_FASTLOCK_COUNT_LOW, 0x80),
+        QMP_PHY_INIT_CFG(QSERDES_V3_RX_RX_MODE_00, 0x59),
+};
+
+static const struct qmp_phy_init_tbl sdm845_ufsphy_pcs_tbl[] = {
+        QMP_PHY_INIT_CFG(QPHY_V3_PCS_RX_SIGDET_CTRL2, 0x6e),
+        QMP_PHY_INIT_CFG(QPHY_V3_PCS_TX_LARGE_AMP_DRV_LVL, 0x0a),
+        QMP_PHY_INIT_CFG(QPHY_V3_PCS_TX_SMALL_AMP_DRV_LVL, 0x02),
+        QMP_PHY_INIT_CFG(QPHY_V3_PCS_RX_SYM_RESYNC_CTRL, 0x03),
+        QMP_PHY_INIT_CFG(QPHY_V3_PCS_TX_MID_TERM_CTRL1, 0x43),
+        QMP_PHY_INIT_CFG(QPHY_V3_PCS_RX_SIGDET_CTRL1, 0x0f),
+        QMP_PHY_INIT_CFG(QPHY_V3_PCS_RX_MIN_HIBERN8_TIME, 0x9a),
+        QMP_PHY_INIT_CFG(QPHY_V3_PCS_MULTI_LANE_CTRL1, 0x02),
+};
 
 /* struct qmp_phy_cfg - per-PHY initialization config */
 struct qmp_phy_cfg {
@@ -649,9 +731,14 @@ struct qmp_phy_cfg {
 
         /* true, if PHY has a separate DP_COM control block */
         bool has_phy_dp_com_ctrl;
+        /* true, if PHY has secondary tx/rx lanes to be configured */
+        bool is_dual_lane_phy;
         /* Register offset of secondary tx/rx lanes for USB DP combo PHY */
         unsigned int tx_b_lane_offset;
         unsigned int rx_b_lane_offset;
+
+        /* true, if PCS block has no separate SW_RESET register */
+        bool no_pcs_sw_reset;
 };
 
 /**
@@ -748,6 +835,10 @@ static const char * const qmp_v3_phy_clk_l[] = {
         "aux", "cfg_ahb", "ref", "com_aux",
 };
 
+static const char * const sdm845_ufs_phy_clk_l[] = {
+        "ref", "ref_aux",
+};
+
 /* list of resets */
 static const char * const msm8996_pciephy_reset_l[] = {
         "phy", "common", "cfg",
@@ -758,7 +849,7 @@ static const char * const msm8996_usb3phy_reset_l[] = {
 };
 
 /* list of regulators */
-static const char * const msm8996_phy_vreg_l[] = {
+static const char * const qmp_phy_vreg_l[] = {
         "vdda-phy", "vdda-pll",
 };
 
@@ -778,8 +869,8 @@ static const struct qmp_phy_cfg msm8996_pciephy_cfg = {
         .num_clks               = ARRAY_SIZE(msm8996_phy_clk_l),
         .reset_list             = msm8996_pciephy_reset_l,
         .num_resets             = ARRAY_SIZE(msm8996_pciephy_reset_l),
-        .vreg_list              = msm8996_phy_vreg_l,
-        .num_vregs              = ARRAY_SIZE(msm8996_phy_vreg_l),
+        .vreg_list              = qmp_phy_vreg_l,
+        .num_vregs              = ARRAY_SIZE(qmp_phy_vreg_l),
         .regs                   = pciephy_regs_layout,
 
         .start_ctrl             = PCS_START | PLL_READY_GATE_EN,
@@ -809,8 +900,8 @@ static const struct qmp_phy_cfg msm8996_usb3phy_cfg = {
         .num_clks               = ARRAY_SIZE(msm8996_phy_clk_l),
         .reset_list             = msm8996_usb3phy_reset_l,
         .num_resets             = ARRAY_SIZE(msm8996_usb3phy_reset_l),
-        .vreg_list              = msm8996_phy_vreg_l,
-        .num_vregs              = ARRAY_SIZE(msm8996_phy_vreg_l),
+        .vreg_list              = qmp_phy_vreg_l,
+        .num_vregs              = ARRAY_SIZE(qmp_phy_vreg_l),
         .regs                   = usb3phy_regs_layout,
 
         .start_ctrl             = SERDES_START | PCS_START,
@@ -870,8 +961,8 @@ static const struct qmp_phy_cfg qmp_v3_usb3phy_cfg = {
         .num_clks               = ARRAY_SIZE(qmp_v3_phy_clk_l),
         .reset_list             = msm8996_usb3phy_reset_l,
         .num_resets             = ARRAY_SIZE(msm8996_usb3phy_reset_l),
-        .vreg_list              = msm8996_phy_vreg_l,
-        .num_vregs              = ARRAY_SIZE(msm8996_phy_vreg_l),
+        .vreg_list              = qmp_phy_vreg_l,
+        .num_vregs              = ARRAY_SIZE(qmp_phy_vreg_l),
         .regs                   = qmp_v3_usb3phy_regs_layout,
 
         .start_ctrl             = SERDES_START | PCS_START,
@@ -883,6 +974,7 @@ static const struct qmp_phy_cfg qmp_v3_usb3phy_cfg = {
         .pwrdn_delay_max        = POWER_DOWN_DELAY_US_MAX,
 
         .has_phy_dp_com_ctrl    = true,
+        .is_dual_lane_phy       = true,
         .tx_b_lane_offset       = 0x400,
         .rx_b_lane_offset       = 0x400,
 };
@@ -903,8 +995,8 @@ static const struct qmp_phy_cfg qmp_v3_usb3_uniphy_cfg = {
         .num_clks               = ARRAY_SIZE(qmp_v3_phy_clk_l),
         .reset_list             = msm8996_usb3phy_reset_l,
         .num_resets             = ARRAY_SIZE(msm8996_usb3phy_reset_l),
-        .vreg_list              = msm8996_phy_vreg_l,
-        .num_vregs              = ARRAY_SIZE(msm8996_phy_vreg_l),
+        .vreg_list              = qmp_phy_vreg_l,
+        .num_vregs              = ARRAY_SIZE(qmp_phy_vreg_l),
         .regs                   = qmp_v3_usb3phy_regs_layout,
 
         .start_ctrl             = SERDES_START | PCS_START,
@@ -916,6 +1008,35 @@ static const struct qmp_phy_cfg qmp_v3_usb3_uniphy_cfg = {
         .pwrdn_delay_max        = POWER_DOWN_DELAY_US_MAX,
 };
 
+static const struct qmp_phy_cfg sdm845_ufsphy_cfg = {
+        .type                   = PHY_TYPE_UFS,
+        .nlanes                 = 2,
+
+        .serdes_tbl             = sdm845_ufsphy_serdes_tbl,
+        .serdes_tbl_num         = ARRAY_SIZE(sdm845_ufsphy_serdes_tbl),
+        .tx_tbl                 = sdm845_ufsphy_tx_tbl,
+        .tx_tbl_num             = ARRAY_SIZE(sdm845_ufsphy_tx_tbl),
+        .rx_tbl                 = sdm845_ufsphy_rx_tbl,
+        .rx_tbl_num             = ARRAY_SIZE(sdm845_ufsphy_rx_tbl),
+        .pcs_tbl                = sdm845_ufsphy_pcs_tbl,
+        .pcs_tbl_num            = ARRAY_SIZE(sdm845_ufsphy_pcs_tbl),
+        .clk_list               = sdm845_ufs_phy_clk_l,
+        .num_clks               = ARRAY_SIZE(sdm845_ufs_phy_clk_l),
+        .vreg_list              = qmp_phy_vreg_l,
+        .num_vregs              = ARRAY_SIZE(qmp_phy_vreg_l),
+        .regs                   = sdm845_ufsphy_regs_layout,
+
+        .start_ctrl             = SERDES_START,
+        .pwrdn_ctrl             = SW_PWRDN,
+        .mask_pcs_ready         = PCS_READY,
+
+        .is_dual_lane_phy       = true,
+        .tx_b_lane_offset       = 0x400,
+        .rx_b_lane_offset       = 0x400,
+
+        .no_pcs_sw_reset        = true,
+};
+
 static void qcom_qmp_phy_configure(void __iomem *base,
                                    const unsigned int *regs,
                                    const struct qmp_phy_init_tbl tbl[],
@@ -935,10 +1056,12 @@ static void qcom_qmp_phy_configure(void __iomem *base,
         }
 }
 
-static int qcom_qmp_phy_com_init(struct qcom_qmp *qmp)
+static int qcom_qmp_phy_com_init(struct qmp_phy *qphy)
 {
+        struct qcom_qmp *qmp = qphy->qmp;
         const struct qmp_phy_cfg *cfg = qmp->cfg;
         void __iomem *serdes = qmp->serdes;
+        void __iomem *pcs = qphy->pcs;
         void __iomem *dp_com = qmp->dp_com;
         int ret, i;
 
@@ -979,10 +1102,6 @@ static int qcom_qmp_phy_com_init(struct qcom_qmp *qmp)
                 goto err_rst;
         }
 
-        if (cfg->has_phy_com_ctrl)
-                qphy_setbits(serdes, cfg->regs[QPHY_COM_POWER_DOWN_CONTROL],
-                             SW_PWRDN);
-
         if (cfg->has_phy_dp_com_ctrl) {
                 qphy_setbits(dp_com, QPHY_V3_DP_COM_POWER_DOWN_CTRL,
                              SW_PWRDN);
@@ -1000,6 +1119,12 @@ static int qcom_qmp_phy_com_init(struct qcom_qmp *qmp)
                              SW_USB3PHY_RESET_MUX | SW_USB3PHY_RESET);
         }
 
+        if (cfg->has_phy_com_ctrl)
+                qphy_setbits(serdes, cfg->regs[QPHY_COM_POWER_DOWN_CONTROL],
+                             SW_PWRDN);
+        else
+                qphy_setbits(pcs, QPHY_POWER_DOWN_CONTROL, cfg->pwrdn_ctrl);
+
         /* Serdes configuration */
         qcom_qmp_phy_configure(serdes, cfg->regs, cfg->serdes_tbl,
                                cfg->serdes_tbl_num);
@@ -1090,7 +1215,7 @@ static int qcom_qmp_phy_init(struct phy *phy)
 
         dev_vdbg(qmp->dev, "Initializing QMP phy\n");
 
-        ret = qcom_qmp_phy_com_init(qmp);
+        ret = qcom_qmp_phy_com_init(qphy);
         if (ret)
                 return ret;
 
@@ -1112,22 +1237,31 @@ static int qcom_qmp_phy_init(struct phy *phy)
         /* Tx, Rx, and PCS configurations */
         qcom_qmp_phy_configure(tx, cfg->regs, cfg->tx_tbl, cfg->tx_tbl_num);
         /* Configuration for other LANE for USB-DP combo PHY */
-        if (cfg->has_phy_dp_com_ctrl)
+        if (cfg->is_dual_lane_phy)
                 qcom_qmp_phy_configure(tx + cfg->tx_b_lane_offset, cfg->regs,
                                        cfg->tx_tbl, cfg->tx_tbl_num);
 
         qcom_qmp_phy_configure(rx, cfg->regs, cfg->rx_tbl, cfg->rx_tbl_num);
-        if (cfg->has_phy_dp_com_ctrl)
+        if (cfg->is_dual_lane_phy)
                 qcom_qmp_phy_configure(rx + cfg->rx_b_lane_offset, cfg->regs,
                                        cfg->rx_tbl, cfg->rx_tbl_num);
 
         qcom_qmp_phy_configure(pcs, cfg->regs, cfg->pcs_tbl, cfg->pcs_tbl_num);
 
         /*
+         * UFS PHY requires the deassert of software reset before serdes start.
+         * For UFS PHYs that do not have software reset control bits, defer
+         * starting serdes until the power on callback.
+         */
+        if ((cfg->type == PHY_TYPE_UFS) && cfg->no_pcs_sw_reset)
+                goto out;
+
+        /*
          * Pull out PHY from POWER DOWN state.
          * This is active low enable signal to power-down PHY.
          */
-        qphy_setbits(pcs, QPHY_POWER_DOWN_CONTROL, cfg->pwrdn_ctrl);
+        if(cfg->type == PHY_TYPE_PCIE)
+                qphy_setbits(pcs, QPHY_POWER_DOWN_CONTROL, cfg->pwrdn_ctrl);
 
         if (cfg->has_pwrdn_delay)
                 usleep_range(cfg->pwrdn_delay_min, cfg->pwrdn_delay_max);
@@ -1151,6 +1285,7 @@ static int qcom_qmp_phy_init(struct phy *phy)
         }
         qmp->phy_initialized = true;
 
+out:
         return ret;
 
 err_pcs_ready:
@@ -1173,7 +1308,8 @@ static int qcom_qmp_phy_exit(struct phy *phy)
         clk_disable_unprepare(qphy->pipe_clk);
 
         /* PHY reset */
-        qphy_setbits(qphy->pcs, cfg->regs[QPHY_SW_RESET], SW_RESET);
+        if (!cfg->no_pcs_sw_reset)
+                qphy_setbits(qphy->pcs, cfg->regs[QPHY_SW_RESET], SW_RESET);
 
         /* stop SerDes and Phy-Coding-Sublayer */
         qphy_clrbits(qphy->pcs, cfg->regs[QPHY_START_CTRL], cfg->start_ctrl);
@@ -1191,6 +1327,44 @@ static int qcom_qmp_phy_exit(struct phy *phy)
         return 0;
 }
 
+static int qcom_qmp_phy_poweron(struct phy *phy)
+{
+        struct qmp_phy *qphy = phy_get_drvdata(phy);
+        struct qcom_qmp *qmp = qphy->qmp;
+        const struct qmp_phy_cfg *cfg = qmp->cfg;
+        void __iomem *pcs = qphy->pcs;
+        void __iomem *status;
+        unsigned int mask, val;
+        int ret = 0;
+
+        if (cfg->type != PHY_TYPE_UFS)
+                return 0;
+
+        /*
+         * For UFS PHY that has not software reset control, serdes start
+         * should only happen when UFS driver explicitly calls phy_power_on
+         * after it deasserts software reset.
+         */
+        if (cfg->no_pcs_sw_reset && !qmp->phy_initialized &&
+            (qmp->init_count != 0)) {
+                /* start SerDes and Phy-Coding-Sublayer */
+                qphy_setbits(pcs, cfg->regs[QPHY_START_CTRL], cfg->start_ctrl);
+
+                status = pcs + cfg->regs[QPHY_PCS_READY_STATUS];
+                mask = cfg->mask_pcs_ready;
+
+                ret = readl_poll_timeout(status, val, !(val & mask), 1,
+                                         PHY_INIT_COMPLETE_TIMEOUT);
+                if (ret) {
+                        dev_err(qmp->dev, "phy initialization timed-out\n");
+                        return ret;
+                }
+                qmp->phy_initialized = true;
+        }
+
+        return ret;
+}
+
 static int qcom_qmp_phy_set_mode(struct phy *phy, enum phy_mode mode)
 {
         struct qmp_phy *qphy = phy_get_drvdata(phy);
@@ -1400,7 +1574,7 @@ static int phy_pipe_clk_register(struct qcom_qmp *qmp, struct device_node *np)
 
         ret = of_property_read_string(np, "clock-output-names", &init.name);
         if (ret) {
-                dev_err(qmp->dev, "%s: No clock-output-names\n", np->name);
+                dev_err(qmp->dev, "%pOFn: No clock-output-names\n", np);
                 return ret;
         }
 
@@ -1420,6 +1594,7 @@ static int phy_pipe_clk_register(struct qcom_qmp *qmp, struct device_node *np)
 static const struct phy_ops qcom_qmp_phy_gen_ops = {
         .init           = qcom_qmp_phy_init,
         .exit           = qcom_qmp_phy_exit,
+        .power_on       = qcom_qmp_phy_poweron,
         .set_mode       = qcom_qmp_phy_set_mode,
         .owner          = THIS_MODULE,
 };
@@ -1522,6 +1697,9 @@ static const struct of_device_id qcom_qmp_phy_of_match_table[] = {
         }, {
                 .compatible = "qcom,sdm845-qmp-usb3-uni-phy",
                 .data = &qmp_v3_usb3_uniphy_cfg,
+        }, {
+                .compatible = "qcom,sdm845-qmp-ufs-phy",
+                .data = &sdm845_ufsphy_cfg,
         },
         { },
 };
@@ -1586,7 +1764,9 @@ static int qcom_qmp_phy_probe(struct platform_device *pdev)
 
         ret = qcom_qmp_phy_vreg_init(dev);
         if (ret) {
-                dev_err(dev, "failed to get regulator supplies\n");
+                if (ret != -EPROBE_DEFER)
+                        dev_err(dev, "failed to get regulator supplies: %d\n",
+                                ret);
                 return ret;
         }
 
diff --git a/drivers/phy/qualcomm/phy-qcom-qmp.h b/drivers/phy/qualcomm/phy-qcom-qmp.h
index 5d78d43ba9fc..d201cc307151 100644
--- a/drivers/phy/qualcomm/phy-qcom-qmp.h
+++ b/drivers/phy/qualcomm/phy-qcom-qmp.h
@@ -184,6 +184,8 @@
 #define QSERDES_V3_COM_VCO_TUNE2_MODE0                  0x0f8
 #define QSERDES_V3_COM_VCO_TUNE1_MODE1                  0x0fc
 #define QSERDES_V3_COM_VCO_TUNE2_MODE1                  0x100
+#define QSERDES_V3_COM_VCO_TUNE_INITVAL1                0x104
+#define QSERDES_V3_COM_VCO_TUNE_INITVAL2                0x108
 #define QSERDES_V3_COM_VCO_TUNE_TIMER1                  0x11c
 #define QSERDES_V3_COM_VCO_TUNE_TIMER2                  0x120
 #define QSERDES_V3_COM_CLK_SELECT                       0x138
@@ -211,8 +213,13 @@
 /* Only for QMP V3 PHY - RX registers */
 #define QSERDES_V3_RX_UCDR_SO_GAIN_HALF                 0x00c
 #define QSERDES_V3_RX_UCDR_SO_GAIN                      0x014
+#define QSERDES_V3_RX_UCDR_SVS_SO_GAIN_HALF             0x024
+#define QSERDES_V3_RX_UCDR_SVS_SO_GAIN_QUARTER          0x028
+#define QSERDES_V3_RX_UCDR_SVS_SO_GAIN                  0x02c
 #define QSERDES_V3_RX_UCDR_FASTLOCK_FO_GAIN             0x030
 #define QSERDES_V3_RX_UCDR_SO_SATURATION_AND_ENABLE     0x034
+#define QSERDES_V3_RX_UCDR_FASTLOCK_COUNT_LOW           0x03c
+#define QSERDES_V3_RX_UCDR_PI_CONTROLS                  0x044
 #define QSERDES_V3_RX_RX_TERM_BW                        0x07c
 #define QSERDES_V3_RX_VGA_CAL_CNTRL1                    0x0bc
 #define QSERDES_V3_RX_VGA_CAL_CNTRL2                    0x0c0
@@ -239,6 +246,8 @@
 #define QPHY_V3_PCS_TXMGN_V3                            0x018
 #define QPHY_V3_PCS_TXMGN_V4                            0x01c
 #define QPHY_V3_PCS_TXMGN_LS                            0x020
+#define QPHY_V3_PCS_TX_LARGE_AMP_DRV_LVL                0x02c
+#define QPHY_V3_PCS_TX_SMALL_AMP_DRV_LVL                0x034
 #define QPHY_V3_PCS_TXDEEMPH_M6DB_V0                    0x024
 #define QPHY_V3_PCS_TXDEEMPH_M3P5DB_V0                  0x028
 #define QPHY_V3_PCS_TXDEEMPH_M6DB_V1                    0x02c
@@ -275,6 +284,12 @@
 #define QPHY_V3_PCS_FLL_CNT_VAL_L                       0x0cc
 #define QPHY_V3_PCS_FLL_CNT_VAL_H_TOL                   0x0d0
 #define QPHY_V3_PCS_FLL_MAN_CODE                        0x0d4
+#define QPHY_V3_PCS_RX_SYM_RESYNC_CTRL                  0x134
+#define QPHY_V3_PCS_RX_MIN_HIBERN8_TIME                 0x138
+#define QPHY_V3_PCS_RX_SIGDET_CTRL1                     0x13c
+#define QPHY_V3_PCS_RX_SIGDET_CTRL2                     0x140
+#define QPHY_V3_PCS_TX_MID_TERM_CTRL1                   0x1bc
+#define QPHY_V3_PCS_MULTI_LANE_CTRL1                    0x1c4
 #define QPHY_V3_PCS_RX_SIGDET_LVL                       0x1d8
 #define QPHY_V3_PCS_REFGEN_REQ_CONFIG1                  0x20c
 #define QPHY_V3_PCS_REFGEN_REQ_CONFIG2                  0x210
diff --git a/drivers/phy/qualcomm/phy-qcom-qusb2.c b/drivers/phy/qualcomm/phy-qcom-qusb2.c
index e70e425f26f5..9ce531194f8a 100644
--- a/drivers/phy/qualcomm/phy-qcom-qusb2.c
+++ b/drivers/phy/qualcomm/phy-qcom-qusb2.c
@@ -800,7 +800,9 @@ static int qusb2_phy_probe(struct platform_device *pdev)
 
         ret = devm_regulator_bulk_get(dev, num, qphy->vregs);
         if (ret) {
-                dev_err(dev, "failed to get regulator supplies\n");
+                if (ret != -EPROBE_DEFER)
+                        dev_err(dev, "failed to get regulator supplies: %d\n",
+                                ret);
                 return ret;
         }
 
diff --git a/drivers/phy/qualcomm/phy-qcom-ufs-i.h b/drivers/phy/qualcomm/phy-qcom-ufs-i.h
index 822c83b8efcd..681644e43248 100644
--- a/drivers/phy/qualcomm/phy-qcom-ufs-i.h
+++ b/drivers/phy/qualcomm/phy-qcom-ufs-i.h
@@ -17,9 +17,9 @@
 
 #include <linux/module.h>
 #include <linux/clk.h>
+#include <linux/phy/phy.h>
 #include <linux/regulator/consumer.h>
 #include <linux/slab.h>
-#include <linux/phy/phy-qcom-ufs.h>
 #include <linux/platform_device.h>
 #include <linux/io.h>
 #include <linux/delay.h>
diff --git a/drivers/phy/qualcomm/phy-qcom-ufs.c b/drivers/phy/qualcomm/phy-qcom-ufs.c
index c5493ea51282..f2979ccad00a 100644
--- a/drivers/phy/qualcomm/phy-qcom-ufs.c
+++ b/drivers/phy/qualcomm/phy-qcom-ufs.c
@@ -431,56 +431,6 @@ static void ufs_qcom_phy_disable_ref_clk(struct ufs_qcom_phy *phy)
         }
 }
 
-#define UFS_REF_CLK_EN  (1 << 5)
-
-static void ufs_qcom_phy_dev_ref_clk_ctrl(struct phy *generic_phy, bool enable)
-{
-        struct ufs_qcom_phy *phy = get_ufs_qcom_phy(generic_phy);
-
-        if (phy->dev_ref_clk_ctrl_mmio &&
-            (enable ^ phy->is_dev_ref_clk_enabled)) {
-                u32 temp = readl_relaxed(phy->dev_ref_clk_ctrl_mmio);
-
-                if (enable)
-                        temp |= UFS_REF_CLK_EN;
-                else
-                        temp &= ~UFS_REF_CLK_EN;
-
-                /*
-                 * If we are here to disable this clock immediately after
-                 * entering into hibern8, we need to make sure that device
-                 * ref_clk is active atleast 1us after the hibern8 enter.
-                 */
-                if (!enable)
-                        udelay(1);
-
-                writel_relaxed(temp, phy->dev_ref_clk_ctrl_mmio);
-                /* ensure that ref_clk is enabled/disabled before we return */
-                wmb();
-                /*
-                 * If we call hibern8 exit after this, we need to make sure that
-                 * device ref_clk is stable for atleast 1us before the hibern8
-                 * exit command.
-                 */
-                if (enable)
-                        udelay(1);
-
-                phy->is_dev_ref_clk_enabled = enable;
-        }
-}
-
-void ufs_qcom_phy_enable_dev_ref_clk(struct phy *generic_phy)
-{
-        ufs_qcom_phy_dev_ref_clk_ctrl(generic_phy, true);
-}
-EXPORT_SYMBOL_GPL(ufs_qcom_phy_enable_dev_ref_clk);
-
-void ufs_qcom_phy_disable_dev_ref_clk(struct phy *generic_phy)
-{
-        ufs_qcom_phy_dev_ref_clk_ctrl(generic_phy, false);
-}
-EXPORT_SYMBOL_GPL(ufs_qcom_phy_disable_dev_ref_clk);
-
 /* Turn ON M-PHY RMMI interface clocks */
 static int ufs_qcom_phy_enable_iface_clk(struct ufs_qcom_phy *phy)
 {
diff --git a/drivers/phy/renesas/Kconfig b/drivers/phy/renesas/Kconfig
index 4bd390c79d21..e340a925bbb1 100644
--- a/drivers/phy/renesas/Kconfig
+++ b/drivers/phy/renesas/Kconfig
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Phy drivers for Renesas platforms
 #
diff --git a/drivers/phy/renesas/Makefile b/drivers/phy/renesas/Makefile
index 4b76fc439ed6..b599ff8a4349 100644
--- a/drivers/phy/renesas/Makefile
+++ b/drivers/phy/renesas/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 obj-$(CONFIG_PHY_RCAR_GEN2)             += phy-rcar-gen2.o
 obj-$(CONFIG_PHY_RCAR_GEN3_PCIE)        += phy-rcar-gen3-pcie.o
 obj-$(CONFIG_PHY_RCAR_GEN3_USB2)        += phy-rcar-gen3-usb2.o
diff --git a/drivers/phy/renesas/phy-rcar-gen2.c b/drivers/phy/renesas/phy-rcar-gen2.c
index 97d4dd6ea924..72eeb066912d 100644
--- a/drivers/phy/renesas/phy-rcar-gen2.c
+++ b/drivers/phy/renesas/phy-rcar-gen2.c
@@ -1,12 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Renesas R-Car Gen2 PHY driver
  *
  * Copyright (C) 2014 Renesas Solutions Corp.
  * Copyright (C) 2014 Cogent Embedded, Inc.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
  */
 
 #include <linux/clk.h>
diff --git a/drivers/phy/renesas/phy-rcar-gen3-usb2.c b/drivers/phy/renesas/phy-rcar-gen3-usb2.c
index fb8f05e39cf7..d0f412c25981 100644
--- a/drivers/phy/renesas/phy-rcar-gen3-usb2.c
+++ b/drivers/phy/renesas/phy-rcar-gen3-usb2.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Renesas R-Car Gen3 for USB2.0 PHY driver
  *
@@ -6,10 +7,6 @@
  * This is based on the phy-rcar-gen2 driver:
  * Copyright (C) 2014 Renesas Solutions Corp.
  * Copyright (C) 2014 Cogent Embedded, Inc.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
  */
 
 #include <linux/extcon-provider.h>
@@ -81,18 +78,29 @@
 #define USB2_ADPCTRL_IDPULLUP           BIT(5)  /* 1 = ID sampling is enabled */
 #define USB2_ADPCTRL_DRVVBUS            BIT(4)
 
-#define RCAR_GEN3_PHY_HAS_DEDICATED_PINS        1
-
 struct rcar_gen3_chan {
         void __iomem *base;
         struct extcon_dev *extcon;
         struct phy *phy;
         struct regulator *vbus;
         struct work_struct work;
+        enum usb_dr_mode dr_mode;
         bool extcon_host;
-        bool has_otg_pins;
+        bool is_otg_channel;
+        bool uses_otg_pins;
 };
 
+/*
+ * Combination about is_otg_channel and uses_otg_pins:
+ *
+ * Parameters                           || Behaviors
+ * is_otg_channel       | uses_otg_pins || irqs         | role sysfs
+ * ---------------------+---------------++--------------+------------
+ * true                 | true          || enabled      | enabled
+ * true                 | false         || disabled     | enabled
+ * false                | any           || disabled     | disabled
+ */
+
 static void rcar_gen3_phy_usb2_work(struct work_struct *work)
 {
         struct rcar_gen3_chan *ch = container_of(work, struct rcar_gen3_chan,
@@ -147,6 +155,18 @@ static void rcar_gen3_enable_vbus_ctrl(struct rcar_gen3_chan *ch, int vbus)
         writel(val, usb2_base + USB2_ADPCTRL);
 }
 
+static void rcar_gen3_control_otg_irq(struct rcar_gen3_chan *ch, int enable)
+{
+        void __iomem *usb2_base = ch->base;
+        u32 val = readl(usb2_base + USB2_OBINTEN);
+
+        if (ch->uses_otg_pins && enable)
+                val |= USB2_OBINT_BITS;
+        else
+                val &= ~USB2_OBINT_BITS;
+        writel(val, usb2_base + USB2_OBINTEN);
+}
+
 static void rcar_gen3_init_for_host(struct rcar_gen3_chan *ch)
 {
         rcar_gen3_set_linectrl(ch, 1, 1);
@@ -192,20 +212,19 @@ static void rcar_gen3_init_for_a_peri(struct rcar_gen3_chan *ch)
 
 static void rcar_gen3_init_from_a_peri_to_a_host(struct rcar_gen3_chan *ch)
 {
-        void __iomem *usb2_base = ch->base;
-        u32 val;
+        rcar_gen3_control_otg_irq(ch, 0);
 
-        val = readl(usb2_base + USB2_OBINTEN);
-        writel(val & ~USB2_OBINT_BITS, usb2_base + USB2_OBINTEN);
-
-        rcar_gen3_enable_vbus_ctrl(ch, 0);
+        rcar_gen3_enable_vbus_ctrl(ch, 1);
         rcar_gen3_init_for_host(ch);
 
-        writel(val | USB2_OBINT_BITS, usb2_base + USB2_OBINTEN);
+        rcar_gen3_control_otg_irq(ch, 1);
 }
 
 static bool rcar_gen3_check_id(struct rcar_gen3_chan *ch)
 {
+        if (!ch->uses_otg_pins)
+                return (ch->dr_mode == USB_DR_MODE_HOST) ? false : true;
+
         return !!(readl(ch->base + USB2_ADPCTRL) & USB2_ADPCTRL_IDDIG);
 }
 
@@ -237,7 +256,7 @@ static ssize_t role_store(struct device *dev, struct device_attribute *attr,
         bool is_b_device;
         enum phy_mode cur_mode, new_mode;
 
-        if (!ch->has_otg_pins || !ch->phy->init_count)
+        if (!ch->is_otg_channel || !ch->phy->init_count)
                 return -EIO;
 
         if (!strncmp(buf, "host", strlen("host")))
@@ -275,7 +294,7 @@ static ssize_t role_show(struct device *dev, struct device_attribute *attr,
 {
         struct rcar_gen3_chan *ch = dev_get_drvdata(dev);
 
-        if (!ch->has_otg_pins || !ch->phy->init_count)
+        if (!ch->is_otg_channel || !ch->phy->init_count)
                 return -EIO;
 
         return sprintf(buf, "%s\n", rcar_gen3_is_host(ch) ? "host" :
@@ -291,8 +310,7 @@ static void rcar_gen3_init_otg(struct rcar_gen3_chan *ch)
         val = readl(usb2_base + USB2_VBCTRL);
         writel(val | USB2_VBCTRL_DRVVBUSSEL, usb2_base + USB2_VBCTRL);
         writel(USB2_OBINT_BITS, usb2_base + USB2_OBINTSTA);
-        val = readl(usb2_base + USB2_OBINTEN);
-        writel(val | USB2_OBINT_BITS, usb2_base + USB2_OBINTEN);
+        rcar_gen3_control_otg_irq(ch, 1);
         val = readl(usb2_base + USB2_ADPCTRL);
         writel(val | USB2_ADPCTRL_IDPULLUP, usb2_base + USB2_ADPCTRL);
         val = readl(usb2_base + USB2_LINECTRL1);
@@ -314,7 +332,7 @@ static int rcar_gen3_phy_usb2_init(struct phy *p)
         writel(USB2_OC_TIMSET_INIT, usb2_base + USB2_OC_TIMSET);
 
         /* Initialize otg part */
-        if (channel->has_otg_pins)
+        if (channel->is_otg_channel)
                 rcar_gen3_init_otg(channel);
 
         return 0;
@@ -388,21 +406,10 @@ static irqreturn_t rcar_gen3_phy_usb2_irq(int irq, void *_ch)
 }
 
 static const struct of_device_id rcar_gen3_phy_usb2_match_table[] = {
-        {
-                .compatible = "renesas,usb2-phy-r8a7795",
-                .data = (void *)RCAR_GEN3_PHY_HAS_DEDICATED_PINS,
-        },
-        {
-                .compatible = "renesas,usb2-phy-r8a7796",
-                .data = (void *)RCAR_GEN3_PHY_HAS_DEDICATED_PINS,
-        },
-        {
-                .compatible = "renesas,usb2-phy-r8a77965",
-                .data = (void *)RCAR_GEN3_PHY_HAS_DEDICATED_PINS,
-        },
-        {
-                .compatible = "renesas,rcar-gen3-usb2-phy",
-        },
+        { .compatible = "renesas,usb2-phy-r8a7795" },
+        { .compatible = "renesas,usb2-phy-r8a7796" },
+        { .compatible = "renesas,usb2-phy-r8a77965" },
+        { .compatible = "renesas,rcar-gen3-usb2-phy" },
         { }
 };
 MODULE_DEVICE_TABLE(of, rcar_gen3_phy_usb2_match_table);
@@ -445,10 +452,13 @@ static int rcar_gen3_phy_usb2_probe(struct platform_device *pdev)
                         dev_err(dev, "No irq handler (%d)\n", irq);
         }
 
-        if (of_usb_get_dr_mode_by_phy(dev->of_node, 0) == USB_DR_MODE_OTG) {
+        channel->dr_mode = of_usb_get_dr_mode_by_phy(dev->of_node, 0);
+        if (channel->dr_mode != USB_DR_MODE_UNKNOWN) {
                 int ret;
 
-                channel->has_otg_pins = (uintptr_t)of_device_get_match_data(dev);
+                channel->is_otg_channel = true;
+                channel->uses_otg_pins = !of_property_read_bool(dev->of_node,
+                                                        "renesas,no-otg-pins");
                 channel->extcon = devm_extcon_dev_allocate(dev,
                                                         rcar_gen3_phy_cable);
                 if (IS_ERR(channel->extcon))
@@ -490,7 +500,7 @@ static int rcar_gen3_phy_usb2_probe(struct platform_device *pdev)
                 dev_err(dev, "Failed to register PHY provider\n");
                 ret = PTR_ERR(provider);
                 goto error;
-        } else if (channel->has_otg_pins) {
+        } else if (channel->is_otg_channel) {
                 int ret;
 
                 ret = device_create_file(dev, &dev_attr_role);
@@ -510,7 +520,7 @@ static int rcar_gen3_phy_usb2_remove(struct platform_device *pdev)
 {
         struct rcar_gen3_chan *channel = platform_get_drvdata(pdev);
 
-        if (channel->has_otg_pins)
+        if (channel->is_otg_channel)
                 device_remove_file(&pdev->dev, &dev_attr_role);
 
         pm_runtime_disable(&pdev->dev);
diff --git a/drivers/phy/renesas/phy-rcar-gen3-usb3.c b/drivers/phy/renesas/phy-rcar-gen3-usb3.c
index 88c83c9b8ff9..566b4cf4ff38 100644
--- a/drivers/phy/renesas/phy-rcar-gen3-usb3.c
+++ b/drivers/phy/renesas/phy-rcar-gen3-usb3.c
@@ -1,11 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Renesas R-Car Gen3 for USB3.0 PHY driver
  *
  * Copyright (C) 2017 Renesas Electronics Corporation
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
  */
 
 #include <linux/clk.h>
diff --git a/drivers/phy/rockchip/Kconfig b/drivers/phy/rockchip/Kconfig
index 0e15119ddfc6..990204a46eb6 100644
--- a/drivers/phy/rockchip/Kconfig
+++ b/drivers/phy/rockchip/Kconfig
@@ -15,6 +15,14 @@ config PHY_ROCKCHIP_EMMC
         help
           Enable this to support the Rockchip EMMC PHY.
 
+config PHY_ROCKCHIP_INNO_HDMI
+        tristate "Rockchip INNO HDMI PHY Driver"
+        depends on (ARCH_ROCKCHIP || COMPILE_TEST) && OF
+        depends on COMMON_CLK
+        select GENERIC_PHY
+        help
+          Enable this to support the Rockchip Innosilicon HDMI PHY.
+
 config PHY_ROCKCHIP_INNO_USB2
         tristate "Rockchip INNO USB2PHY Driver"
         depends on (ARCH_ROCKCHIP || COMPILE_TEST) && OF
diff --git a/drivers/phy/rockchip/Makefile b/drivers/phy/rockchip/Makefile
index 7f149d989046..fd21cbaf40dd 100644
--- a/drivers/phy/rockchip/Makefile
+++ b/drivers/phy/rockchip/Makefile
@@ -1,6 +1,7 @@
 # SPDX-License-Identifier: GPL-2.0
 obj-$(CONFIG_PHY_ROCKCHIP_DP)           += phy-rockchip-dp.o
 obj-$(CONFIG_PHY_ROCKCHIP_EMMC)         += phy-rockchip-emmc.o
+obj-$(CONFIG_PHY_ROCKCHIP_INNO_HDMI)    += phy-rockchip-inno-hdmi.o
 obj-$(CONFIG_PHY_ROCKCHIP_INNO_USB2)    += phy-rockchip-inno-usb2.o
 obj-$(CONFIG_PHY_ROCKCHIP_PCIE)         += phy-rockchip-pcie.o
 obj-$(CONFIG_PHY_ROCKCHIP_TYPEC)        += phy-rockchip-typec.o
diff --git a/drivers/phy/rockchip/phy-rockchip-emmc.c b/drivers/phy/rockchip/phy-rockchip-emmc.c
index b237360f95f6..19bf84f0bc67 100644
--- a/drivers/phy/rockchip/phy-rockchip-emmc.c
+++ b/drivers/phy/rockchip/phy-rockchip-emmc.c
@@ -337,8 +337,8 @@ static int rockchip_emmc_phy_probe(struct platform_device *pdev)
                 return -ENOMEM;
 
         if (of_property_read_u32(dev->of_node, "reg", &reg_offset)) {
-                dev_err(dev, "missing reg property in node %s\n",
-                        dev->of_node->name);
+                dev_err(dev, "missing reg property in node %pOFn\n",
+                        dev->of_node);
                 return -EINVAL;
         }
 
diff --git a/drivers/phy/rockchip/phy-rockchip-inno-hdmi.c b/drivers/phy/rockchip/phy-rockchip-inno-hdmi.c
new file mode 100644
index 000000000000..b10a84cab4a7
--- /dev/null
+++ b/drivers/phy/rockchip/phy-rockchip-inno-hdmi.c
@@ -0,0 +1,1277 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * Copyright (c) 2017 Rockchip Electronics Co. Ltd.
+ *
+ * Author: Zheng Yang <zhengyang@rock-chips.com>
+ *         Heiko Stuebner <heiko@sntech.de>
+ */
+
+#include <linux/clk.h>
+#include <linux/clk-provider.h>
+#include <linux/delay.h>
+#include <linux/io.h>
+#include <linux/interrupt.h>
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/nvmem-consumer.h>
+#include <linux/of.h>
+#include <linux/of_device.h>
+#include <linux/platform_device.h>
+#include <linux/regmap.h>
+#include <linux/phy/phy.h>
+#include <linux/slab.h>
+
+#define UPDATE(x, h, l)         (((x) << (l)) & GENMASK((h), (l)))
+
+/* REG: 0x00 */
+#define RK3228_PRE_PLL_REFCLK_SEL_PCLK                  BIT(0)
+/* REG: 0x01 */
+#define RK3228_BYPASS_RXSENSE_EN                        BIT(2)
+#define RK3228_BYPASS_PWRON_EN                          BIT(1)
+#define RK3228_BYPASS_PLLPD_EN                          BIT(0)
+/* REG: 0x02 */
+#define RK3228_BYPASS_PDATA_EN                          BIT(4)
+#define RK3228_PDATAEN_DISABLE                          BIT(0)
+/* REG: 0x03 */
+#define RK3228_BYPASS_AUTO_TERM_RES_CAL                 BIT(7)
+#define RK3228_AUTO_TERM_RES_CAL_SPEED_14_8(x)          UPDATE(x, 6, 0)
+/* REG: 0x04 */
+#define RK3228_AUTO_TERM_RES_CAL_SPEED_7_0(x)           UPDATE(x, 7, 0)
+/* REG: 0xaa */
+#define RK3228_POST_PLL_CTRL_MANUAL                     BIT(0)
+/* REG: 0xe0 */
+#define RK3228_POST_PLL_POWER_DOWN                      BIT(5)
+#define RK3228_PRE_PLL_POWER_DOWN                       BIT(4)
+#define RK3228_RXSENSE_CLK_CH_ENABLE                    BIT(3)
+#define RK3228_RXSENSE_DATA_CH2_ENABLE                  BIT(2)
+#define RK3228_RXSENSE_DATA_CH1_ENABLE                  BIT(1)
+#define RK3228_RXSENSE_DATA_CH0_ENABLE                  BIT(0)
+/* REG: 0xe1 */
+#define RK3228_BANDGAP_ENABLE                           BIT(4)
+#define RK3228_TMDS_DRIVER_ENABLE                       GENMASK(3, 0)
+/* REG: 0xe2 */
+#define RK3228_PRE_PLL_FB_DIV_8_MASK                    BIT(7)
+#define RK3228_PRE_PLL_FB_DIV_8(x)                      UPDATE((x) >> 8, 7, 7)
+#define RK3228_PCLK_VCO_DIV_5_MASK                      BIT(5)
+#define RK3228_PCLK_VCO_DIV_5(x)                        UPDATE(x, 5, 5)
+#define RK3228_PRE_PLL_PRE_DIV_MASK                     GENMASK(4, 0)
+#define RK3228_PRE_PLL_PRE_DIV(x)                       UPDATE(x, 4, 0)
+/* REG: 0xe3 */
+#define RK3228_PRE_PLL_FB_DIV_7_0(x)                    UPDATE(x, 7, 0)
+/* REG: 0xe4 */
+#define RK3228_PRE_PLL_PCLK_DIV_B_MASK                  GENMASK(6, 5)
+#define RK3228_PRE_PLL_PCLK_DIV_B_SHIFT                 5
+#define RK3228_PRE_PLL_PCLK_DIV_B(x)                    UPDATE(x, 6, 5)
+#define RK3228_PRE_PLL_PCLK_DIV_A_MASK                  GENMASK(4, 0)
+#define RK3228_PRE_PLL_PCLK_DIV_A(x)                    UPDATE(x, 4, 0)
+/* REG: 0xe5 */
+#define RK3228_PRE_PLL_PCLK_DIV_C_MASK                  GENMASK(6, 5)
+#define RK3228_PRE_PLL_PCLK_DIV_C(x)                    UPDATE(x, 6, 5)
+#define RK3228_PRE_PLL_PCLK_DIV_D_MASK                  GENMASK(4, 0)
+#define RK3228_PRE_PLL_PCLK_DIV_D(x)                    UPDATE(x, 4, 0)
+/* REG: 0xe6 */
+#define RK3228_PRE_PLL_TMDSCLK_DIV_C_MASK               GENMASK(5, 4)
+#define RK3228_PRE_PLL_TMDSCLK_DIV_C(x)                 UPDATE(x, 5, 4)
+#define RK3228_PRE_PLL_TMDSCLK_DIV_A_MASK               GENMASK(3, 2)
+#define RK3228_PRE_PLL_TMDSCLK_DIV_A(x)                 UPDATE(x, 3, 2)
+#define RK3228_PRE_PLL_TMDSCLK_DIV_B_MASK               GENMASK(1, 0)
+#define RK3228_PRE_PLL_TMDSCLK_DIV_B(x)                 UPDATE(x, 1, 0)
+/* REG: 0xe8 */
+#define RK3228_PRE_PLL_LOCK_STATUS                      BIT(0)
+/* REG: 0xe9 */
+#define RK3228_POST_PLL_POST_DIV_ENABLE                 UPDATE(3, 7, 6)
+#define RK3228_POST_PLL_PRE_DIV_MASK                    GENMASK(4, 0)
+#define RK3228_POST_PLL_PRE_DIV(x)                      UPDATE(x, 4, 0)
+/* REG: 0xea */
+#define RK3228_POST_PLL_FB_DIV_7_0(x)                   UPDATE(x, 7, 0)
+/* REG: 0xeb */
+#define RK3228_POST_PLL_FB_DIV_8_MASK                   BIT(7)
+#define RK3228_POST_PLL_FB_DIV_8(x)                     UPDATE((x) >> 8, 7, 7)
+#define RK3228_POST_PLL_POST_DIV_MASK                   GENMASK(5, 4)
+#define RK3228_POST_PLL_POST_DIV(x)                     UPDATE(x, 5, 4)
+#define RK3228_POST_PLL_LOCK_STATUS                     BIT(0)
+/* REG: 0xee */
+#define RK3228_TMDS_CH_TA_ENABLE                        GENMASK(7, 4)
+/* REG: 0xef */
+#define RK3228_TMDS_CLK_CH_TA(x)                        UPDATE(x, 7, 6)
+#define RK3228_TMDS_DATA_CH2_TA(x)                      UPDATE(x, 5, 4)
+#define RK3228_TMDS_DATA_CH1_TA(x)                      UPDATE(x, 3, 2)
+#define RK3228_TMDS_DATA_CH0_TA(x)                      UPDATE(x, 1, 0)
+/* REG: 0xf0 */
+#define RK3228_TMDS_DATA_CH2_PRE_EMPHASIS_MASK          GENMASK(5, 4)
+#define RK3228_TMDS_DATA_CH2_PRE_EMPHASIS(x)            UPDATE(x, 5, 4)
+#define RK3228_TMDS_DATA_CH1_PRE_EMPHASIS_MASK          GENMASK(3, 2)
+#define RK3228_TMDS_DATA_CH1_PRE_EMPHASIS(x)            UPDATE(x, 3, 2)
+#define RK3228_TMDS_DATA_CH0_PRE_EMPHASIS_MASK          GENMASK(1, 0)
+#define RK3228_TMDS_DATA_CH0_PRE_EMPHASIS(x)            UPDATE(x, 1, 0)
+/* REG: 0xf1 */
+#define RK3228_TMDS_CLK_CH_OUTPUT_SWING(x)              UPDATE(x, 7, 4)
+#define RK3228_TMDS_DATA_CH2_OUTPUT_SWING(x)            UPDATE(x, 3, 0)
+/* REG: 0xf2 */
+#define RK3228_TMDS_DATA_CH1_OUTPUT_SWING(x)            UPDATE(x, 7, 4)
+#define RK3228_TMDS_DATA_CH0_OUTPUT_SWING(x)            UPDATE(x, 3, 0)
+
+/* REG: 0x01 */
+#define RK3328_BYPASS_RXSENSE_EN                        BIT(2)
+#define RK3328_BYPASS_POWERON_EN                        BIT(1)
+#define RK3328_BYPASS_PLLPD_EN                          BIT(0)
+/* REG: 0x02 */
+#define RK3328_INT_POL_HIGH                             BIT(7)
+#define RK3328_BYPASS_PDATA_EN                          BIT(4)
+#define RK3328_PDATA_EN                                 BIT(0)
+/* REG:0x05 */
+#define RK3328_INT_TMDS_CLK(x)                          UPDATE(x, 7, 4)
+#define RK3328_INT_TMDS_D2(x)                           UPDATE(x, 3, 0)
+/* REG:0x07 */
+#define RK3328_INT_TMDS_D1(x)                           UPDATE(x, 7, 4)
+#define RK3328_INT_TMDS_D0(x)                           UPDATE(x, 3, 0)
+/* for all RK3328_INT_TMDS_*, ESD_DET as defined in 0xc8-0xcb */
+#define RK3328_INT_AGND_LOW_PULSE_LOCKED                BIT(3)
+#define RK3328_INT_RXSENSE_LOW_PULSE_LOCKED             BIT(2)
+#define RK3328_INT_VSS_AGND_ESD_DET                     BIT(1)
+#define RK3328_INT_AGND_VSS_ESD_DET                     BIT(0)
+/* REG: 0xa0 */
+#define RK3328_PCLK_VCO_DIV_5_MASK                      BIT(1)
+#define RK3328_PCLK_VCO_DIV_5(x)                        UPDATE(x, 1, 1)
+#define RK3328_PRE_PLL_POWER_DOWN                       BIT(0)
+/* REG: 0xa1 */
+#define RK3328_PRE_PLL_PRE_DIV_MASK                     GENMASK(5, 0)
+#define RK3328_PRE_PLL_PRE_DIV(x)                       UPDATE(x, 5, 0)
+/* REG: 0xa2 */
+/* unset means center spread */
+#define RK3328_SPREAD_SPECTRUM_MOD_DOWN                 BIT(7)
+#define RK3328_SPREAD_SPECTRUM_MOD_DISABLE              BIT(6)
+#define RK3328_PRE_PLL_FRAC_DIV_DISABLE                 UPDATE(3, 5, 4)
+#define RK3328_PRE_PLL_FB_DIV_11_8_MASK                 GENMASK(3, 0)
+#define RK3328_PRE_PLL_FB_DIV_11_8(x)                   UPDATE((x) >> 8, 3, 0)
+/* REG: 0xa3 */
+#define RK3328_PRE_PLL_FB_DIV_7_0(x)                    UPDATE(x, 7, 0)
+/* REG: 0xa4*/
+#define RK3328_PRE_PLL_TMDSCLK_DIV_C_MASK               GENMASK(1, 0)
+#define RK3328_PRE_PLL_TMDSCLK_DIV_C(x)                 UPDATE(x, 1, 0)
+#define RK3328_PRE_PLL_TMDSCLK_DIV_B_MASK               GENMASK(3, 2)
+#define RK3328_PRE_PLL_TMDSCLK_DIV_B(x)                 UPDATE(x, 3, 2)
+#define RK3328_PRE_PLL_TMDSCLK_DIV_A_MASK               GENMASK(5, 4)
+#define RK3328_PRE_PLL_TMDSCLK_DIV_A(x)                 UPDATE(x, 5, 4)
+/* REG: 0xa5 */
+#define RK3328_PRE_PLL_PCLK_DIV_B_SHIFT                 5
+#define RK3328_PRE_PLL_PCLK_DIV_B_MASK                  GENMASK(6, 5)
+#define RK3328_PRE_PLL_PCLK_DIV_B(x)                    UPDATE(x, 6, 5)
+#define RK3328_PRE_PLL_PCLK_DIV_A_MASK                  GENMASK(4, 0)
+#define RK3328_PRE_PLL_PCLK_DIV_A(x)                    UPDATE(x, 4, 0)
+/* REG: 0xa6 */
+#define RK3328_PRE_PLL_PCLK_DIV_C_SHIFT                 5
+#define RK3328_PRE_PLL_PCLK_DIV_C_MASK                  GENMASK(6, 5)
+#define RK3328_PRE_PLL_PCLK_DIV_C(x)                    UPDATE(x, 6, 5)
+#define RK3328_PRE_PLL_PCLK_DIV_D_MASK                  GENMASK(4, 0)
+#define RK3328_PRE_PLL_PCLK_DIV_D(x)                    UPDATE(x, 4, 0)
+/* REG: 0xa9 */
+#define RK3328_PRE_PLL_LOCK_STATUS                      BIT(0)
+/* REG: 0xaa */
+#define RK3328_POST_PLL_POST_DIV_ENABLE                 GENMASK(3, 2)
+#define RK3328_POST_PLL_REFCLK_SEL_TMDS                 BIT(1)
+#define RK3328_POST_PLL_POWER_DOWN                      BIT(0)
+/* REG:0xab */
+#define RK3328_POST_PLL_FB_DIV_8(x)                     UPDATE((x) >> 8, 7, 7)
+#define RK3328_POST_PLL_PRE_DIV(x)                      UPDATE(x, 4, 0)
+/* REG: 0xac */
+#define RK3328_POST_PLL_FB_DIV_7_0(x)                   UPDATE(x, 7, 0)
+/* REG: 0xad */
+#define RK3328_POST_PLL_POST_DIV_MASK                   GENMASK(1, 0)
+#define RK3328_POST_PLL_POST_DIV_2                      0x0
+#define RK3328_POST_PLL_POST_DIV_4                      0x1
+#define RK3328_POST_PLL_POST_DIV_8                      0x3
+/* REG: 0xaf */
+#define RK3328_POST_PLL_LOCK_STATUS                     BIT(0)
+/* REG: 0xb0 */
+#define RK3328_BANDGAP_ENABLE                           BIT(2)
+/* REG: 0xb2 */
+#define RK3328_TMDS_CLK_DRIVER_EN                       BIT(3)
+#define RK3328_TMDS_D2_DRIVER_EN                        BIT(2)
+#define RK3328_TMDS_D1_DRIVER_EN                        BIT(1)
+#define RK3328_TMDS_D0_DRIVER_EN                        BIT(0)
+#define RK3328_TMDS_DRIVER_ENABLE               (RK3328_TMDS_CLK_DRIVER_EN | \
+                                                RK3328_TMDS_D2_DRIVER_EN | \
+                                                RK3328_TMDS_D1_DRIVER_EN | \
+                                                RK3328_TMDS_D0_DRIVER_EN)
+/* REG:0xc5 */
+#define RK3328_BYPASS_TERM_RESISTOR_CALIB               BIT(7)
+#define RK3328_TERM_RESISTOR_CALIB_SPEED_14_8(x)        UPDATE((x) >> 8, 6, 0)
+/* REG:0xc6 */
+#define RK3328_TERM_RESISTOR_CALIB_SPEED_7_0(x)         UPDATE(x, 7, 9)
+/* REG:0xc7 */
+#define RK3328_TERM_RESISTOR_50                         UPDATE(0, 2, 1)
+#define RK3328_TERM_RESISTOR_62_5                       UPDATE(1, 2, 1)
+#define RK3328_TERM_RESISTOR_75                         UPDATE(2, 2, 1)
+#define RK3328_TERM_RESISTOR_100                        UPDATE(3, 2, 1)
+/* REG 0xc8 - 0xcb */
+#define RK3328_ESD_DETECT_MASK                          GENMASK(7, 6)
+#define RK3328_ESD_DETECT_340MV                         (0x0 << 6)
+#define RK3328_ESD_DETECT_280MV                         (0x1 << 6)
+#define RK3328_ESD_DETECT_260MV                         (0x2 << 6)
+#define RK3328_ESD_DETECT_240MV                         (0x3 << 6)
+/* resistors can be used in parallel */
+#define RK3328_TMDS_TERM_RESIST_MASK                    GENMASK(5, 0)
+#define RK3328_TMDS_TERM_RESIST_75                      BIT(5)
+#define RK3328_TMDS_TERM_RESIST_150                     BIT(4)
+#define RK3328_TMDS_TERM_RESIST_300                     BIT(3)
+#define RK3328_TMDS_TERM_RESIST_600                     BIT(2)
+#define RK3328_TMDS_TERM_RESIST_1000                    BIT(1)
+#define RK3328_TMDS_TERM_RESIST_2000                    BIT(0)
+/* REG: 0xd1 */
+#define RK3328_PRE_PLL_FRAC_DIV_23_16(x)                UPDATE((x) >> 16, 7, 0)
+/* REG: 0xd2 */
+#define RK3328_PRE_PLL_FRAC_DIV_15_8(x)                 UPDATE((x) >> 8, 7, 0)
+/* REG: 0xd3 */
+#define RK3328_PRE_PLL_FRAC_DIV_7_0(x)                  UPDATE(x, 7, 0)
+
+struct inno_hdmi_phy_drv_data;
+
+struct inno_hdmi_phy {
+        struct device *dev;
+        struct regmap *regmap;
+        int irq;
+
+        struct phy *phy;
+        struct clk *sysclk;
+        struct clk *refoclk;
+        struct clk *refpclk;
+
+        /* platform data */
+        const struct inno_hdmi_phy_drv_data *plat_data;
+        int chip_version;
+
+        /* clk provider */
+        struct clk_hw hw;
+        struct clk *phyclk;
+        unsigned long pixclock;
+};
+
+struct pre_pll_config {
+        unsigned long pixclock;
+        unsigned long tmdsclock;
+        u8 prediv;
+        u16 fbdiv;
+        u8 tmds_div_a;
+        u8 tmds_div_b;
+        u8 tmds_div_c;
+        u8 pclk_div_a;
+        u8 pclk_div_b;
+        u8 pclk_div_c;
+        u8 pclk_div_d;
+        u8 vco_div_5_en;
+        u32 fracdiv;
+};
+
+struct post_pll_config {
+        unsigned long tmdsclock;
+        u8 prediv;
+        u16 fbdiv;
+        u8 postdiv;
+        u8 version;
+};
+
+struct phy_config {
+        unsigned long   tmdsclock;
+        u8              regs[14];
+};
+
+struct inno_hdmi_phy_ops {
+        int (*init)(struct inno_hdmi_phy *inno);
+        int (*power_on)(struct inno_hdmi_phy *inno,
+                        const struct post_pll_config *cfg,
+                        const struct phy_config *phy_cfg);
+        void (*power_off)(struct inno_hdmi_phy *inno);
+};
+
+struct inno_hdmi_phy_drv_data {
+        const struct inno_hdmi_phy_ops  *ops;
+        const struct clk_ops            *clk_ops;
+        const struct phy_config         *phy_cfg_table;
+};
+
+static const struct pre_pll_config pre_pll_cfg_table[] = {
+        { 27000000,  27000000, 1,  90, 3, 2, 2, 10, 3, 3, 4, 0, 0},
+        { 27000000,  33750000, 1,  90, 1, 3, 3, 10, 3, 3, 4, 0, 0},
+        { 40000000,  40000000, 1,  80, 2, 2, 2, 12, 2, 2, 2, 0, 0},
+        { 59341000,  59341000, 1,  98, 3, 1, 2,  1, 3, 3, 4, 0, 0xE6AE6B},
+        { 59400000,  59400000, 1,  99, 3, 1, 1,  1, 3, 3, 4, 0, 0},
+        { 59341000,  74176250, 1,  98, 0, 3, 3,  1, 3, 3, 4, 0, 0xE6AE6B},
+        { 59400000,  74250000, 1,  99, 1, 2, 2,  1, 3, 3, 4, 0, 0},
+        { 74176000,  74176000, 1,  98, 1, 2, 2,  1, 2, 3, 4, 0, 0xE6AE6B},
+        { 74250000,  74250000, 1,  99, 1, 2, 2,  1, 2, 3, 4, 0, 0},
+        { 74176000,  92720000, 4, 494, 1, 2, 2,  1, 3, 3, 4, 0, 0x816817},
+        { 74250000,  92812500, 4, 495, 1, 2, 2,  1, 3, 3, 4, 0, 0},
+        {148352000, 148352000, 1,  98, 1, 1, 1,  1, 2, 2, 2, 0, 0xE6AE6B},
+        {148500000, 148500000, 1,  99, 1, 1, 1,  1, 2, 2, 2, 0, 0},
+        {148352000, 185440000, 4, 494, 0, 2, 2,  1, 3, 2, 2, 0, 0x816817},
+        {148500000, 185625000, 4, 495, 0, 2, 2,  1, 3, 2, 2, 0, 0},
+        {296703000, 296703000, 1,  98, 0, 1, 1,  1, 0, 2, 2, 0, 0xE6AE6B},
+        {297000000, 297000000, 1,  99, 0, 1, 1,  1, 0, 2, 2, 0, 0},
+        {296703000, 370878750, 4, 494, 1, 2, 0,  1, 3, 1, 1, 0, 0x816817},
+        {297000000, 371250000, 4, 495, 1, 2, 0,  1, 3, 1, 1, 0, 0},
+        {593407000, 296703500, 1,  98, 0, 1, 1,  1, 0, 2, 1, 0, 0xE6AE6B},
+        {594000000, 297000000, 1,  99, 0, 1, 1,  1, 0, 2, 1, 0, 0},
+        {593407000, 370879375, 4, 494, 1, 2, 0,  1, 3, 1, 1, 1, 0x816817},
+        {594000000, 371250000, 4, 495, 1, 2, 0,  1, 3, 1, 1, 1, 0},
+        {593407000, 593407000, 1,  98, 0, 2, 0,  1, 0, 1, 1, 0, 0xE6AE6B},
+        {594000000, 594000000, 1,  99, 0, 2, 0,  1, 0, 1, 1, 0, 0},
+        { /* sentinel */ }
+};
+
+static const struct post_pll_config post_pll_cfg_table[] = {
+        {33750000,  1, 40, 8, 1},
+        {33750000,  1, 80, 8, 2},
+        {74250000,  1, 40, 8, 1},
+        {74250000, 18, 80, 8, 2},
+        {148500000, 2, 40, 4, 3},
+        {297000000, 4, 40, 2, 3},
+        {594000000, 8, 40, 1, 3},
+        { /* sentinel */ }
+};
+
+/* phy tuning values for an undocumented set of registers */
+static const struct phy_config rk3228_phy_cfg[] = {
+        {       165000000, {
+                        0xaa, 0x00, 0x44, 0x44, 0x00, 0x00, 0x00, 0x00, 0x00,
+                        0x00, 0x00, 0x00, 0x00, 0x00,
+                },
+        }, {
+                340000000, {
+                        0xaa, 0x15, 0x6a, 0xaa, 0x00, 0x00, 0x00, 0x00, 0x00,
+                        0x00, 0x00, 0x00, 0x00, 0x00,
+                },
+        }, {
+                594000000, {
+                        0xaa, 0x15, 0x7a, 0xaa, 0x00, 0x00, 0x00, 0x00, 0x00,
+                        0x00, 0x00, 0x00, 0x00, 0x00,
+                },
+        }, { /* sentinel */ },
+};
+
+/* phy tuning values for an undocumented set of registers */
+static const struct phy_config rk3328_phy_cfg[] = {
+        {       165000000, {
+                        0x07, 0x0a, 0x0a, 0x0a, 0x00, 0x00, 0x08, 0x08, 0x08,
+                        0x00, 0xac, 0xcc, 0xcc, 0xcc,
+                },
+        }, {
+                340000000, {
+                        0x0b, 0x0d, 0x0d, 0x0d, 0x07, 0x15, 0x08, 0x08, 0x08,
+                        0x3f, 0xac, 0xcc, 0xcd, 0xdd,
+                },
+        }, {
+                594000000, {
+                        0x10, 0x1a, 0x1a, 0x1a, 0x07, 0x15, 0x08, 0x08, 0x08,
+                        0x00, 0xac, 0xcc, 0xcc, 0xcc,
+                },
+        }, { /* sentinel */ },
+};
+
+static inline struct inno_hdmi_phy *to_inno_hdmi_phy(struct clk_hw *hw)
+{
+        return container_of(hw, struct inno_hdmi_phy, hw);
+}
+
+/*
+ * The register description of the IP block does not use any distinct names
+ * but instead the databook simply numbers the registers in one-increments.
+ * As the registers are obviously 32bit sized, the inno_* functions
+ * translate the databook register names to the actual registers addresses.
+ */
+static inline void inno_write(struct inno_hdmi_phy *inno, u32 reg, u8 val)
+{
+        regmap_write(inno->regmap, reg * 4, val);
+}
+
+static inline u8 inno_read(struct inno_hdmi_phy *inno, u32 reg)
+{
+        u32 val;
+
+        regmap_read(inno->regmap, reg * 4, &val);
+
+        return val;
+}
+
+static inline void inno_update_bits(struct inno_hdmi_phy *inno, u8 reg,
+                                    u8 mask, u8 val)
+{
+        regmap_update_bits(inno->regmap, reg * 4, mask, val);
+}
+
+#define inno_poll(inno, reg, val, cond, sleep_us, timeout_us) \
+        regmap_read_poll_timeout((inno)->regmap, (reg) * 4, val, cond, \
+                                 sleep_us, timeout_us)
+
+static unsigned long inno_hdmi_phy_get_tmdsclk(struct inno_hdmi_phy *inno,
+                                               unsigned long rate)
+{
+        int bus_width = phy_get_bus_width(inno->phy);
+
+        switch (bus_width) {
+        case 4:
+        case 5:
+        case 6:
+        case 10:
+        case 12:
+        case 16:
+                return (u64)rate * bus_width / 8;
+        default:
+                return rate;
+        }
+}
+
+static irqreturn_t inno_hdmi_phy_rk3328_hardirq(int irq, void *dev_id)
+{
+        struct inno_hdmi_phy *inno = dev_id;
+        int intr_stat1, intr_stat2, intr_stat3;
+
+        intr_stat1 = inno_read(inno, 0x04);
+        intr_stat2 = inno_read(inno, 0x06);
+        intr_stat3 = inno_read(inno, 0x08);
+
+        if (intr_stat1)
+                inno_write(inno, 0x04, intr_stat1);
+        if (intr_stat2)
+                inno_write(inno, 0x06, intr_stat2);
+        if (intr_stat3)
+                inno_write(inno, 0x08, intr_stat3);
+
+        if (intr_stat1 || intr_stat2 || intr_stat3)
+                return IRQ_WAKE_THREAD;
+
+        return IRQ_HANDLED;
+}
+
+static irqreturn_t inno_hdmi_phy_rk3328_irq(int irq, void *dev_id)
+{
+        struct inno_hdmi_phy *inno = dev_id;
+
+        inno_update_bits(inno, 0x02, RK3328_PDATA_EN, 0);
+        usleep_range(10, 20);
+        inno_update_bits(inno, 0x02, RK3328_PDATA_EN, RK3328_PDATA_EN);
+
+        return IRQ_HANDLED;
+}
+
+static int inno_hdmi_phy_power_on(struct phy *phy)
+{
+        struct inno_hdmi_phy *inno = phy_get_drvdata(phy);
+        const struct post_pll_config *cfg = post_pll_cfg_table;
+        const struct phy_config *phy_cfg = inno->plat_data->phy_cfg_table;
+        unsigned long tmdsclock = inno_hdmi_phy_get_tmdsclk(inno,
+                                                            inno->pixclock);
+        int ret;
+
+        if (!tmdsclock) {
+                dev_err(inno->dev, "TMDS clock is zero!\n");
+                return -EINVAL;
+        }
+
+        if (!inno->plat_data->ops->power_on)
+                return -EINVAL;
+
+        for (; cfg->tmdsclock != 0; cfg++)
+                if (tmdsclock <= cfg->tmdsclock &&
+                    cfg->version & inno->chip_version)
+                        break;
+
+        for (; phy_cfg->tmdsclock != 0; phy_cfg++)
+                if (tmdsclock <= phy_cfg->tmdsclock)
+                        break;
+
+        if (cfg->tmdsclock == 0 || phy_cfg->tmdsclock == 0)
+                return -EINVAL;
+
+        dev_dbg(inno->dev, "Inno HDMI PHY Power On\n");
+
+        ret = clk_prepare_enable(inno->phyclk);
+        if (ret)
+                return ret;
+
+        ret = inno->plat_data->ops->power_on(inno, cfg, phy_cfg);
+        if (ret) {
+                clk_disable_unprepare(inno->phyclk);
+                return ret;
+        }
+
+        return 0;
+}
+
+static int inno_hdmi_phy_power_off(struct phy *phy)
+{
+        struct inno_hdmi_phy *inno = phy_get_drvdata(phy);
+
+        if (!inno->plat_data->ops->power_off)
+                return -EINVAL;
+
+        inno->plat_data->ops->power_off(inno);
+
+        clk_disable_unprepare(inno->phyclk);
+
+        dev_dbg(inno->dev, "Inno HDMI PHY Power Off\n");
+
+        return 0;
+}
+
+static const struct phy_ops inno_hdmi_phy_ops = {
+        .owner = THIS_MODULE,
+        .power_on = inno_hdmi_phy_power_on,
+        .power_off = inno_hdmi_phy_power_off,
+};
+
+static const
+struct pre_pll_config *inno_hdmi_phy_get_pre_pll_cfg(struct inno_hdmi_phy *inno,
+                                                     unsigned long rate)
+{
+        const struct pre_pll_config *cfg = pre_pll_cfg_table;
+        unsigned long tmdsclock = inno_hdmi_phy_get_tmdsclk(inno, rate);
+
+        for (; cfg->pixclock != 0; cfg++)
+                if (cfg->pixclock == rate && cfg->tmdsclock == tmdsclock)
+                        break;
+
+        if (cfg->pixclock == 0)
+                return ERR_PTR(-EINVAL);
+
+        return cfg;
+}
+
+static int inno_hdmi_phy_rk3228_clk_is_prepared(struct clk_hw *hw)
+{
+        struct inno_hdmi_phy *inno = to_inno_hdmi_phy(hw);
+        u8 status;
+
+        status = inno_read(inno, 0xe0) & RK3228_PRE_PLL_POWER_DOWN;
+        return status ? 0 : 1;
+}
+
+static int inno_hdmi_phy_rk3228_clk_prepare(struct clk_hw *hw)
+{
+        struct inno_hdmi_phy *inno = to_inno_hdmi_phy(hw);
+
+        inno_update_bits(inno, 0xe0, RK3228_PRE_PLL_POWER_DOWN, 0);
+        return 0;
+}
+
+static void inno_hdmi_phy_rk3228_clk_unprepare(struct clk_hw *hw)
+{
+        struct inno_hdmi_phy *inno = to_inno_hdmi_phy(hw);
+
+        inno_update_bits(inno, 0xe0, RK3228_PRE_PLL_POWER_DOWN,
+                         RK3228_PRE_PLL_POWER_DOWN);
+}
+
+static
+unsigned long inno_hdmi_phy_rk3228_clk_recalc_rate(struct clk_hw *hw,
+                                                   unsigned long parent_rate)
+{
+        struct inno_hdmi_phy *inno = to_inno_hdmi_phy(hw);
+        u8 nd, no_a, no_b, no_d;
+        u64 vco;
+        u16 nf;
+
+        nd = inno_read(inno, 0xe2) & RK3228_PRE_PLL_PRE_DIV_MASK;
+        nf = (inno_read(inno, 0xe2) & RK3228_PRE_PLL_FB_DIV_8_MASK) << 1;
+        nf |= inno_read(inno, 0xe3);
+        vco = parent_rate * nf;
+
+        if (inno_read(inno, 0xe2) & RK3228_PCLK_VCO_DIV_5_MASK) {
+                do_div(vco, nd * 5);
+        } else {
+                no_a = inno_read(inno, 0xe4) & RK3228_PRE_PLL_PCLK_DIV_A_MASK;
+                if (!no_a)
+                        no_a = 1;
+                no_b = inno_read(inno, 0xe4) & RK3228_PRE_PLL_PCLK_DIV_B_MASK;
+                no_b >>= RK3228_PRE_PLL_PCLK_DIV_B_SHIFT;
+                no_b += 2;
+                no_d = inno_read(inno, 0xe5) & RK3228_PRE_PLL_PCLK_DIV_D_MASK;
+
+                do_div(vco, (nd * (no_a == 1 ? no_b : no_a) * no_d * 2));
+        }
+
+        inno->pixclock = vco;
+
+        dev_dbg(inno->dev, "%s rate %lu\n", __func__, inno->pixclock);
+
+        return vco;
+}
+
+static long inno_hdmi_phy_rk3228_clk_round_rate(struct clk_hw *hw,
+                                                unsigned long rate,
+                                                unsigned long *parent_rate)
+{
+        const struct pre_pll_config *cfg = pre_pll_cfg_table;
+
+        for (; cfg->pixclock != 0; cfg++)
+                if (cfg->pixclock == rate && !cfg->fracdiv)
+                        break;
+
+        if (cfg->pixclock == 0)
+                return -EINVAL;
+
+        return cfg->pixclock;
+}
+
+static int inno_hdmi_phy_rk3228_clk_set_rate(struct clk_hw *hw,
+                                             unsigned long rate,
+                                             unsigned long parent_rate)
+{
+        struct inno_hdmi_phy *inno = to_inno_hdmi_phy(hw);
+        const struct pre_pll_config *cfg = pre_pll_cfg_table;
+        unsigned long tmdsclock = inno_hdmi_phy_get_tmdsclk(inno, rate);
+        u32 v;
+        int ret;
+
+        dev_dbg(inno->dev, "%s rate %lu tmdsclk %lu\n",
+                __func__, rate, tmdsclock);
+
+        cfg = inno_hdmi_phy_get_pre_pll_cfg(inno, rate);
+        if (IS_ERR(cfg))
+                return PTR_ERR(cfg);
+
+        /* Power down PRE-PLL */
+        inno_update_bits(inno, 0xe0, RK3228_PRE_PLL_POWER_DOWN,
+                         RK3228_PRE_PLL_POWER_DOWN);
+
+        inno_update_bits(inno, 0xe2, RK3228_PRE_PLL_FB_DIV_8_MASK |
+                         RK3228_PCLK_VCO_DIV_5_MASK |
+                         RK3228_PRE_PLL_PRE_DIV_MASK,
+                         RK3228_PRE_PLL_FB_DIV_8(cfg->fbdiv) |
+                         RK3228_PCLK_VCO_DIV_5(cfg->vco_div_5_en) |
+                         RK3228_PRE_PLL_PRE_DIV(cfg->prediv));
+        inno_write(inno, 0xe3, RK3228_PRE_PLL_FB_DIV_7_0(cfg->fbdiv));
+        inno_update_bits(inno, 0xe4, RK3228_PRE_PLL_PCLK_DIV_B_MASK |
+                         RK3228_PRE_PLL_PCLK_DIV_A_MASK,
+                         RK3228_PRE_PLL_PCLK_DIV_B(cfg->pclk_div_b) |
+                         RK3228_PRE_PLL_PCLK_DIV_A(cfg->pclk_div_a));
+        inno_update_bits(inno, 0xe5, RK3228_PRE_PLL_PCLK_DIV_C_MASK |
+                         RK3228_PRE_PLL_PCLK_DIV_D_MASK,
+                         RK3228_PRE_PLL_PCLK_DIV_C(cfg->pclk_div_c) |
+                         RK3228_PRE_PLL_PCLK_DIV_D(cfg->pclk_div_d));
+        inno_update_bits(inno, 0xe6, RK3228_PRE_PLL_TMDSCLK_DIV_C_MASK |
+                         RK3228_PRE_PLL_TMDSCLK_DIV_A_MASK |
+                         RK3228_PRE_PLL_TMDSCLK_DIV_B_MASK,
+                         RK3228_PRE_PLL_TMDSCLK_DIV_C(cfg->tmds_div_c) |
+                         RK3228_PRE_PLL_TMDSCLK_DIV_A(cfg->tmds_div_a) |
+                         RK3228_PRE_PLL_TMDSCLK_DIV_B(cfg->tmds_div_b));
+
+        /* Power up PRE-PLL */
+        inno_update_bits(inno, 0xe0, RK3228_PRE_PLL_POWER_DOWN, 0);
+
+        /* Wait for Pre-PLL lock */
+        ret = inno_poll(inno, 0xe8, v, v & RK3228_PRE_PLL_LOCK_STATUS,
+                        100, 100000);
+        if (ret) {
+                dev_err(inno->dev, "Pre-PLL locking failed\n");
+                return ret;
+        }
+
+        inno->pixclock = rate;
+
+        return 0;
+}
+
+static const struct clk_ops inno_hdmi_phy_rk3228_clk_ops = {
+        .prepare = inno_hdmi_phy_rk3228_clk_prepare,
+        .unprepare = inno_hdmi_phy_rk3228_clk_unprepare,
+        .is_prepared = inno_hdmi_phy_rk3228_clk_is_prepared,
+        .recalc_rate = inno_hdmi_phy_rk3228_clk_recalc_rate,
+        .round_rate = inno_hdmi_phy_rk3228_clk_round_rate,
+        .set_rate = inno_hdmi_phy_rk3228_clk_set_rate,
+};
+
+static int inno_hdmi_phy_rk3328_clk_is_prepared(struct clk_hw *hw)
+{
+        struct inno_hdmi_phy *inno = to_inno_hdmi_phy(hw);
+        u8 status;
+
+        status = inno_read(inno, 0xa0) & RK3328_PRE_PLL_POWER_DOWN;
+        return status ? 0 : 1;
+}
+
+static int inno_hdmi_phy_rk3328_clk_prepare(struct clk_hw *hw)
+{
+        struct inno_hdmi_phy *inno = to_inno_hdmi_phy(hw);
+
+        inno_update_bits(inno, 0xa0, RK3328_PRE_PLL_POWER_DOWN, 0);
+        return 0;
+}
+
+static void inno_hdmi_phy_rk3328_clk_unprepare(struct clk_hw *hw)
+{
+        struct inno_hdmi_phy *inno = to_inno_hdmi_phy(hw);
+
+        inno_update_bits(inno, 0xa0, RK3328_PRE_PLL_POWER_DOWN,
+                         RK3328_PRE_PLL_POWER_DOWN);
+}
+
+static
+unsigned long inno_hdmi_phy_rk3328_clk_recalc_rate(struct clk_hw *hw,
+                                                   unsigned long parent_rate)
+{
+        struct inno_hdmi_phy *inno = to_inno_hdmi_phy(hw);
+        unsigned long frac;
+        u8 nd, no_a, no_b, no_c, no_d;
+        u64 vco;
+        u16 nf;
+
+        nd = inno_read(inno, 0xa1) & RK3328_PRE_PLL_PRE_DIV_MASK;
+        nf = ((inno_read(inno, 0xa2) & RK3328_PRE_PLL_FB_DIV_11_8_MASK) << 8);
+        nf |= inno_read(inno, 0xa3);
+        vco = parent_rate * nf;
+
+        if (!(inno_read(inno, 0xa2) & RK3328_PRE_PLL_FRAC_DIV_DISABLE)) {
+                frac = inno_read(inno, 0xd3) |
+                       (inno_read(inno, 0xd2) << 8) |
+                       (inno_read(inno, 0xd1) << 16);
+                vco += DIV_ROUND_CLOSEST(parent_rate * frac, (1 << 24));
+        }
+
+        if (inno_read(inno, 0xa0) & RK3328_PCLK_VCO_DIV_5_MASK) {
+                do_div(vco, nd * 5);
+        } else {
+                no_a = inno_read(inno, 0xa5) & RK3328_PRE_PLL_PCLK_DIV_A_MASK;
+                no_b = inno_read(inno, 0xa5) & RK3328_PRE_PLL_PCLK_DIV_B_MASK;
+                no_b >>= RK3328_PRE_PLL_PCLK_DIV_B_SHIFT;
+                no_b += 2;
+                no_c = inno_read(inno, 0xa6) & RK3328_PRE_PLL_PCLK_DIV_C_MASK;
+                no_c >>= RK3328_PRE_PLL_PCLK_DIV_C_SHIFT;
+                no_c = 1 << no_c;
+                no_d = inno_read(inno, 0xa6) & RK3328_PRE_PLL_PCLK_DIV_D_MASK;
+
+                do_div(vco, (nd * (no_a == 1 ? no_b : no_a) * no_d * 2));
+        }
+
+        inno->pixclock = vco;
+        dev_dbg(inno->dev, "%s rate %lu\n", __func__, inno->pixclock);
+
+        return vco;
+}
+
+static long inno_hdmi_phy_rk3328_clk_round_rate(struct clk_hw *hw,
+                                                unsigned long rate,
+                                                unsigned long *parent_rate)
+{
+        const struct pre_pll_config *cfg = pre_pll_cfg_table;
+
+        for (; cfg->pixclock != 0; cfg++)
+                if (cfg->pixclock == rate)
+                        break;
+
+        if (cfg->pixclock == 0)
+                return -EINVAL;
+
+        return cfg->pixclock;
+}
+
+static int inno_hdmi_phy_rk3328_clk_set_rate(struct clk_hw *hw,
+                                             unsigned long rate,
+                                             unsigned long parent_rate)
+{
+        struct inno_hdmi_phy *inno = to_inno_hdmi_phy(hw);
+        const struct pre_pll_config *cfg = pre_pll_cfg_table;
+        unsigned long tmdsclock = inno_hdmi_phy_get_tmdsclk(inno, rate);
+        u32 val;
+        int ret;
+
+        dev_dbg(inno->dev, "%s rate %lu tmdsclk %lu\n",
+                __func__, rate, tmdsclock);
+
+        cfg = inno_hdmi_phy_get_pre_pll_cfg(inno, rate);
+        if (IS_ERR(cfg))
+                return PTR_ERR(cfg);
+
+        inno_update_bits(inno, 0xa0, RK3328_PRE_PLL_POWER_DOWN,
+                         RK3328_PRE_PLL_POWER_DOWN);
+
+        /* Configure pre-pll */
+        inno_update_bits(inno, 0xa0, RK3228_PCLK_VCO_DIV_5_MASK,
+                         RK3228_PCLK_VCO_DIV_5(cfg->vco_div_5_en));
+        inno_write(inno, 0xa1, RK3328_PRE_PLL_PRE_DIV(cfg->prediv));
+
+        val = RK3328_SPREAD_SPECTRUM_MOD_DISABLE;
+        if (!cfg->fracdiv)
+                val |= RK3328_PRE_PLL_FRAC_DIV_DISABLE;
+        inno_write(inno, 0xa2, RK3328_PRE_PLL_FB_DIV_11_8(cfg->fbdiv) | val);
+        inno_write(inno, 0xa3, RK3328_PRE_PLL_FB_DIV_7_0(cfg->fbdiv));
+        inno_write(inno, 0xa5, RK3328_PRE_PLL_PCLK_DIV_A(cfg->pclk_div_a) |
+                   RK3328_PRE_PLL_PCLK_DIV_B(cfg->pclk_div_b));
+        inno_write(inno, 0xa6, RK3328_PRE_PLL_PCLK_DIV_C(cfg->pclk_div_c) |
+                   RK3328_PRE_PLL_PCLK_DIV_D(cfg->pclk_div_d));
+        inno_write(inno, 0xa4, RK3328_PRE_PLL_TMDSCLK_DIV_C(cfg->tmds_div_c) |
+                   RK3328_PRE_PLL_TMDSCLK_DIV_A(cfg->tmds_div_a) |
+                   RK3328_PRE_PLL_TMDSCLK_DIV_B(cfg->tmds_div_b));
+        inno_write(inno, 0xd3, RK3328_PRE_PLL_FRAC_DIV_7_0(cfg->fracdiv));
+        inno_write(inno, 0xd2, RK3328_PRE_PLL_FRAC_DIV_15_8(cfg->fracdiv));
+        inno_write(inno, 0xd1, RK3328_PRE_PLL_FRAC_DIV_23_16(cfg->fracdiv));
+
+        inno_update_bits(inno, 0xa0, RK3328_PRE_PLL_POWER_DOWN, 0);
+
+        /* Wait for Pre-PLL lock */
+        ret = inno_poll(inno, 0xa9, val, val & RK3328_PRE_PLL_LOCK_STATUS,
+                        1000, 10000);
+        if (ret) {
+                dev_err(inno->dev, "Pre-PLL locking failed\n");
+                return ret;
+        }
+
+        inno->pixclock = rate;
+
+        return 0;
+}
+
+static const struct clk_ops inno_hdmi_phy_rk3328_clk_ops = {
+        .prepare = inno_hdmi_phy_rk3328_clk_prepare,
+        .unprepare = inno_hdmi_phy_rk3328_clk_unprepare,
+        .is_prepared = inno_hdmi_phy_rk3328_clk_is_prepared,
+        .recalc_rate = inno_hdmi_phy_rk3328_clk_recalc_rate,
+        .round_rate = inno_hdmi_phy_rk3328_clk_round_rate,
+        .set_rate = inno_hdmi_phy_rk3328_clk_set_rate,
+};
+
+static int inno_hdmi_phy_clk_register(struct inno_hdmi_phy *inno)
+{
+        struct device *dev = inno->dev;
+        struct device_node *np = dev->of_node;
+        struct clk_init_data init;
+        const char *parent_name;
+        int ret;
+
+        parent_name = __clk_get_name(inno->refoclk);
+
+        init.parent_names = &parent_name;
+        init.num_parents = 1;
+        init.flags = 0;
+        init.name = "pin_hd20_pclk";
+        init.ops = inno->plat_data->clk_ops;
+
+        /* optional override of the clock name */
+        of_property_read_string(np, "clock-output-names", &init.name);
+
+        inno->hw.init = &init;
+
+        inno->phyclk = devm_clk_register(dev, &inno->hw);
+        if (IS_ERR(inno->phyclk)) {
+                ret = PTR_ERR(inno->phyclk);
+                dev_err(dev, "failed to register clock: %d\n", ret);
+                return ret;
+        }
+
+        ret = of_clk_add_provider(np, of_clk_src_simple_get, inno->phyclk);
+        if (ret) {
+                dev_err(dev, "failed to register clock provider: %d\n", ret);
+                return ret;
+        }
+
+        return 0;
+}
+
+static int inno_hdmi_phy_rk3228_init(struct inno_hdmi_phy *inno)
+{
+        /*
+         * Use phy internal register control
+         * rxsense/poweron/pllpd/pdataen signal.
+         */
+        inno_write(inno, 0x01, RK3228_BYPASS_RXSENSE_EN |
+                   RK3228_BYPASS_PWRON_EN |
+                   RK3228_BYPASS_PLLPD_EN);
+        inno_update_bits(inno, 0x02, RK3228_BYPASS_PDATA_EN,
+                         RK3228_BYPASS_PDATA_EN);
+
+        /* manual power down post-PLL */
+        inno_update_bits(inno, 0xaa, RK3228_POST_PLL_CTRL_MANUAL,
+                         RK3228_POST_PLL_CTRL_MANUAL);
+
+        inno->chip_version = 1;
+
+        return 0;
+}
+
+static int
+inno_hdmi_phy_rk3228_power_on(struct inno_hdmi_phy *inno,
+                              const struct post_pll_config *cfg,
+                              const struct phy_config *phy_cfg)
+{
+        int ret;
+        u32 v;
+
+        inno_update_bits(inno, 0x02, RK3228_PDATAEN_DISABLE,
+                         RK3228_PDATAEN_DISABLE);
+        inno_update_bits(inno, 0xe0, RK3228_PRE_PLL_POWER_DOWN |
+                         RK3228_POST_PLL_POWER_DOWN,
+                         RK3228_PRE_PLL_POWER_DOWN |
+                         RK3228_POST_PLL_POWER_DOWN);
+
+        /* Post-PLL update */
+        inno_update_bits(inno, 0xe9, RK3228_POST_PLL_PRE_DIV_MASK,
+                         RK3228_POST_PLL_PRE_DIV(cfg->prediv));
+        inno_update_bits(inno, 0xeb, RK3228_POST_PLL_FB_DIV_8_MASK,
+                         RK3228_POST_PLL_FB_DIV_8(cfg->fbdiv));
+        inno_write(inno, 0xea, RK3228_POST_PLL_FB_DIV_7_0(cfg->fbdiv));
+
+        if (cfg->postdiv == 1) {
+                inno_update_bits(inno, 0xe9, RK3228_POST_PLL_POST_DIV_ENABLE,
+                                 0);
+        } else {
+                int div = cfg->postdiv / 2 - 1;
+
+                inno_update_bits(inno, 0xe9, RK3228_POST_PLL_POST_DIV_ENABLE,
+                                 RK3228_POST_PLL_POST_DIV_ENABLE);
+                inno_update_bits(inno, 0xeb, RK3228_POST_PLL_POST_DIV_MASK,
+                                 RK3228_POST_PLL_POST_DIV(div));
+        }
+
+        for (v = 0; v < 4; v++)
+                inno_write(inno, 0xef + v, phy_cfg->regs[v]);
+
+        inno_update_bits(inno, 0xe0, RK3228_PRE_PLL_POWER_DOWN |
+                         RK3228_POST_PLL_POWER_DOWN, 0);
+        inno_update_bits(inno, 0xe1, RK3228_BANDGAP_ENABLE,
+                         RK3228_BANDGAP_ENABLE);
+        inno_update_bits(inno, 0xe1, RK3228_TMDS_DRIVER_ENABLE,
+                         RK3228_TMDS_DRIVER_ENABLE);
+
+        /* Wait for post PLL lock */
+        ret = inno_poll(inno, 0xeb, v, v & RK3228_POST_PLL_LOCK_STATUS,
+                        100, 100000);
+        if (ret) {
+                dev_err(inno->dev, "Post-PLL locking failed\n");
+                return ret;
+        }
+
+        if (cfg->tmdsclock > 340000000)
+                msleep(100);
+
+        inno_update_bits(inno, 0x02, RK3228_PDATAEN_DISABLE, 0);
+        return 0;
+}
+
+static void inno_hdmi_phy_rk3228_power_off(struct inno_hdmi_phy *inno)
+{
+        inno_update_bits(inno, 0xe1, RK3228_TMDS_DRIVER_ENABLE, 0);
+        inno_update_bits(inno, 0xe1, RK3228_BANDGAP_ENABLE, 0);
+        inno_update_bits(inno, 0xe0, RK3228_POST_PLL_POWER_DOWN,
+                         RK3228_POST_PLL_POWER_DOWN);
+}
+
+static const struct inno_hdmi_phy_ops rk3228_hdmi_phy_ops = {
+        .init = inno_hdmi_phy_rk3228_init,
+        .power_on = inno_hdmi_phy_rk3228_power_on,
+        .power_off = inno_hdmi_phy_rk3228_power_off,
+};
+
+static int inno_hdmi_phy_rk3328_init(struct inno_hdmi_phy *inno)
+{
+        struct nvmem_cell *cell;
+        unsigned char *efuse_buf;
+        size_t len;
+
+        /*
+         * Use phy internal register control
+         * rxsense/poweron/pllpd/pdataen signal.
+         */
+        inno_write(inno, 0x01, RK3328_BYPASS_RXSENSE_EN |
+                   RK3328_BYPASS_POWERON_EN |
+                   RK3328_BYPASS_PLLPD_EN);
+        inno_write(inno, 0x02, RK3328_INT_POL_HIGH | RK3328_BYPASS_PDATA_EN |
+                   RK3328_PDATA_EN);
+
+        /* Disable phy irq */
+        inno_write(inno, 0x05, 0);
+        inno_write(inno, 0x07, 0);
+
+        /* try to read the chip-version */
+        inno->chip_version = 1;
+        cell = nvmem_cell_get(inno->dev, "cpu-version");
+        if (IS_ERR(cell)) {
+                if (PTR_ERR(cell) == -EPROBE_DEFER)
+                        return -EPROBE_DEFER;
+
+                return 0;
+        }
+
+        efuse_buf = nvmem_cell_read(cell, &len);
+        nvmem_cell_put(cell);
+
+        if (IS_ERR(efuse_buf))
+                return 0;
+        if (len == 1)
+                inno->chip_version = efuse_buf[0] + 1;
+        kfree(efuse_buf);
+
+        return 0;
+}
+
+static int
+inno_hdmi_phy_rk3328_power_on(struct inno_hdmi_phy *inno,
+                              const struct post_pll_config *cfg,
+                              const struct phy_config *phy_cfg)
+{
+        int ret;
+        u32 v;
+
+        inno_update_bits(inno, 0x02, RK3328_PDATA_EN, 0);
+        inno_update_bits(inno, 0xaa, RK3328_POST_PLL_POWER_DOWN,
+                         RK3328_POST_PLL_POWER_DOWN);
+
+        inno_write(inno, 0xac, RK3328_POST_PLL_FB_DIV_7_0(cfg->fbdiv));
+        if (cfg->postdiv == 1) {
+                inno_write(inno, 0xaa, RK3328_POST_PLL_REFCLK_SEL_TMDS);
+                inno_write(inno, 0xab, RK3328_POST_PLL_FB_DIV_8(cfg->fbdiv) |
+                           RK3328_POST_PLL_PRE_DIV(cfg->prediv));
+        } else {
+                v = (cfg->postdiv / 2) - 1;
+                v &= RK3328_POST_PLL_POST_DIV_MASK;
+                inno_write(inno, 0xad, v);
+                inno_write(inno, 0xab, RK3328_POST_PLL_FB_DIV_8(cfg->fbdiv) |
+                           RK3328_POST_PLL_PRE_DIV(cfg->prediv));
+                inno_write(inno, 0xaa, RK3328_POST_PLL_POST_DIV_ENABLE |
+                           RK3328_POST_PLL_REFCLK_SEL_TMDS);
+        }
+
+        for (v = 0; v < 14; v++)
+                inno_write(inno, 0xb5 + v, phy_cfg->regs[v]);
+
+        /* set ESD detection threshold for TMDS CLK, D2, D1 and D0 */
+        for (v = 0; v < 4; v++)
+                inno_update_bits(inno, 0xc8 + v, RK3328_ESD_DETECT_MASK,
+                                 RK3328_ESD_DETECT_340MV);
+
+        if (phy_cfg->tmdsclock > 340000000) {
+                /* Set termination resistor to 100ohm */
+                v = clk_get_rate(inno->sysclk) / 100000;
+                inno_write(inno, 0xc5, RK3328_TERM_RESISTOR_CALIB_SPEED_14_8(v)
+                           | RK3328_BYPASS_TERM_RESISTOR_CALIB);
+                inno_write(inno, 0xc6, RK3328_TERM_RESISTOR_CALIB_SPEED_7_0(v));
+                inno_write(inno, 0xc7, RK3328_TERM_RESISTOR_100);
+                inno_update_bits(inno, 0xc5,
+                                 RK3328_BYPASS_TERM_RESISTOR_CALIB, 0);
+        } else {
+                inno_write(inno, 0xc5, RK3328_BYPASS_TERM_RESISTOR_CALIB);
+
+                /* clk termination resistor is 50ohm (parallel resistors) */
+                if (phy_cfg->tmdsclock > 165000000)
+                        inno_update_bits(inno, 0xc8,
+                                         RK3328_TMDS_TERM_RESIST_MASK,
+                                         RK3328_TMDS_TERM_RESIST_75 |
+                                         RK3328_TMDS_TERM_RESIST_150);
+
+                /* data termination resistor for D2, D1 and D0 is 150ohm */
+                for (v = 0; v < 3; v++)
+                        inno_update_bits(inno, 0xc9 + v,
+                                         RK3328_TMDS_TERM_RESIST_MASK,
+                                         RK3328_TMDS_TERM_RESIST_150);
+        }
+
+        inno_update_bits(inno, 0xaa, RK3328_POST_PLL_POWER_DOWN, 0);
+        inno_update_bits(inno, 0xb0, RK3328_BANDGAP_ENABLE,
+                         RK3328_BANDGAP_ENABLE);
+        inno_update_bits(inno, 0xb2, RK3328_TMDS_DRIVER_ENABLE,
+                         RK3328_TMDS_DRIVER_ENABLE);
+
+        /* Wait for post PLL lock */
+        ret = inno_poll(inno, 0xaf, v, v & RK3328_POST_PLL_LOCK_STATUS,
+                        1000, 10000);
+        if (ret) {
+                dev_err(inno->dev, "Post-PLL locking failed\n");
+                return ret;
+        }
+
+        if (phy_cfg->tmdsclock > 340000000)
+                msleep(100);
+
+        inno_update_bits(inno, 0x02, RK3328_PDATA_EN, RK3328_PDATA_EN);
+
+        /* Enable PHY IRQ */
+        inno_write(inno, 0x05, RK3328_INT_TMDS_CLK(RK3328_INT_VSS_AGND_ESD_DET)
+                   | RK3328_INT_TMDS_D2(RK3328_INT_VSS_AGND_ESD_DET));
+        inno_write(inno, 0x07, RK3328_INT_TMDS_D1(RK3328_INT_VSS_AGND_ESD_DET)
+                   | RK3328_INT_TMDS_D0(RK3328_INT_VSS_AGND_ESD_DET));
+        return 0;
+}
+
+static void inno_hdmi_phy_rk3328_power_off(struct inno_hdmi_phy *inno)
+{
+        inno_update_bits(inno, 0xb2, RK3328_TMDS_DRIVER_ENABLE, 0);
+        inno_update_bits(inno, 0xb0, RK3328_BANDGAP_ENABLE, 0);
+        inno_update_bits(inno, 0xaa, RK3328_POST_PLL_POWER_DOWN,
+                         RK3328_POST_PLL_POWER_DOWN);
+
+        /* Disable PHY IRQ */
+        inno_write(inno, 0x05, 0);
+        inno_write(inno, 0x07, 0);
+}
+
+static const struct inno_hdmi_phy_ops rk3328_hdmi_phy_ops = {
+        .init = inno_hdmi_phy_rk3328_init,
+        .power_on = inno_hdmi_phy_rk3328_power_on,
+        .power_off = inno_hdmi_phy_rk3328_power_off,
+};
+
+static const struct inno_hdmi_phy_drv_data rk3228_hdmi_phy_drv_data = {
+        .ops = &rk3228_hdmi_phy_ops,
+        .clk_ops = &inno_hdmi_phy_rk3228_clk_ops,
+        .phy_cfg_table = rk3228_phy_cfg,
+};
+
+static const struct inno_hdmi_phy_drv_data rk3328_hdmi_phy_drv_data = {
+        .ops = &rk3328_hdmi_phy_ops,
+        .clk_ops = &inno_hdmi_phy_rk3328_clk_ops,
+        .phy_cfg_table = rk3328_phy_cfg,
+};
+
+static const struct regmap_config inno_hdmi_phy_regmap_config = {
+        .reg_bits = 32,
+        .val_bits = 32,
+        .reg_stride = 4,
+        .max_register = 0x400,
+};
+
+static void inno_hdmi_phy_action(void *data)
+{
+        struct inno_hdmi_phy *inno = data;
+
+        clk_disable_unprepare(inno->refpclk);
+        clk_disable_unprepare(inno->sysclk);
+}
+
+static int inno_hdmi_phy_probe(struct platform_device *pdev)
+{
+        struct inno_hdmi_phy *inno;
+        struct phy_provider *phy_provider;
+        struct resource *res;
+        void __iomem *regs;
+        int ret;
+
+        inno = devm_kzalloc(&pdev->dev, sizeof(*inno), GFP_KERNEL);
+        if (!inno)
+                return -ENOMEM;
+
+        inno->dev = &pdev->dev;
+
+        inno->plat_data = of_device_get_match_data(inno->dev);
+        if (!inno->plat_data || !inno->plat_data->ops)
+                return -EINVAL;
+
+        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+        regs = devm_ioremap_resource(inno->dev, res);
+        if (IS_ERR(regs))
+                return PTR_ERR(regs);
+
+        inno->sysclk = devm_clk_get(inno->dev, "sysclk");
+        if (IS_ERR(inno->sysclk)) {
+                ret = PTR_ERR(inno->sysclk);
+                dev_err(inno->dev, "failed to get sysclk: %d\n", ret);
+                return ret;
+        }
+
+        inno->refpclk = devm_clk_get(inno->dev, "refpclk");
+        if (IS_ERR(inno->refpclk)) {
+                ret = PTR_ERR(inno->refpclk);
+                dev_err(inno->dev, "failed to get ref clock: %d\n", ret);
+                return ret;
+        }
+
+        inno->refoclk = devm_clk_get(inno->dev, "refoclk");
+        if (IS_ERR(inno->refoclk)) {
+                ret = PTR_ERR(inno->refoclk);
+                dev_err(inno->dev, "failed to get oscillator-ref clock: %d\n",
+                        ret);
+                return ret;
+        }
+
+        ret = clk_prepare_enable(inno->sysclk);
+        if (ret) {
+                dev_err(inno->dev, "Cannot enable inno phy sysclk: %d\n", ret);
+                return ret;
+        }
+
+        /*
+         * Refpclk needs to be on, on at least the rk3328 for still
+         * unknown reasons.
+         */
+        ret = clk_prepare_enable(inno->refpclk);
+        if (ret) {
+                dev_err(inno->dev, "failed to enable refpclk\n");
+                clk_disable_unprepare(inno->sysclk);
+                return ret;
+        }
+
+        ret = devm_add_action_or_reset(inno->dev, inno_hdmi_phy_action,
+                                       inno);
+        if (ret)
+                return ret;
+
+        inno->regmap = devm_regmap_init_mmio(inno->dev, regs,
+                                             &inno_hdmi_phy_regmap_config);
+        if (IS_ERR(inno->regmap))
+                return PTR_ERR(inno->regmap);
+
+        /* only the newer rk3328 hdmiphy has an interrupt */
+        inno->irq = platform_get_irq(pdev, 0);
+        if (inno->irq > 0) {
+                ret = devm_request_threaded_irq(inno->dev, inno->irq,
+                                                inno_hdmi_phy_rk3328_hardirq,
+                                                inno_hdmi_phy_rk3328_irq,
+                                                IRQF_SHARED,
+                                                dev_name(inno->dev), inno);
+                if (ret)
+                        return ret;
+        }
+
+        inno->phy = devm_phy_create(inno->dev, NULL, &inno_hdmi_phy_ops);
+        if (IS_ERR(inno->phy)) {
+                dev_err(inno->dev, "failed to create HDMI PHY\n");
+                return PTR_ERR(inno->phy);
+        }
+
+        phy_set_drvdata(inno->phy, inno);
+        phy_set_bus_width(inno->phy, 8);
+
+        if (inno->plat_data->ops->init) {
+                ret = inno->plat_data->ops->init(inno);
+                if (ret)
+                        return ret;
+        }
+
+        ret = inno_hdmi_phy_clk_register(inno);
+        if (ret)
+                return ret;
+
+        phy_provider = devm_of_phy_provider_register(inno->dev,
+                                                     of_phy_simple_xlate);
+        return PTR_ERR_OR_ZERO(phy_provider);
+}
+
+static int inno_hdmi_phy_remove(struct platform_device *pdev)
+{
+        of_clk_del_provider(pdev->dev.of_node);
+
+        return 0;
+}
+
+static const struct of_device_id inno_hdmi_phy_of_match[] = {
+        {
+                .compatible = "rockchip,rk3228-hdmi-phy",
+                .data = &rk3228_hdmi_phy_drv_data
+        }, {
+                .compatible = "rockchip,rk3328-hdmi-phy",
+                .data = &rk3328_hdmi_phy_drv_data
+        }, { /* sentinel */ }
+};
+MODULE_DEVICE_TABLE(of, inno_hdmi_phy_of_match);
+
+static struct platform_driver inno_hdmi_phy_driver = {
+        .probe  = inno_hdmi_phy_probe,
+        .remove = inno_hdmi_phy_remove,
+        .driver = {
+                .name = "inno-hdmi-phy",
+                .of_match_table = inno_hdmi_phy_of_match,
+        },
+};
+module_platform_driver(inno_hdmi_phy_driver);
+
+MODULE_AUTHOR("Zheng Yang <zhengyang@rock-chips.com>");
+MODULE_DESCRIPTION("Innosilion HDMI 2.0 Transmitter PHY Driver");
+MODULE_LICENSE("GPL v2");
diff --git a/drivers/phy/rockchip/phy-rockchip-inno-usb2.c b/drivers/phy/rockchip/phy-rockchip-inno-usb2.c
index 5049dac79bd0..24bd2717abdb 100644
--- a/drivers/phy/rockchip/phy-rockchip-inno-usb2.c
+++ b/drivers/phy/rockchip/phy-rockchip-inno-usb2.c
@@ -1116,8 +1116,8 @@ static int rockchip_usb2phy_probe(struct platform_device *pdev)
         }
 
         if (of_property_read_u32(np, "reg", &reg)) {
-                dev_err(dev, "the reg property is not assigned in %s node\n",
-                        np->name);
+                dev_err(dev, "the reg property is not assigned in %pOFn node\n",
+                        np);
                 return -EINVAL;
         }
 
@@ -1143,8 +1143,8 @@ static int rockchip_usb2phy_probe(struct platform_device *pdev)
         }
 
         if (!rphy->phy_cfg) {
-                dev_err(dev, "no phy-config can be matched with %s node\n",
-                        np->name);
+                dev_err(dev, "no phy-config can be matched with %pOFn node\n",
+                        np);
                 return -EINVAL;
         }
 
diff --git a/drivers/phy/rockchip/phy-rockchip-typec.c b/drivers/phy/rockchip/phy-rockchip-typec.c
index 76a4b58ec771..c57e496f0b0c 100644
--- a/drivers/phy/rockchip/phy-rockchip-typec.c
+++ b/drivers/phy/rockchip/phy-rockchip-typec.c
@@ -1145,8 +1145,8 @@ static int rockchip_typec_phy_probe(struct platform_device *pdev)
         }
 
         if (!tcphy->port_cfgs) {
-                dev_err(dev, "no phy-config can be matched with %s node\n",
-                        np->name);
+                dev_err(dev, "no phy-config can be matched with %pOFn node\n",
+                        np);
                 return -EINVAL;
         }
 
@@ -1186,8 +1186,8 @@ static int rockchip_typec_phy_probe(struct platform_device *pdev)
                         continue;
 
                 if (IS_ERR(phy)) {
-                        dev_err(dev, "failed to create phy: %s\n",
-                                child_np->name);
+                        dev_err(dev, "failed to create phy: %pOFn\n",
+                                child_np);
                         pm_runtime_disable(dev);
                         return PTR_ERR(phy);
                 }
diff --git a/drivers/phy/rockchip/phy-rockchip-usb.c b/drivers/phy/rockchip/phy-rockchip-usb.c
index 3378eeb7a562..b2899c744ad9 100644
--- a/drivers/phy/rockchip/phy-rockchip-usb.c
+++ b/drivers/phy/rockchip/phy-rockchip-usb.c
@@ -36,7 +36,22 @@ static int enable_usb_uart;
 #define HIWORD_UPDATE(val, mask) \
                 ((val) | (mask) << 16)
 
-#define UOC_CON0_SIDDQ BIT(13)
+#define UOC_CON0                                        0x00
+#define UOC_CON0_SIDDQ                                  BIT(13)
+#define UOC_CON0_DISABLE                                BIT(4)
+#define UOC_CON0_COMMON_ON_N                            BIT(0)
+
+#define UOC_CON2                                        0x08
+#define UOC_CON2_SOFT_CON_SEL                           BIT(2)
+
+#define UOC_CON3                                        0x0c
+/* bits present on rk3188 and rk3288 phys */
+#define UOC_CON3_UTMI_TERMSEL_FULLSPEED                 BIT(5)
+#define UOC_CON3_UTMI_XCVRSEELCT_FSTRANSC               (1 << 3)
+#define UOC_CON3_UTMI_XCVRSEELCT_MASK                   (3 << 3)
+#define UOC_CON3_UTMI_OPMODE_NODRIVING                  (1 << 1)
+#define UOC_CON3_UTMI_OPMODE_MASK                       (3 << 1)
+#define UOC_CON3_UTMI_SUSPENDN                          BIT(0)
 
 struct rockchip_usb_phys {
         int reg;
@@ -46,7 +61,8 @@ struct rockchip_usb_phys {
 struct rockchip_usb_phy_base;
 struct rockchip_usb_phy_pdata {
         struct rockchip_usb_phys *phys;
-        int (*init_usb_uart)(struct regmap *grf);
+        int (*init_usb_uart)(struct regmap *grf,
+                             const struct rockchip_usb_phy_pdata *pdata);
         int usb_uart_phy;
 };
 
@@ -208,8 +224,8 @@ static int rockchip_usb_phy_init(struct rockchip_usb_phy_base *base,
         rk_phy->np = child;
 
         if (of_property_read_u32(child, "reg", &reg_offset)) {
-                dev_err(base->dev, "missing reg property in node %s\n",
-                        child->name);
+                dev_err(base->dev, "missing reg property in node %pOFn\n",
+                        child);
                 return -EINVAL;
         }
 
@@ -313,28 +329,88 @@ static const struct rockchip_usb_phy_pdata rk3066a_pdata = {
         },
 };
 
+static int __init rockchip_init_usb_uart_common(struct regmap *grf,
+                                const struct rockchip_usb_phy_pdata *pdata)
+{
+        int regoffs = pdata->phys[pdata->usb_uart_phy].reg;
+        int ret;
+        u32 val;
+
+        /*
+         * COMMON_ON and DISABLE settings are described in the TRM,
+         * but were not present in the original code.
+         * Also disable the analog phy components to save power.
+         */
+        val = HIWORD_UPDATE(UOC_CON0_COMMON_ON_N
+                                | UOC_CON0_DISABLE
+                                | UOC_CON0_SIDDQ,
+                            UOC_CON0_COMMON_ON_N
+                                | UOC_CON0_DISABLE
+                                | UOC_CON0_SIDDQ);
+        ret = regmap_write(grf, regoffs + UOC_CON0, val);
+        if (ret)
+                return ret;
+
+        val = HIWORD_UPDATE(UOC_CON2_SOFT_CON_SEL,
+                            UOC_CON2_SOFT_CON_SEL);
+        ret = regmap_write(grf, regoffs + UOC_CON2, val);
+        if (ret)
+                return ret;
+
+        val = HIWORD_UPDATE(UOC_CON3_UTMI_OPMODE_NODRIVING
+                                | UOC_CON3_UTMI_XCVRSEELCT_FSTRANSC
+                                | UOC_CON3_UTMI_TERMSEL_FULLSPEED,
+                            UOC_CON3_UTMI_SUSPENDN
+                                | UOC_CON3_UTMI_OPMODE_MASK
+                                | UOC_CON3_UTMI_XCVRSEELCT_MASK
+                                | UOC_CON3_UTMI_TERMSEL_FULLSPEED);
+        ret = regmap_write(grf, UOC_CON3, val);
+        if (ret)
+                return ret;
+
+        return 0;
+}
+
+#define RK3188_UOC0_CON0                                0x10c
+#define RK3188_UOC0_CON0_BYPASSSEL                      BIT(9)
+#define RK3188_UOC0_CON0_BYPASSDMEN                     BIT(8)
+
+/*
+ * Enable the bypass of uart2 data through the otg usb phy.
+ * See description of rk3288-variant for details.
+ */
+static int __init rk3188_init_usb_uart(struct regmap *grf,
+                                const struct rockchip_usb_phy_pdata *pdata)
+{
+        u32 val;
+        int ret;
+
+        ret = rockchip_init_usb_uart_common(grf, pdata);
+        if (ret)
+                return ret;
+
+        val = HIWORD_UPDATE(RK3188_UOC0_CON0_BYPASSSEL
+                                | RK3188_UOC0_CON0_BYPASSDMEN,
+                            RK3188_UOC0_CON0_BYPASSSEL
+                                | RK3188_UOC0_CON0_BYPASSDMEN);
+        ret = regmap_write(grf, RK3188_UOC0_CON0, val);
+        if (ret)
+                return ret;
+
+        return 0;
+}
+
 static const struct rockchip_usb_phy_pdata rk3188_pdata = {
         .phys = (struct rockchip_usb_phys[]){
                 { .reg = 0x10c, .pll_name = "sclk_otgphy0_480m" },
                 { .reg = 0x11c, .pll_name = "sclk_otgphy1_480m" },
                 { /* sentinel */ }
         },
+        .init_usb_uart = rk3188_init_usb_uart,
+        .usb_uart_phy = 0,
 };
 
-#define RK3288_UOC0_CON0                                0x320
-#define RK3288_UOC0_CON0_COMMON_ON_N                    BIT(0)
-#define RK3288_UOC0_CON0_DISABLE                        BIT(4)
-
-#define RK3288_UOC0_CON2                                0x328
-#define RK3288_UOC0_CON2_SOFT_CON_SEL                   BIT(2)
-
 #define RK3288_UOC0_CON3                                0x32c
-#define RK3288_UOC0_CON3_UTMI_SUSPENDN                  BIT(0)
-#define RK3288_UOC0_CON3_UTMI_OPMODE_NODRIVING          (1 << 1)
-#define RK3288_UOC0_CON3_UTMI_OPMODE_MASK               (3 << 1)
-#define RK3288_UOC0_CON3_UTMI_XCVRSEELCT_FSTRANSC       (1 << 3)
-#define RK3288_UOC0_CON3_UTMI_XCVRSEELCT_MASK           (3 << 3)
-#define RK3288_UOC0_CON3_UTMI_TERMSEL_FULLSPEED         BIT(5)
 #define RK3288_UOC0_CON3_BYPASSDMEN                     BIT(6)
 #define RK3288_UOC0_CON3_BYPASSSEL                      BIT(7)
 
@@ -353,40 +429,13 @@ static const struct rockchip_usb_phy_pdata rk3188_pdata = {
  *
  * The actual code in the vendor kernel does some things differently.
  */
-static int __init rk3288_init_usb_uart(struct regmap *grf)
+static int __init rk3288_init_usb_uart(struct regmap *grf,
+                                const struct rockchip_usb_phy_pdata *pdata)
 {
         u32 val;
         int ret;
 
-        /*
-         * COMMON_ON and DISABLE settings are described in the TRM,
-         * but were not present in the original code.
-         * Also disable the analog phy components to save power.
-         */
-        val = HIWORD_UPDATE(RK3288_UOC0_CON0_COMMON_ON_N
-                                | RK3288_UOC0_CON0_DISABLE
-                                | UOC_CON0_SIDDQ,
-                            RK3288_UOC0_CON0_COMMON_ON_N
-                                | RK3288_UOC0_CON0_DISABLE
-                                | UOC_CON0_SIDDQ);
-        ret = regmap_write(grf, RK3288_UOC0_CON0, val);
-        if (ret)
-                return ret;
-
-        val = HIWORD_UPDATE(RK3288_UOC0_CON2_SOFT_CON_SEL,
-                            RK3288_UOC0_CON2_SOFT_CON_SEL);
-        ret = regmap_write(grf, RK3288_UOC0_CON2, val);
-        if (ret)
-                return ret;
-
-        val = HIWORD_UPDATE(RK3288_UOC0_CON3_UTMI_OPMODE_NODRIVING
-                                | RK3288_UOC0_CON3_UTMI_XCVRSEELCT_FSTRANSC
-                                | RK3288_UOC0_CON3_UTMI_TERMSEL_FULLSPEED,
-                            RK3288_UOC0_CON3_UTMI_SUSPENDN
-                                | RK3288_UOC0_CON3_UTMI_OPMODE_MASK
-                                | RK3288_UOC0_CON3_UTMI_XCVRSEELCT_MASK
-                                | RK3288_UOC0_CON3_UTMI_TERMSEL_FULLSPEED);
-        ret = regmap_write(grf, RK3288_UOC0_CON3, val);
+        ret = rockchip_init_usb_uart_common(grf, pdata);
         if (ret)
                 return ret;
 
@@ -516,7 +565,7 @@ static int __init rockchip_init_usb_uart(void)
                 return PTR_ERR(grf);
         }
 
-        ret = data->init_usb_uart(grf);
+        ret = data->init_usb_uart(grf, data);
         if (ret) {
                 pr_err("%s: could not init usb_uart, %d\n", __func__, ret);
                 enable_usb_uart = 0;
diff --git a/drivers/phy/socionext/Kconfig b/drivers/phy/socionext/Kconfig
new file mode 100644
index 000000000000..467e8147972b
--- /dev/null
+++ b/drivers/phy/socionext/Kconfig
@@ -0,0 +1,34 @@
+#
+# PHY drivers for Socionext platforms.
+#
+
+config PHY_UNIPHIER_USB2
+        tristate "UniPhier USB2 PHY driver"
+        depends on ARCH_UNIPHIER || COMPILE_TEST
+        depends on OF && HAS_IOMEM
+        select GENERIC_PHY
+        select MFD_SYSCON
+        help
+          Enable this to support USB PHY implemented on USB2 controller
+          on UniPhier SoCs. This driver provides interface to interact
+          with USB 2.0 PHY that is part of the UniPhier SoC.
+          In case of Pro4, it is necessary to specify this USB2 PHY instead
+          of USB3 HS-PHY.
+
+config PHY_UNIPHIER_USB3
+        tristate "UniPhier USB3 PHY driver"
+        depends on ARCH_UNIPHIER || COMPILE_TEST
+        depends on OF && HAS_IOMEM
+        select GENERIC_PHY
+        help
+          Enable this to support USB PHY implemented in USB3 controller
+          on UniPhier SoCs. This controller supports USB3.0 and lower speed.
+
+config PHY_UNIPHIER_PCIE
+        tristate "Uniphier PHY driver for PCIe controller"
+        depends on (ARCH_UNIPHIER || COMPILE_TEST) && OF
+        default PCIE_UNIPHIER
+        select GENERIC_PHY
+        help
+          Enable this to support PHY implemented in PCIe controller
+          on UniPhier SoCs. This driver supports LD20 and PXs3 SoCs.
diff --git a/drivers/phy/socionext/Makefile b/drivers/phy/socionext/Makefile
new file mode 100644
index 000000000000..7dc9095b5bb7
--- /dev/null
+++ b/drivers/phy/socionext/Makefile
@@ -0,0 +1,8 @@
+# SPDX-License-Identifier: GPL-2.0
+#
+# Makefile for the phy drivers.
+#
+
+obj-$(CONFIG_PHY_UNIPHIER_USB2) += phy-uniphier-usb2.o
+obj-$(CONFIG_PHY_UNIPHIER_USB3) += phy-uniphier-usb3hs.o phy-uniphier-usb3ss.o
+obj-$(CONFIG_PHY_UNIPHIER_PCIE) += phy-uniphier-pcie.o
diff --git a/drivers/phy/socionext/phy-uniphier-pcie.c b/drivers/phy/socionext/phy-uniphier-pcie.c
new file mode 100644
index 000000000000..93ffbd2940fa
--- /dev/null
+++ b/drivers/phy/socionext/phy-uniphier-pcie.c
@@ -0,0 +1,240 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * phy-uniphier-pcie.c - PHY driver for UniPhier PCIe controller
+ * Copyright 2018, Socionext Inc.
+ * Author: Kunihiko Hayashi <hayashi.kunihiko@socionext.com>
+ */
+
+#include <linux/bitops.h>
+#include <linux/bitfield.h>
+#include <linux/clk.h>
+#include <linux/iopoll.h>
+#include <linux/mfd/syscon.h>
+#include <linux/module.h>
+#include <linux/of_device.h>
+#include <linux/phy/phy.h>
+#include <linux/platform_device.h>
+#include <linux/regmap.h>
+#include <linux/reset.h>
+#include <linux/resource.h>
+
+/* PHY */
+#define PCL_PHY_TEST_I          0x2000
+#define PCL_PHY_TEST_O          0x2004
+#define TESTI_DAT_MASK          GENMASK(13, 6)
+#define TESTI_ADR_MASK          GENMASK(5, 1)
+#define TESTI_WR_EN             BIT(0)
+
+#define PCL_PHY_RESET           0x200c
+#define PCL_PHY_RESET_N_MNMODE  BIT(8)  /* =1:manual */
+#define PCL_PHY_RESET_N         BIT(0)  /* =1:deasssert */
+
+/* SG */
+#define SG_USBPCIESEL           0x590
+#define SG_USBPCIESEL_PCIE      BIT(0)
+
+#define PCL_PHY_R00             0
+#define   RX_EQ_ADJ_EN          BIT(3)          /* enable for EQ adjustment */
+#define PCL_PHY_R06             6
+#define   RX_EQ_ADJ             GENMASK(5, 0)   /* EQ adjustment value */
+#define   RX_EQ_ADJ_VAL         0
+#define PCL_PHY_R26             26
+#define   VCO_CTRL              GENMASK(7, 4)   /* Tx VCO adjustment value */
+#define   VCO_CTRL_INIT_VAL     5
+
+struct uniphier_pciephy_priv {
+        void __iomem *base;
+        struct device *dev;
+        struct clk *clk;
+        struct reset_control *rst;
+        const struct uniphier_pciephy_soc_data *data;
+};
+
+struct uniphier_pciephy_soc_data {
+        bool has_syscon;
+};
+
+static void uniphier_pciephy_testio_write(struct uniphier_pciephy_priv *priv,
+                                          u32 data)
+{
+        /* need to read TESTO twice after accessing TESTI */
+        writel(data, priv->base + PCL_PHY_TEST_I);
+        readl(priv->base + PCL_PHY_TEST_O);
+        readl(priv->base + PCL_PHY_TEST_O);
+}
+
+static void uniphier_pciephy_set_param(struct uniphier_pciephy_priv *priv,
+                                       u32 reg, u32 mask, u32 param)
+{
+        u32 val;
+
+        /* read previous data */
+        val  = FIELD_PREP(TESTI_DAT_MASK, 1);
+        val |= FIELD_PREP(TESTI_ADR_MASK, reg);
+        uniphier_pciephy_testio_write(priv, val);
+        val = readl(priv->base + PCL_PHY_TEST_O);
+
+        /* update value */
+        val &= ~FIELD_PREP(TESTI_DAT_MASK, mask);
+        val  = FIELD_PREP(TESTI_DAT_MASK, mask & param);
+        val |= FIELD_PREP(TESTI_ADR_MASK, reg);
+        uniphier_pciephy_testio_write(priv, val);
+        uniphier_pciephy_testio_write(priv, val | TESTI_WR_EN);
+        uniphier_pciephy_testio_write(priv, val);
+
+        /* read current data as dummy */
+        val  = FIELD_PREP(TESTI_DAT_MASK, 1);
+        val |= FIELD_PREP(TESTI_ADR_MASK, reg);
+        uniphier_pciephy_testio_write(priv, val);
+        readl(priv->base + PCL_PHY_TEST_O);
+}
+
+static void uniphier_pciephy_assert(struct uniphier_pciephy_priv *priv)
+{
+        u32 val;
+
+        val = readl(priv->base + PCL_PHY_RESET);
+        val &= ~PCL_PHY_RESET_N;
+        val |= PCL_PHY_RESET_N_MNMODE;
+        writel(val, priv->base + PCL_PHY_RESET);
+}
+
+static void uniphier_pciephy_deassert(struct uniphier_pciephy_priv *priv)
+{
+        u32 val;
+
+        val = readl(priv->base + PCL_PHY_RESET);
+        val |= PCL_PHY_RESET_N_MNMODE | PCL_PHY_RESET_N;
+        writel(val, priv->base + PCL_PHY_RESET);
+}
+
+static int uniphier_pciephy_init(struct phy *phy)
+{
+        struct uniphier_pciephy_priv *priv = phy_get_drvdata(phy);
+        int ret;
+
+        ret = clk_prepare_enable(priv->clk);
+        if (ret)
+                return ret;
+
+        ret = reset_control_deassert(priv->rst);
+        if (ret)
+                goto out_clk_disable;
+
+        uniphier_pciephy_set_param(priv, PCL_PHY_R00,
+                                   RX_EQ_ADJ_EN, RX_EQ_ADJ_EN);
+        uniphier_pciephy_set_param(priv, PCL_PHY_R06, RX_EQ_ADJ,
+                                   FIELD_PREP(RX_EQ_ADJ, RX_EQ_ADJ_VAL));
+        uniphier_pciephy_set_param(priv, PCL_PHY_R26, VCO_CTRL,
+                                   FIELD_PREP(VCO_CTRL, VCO_CTRL_INIT_VAL));
+        usleep_range(1, 10);
+
+        uniphier_pciephy_deassert(priv);
+        usleep_range(1, 10);
+
+        return 0;
+
+out_clk_disable:
+        clk_disable_unprepare(priv->clk);
+
+        return ret;
+}
+
+static int uniphier_pciephy_exit(struct phy *phy)
+{
+        struct uniphier_pciephy_priv *priv = phy_get_drvdata(phy);
+
+        uniphier_pciephy_assert(priv);
+        reset_control_assert(priv->rst);
+        clk_disable_unprepare(priv->clk);
+
+        return 0;
+}
+
+static const struct phy_ops uniphier_pciephy_ops = {
+        .init  = uniphier_pciephy_init,
+        .exit  = uniphier_pciephy_exit,
+        .owner = THIS_MODULE,
+};
+
+static int uniphier_pciephy_probe(struct platform_device *pdev)
+{
+        struct uniphier_pciephy_priv *priv;
+        struct phy_provider *phy_provider;
+        struct device *dev = &pdev->dev;
+        struct regmap *regmap;
+        struct resource *res;
+        struct phy *phy;
+
+        priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL);
+        if (!priv)
+                return -ENOMEM;
+
+        priv->data = of_device_get_match_data(dev);
+        if (WARN_ON(!priv->data))
+                return -EINVAL;
+
+        priv->dev = dev;
+
+        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+        priv->base = devm_ioremap_resource(dev, res);
+        if (IS_ERR(priv->base))
+                return PTR_ERR(priv->base);
+
+        priv->clk = devm_clk_get(dev, NULL);
+        if (IS_ERR(priv->clk))
+                return PTR_ERR(priv->clk);
+
+        priv->rst = devm_reset_control_get_shared(dev, NULL);
+        if (IS_ERR(priv->rst))
+                return PTR_ERR(priv->rst);
+
+        phy = devm_phy_create(dev, dev->of_node, &uniphier_pciephy_ops);
+        if (IS_ERR(phy))
+                return PTR_ERR(phy);
+
+        regmap = syscon_regmap_lookup_by_phandle(dev->of_node,
+                                                 "socionext,syscon");
+        if (!IS_ERR(regmap) && priv->data->has_syscon)
+                regmap_update_bits(regmap, SG_USBPCIESEL,
+                                   SG_USBPCIESEL_PCIE, SG_USBPCIESEL_PCIE);
+
+        phy_set_drvdata(phy, priv);
+        phy_provider = devm_of_phy_provider_register(dev, of_phy_simple_xlate);
+
+        return PTR_ERR_OR_ZERO(phy_provider);
+}
+
+static const struct uniphier_pciephy_soc_data uniphier_ld20_data = {
+        .has_syscon = true,
+};
+
+static const struct uniphier_pciephy_soc_data uniphier_pxs3_data = {
+        .has_syscon = false,
+};
+
+static const struct of_device_id uniphier_pciephy_match[] = {
+        {
+                .compatible = "socionext,uniphier-ld20-pcie-phy",
+                .data = &uniphier_ld20_data,
+        },
+        {
+                .compatible = "socionext,uniphier-pxs3-pcie-phy",
+                .data = &uniphier_pxs3_data,
+        },
+        { /* sentinel */ },
+};
+MODULE_DEVICE_TABLE(of, uniphier_pciephy_match);
+
+static struct platform_driver uniphier_pciephy_driver = {
+        .probe = uniphier_pciephy_probe,
+        .driver = {
+                .name = "uniphier-pcie-phy",
+                .of_match_table = uniphier_pciephy_match,
+        },
+};
+module_platform_driver(uniphier_pciephy_driver);
+
+MODULE_AUTHOR("Kunihiko Hayashi <hayashi.kunihiko@socionext.com>");
+MODULE_DESCRIPTION("UniPhier PHY driver for PCIe controller");
+MODULE_LICENSE("GPL v2");
diff --git a/drivers/phy/socionext/phy-uniphier-usb2.c b/drivers/phy/socionext/phy-uniphier-usb2.c
new file mode 100644
index 000000000000..3f2086ed4fe4
--- /dev/null
+++ b/drivers/phy/socionext/phy-uniphier-usb2.c
@@ -0,0 +1,244 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * phy-uniphier-usb2.c - PHY driver for UniPhier USB2 controller
+ * Copyright 2015-2018 Socionext Inc.
+ * Author:
+ *      Kunihiko Hayashi <hayashi.kunihiko@socionext.com>
+ */
+
+#include <linux/mfd/syscon.h>
+#include <linux/module.h>
+#include <linux/of.h>
+#include <linux/of_platform.h>
+#include <linux/phy/phy.h>
+#include <linux/platform_device.h>
+#include <linux/regmap.h>
+#include <linux/regulator/consumer.h>
+
+#define SG_USBPHY1CTRL          0x500
+#define SG_USBPHY1CTRL2         0x504
+#define SG_USBPHY2CTRL          0x508
+#define SG_USBPHY2CTRL2         0x50c   /* LD11 */
+#define SG_USBPHY12PLL          0x50c   /* Pro4 */
+#define SG_USBPHY3CTRL          0x510
+#define SG_USBPHY3CTRL2         0x514
+#define SG_USBPHY4CTRL          0x518   /* Pro4 */
+#define SG_USBPHY4CTRL2         0x51c   /* Pro4 */
+#define SG_USBPHY34PLL          0x51c   /* Pro4 */
+
+struct uniphier_u2phy_param {
+        u32 offset;
+        u32 value;
+};
+
+struct uniphier_u2phy_soc_data {
+        struct uniphier_u2phy_param config0;
+        struct uniphier_u2phy_param config1;
+};
+
+struct uniphier_u2phy_priv {
+        struct regmap *regmap;
+        struct phy *phy;
+        struct regulator *vbus;
+        const struct uniphier_u2phy_soc_data *data;
+        struct uniphier_u2phy_priv *next;
+};
+
+static int uniphier_u2phy_power_on(struct phy *phy)
+{
+        struct uniphier_u2phy_priv *priv = phy_get_drvdata(phy);
+        int ret = 0;
+
+        if (priv->vbus)
+                ret = regulator_enable(priv->vbus);
+
+        return ret;
+}
+
+static int uniphier_u2phy_power_off(struct phy *phy)
+{
+        struct uniphier_u2phy_priv *priv = phy_get_drvdata(phy);
+
+        if (priv->vbus)
+                regulator_disable(priv->vbus);
+
+        return 0;
+}
+
+static int uniphier_u2phy_init(struct phy *phy)
+{
+        struct uniphier_u2phy_priv *priv = phy_get_drvdata(phy);
+
+        if (!priv->data)
+                return 0;
+
+        regmap_write(priv->regmap, priv->data->config0.offset,
+                     priv->data->config0.value);
+        regmap_write(priv->regmap, priv->data->config1.offset,
+                     priv->data->config1.value);
+
+        return 0;
+}
+
+static struct phy *uniphier_u2phy_xlate(struct device *dev,
+                                        struct of_phandle_args *args)
+{
+        struct uniphier_u2phy_priv *priv = dev_get_drvdata(dev);
+
+        while (priv && args->np != priv->phy->dev.of_node)
+                priv = priv->next;
+
+        if (!priv) {
+                dev_err(dev, "Failed to find appropriate phy\n");
+                return ERR_PTR(-EINVAL);
+        }
+
+        return priv->phy;
+}
+
+static const struct phy_ops uniphier_u2phy_ops = {
+        .init      = uniphier_u2phy_init,
+        .power_on  = uniphier_u2phy_power_on,
+        .power_off = uniphier_u2phy_power_off,
+        .owner = THIS_MODULE,
+};
+
+static int uniphier_u2phy_probe(struct platform_device *pdev)
+{
+        struct device *dev = &pdev->dev;
+        struct device_node *parent, *child;
+        struct uniphier_u2phy_priv *priv = NULL, *next = NULL;
+        struct phy_provider *phy_provider;
+        struct regmap *regmap;
+        const struct uniphier_u2phy_soc_data *data;
+        int ret, data_idx, ndatas;
+
+        data = of_device_get_match_data(dev);
+        if (WARN_ON(!data))
+                return -EINVAL;
+
+        /* get number of data */
+        for (ndatas = 0; data[ndatas].config0.offset; ndatas++)
+                ;
+
+        parent = of_get_parent(dev->of_node);
+        regmap = syscon_node_to_regmap(parent);
+        of_node_put(parent);
+        if (IS_ERR(regmap)) {
+                dev_err(dev, "Failed to get regmap\n");
+                return PTR_ERR(regmap);
+        }
+
+        for_each_child_of_node(dev->of_node, child) {
+                priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL);
+                if (!priv) {
+                        ret = -ENOMEM;
+                        goto out_put_child;
+                }
+                priv->regmap = regmap;
+
+                priv->vbus = devm_regulator_get_optional(dev, "vbus");
+                if (IS_ERR(priv->vbus)) {
+                        if (PTR_ERR(priv->vbus) == -EPROBE_DEFER) {
+                                ret = PTR_ERR(priv->vbus);
+                                goto out_put_child;
+                        }
+                        priv->vbus = NULL;
+                }
+
+                priv->phy = devm_phy_create(dev, child, &uniphier_u2phy_ops);
+                if (IS_ERR(priv->phy)) {
+                        dev_err(dev, "Failed to create phy\n");
+                        ret = PTR_ERR(priv->phy);
+                        goto out_put_child;
+                }
+
+                ret = of_property_read_u32(child, "reg", &data_idx);
+                if (ret) {
+                        dev_err(dev, "Failed to get reg property\n");
+                        goto out_put_child;
+                }
+
+                if (data_idx < ndatas)
+                        priv->data = &data[data_idx];
+                else
+                        dev_warn(dev, "No phy configuration: %s\n",
+                                 child->full_name);
+
+                phy_set_drvdata(priv->phy, priv);
+                priv->next = next;
+                next = priv;
+        }
+
+        dev_set_drvdata(dev, priv);
+        phy_provider = devm_of_phy_provider_register(dev,
+                                                     uniphier_u2phy_xlate);
+        return PTR_ERR_OR_ZERO(phy_provider);
+
+out_put_child:
+        of_node_put(child);
+
+        return ret;
+}
+
+static const struct uniphier_u2phy_soc_data uniphier_pro4_data[] = {
+        {
+                .config0 = { SG_USBPHY1CTRL, 0x05142400 },
+                .config1 = { SG_USBPHY12PLL, 0x00010010 },
+        },
+        {
+                .config0 = { SG_USBPHY2CTRL, 0x05142400 },
+                .config1 = { SG_USBPHY12PLL, 0x00010010 },
+        },
+        {
+                .config0 = { SG_USBPHY3CTRL, 0x05142400 },
+                .config1 = { SG_USBPHY34PLL, 0x00010010 },
+        },
+        {
+                .config0 = { SG_USBPHY4CTRL, 0x05142400 },
+                .config1 = { SG_USBPHY34PLL, 0x00010010 },
+        },
+        { /* sentinel */ }
+};
+
+static const struct uniphier_u2phy_soc_data uniphier_ld11_data[] = {
+        {
+                .config0 = { SG_USBPHY1CTRL,  0x82280000 },
+                .config1 = { SG_USBPHY1CTRL2, 0x00000106 },
+        },
+        {
+                .config0 = { SG_USBPHY2CTRL,  0x82280000 },
+                .config1 = { SG_USBPHY2CTRL2, 0x00000106 },
+        },
+        {
+                .config0 = { SG_USBPHY3CTRL,  0x82280000 },
+                .config1 = { SG_USBPHY3CTRL2, 0x00000106 },
+        },
+        { /* sentinel */ }
+};
+
+static const struct of_device_id uniphier_u2phy_match[] = {
+        {
+                .compatible = "socionext,uniphier-pro4-usb2-phy",
+                .data = &uniphier_pro4_data,
+        },
+        {
+                .compatible = "socionext,uniphier-ld11-usb2-phy",
+                .data = &uniphier_ld11_data,
+        },
+        { /* sentinel */ }
+};
+MODULE_DEVICE_TABLE(of, uniphier_u2phy_match);
+
+static struct platform_driver uniphier_u2phy_driver = {
+        .probe = uniphier_u2phy_probe,
+        .driver = {
+                .name = "uniphier-usb2-phy",
+                .of_match_table = uniphier_u2phy_match,
+        },
+};
+module_platform_driver(uniphier_u2phy_driver);
+
+MODULE_AUTHOR("Kunihiko Hayashi <hayashi.kunihiko@socionext.com>");
+MODULE_DESCRIPTION("UniPhier PHY driver for USB2 controller");
+MODULE_LICENSE("GPL v2");
diff --git a/drivers/phy/socionext/phy-uniphier-usb3hs.c b/drivers/phy/socionext/phy-uniphier-usb3hs.c
new file mode 100644
index 000000000000..b1b048be6166
--- /dev/null
+++ b/drivers/phy/socionext/phy-uniphier-usb3hs.c
@@ -0,0 +1,422 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * phy-uniphier-usb3hs.c - HS-PHY driver for Socionext UniPhier USB3 controller
+ * Copyright 2015-2018 Socionext Inc.
+ * Author:
+ *      Kunihiko Hayashi <hayashi.kunihiko@socionext.com>
+ * Contributors:
+ *      Motoya Tanigawa <tanigawa.motoya@socionext.com>
+ *      Masami Hiramatsu <masami.hiramatsu@linaro.org>
+ */
+
+#include <linux/bitfield.h>
+#include <linux/bitops.h>
+#include <linux/clk.h>
+#include <linux/io.h>
+#include <linux/module.h>
+#include <linux/nvmem-consumer.h>
+#include <linux/of.h>
+#include <linux/of_platform.h>
+#include <linux/phy/phy.h>
+#include <linux/platform_device.h>
+#include <linux/regulator/consumer.h>
+#include <linux/reset.h>
+#include <linux/slab.h>
+
+#define HSPHY_CFG0              0x0
+#define HSPHY_CFG0_HS_I_MASK    GENMASK(31, 28)
+#define HSPHY_CFG0_HSDISC_MASK  GENMASK(27, 26)
+#define HSPHY_CFG0_SWING_MASK   GENMASK(17, 16)
+#define HSPHY_CFG0_SEL_T_MASK   GENMASK(15, 12)
+#define HSPHY_CFG0_RTERM_MASK   GENMASK(7, 6)
+#define HSPHY_CFG0_TRIMMASK     (HSPHY_CFG0_HS_I_MASK \
+                                 | HSPHY_CFG0_SEL_T_MASK \
+                                 | HSPHY_CFG0_RTERM_MASK)
+
+#define HSPHY_CFG1              0x4
+#define HSPHY_CFG1_DAT_EN       BIT(29)
+#define HSPHY_CFG1_ADR_EN       BIT(28)
+#define HSPHY_CFG1_ADR_MASK     GENMASK(27, 16)
+#define HSPHY_CFG1_DAT_MASK     GENMASK(23, 16)
+
+#define PHY_F(regno, msb, lsb) { (regno), (msb), (lsb) }
+
+#define LS_SLEW         PHY_F(10, 6, 6) /* LS mode slew rate */
+#define FS_LS_DRV       PHY_F(10, 5, 5) /* FS/LS slew rate */
+
+#define MAX_PHY_PARAMS  2
+
+struct uniphier_u3hsphy_param {
+        struct {
+                int reg_no;
+                int msb;
+                int lsb;
+        } field;
+        u8 value;
+};
+
+struct uniphier_u3hsphy_trim_param {
+        unsigned int rterm;
+        unsigned int sel_t;
+        unsigned int hs_i;
+};
+
+#define trim_param_is_valid(p)  ((p)->rterm || (p)->sel_t || (p)->hs_i)
+
+struct uniphier_u3hsphy_priv {
+        struct device *dev;
+        void __iomem *base;
+        struct clk *clk, *clk_parent, *clk_ext;
+        struct reset_control *rst, *rst_parent;
+        struct regulator *vbus;
+        const struct uniphier_u3hsphy_soc_data *data;
+};
+
+struct uniphier_u3hsphy_soc_data {
+        int nparams;
+        const struct uniphier_u3hsphy_param param[MAX_PHY_PARAMS];
+        u32 config0;
+        u32 config1;
+        void (*trim_func)(struct uniphier_u3hsphy_priv *priv, u32 *pconfig,
+                          struct uniphier_u3hsphy_trim_param *pt);
+};
+
+static void uniphier_u3hsphy_trim_ld20(struct uniphier_u3hsphy_priv *priv,
+                                       u32 *pconfig,
+                                       struct uniphier_u3hsphy_trim_param *pt)
+{
+        *pconfig &= ~HSPHY_CFG0_RTERM_MASK;
+        *pconfig |= FIELD_PREP(HSPHY_CFG0_RTERM_MASK, pt->rterm);
+
+        *pconfig &= ~HSPHY_CFG0_SEL_T_MASK;
+        *pconfig |= FIELD_PREP(HSPHY_CFG0_SEL_T_MASK, pt->sel_t);
+
+        *pconfig &= ~HSPHY_CFG0_HS_I_MASK;
+        *pconfig |= FIELD_PREP(HSPHY_CFG0_HS_I_MASK,  pt->hs_i);
+}
+
+static int uniphier_u3hsphy_get_nvparam(struct uniphier_u3hsphy_priv *priv,
+                                        const char *name, unsigned int *val)
+{
+        struct nvmem_cell *cell;
+        u8 *buf;
+
+        cell = devm_nvmem_cell_get(priv->dev, name);
+        if (IS_ERR(cell))
+                return PTR_ERR(cell);
+
+        buf = nvmem_cell_read(cell, NULL);
+        if (IS_ERR(buf))
+                return PTR_ERR(buf);
+
+        *val = *buf;
+
+        kfree(buf);
+
+        return 0;
+}
+
+static int uniphier_u3hsphy_get_nvparams(struct uniphier_u3hsphy_priv *priv,
+                                         struct uniphier_u3hsphy_trim_param *pt)
+{
+        int ret;
+
+        ret = uniphier_u3hsphy_get_nvparam(priv, "rterm", &pt->rterm);
+        if (ret)
+                return ret;
+
+        ret = uniphier_u3hsphy_get_nvparam(priv, "sel_t", &pt->sel_t);
+        if (ret)
+                return ret;
+
+        ret = uniphier_u3hsphy_get_nvparam(priv, "hs_i", &pt->hs_i);
+        if (ret)
+                return ret;
+
+        return 0;
+}
+
+static int uniphier_u3hsphy_update_config(struct uniphier_u3hsphy_priv *priv,
+                                          u32 *pconfig)
+{
+        struct uniphier_u3hsphy_trim_param trim;
+        int ret, trimmed = 0;
+
+        if (priv->data->trim_func) {
+                ret = uniphier_u3hsphy_get_nvparams(priv, &trim);
+                if (ret == -EPROBE_DEFER)
+                        return ret;
+
+                /*
+                 * call trim_func only when trimming parameters that aren't
+                 * all-zero can be acquired. All-zero parameters mean nothing
+                 * has been written to nvmem.
+                 */
+                if (!ret && trim_param_is_valid(&trim)) {
+                        priv->data->trim_func(priv, pconfig, &trim);
+                        trimmed = 1;
+                } else {
+                        dev_dbg(priv->dev, "can't get parameter from nvmem\n");
+                }
+        }
+
+        /* use default parameters without trimming values */
+        if (!trimmed) {
+                *pconfig &= ~HSPHY_CFG0_HSDISC_MASK;
+                *pconfig |= FIELD_PREP(HSPHY_CFG0_HSDISC_MASK, 3);
+        }
+
+        return 0;
+}
+
+static void uniphier_u3hsphy_set_param(struct uniphier_u3hsphy_priv *priv,
+                                       const struct uniphier_u3hsphy_param *p)
+{
+        u32 val;
+        u32 field_mask = GENMASK(p->field.msb, p->field.lsb);
+        u8 data;
+
+        val = readl(priv->base + HSPHY_CFG1);
+        val &= ~HSPHY_CFG1_ADR_MASK;
+        val |= FIELD_PREP(HSPHY_CFG1_ADR_MASK, p->field.reg_no)
+                | HSPHY_CFG1_ADR_EN;
+        writel(val, priv->base + HSPHY_CFG1);
+
+        val = readl(priv->base + HSPHY_CFG1);
+        val &= ~HSPHY_CFG1_ADR_EN;
+        writel(val, priv->base + HSPHY_CFG1);
+
+        val = readl(priv->base + HSPHY_CFG1);
+        val &= ~FIELD_PREP(HSPHY_CFG1_DAT_MASK, field_mask);
+        data = field_mask & (p->value << p->field.lsb);
+        val |=  FIELD_PREP(HSPHY_CFG1_DAT_MASK, data) | HSPHY_CFG1_DAT_EN;
+        writel(val, priv->base + HSPHY_CFG1);
+
+        val = readl(priv->base + HSPHY_CFG1);
+        val &= ~HSPHY_CFG1_DAT_EN;
+        writel(val, priv->base + HSPHY_CFG1);
+}
+
+static int uniphier_u3hsphy_power_on(struct phy *phy)
+{
+        struct uniphier_u3hsphy_priv *priv = phy_get_drvdata(phy);
+        int ret;
+
+        ret = clk_prepare_enable(priv->clk_ext);
+        if (ret)
+                return ret;
+
+        ret = clk_prepare_enable(priv->clk);
+        if (ret)
+                goto out_clk_ext_disable;
+
+        ret = reset_control_deassert(priv->rst);
+        if (ret)
+                goto out_clk_disable;
+
+        if (priv->vbus) {
+                ret = regulator_enable(priv->vbus);
+                if (ret)
+                        goto out_rst_assert;
+        }
+
+        return 0;
+
+out_rst_assert:
+        reset_control_assert(priv->rst);
+out_clk_disable:
+        clk_disable_unprepare(priv->clk);
+out_clk_ext_disable:
+        clk_disable_unprepare(priv->clk_ext);
+
+        return ret;
+}
+
+static int uniphier_u3hsphy_power_off(struct phy *phy)
+{
+        struct uniphier_u3hsphy_priv *priv = phy_get_drvdata(phy);
+
+        if (priv->vbus)
+                regulator_disable(priv->vbus);
+
+        reset_control_assert(priv->rst);
+        clk_disable_unprepare(priv->clk);
+        clk_disable_unprepare(priv->clk_ext);
+
+        return 0;
+}
+
+static int uniphier_u3hsphy_init(struct phy *phy)
+{
+        struct uniphier_u3hsphy_priv *priv = phy_get_drvdata(phy);
+        u32 config0, config1;
+        int i, ret;
+
+        ret = clk_prepare_enable(priv->clk_parent);
+        if (ret)
+                return ret;
+
+        ret = reset_control_deassert(priv->rst_parent);
+        if (ret)
+                goto out_clk_disable;
+
+        if (!priv->data->config0 && !priv->data->config1)
+                return 0;
+
+        config0 = priv->data->config0;
+        config1 = priv->data->config1;
+
+        ret = uniphier_u3hsphy_update_config(priv, &config0);
+        if (ret)
+                goto out_rst_assert;
+
+        writel(config0, priv->base + HSPHY_CFG0);
+        writel(config1, priv->base + HSPHY_CFG1);
+
+        for (i = 0; i < priv->data->nparams; i++)
+                uniphier_u3hsphy_set_param(priv, &priv->data->param[i]);
+
+        return 0;
+
+out_rst_assert:
+        reset_control_assert(priv->rst_parent);
+out_clk_disable:
+        clk_disable_unprepare(priv->clk_parent);
+
+        return ret;
+}
+
+static int uniphier_u3hsphy_exit(struct phy *phy)
+{
+        struct uniphier_u3hsphy_priv *priv = phy_get_drvdata(phy);
+
+        reset_control_assert(priv->rst_parent);
+        clk_disable_unprepare(priv->clk_parent);
+
+        return 0;
+}
+
+static const struct phy_ops uniphier_u3hsphy_ops = {
+        .init           = uniphier_u3hsphy_init,
+        .exit           = uniphier_u3hsphy_exit,
+        .power_on       = uniphier_u3hsphy_power_on,
+        .power_off      = uniphier_u3hsphy_power_off,
+        .owner          = THIS_MODULE,
+};
+
+static int uniphier_u3hsphy_probe(struct platform_device *pdev)
+{
+        struct device *dev = &pdev->dev;
+        struct uniphier_u3hsphy_priv *priv;
+        struct phy_provider *phy_provider;
+        struct resource *res;
+        struct phy *phy;
+
+        priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL);
+        if (!priv)
+                return -ENOMEM;
+
+        priv->dev = dev;
+        priv->data = of_device_get_match_data(dev);
+        if (WARN_ON(!priv->data ||
+                    priv->data->nparams > MAX_PHY_PARAMS))
+                return -EINVAL;
+
+        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+        priv->base = devm_ioremap_resource(dev, res);
+        if (IS_ERR(priv->base))
+                return PTR_ERR(priv->base);
+
+        priv->clk = devm_clk_get(dev, "phy");
+        if (IS_ERR(priv->clk))
+                return PTR_ERR(priv->clk);
+
+        priv->clk_parent = devm_clk_get(dev, "link");
+        if (IS_ERR(priv->clk_parent))
+                return PTR_ERR(priv->clk_parent);
+
+        priv->clk_ext = devm_clk_get(dev, "phy-ext");
+        if (IS_ERR(priv->clk_ext)) {
+                if (PTR_ERR(priv->clk_ext) == -ENOENT)
+                        priv->clk_ext = NULL;
+                else
+                        return PTR_ERR(priv->clk_ext);
+        }
+
+        priv->rst = devm_reset_control_get_shared(dev, "phy");
+        if (IS_ERR(priv->rst))
+                return PTR_ERR(priv->rst);
+
+        priv->rst_parent = devm_reset_control_get_shared(dev, "link");
+        if (IS_ERR(priv->rst_parent))
+                return PTR_ERR(priv->rst_parent);
+
+        priv->vbus = devm_regulator_get_optional(dev, "vbus");
+        if (IS_ERR(priv->vbus)) {
+                if (PTR_ERR(priv->vbus) == -EPROBE_DEFER)
+                        return PTR_ERR(priv->vbus);
+                priv->vbus = NULL;
+        }
+
+        phy = devm_phy_create(dev, dev->of_node, &uniphier_u3hsphy_ops);
+        if (IS_ERR(phy))
+                return PTR_ERR(phy);
+
+        phy_set_drvdata(phy, priv);
+        phy_provider = devm_of_phy_provider_register(dev, of_phy_simple_xlate);
+
+        return PTR_ERR_OR_ZERO(phy_provider);
+}
+
+static const struct uniphier_u3hsphy_soc_data uniphier_pxs2_data = {
+        .nparams = 0,
+};
+
+static const struct uniphier_u3hsphy_soc_data uniphier_ld20_data = {
+        .nparams = 2,
+        .param = {
+                { LS_SLEW, 1 },
+                { FS_LS_DRV, 1 },
+        },
+        .trim_func = uniphier_u3hsphy_trim_ld20,
+        .config0 = 0x92316680,
+        .config1 = 0x00000106,
+};
+
+static const struct uniphier_u3hsphy_soc_data uniphier_pxs3_data = {
+        .nparams = 0,
+        .trim_func = uniphier_u3hsphy_trim_ld20,
+        .config0 = 0x92316680,
+        .config1 = 0x00000106,
+};
+
+static const struct of_device_id uniphier_u3hsphy_match[] = {
+        {
+                .compatible = "socionext,uniphier-pxs2-usb3-hsphy",
+                .data = &uniphier_pxs2_data,
+        },
+        {
+                .compatible = "socionext,uniphier-ld20-usb3-hsphy",
+                .data = &uniphier_ld20_data,
+        },
+        {
+                .compatible = "socionext,uniphier-pxs3-usb3-hsphy",
+                .data = &uniphier_pxs3_data,
+        },
+        { /* sentinel */ }
+};
+MODULE_DEVICE_TABLE(of, uniphier_u3hsphy_match);
+
+static struct platform_driver uniphier_u3hsphy_driver = {
+        .probe = uniphier_u3hsphy_probe,
+        .driver = {
+                .name = "uniphier-usb3-hsphy",
+                .of_match_table = uniphier_u3hsphy_match,
+        },
+};
+
+module_platform_driver(uniphier_u3hsphy_driver);
+
+MODULE_AUTHOR("Kunihiko Hayashi <hayashi.kunihiko@socionext.com>");
+MODULE_DESCRIPTION("UniPhier HS-PHY driver for USB3 controller");
+MODULE_LICENSE("GPL v2");
diff --git a/drivers/phy/socionext/phy-uniphier-usb3ss.c b/drivers/phy/socionext/phy-uniphier-usb3ss.c
new file mode 100644
index 000000000000..4be95679c7d8
--- /dev/null
+++ b/drivers/phy/socionext/phy-uniphier-usb3ss.c
@@ -0,0 +1,349 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * phy-uniphier-usb3ss.c - SS-PHY driver for Socionext UniPhier USB3 controller
+ * Copyright 2015-2018 Socionext Inc.
+ * Author:
+ *      Kunihiko Hayashi <hayashi.kunihiko@socionext.com>
+ * Contributors:
+ *      Motoya Tanigawa <tanigawa.motoya@socionext.com>
+ *      Masami Hiramatsu <masami.hiramatsu@linaro.org>
+ */
+
+#include <linux/bitfield.h>
+#include <linux/bitops.h>
+#include <linux/clk.h>
+#include <linux/io.h>
+#include <linux/module.h>
+#include <linux/of.h>
+#include <linux/of_platform.h>
+#include <linux/phy/phy.h>
+#include <linux/platform_device.h>
+#include <linux/regulator/consumer.h>
+#include <linux/reset.h>
+
+#define SSPHY_TESTI             0x0
+#define SSPHY_TESTO             0x4
+#define TESTI_DAT_MASK          GENMASK(13, 6)
+#define TESTI_ADR_MASK          GENMASK(5, 1)
+#define TESTI_WR_EN             BIT(0)
+
+#define PHY_F(regno, msb, lsb) { (regno), (msb), (lsb) }
+
+#define CDR_CPD_TRIM    PHY_F(7, 3, 0)  /* RxPLL charge pump current */
+#define CDR_CPF_TRIM    PHY_F(8, 3, 0)  /* RxPLL charge pump current 2 */
+#define TX_PLL_TRIM     PHY_F(9, 3, 0)  /* TxPLL charge pump current */
+#define BGAP_TRIM       PHY_F(11, 3, 0) /* Bandgap voltage */
+#define CDR_TRIM        PHY_F(13, 6, 5) /* Clock Data Recovery setting */
+#define VCO_CTRL        PHY_F(26, 7, 4) /* VCO control */
+#define VCOPLL_CTRL     PHY_F(27, 2, 0) /* TxPLL VCO tuning */
+#define VCOPLL_CM       PHY_F(28, 1, 0) /* TxPLL voltage */
+
+#define MAX_PHY_PARAMS  7
+
+struct uniphier_u3ssphy_param {
+        struct {
+                int reg_no;
+                int msb;
+                int lsb;
+        } field;
+        u8 value;
+};
+
+struct uniphier_u3ssphy_priv {
+        struct device *dev;
+        void __iomem *base;
+        struct clk *clk, *clk_ext, *clk_parent, *clk_parent_gio;
+        struct reset_control *rst, *rst_parent, *rst_parent_gio;
+        struct regulator *vbus;
+        const struct uniphier_u3ssphy_soc_data *data;
+};
+
+struct uniphier_u3ssphy_soc_data {
+        bool is_legacy;
+        int nparams;
+        const struct uniphier_u3ssphy_param param[MAX_PHY_PARAMS];
+};
+
+static void uniphier_u3ssphy_testio_write(struct uniphier_u3ssphy_priv *priv,
+                                          u32 data)
+{
+        /* need to read TESTO twice after accessing TESTI */
+        writel(data, priv->base + SSPHY_TESTI);
+        readl(priv->base + SSPHY_TESTO);
+        readl(priv->base + SSPHY_TESTO);
+}
+
+static void uniphier_u3ssphy_set_param(struct uniphier_u3ssphy_priv *priv,
+                                       const struct uniphier_u3ssphy_param *p)
+{
+        u32 val;
+        u8 field_mask = GENMASK(p->field.msb, p->field.lsb);
+        u8 data;
+
+        /* read previous data */
+        val  = FIELD_PREP(TESTI_DAT_MASK, 1);
+        val |= FIELD_PREP(TESTI_ADR_MASK, p->field.reg_no);
+        uniphier_u3ssphy_testio_write(priv, val);
+        val = readl(priv->base + SSPHY_TESTO);
+
+        /* update value */
+        val &= ~FIELD_PREP(TESTI_DAT_MASK, field_mask);
+        data = field_mask & (p->value << p->field.lsb);
+        val  = FIELD_PREP(TESTI_DAT_MASK, data);
+        val |= FIELD_PREP(TESTI_ADR_MASK, p->field.reg_no);
+        uniphier_u3ssphy_testio_write(priv, val);
+        uniphier_u3ssphy_testio_write(priv, val | TESTI_WR_EN);
+        uniphier_u3ssphy_testio_write(priv, val);
+
+        /* read current data as dummy */
+        val  = FIELD_PREP(TESTI_DAT_MASK, 1);
+        val |= FIELD_PREP(TESTI_ADR_MASK, p->field.reg_no);
+        uniphier_u3ssphy_testio_write(priv, val);
+        readl(priv->base + SSPHY_TESTO);
+}
+
+static int uniphier_u3ssphy_power_on(struct phy *phy)
+{
+        struct uniphier_u3ssphy_priv *priv = phy_get_drvdata(phy);
+        int ret;
+
+        ret = clk_prepare_enable(priv->clk_ext);
+        if (ret)
+                return ret;
+
+        ret = clk_prepare_enable(priv->clk);
+        if (ret)
+                goto out_clk_ext_disable;
+
+        ret = reset_control_deassert(priv->rst);
+        if (ret)
+                goto out_clk_disable;
+
+        if (priv->vbus) {
+                ret = regulator_enable(priv->vbus);
+                if (ret)
+                        goto out_rst_assert;
+        }
+
+        return 0;
+
+out_rst_assert:
+        reset_control_assert(priv->rst);
+out_clk_disable:
+        clk_disable_unprepare(priv->clk);
+out_clk_ext_disable:
+        clk_disable_unprepare(priv->clk_ext);
+
+        return ret;
+}
+
+static int uniphier_u3ssphy_power_off(struct phy *phy)
+{
+        struct uniphier_u3ssphy_priv *priv = phy_get_drvdata(phy);
+
+        if (priv->vbus)
+                regulator_disable(priv->vbus);
+
+        reset_control_assert(priv->rst);
+        clk_disable_unprepare(priv->clk);
+        clk_disable_unprepare(priv->clk_ext);
+
+        return 0;
+}
+
+static int uniphier_u3ssphy_init(struct phy *phy)
+{
+        struct uniphier_u3ssphy_priv *priv = phy_get_drvdata(phy);
+        int i, ret;
+
+        ret = clk_prepare_enable(priv->clk_parent);
+        if (ret)
+                return ret;
+
+        ret = clk_prepare_enable(priv->clk_parent_gio);
+        if (ret)
+                goto out_clk_disable;
+
+        ret = reset_control_deassert(priv->rst_parent);
+        if (ret)
+                goto out_clk_gio_disable;
+
+        ret = reset_control_deassert(priv->rst_parent_gio);
+        if (ret)
+                goto out_rst_assert;
+
+        if (priv->data->is_legacy)
+                return 0;
+
+        for (i = 0; i < priv->data->nparams; i++)
+                uniphier_u3ssphy_set_param(priv, &priv->data->param[i]);
+
+        return 0;
+
+out_rst_assert:
+        reset_control_assert(priv->rst_parent);
+out_clk_gio_disable:
+        clk_disable_unprepare(priv->clk_parent_gio);
+out_clk_disable:
+        clk_disable_unprepare(priv->clk_parent);
+
+        return ret;
+}
+
+static int uniphier_u3ssphy_exit(struct phy *phy)
+{
+        struct uniphier_u3ssphy_priv *priv = phy_get_drvdata(phy);
+
+        reset_control_assert(priv->rst_parent_gio);
+        reset_control_assert(priv->rst_parent);
+        clk_disable_unprepare(priv->clk_parent_gio);
+        clk_disable_unprepare(priv->clk_parent);
+
+        return 0;
+}
+
+static const struct phy_ops uniphier_u3ssphy_ops = {
+        .init           = uniphier_u3ssphy_init,
+        .exit           = uniphier_u3ssphy_exit,
+        .power_on       = uniphier_u3ssphy_power_on,
+        .power_off      = uniphier_u3ssphy_power_off,
+        .owner          = THIS_MODULE,
+};
+
+static int uniphier_u3ssphy_probe(struct platform_device *pdev)
+{
+        struct device *dev = &pdev->dev;
+        struct uniphier_u3ssphy_priv *priv;
+        struct phy_provider *phy_provider;
+        struct resource *res;
+        struct phy *phy;
+
+        priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL);
+        if (!priv)
+                return -ENOMEM;
+
+        priv->dev = dev;
+        priv->data = of_device_get_match_data(dev);
+        if (WARN_ON(!priv->data ||
+                    priv->data->nparams > MAX_PHY_PARAMS))
+                return -EINVAL;
+
+        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+        priv->base = devm_ioremap_resource(dev, res);
+        if (IS_ERR(priv->base))
+                return PTR_ERR(priv->base);
+
+        if (!priv->data->is_legacy) {
+                priv->clk = devm_clk_get(dev, "phy");
+                if (IS_ERR(priv->clk))
+                        return PTR_ERR(priv->clk);
+
+                priv->clk_ext = devm_clk_get(dev, "phy-ext");
+                if (IS_ERR(priv->clk_ext)) {
+                        if (PTR_ERR(priv->clk_ext) == -ENOENT)
+                                priv->clk_ext = NULL;
+                        else
+                                return PTR_ERR(priv->clk_ext);
+                }
+
+                priv->rst = devm_reset_control_get_shared(dev, "phy");
+                if (IS_ERR(priv->rst))
+                        return PTR_ERR(priv->rst);
+        } else {
+                priv->clk_parent_gio = devm_clk_get(dev, "gio");
+                if (IS_ERR(priv->clk_parent_gio))
+                        return PTR_ERR(priv->clk_parent_gio);
+
+                priv->rst_parent_gio =
+                        devm_reset_control_get_shared(dev, "gio");
+                if (IS_ERR(priv->rst_parent_gio))
+                        return PTR_ERR(priv->rst_parent_gio);
+        }
+
+        priv->clk_parent = devm_clk_get(dev, "link");
+        if (IS_ERR(priv->clk_parent))
+                return PTR_ERR(priv->clk_parent);
+
+        priv->rst_parent = devm_reset_control_get_shared(dev, "link");
+        if (IS_ERR(priv->rst_parent))
+                return PTR_ERR(priv->rst_parent);
+
+        priv->vbus = devm_regulator_get_optional(dev, "vbus");
+        if (IS_ERR(priv->vbus)) {
+                if (PTR_ERR(priv->vbus) == -EPROBE_DEFER)
+                        return PTR_ERR(priv->vbus);
+                priv->vbus = NULL;
+        }
+
+        phy = devm_phy_create(dev, dev->of_node, &uniphier_u3ssphy_ops);
+        if (IS_ERR(phy))
+                return PTR_ERR(phy);
+
+        phy_set_drvdata(phy, priv);
+        phy_provider = devm_of_phy_provider_register(dev, of_phy_simple_xlate);
+
+        return PTR_ERR_OR_ZERO(phy_provider);
+}
+
+static const struct uniphier_u3ssphy_soc_data uniphier_pro4_data = {
+        .is_legacy = true,
+};
+
+static const struct uniphier_u3ssphy_soc_data uniphier_pxs2_data = {
+        .is_legacy = false,
+        .nparams = 7,
+        .param = {
+                { CDR_CPD_TRIM, 10 },
+                { CDR_CPF_TRIM, 3 },
+                { TX_PLL_TRIM, 5 },
+                { BGAP_TRIM, 9 },
+                { CDR_TRIM, 2 },
+                { VCOPLL_CTRL, 7 },
+                { VCOPLL_CM, 1 },
+        },
+};
+
+static const struct uniphier_u3ssphy_soc_data uniphier_ld20_data = {
+        .is_legacy = false,
+        .nparams = 3,
+        .param = {
+                { CDR_CPD_TRIM, 6 },
+                { CDR_TRIM, 2 },
+                { VCO_CTRL, 5 },
+        },
+};
+
+static const struct of_device_id uniphier_u3ssphy_match[] = {
+        {
+                .compatible = "socionext,uniphier-pro4-usb3-ssphy",
+                .data = &uniphier_pro4_data,
+        },
+        {
+                .compatible = "socionext,uniphier-pxs2-usb3-ssphy",
+                .data = &uniphier_pxs2_data,
+        },
+        {
+                .compatible = "socionext,uniphier-ld20-usb3-ssphy",
+                .data = &uniphier_ld20_data,
+        },
+        {
+                .compatible = "socionext,uniphier-pxs3-usb3-ssphy",
+                .data = &uniphier_ld20_data,
+        },
+        { /* sentinel */ }
+};
+MODULE_DEVICE_TABLE(of, uniphier_u3ssphy_match);
+
+static struct platform_driver uniphier_u3ssphy_driver = {
+        .probe = uniphier_u3ssphy_probe,
+        .driver = {
+                .name = "uniphier-usb3-ssphy",
+                .of_match_table = uniphier_u3ssphy_match,
+        },
+};
+
+module_platform_driver(uniphier_u3ssphy_driver);
+
+MODULE_AUTHOR("Kunihiko Hayashi <hayashi.kunihiko@socionext.com>");
+MODULE_DESCRIPTION("UniPhier SS-PHY driver for USB3 controller");
+MODULE_LICENSE("GPL v2");
diff --git a/drivers/phy/tegra/xusb.c b/drivers/phy/tegra/xusb.c
index de1b4ebe4de2..5b3b8863363e 100644
--- a/drivers/phy/tegra/xusb.c
+++ b/drivers/phy/tegra/xusb.c
@@ -115,8 +115,8 @@ int tegra_xusb_lane_parse_dt(struct tegra_xusb_lane *lane,
 
         err = match_string(lane->soc->funcs, lane->soc->num_funcs, function);
         if (err < 0) {
-                dev_err(dev, "invalid function \"%s\" for lane \"%s\"\n",
-                        function, np->name);
+                dev_err(dev, "invalid function \"%s\" for lane \"%pOFn\"\n",
+                        function, np);
                 return err;
         }
 
diff --git a/drivers/phy/ti/phy-twl4030-usb.c b/drivers/phy/ti/phy-twl4030-usb.c
index a44680d64f9b..c267afb68f07 100644
--- a/drivers/phy/ti/phy-twl4030-usb.c
+++ b/drivers/phy/ti/phy-twl4030-usb.c
@@ -144,6 +144,7 @@
 #define PMBR1                           0x0D
 #define GPIO_USB_4PIN_ULPI_2430C        (3 << 0)
 
+static irqreturn_t twl4030_usb_irq(int irq, void *_twl);
 /*
  * If VBUS is valid or ID is ground, then we know a
  * cable is present and we need to be runtime-enabled
@@ -395,6 +396,33 @@ static void __twl4030_phy_power(struct twl4030_usb *twl, int on)
         WARN_ON(twl4030_usb_write_verify(twl, PHY_PWR_CTRL, pwr) < 0);
 }
 
+static int __maybe_unused twl4030_usb_suspend(struct device *dev)
+{
+        struct twl4030_usb *twl = dev_get_drvdata(dev);
+
+        /*
+         * we need enabled runtime on resume,
+         * so turn irq off here, so we do not get it early
+         * note: wakeup on usb plug works independently of this
+         */
+        dev_dbg(twl->dev, "%s\n", __func__);
+        disable_irq(twl->irq);
+
+        return 0;
+}
+
+static int __maybe_unused twl4030_usb_resume(struct device *dev)
+{
+        struct twl4030_usb *twl = dev_get_drvdata(dev);
+
+        dev_dbg(twl->dev, "%s\n", __func__);
+        enable_irq(twl->irq);
+        /* check whether cable status changed */
+        twl4030_usb_irq(0, twl);
+
+        return 0;
+}
+
 static int __maybe_unused twl4030_usb_runtime_suspend(struct device *dev)
 {
         struct twl4030_usb *twl = dev_get_drvdata(dev);
@@ -655,6 +683,7 @@ static const struct phy_ops ops = {
 static const struct dev_pm_ops twl4030_usb_pm_ops = {
         SET_RUNTIME_PM_OPS(twl4030_usb_runtime_suspend,
                            twl4030_usb_runtime_resume, NULL)
+        SET_SYSTEM_SLEEP_PM_OPS(twl4030_usb_suspend, twl4030_usb_resume)
 };
 
 static int twl4030_usb_probe(struct platform_device *pdev)
diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig
index 0c1aa6c314f5..bdac939de223 100644
--- a/drivers/platform/x86/Kconfig
+++ b/drivers/platform/x86/Kconfig
@@ -867,6 +867,8 @@ config INTEL_CHT_INT33FE
         tristate "Intel Cherry Trail ACPI INT33FE Driver"
         depends on X86 && ACPI && I2C && REGULATOR
         depends on CHARGER_BQ24190=y || (CHARGER_BQ24190=m && m)
+        depends on USB_ROLES_INTEL_XHCI=y || (USB_ROLES_INTEL_XHCI=m && m)
+        depends on TYPEC_MUX_PI3USB30532=y || (TYPEC_MUX_PI3USB30532=m && m)
         ---help---
           This driver add support for the INT33FE ACPI device found on
           some Intel Cherry Trail devices.
diff --git a/drivers/platform/x86/intel_cht_int33fe.c b/drivers/platform/x86/intel_cht_int33fe.c
index 7166f1cf8a1d..f40b1c192106 100644
--- a/drivers/platform/x86/intel_cht_int33fe.c
+++ b/drivers/platform/x86/intel_cht_int33fe.c
@@ -35,7 +35,7 @@ struct cht_int33fe_data {
         struct i2c_client *fusb302;
         struct i2c_client *pi3usb30532;
         /* Contain a list-head must be per device */
-        struct device_connection connections[3];
+        struct device_connection connections[5];
 };
 
 /*
@@ -175,19 +175,20 @@ static int cht_int33fe_probe(struct platform_device *pdev)
                         return -EPROBE_DEFER; /* Wait for i2c-adapter to load */
         }
 
-        data->connections[0].endpoint[0] = "i2c-fusb302";
+        data->connections[0].endpoint[0] = "port0";
         data->connections[0].endpoint[1] = "i2c-pi3usb30532";
         data->connections[0].id = "typec-switch";
-        data->connections[1].endpoint[0] = "i2c-fusb302";
+        data->connections[1].endpoint[0] = "port0";
         data->connections[1].endpoint[1] = "i2c-pi3usb30532";
         data->connections[1].id = "typec-mux";
-        data->connections[2].endpoint[0] = "i2c-fusb302";
-        data->connections[2].endpoint[1] = "intel_xhci_usb_sw-role-switch";
-        data->connections[2].id = "usb-role-switch";
+        data->connections[2].endpoint[0] = "port0";
+        data->connections[2].endpoint[1] = "i2c-pi3usb30532";
+        data->connections[2].id = "idff01m01";
+        data->connections[3].endpoint[0] = "i2c-fusb302";
+        data->connections[3].endpoint[1] = "intel_xhci_usb_sw-role-switch";
+        data->connections[3].id = "usb-role-switch";
 
-        device_connection_add(&data->connections[0]);
-        device_connection_add(&data->connections[1]);
-        device_connection_add(&data->connections[2]);
+        device_connections_add(data->connections);
 
         memset(&board_info, 0, sizeof(board_info));
         strlcpy(board_info.type, "typec_fusb302", I2C_NAME_SIZE);
@@ -218,9 +219,7 @@ out_unregister_max17047:
         if (data->max17047)
                 i2c_unregister_device(data->max17047);
 
-        device_connection_remove(&data->connections[2]);
-        device_connection_remove(&data->connections[1]);
-        device_connection_remove(&data->connections[0]);
+        device_connections_remove(data->connections);
 
         return -EPROBE_DEFER; /* Wait for the i2c-adapter to load */
 }
@@ -234,9 +233,7 @@ static int cht_int33fe_remove(struct platform_device *pdev)
         if (data->max17047)
                 i2c_unregister_device(data->max17047);
 
-        device_connection_remove(&data->connections[2]);
-        device_connection_remove(&data->connections[1]);
-        device_connection_remove(&data->connections[0]);
+        device_connections_remove(data->connections);
 
         return 0;
 }
diff --git a/drivers/scsi/ufs/ufs-qcom.c b/drivers/scsi/ufs/ufs-qcom.c
index 4a6b2b350ace..3aeadb14aae1 100644
--- a/drivers/scsi/ufs/ufs-qcom.c
+++ b/drivers/scsi/ufs/ufs-qcom.c
@@ -16,7 +16,6 @@
 #include <linux/of.h>
 #include <linux/platform_device.h>
 #include <linux/phy/phy.h>
-#include <linux/phy/phy-qcom-ufs.h>
 
 #include "ufshcd.h"
 #include "ufshcd-pltfrm.h"
@@ -191,22 +190,9 @@ out:
 
 static int ufs_qcom_link_startup_post_change(struct ufs_hba *hba)
 {
-        struct ufs_qcom_host *host = ufshcd_get_variant(hba);
-        struct phy *phy = host->generic_phy;
         u32 tx_lanes;
-        int err = 0;
-
-        err = ufs_qcom_get_connected_tx_lanes(hba, &tx_lanes);
-        if (err)
-                goto out;
 
-        err = ufs_qcom_phy_set_tx_lane_enable(phy, tx_lanes);
-        if (err)
-                dev_err(hba->dev, "%s: ufs_qcom_phy_set_tx_lane_enable failed\n",
-                        __func__);
-
-out:
-        return err;
+        return ufs_qcom_get_connected_tx_lanes(hba, &tx_lanes);
 }
 
 static int ufs_qcom_check_hibern8(struct ufs_hba *hba)
@@ -934,10 +920,8 @@ static int ufs_qcom_pwr_change_notify(struct ufs_hba *hba,
 {
         u32 val;
         struct ufs_qcom_host *host = ufshcd_get_variant(hba);
-        struct phy *phy = host->generic_phy;
         struct ufs_qcom_dev_params ufs_qcom_cap;
         int ret = 0;
-        int res = 0;
 
         if (!dev_req_params) {
                 pr_err("%s: incoming dev_req_params is NULL\n", __func__);
@@ -1004,12 +988,6 @@ static int ufs_qcom_pwr_change_notify(struct ufs_hba *hba,
                 }
 
                 val = ~(MAX_U32 << dev_req_params->lane_tx);
-                res = ufs_qcom_phy_set_tx_lane_enable(phy, val);
-                if (res) {
-                        dev_err(hba->dev, "%s: ufs_qcom_phy_set_tx_lane_enable() failed res = %d\n",
-                                __func__, res);
-                        ret = res;
-                }
 
                 /* cache the power mode parameters to use internally */
                 memcpy(&host->dev_req_params,
@@ -1266,10 +1244,6 @@ static int ufs_qcom_init(struct ufs_hba *hba)
                 }
         }
 
-        /* update phy revision information before calling phy_init() */
-        ufs_qcom_phy_save_controller_version(host->generic_phy,
-                host->hw_ver.major, host->hw_ver.minor, host->hw_ver.step);
-
         err = ufs_qcom_init_lane_clks(host);
         if (err)
                 goto out_variant_clear;
diff --git a/drivers/scsi/ufs/ufs-qcom.h b/drivers/scsi/ufs/ufs-qcom.h
index 295f4bef6a0e..c114826316eb 100644
--- a/drivers/scsi/ufs/ufs-qcom.h
+++ b/drivers/scsi/ufs/ufs-qcom.h
@@ -129,11 +129,6 @@ enum {
         MASK_CLK_NS_REG                     = 0xFFFC00,
 };
 
-enum ufs_qcom_phy_init_type {
-        UFS_PHY_INIT_FULL,
-        UFS_PHY_INIT_CFG_RESTORE,
-};
-
 /* QCOM UFS debug print bit mask */
 #define UFS_QCOM_DBG_PRINT_REGS_EN      BIT(0)
 #define UFS_QCOM_DBG_PRINT_ICE_REGS_EN  BIT(1)
diff --git a/drivers/usb/chipidea/ci_hdrc_imx.c b/drivers/usb/chipidea/ci_hdrc_imx.c
index 19f5f5f2a48a..09b37c0d075d 100644
--- a/drivers/usb/chipidea/ci_hdrc_imx.c
+++ b/drivers/usb/chipidea/ci_hdrc_imx.c
@@ -364,8 +364,7 @@ static void ci_hdrc_imx_shutdown(struct platform_device *pdev)
         ci_hdrc_imx_remove(pdev);
 }
 
-#ifdef CONFIG_PM
-static int imx_controller_suspend(struct device *dev)
+static int __maybe_unused imx_controller_suspend(struct device *dev)
 {
         struct ci_hdrc_imx_data *data = dev_get_drvdata(dev);
 
@@ -377,7 +376,7 @@ static int imx_controller_suspend(struct device *dev)
         return 0;
 }
 
-static int imx_controller_resume(struct device *dev)
+static int __maybe_unused imx_controller_resume(struct device *dev)
 {
         struct ci_hdrc_imx_data *data = dev_get_drvdata(dev);
         int ret = 0;
@@ -408,8 +407,7 @@ clk_disable:
         return ret;
 }
 
-#ifdef CONFIG_PM_SLEEP
-static int ci_hdrc_imx_suspend(struct device *dev)
+static int __maybe_unused ci_hdrc_imx_suspend(struct device *dev)
 {
         int ret;
 
@@ -431,7 +429,7 @@ static int ci_hdrc_imx_suspend(struct device *dev)
         return imx_controller_suspend(dev);
 }
 
-static int ci_hdrc_imx_resume(struct device *dev)
+static int __maybe_unused ci_hdrc_imx_resume(struct device *dev)
 {
         struct ci_hdrc_imx_data *data = dev_get_drvdata(dev);
         int ret;
@@ -445,9 +443,8 @@ static int ci_hdrc_imx_resume(struct device *dev)
 
         return ret;
 }
-#endif /* CONFIG_PM_SLEEP */
 
-static int ci_hdrc_imx_runtime_suspend(struct device *dev)
+static int __maybe_unused ci_hdrc_imx_runtime_suspend(struct device *dev)
 {
         struct ci_hdrc_imx_data *data = dev_get_drvdata(dev);
         int ret;
@@ -466,13 +463,11 @@ static int ci_hdrc_imx_runtime_suspend(struct device *dev)
         return imx_controller_suspend(dev);
 }
 
-static int ci_hdrc_imx_runtime_resume(struct device *dev)
+static int __maybe_unused ci_hdrc_imx_runtime_resume(struct device *dev)
 {
         return imx_controller_resume(dev);
 }
 
-#endif /* CONFIG_PM */
-
 static const struct dev_pm_ops ci_hdrc_imx_pm_ops = {
         SET_SYSTEM_SLEEP_PM_OPS(ci_hdrc_imx_suspend, ci_hdrc_imx_resume)
         SET_RUNTIME_PM_OPS(ci_hdrc_imx_runtime_suspend,
@@ -492,7 +487,7 @@ static struct platform_driver ci_hdrc_imx_driver = {
 module_platform_driver(ci_hdrc_imx_driver);
 
 MODULE_ALIAS("platform:imx-usb");
-MODULE_LICENSE("GPL v2");
+MODULE_LICENSE("GPL");
 MODULE_DESCRIPTION("CI HDRC i.MX USB binding");
 MODULE_AUTHOR("Marek Vasut <marex@denx.de>");
 MODULE_AUTHOR("Richard Zhao <richard.zhao@freescale.com>");
diff --git a/drivers/usb/chipidea/core.c b/drivers/usb/chipidea/core.c
index 85fc6db48e44..7bfcbb23c2a4 100644
--- a/drivers/usb/chipidea/core.c
+++ b/drivers/usb/chipidea/core.c
@@ -53,6 +53,7 @@
 #include <linux/kernel.h>
 #include <linux/slab.h>
 #include <linux/pm_runtime.h>
+#include <linux/pinctrl/consumer.h>
 #include <linux/usb/ch9.h>
 #include <linux/usb/gadget.h>
 #include <linux/usb/otg.h>
@@ -723,6 +724,24 @@ static int ci_get_platdata(struct device *dev,
                 else
                         cable->connected = false;
         }
+
+        platdata->pctl = devm_pinctrl_get(dev);
+        if (!IS_ERR(platdata->pctl)) {
+                struct pinctrl_state *p;
+
+                p = pinctrl_lookup_state(platdata->pctl, "default");
+                if (!IS_ERR(p))
+                        platdata->pins_default = p;
+
+                p = pinctrl_lookup_state(platdata->pctl, "host");
+                if (!IS_ERR(p))
+                        platdata->pins_host = p;
+
+                p = pinctrl_lookup_state(platdata->pctl, "device");
+                if (!IS_ERR(p))
+                        platdata->pins_device = p;
+        }
+
         return 0;
 }
 
diff --git a/drivers/usb/chipidea/host.c b/drivers/usb/chipidea/host.c
index 4638d9b066be..d858a82c4f44 100644
--- a/drivers/usb/chipidea/host.c
+++ b/drivers/usb/chipidea/host.c
@@ -13,6 +13,7 @@
 #include <linux/usb/hcd.h>
 #include <linux/usb/chipidea.h>
 #include <linux/regulator/consumer.h>
+#include <linux/pinctrl/consumer.h>
 
 #include "../host/ehci.h"
 
@@ -153,6 +154,10 @@ static int host_start(struct ci_hdrc *ci)
                 }
         }
 
+        if (ci->platdata->pins_host)
+                pinctrl_select_state(ci->platdata->pctl,
+                                     ci->platdata->pins_host);
+
         ret = usb_add_hcd(hcd, 0, 0);
         if (ret) {
                 goto disable_reg;
@@ -197,6 +202,10 @@ static void host_stop(struct ci_hdrc *ci)
         }
         ci->hcd = NULL;
         ci->otg.host = NULL;
+
+        if (ci->platdata->pins_host && ci->platdata->pins_default)
+                pinctrl_select_state(ci->platdata->pctl,
+                                     ci->platdata->pins_default);
 }
 
 
diff --git a/drivers/usb/chipidea/otg.c b/drivers/usb/chipidea/otg.c
index db4ceffcf2a6..f25d4827fd49 100644
--- a/drivers/usb/chipidea/otg.c
+++ b/drivers/usb/chipidea/otg.c
@@ -203,14 +203,17 @@ static void ci_otg_work(struct work_struct *work)
         }
 
         pm_runtime_get_sync(ci->dev);
+
         if (ci->id_event) {
                 ci->id_event = false;
                 ci_handle_id_switch(ci);
-        } else if (ci->b_sess_valid_event) {
+        }
+
+        if (ci->b_sess_valid_event) {
                 ci->b_sess_valid_event = false;
                 ci_handle_vbus_change(ci);
-        } else
-                dev_err(ci->dev, "unexpected event occurs at %s\n", __func__);
+        }
+
         pm_runtime_put_sync(ci->dev);
 
         enable_irq(ci->irq);
diff --git a/drivers/usb/chipidea/otg.h b/drivers/usb/chipidea/otg.h
index 7e7428e48bfa..4f8b8179ec96 100644
--- a/drivers/usb/chipidea/otg.h
+++ b/drivers/usb/chipidea/otg.h
@@ -17,7 +17,8 @@ void ci_handle_vbus_change(struct ci_hdrc *ci);
 static inline void ci_otg_queue_work(struct ci_hdrc *ci)
 {
         disable_irq_nosync(ci->irq);
-        queue_work(ci->wq, &ci->work);
+        if (queue_work(ci->wq, &ci->work) == false)
+                enable_irq(ci->irq);
 }
 
 #endif /* __DRIVERS_USB_CHIPIDEA_OTG_H */
diff --git a/drivers/usb/chipidea/udc.c b/drivers/usb/chipidea/udc.c
index 9852ec5e6e01..829e947cabf5 100644
--- a/drivers/usb/chipidea/udc.c
+++ b/drivers/usb/chipidea/udc.c
@@ -15,6 +15,7 @@
 #include <linux/kernel.h>
 #include <linux/slab.h>
 #include <linux/pm_runtime.h>
+#include <linux/pinctrl/consumer.h>
 #include <linux/usb/ch9.h>
 #include <linux/usb/gadget.h>
 #include <linux/usb/otg-fsm.h>
@@ -1965,6 +1966,10 @@ void ci_hdrc_gadget_destroy(struct ci_hdrc *ci)
 
 static int udc_id_switch_for_device(struct ci_hdrc *ci)
 {
+        if (ci->platdata->pins_device)
+                pinctrl_select_state(ci->platdata->pctl,
+                                     ci->platdata->pins_device);
+
         if (ci->is_otg)
                 /* Clear and enable BSV irq */
                 hw_write_otgsc(ci, OTGSC_BSVIS | OTGSC_BSVIE,
@@ -1983,6 +1988,10 @@ static void udc_id_switch_for_host(struct ci_hdrc *ci)
                 hw_write_otgsc(ci, OTGSC_BSVIE | OTGSC_BSVIS, OTGSC_BSVIS);
 
         ci->vbus_active = 0;
+
+        if (ci->platdata->pins_device && ci->platdata->pins_default)
+                pinctrl_select_state(ci->platdata->pctl,
+                                     ci->platdata->pins_default);
 }
 
 /**
diff --git a/drivers/usb/chipidea/usbmisc_imx.c b/drivers/usb/chipidea/usbmisc_imx.c
index 34ad5bf8acd8..def80ff547e4 100644
--- a/drivers/usb/chipidea/usbmisc_imx.c
+++ b/drivers/usb/chipidea/usbmisc_imx.c
@@ -343,6 +343,8 @@ static int usbmisc_imx6q_init(struct imx_usbmisc_data *data)
         } else if (data->oc_polarity == 1) {
                 /* High active */
                 reg &= ~(MX6_BM_OVER_CUR_DIS | MX6_BM_OVER_CUR_POLARITY);
+        } else {
+                reg &= ~(MX6_BM_OVER_CUR_DIS);
         }
         writel(reg, usbmisc->base + data->index * 4);
 
@@ -633,6 +635,6 @@ static struct platform_driver usbmisc_imx_driver = {
 module_platform_driver(usbmisc_imx_driver);
 
 MODULE_ALIAS("platform:usbmisc-imx");
-MODULE_LICENSE("GPL v2");
+MODULE_LICENSE("GPL");
 MODULE_DESCRIPTION("driver for imx usb non-core registers");
 MODULE_AUTHOR("Richard Zhao <richard.zhao@freescale.com>");
diff --git a/drivers/usb/class/usbtmc.c b/drivers/usb/class/usbtmc.c
index 83ffa5a14c3d..4942122b2346 100644
--- a/drivers/usb/class/usbtmc.c
+++ b/drivers/usb/class/usbtmc.c
@@ -5,6 +5,7 @@
  * Copyright (C) 2007 Stefan Kopp, Gechingen, Germany
  * Copyright (C) 2008 Novell, Inc.
  * Copyright (C) 2008 Greg Kroah-Hartman <gregkh@suse.de>
+ * Copyright (C) 2018 IVI Foundation, Inc.
  */
 
 #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
@@ -21,21 +22,24 @@
 #include <linux/compat.h>
 #include <linux/usb/tmc.h>
 
+/* Increment API VERSION when changing tmc.h with new flags or ioctls
+ * or when changing a significant behavior of the driver.
+ */
+#define USBTMC_API_VERSION (2)
 
 #define USBTMC_HEADER_SIZE      12
 #define USBTMC_MINOR_BASE       176
 
-/*
- * Size of driver internal IO buffer. Must be multiple of 4 and at least as
- * large as wMaxPacketSize (which is usually 512 bytes).
- */
-#define USBTMC_SIZE_IOBUFFER    2048
-
 /* Minimum USB timeout (in milliseconds) */
 #define USBTMC_MIN_TIMEOUT      100
 /* Default USB timeout (in milliseconds) */
 #define USBTMC_TIMEOUT          5000
 
+/* Max number of urbs used in write transfers */
+#define MAX_URBS_IN_FLIGHT      16
+/* I/O buffer size used in generic read/write functions */
+#define USBTMC_BUFSIZE          (4096)
+
 /*
  * Maximum number of read cycles to empty bulk in endpoint during CLEAR and
  * ABORT_BULK_IN requests. Ends the loop if (for whatever reason) a short
@@ -79,6 +83,9 @@ struct usbtmc_device_data {
         u8 bTag_last_write;     /* needed for abort */
         u8 bTag_last_read;      /* needed for abort */
 
+        /* packet size of IN bulk */
+        u16            wMaxPacketSize;
+
         /* data for interrupt in endpoint handling */
         u8             bNotify1;
         u8             bNotify2;
@@ -95,11 +102,6 @@ struct usbtmc_device_data {
         /* coalesced usb488_caps from usbtmc_dev_capabilities */
         __u8 usb488_caps;
 
-        /* attributes from the USB TMC spec for this device */
-        u8 TermChar;
-        bool TermCharEnabled;
-        bool auto_abort;
-
         bool zombie; /* fd of disconnected device */
 
         struct usbtmc_dev_capabilities  capabilities;
@@ -121,13 +123,34 @@ struct usbtmc_file_data {
         u32            timeout;
         u8             srq_byte;
         atomic_t       srq_asserted;
+        atomic_t       closing;
+        u8             bmTransferAttributes; /* member of DEV_DEP_MSG_IN */
+
         u8             eom_val;
         u8             term_char;
         bool           term_char_enabled;
+        bool           auto_abort;
+
+        spinlock_t     err_lock; /* lock for errors */
+
+        struct usb_anchor submitted;
+
+        /* data for generic_write */
+        struct semaphore limit_write_sem;
+        u32 out_transfer_size;
+        int out_status;
+
+        /* data for generic_read */
+        u32 in_transfer_size;
+        int in_status;
+        int in_urbs_used;
+        struct usb_anchor in_anchor;
+        wait_queue_head_t wait_bulk_in;
 };
 
 /* Forward declarations */
 static struct usb_driver usbtmc_driver;
+static void usbtmc_draw_down(struct usbtmc_file_data *file_data);
 
 static void usbtmc_delete(struct kref *kref)
 {
@@ -153,6 +176,12 @@ static int usbtmc_open(struct inode *inode, struct file *filp)
         if (!file_data)
                 return -ENOMEM;
 
+        spin_lock_init(&file_data->err_lock);
+        sema_init(&file_data->limit_write_sem, MAX_URBS_IN_FLIGHT);
+        init_usb_anchor(&file_data->submitted);
+        init_usb_anchor(&file_data->in_anchor);
+        init_waitqueue_head(&file_data->wait_bulk_in);
+
         data = usb_get_intfdata(intf);
         /* Protect reference to data from file structure until release */
         kref_get(&data->kref);
@@ -160,10 +189,12 @@ static int usbtmc_open(struct inode *inode, struct file *filp)
         mutex_lock(&data->io_mutex);
         file_data->data = data;
 
-        /* copy default values from device settings */
+        atomic_set(&file_data->closing, 0);
+
         file_data->timeout = USBTMC_TIMEOUT;
-        file_data->term_char = data->TermChar;
-        file_data->term_char_enabled = data->TermCharEnabled;
+        file_data->term_char = '\n';
+        file_data->term_char_enabled = 0;
+        file_data->auto_abort = 0;
         file_data->eom_val = 1;
 
         INIT_LIST_HEAD(&file_data->file_elem);
@@ -178,6 +209,40 @@ static int usbtmc_open(struct inode *inode, struct file *filp)
         return 0;
 }
 
+/*
+ * usbtmc_flush - called before file handle is closed
+ */
+static int usbtmc_flush(struct file *file, fl_owner_t id)
+{
+        struct usbtmc_file_data *file_data;
+        struct usbtmc_device_data *data;
+
+        file_data = file->private_data;
+        if (file_data == NULL)
+                return -ENODEV;
+
+        atomic_set(&file_data->closing, 1);
+        data = file_data->data;
+
+        /* wait for io to stop */
+        mutex_lock(&data->io_mutex);
+
+        usbtmc_draw_down(file_data);
+
+        spin_lock_irq(&file_data->err_lock);
+        file_data->in_status = 0;
+        file_data->in_transfer_size = 0;
+        file_data->in_urbs_used = 0;
+        file_data->out_status = 0;
+        file_data->out_transfer_size = 0;
+        spin_unlock_irq(&file_data->err_lock);
+
+        wake_up_interruptible_all(&data->waitq);
+        mutex_unlock(&data->io_mutex);
+
+        return 0;
+}
+
 static int usbtmc_release(struct inode *inode, struct file *file)
 {
         struct usbtmc_file_data *file_data = file->private_data;
@@ -197,18 +262,17 @@ static int usbtmc_release(struct inode *inode, struct file *file)
         return 0;
 }
 
-static int usbtmc_ioctl_abort_bulk_in(struct usbtmc_device_data *data)
+static int usbtmc_ioctl_abort_bulk_in_tag(struct usbtmc_device_data *data,
+                                          u8 tag)
 {
         u8 *buffer;
         struct device *dev;
         int rv;
         int n;
         int actual;
-        struct usb_host_interface *current_setting;
-        int max_size;
 
         dev = &data->intf->dev;
-        buffer = kmalloc(USBTMC_SIZE_IOBUFFER, GFP_KERNEL);
+        buffer = kmalloc(USBTMC_BUFSIZE, GFP_KERNEL);
         if (!buffer)
                 return -ENOMEM;
 
@@ -216,86 +280,88 @@ static int usbtmc_ioctl_abort_bulk_in(struct usbtmc_device_data *data)
                              usb_rcvctrlpipe(data->usb_dev, 0),
                              USBTMC_REQUEST_INITIATE_ABORT_BULK_IN,
                              USB_DIR_IN | USB_TYPE_CLASS | USB_RECIP_ENDPOINT,
-                             data->bTag_last_read, data->bulk_in,
-                             buffer, 2, USBTMC_TIMEOUT);
+                             tag, data->bulk_in,
+                             buffer, 2, USB_CTRL_GET_TIMEOUT);
 
         if (rv < 0) {
                 dev_err(dev, "usb_control_msg returned %d\n", rv);
                 goto exit;
         }
 
-        dev_dbg(dev, "INITIATE_ABORT_BULK_IN returned %x\n", buffer[0]);
+        dev_dbg(dev, "INITIATE_ABORT_BULK_IN returned %x with tag %02x\n",
+                buffer[0], buffer[1]);
 
         if (buffer[0] == USBTMC_STATUS_FAILED) {
+                /* No transfer in progress and the Bulk-OUT FIFO is empty. */
                 rv = 0;
                 goto exit;
         }
 
-        if (buffer[0] != USBTMC_STATUS_SUCCESS) {
-                dev_err(dev, "INITIATE_ABORT_BULK_IN returned %x\n",
-                        buffer[0]);
-                rv = -EPERM;
+        if (buffer[0] == USBTMC_STATUS_TRANSFER_NOT_IN_PROGRESS) {
+                /* The device returns this status if either:
+                 * - There is a transfer in progress, but the specified bTag
+                 *   does not match.
+                 * - There is no transfer in progress, but the Bulk-OUT FIFO
+                 *   is not empty.
+                 */
+                rv = -ENOMSG;
                 goto exit;
         }
 
-        max_size = 0;
-        current_setting = data->intf->cur_altsetting;
-        for (n = 0; n < current_setting->desc.bNumEndpoints; n++)
-                if (current_setting->endpoint[n].desc.bEndpointAddress ==
-                        data->bulk_in)
-                        max_size = usb_endpoint_maxp(&current_setting->endpoint[n].desc);
-
-        if (max_size == 0) {
-                dev_err(dev, "Couldn't get wMaxPacketSize\n");
+        if (buffer[0] != USBTMC_STATUS_SUCCESS) {
+                dev_err(dev, "INITIATE_ABORT_BULK_IN returned %x\n",
+                        buffer[0]);
                 rv = -EPERM;
                 goto exit;
         }
 
-        dev_dbg(&data->intf->dev, "wMaxPacketSize is %d\n", max_size);
-
         n = 0;
 
-        do {
-                dev_dbg(dev, "Reading from bulk in EP\n");
+usbtmc_abort_bulk_in_status:
+        dev_dbg(dev, "Reading from bulk in EP\n");
 
-                rv = usb_bulk_msg(data->usb_dev,
-                                  usb_rcvbulkpipe(data->usb_dev,
-                                                  data->bulk_in),
-                                  buffer, USBTMC_SIZE_IOBUFFER,
-                                  &actual, USBTMC_TIMEOUT);
+        /* Data must be present. So use low timeout 300 ms */
+        actual = 0;
+        rv = usb_bulk_msg(data->usb_dev,
+                          usb_rcvbulkpipe(data->usb_dev,
+                                          data->bulk_in),
+                          buffer, USBTMC_BUFSIZE,
+                          &actual, 300);
 
-                n++;
+        print_hex_dump_debug("usbtmc ", DUMP_PREFIX_NONE, 16, 1,
+                             buffer, actual, true);
 
-                if (rv < 0) {
-                        dev_err(dev, "usb_bulk_msg returned %d\n", rv);
+        n++;
+
+        if (rv < 0) {
+                dev_err(dev, "usb_bulk_msg returned %d\n", rv);
+                if (rv != -ETIMEDOUT)
                         goto exit;
-                }
-        } while ((actual == max_size) &&
-                 (n < USBTMC_MAX_READS_TO_CLEAR_BULK_IN));
+        }
 
-        if (actual == max_size) {
+        if (actual == USBTMC_BUFSIZE)
+                goto usbtmc_abort_bulk_in_status;
+
+        if (n >= USBTMC_MAX_READS_TO_CLEAR_BULK_IN) {
                 dev_err(dev, "Couldn't clear device buffer within %d cycles\n",
                         USBTMC_MAX_READS_TO_CLEAR_BULK_IN);
                 rv = -EPERM;
                 goto exit;
         }
 
-        n = 0;
-
-usbtmc_abort_bulk_in_status:
         rv = usb_control_msg(data->usb_dev,
                              usb_rcvctrlpipe(data->usb_dev, 0),
                              USBTMC_REQUEST_CHECK_ABORT_BULK_IN_STATUS,
                              USB_DIR_IN | USB_TYPE_CLASS | USB_RECIP_ENDPOINT,
                              0, data->bulk_in, buffer, 0x08,
-                             USBTMC_TIMEOUT);
+                             USB_CTRL_GET_TIMEOUT);
 
         if (rv < 0) {
                 dev_err(dev, "usb_control_msg returned %d\n", rv);
                 goto exit;
         }
 
-        dev_dbg(dev, "INITIATE_ABORT_BULK_IN returned %x\n", buffer[0]);
+        dev_dbg(dev, "CHECK_ABORT_BULK_IN returned %x\n", buffer[0]);
 
         if (buffer[0] == USBTMC_STATUS_SUCCESS) {
                 rv = 0;
@@ -303,46 +369,30 @@ usbtmc_abort_bulk_in_status:
         }
 
         if (buffer[0] != USBTMC_STATUS_PENDING) {
-                dev_err(dev, "INITIATE_ABORT_BULK_IN returned %x\n", buffer[0]);
+                dev_err(dev, "CHECK_ABORT_BULK_IN returned %x\n", buffer[0]);
                 rv = -EPERM;
                 goto exit;
         }
 
-        if (buffer[1] == 1)
-                do {
-                        dev_dbg(dev, "Reading from bulk in EP\n");
-
-                        rv = usb_bulk_msg(data->usb_dev,
-                                          usb_rcvbulkpipe(data->usb_dev,
-                                                          data->bulk_in),
-                                          buffer, USBTMC_SIZE_IOBUFFER,
-                                          &actual, USBTMC_TIMEOUT);
-
-                        n++;
-
-                        if (rv < 0) {
-                                dev_err(dev, "usb_bulk_msg returned %d\n", rv);
-                                goto exit;
-                        }
-                } while ((actual == max_size) &&
-                         (n < USBTMC_MAX_READS_TO_CLEAR_BULK_IN));
-
-        if (actual == max_size) {
-                dev_err(dev, "Couldn't clear device buffer within %d cycles\n",
-                        USBTMC_MAX_READS_TO_CLEAR_BULK_IN);
-                rv = -EPERM;
-                goto exit;
+        if ((buffer[1] & 1) > 0) {
+                /* The device has 1 or more queued packets the Host can read */
+                goto usbtmc_abort_bulk_in_status;
         }
 
-        goto usbtmc_abort_bulk_in_status;
-
+        /* The Host must send CHECK_ABORT_BULK_IN_STATUS at a later time. */
+        rv = -EAGAIN;
 exit:
         kfree(buffer);
         return rv;
+}
 
+static int usbtmc_ioctl_abort_bulk_in(struct usbtmc_device_data *data)
+{
+        return usbtmc_ioctl_abort_bulk_in_tag(data, data->bTag_last_read);
 }
 
-static int usbtmc_ioctl_abort_bulk_out(struct usbtmc_device_data *data)
+static int usbtmc_ioctl_abort_bulk_out_tag(struct usbtmc_device_data *data,
+                                           u8 tag)
 {
         struct device *dev;
         u8 *buffer;
@@ -359,8 +409,8 @@ static int usbtmc_ioctl_abort_bulk_out(struct usbtmc_device_data *data)
                              usb_rcvctrlpipe(data->usb_dev, 0),
                              USBTMC_REQUEST_INITIATE_ABORT_BULK_OUT,
                              USB_DIR_IN | USB_TYPE_CLASS | USB_RECIP_ENDPOINT,
-                             data->bTag_last_write, data->bulk_out,
-                             buffer, 2, USBTMC_TIMEOUT);
+                             tag, data->bulk_out,
+                             buffer, 2, USB_CTRL_GET_TIMEOUT);
 
         if (rv < 0) {
                 dev_err(dev, "usb_control_msg returned %d\n", rv);
@@ -379,12 +429,14 @@ static int usbtmc_ioctl_abort_bulk_out(struct usbtmc_device_data *data)
         n = 0;
 
 usbtmc_abort_bulk_out_check_status:
+        /* do not stress device with subsequent requests */
+        msleep(50);
         rv = usb_control_msg(data->usb_dev,
                              usb_rcvctrlpipe(data->usb_dev, 0),
                              USBTMC_REQUEST_CHECK_ABORT_BULK_OUT_STATUS,
                              USB_DIR_IN | USB_TYPE_CLASS | USB_RECIP_ENDPOINT,
                              0, data->bulk_out, buffer, 0x08,
-                             USBTMC_TIMEOUT);
+                             USB_CTRL_GET_TIMEOUT);
         n++;
         if (rv < 0) {
                 dev_err(dev, "usb_control_msg returned %d\n", rv);
@@ -418,6 +470,11 @@ exit:
         return rv;
 }
 
+static int usbtmc_ioctl_abort_bulk_out(struct usbtmc_device_data *data)
+{
+        return usbtmc_ioctl_abort_bulk_out_tag(data, data->bTag_last_write);
+}
+
 static int usbtmc488_ioctl_read_stb(struct usbtmc_file_data *file_data,
                                 void __user *arg)
 {
@@ -457,7 +514,7 @@ static int usbtmc488_ioctl_read_stb(struct usbtmc_file_data *file_data,
                         USB_DIR_IN | USB_TYPE_CLASS | USB_RECIP_INTERFACE,
                         data->iin_bTag,
                         data->ifnum,
-                        buffer, 0x03, USBTMC_TIMEOUT);
+                        buffer, 0x03, USB_CTRL_GET_TIMEOUT);
         if (rv < 0) {
                 dev_err(dev, "stb usb_control_msg returned %d\n", rv);
                 goto exit;
@@ -510,6 +567,54 @@ static int usbtmc488_ioctl_read_stb(struct usbtmc_file_data *file_data,
         return rv;
 }
 
+static int usbtmc488_ioctl_wait_srq(struct usbtmc_file_data *file_data,
+                                    __u32 __user *arg)
+{
+        struct usbtmc_device_data *data = file_data->data;
+        struct device *dev = &data->intf->dev;
+        int rv;
+        u32 timeout;
+        unsigned long expire;
+
+        if (!data->iin_ep_present) {
+                dev_dbg(dev, "no interrupt endpoint present\n");
+                return -EFAULT;
+        }
+
+        if (get_user(timeout, arg))
+                return -EFAULT;
+
+        expire = msecs_to_jiffies(timeout);
+
+        mutex_unlock(&data->io_mutex);
+
+        rv = wait_event_interruptible_timeout(
+                        data->waitq,
+                        atomic_read(&file_data->srq_asserted) != 0 ||
+                        atomic_read(&file_data->closing),
+                        expire);
+
+        mutex_lock(&data->io_mutex);
+
+        /* Note! disconnect or close could be called in the meantime */
+        if (atomic_read(&file_data->closing) || data->zombie)
+                rv = -ENODEV;
+
+        if (rv < 0) {
+                /* dev can be invalid now! */
+                pr_debug("%s - wait interrupted %d\n", __func__, rv);
+                return rv;
+        }
+
+        if (rv == 0) {
+                dev_dbg(dev, "%s - wait timed out\n", __func__);
+                return -ETIMEDOUT;
+        }
+
+        dev_dbg(dev, "%s - srq asserted\n", __func__);
+        return 0;
+}
+
 static int usbtmc488_ioctl_simple(struct usbtmc_device_data *data,
                                 void __user *arg, unsigned int cmd)
 {
@@ -543,7 +648,7 @@ static int usbtmc488_ioctl_simple(struct usbtmc_device_data *data,
                         USB_DIR_IN | USB_TYPE_CLASS | USB_RECIP_INTERFACE,
                         wValue,
                         data->ifnum,
-                        buffer, 0x01, USBTMC_TIMEOUT);
+                        buffer, 0x01, USB_CTRL_GET_TIMEOUT);
         if (rv < 0) {
                 dev_err(dev, "simple usb_control_msg failed %d\n", rv);
                 goto exit;
@@ -610,6 +715,559 @@ static int usbtmc488_ioctl_trigger(struct usbtmc_file_data *file_data)
         return 0;
 }
 
+static struct urb *usbtmc_create_urb(void)
+{
+        const size_t bufsize = USBTMC_BUFSIZE;
+        u8 *dmabuf = NULL;
+        struct urb *urb = usb_alloc_urb(0, GFP_KERNEL);
+
+        if (!urb)
+                return NULL;
+
+        dmabuf = kmalloc(bufsize, GFP_KERNEL);
+        if (!dmabuf) {
+                usb_free_urb(urb);
+                return NULL;
+        }
+
+        urb->transfer_buffer = dmabuf;
+        urb->transfer_buffer_length = bufsize;
+        urb->transfer_flags |= URB_FREE_BUFFER;
+        return urb;
+}
+
+static void usbtmc_read_bulk_cb(struct urb *urb)
+{
+        struct usbtmc_file_data *file_data = urb->context;
+        int status = urb->status;
+        unsigned long flags;
+
+        /* sync/async unlink faults aren't errors */
+        if (status) {
+                if (!(/* status == -ENOENT || */
+                        status == -ECONNRESET ||
+                        status == -EREMOTEIO || /* Short packet */
+                        status == -ESHUTDOWN))
+                        dev_err(&file_data->data->intf->dev,
+                        "%s - nonzero read bulk status received: %d\n",
+                        __func__, status);
+
+                spin_lock_irqsave(&file_data->err_lock, flags);
+                if (!file_data->in_status)
+                        file_data->in_status = status;
+                spin_unlock_irqrestore(&file_data->err_lock, flags);
+        }
+
+        spin_lock_irqsave(&file_data->err_lock, flags);
+        file_data->in_transfer_size += urb->actual_length;
+        dev_dbg(&file_data->data->intf->dev,
+                "%s - total size: %u current: %d status: %d\n",
+                __func__, file_data->in_transfer_size,
+                urb->actual_length, status);
+        spin_unlock_irqrestore(&file_data->err_lock, flags);
+        usb_anchor_urb(urb, &file_data->in_anchor);
+
+        wake_up_interruptible(&file_data->wait_bulk_in);
+        wake_up_interruptible(&file_data->data->waitq);
+}
+
+static inline bool usbtmc_do_transfer(struct usbtmc_file_data *file_data)
+{
+        bool data_or_error;
+
+        spin_lock_irq(&file_data->err_lock);
+        data_or_error = !usb_anchor_empty(&file_data->in_anchor)
+                        || file_data->in_status;
+        spin_unlock_irq(&file_data->err_lock);
+        dev_dbg(&file_data->data->intf->dev, "%s: returns %d\n", __func__,
+                data_or_error);
+        return data_or_error;
+}
+
+static ssize_t usbtmc_generic_read(struct usbtmc_file_data *file_data,
+                                   void __user *user_buffer,
+                                   u32 transfer_size,
+                                   u32 *transferred,
+                                   u32 flags)
+{
+        struct usbtmc_device_data *data = file_data->data;
+        struct device *dev = &data->intf->dev;
+        u32 done = 0;
+        u32 remaining;
+        const u32 bufsize = USBTMC_BUFSIZE;
+        int retval = 0;
+        u32 max_transfer_size;
+        unsigned long expire;
+        int bufcount = 1;
+        int again = 0;
+
+        /* mutex already locked */
+
+        *transferred = done;
+
+        max_transfer_size = transfer_size;
+
+        if (flags & USBTMC_FLAG_IGNORE_TRAILER) {
+                /* The device may send extra alignment bytes (up to
+                 * wMaxPacketSize – 1) to avoid sending a zero-length
+                 * packet
+                 */
+                remaining = transfer_size;
+                if ((max_transfer_size % data->wMaxPacketSize) == 0)
+                        max_transfer_size += (data->wMaxPacketSize - 1);
+        } else {
+                /* round down to bufsize to avoid truncated data left */
+                if (max_transfer_size > bufsize) {
+                        max_transfer_size =
+                                roundup(max_transfer_size + 1 - bufsize,
+                                        bufsize);
+                }
+                remaining = max_transfer_size;
+        }
+
+        spin_lock_irq(&file_data->err_lock);
+
+        if (file_data->in_status) {
+                /* return the very first error */
+                retval = file_data->in_status;
+                spin_unlock_irq(&file_data->err_lock);
+                goto error;
+        }
+
+        if (flags & USBTMC_FLAG_ASYNC) {
+                if (usb_anchor_empty(&file_data->in_anchor))
+                        again = 1;
+
+                if (file_data->in_urbs_used == 0) {
+                        file_data->in_transfer_size = 0;
+                        file_data->in_status = 0;
+                }
+        } else {
+                file_data->in_transfer_size = 0;
+                file_data->in_status = 0;
+        }
+
+        if (max_transfer_size == 0) {
+                bufcount = 0;
+        } else {
+                bufcount = roundup(max_transfer_size, bufsize) / bufsize;
+                if (bufcount > file_data->in_urbs_used)
+                        bufcount -= file_data->in_urbs_used;
+                else
+                        bufcount = 0;
+
+                if (bufcount + file_data->in_urbs_used > MAX_URBS_IN_FLIGHT) {
+                        bufcount = MAX_URBS_IN_FLIGHT -
+                                        file_data->in_urbs_used;
+                }
+        }
+        spin_unlock_irq(&file_data->err_lock);
+
+        dev_dbg(dev, "%s: requested=%u flags=0x%X size=%u bufs=%d used=%d\n",
+                __func__, transfer_size, flags,
+                max_transfer_size, bufcount, file_data->in_urbs_used);
+
+        while (bufcount > 0) {
+                u8 *dmabuf = NULL;
+                struct urb *urb = usbtmc_create_urb();
+
+                if (!urb) {
+                        retval = -ENOMEM;
+                        goto error;
+                }
+
+                dmabuf = urb->transfer_buffer;
+
+                usb_fill_bulk_urb(urb, data->usb_dev,
+                        usb_rcvbulkpipe(data->usb_dev, data->bulk_in),
+                        dmabuf, bufsize,
+                        usbtmc_read_bulk_cb, file_data);
+
+                usb_anchor_urb(urb, &file_data->submitted);
+                retval = usb_submit_urb(urb, GFP_KERNEL);
+                /* urb is anchored. We can release our reference. */
+                usb_free_urb(urb);
+                if (unlikely(retval)) {
+                        usb_unanchor_urb(urb);
+                        goto error;
+                }
+                file_data->in_urbs_used++;
+                bufcount--;
+        }
+
+        if (again) {
+                dev_dbg(dev, "%s: ret=again\n", __func__);
+                return -EAGAIN;
+        }
+
+        if (user_buffer == NULL)
+                return -EINVAL;
+
+        expire = msecs_to_jiffies(file_data->timeout);
+
+        while (max_transfer_size > 0) {
+                u32 this_part;
+                struct urb *urb = NULL;
+
+                if (!(flags & USBTMC_FLAG_ASYNC)) {
+                        dev_dbg(dev, "%s: before wait time %lu\n",
+                                __func__, expire);
+                        retval = wait_event_interruptible_timeout(
+                                file_data->wait_bulk_in,
+                                usbtmc_do_transfer(file_data),
+                                expire);
+
+                        dev_dbg(dev, "%s: wait returned %d\n",
+                                __func__, retval);
+
+                        if (retval <= 0) {
+                                if (retval == 0)
+                                        retval = -ETIMEDOUT;
+                                goto error;
+                        }
+                }
+
+                urb = usb_get_from_anchor(&file_data->in_anchor);
+                if (!urb) {
+                        if (!(flags & USBTMC_FLAG_ASYNC)) {
+                                /* synchronous case: must not happen */
+                                retval = -EFAULT;
+                                goto error;
+                        }
+
+                        /* asynchronous case: ready, do not block or wait */
+                        *transferred = done;
+                        dev_dbg(dev, "%s: (async) done=%u ret=0\n",
+                                __func__, done);
+                        return 0;
+                }
+
+                file_data->in_urbs_used--;
+
+                if (max_transfer_size > urb->actual_length)
+                        max_transfer_size -= urb->actual_length;
+                else
+                        max_transfer_size = 0;
+
+                if (remaining > urb->actual_length)
+                        this_part = urb->actual_length;
+                else
+                        this_part = remaining;
+
+                print_hex_dump_debug("usbtmc ", DUMP_PREFIX_NONE, 16, 1,
+                        urb->transfer_buffer, urb->actual_length, true);
+
+                if (copy_to_user(user_buffer + done,
+                                 urb->transfer_buffer, this_part)) {
+                        usb_free_urb(urb);
+                        retval = -EFAULT;
+                        goto error;
+                }
+
+                remaining -= this_part;
+                done += this_part;
+
+                spin_lock_irq(&file_data->err_lock);
+                if (urb->status) {
+                        /* return the very first error */
+                        retval = file_data->in_status;
+                        spin_unlock_irq(&file_data->err_lock);
+                        usb_free_urb(urb);
+                        goto error;
+                }
+                spin_unlock_irq(&file_data->err_lock);
+
+                if (urb->actual_length < bufsize) {
+                        /* short packet or ZLP received => ready */
+                        usb_free_urb(urb);
+                        retval = 1;
+                        break;
+                }
+
+                if (!(flags & USBTMC_FLAG_ASYNC) &&
+                    max_transfer_size > (bufsize * file_data->in_urbs_used)) {
+                        /* resubmit, since other buffers still not enough */
+                        usb_anchor_urb(urb, &file_data->submitted);
+                        retval = usb_submit_urb(urb, GFP_KERNEL);
+                        if (unlikely(retval)) {
+                                usb_unanchor_urb(urb);
+                                usb_free_urb(urb);
+                                goto error;
+                        }
+                        file_data->in_urbs_used++;
+                }
+                usb_free_urb(urb);
+                retval = 0;
+        }
+
+error:
+        *transferred = done;
+
+        dev_dbg(dev, "%s: before kill\n", __func__);
+        /* Attention: killing urbs can take long time (2 ms) */
+        usb_kill_anchored_urbs(&file_data->submitted);
+        dev_dbg(dev, "%s: after kill\n", __func__);
+        usb_scuttle_anchored_urbs(&file_data->in_anchor);
+        file_data->in_urbs_used = 0;
+        file_data->in_status = 0; /* no spinlock needed here */
+        dev_dbg(dev, "%s: done=%u ret=%d\n", __func__, done, retval);
+
+        return retval;
+}
+
+static ssize_t usbtmc_ioctl_generic_read(struct usbtmc_file_data *file_data,
+                                         void __user *arg)
+{
+        struct usbtmc_message msg;
+        ssize_t retval = 0;
+
+        /* mutex already locked */
+
+        if (copy_from_user(&msg, arg, sizeof(struct usbtmc_message)))
+                return -EFAULT;
+
+        retval = usbtmc_generic_read(file_data, msg.message,
+                                     msg.transfer_size, &msg.transferred,
+                                     msg.flags);
+
+        if (put_user(msg.transferred,
+                     &((struct usbtmc_message __user *)arg)->transferred))
+                return -EFAULT;
+
+        return retval;
+}
+
+static void usbtmc_write_bulk_cb(struct urb *urb)
+{
+        struct usbtmc_file_data *file_data = urb->context;
+        int wakeup = 0;
+        unsigned long flags;
+
+        spin_lock_irqsave(&file_data->err_lock, flags);
+        file_data->out_transfer_size += urb->actual_length;
+
+        /* sync/async unlink faults aren't errors */
+        if (urb->status) {
+                if (!(urb->status == -ENOENT ||
+                        urb->status == -ECONNRESET ||
+                        urb->status == -ESHUTDOWN))
+                        dev_err(&file_data->data->intf->dev,
+                                "%s - nonzero write bulk status received: %d\n",
+                                __func__, urb->status);
+
+                if (!file_data->out_status) {
+                        file_data->out_status = urb->status;
+                        wakeup = 1;
+                }
+        }
+        spin_unlock_irqrestore(&file_data->err_lock, flags);
+
+        dev_dbg(&file_data->data->intf->dev,
+                "%s - write bulk total size: %u\n",
+                __func__, file_data->out_transfer_size);
+
+        up(&file_data->limit_write_sem);
+        if (usb_anchor_empty(&file_data->submitted) || wakeup)
+                wake_up_interruptible(&file_data->data->waitq);
+}
+
+static ssize_t usbtmc_generic_write(struct usbtmc_file_data *file_data,
+                                    const void __user *user_buffer,
+                                    u32 transfer_size,
+                                    u32 *transferred,
+                                    u32 flags)
+{
+        struct usbtmc_device_data *data = file_data->data;
+        struct device *dev;
+        u32 done = 0;
+        u32 remaining;
+        unsigned long expire;
+        const u32 bufsize = USBTMC_BUFSIZE;
+        struct urb *urb = NULL;
+        int retval = 0;
+        u32 timeout;
+
+        *transferred = 0;
+
+        /* Get pointer to private data structure */
+        dev = &data->intf->dev;
+
+        dev_dbg(dev, "%s: size=%u flags=0x%X sema=%u\n",
+                __func__, transfer_size, flags,
+                file_data->limit_write_sem.count);
+
+        if (flags & USBTMC_FLAG_APPEND) {
+                spin_lock_irq(&file_data->err_lock);
+                retval = file_data->out_status;
+                spin_unlock_irq(&file_data->err_lock);
+                if (retval < 0)
+                        return retval;
+        } else {
+                spin_lock_irq(&file_data->err_lock);
+                file_data->out_transfer_size = 0;
+                file_data->out_status = 0;
+                spin_unlock_irq(&file_data->err_lock);
+        }
+
+        remaining = transfer_size;
+        if (remaining > INT_MAX)
+                remaining = INT_MAX;
+
+        timeout = file_data->timeout;
+        expire = msecs_to_jiffies(timeout);
+
+        while (remaining > 0) {
+                u32 this_part, aligned;
+                u8 *buffer = NULL;
+
+                if (flags & USBTMC_FLAG_ASYNC) {
+                        if (down_trylock(&file_data->limit_write_sem)) {
+                                retval = (done)?(0):(-EAGAIN);
+                                goto exit;
+                        }
+                } else {
+                        retval = down_timeout(&file_data->limit_write_sem,
+                                              expire);
+                        if (retval < 0) {
+                                retval = -ETIMEDOUT;
+                                goto error;
+                        }
+                }
+
+                spin_lock_irq(&file_data->err_lock);
+                retval = file_data->out_status;
+                spin_unlock_irq(&file_data->err_lock);
+                if (retval < 0) {
+                        up(&file_data->limit_write_sem);
+                        goto error;
+                }
+
+                /* prepare next urb to send */
+                urb = usbtmc_create_urb();
+                if (!urb) {
+                        retval = -ENOMEM;
+                        up(&file_data->limit_write_sem);
+                        goto error;
+                }
+                buffer = urb->transfer_buffer;
+
+                if (remaining > bufsize)
+                        this_part = bufsize;
+                else
+                        this_part = remaining;
+
+                if (copy_from_user(buffer, user_buffer + done, this_part)) {
+                        retval = -EFAULT;
+                        up(&file_data->limit_write_sem);
+                        goto error;
+                }
+
+                print_hex_dump_debug("usbtmc ", DUMP_PREFIX_NONE,
+                        16, 1, buffer, this_part, true);
+
+                /* fill bulk with 32 bit alignment to meet USBTMC specification
+                 * (size + 3 & ~3) rounds up and simplifies user code
+                 */
+                aligned = (this_part + 3) & ~3;
+                dev_dbg(dev, "write(size:%u align:%u done:%u)\n",
+                        (unsigned int)this_part,
+                        (unsigned int)aligned,
+                        (unsigned int)done);
+
+                usb_fill_bulk_urb(urb, data->usb_dev,
+                        usb_sndbulkpipe(data->usb_dev, data->bulk_out),
+                        urb->transfer_buffer, aligned,
+                        usbtmc_write_bulk_cb, file_data);
+
+                usb_anchor_urb(urb, &file_data->submitted);
+                retval = usb_submit_urb(urb, GFP_KERNEL);
+                if (unlikely(retval)) {
+                        usb_unanchor_urb(urb);
+                        up(&file_data->limit_write_sem);
+                        goto error;
+                }
+
+                usb_free_urb(urb);
+                urb = NULL; /* urb will be finally released by usb driver */
+
+                remaining -= this_part;
+                done += this_part;
+        }
+
+        /* All urbs are on the fly */
+        if (!(flags & USBTMC_FLAG_ASYNC)) {
+                if (!usb_wait_anchor_empty_timeout(&file_data->submitted,
+                                                   timeout)) {
+                        retval = -ETIMEDOUT;
+                        goto error;
+                }
+        }
+
+        retval = 0;
+        goto exit;
+
+error:
+        usb_kill_anchored_urbs(&file_data->submitted);
+exit:
+        usb_free_urb(urb);
+
+        spin_lock_irq(&file_data->err_lock);
+        if (!(flags & USBTMC_FLAG_ASYNC))
+                done = file_data->out_transfer_size;
+        if (!retval && file_data->out_status)
+                retval = file_data->out_status;
+        spin_unlock_irq(&file_data->err_lock);
+
+        *transferred = done;
+
+        dev_dbg(dev, "%s: done=%u, retval=%d, urbstat=%d\n",
+                __func__, done, retval, file_data->out_status);
+
+        return retval;
+}
+
+static ssize_t usbtmc_ioctl_generic_write(struct usbtmc_file_data *file_data,
+                                          void __user *arg)
+{
+        struct usbtmc_message msg;
+        ssize_t retval = 0;
+
+        /* mutex already locked */
+
+        if (copy_from_user(&msg, arg, sizeof(struct usbtmc_message)))
+                return -EFAULT;
+
+        retval = usbtmc_generic_write(file_data, msg.message,
+                                      msg.transfer_size, &msg.transferred,
+                                      msg.flags);
+
+        if (put_user(msg.transferred,
+                     &((struct usbtmc_message __user *)arg)->transferred))
+                return -EFAULT;
+
+        return retval;
+}
+
+/*
+ * Get the generic write result
+ */
+static ssize_t usbtmc_ioctl_write_result(struct usbtmc_file_data *file_data,
+                                void __user *arg)
+{
+        u32 transferred;
+        int retval;
+
+        spin_lock_irq(&file_data->err_lock);
+        transferred = file_data->out_transfer_size;
+        retval = file_data->out_status;
+        spin_unlock_irq(&file_data->err_lock);
+
+        if (put_user(transferred, (__u32 __user *)arg))
+                return -EFAULT;
+
+        return retval;
+}
+
 /*
  * Sends a REQUEST_DEV_DEP_MSG_IN message on the Bulk-OUT endpoint.
  * @transfer_size: number of bytes to request from the device.
@@ -619,7 +1277,7 @@ static int usbtmc488_ioctl_trigger(struct usbtmc_file_data *file_data)
  * Also updates bTag_last_write.
  */
 static int send_request_dev_dep_msg_in(struct usbtmc_file_data *file_data,
-                                       size_t transfer_size)
+                                       u32 transfer_size)
 {
         struct usbtmc_device_data *data = file_data->data;
         int retval;
@@ -662,12 +1320,11 @@ static int send_request_dev_dep_msg_in(struct usbtmc_file_data *file_data,
                 data->bTag++;
 
         kfree(buffer);
-        if (retval < 0) {
-                dev_err(&data->intf->dev, "usb_bulk_msg in send_request_dev_dep_msg_in() returned %d\n", retval);
-                return retval;
-        }
+        if (retval < 0)
+                dev_err(&data->intf->dev, "%s returned %d\n",
+                        __func__, retval);
 
-        return 0;
+        return retval;
 }
 
 static ssize_t usbtmc_read(struct file *filp, char __user *buf,
@@ -676,20 +1333,20 @@ static ssize_t usbtmc_read(struct file *filp, char __user *buf,
         struct usbtmc_file_data *file_data;
         struct usbtmc_device_data *data;
         struct device *dev;
+        const u32 bufsize = USBTMC_BUFSIZE;
         u32 n_characters;
         u8 *buffer;
         int actual;
-        size_t done;
-        size_t remaining;
+        u32 done = 0;
+        u32 remaining;
         int retval;
-        size_t this_part;
 
         /* Get pointer to private data structure */
         file_data = filp->private_data;
         data = file_data->data;
         dev = &data->intf->dev;
 
-        buffer = kmalloc(USBTMC_SIZE_IOBUFFER, GFP_KERNEL);
+        buffer = kmalloc(bufsize, GFP_KERNEL);
         if (!buffer)
                 return -ENOMEM;
 
@@ -699,124 +1356,116 @@ static ssize_t usbtmc_read(struct file *filp, char __user *buf,
                 goto exit;
         }
 
-        dev_dbg(dev, "usb_bulk_msg_in: count(%zu)\n", count);
+        if (count > INT_MAX)
+                count = INT_MAX;
+
+        dev_dbg(dev, "%s(count:%zu)\n", __func__, count);
 
         retval = send_request_dev_dep_msg_in(file_data, count);
 
         if (retval < 0) {
-                if (data->auto_abort)
+                if (file_data->auto_abort)
                         usbtmc_ioctl_abort_bulk_out(data);
                 goto exit;
         }
 
         /* Loop until we have fetched everything we requested */
         remaining = count;
-        this_part = remaining;
-        done = 0;
+        actual = 0;
 
-        while (remaining > 0) {
-                /* Send bulk URB */
-                retval = usb_bulk_msg(data->usb_dev,
-                                      usb_rcvbulkpipe(data->usb_dev,
-                                                      data->bulk_in),
-                                      buffer, USBTMC_SIZE_IOBUFFER, &actual,
-                                      file_data->timeout);
-
-                dev_dbg(dev, "usb_bulk_msg: retval(%u), done(%zu), remaining(%zu), actual(%d)\n", retval, done, remaining, actual);
+        /* Send bulk URB */
+        retval = usb_bulk_msg(data->usb_dev,
+                              usb_rcvbulkpipe(data->usb_dev,
+                                              data->bulk_in),
+                              buffer, bufsize, &actual,
+                              file_data->timeout);
 
-                /* Store bTag (in case we need to abort) */
-                data->bTag_last_read = data->bTag;
+        dev_dbg(dev, "%s: bulk_msg retval(%u), actual(%d)\n",
+                __func__, retval, actual);
 
-                if (retval < 0) {
-                        dev_dbg(dev, "Unable to read data, error %d\n", retval);
-                        if (data->auto_abort)
-                                usbtmc_ioctl_abort_bulk_in(data);
-                        goto exit;
-                }
-
-                /* Parse header in first packet */
-                if (done == 0) {
-                        /* Sanity checks for the header */
-                        if (actual < USBTMC_HEADER_SIZE) {
-                                dev_err(dev, "Device sent too small first packet: %u < %u\n", actual, USBTMC_HEADER_SIZE);
-                                if (data->auto_abort)
-                                        usbtmc_ioctl_abort_bulk_in(data);
-                                goto exit;
-                        }
+        /* Store bTag (in case we need to abort) */
+        data->bTag_last_read = data->bTag;
 
-                        if (buffer[0] != 2) {
-                                dev_err(dev, "Device sent reply with wrong MsgID: %u != 2\n", buffer[0]);
-                                if (data->auto_abort)
-                                        usbtmc_ioctl_abort_bulk_in(data);
-                                goto exit;
-                        }
+        if (retval < 0) {
+                if (file_data->auto_abort)
+                        usbtmc_ioctl_abort_bulk_in(data);
+                goto exit;
+        }
 
-                        if (buffer[1] != data->bTag_last_write) {
-                                dev_err(dev, "Device sent reply with wrong bTag: %u != %u\n", buffer[1], data->bTag_last_write);
-                                if (data->auto_abort)
-                                        usbtmc_ioctl_abort_bulk_in(data);
-                                goto exit;
-                        }
+        /* Sanity checks for the header */
+        if (actual < USBTMC_HEADER_SIZE) {
+                dev_err(dev, "Device sent too small first packet: %u < %u\n",
+                        actual, USBTMC_HEADER_SIZE);
+                if (file_data->auto_abort)
+                        usbtmc_ioctl_abort_bulk_in(data);
+                goto exit;
+        }
 
-                        /* How many characters did the instrument send? */
-                        n_characters = buffer[4] +
-                                       (buffer[5] << 8) +
-                                       (buffer[6] << 16) +
-                                       (buffer[7] << 24);
+        if (buffer[0] != 2) {
+                dev_err(dev, "Device sent reply with wrong MsgID: %u != 2\n",
+                        buffer[0]);
+                if (file_data->auto_abort)
+                        usbtmc_ioctl_abort_bulk_in(data);
+                goto exit;
+        }
 
-                        if (n_characters > this_part) {
-                                dev_err(dev, "Device wants to return more data than requested: %u > %zu\n", n_characters, count);
-                                if (data->auto_abort)
-                                        usbtmc_ioctl_abort_bulk_in(data);
-                                goto exit;
-                        }
+        if (buffer[1] != data->bTag_last_write) {
+                dev_err(dev, "Device sent reply with wrong bTag: %u != %u\n",
+                buffer[1], data->bTag_last_write);
+                if (file_data->auto_abort)
+                        usbtmc_ioctl_abort_bulk_in(data);
+                goto exit;
+        }
 
-                        /* Remove the USBTMC header */
-                        actual -= USBTMC_HEADER_SIZE;
+        /* How many characters did the instrument send? */
+        n_characters = buffer[4] +
+                       (buffer[5] << 8) +
+                       (buffer[6] << 16) +
+                       (buffer[7] << 24);
 
-                        /* Check if the message is smaller than requested */
-                        if (remaining > n_characters)
-                                remaining = n_characters;
-                        /* Remove padding if it exists */
-                        if (actual > remaining)
-                                actual = remaining;
+        file_data->bmTransferAttributes = buffer[8];
 
-                        dev_dbg(dev, "Bulk-IN header: N_characters(%u), bTransAttr(%u)\n", n_characters, buffer[8]);
+        dev_dbg(dev, "Bulk-IN header: N_characters(%u), bTransAttr(%u)\n",
+                n_characters, buffer[8]);
 
-                        remaining -= actual;
+        if (n_characters > remaining) {
+                dev_err(dev, "Device wants to return more data than requested: %u > %zu\n",
+                        n_characters, count);
+                if (file_data->auto_abort)
+                        usbtmc_ioctl_abort_bulk_in(data);
+                goto exit;
+        }
 
-                        /* Terminate if end-of-message bit received from device */
-                        if ((buffer[8] & 0x01) && (actual >= n_characters))
-                                remaining = 0;
+        print_hex_dump_debug("usbtmc ", DUMP_PREFIX_NONE,
+                             16, 1, buffer, actual, true);
 
-                        dev_dbg(dev, "Bulk-IN header: remaining(%zu), buf(%p), buffer(%p) done(%zu)\n", remaining,buf,buffer,done);
+        remaining = n_characters;
 
+        /* Remove the USBTMC header */
+        actual -= USBTMC_HEADER_SIZE;
 
-                        /* Copy buffer to user space */
-                        if (copy_to_user(buf + done, &buffer[USBTMC_HEADER_SIZE], actual)) {
-                                /* There must have been an addressing problem */
-                                retval = -EFAULT;
-                                goto exit;
-                        }
-                        done += actual;
-                }
-                else  {
-                        if (actual > remaining)
-                                actual = remaining;
+        /* Remove padding if it exists */
+        if (actual > remaining)
+                actual = remaining;
 
-                        remaining -= actual;
+        remaining -= actual;
 
-                        dev_dbg(dev, "Bulk-IN header cont: actual(%u), done(%zu), remaining(%zu), buf(%p), buffer(%p)\n", actual, done, remaining,buf,buffer);
+        /* Copy buffer to user space */
+        if (copy_to_user(buf, &buffer[USBTMC_HEADER_SIZE], actual)) {
+                /* There must have been an addressing problem */
+                retval = -EFAULT;
+                goto exit;
+        }
 
-                        /* Copy buffer to user space */
-                        if (copy_to_user(buf + done, buffer, actual)) {
-                                /* There must have been an addressing problem */
-                                retval = -EFAULT;
-                                goto exit;
-                        }
-                        done += actual;
-                }
+        if ((actual + USBTMC_HEADER_SIZE) == bufsize) {
+                retval = usbtmc_generic_read(file_data, buf + actual,
+                                             remaining,
+                                             &done,
+                                             USBTMC_FLAG_IGNORE_TRAILER);
+                if (retval < 0)
+                        goto exit;
         }
+        done += actual;
 
         /* Update file position value */
         *f_pos = *f_pos + done;
@@ -833,113 +1482,152 @@ static ssize_t usbtmc_write(struct file *filp, const char __user *buf,
 {
         struct usbtmc_file_data *file_data;
         struct usbtmc_device_data *data;
+        struct urb *urb = NULL;
+        ssize_t retval = 0;
         u8 *buffer;
-        int retval;
-        int actual;
-        unsigned long int n_bytes;
-        int remaining;
-        int done;
-        int this_part;
+        u32 remaining, done;
+        u32 transfersize, aligned, buflen;
 
         file_data = filp->private_data;
         data = file_data->data;
 
-        buffer = kmalloc(USBTMC_SIZE_IOBUFFER, GFP_KERNEL);
-        if (!buffer)
-                return -ENOMEM;
-
         mutex_lock(&data->io_mutex);
+
         if (data->zombie) {
                 retval = -ENODEV;
                 goto exit;
         }
 
-        remaining = count;
         done = 0;
 
-        while (remaining > 0) {
-                if (remaining > USBTMC_SIZE_IOBUFFER - USBTMC_HEADER_SIZE) {
-                        this_part = USBTMC_SIZE_IOBUFFER - USBTMC_HEADER_SIZE;
-                        buffer[8] = 0;
-                } else {
-                        this_part = remaining;
-                        buffer[8] = file_data->eom_val;
-                }
+        spin_lock_irq(&file_data->err_lock);
+        file_data->out_transfer_size = 0;
+        file_data->out_status = 0;
+        spin_unlock_irq(&file_data->err_lock);
 
-                /* Setup IO buffer for DEV_DEP_MSG_OUT message */
-                buffer[0] = 1;
-                buffer[1] = data->bTag;
-                buffer[2] = ~data->bTag;
-                buffer[3] = 0; /* Reserved */
-                buffer[4] = this_part >> 0;
-                buffer[5] = this_part >> 8;
-                buffer[6] = this_part >> 16;
-                buffer[7] = this_part >> 24;
-                /* buffer[8] is set above... */
-                buffer[9] = 0; /* Reserved */
-                buffer[10] = 0; /* Reserved */
-                buffer[11] = 0; /* Reserved */
-
-                if (copy_from_user(&buffer[USBTMC_HEADER_SIZE], buf + done, this_part)) {
-                        retval = -EFAULT;
-                        goto exit;
-                }
+        if (!count)
+                goto exit;
 
-                n_bytes = roundup(USBTMC_HEADER_SIZE + this_part, 4);
-                memset(buffer + USBTMC_HEADER_SIZE + this_part, 0, n_bytes - (USBTMC_HEADER_SIZE + this_part));
+        if (down_trylock(&file_data->limit_write_sem)) {
+                /* previous calls were async */
+                retval = -EBUSY;
+                goto exit;
+        }
 
-                do {
-                        retval = usb_bulk_msg(data->usb_dev,
-                                              usb_sndbulkpipe(data->usb_dev,
-                                                              data->bulk_out),
-                                              buffer, n_bytes,
-                                              &actual, file_data->timeout);
-                        if (retval != 0)
-                                break;
-                        n_bytes -= actual;
-                } while (n_bytes);
-
-                data->bTag_last_write = data->bTag;
+        urb = usbtmc_create_urb();
+        if (!urb) {
+                retval = -ENOMEM;
+                up(&file_data->limit_write_sem);
+                goto exit;
+        }
+
+        buffer = urb->transfer_buffer;
+        buflen = urb->transfer_buffer_length;
+
+        if (count > INT_MAX) {
+                transfersize = INT_MAX;
+                buffer[8] = 0;
+        } else {
+                transfersize = count;
+                buffer[8] = file_data->eom_val;
+        }
+
+        /* Setup IO buffer for DEV_DEP_MSG_OUT message */
+        buffer[0] = 1;
+        buffer[1] = data->bTag;
+        buffer[2] = ~data->bTag;
+        buffer[3] = 0; /* Reserved */
+        buffer[4] = transfersize >> 0;
+        buffer[5] = transfersize >> 8;
+        buffer[6] = transfersize >> 16;
+        buffer[7] = transfersize >> 24;
+        /* buffer[8] is set above... */
+        buffer[9] = 0; /* Reserved */
+        buffer[10] = 0; /* Reserved */
+        buffer[11] = 0; /* Reserved */
+
+        remaining = transfersize;
+
+        if (transfersize + USBTMC_HEADER_SIZE > buflen) {
+                transfersize = buflen - USBTMC_HEADER_SIZE;
+                aligned = buflen;
+        } else {
+                aligned = (transfersize + (USBTMC_HEADER_SIZE + 3)) & ~3;
+        }
+
+        if (copy_from_user(&buffer[USBTMC_HEADER_SIZE], buf, transfersize)) {
+                retval = -EFAULT;
+                up(&file_data->limit_write_sem);
+                goto exit;
+        }
+
+        dev_dbg(&data->intf->dev, "%s(size:%u align:%u)\n", __func__,
+                (unsigned int)transfersize, (unsigned int)aligned);
+
+        print_hex_dump_debug("usbtmc ", DUMP_PREFIX_NONE,
+                             16, 1, buffer, aligned, true);
+
+        usb_fill_bulk_urb(urb, data->usb_dev,
+                usb_sndbulkpipe(data->usb_dev, data->bulk_out),
+                urb->transfer_buffer, aligned,
+                usbtmc_write_bulk_cb, file_data);
+
+        usb_anchor_urb(urb, &file_data->submitted);
+        retval = usb_submit_urb(urb, GFP_KERNEL);
+        if (unlikely(retval)) {
+                usb_unanchor_urb(urb);
+                up(&file_data->limit_write_sem);
+                goto exit;
+        }
+
+        remaining -= transfersize;
+
+        data->bTag_last_write = data->bTag;
+        data->bTag++;
+
+        if (!data->bTag)
                 data->bTag++;
 
-                if (!data->bTag)
-                        data->bTag++;
+        /* call generic_write even when remaining = 0 */
+        retval = usbtmc_generic_write(file_data, buf + transfersize, remaining,
+                                      &done, USBTMC_FLAG_APPEND);
+        /* truncate alignment bytes */
+        if (done > remaining)
+                done = remaining;
 
-                if (retval < 0) {
-                        dev_err(&data->intf->dev,
-                                "Unable to send data, error %d\n", retval);
-                        if (data->auto_abort)
-                                usbtmc_ioctl_abort_bulk_out(data);
-                        goto exit;
-                }
+        /*add size of first urb*/
+        done += transfersize;
 
-                remaining -= this_part;
-                done += this_part;
+        if (retval < 0) {
+                usb_kill_anchored_urbs(&file_data->submitted);
+
+                dev_err(&data->intf->dev,
+                        "Unable to send data, error %d\n", (int)retval);
+                if (file_data->auto_abort)
+                        usbtmc_ioctl_abort_bulk_out(data);
+                goto exit;
         }
 
-        retval = count;
+        retval = done;
 exit:
+        usb_free_urb(urb);
         mutex_unlock(&data->io_mutex);
-        kfree(buffer);
         return retval;
 }
 
 static int usbtmc_ioctl_clear(struct usbtmc_device_data *data)
 {
-        struct usb_host_interface *current_setting;
-        struct usb_endpoint_descriptor *desc;
         struct device *dev;
         u8 *buffer;
         int rv;
         int n;
         int actual = 0;
-        int max_size;
 
         dev = &data->intf->dev;
 
         dev_dbg(dev, "Sending INITIATE_CLEAR request\n");
 
-        buffer = kmalloc(USBTMC_SIZE_IOBUFFER, GFP_KERNEL);
+        buffer = kmalloc(USBTMC_BUFSIZE, GFP_KERNEL);
         if (!buffer)
                 return -ENOMEM;
 
@@ -947,7 +1635,7 @@ static int usbtmc_ioctl_clear(struct usbtmc_device_data *data)
                              usb_rcvctrlpipe(data->usb_dev, 0),
                              USBTMC_REQUEST_INITIATE_CLEAR,
                              USB_DIR_IN | USB_TYPE_CLASS | USB_RECIP_INTERFACE,
-                             0, 0, buffer, 1, USBTMC_TIMEOUT);
+                             0, 0, buffer, 1, USB_CTRL_GET_TIMEOUT);
         if (rv < 0) {
                 dev_err(dev, "usb_control_msg returned %d\n", rv);
                 goto exit;
@@ -961,22 +1649,6 @@ static int usbtmc_ioctl_clear(struct usbtmc_device_data *data)
                 goto exit;
         }
 
-        max_size = 0;
-        current_setting = data->intf->cur_altsetting;
-        for (n = 0; n < current_setting->desc.bNumEndpoints; n++) {
-                desc = &current_setting->endpoint[n].desc;
-                if (desc->bEndpointAddress == data->bulk_in)
-                        max_size = usb_endpoint_maxp(desc);
-        }
-
-        if (max_size == 0) {
-                dev_err(dev, "Couldn't get wMaxPacketSize\n");
-                rv = -EPERM;
-                goto exit;
-        }
-
-        dev_dbg(dev, "wMaxPacketSize is %d\n", max_size);
-
         n = 0;
 
 usbtmc_clear_check_status:
@@ -987,7 +1659,7 @@ usbtmc_clear_check_status:
                              usb_rcvctrlpipe(data->usb_dev, 0),
                              USBTMC_REQUEST_CHECK_CLEAR_STATUS,
                              USB_DIR_IN | USB_TYPE_CLASS | USB_RECIP_INTERFACE,
-                             0, 0, buffer, 2, USBTMC_TIMEOUT);
+                             0, 0, buffer, 2, USB_CTRL_GET_TIMEOUT);
         if (rv < 0) {
                 dev_err(dev, "usb_control_msg returned %d\n", rv);
                 goto exit;
@@ -1004,15 +1676,20 @@ usbtmc_clear_check_status:
                 goto exit;
         }
 
-        if (buffer[1] == 1)
+        if ((buffer[1] & 1) != 0) {
                 do {
                         dev_dbg(dev, "Reading from bulk in EP\n");
 
+                        actual = 0;
                         rv = usb_bulk_msg(data->usb_dev,
                                           usb_rcvbulkpipe(data->usb_dev,
                                                           data->bulk_in),
-                                          buffer, USBTMC_SIZE_IOBUFFER,
-                                          &actual, USBTMC_TIMEOUT);
+                                          buffer, USBTMC_BUFSIZE,
+                                          &actual, USB_CTRL_GET_TIMEOUT);
+
+                        print_hex_dump_debug("usbtmc ", DUMP_PREFIX_NONE,
+                                             16, 1, buffer, actual, true);
+
                         n++;
 
                         if (rv < 0) {
@@ -1020,10 +1697,15 @@ usbtmc_clear_check_status:
                                         rv);
                                 goto exit;
                         }
-                } while ((actual == max_size) &&
+                } while ((actual == USBTMC_BUFSIZE) &&
                           (n < USBTMC_MAX_READS_TO_CLEAR_BULK_IN));
+        } else {
+                /* do not stress device with subsequent requests */
+                msleep(50);
+                n++;
+        }
 
-        if (actual == max_size) {
+        if (n >= USBTMC_MAX_READS_TO_CLEAR_BULK_IN) {
                 dev_err(dev, "Couldn't clear device buffer within %d cycles\n",
                         USBTMC_MAX_READS_TO_CLEAR_BULK_IN);
                 rv = -EPERM;
@@ -1037,7 +1719,7 @@ usbtmc_clear_bulk_out_halt:
         rv = usb_clear_halt(data->usb_dev,
                             usb_sndbulkpipe(data->usb_dev, data->bulk_out));
         if (rv < 0) {
-                dev_err(dev, "usb_control_msg returned %d\n", rv);
+                dev_err(dev, "usb_clear_halt returned %d\n", rv);
                 goto exit;
         }
         rv = 0;
@@ -1054,12 +1736,9 @@ static int usbtmc_ioctl_clear_out_halt(struct usbtmc_device_data *data)
         rv = usb_clear_halt(data->usb_dev,
                             usb_sndbulkpipe(data->usb_dev, data->bulk_out));
 
-        if (rv < 0) {
-                dev_err(&data->usb_dev->dev, "usb_control_msg returned %d\n",
-                        rv);
-                return rv;
-        }
-        return 0;
+        if (rv < 0)
+                dev_err(&data->usb_dev->dev, "%s returned %d\n", __func__, rv);
+        return rv;
 }
 
 static int usbtmc_ioctl_clear_in_halt(struct usbtmc_device_data *data)
@@ -1069,11 +1748,33 @@ static int usbtmc_ioctl_clear_in_halt(struct usbtmc_device_data *data)
         rv = usb_clear_halt(data->usb_dev,
                             usb_rcvbulkpipe(data->usb_dev, data->bulk_in));
 
-        if (rv < 0) {
-                dev_err(&data->usb_dev->dev, "usb_control_msg returned %d\n",
-                        rv);
-                return rv;
-        }
+        if (rv < 0)
+                dev_err(&data->usb_dev->dev, "%s returned %d\n", __func__, rv);
+        return rv;
+}
+
+static int usbtmc_ioctl_cancel_io(struct usbtmc_file_data *file_data)
+{
+        spin_lock_irq(&file_data->err_lock);
+        file_data->in_status = -ECANCELED;
+        file_data->out_status = -ECANCELED;
+        spin_unlock_irq(&file_data->err_lock);
+        usb_kill_anchored_urbs(&file_data->submitted);
+        return 0;
+}
+
+static int usbtmc_ioctl_cleanup_io(struct usbtmc_file_data *file_data)
+{
+        usb_kill_anchored_urbs(&file_data->submitted);
+        usb_scuttle_anchored_urbs(&file_data->in_anchor);
+        spin_lock_irq(&file_data->err_lock);
+        file_data->in_status = 0;
+        file_data->in_transfer_size = 0;
+        file_data->out_status = 0;
+        file_data->out_transfer_size = 0;
+        spin_unlock_irq(&file_data->err_lock);
+
+        file_data->in_urbs_used = 0;
         return 0;
 }
 
@@ -1090,7 +1791,7 @@ static int get_capabilities(struct usbtmc_device_data *data)
         rv = usb_control_msg(data->usb_dev, usb_rcvctrlpipe(data->usb_dev, 0),
                              USBTMC_REQUEST_GET_CAPABILITIES,
                              USB_DIR_IN | USB_TYPE_CLASS | USB_RECIP_INTERFACE,
-                             0, 0, buffer, 0x18, USBTMC_TIMEOUT);
+                             0, 0, buffer, 0x18, USB_CTRL_GET_TIMEOUT);
         if (rv < 0) {
                 dev_err(dev, "usb_control_msg returned %d\n", rv);
                 goto err_out;
@@ -1147,72 +1848,6 @@ static const struct attribute_group capability_attr_grp = {
         .attrs = capability_attrs,
 };
 
-static ssize_t TermChar_show(struct device *dev,
-                             struct device_attribute *attr, char *buf)
-{
-        struct usb_interface *intf = to_usb_interface(dev);
-        struct usbtmc_device_data *data = usb_get_intfdata(intf);
-
-        return sprintf(buf, "%c\n", data->TermChar);
-}
-
-static ssize_t TermChar_store(struct device *dev,
-                              struct device_attribute *attr,
-                              const char *buf, size_t count)
-{
-        struct usb_interface *intf = to_usb_interface(dev);
-        struct usbtmc_device_data *data = usb_get_intfdata(intf);
-
-        if (count < 1)
-                return -EINVAL;
-        data->TermChar = buf[0];
-        return count;
-}
-static DEVICE_ATTR_RW(TermChar);
-
-#define data_attribute(name)                                            \
-static ssize_t name##_show(struct device *dev,                          \
-                           struct device_attribute *attr, char *buf)    \
-{                                                                       \
-        struct usb_interface *intf = to_usb_interface(dev);             \
-        struct usbtmc_device_data *data = usb_get_intfdata(intf);       \
-                                                                        \
-        return sprintf(buf, "%d\n", data->name);                        \
-}                                                                       \
-static ssize_t name##_store(struct device *dev,                         \
-                            struct device_attribute *attr,              \
-                            const char *buf, size_t count)              \
-{                                                                       \
-        struct usb_interface *intf = to_usb_interface(dev);             \
-        struct usbtmc_device_data *data = usb_get_intfdata(intf);       \
-        ssize_t result;                                                 \
-        unsigned val;                                                   \
-                                                                        \
-        result = sscanf(buf, "%u\n", &val);                             \
-        if (result != 1)                                                \
-                result = -EINVAL;                                       \
-        data->name = val;                                               \
-        if (result < 0)                                                 \
-                return result;                                          \
-        else                                                            \
-                return count;                                           \
-}                                                                       \
-static DEVICE_ATTR_RW(name)
-
-data_attribute(TermCharEnabled);
-data_attribute(auto_abort);
-
-static struct attribute *data_attrs[] = {
-        &dev_attr_TermChar.attr,
-        &dev_attr_TermCharEnabled.attr,
-        &dev_attr_auto_abort.attr,
-        NULL,
-};
-
-static const struct attribute_group data_attr_grp = {
-        .attrs = data_attrs,
-};
-
 static int usbtmc_ioctl_indicator_pulse(struct usbtmc_device_data *data)
 {
         struct device *dev;
@@ -1229,7 +1864,7 @@ static int usbtmc_ioctl_indicator_pulse(struct usbtmc_device_data *data)
                              usb_rcvctrlpipe(data->usb_dev, 0),
                              USBTMC_REQUEST_INDICATOR_PULSE,
                              USB_DIR_IN | USB_TYPE_CLASS | USB_RECIP_INTERFACE,
-                             0, 0, buffer, 0x01, USBTMC_TIMEOUT);
+                             0, 0, buffer, 0x01, USB_CTRL_GET_TIMEOUT);
 
         if (rv < 0) {
                 dev_err(dev, "usb_control_msg returned %d\n", rv);
@@ -1250,6 +1885,63 @@ exit:
         return rv;
 }
 
+static int usbtmc_ioctl_request(struct usbtmc_device_data *data,
+                                void __user *arg)
+{
+        struct device *dev = &data->intf->dev;
+        struct usbtmc_ctrlrequest request;
+        u8 *buffer = NULL;
+        int rv;
+        unsigned long res;
+
+        res = copy_from_user(&request, arg, sizeof(struct usbtmc_ctrlrequest));
+        if (res)
+                return -EFAULT;
+
+        if (request.req.wLength > USBTMC_BUFSIZE)
+                return -EMSGSIZE;
+
+        if (request.req.wLength) {
+                buffer = kmalloc(request.req.wLength, GFP_KERNEL);
+                if (!buffer)
+                        return -ENOMEM;
+
+                if ((request.req.bRequestType & USB_DIR_IN) == 0) {
+                        /* Send control data to device */
+                        res = copy_from_user(buffer, request.data,
+                                             request.req.wLength);
+                        if (res) {
+                                rv = -EFAULT;
+                                goto exit;
+                        }
+                }
+        }
+
+        rv = usb_control_msg(data->usb_dev,
+                        usb_rcvctrlpipe(data->usb_dev, 0),
+                        request.req.bRequest,
+                        request.req.bRequestType,
+                        request.req.wValue,
+                        request.req.wIndex,
+                        buffer, request.req.wLength, USB_CTRL_GET_TIMEOUT);
+
+        if (rv < 0) {
+                dev_err(dev, "%s failed %d\n", __func__, rv);
+                goto exit;
+        }
+
+        if (rv && (request.req.bRequestType & USB_DIR_IN)) {
+                /* Read control data from device */
+                res = copy_to_user(request.data, buffer, rv);
+                if (res)
+                        rv = -EFAULT;
+        }
+
+ exit:
+        kfree(buffer);
+        return rv;
+}
+
 /*
  * Get the usb timeout value
  */
@@ -1331,6 +2023,7 @@ static long usbtmc_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
         struct usbtmc_file_data *file_data;
         struct usbtmc_device_data *data;
         int retval = -EBADRQC;
+        __u8 tmp_byte;
 
         file_data = file->private_data;
         data = file_data->data;
@@ -1366,6 +2059,10 @@ static long usbtmc_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
                 retval = usbtmc_ioctl_abort_bulk_in(data);
                 break;
 
+        case USBTMC_IOCTL_CTRL_REQUEST:
+                retval = usbtmc_ioctl_request(data, (void __user *)arg);
+                break;
+
         case USBTMC_IOCTL_GET_TIMEOUT:
                 retval = usbtmc_ioctl_get_timeout(file_data,
                                                   (void __user *)arg);
@@ -1386,12 +2083,29 @@ static long usbtmc_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
                                                    (void __user *)arg);
                 break;
 
+        case USBTMC_IOCTL_WRITE:
+                retval = usbtmc_ioctl_generic_write(file_data,
+                                                    (void __user *)arg);
+                break;
+
+        case USBTMC_IOCTL_READ:
+                retval = usbtmc_ioctl_generic_read(file_data,
+                                                   (void __user *)arg);
+                break;
+
+        case USBTMC_IOCTL_WRITE_RESULT:
+                retval = usbtmc_ioctl_write_result(file_data,
+                                                   (void __user *)arg);
+                break;
+
+        case USBTMC_IOCTL_API_VERSION:
+                retval = put_user(USBTMC_API_VERSION,
+                                  (__u32 __user *)arg);
+                break;
+
         case USBTMC488_IOCTL_GET_CAPS:
-                retval = copy_to_user((void __user *)arg,
-                                &data->usb488_caps,
-                                sizeof(data->usb488_caps));
-                if (retval)
-                        retval = -EFAULT;
+                retval = put_user(data->usb488_caps,
+                                  (unsigned char __user *)arg);
                 break;
 
         case USBTMC488_IOCTL_READ_STB:
@@ -1417,6 +2131,30 @@ static long usbtmc_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
         case USBTMC488_IOCTL_TRIGGER:
                 retval = usbtmc488_ioctl_trigger(file_data);
                 break;
+
+        case USBTMC488_IOCTL_WAIT_SRQ:
+                retval = usbtmc488_ioctl_wait_srq(file_data,
+                                                  (__u32 __user *)arg);
+                break;
+
+        case USBTMC_IOCTL_MSG_IN_ATTR:
+                retval = put_user(file_data->bmTransferAttributes,
+                                  (__u8 __user *)arg);
+                break;
+
+        case USBTMC_IOCTL_AUTO_ABORT:
+                retval = get_user(tmp_byte, (unsigned char __user *)arg);
+                if (retval == 0)
+                        file_data->auto_abort = !!tmp_byte;
+                break;
+
+        case USBTMC_IOCTL_CANCEL_IO:
+                retval = usbtmc_ioctl_cancel_io(file_data);
+                break;
+
+        case USBTMC_IOCTL_CLEANUP_IO:
+                retval = usbtmc_ioctl_cleanup_io(file_data);
+                break;
         }
 
 skip_io_on_zombie:
@@ -1446,7 +2184,28 @@ static __poll_t usbtmc_poll(struct file *file, poll_table *wait)
 
         poll_wait(file, &data->waitq, wait);
 
-        mask = (atomic_read(&file_data->srq_asserted)) ? EPOLLPRI : 0;
+        /* Note that EPOLLPRI is now assigned to SRQ, and
+         * EPOLLIN|EPOLLRDNORM to normal read data.
+         */
+        mask = 0;
+        if (atomic_read(&file_data->srq_asserted))
+                mask |= EPOLLPRI;
+
+        /* Note that the anchor submitted includes all urbs for BULK IN
+         * and OUT. So EPOLLOUT is signaled when BULK OUT is empty and
+         * all BULK IN urbs are completed and moved to in_anchor.
+         */
+        if (usb_anchor_empty(&file_data->submitted))
+                mask |= (EPOLLOUT | EPOLLWRNORM);
+        if (!usb_anchor_empty(&file_data->in_anchor))
+                mask |= (EPOLLIN | EPOLLRDNORM);
+
+        spin_lock_irq(&file_data->err_lock);
+        if (file_data->in_status || file_data->out_status)
+                mask |= EPOLLERR;
+        spin_unlock_irq(&file_data->err_lock);
+
+        dev_dbg(&data->intf->dev, "poll mask = %x\n", mask);
 
 no_poll:
         mutex_unlock(&data->io_mutex);
@@ -1459,6 +2218,7 @@ static const struct file_operations fops = {
         .write          = usbtmc_write,
         .open           = usbtmc_open,
         .release        = usbtmc_release,
+        .flush          = usbtmc_flush,
         .unlocked_ioctl = usbtmc_ioctl,
 #ifdef CONFIG_COMPAT
         .compat_ioctl   = usbtmc_ioctl,
@@ -1552,7 +2312,9 @@ static void usbtmc_free_int(struct usbtmc_device_data *data)
                 return;
         usb_kill_urb(data->iin_urb);
         kfree(data->iin_buffer);
+        data->iin_buffer = NULL;
         usb_free_urb(data->iin_urb);
+        data->iin_urb = NULL;
         kref_put(&data->kref, usbtmc_delete);
 }
 
@@ -1585,8 +2347,6 @@ static int usbtmc_probe(struct usb_interface *intf,
 
         /* Initialize USBTMC bTag and other fields */
         data->bTag      = 1;
-        data->TermCharEnabled = 0;
-        data->TermChar = '\n';
         /*  2 <= bTag <= 127   USBTMC-USB488 subclass specification 4.3.1 */
         data->iin_bTag = 2;
 
@@ -1603,6 +2363,7 @@ static int usbtmc_probe(struct usb_interface *intf,
         }
 
         data->bulk_in = bulk_in->bEndpointAddress;
+        data->wMaxPacketSize = usb_endpoint_maxp(bulk_in);
         dev_dbg(&intf->dev, "Found bulk in endpoint at %u\n", data->bulk_in);
 
         data->bulk_out = bulk_out->bEndpointAddress;
@@ -1659,12 +2420,10 @@ static int usbtmc_probe(struct usb_interface *intf,
                 }
         }
 
-        retcode = sysfs_create_group(&intf->dev.kobj, &data_attr_grp);
-
         retcode = usb_register_dev(intf, &usbtmc_class);
         if (retcode) {
-                dev_err(&intf->dev, "Not able to get a minor"
-                        " (base %u, slice default): %d\n", USBTMC_MINOR_BASE,
+                dev_err(&intf->dev, "Not able to get a minor (base %u, slice default): %d\n",
+                        USBTMC_MINOR_BASE,
                         retcode);
                 goto error_register;
         }
@@ -1674,7 +2433,6 @@ static int usbtmc_probe(struct usb_interface *intf,
 
 error_register:
         sysfs_remove_group(&intf->dev.kobj, &capability_attr_grp);
-        sysfs_remove_group(&intf->dev.kobj, &data_attr_grp);
         usbtmc_free_int(data);
 err_put:
         kref_put(&data->kref, usbtmc_delete);
@@ -1684,26 +2442,103 @@ err_put:
 static void usbtmc_disconnect(struct usb_interface *intf)
 {
         struct usbtmc_device_data *data  = usb_get_intfdata(intf);
+        struct list_head *elem;
 
         usb_deregister_dev(intf, &usbtmc_class);
         sysfs_remove_group(&intf->dev.kobj, &capability_attr_grp);
-        sysfs_remove_group(&intf->dev.kobj, &data_attr_grp);
         mutex_lock(&data->io_mutex);
         data->zombie = 1;
         wake_up_interruptible_all(&data->waitq);
+        list_for_each(elem, &data->file_list) {
+                struct usbtmc_file_data *file_data;
+
+                file_data = list_entry(elem,
+                                       struct usbtmc_file_data,
+                                       file_elem);
+                usb_kill_anchored_urbs(&file_data->submitted);
+                usb_scuttle_anchored_urbs(&file_data->in_anchor);
+        }
         mutex_unlock(&data->io_mutex);
         usbtmc_free_int(data);
         kref_put(&data->kref, usbtmc_delete);
 }
 
+static void usbtmc_draw_down(struct usbtmc_file_data *file_data)
+{
+        int time;
+
+        time = usb_wait_anchor_empty_timeout(&file_data->submitted, 1000);
+        if (!time)
+                usb_kill_anchored_urbs(&file_data->submitted);
+        usb_scuttle_anchored_urbs(&file_data->in_anchor);
+}
+
 static int usbtmc_suspend(struct usb_interface *intf, pm_message_t message)
 {
-        /* this driver does not have pending URBs */
+        struct usbtmc_device_data *data = usb_get_intfdata(intf);
+        struct list_head *elem;
+
+        if (!data)
+                return 0;
+
+        mutex_lock(&data->io_mutex);
+        list_for_each(elem, &data->file_list) {
+                struct usbtmc_file_data *file_data;
+
+                file_data = list_entry(elem,
+                                       struct usbtmc_file_data,
+                                       file_elem);
+                usbtmc_draw_down(file_data);
+        }
+
+        if (data->iin_ep_present && data->iin_urb)
+                usb_kill_urb(data->iin_urb);
+
+        mutex_unlock(&data->io_mutex);
         return 0;
 }
 
 static int usbtmc_resume(struct usb_interface *intf)
 {
+        struct usbtmc_device_data *data = usb_get_intfdata(intf);
+        int retcode = 0;
+
+        if (data->iin_ep_present && data->iin_urb)
+                retcode = usb_submit_urb(data->iin_urb, GFP_KERNEL);
+        if (retcode)
+                dev_err(&intf->dev, "Failed to submit iin_urb\n");
+
+        return retcode;
+}
+
+static int usbtmc_pre_reset(struct usb_interface *intf)
+{
+        struct usbtmc_device_data *data  = usb_get_intfdata(intf);
+        struct list_head *elem;
+
+        if (!data)
+                return 0;
+
+        mutex_lock(&data->io_mutex);
+
+        list_for_each(elem, &data->file_list) {
+                struct usbtmc_file_data *file_data;
+
+                file_data = list_entry(elem,
+                                       struct usbtmc_file_data,
+                                       file_elem);
+                usbtmc_ioctl_cancel_io(file_data);
+        }
+
+        return 0;
+}
+
+static int usbtmc_post_reset(struct usb_interface *intf)
+{
+        struct usbtmc_device_data *data  = usb_get_intfdata(intf);
+
+        mutex_unlock(&data->io_mutex);
+
         return 0;
 }
 
@@ -1714,6 +2549,8 @@ static struct usb_driver usbtmc_driver = {
         .disconnect     = usbtmc_disconnect,
         .suspend        = usbtmc_suspend,
         .resume         = usbtmc_resume,
+        .pre_reset      = usbtmc_pre_reset,
+        .post_reset     = usbtmc_post_reset,
 };
 
 module_usb_driver(usbtmc_driver);
diff --git a/drivers/usb/core/buffer.c b/drivers/usb/core/buffer.c
index 77eef8acff94..f641342cdec0 100644
--- a/drivers/usb/core/buffer.c
+++ b/drivers/usb/core/buffer.c
@@ -101,12 +101,8 @@ void hcd_buffer_destroy(struct usb_hcd *hcd)
                 return;
 
         for (i = 0; i < HCD_BUFFER_POOLS; i++) {
-                struct dma_pool *pool = hcd->pool[i];
-
-                if (pool) {
-                        dma_pool_destroy(pool);
-                        hcd->pool[i] = NULL;
-                }
+                dma_pool_destroy(hcd->pool[i]);
+                hcd->pool[i] = NULL;
         }
 }
 
diff --git a/drivers/usb/core/driver.c b/drivers/usb/core/driver.c
index a1f225f077cd..53564386ed57 100644
--- a/drivers/usb/core/driver.c
+++ b/drivers/usb/core/driver.c
@@ -510,7 +510,6 @@ int usb_driver_claim_interface(struct usb_driver *driver,
                                 struct usb_interface *iface, void *priv)
 {
         struct device *dev;
-        struct usb_device *udev;
         int retval = 0;
 
         if (!iface)
@@ -524,8 +523,6 @@ int usb_driver_claim_interface(struct usb_driver *driver,
         if (!iface->authorized)
                 return -ENODEV;
 
-        udev = interface_to_usbdev(iface);
-
         dev->driver = &driver->drvwrap.driver;
         usb_set_intfdata(iface, priv);
         iface->needs_binding = 0;
diff --git a/drivers/usb/core/generic.c b/drivers/usb/core/generic.c
index bc8242bc4564..356b05c82dbc 100644
--- a/drivers/usb/core/generic.c
+++ b/drivers/usb/core/generic.c
@@ -21,6 +21,7 @@
 
 #include <linux/usb.h>
 #include <linux/usb/hcd.h>
+#include <uapi/linux/usb/audio.h>
 #include "usb.h"
 
 static inline const char *plural(int n)
@@ -42,6 +43,16 @@ static int is_activesync(struct usb_interface_descriptor *desc)
                 && desc->bInterfaceProtocol == 1;
 }
 
+static bool is_audio(struct usb_interface_descriptor *desc)
+{
+        return desc->bInterfaceClass == USB_CLASS_AUDIO;
+}
+
+static bool is_uac3_config(struct usb_interface_descriptor *desc)
+{
+        return desc->bInterfaceProtocol == UAC_VERSION_3;
+}
+
 int usb_choose_configuration(struct usb_device *udev)
 {
         int i;
@@ -121,6 +132,22 @@ int usb_choose_configuration(struct usb_device *udev)
 #endif
                 }
 
+                /*
+                 * Select first configuration as default for audio so that
+                 * devices that don't comply with UAC3 protocol are supported.
+                 * But, still iterate through other configurations and
+                 * select UAC3 compliant config if present.
+                 */
+                if (i == 0 && num_configs > 1 && desc && is_audio(desc)) {
+                        best = c;
+                        continue;
+                }
+
+                if (i > 0 && desc && is_audio(desc) && is_uac3_config(desc)) {
+                        best = c;
+                        break;
+                }
+
                 /* From the remaining configs, choose the first one whose
                  * first interface is for a non-vendor-specific class.
                  * Reason: Linux is more likely to have a class driver
diff --git a/drivers/usb/core/hcd.c b/drivers/usb/core/hcd.c
index 1c21955fe7c0..487025d31d44 100644
--- a/drivers/usb/core/hcd.c
+++ b/drivers/usb/core/hcd.c
@@ -1738,7 +1738,6 @@ static void __usb_hcd_giveback_urb(struct urb *urb)
         struct usb_hcd *hcd = bus_to_hcd(urb->dev->bus);
         struct usb_anchor *anchor = urb->anchor;
         int status = urb->unlinked;
-        unsigned long flags;
 
         urb->hcpriv = NULL;
         if (unlikely((urb->transfer_flags & URB_SHORT_NOT_OK) &&
@@ -1755,20 +1754,7 @@ static void __usb_hcd_giveback_urb(struct urb *urb)
 
         /* pass ownership to the completion handler */
         urb->status = status;
-
-        /*
-         * We disable local IRQs here avoid possible deadlock because
-         * drivers may call spin_lock() to hold lock which might be
-         * acquired in one hard interrupt handler.
-         *
-         * The local_irq_save()/local_irq_restore() around complete()
-         * will be removed if current USB drivers have been cleaned up
-         * and no one may trigger the above deadlock situation when
-         * running complete() in tasklet.
-         */
-        local_irq_save(flags);
         urb->complete(urb);
-        local_irq_restore(flags);
 
         usb_anchor_resume_wakeups(anchor);
         atomic_dec(&urb->use_count);
diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c
index 462ce49f683a..c6077d582d29 100644
--- a/drivers/usb/core/hub.c
+++ b/drivers/usb/core/hub.c
@@ -28,6 +28,7 @@
 #include <linux/mutex.h>
 #include <linux/random.h>
 #include <linux/pm_qos.h>
+#include <linux/kobject.h>
 
 #include <linux/uaccess.h>
 #include <asm/byteorder.h>
@@ -2660,11 +2661,13 @@ static bool use_new_scheme(struct usb_device *udev, int retry,
 {
         int old_scheme_first_port =
                 port_dev->quirks & USB_PORT_QUIRK_OLD_SCHEME;
+        int quick_enumeration = (udev->speed == USB_SPEED_HIGH);
 
         if (udev->speed >= USB_SPEED_SUPER)
                 return false;
 
-        return USE_NEW_SCHEME(retry, old_scheme_first_port || old_scheme_first);
+        return USE_NEW_SCHEME(retry, old_scheme_first_port || old_scheme_first
+                              || quick_enumeration);
 }
 
 /* Is a USB 3.0 port in the Inactive or Compliance Mode state?
@@ -5147,6 +5150,42 @@ static void hub_port_connect_change(struct usb_hub *hub, int port1,
         usb_lock_port(port_dev);
 }
 
+/* Handle notifying userspace about hub over-current events */
+static void port_over_current_notify(struct usb_port *port_dev)
+{
+        static char *envp[] = { NULL, NULL, NULL };
+        struct device *hub_dev;
+        char *port_dev_path;
+
+        sysfs_notify(&port_dev->dev.kobj, NULL, "over_current_count");
+
+        hub_dev = port_dev->dev.parent;
+
+        if (!hub_dev)
+                return;
+
+        port_dev_path = kobject_get_path(&port_dev->dev.kobj, GFP_KERNEL);
+        if (!port_dev_path)
+                return;
+
+        envp[0] = kasprintf(GFP_KERNEL, "OVER_CURRENT_PORT=%s", port_dev_path);
+        if (!envp[0])
+                goto exit_path;
+
+        envp[1] = kasprintf(GFP_KERNEL, "OVER_CURRENT_COUNT=%u",
+                        port_dev->over_current_count);
+        if (!envp[1])
+                goto exit;
+
+        kobject_uevent_env(&hub_dev->kobj, KOBJ_CHANGE, envp);
+
+        kfree(envp[1]);
+exit:
+        kfree(envp[0]);
+exit_path:
+        kfree(port_dev_path);
+}
+
 static void port_event(struct usb_hub *hub, int port1)
                 __must_hold(&port_dev->status_lock)
 {
@@ -5189,6 +5228,7 @@ static void port_event(struct usb_hub *hub, int port1)
         if (portchange & USB_PORT_STAT_C_OVERCURRENT) {
                 u16 status = 0, unused;
                 port_dev->over_current_count++;
+                port_over_current_notify(port_dev);
 
                 dev_dbg(&port_dev->dev, "over-current change #%u\n",
                         port_dev->over_current_count);
diff --git a/drivers/usb/core/phy.c b/drivers/usb/core/phy.c
index 9879767452a2..38b2c776c4b4 100644
--- a/drivers/usb/core/phy.c
+++ b/drivers/usb/core/phy.c
@@ -23,10 +23,11 @@ static int usb_phy_roothub_add_phy(struct device *dev, int index,
                                    struct list_head *list)
 {
         struct usb_phy_roothub *roothub_entry;
-        struct phy *phy = devm_of_phy_get_by_index(dev, dev->of_node, index);
+        struct phy *phy;
 
-        if (IS_ERR_OR_NULL(phy)) {
-                if (!phy || PTR_ERR(phy) == -ENODEV)
+        phy = devm_of_phy_get_by_index(dev, dev->of_node, index);
+        if (IS_ERR(phy)) {
+                if (PTR_ERR(phy) == -ENODEV)
                         return 0;
                 else
                         return PTR_ERR(phy);
diff --git a/drivers/usb/core/port.c b/drivers/usb/core/port.c
index 4a2143195395..1a06a4b5fbb1 100644
--- a/drivers/usb/core/port.c
+++ b/drivers/usb/core/port.c
@@ -16,6 +16,15 @@ static int usb_port_block_power_off;
 
 static const struct attribute_group *port_dev_group[];
 
+static ssize_t location_show(struct device *dev,
+                             struct device_attribute *attr, char *buf)
+{
+        struct usb_port *port_dev = to_usb_port(dev);
+
+        return sprintf(buf, "0x%08x\n", port_dev->location);
+}
+static DEVICE_ATTR_RO(location);
+
 static ssize_t connect_type_show(struct device *dev,
                                  struct device_attribute *attr, char *buf)
 {
@@ -140,6 +149,7 @@ static DEVICE_ATTR_RW(usb3_lpm_permit);
 
 static struct attribute *port_dev_attrs[] = {
         &dev_attr_connect_type.attr,
+        &dev_attr_location.attr,
         &dev_attr_quirks.attr,
         &dev_attr_over_current_count.attr,
         NULL,
diff --git a/drivers/usb/dwc2/core.h b/drivers/usb/dwc2/core.h
index cc9c93affa14..30bab8463c96 100644
--- a/drivers/usb/dwc2/core.h
+++ b/drivers/usb/dwc2/core.h
@@ -393,6 +393,20 @@ enum dwc2_ep0_state {
  *                      0 - No
  *                      1 - Yes
  * @hird_threshold:     Value of BESL or HIRD Threshold.
+ * @ref_clk_per:        Indicates in terms of pico seconds the period
+ *                      of ref_clk.
+ *                      62500 - 16MHz
+ *                      58823 - 17MHz
+ *                      52083 - 19.2MHz
+ *                      50000 - 20MHz
+ *                      41666 - 24MHz
+ *                      33333 - 30MHz (default)
+ *                      25000 - 40MHz
+ * @sof_cnt_wkup_alert: Indicates in term of number of SOF's after which
+ *                      the controller should generate an interrupt if the
+ *                      device had been in L1 state until that period.
+ *                      This is used by SW to initiate Remote WakeUp in the
+ *                      controller so as to sync to the uF number from the host.
  * @activate_stm_fs_transceiver: Activate internal transceiver using GGPIO
  *                      register.
  *                      0 - Deactivate the transceiver (default)
@@ -416,6 +430,9 @@ enum dwc2_ep0_state {
  *                      back to DWC2_SPEED_PARAM_HIGH while device is gone.
  *                      0 - No (default)
  *                      1 - Yes
+ * @service_interval:   Enable service interval based scheduling.
+ *                      0 - No
+ *                      1 - Yes
  *
  * The following parameters may be specified when starting the module. These
  * parameters define how the DWC_otg controller should be configured. A
@@ -461,6 +478,7 @@ struct dwc2_core_params {
         bool lpm_clock_gating;
         bool besl;
         bool hird_threshold_en;
+        bool service_interval;
         u8 hird_threshold;
         bool activate_stm_fs_transceiver;
         bool ipg_isoc_en;
@@ -468,6 +486,10 @@ struct dwc2_core_params {
         u32 max_transfer_size;
         u32 ahbcfg;
 
+        /* GREFCLK parameters */
+        u32 ref_clk_per;
+        u16 sof_cnt_wkup_alert;
+
         /* Host parameters */
         bool host_dma;
         bool dma_desc_enable;
@@ -605,6 +627,10 @@ struct dwc2_core_params {
  *                      FIFO sizing is enabled 16 to 32768
  *                      Actual maximum value is autodetected and also
  *                      the default.
+ * @service_interval_mode: For enabling service interval based scheduling in the
+ *                         controller.
+ *                           0 - Disable
+ *                           1 - Enable
  */
 struct dwc2_hw_params {
         unsigned op_mode:3;
@@ -635,6 +661,7 @@ struct dwc2_hw_params {
         unsigned utmi_phy_data_width:2;
         unsigned lpm_mode:1;
         unsigned ipg_isoc_en:1;
+        unsigned service_interval_mode:1;
         u32 snpsid;
         u32 dev_ep_dirs;
         u32 g_tx_fifo_size[MAX_EPS_CHANNELS];
@@ -1354,6 +1381,7 @@ int dwc2_hsotg_tx_fifo_count(struct dwc2_hsotg *hsotg);
 int dwc2_hsotg_tx_fifo_total_depth(struct dwc2_hsotg *hsotg);
 int dwc2_hsotg_tx_fifo_average_depth(struct dwc2_hsotg *hsotg);
 void dwc2_gadget_init_lpm(struct dwc2_hsotg *hsotg);
+void dwc2_gadget_program_ref_clk(struct dwc2_hsotg *hsotg);
 #else
 static inline int dwc2_hsotg_remove(struct dwc2_hsotg *dwc2)
 { return 0; }
@@ -1388,6 +1416,7 @@ static inline int dwc2_hsotg_tx_fifo_total_depth(struct dwc2_hsotg *hsotg)
 static inline int dwc2_hsotg_tx_fifo_average_depth(struct dwc2_hsotg *hsotg)
 { return 0; }
 static inline void dwc2_gadget_init_lpm(struct dwc2_hsotg *hsotg) {}
+static inline void dwc2_gadget_program_ref_clk(struct dwc2_hsotg *hsotg) {}
 #endif
 
 #if IS_ENABLED(CONFIG_USB_DWC2_HOST) || IS_ENABLED(CONFIG_USB_DWC2_DUAL_ROLE)
diff --git a/drivers/usb/dwc2/debugfs.c b/drivers/usb/dwc2/debugfs.c
index 22d015b0424f..7f62f4cdc265 100644
--- a/drivers/usb/dwc2/debugfs.c
+++ b/drivers/usb/dwc2/debugfs.c
@@ -701,6 +701,7 @@ static int params_show(struct seq_file *seq, void *v)
         print_param(seq, p, besl);
         print_param(seq, p, hird_threshold_en);
         print_param(seq, p, hird_threshold);
+        print_param(seq, p, service_interval);
         print_param(seq, p, host_dma);
         print_param(seq, p, g_dma);
         print_param(seq, p, g_dma_desc);
diff --git a/drivers/usb/dwc2/gadget.c b/drivers/usb/dwc2/gadget.c
index 220c0f9b89b0..2d6d2c8244de 100644
--- a/drivers/usb/dwc2/gadget.c
+++ b/drivers/usb/dwc2/gadget.c
@@ -123,6 +123,24 @@ static inline void dwc2_gadget_incr_frame_num(struct dwc2_hsotg_ep *hs_ep)
 }
 
 /**
+ * dwc2_gadget_dec_frame_num_by_one - Decrements the targeted frame number
+ *                                    by one.
+ * @hs_ep: The endpoint.
+ *
+ * This function used in service interval based scheduling flow to calculate
+ * descriptor frame number filed value. For service interval mode frame
+ * number in descriptor should point to last (u)frame in the interval.
+ *
+ */
+static inline void dwc2_gadget_dec_frame_num_by_one(struct dwc2_hsotg_ep *hs_ep)
+{
+        if (hs_ep->target_frame)
+                hs_ep->target_frame -= 1;
+        else
+                hs_ep->target_frame = DSTS_SOFFN_LIMIT;
+}
+
+/**
  * dwc2_hsotg_en_gsint - enable one or more of the general interrupt
  * @hsotg: The device state
  * @ints: A bitmask of the interrupts to enable
@@ -228,6 +246,27 @@ int dwc2_hsotg_tx_fifo_total_depth(struct dwc2_hsotg *hsotg)
 }
 
 /**
+ * dwc2_gadget_wkup_alert_handler - Handler for WKUP_ALERT interrupt
+ *
+ * @hsotg: Programming view of the DWC_otg controller
+ *
+ */
+static void dwc2_gadget_wkup_alert_handler(struct dwc2_hsotg *hsotg)
+{
+        u32 gintsts2;
+        u32 gintmsk2;
+
+        gintsts2 = dwc2_readl(hsotg, GINTSTS2);
+        gintmsk2 = dwc2_readl(hsotg, GINTMSK2);
+
+        if (gintsts2 & GINTSTS2_WKUP_ALERT_INT) {
+                dev_dbg(hsotg->dev, "%s: Wkup_Alert_Int\n", __func__);
+                dwc2_clear_bit(hsotg, GINTSTS2, GINTSTS2_WKUP_ALERT_INT);
+                dwc2_set_bit(hsotg, DCFG, DCTL_RMTWKUPSIG);
+        }
+}
+
+/**
  * dwc2_hsotg_tx_fifo_average_depth - returns average depth of device mode
  * TX FIFOs
  *
@@ -2812,6 +2851,23 @@ static void dwc2_gadget_handle_nak(struct dwc2_hsotg_ep *hs_ep)
                 if (using_desc_dma(hsotg)) {
                         hs_ep->target_frame = hsotg->frame_number;
                         dwc2_gadget_incr_frame_num(hs_ep);
+
+                        /* In service interval mode target_frame must
+                         * be set to last (u)frame of the service interval.
+                         */
+                        if (hsotg->params.service_interval) {
+                                /* Set target_frame to the first (u)frame of
+                                 * the service interval
+                                 */
+                                hs_ep->target_frame &= ~hs_ep->interval + 1;
+
+                                /* Set target_frame to the last (u)frame of
+                                 * the service interval
+                                 */
+                                dwc2_gadget_incr_frame_num(hs_ep);
+                                dwc2_gadget_dec_frame_num_by_one(hs_ep);
+                        }
+
                         dwc2_gadget_start_isoc_ddma(hs_ep);
                         return;
                 }
@@ -3109,6 +3165,8 @@ static void kill_all_requests(struct dwc2_hsotg *hsotg,
                 dwc2_hsotg_txfifo_flush(hsotg, ep->fifo_index);
 }
 
+static int dwc2_hsotg_ep_disable(struct usb_ep *ep);
+
 /**
  * dwc2_hsotg_disconnect - disconnect service
  * @hsotg: The device state.
@@ -3127,13 +3185,12 @@ void dwc2_hsotg_disconnect(struct dwc2_hsotg *hsotg)
         hsotg->connected = 0;
         hsotg->test_mode = 0;
 
+        /* all endpoints should be shutdown */
         for (ep = 0; ep < hsotg->num_of_eps; ep++) {
                 if (hsotg->eps_in[ep])
-                        kill_all_requests(hsotg, hsotg->eps_in[ep],
-                                          -ESHUTDOWN);
+                        dwc2_hsotg_ep_disable(&hsotg->eps_in[ep]->ep);
                 if (hsotg->eps_out[ep])
-                        kill_all_requests(hsotg, hsotg->eps_out[ep],
-                                          -ESHUTDOWN);
+                        dwc2_hsotg_ep_disable(&hsotg->eps_out[ep]->ep);
         }
 
         call_gadget(hsotg, disconnect);
@@ -3191,13 +3248,23 @@ void dwc2_hsotg_core_init_disconnected(struct dwc2_hsotg *hsotg,
         u32 val;
         u32 usbcfg;
         u32 dcfg = 0;
+        int ep;
 
         /* Kill any ep0 requests as controller will be reinitialized */
         kill_all_requests(hsotg, hsotg->eps_out[0], -ECONNRESET);
 
-        if (!is_usb_reset)
+        if (!is_usb_reset) {
                 if (dwc2_core_reset(hsotg, true))
                         return;
+        } else {
+                /* all endpoints should be shutdown */
+                for (ep = 1; ep < hsotg->num_of_eps; ep++) {
+                        if (hsotg->eps_in[ep])
+                                dwc2_hsotg_ep_disable(&hsotg->eps_in[ep]->ep);
+                        if (hsotg->eps_out[ep])
+                                dwc2_hsotg_ep_disable(&hsotg->eps_out[ep]->ep);
+                }
+        }
 
         /*
          * we must now enable ep0 ready for host detection and then
@@ -3312,6 +3379,10 @@ void dwc2_hsotg_core_init_disconnected(struct dwc2_hsotg *hsotg,
                 dwc2_set_bit(hsotg, DIEPMSK, DIEPMSK_BNAININTRMSK);
         }
 
+        /* Enable Service Interval mode if supported */
+        if (using_desc_dma(hsotg) && hsotg->params.service_interval)
+                dwc2_set_bit(hsotg, DCTL, DCTL_SERVICE_INTERVAL_SUPPORTED);
+
         dwc2_writel(hsotg, 0, DAINTMSK);
 
         dev_dbg(hsotg->dev, "EP0: DIEPCTL0=0x%08x, DOEPCTL0=0x%08x\n",
@@ -3368,6 +3439,10 @@ void dwc2_hsotg_core_init_disconnected(struct dwc2_hsotg *hsotg,
         /* configure the core to support LPM */
         dwc2_gadget_init_lpm(hsotg);
 
+        /* program GREFCLK register if needed */
+        if (using_desc_dma(hsotg) && hsotg->params.service_interval)
+                dwc2_gadget_program_ref_clk(hsotg);
+
         /* must be at-least 3ms to allow bus to see disconnect */
         mdelay(3);
 
@@ -3676,6 +3751,10 @@ irq_retry:
         if (gintsts & IRQ_RETRY_MASK && --retry_count > 0)
                 goto irq_retry;
 
+        /* Check WKUP_ALERT interrupt*/
+        if (hsotg->params.service_interval)
+                dwc2_gadget_wkup_alert_handler(hsotg);
+
         spin_unlock(&hsotg->lock);
 
         return IRQ_HANDLED;
@@ -3993,6 +4072,7 @@ static int dwc2_hsotg_ep_disable(struct usb_ep *ep)
         unsigned long flags;
         u32 epctrl_reg;
         u32 ctrl;
+        int locked;
 
         dev_dbg(hsotg->dev, "%s(ep %p)\n", __func__, ep);
 
@@ -4008,7 +4088,9 @@ static int dwc2_hsotg_ep_disable(struct usb_ep *ep)
 
         epctrl_reg = dir_in ? DIEPCTL(index) : DOEPCTL(index);
 
-        spin_lock_irqsave(&hsotg->lock, flags);
+        locked = spin_is_locked(&hsotg->lock);
+        if (!locked)
+                spin_lock_irqsave(&hsotg->lock, flags);
 
         ctrl = dwc2_readl(hsotg, epctrl_reg);
 
@@ -4032,7 +4114,9 @@ static int dwc2_hsotg_ep_disable(struct usb_ep *ep)
         hs_ep->fifo_index = 0;
         hs_ep->fifo_size = 0;
 
-        spin_unlock_irqrestore(&hsotg->lock, flags);
+        if (!locked)
+                spin_unlock_irqrestore(&hsotg->lock, flags);
+
         return 0;
 }
 
@@ -4944,6 +5028,29 @@ void dwc2_gadget_init_lpm(struct dwc2_hsotg *hsotg)
         val |= hsotg->params.besl ? GLPMCFG_ENBESL : 0;
         dwc2_writel(hsotg, val, GLPMCFG);
         dev_dbg(hsotg->dev, "GLPMCFG=0x%08x\n", dwc2_readl(hsotg, GLPMCFG));
+
+        /* Unmask WKUP_ALERT Interrupt */
+        if (hsotg->params.service_interval)
+                dwc2_set_bit(hsotg, GINTMSK2, GINTMSK2_WKUP_ALERT_INT_MSK);
+}
+
+/**
+ * dwc2_gadget_program_ref_clk - Program GREFCLK register in device mode
+ *
+ * @hsotg: Programming view of DWC_otg controller
+ *
+ */
+void dwc2_gadget_program_ref_clk(struct dwc2_hsotg *hsotg)
+{
+        u32 val = 0;
+
+        val |= GREFCLK_REF_CLK_MODE;
+        val |= hsotg->params.ref_clk_per << GREFCLK_REFCLKPER_SHIFT;
+        val |= hsotg->params.sof_cnt_wkup_alert <<
+               GREFCLK_SOF_CNT_WKUP_ALERT_SHIFT;
+
+        dwc2_writel(hsotg, val, GREFCLK);
+        dev_dbg(hsotg->dev, "GREFCLK=0x%08x\n", dwc2_readl(hsotg, GREFCLK));
 }
 
 /**
diff --git a/drivers/usb/dwc2/hcd.c b/drivers/usb/dwc2/hcd.c
index 2bd6e6bfc241..dd82fa516f3f 100644
--- a/drivers/usb/dwc2/hcd.c
+++ b/drivers/usb/dwc2/hcd.c
@@ -358,16 +358,10 @@ static void dwc2_gusbcfg_init(struct dwc2_hsotg *hsotg)
 
 static int dwc2_vbus_supply_init(struct dwc2_hsotg *hsotg)
 {
-        int ret;
-
-        hsotg->vbus_supply = devm_regulator_get_optional(hsotg->dev, "vbus");
-        if (IS_ERR(hsotg->vbus_supply)) {
-                ret = PTR_ERR(hsotg->vbus_supply);
-                hsotg->vbus_supply = NULL;
-                return ret == -ENODEV ? 0 : ret;
-        }
+        if (hsotg->vbus_supply)
+                return regulator_enable(hsotg->vbus_supply);
 
-        return regulator_enable(hsotg->vbus_supply);
+        return 0;
 }
 
 static int dwc2_vbus_supply_exit(struct dwc2_hsotg *hsotg)
@@ -1328,14 +1322,11 @@ static void dwc2_hc_write_packet(struct dwc2_hsotg *hsotg,
         u32 remaining_count;
         u32 byte_count;
         u32 dword_count;
-        u32 __iomem *data_fifo;
         u32 *data_buf = (u32 *)chan->xfer_buf;
 
         if (dbg_hc(chan))
                 dev_vdbg(hsotg->dev, "%s()\n", __func__);
 
-        data_fifo = (u32 __iomem *)(hsotg->regs + HCFIFO(chan->hc_num));
-
         remaining_count = chan->xfer_len - chan->xfer_count;
         if (remaining_count > chan->max_packet)
                 byte_count = chan->max_packet;
@@ -3564,6 +3555,7 @@ static int dwc2_hcd_hub_control(struct dwc2_hsotg *hsotg, u16 typereq,
         u32 port_status;
         u32 speed;
         u32 pcgctl;
+        u32 pwr;
 
         switch (typereq) {
         case ClearHubFeature:
@@ -3612,8 +3604,11 @@ static int dwc2_hcd_hub_control(struct dwc2_hsotg *hsotg, u16 typereq,
                         dev_dbg(hsotg->dev,
                                 "ClearPortFeature USB_PORT_FEAT_POWER\n");
                         hprt0 = dwc2_read_hprt0(hsotg);
+                        pwr = hprt0 & HPRT0_PWR;
                         hprt0 &= ~HPRT0_PWR;
                         dwc2_writel(hsotg, hprt0, HPRT0);
+                        if (pwr)
+                                dwc2_vbus_supply_exit(hsotg);
                         break;
 
                 case USB_PORT_FEAT_INDICATOR:
@@ -3823,8 +3818,11 @@ static int dwc2_hcd_hub_control(struct dwc2_hsotg *hsotg, u16 typereq,
                         dev_dbg(hsotg->dev,
                                 "SetPortFeature - USB_PORT_FEAT_POWER\n");
                         hprt0 = dwc2_read_hprt0(hsotg);
+                        pwr = hprt0 & HPRT0_PWR;
                         hprt0 |= HPRT0_PWR;
                         dwc2_writel(hsotg, hprt0, HPRT0);
+                        if (!pwr)
+                                dwc2_vbus_supply_init(hsotg);
                         break;
 
                 case USB_PORT_FEAT_RESET:
@@ -3841,6 +3839,7 @@ static int dwc2_hcd_hub_control(struct dwc2_hsotg *hsotg, u16 typereq,
                         dwc2_writel(hsotg, 0, PCGCTL);
 
                         hprt0 = dwc2_read_hprt0(hsotg);
+                        pwr = hprt0 & HPRT0_PWR;
                         /* Clear suspend bit if resetting from suspend state */
                         hprt0 &= ~HPRT0_SUSP;
 
@@ -3854,6 +3853,8 @@ static int dwc2_hcd_hub_control(struct dwc2_hsotg *hsotg, u16 typereq,
                                 dev_dbg(hsotg->dev,
                                         "In host mode, hprt0=%08x\n", hprt0);
                                 dwc2_writel(hsotg, hprt0, HPRT0);
+                                if (!pwr)
+                                        dwc2_vbus_supply_init(hsotg);
                         }
 
                         /* Clear reset bit in 10ms (FS/LS) or 50ms (HS) */
@@ -4393,6 +4394,8 @@ static int _dwc2_hcd_start(struct usb_hcd *hcd)
         struct dwc2_hsotg *hsotg = dwc2_hcd_to_hsotg(hcd);
         struct usb_bus *bus = hcd_to_bus(hcd);
         unsigned long flags;
+        u32 hprt0;
+        int ret;
 
         dev_dbg(hsotg->dev, "DWC OTG HCD START\n");
 
@@ -4408,6 +4411,17 @@ static int _dwc2_hcd_start(struct usb_hcd *hcd)
 
         dwc2_hcd_reinit(hsotg);
 
+        hprt0 = dwc2_read_hprt0(hsotg);
+        /* Has vbus power been turned on in dwc2_core_host_init ? */
+        if (hprt0 & HPRT0_PWR) {
+                /* Enable external vbus supply before resuming root hub */
+                spin_unlock_irqrestore(&hsotg->lock, flags);
+                ret = dwc2_vbus_supply_init(hsotg);
+                if (ret)
+                        return ret;
+                spin_lock_irqsave(&hsotg->lock, flags);
+        }
+
         /* Initialize and connect root hub if one is not already attached */
         if (bus->root_hub) {
                 dev_dbg(hsotg->dev, "DWC OTG HCD Has Root Hub\n");
@@ -4417,7 +4431,7 @@ static int _dwc2_hcd_start(struct usb_hcd *hcd)
 
         spin_unlock_irqrestore(&hsotg->lock, flags);
 
-        return dwc2_vbus_supply_init(hsotg);
+        return 0;
 }
 
 /*
@@ -4428,6 +4442,7 @@ static void _dwc2_hcd_stop(struct usb_hcd *hcd)
 {
         struct dwc2_hsotg *hsotg = dwc2_hcd_to_hsotg(hcd);
         unsigned long flags;
+        u32 hprt0;
 
         /* Turn off all host-specific interrupts */
         dwc2_disable_host_interrupts(hsotg);
@@ -4436,6 +4451,7 @@ static void _dwc2_hcd_stop(struct usb_hcd *hcd)
         synchronize_irq(hcd->irq);
 
         spin_lock_irqsave(&hsotg->lock, flags);
+        hprt0 = dwc2_read_hprt0(hsotg);
         /* Ensure hcd is disconnected */
         dwc2_hcd_disconnect(hsotg, true);
         dwc2_hcd_stop(hsotg);
@@ -4444,7 +4460,9 @@ static void _dwc2_hcd_stop(struct usb_hcd *hcd)
         clear_bit(HCD_FLAG_HW_ACCESSIBLE, &hcd->flags);
         spin_unlock_irqrestore(&hsotg->lock, flags);
 
-        dwc2_vbus_supply_exit(hsotg);
+        /* keep balanced supply init/exit by checking HPRT0_PWR */
+        if (hprt0 & HPRT0_PWR)
+                dwc2_vbus_supply_exit(hsotg);
 
         usleep_range(1000, 3000);
 }
@@ -4482,7 +4500,9 @@ static int _dwc2_hcd_suspend(struct usb_hcd *hcd)
                 hprt0 |= HPRT0_SUSP;
                 hprt0 &= ~HPRT0_PWR;
                 dwc2_writel(hsotg, hprt0, HPRT0);
+                spin_unlock_irqrestore(&hsotg->lock, flags);
                 dwc2_vbus_supply_exit(hsotg);
+                spin_lock_irqsave(&hsotg->lock, flags);
         }
 
         /* Enter partial_power_down */
diff --git a/drivers/usb/dwc2/hw.h b/drivers/usb/dwc2/hw.h
index 0ca8e7bc7aaf..2b1ea441b7d4 100644
--- a/drivers/usb/dwc2/hw.h
+++ b/drivers/usb/dwc2/hw.h
@@ -312,6 +312,7 @@
 #define GHWCFG4_UTMI_PHY_DATA_WIDTH_SHIFT       14
 #define GHWCFG4_ACG_SUPPORTED                   BIT(12)
 #define GHWCFG4_IPG_ISOC_SUPPORTED              BIT(11)
+#define GHWCFG4_SERVICE_INTERVAL_SUPPORTED      BIT(10)
 #define GHWCFG4_UTMI_PHY_DATA_WIDTH_8           0
 #define GHWCFG4_UTMI_PHY_DATA_WIDTH_16          1
 #define GHWCFG4_UTMI_PHY_DATA_WIDTH_8_OR_16     2
@@ -404,6 +405,19 @@
 #define ADPCTL_PRB_DSCHRG_MASK          (0x3 << 0)
 #define ADPCTL_PRB_DSCHRG_SHIFT         0
 
+#define GREFCLK                             HSOTG_REG(0x0064)
+#define GREFCLK_REFCLKPER_MASK              (0x1ffff << 15)
+#define GREFCLK_REFCLKPER_SHIFT             15
+#define GREFCLK_REF_CLK_MODE                BIT(14)
+#define GREFCLK_SOF_CNT_WKUP_ALERT_MASK     (0x3ff)
+#define GREFCLK_SOF_CNT_WKUP_ALERT_SHIFT    0
+
+#define GINTMSK2                        HSOTG_REG(0x0068)
+#define GINTMSK2_WKUP_ALERT_INT_MSK     BIT(0)
+
+#define GINTSTS2                        HSOTG_REG(0x006c)
+#define GINTSTS2_WKUP_ALERT_INT         BIT(0)
+
 #define HPTXFSIZ                        HSOTG_REG(0x100)
 /* Use FIFOSIZE_* constants to access this register */
 
@@ -443,6 +457,7 @@
 #define DCFG_DEVSPD_FS48                3
 
 #define DCTL                            HSOTG_REG(0x804)
+#define DCTL_SERVICE_INTERVAL_SUPPORTED BIT(19)
 #define DCTL_PWRONPRGDONE               BIT(11)
 #define DCTL_CGOUTNAK                   BIT(10)
 #define DCTL_SGOUTNAK                   BIT(9)
diff --git a/drivers/usb/dwc2/params.c b/drivers/usb/dwc2/params.c
index bf7052e037d6..7c1b6938f212 100644
--- a/drivers/usb/dwc2/params.c
+++ b/drivers/usb/dwc2/params.c
@@ -81,6 +81,7 @@ static void dwc2_set_rk_params(struct dwc2_hsotg *hsotg)
         p->host_perio_tx_fifo_size = 256;
         p->ahbcfg = GAHBCFG_HBSTLEN_INCR16 <<
                 GAHBCFG_HBSTLEN_SHIFT;
+        p->power_down = 0;
 }
 
 static void dwc2_set_ltq_params(struct dwc2_hsotg *hsotg)
@@ -299,9 +300,12 @@ static void dwc2_set_default_params(struct dwc2_hsotg *hsotg)
         p->hird_threshold_en = true;
         p->hird_threshold = 4;
         p->ipg_isoc_en = false;
+        p->service_interval = false;
         p->max_packet_count = hw->max_packet_count;
         p->max_transfer_size = hw->max_transfer_size;
         p->ahbcfg = GAHBCFG_HBSTLEN_INCR << GAHBCFG_HBSTLEN_SHIFT;
+        p->ref_clk_per = 33333;
+        p->sof_cnt_wkup_alert = 100;
 
         if ((hsotg->dr_mode == USB_DR_MODE_HOST) ||
             (hsotg->dr_mode == USB_DR_MODE_OTG)) {
@@ -592,6 +596,7 @@ static void dwc2_check_params(struct dwc2_hsotg *hsotg)
         CHECK_BOOL(besl, (hsotg->hw_params.snpsid >= DWC2_CORE_REV_3_00a));
         CHECK_BOOL(hird_threshold_en, hsotg->params.lpm);
         CHECK_RANGE(hird_threshold, 0, hsotg->params.besl ? 12 : 7, 0);
+        CHECK_BOOL(service_interval, hw->service_interval_mode);
         CHECK_RANGE(max_packet_count,
                     15, hw->max_packet_count,
                     hw->max_packet_count);
@@ -780,6 +785,8 @@ int dwc2_get_hwparams(struct dwc2_hsotg *hsotg)
                                   GHWCFG4_UTMI_PHY_DATA_WIDTH_SHIFT;
         hw->acg_enable = !!(hwcfg4 & GHWCFG4_ACG_SUPPORTED);
         hw->ipg_isoc_en = !!(hwcfg4 & GHWCFG4_IPG_ISOC_SUPPORTED);
+        hw->service_interval_mode = !!(hwcfg4 &
+                                       GHWCFG4_SERVICE_INTERVAL_SUPPORTED);
 
         /* fifo sizes */
         hw->rx_fifo_size = (grxfsiz & GRXFSIZ_DEPTH_MASK) >>
diff --git a/drivers/usb/dwc2/platform.c b/drivers/usb/dwc2/platform.c
index 577642895b57..c0b64d483552 100644
--- a/drivers/usb/dwc2/platform.c
+++ b/drivers/usb/dwc2/platform.c
@@ -432,6 +432,14 @@ static int dwc2_driver_probe(struct platform_device *dev)
         if (retval)
                 return retval;
 
+        hsotg->vbus_supply = devm_regulator_get_optional(hsotg->dev, "vbus");
+        if (IS_ERR(hsotg->vbus_supply)) {
+                retval = PTR_ERR(hsotg->vbus_supply);
+                hsotg->vbus_supply = NULL;
+                if (retval != -ENODEV)
+                        return retval;
+        }
+
         retval = dwc2_lowlevel_hw_enable(hsotg);
         if (retval)
                 return retval;
diff --git a/drivers/usb/dwc3/Kconfig b/drivers/usb/dwc3/Kconfig
index 518ead12458d..1a0404fda596 100644
--- a/drivers/usb/dwc3/Kconfig
+++ b/drivers/usb/dwc3/Kconfig
@@ -113,7 +113,7 @@ config USB_DWC3_ST
 
 config USB_DWC3_QCOM
         tristate "Qualcomm Platform"
-        depends on ARCH_QCOM || COMPILE_TEST
+        depends on EXTCON && (ARCH_QCOM || COMPILE_TEST)
         depends on OF
         default USB_DWC3
         help
diff --git a/drivers/usb/dwc3/core.c b/drivers/usb/dwc3/core.c
index 88c80fcc39f5..becfbb87f791 100644
--- a/drivers/usb/dwc3/core.c
+++ b/drivers/usb/dwc3/core.c
@@ -756,7 +756,7 @@ static void dwc3_core_setup_global_control(struct dwc3 *dwc)
 
         /* check if current dwc3 is on simulation board */
         if (dwc->hwparams.hwparams6 & DWC3_GHWPARAMS6_EN_FPGA) {
-                dev_info(dwc->dev, "Running with FPGA optmizations\n");
+                dev_info(dwc->dev, "Running with FPGA optimizations\n");
                 dwc->is_fpga = true;
         }
 
diff --git a/drivers/usb/dwc3/dwc3-exynos.c b/drivers/usb/dwc3/dwc3-exynos.c
index a94fb1ba8f2c..cb7fcd7c0ad8 100644
--- a/drivers/usb/dwc3/dwc3-exynos.c
+++ b/drivers/usb/dwc3/dwc3-exynos.c
@@ -13,80 +13,30 @@
 #include <linux/slab.h>
 #include <linux/platform_device.h>
 #include <linux/clk.h>
-#include <linux/usb/otg.h>
-#include <linux/usb/usb_phy_generic.h>
 #include <linux/of.h>
 #include <linux/of_platform.h>
 #include <linux/regulator/consumer.h>
 
+#define DWC3_EXYNOS_MAX_CLOCKS  4
+
+struct dwc3_exynos_driverdata {
+        const char              *clk_names[DWC3_EXYNOS_MAX_CLOCKS];
+        int                     num_clks;
+        int                     suspend_clk_idx;
+};
+
 struct dwc3_exynos {
-        struct platform_device  *usb2_phy;
-        struct platform_device  *usb3_phy;
         struct device           *dev;
 
-        struct clk              *clk;
-        struct clk              *susp_clk;
-        struct clk              *axius_clk;
+        const char              **clk_names;
+        struct clk              *clks[DWC3_EXYNOS_MAX_CLOCKS];
+        int                     num_clks;
+        int                     suspend_clk_idx;
 
         struct regulator        *vdd33;
         struct regulator        *vdd10;
 };
 
-static int dwc3_exynos_register_phys(struct dwc3_exynos *exynos)
-{
-        struct usb_phy_generic_platform_data pdata;
-        struct platform_device  *pdev;
-        int                     ret;
-
-        memset(&pdata, 0x00, sizeof(pdata));
-
-        pdev = platform_device_alloc("usb_phy_generic", PLATFORM_DEVID_AUTO);
-        if (!pdev)
-                return -ENOMEM;
-
-        exynos->usb2_phy = pdev;
-        pdata.type = USB_PHY_TYPE_USB2;
-        pdata.gpio_reset = -1;
-
-        ret = platform_device_add_data(exynos->usb2_phy, &pdata, sizeof(pdata));
-        if (ret)
-                goto err1;
-
-        pdev = platform_device_alloc("usb_phy_generic", PLATFORM_DEVID_AUTO);
-        if (!pdev) {
-                ret = -ENOMEM;
-                goto err1;
-        }
-
-        exynos->usb3_phy = pdev;
-        pdata.type = USB_PHY_TYPE_USB3;
-
-        ret = platform_device_add_data(exynos->usb3_phy, &pdata, sizeof(pdata));
-        if (ret)
-                goto err2;
-
-        ret = platform_device_add(exynos->usb2_phy);
-        if (ret)
-                goto err2;
-
-        ret = platform_device_add(exynos->usb3_phy);
-        if (ret)
-                goto err3;
-
-        return 0;
-
-err3:
-        platform_device_del(exynos->usb2_phy);
-
-err2:
-        platform_device_put(exynos->usb3_phy);
-
-err1:
-        platform_device_put(exynos->usb2_phy);
-
-        return ret;
-}
-
 static int dwc3_exynos_remove_child(struct device *dev, void *unused)
 {
         struct platform_device *pdev = to_platform_device(dev);
@@ -101,47 +51,42 @@ static int dwc3_exynos_probe(struct platform_device *pdev)
         struct dwc3_exynos      *exynos;
         struct device           *dev = &pdev->dev;
         struct device_node      *node = dev->of_node;
-
-        int                     ret;
+        const struct dwc3_exynos_driverdata *driver_data;
+        int                     i, ret;
 
         exynos = devm_kzalloc(dev, sizeof(*exynos), GFP_KERNEL);
         if (!exynos)
                 return -ENOMEM;
 
-        platform_set_drvdata(pdev, exynos);
+        driver_data = of_device_get_match_data(dev);
+        exynos->dev = dev;
+        exynos->num_clks = driver_data->num_clks;
+        exynos->clk_names = (const char **)driver_data->clk_names;
+        exynos->suspend_clk_idx = driver_data->suspend_clk_idx;
 
-        exynos->dev     = dev;
+        platform_set_drvdata(pdev, exynos);
 
-        exynos->clk = devm_clk_get(dev, "usbdrd30");
-        if (IS_ERR(exynos->clk)) {
-                dev_err(dev, "couldn't get clock\n");
-                return -EINVAL;
+        for (i = 0; i < exynos->num_clks; i++) {
+                exynos->clks[i] = devm_clk_get(dev, exynos->clk_names[i]);
+                if (IS_ERR(exynos->clks[i])) {
+                        dev_err(dev, "failed to get clock: %s\n",
+                                exynos->clk_names[i]);
+                        return PTR_ERR(exynos->clks[i]);
+                }
         }
-        ret = clk_prepare_enable(exynos->clk);
-        if (ret)
-                return ret;
 
-        exynos->susp_clk = devm_clk_get(dev, "usbdrd30_susp_clk");
-        if (IS_ERR(exynos->susp_clk))
-                exynos->susp_clk = NULL;
-        ret = clk_prepare_enable(exynos->susp_clk);
-        if (ret)
-                goto susp_clk_err;
-
-        if (of_device_is_compatible(node, "samsung,exynos7-dwusb3")) {
-                exynos->axius_clk = devm_clk_get(dev, "usbdrd30_axius_clk");
-                if (IS_ERR(exynos->axius_clk)) {
-                        dev_err(dev, "no AXI UpScaler clk specified\n");
-                        ret = -ENODEV;
-                        goto axius_clk_err;
+        for (i = 0; i < exynos->num_clks; i++) {
+                ret = clk_prepare_enable(exynos->clks[i]);
+                if (ret) {
+                        while (--i > 0)
+                                clk_disable_unprepare(exynos->clks[i]);
+                        return ret;
                 }
-                ret = clk_prepare_enable(exynos->axius_clk);
-                if (ret)
-                        goto axius_clk_err;
-        } else {
-                exynos->axius_clk = NULL;
         }
 
+        if (exynos->suspend_clk_idx >= 0)
+                clk_prepare_enable(exynos->clks[exynos->suspend_clk_idx]);
+
         exynos->vdd33 = devm_regulator_get(dev, "vdd33");
         if (IS_ERR(exynos->vdd33)) {
                 ret = PTR_ERR(exynos->vdd33);
@@ -164,12 +109,6 @@ static int dwc3_exynos_probe(struct platform_device *pdev)
                 goto vdd10_err;
         }
 
-        ret = dwc3_exynos_register_phys(exynos);
-        if (ret) {
-                dev_err(dev, "couldn't register PHYs\n");
-                goto phys_err;
-        }
-
         if (node) {
                 ret = of_platform_populate(node, NULL, NULL, dev);
                 if (ret) {
@@ -185,32 +124,31 @@ static int dwc3_exynos_probe(struct platform_device *pdev)
         return 0;
 
 populate_err:
-        platform_device_unregister(exynos->usb2_phy);
-        platform_device_unregister(exynos->usb3_phy);
-phys_err:
         regulator_disable(exynos->vdd10);
 vdd10_err:
         regulator_disable(exynos->vdd33);
 vdd33_err:
-        clk_disable_unprepare(exynos->axius_clk);
-axius_clk_err:
-        clk_disable_unprepare(exynos->susp_clk);
-susp_clk_err:
-        clk_disable_unprepare(exynos->clk);
+        for (i = exynos->num_clks - 1; i >= 0; i--)
+                clk_disable_unprepare(exynos->clks[i]);
+
+        if (exynos->suspend_clk_idx >= 0)
+                clk_disable_unprepare(exynos->clks[exynos->suspend_clk_idx]);
+
         return ret;
 }
 
 static int dwc3_exynos_remove(struct platform_device *pdev)
 {
         struct dwc3_exynos      *exynos = platform_get_drvdata(pdev);
+        int i;
 
         device_for_each_child(&pdev->dev, NULL, dwc3_exynos_remove_child);
-        platform_device_unregister(exynos->usb2_phy);
-        platform_device_unregister(exynos->usb3_phy);
 
-        clk_disable_unprepare(exynos->axius_clk);
-        clk_disable_unprepare(exynos->susp_clk);
-        clk_disable_unprepare(exynos->clk);
+        for (i = exynos->num_clks - 1; i >= 0; i--)
+                clk_disable_unprepare(exynos->clks[i]);
+
+        if (exynos->suspend_clk_idx >= 0)
+                clk_disable_unprepare(exynos->clks[exynos->suspend_clk_idx]);
 
         regulator_disable(exynos->vdd33);
         regulator_disable(exynos->vdd10);
@@ -218,10 +156,36 @@ static int dwc3_exynos_remove(struct platform_device *pdev)
         return 0;
 }
 
+static const struct dwc3_exynos_driverdata exynos5250_drvdata = {
+        .clk_names = { "usbdrd30" },
+        .num_clks = 1,
+        .suspend_clk_idx = -1,
+};
+
+static const struct dwc3_exynos_driverdata exynos5433_drvdata = {
+        .clk_names = { "aclk", "susp_clk", "pipe_pclk", "phyclk" },
+        .num_clks = 4,
+        .suspend_clk_idx = 1,
+};
+
+static const struct dwc3_exynos_driverdata exynos7_drvdata = {
+        .clk_names = { "usbdrd30", "usbdrd30_susp_clk", "usbdrd30_axius_clk" },
+        .num_clks = 3,
+        .suspend_clk_idx = 1,
+};
+
 static const struct of_device_id exynos_dwc3_match[] = {
-        { .compatible = "samsung,exynos5250-dwusb3" },
-        { .compatible = "samsung,exynos7-dwusb3" },
-        {},
+        {
+                .compatible = "samsung,exynos5250-dwusb3",
+                .data = &exynos5250_drvdata,
+        }, {
+                .compatible = "samsung,exynos5433-dwusb3",
+                .data = &exynos5433_drvdata,
+        }, {
+                .compatible = "samsung,exynos7-dwusb3",
+                .data = &exynos7_drvdata,
+        }, {
+        }
 };
 MODULE_DEVICE_TABLE(of, exynos_dwc3_match);
 
@@ -229,9 +193,10 @@ MODULE_DEVICE_TABLE(of, exynos_dwc3_match);
 static int dwc3_exynos_suspend(struct device *dev)
 {
         struct dwc3_exynos *exynos = dev_get_drvdata(dev);
+        int i;
 
-        clk_disable(exynos->axius_clk);
-        clk_disable(exynos->clk);
+        for (i = exynos->num_clks - 1; i >= 0; i--)
+                clk_disable_unprepare(exynos->clks[i]);
 
         regulator_disable(exynos->vdd33);
         regulator_disable(exynos->vdd10);
@@ -242,7 +207,7 @@ static int dwc3_exynos_suspend(struct device *dev)
 static int dwc3_exynos_resume(struct device *dev)
 {
         struct dwc3_exynos *exynos = dev_get_drvdata(dev);
-        int ret;
+        int i, ret;
 
         ret = regulator_enable(exynos->vdd33);
         if (ret) {
@@ -255,13 +220,14 @@ static int dwc3_exynos_resume(struct device *dev)
                 return ret;
         }
 
-        clk_enable(exynos->clk);
-        clk_enable(exynos->axius_clk);
-
-        /* runtime set active to reflect active state. */
-        pm_runtime_disable(dev);
-        pm_runtime_set_active(dev);
-        pm_runtime_enable(dev);
+        for (i = 0; i < exynos->num_clks; i++) {
+                ret = clk_prepare_enable(exynos->clks[i]);
+                if (ret) {
+                        while (--i > 0)
+                                clk_disable_unprepare(exynos->clks[i]);
+                        return ret;
+                }
+        }
 
         return 0;
 }
diff --git a/drivers/usb/dwc3/gadget.c b/drivers/usb/dwc3/gadget.c
index 2b53194081ba..679c12e14522 100644
--- a/drivers/usb/dwc3/gadget.c
+++ b/drivers/usb/dwc3/gadget.c
@@ -270,27 +270,36 @@ int dwc3_send_gadget_ep_cmd(struct dwc3_ep *dep, unsigned cmd,
         const struct usb_endpoint_descriptor *desc = dep->endpoint.desc;
         struct dwc3             *dwc = dep->dwc;
         u32                     timeout = 1000;
+        u32                     saved_config = 0;
         u32                     reg;
 
         int                     cmd_status = 0;
-        int                     susphy = false;
         int                     ret = -EINVAL;
 
         /*
-         * Synopsys Databook 2.60a states, on section 6.3.2.5.[1-8], that if
-         * we're issuing an endpoint command, we must check if
-         * GUSB2PHYCFG.SUSPHY bit is set. If it is, then we need to clear it.
+         * When operating in USB 2.0 speeds (HS/FS), if GUSB2PHYCFG.ENBLSLPM or
+         * GUSB2PHYCFG.SUSPHY is set, it must be cleared before issuing an
+         * endpoint command.
          *
-         * We will also set SUSPHY bit to what it was before returning as stated
-         * by the same section on Synopsys databook.
+         * Save and clear both GUSB2PHYCFG.ENBLSLPM and GUSB2PHYCFG.SUSPHY
+         * settings. Restore them after the command is completed.
+         *
+         * DWC_usb3 3.30a and DWC_usb31 1.90a programming guide section 3.2.2
          */
         if (dwc->gadget.speed <= USB_SPEED_HIGH) {
                 reg = dwc3_readl(dwc->regs, DWC3_GUSB2PHYCFG(0));
                 if (unlikely(reg & DWC3_GUSB2PHYCFG_SUSPHY)) {
-                        susphy = true;
+                        saved_config |= DWC3_GUSB2PHYCFG_SUSPHY;
                         reg &= ~DWC3_GUSB2PHYCFG_SUSPHY;
-                        dwc3_writel(dwc->regs, DWC3_GUSB2PHYCFG(0), reg);
                 }
+
+                if (reg & DWC3_GUSB2PHYCFG_ENBLSLPM) {
+                        saved_config |= DWC3_GUSB2PHYCFG_ENBLSLPM;
+                        reg &= ~DWC3_GUSB2PHYCFG_ENBLSLPM;
+                }
+
+                if (saved_config)
+                        dwc3_writel(dwc->regs, DWC3_GUSB2PHYCFG(0), reg);
         }
 
         if (DWC3_DEPCMD_CMD(cmd) == DWC3_DEPCMD_STARTTRANSFER) {
@@ -389,9 +398,9 @@ int dwc3_send_gadget_ep_cmd(struct dwc3_ep *dep, unsigned cmd,
                 }
         }
 
-        if (unlikely(susphy)) {
+        if (saved_config) {
                 reg = dwc3_readl(dwc->regs, DWC3_GUSB2PHYCFG(0));
-                reg |= DWC3_GUSB2PHYCFG_SUSPHY;
+                reg |= saved_config;
                 dwc3_writel(dwc->regs, DWC3_GUSB2PHYCFG(0), reg);
         }
 
diff --git a/drivers/usb/early/xhci-dbc.c b/drivers/usb/early/xhci-dbc.c
index e15e896f356c..165653a5e45d 100644
--- a/drivers/usb/early/xhci-dbc.c
+++ b/drivers/usb/early/xhci-dbc.c
@@ -717,17 +717,14 @@ static void xdbc_handle_port_status(struct xdbc_trb *evt_trb)
 
 static void xdbc_handle_tx_event(struct xdbc_trb *evt_trb)
 {
-        size_t remain_length;
         u32 comp_code;
         int ep_id;
 
         comp_code       = GET_COMP_CODE(le32_to_cpu(evt_trb->field[2]));
-        remain_length   = EVENT_TRB_LEN(le32_to_cpu(evt_trb->field[2]));
         ep_id           = TRB_TO_EP_ID(le32_to_cpu(evt_trb->field[3]));
 
         switch (comp_code) {
         case COMP_SUCCESS:
-                remain_length = 0;
         case COMP_SHORT_PACKET:
                 break;
         case COMP_TRB_ERROR:
diff --git a/drivers/usb/gadget/function/f_uac2.c b/drivers/usb/gadget/function/f_uac2.c
index d582921f7257..db2d4980cb35 100644
--- a/drivers/usb/gadget/function/f_uac2.c
+++ b/drivers/usb/gadget/function/f_uac2.c
@@ -22,12 +22,8 @@
  *  controlled by two clock sources :
  *    CLK_5 := c_srate, and CLK_6 := p_srate
  */
-#define USB_OUT_IT_ID   1
-#define IO_IN_IT_ID     2
-#define IO_OUT_OT_ID    3
-#define USB_IN_OT_ID    4
-#define USB_OUT_CLK_ID  5
-#define USB_IN_CLK_ID   6
+#define USB_OUT_CLK_ID  (out_clk_src_desc.bClockID)
+#define USB_IN_CLK_ID   (in_clk_src_desc.bClockID)
 
 #define CONTROL_ABSENT  0
 #define CONTROL_RDONLY  1
@@ -43,6 +39,9 @@
 #define UNFLW_CTRL      8
 #define OVFLW_CTRL      10
 
+#define EPIN_EN(_opts) ((_opts)->p_chmask != 0)
+#define EPOUT_EN(_opts) ((_opts)->c_chmask != 0)
+
 struct f_uac2 {
         struct g_audio g_audio;
         u8 ac_intf, as_in_intf, as_out_intf;
@@ -135,7 +134,7 @@ static struct uac_clock_source_descriptor in_clk_src_desc = {
         .bDescriptorType = USB_DT_CS_INTERFACE,
 
         .bDescriptorSubtype = UAC2_CLOCK_SOURCE,
-        .bClockID = USB_IN_CLK_ID,
+        /* .bClockID = DYNAMIC */
         .bmAttributes = UAC_CLOCK_SOURCE_TYPE_INT_FIXED,
         .bmControls = (CONTROL_RDONLY << CLK_FREQ_CTRL),
         .bAssocTerminal = 0,
@@ -147,7 +146,7 @@ static struct uac_clock_source_descriptor out_clk_src_desc = {
         .bDescriptorType = USB_DT_CS_INTERFACE,
 
         .bDescriptorSubtype = UAC2_CLOCK_SOURCE,
-        .bClockID = USB_OUT_CLK_ID,
+        /* .bClockID = DYNAMIC */
         .bmAttributes = UAC_CLOCK_SOURCE_TYPE_INT_FIXED,
         .bmControls = (CONTROL_RDONLY << CLK_FREQ_CTRL),
         .bAssocTerminal = 0,
@@ -159,10 +158,10 @@ static struct uac2_input_terminal_descriptor usb_out_it_desc = {
         .bDescriptorType = USB_DT_CS_INTERFACE,
 
         .bDescriptorSubtype = UAC_INPUT_TERMINAL,
-        .bTerminalID = USB_OUT_IT_ID,
+        /* .bTerminalID = DYNAMIC */
         .wTerminalType = cpu_to_le16(UAC_TERMINAL_STREAMING),
         .bAssocTerminal = 0,
-        .bCSourceID = USB_OUT_CLK_ID,
+        /* .bCSourceID = DYNAMIC */
         .iChannelNames = 0,
         .bmControls = cpu_to_le16(CONTROL_RDWR << COPY_CTRL),
 };
@@ -173,10 +172,10 @@ static struct uac2_input_terminal_descriptor io_in_it_desc = {
         .bDescriptorType = USB_DT_CS_INTERFACE,
 
         .bDescriptorSubtype = UAC_INPUT_TERMINAL,
-        .bTerminalID = IO_IN_IT_ID,
+        /* .bTerminalID = DYNAMIC */
         .wTerminalType = cpu_to_le16(UAC_INPUT_TERMINAL_UNDEFINED),
         .bAssocTerminal = 0,
-        .bCSourceID = USB_IN_CLK_ID,
+        /* .bCSourceID = DYNAMIC */
         .iChannelNames = 0,
         .bmControls = cpu_to_le16(CONTROL_RDWR << COPY_CTRL),
 };
@@ -187,11 +186,11 @@ static struct uac2_output_terminal_descriptor usb_in_ot_desc = {
         .bDescriptorType = USB_DT_CS_INTERFACE,
 
         .bDescriptorSubtype = UAC_OUTPUT_TERMINAL,
-        .bTerminalID = USB_IN_OT_ID,
+        /* .bTerminalID = DYNAMIC */
         .wTerminalType = cpu_to_le16(UAC_TERMINAL_STREAMING),
         .bAssocTerminal = 0,
-        .bSourceID = IO_IN_IT_ID,
-        .bCSourceID = USB_IN_CLK_ID,
+        /* .bSourceID = DYNAMIC */
+        /* .bCSourceID = DYNAMIC */
         .bmControls = cpu_to_le16(CONTROL_RDWR << COPY_CTRL),
 };
 
@@ -201,11 +200,11 @@ static struct uac2_output_terminal_descriptor io_out_ot_desc = {
         .bDescriptorType = USB_DT_CS_INTERFACE,
 
         .bDescriptorSubtype = UAC_OUTPUT_TERMINAL,
-        .bTerminalID = IO_OUT_OT_ID,
+        /* .bTerminalID = DYNAMIC */
         .wTerminalType = cpu_to_le16(UAC_OUTPUT_TERMINAL_UNDEFINED),
         .bAssocTerminal = 0,
-        .bSourceID = USB_OUT_IT_ID,
-        .bCSourceID = USB_OUT_CLK_ID,
+        /* .bSourceID = DYNAMIC */
+        /* .bCSourceID = DYNAMIC */
         .bmControls = cpu_to_le16(CONTROL_RDWR << COPY_CTRL),
 };
 
@@ -253,7 +252,7 @@ static struct uac2_as_header_descriptor as_out_hdr_desc = {
         .bDescriptorType = USB_DT_CS_INTERFACE,
 
         .bDescriptorSubtype = UAC_AS_GENERAL,
-        .bTerminalLink = USB_OUT_IT_ID,
+        /* .bTerminalLink = DYNAMIC */
         .bmControls = 0,
         .bFormatType = UAC_FORMAT_TYPE_I,
         .bmFormats = cpu_to_le32(UAC_FORMAT_TYPE_I_PCM),
@@ -330,7 +329,7 @@ static struct uac2_as_header_descriptor as_in_hdr_desc = {
         .bDescriptorType = USB_DT_CS_INTERFACE,
 
         .bDescriptorSubtype = UAC_AS_GENERAL,
-        .bTerminalLink = USB_IN_OT_ID,
+        /* .bTerminalLink = DYNAMIC */
         .bmControls = 0,
         .bFormatType = UAC_FORMAT_TYPE_I,
         .bmFormats = cpu_to_le32(UAC_FORMAT_TYPE_I_PCM),
@@ -471,6 +470,125 @@ static void set_ep_max_packet_size(const struct f_uac2_opts *uac2_opts,
                                 le16_to_cpu(ep_desc->wMaxPacketSize)));
 }
 
+/* Use macro to overcome line length limitation */
+#define USBDHDR(p) (struct usb_descriptor_header *)(p)
+
+static void setup_descriptor(struct f_uac2_opts *opts)
+{
+        /* patch descriptors */
+        int i = 1; /* ID's start with 1 */
+
+        if (EPOUT_EN(opts))
+                usb_out_it_desc.bTerminalID = i++;
+        if (EPIN_EN(opts))
+                io_in_it_desc.bTerminalID = i++;
+        if (EPOUT_EN(opts))
+                io_out_ot_desc.bTerminalID = i++;
+        if (EPIN_EN(opts))
+                usb_in_ot_desc.bTerminalID = i++;
+        if (EPOUT_EN(opts))
+                out_clk_src_desc.bClockID = i++;
+        if (EPIN_EN(opts))
+                in_clk_src_desc.bClockID = i++;
+
+        usb_out_it_desc.bCSourceID = out_clk_src_desc.bClockID;
+        usb_in_ot_desc.bSourceID = io_in_it_desc.bTerminalID;
+        usb_in_ot_desc.bCSourceID = in_clk_src_desc.bClockID;
+        io_in_it_desc.bCSourceID = in_clk_src_desc.bClockID;
+        io_out_ot_desc.bCSourceID = out_clk_src_desc.bClockID;
+        io_out_ot_desc.bSourceID = usb_out_it_desc.bTerminalID;
+        as_out_hdr_desc.bTerminalLink = usb_out_it_desc.bTerminalID;
+        as_in_hdr_desc.bTerminalLink = usb_in_ot_desc.bTerminalID;
+
+        iad_desc.bInterfaceCount = 1;
+        ac_hdr_desc.wTotalLength = 0;
+
+        if (EPIN_EN(opts)) {
+                u16 len = le16_to_cpu(ac_hdr_desc.wTotalLength);
+
+                len += sizeof(in_clk_src_desc);
+                len += sizeof(usb_in_ot_desc);
+                len += sizeof(io_in_it_desc);
+                ac_hdr_desc.wTotalLength = cpu_to_le16(len);
+                iad_desc.bInterfaceCount++;
+        }
+        if (EPOUT_EN(opts)) {
+                u16 len = le16_to_cpu(ac_hdr_desc.wTotalLength);
+
+                len += sizeof(out_clk_src_desc);
+                len += sizeof(usb_out_it_desc);
+                len += sizeof(io_out_ot_desc);
+                ac_hdr_desc.wTotalLength = cpu_to_le16(len);
+                iad_desc.bInterfaceCount++;
+        }
+
+        i = 0;
+        fs_audio_desc[i++] = USBDHDR(&iad_desc);
+        fs_audio_desc[i++] = USBDHDR(&std_ac_if_desc);
+        fs_audio_desc[i++] = USBDHDR(&ac_hdr_desc);
+        if (EPIN_EN(opts))
+                fs_audio_desc[i++] = USBDHDR(&in_clk_src_desc);
+        if (EPOUT_EN(opts)) {
+                fs_audio_desc[i++] = USBDHDR(&out_clk_src_desc);
+                fs_audio_desc[i++] = USBDHDR(&usb_out_it_desc);
+        }
+        if (EPIN_EN(opts)) {
+                fs_audio_desc[i++] = USBDHDR(&io_in_it_desc);
+                fs_audio_desc[i++] = USBDHDR(&usb_in_ot_desc);
+        }
+        if (EPOUT_EN(opts)) {
+                fs_audio_desc[i++] = USBDHDR(&io_out_ot_desc);
+                fs_audio_desc[i++] = USBDHDR(&std_as_out_if0_desc);
+                fs_audio_desc[i++] = USBDHDR(&std_as_out_if1_desc);
+                fs_audio_desc[i++] = USBDHDR(&as_out_hdr_desc);
+                fs_audio_desc[i++] = USBDHDR(&as_out_fmt1_desc);
+                fs_audio_desc[i++] = USBDHDR(&fs_epout_desc);
+                fs_audio_desc[i++] = USBDHDR(&as_iso_out_desc);
+        }
+        if (EPIN_EN(opts)) {
+                fs_audio_desc[i++] = USBDHDR(&std_as_in_if0_desc);
+                fs_audio_desc[i++] = USBDHDR(&std_as_in_if1_desc);
+                fs_audio_desc[i++] = USBDHDR(&as_in_hdr_desc);
+                fs_audio_desc[i++] = USBDHDR(&as_in_fmt1_desc);
+                fs_audio_desc[i++] = USBDHDR(&fs_epin_desc);
+                fs_audio_desc[i++] = USBDHDR(&as_iso_in_desc);
+        }
+        fs_audio_desc[i] = NULL;
+
+        i = 0;
+        hs_audio_desc[i++] = USBDHDR(&iad_desc);
+        hs_audio_desc[i++] = USBDHDR(&std_ac_if_desc);
+        hs_audio_desc[i++] = USBDHDR(&ac_hdr_desc);
+        if (EPIN_EN(opts))
+                hs_audio_desc[i++] = USBDHDR(&in_clk_src_desc);
+        if (EPOUT_EN(opts)) {
+                hs_audio_desc[i++] = USBDHDR(&out_clk_src_desc);
+                hs_audio_desc[i++] = USBDHDR(&usb_out_it_desc);
+        }
+        if (EPIN_EN(opts)) {
+                hs_audio_desc[i++] = USBDHDR(&io_in_it_desc);
+                hs_audio_desc[i++] = USBDHDR(&usb_in_ot_desc);
+        }
+        if (EPOUT_EN(opts)) {
+                hs_audio_desc[i++] = USBDHDR(&io_out_ot_desc);
+                hs_audio_desc[i++] = USBDHDR(&std_as_out_if0_desc);
+                hs_audio_desc[i++] = USBDHDR(&std_as_out_if1_desc);
+                hs_audio_desc[i++] = USBDHDR(&as_out_hdr_desc);
+                hs_audio_desc[i++] = USBDHDR(&as_out_fmt1_desc);
+                hs_audio_desc[i++] = USBDHDR(&hs_epout_desc);
+                hs_audio_desc[i++] = USBDHDR(&as_iso_out_desc);
+        }
+        if (EPIN_EN(opts)) {
+                hs_audio_desc[i++] = USBDHDR(&std_as_in_if0_desc);
+                hs_audio_desc[i++] = USBDHDR(&std_as_in_if1_desc);
+                hs_audio_desc[i++] = USBDHDR(&as_in_hdr_desc);
+                hs_audio_desc[i++] = USBDHDR(&as_in_fmt1_desc);
+                hs_audio_desc[i++] = USBDHDR(&hs_epin_desc);
+                hs_audio_desc[i++] = USBDHDR(&as_iso_in_desc);
+        }
+        hs_audio_desc[i] = NULL;
+}
+
 static int
 afunc_bind(struct usb_configuration *cfg, struct usb_function *fn)
 {
@@ -530,25 +648,29 @@ afunc_bind(struct usb_configuration *cfg, struct usb_function *fn)
         uac2->ac_intf = ret;
         uac2->ac_alt = 0;
 
-        ret = usb_interface_id(cfg, fn);
-        if (ret < 0) {
-                dev_err(dev, "%s:%d Error!\n", __func__, __LINE__);
-                return ret;
+        if (EPOUT_EN(uac2_opts)) {
+                ret = usb_interface_id(cfg, fn);
+                if (ret < 0) {
+                        dev_err(dev, "%s:%d Error!\n", __func__, __LINE__);
+                        return ret;
+                }
+                std_as_out_if0_desc.bInterfaceNumber = ret;
+                std_as_out_if1_desc.bInterfaceNumber = ret;
+                uac2->as_out_intf = ret;
+                uac2->as_out_alt = 0;
         }
-        std_as_out_if0_desc.bInterfaceNumber = ret;
-        std_as_out_if1_desc.bInterfaceNumber = ret;
-        uac2->as_out_intf = ret;
-        uac2->as_out_alt = 0;
 
-        ret = usb_interface_id(cfg, fn);
-        if (ret < 0) {
-                dev_err(dev, "%s:%d Error!\n", __func__, __LINE__);
-                return ret;
+        if (EPIN_EN(uac2_opts)) {
+                ret = usb_interface_id(cfg, fn);
+                if (ret < 0) {
+                        dev_err(dev, "%s:%d Error!\n", __func__, __LINE__);
+                        return ret;
+                }
+                std_as_in_if0_desc.bInterfaceNumber = ret;
+                std_as_in_if1_desc.bInterfaceNumber = ret;
+                uac2->as_in_intf = ret;
+                uac2->as_in_alt = 0;
         }
-        std_as_in_if0_desc.bInterfaceNumber = ret;
-        std_as_in_if1_desc.bInterfaceNumber = ret;
-        uac2->as_in_intf = ret;
-        uac2->as_in_alt = 0;
 
         /* Calculate wMaxPacketSize according to audio bandwidth */
         set_ep_max_packet_size(uac2_opts, &fs_epin_desc, 1000, true);
@@ -556,16 +678,20 @@ afunc_bind(struct usb_configuration *cfg, struct usb_function *fn)
         set_ep_max_packet_size(uac2_opts, &hs_epin_desc, 8000, true);
         set_ep_max_packet_size(uac2_opts, &hs_epout_desc, 8000, false);
 
-        agdev->out_ep = usb_ep_autoconfig(gadget, &fs_epout_desc);
-        if (!agdev->out_ep) {
-                dev_err(dev, "%s:%d Error!\n", __func__, __LINE__);
-                return -ENODEV;
+        if (EPOUT_EN(uac2_opts)) {
+                agdev->out_ep = usb_ep_autoconfig(gadget, &fs_epout_desc);
+                if (!agdev->out_ep) {
+                        dev_err(dev, "%s:%d Error!\n", __func__, __LINE__);
+                        return -ENODEV;
+                }
         }
 
-        agdev->in_ep = usb_ep_autoconfig(gadget, &fs_epin_desc);
-        if (!agdev->in_ep) {
-                dev_err(dev, "%s:%d Error!\n", __func__, __LINE__);
-                return -ENODEV;
+        if (EPIN_EN(uac2_opts)) {
+                agdev->in_ep = usb_ep_autoconfig(gadget, &fs_epin_desc);
+                if (!agdev->in_ep) {
+                        dev_err(dev, "%s:%d Error!\n", __func__, __LINE__);
+                        return -ENODEV;
+                }
         }
 
         agdev->in_ep_maxpsize = max_t(u16,
@@ -578,6 +704,8 @@ afunc_bind(struct usb_configuration *cfg, struct usb_function *fn)
         hs_epout_desc.bEndpointAddress = fs_epout_desc.bEndpointAddress;
         hs_epin_desc.bEndpointAddress = fs_epin_desc.bEndpointAddress;
 
+        setup_descriptor(uac2_opts);
+
         ret = usb_assign_descriptors(fn, fs_audio_desc, hs_audio_desc, NULL,
                                      NULL);
         if (ret)
diff --git a/drivers/usb/gadget/function/f_uvc.c b/drivers/usb/gadget/function/f_uvc.c
index d8ce7868fe22..8c99392df593 100644
--- a/drivers/usb/gadget/function/f_uvc.c
+++ b/drivers/usb/gadget/function/f_uvc.c
@@ -197,12 +197,6 @@ static const struct usb_descriptor_header * const uvc_ss_streaming[] = {
         NULL,
 };
 
-void uvc_set_trace_param(unsigned int trace)
-{
-        uvc_gadget_trace_param = trace;
-}
-EXPORT_SYMBOL(uvc_set_trace_param);
-
 /* --------------------------------------------------------------------------
  * Control requests
  */
@@ -232,13 +226,8 @@ uvc_function_setup(struct usb_function *f, const struct usb_ctrlrequest *ctrl)
         struct v4l2_event v4l2_event;
         struct uvc_event *uvc_event = (void *)&v4l2_event.u.data;
 
-        /* printk(KERN_INFO "setup request %02x %02x value %04x index %04x %04x\n",
-         *      ctrl->bRequestType, ctrl->bRequest, le16_to_cpu(ctrl->wValue),
-         *      le16_to_cpu(ctrl->wIndex), le16_to_cpu(ctrl->wLength));
-         */
-
         if ((ctrl->bRequestType & USB_TYPE_MASK) != USB_TYPE_CLASS) {
-                INFO(f->config->cdev, "invalid request type\n");
+                uvcg_info(f, "invalid request type\n");
                 return -EINVAL;
         }
 
@@ -272,7 +261,7 @@ uvc_function_get_alt(struct usb_function *f, unsigned interface)
 {
         struct uvc_device *uvc = to_uvc(f);
 
-        INFO(f->config->cdev, "uvc_function_get_alt(%u)\n", interface);
+        uvcg_info(f, "%s(%u)\n", __func__, interface);
 
         if (interface == uvc->control_intf)
                 return 0;
@@ -291,13 +280,13 @@ uvc_function_set_alt(struct usb_function *f, unsigned interface, unsigned alt)
         struct uvc_event *uvc_event = (void *)&v4l2_event.u.data;
         int ret;
 
-        INFO(cdev, "uvc_function_set_alt(%u, %u)\n", interface, alt);
+        uvcg_info(f, "%s(%u, %u)\n", __func__, interface, alt);
 
         if (interface == uvc->control_intf) {
                 if (alt)
                         return -EINVAL;
 
-                INFO(cdev, "reset UVC Control\n");
+                uvcg_info(f, "reset UVC Control\n");
                 usb_ep_disable(uvc->control_ep);
 
                 if (!uvc->control_ep->desc)
@@ -348,7 +337,7 @@ uvc_function_set_alt(struct usb_function *f, unsigned interface, unsigned alt)
                 if (!uvc->video.ep)
                         return -EINVAL;
 
-                INFO(cdev, "reset UVC\n");
+                uvcg_info(f, "reset UVC\n");
                 usb_ep_disable(uvc->video.ep);
 
                 ret = config_ep_by_speed(f->config->cdev->gadget,
@@ -373,7 +362,7 @@ uvc_function_disable(struct usb_function *f)
         struct uvc_device *uvc = to_uvc(f);
         struct v4l2_event v4l2_event;
 
-        INFO(f->config->cdev, "uvc_function_disable\n");
+        uvcg_info(f, "%s()\n", __func__);
 
         memset(&v4l2_event, 0, sizeof(v4l2_event));
         v4l2_event.type = UVC_EVENT_DISCONNECT;
@@ -392,21 +381,19 @@ uvc_function_disable(struct usb_function *f)
 void
 uvc_function_connect(struct uvc_device *uvc)
 {
-        struct usb_composite_dev *cdev = uvc->func.config->cdev;
         int ret;
 
         if ((ret = usb_function_activate(&uvc->func)) < 0)
-                INFO(cdev, "UVC connect failed with %d\n", ret);
+                uvcg_info(&uvc->func, "UVC connect failed with %d\n", ret);
 }
 
 void
 uvc_function_disconnect(struct uvc_device *uvc)
 {
-        struct usb_composite_dev *cdev = uvc->func.config->cdev;
         int ret;
 
         if ((ret = usb_function_deactivate(&uvc->func)) < 0)
-                INFO(cdev, "UVC disconnect failed with %d\n", ret);
+                uvcg_info(&uvc->func, "UVC disconnect failed with %d\n", ret);
 }
 
 /* --------------------------------------------------------------------------
@@ -605,7 +592,7 @@ uvc_function_bind(struct usb_configuration *c, struct usb_function *f)
         struct f_uvc_opts *opts;
         int ret = -EINVAL;
 
-        INFO(cdev, "uvc_function_bind\n");
+        uvcg_info(f, "%s()\n", __func__);
 
         opts = fi_to_f_uvc_opts(f->fi);
         /* Sanity check the streaming endpoint module parameters.
@@ -618,8 +605,8 @@ uvc_function_bind(struct usb_configuration *c, struct usb_function *f)
         if (opts->streaming_maxburst &&
             (opts->streaming_maxpacket % 1024) != 0) {
                 opts->streaming_maxpacket = roundup(opts->streaming_maxpacket, 1024);
-                INFO(cdev, "overriding streaming_maxpacket to %d\n",
-                     opts->streaming_maxpacket);
+                uvcg_info(f, "overriding streaming_maxpacket to %d\n",
+                          opts->streaming_maxpacket);
         }
 
         /* Fill in the FS/HS/SS Video Streaming specific descriptors from the
@@ -658,7 +645,7 @@ uvc_function_bind(struct usb_configuration *c, struct usb_function *f)
         /* Allocate endpoints. */
         ep = usb_ep_autoconfig(cdev->gadget, &uvc_control_ep);
         if (!ep) {
-                INFO(cdev, "Unable to allocate control EP\n");
+                uvcg_info(f, "Unable to allocate control EP\n");
                 goto error;
         }
         uvc->control_ep = ep;
@@ -672,7 +659,7 @@ uvc_function_bind(struct usb_configuration *c, struct usb_function *f)
                 ep = usb_ep_autoconfig(cdev->gadget, &uvc_fs_streaming_ep);
 
         if (!ep) {
-                INFO(cdev, "Unable to allocate streaming EP\n");
+                uvcg_info(f, "Unable to allocate streaming EP\n");
                 goto error;
         }
         uvc->video.ep = ep;
@@ -699,12 +686,14 @@ uvc_function_bind(struct usb_configuration *c, struct usb_function *f)
         uvc_iad.bFirstInterface = ret;
         uvc_control_intf.bInterfaceNumber = ret;
         uvc->control_intf = ret;
+        opts->control_interface = ret;
 
         if ((ret = usb_interface_id(c, f)) < 0)
                 goto error;
         uvc_streaming_intf_alt0.bInterfaceNumber = ret;
         uvc_streaming_intf_alt1.bInterfaceNumber = ret;
         uvc->streaming_intf = ret;
+        opts->streaming_interface = ret;
 
         /* Copy descriptors */
         f->fs_descriptors = uvc_copy_descriptors(uvc, USB_SPEED_FULL);
@@ -743,19 +732,19 @@ uvc_function_bind(struct usb_configuration *c, struct usb_function *f)
         uvc->control_req->context = uvc;
 
         if (v4l2_device_register(&cdev->gadget->dev, &uvc->v4l2_dev)) {
-                printk(KERN_INFO "v4l2_device_register failed\n");
+                uvcg_err(f, "failed to register V4L2 device\n");
                 goto error;
         }
 
         /* Initialise video. */
-        ret = uvcg_video_init(&uvc->video);
+        ret = uvcg_video_init(&uvc->video, uvc);
         if (ret < 0)
                 goto error;
 
         /* Register a V4L2 device. */
         ret = uvc_register_video(uvc);
         if (ret < 0) {
-                printk(KERN_INFO "Unable to register video device\n");
+                uvcg_err(f, "failed to register video device\n");
                 goto error;
         }
 
@@ -792,6 +781,7 @@ static struct usb_function_instance *uvc_alloc_inst(void)
         struct uvc_output_terminal_descriptor *od;
         struct uvc_color_matching_descriptor *md;
         struct uvc_descriptor_header **ctl_cls;
+        int ret;
 
         opts = kzalloc(sizeof(*opts), GFP_KERNEL);
         if (!opts)
@@ -868,7 +858,12 @@ static struct usb_function_instance *uvc_alloc_inst(void)
         opts->streaming_interval = 1;
         opts->streaming_maxpacket = 1024;
 
-        uvcg_attach_configfs(opts);
+        ret = uvcg_attach_configfs(opts);
+        if (ret < 0) {
+                kfree(opts);
+                return ERR_PTR(ret);
+        }
+
         return &opts->func_inst;
 }
 
@@ -886,7 +881,7 @@ static void uvc_unbind(struct usb_configuration *c, struct usb_function *f)
         struct usb_composite_dev *cdev = c->cdev;
         struct uvc_device *uvc = to_uvc(f);
 
-        INFO(cdev, "%s\n", __func__);
+        uvcg_info(f, "%s\n", __func__);
 
         device_remove_file(&uvc->vdev.dev, &dev_attr_function_name);
         video_unregister_device(&uvc->vdev);
diff --git a/drivers/usb/gadget/function/u_uvc.h b/drivers/usb/gadget/function/u_uvc.h
index 2ed292e94fbc..5242d489e20a 100644
--- a/drivers/usb/gadget/function/u_uvc.h
+++ b/drivers/usb/gadget/function/u_uvc.h
@@ -25,6 +25,9 @@ struct f_uvc_opts {
         unsigned int                                    streaming_maxpacket;
         unsigned int                                    streaming_maxburst;
 
+        unsigned int                                    control_interface;
+        unsigned int                                    streaming_interface;
+
         /*
          * Control descriptors array pointers for full-/high-speed and
          * super-speed. They point by default to the uvc_fs_control_cls and
diff --git a/drivers/usb/gadget/function/uvc.h b/drivers/usb/gadget/function/uvc.h
index 93cf78b420fe..099d650082e5 100644
--- a/drivers/usb/gadget/function/uvc.h
+++ b/drivers/usb/gadget/function/uvc.h
@@ -24,6 +24,7 @@
 struct usb_ep;
 struct usb_request;
 struct uvc_descriptor_header;
+struct uvc_device;
 
 /* ------------------------------------------------------------------------
  * Debugging, printing and logging
@@ -51,14 +52,12 @@ extern unsigned int uvc_gadget_trace_param;
                         printk(KERN_DEBUG "uvcvideo: " msg); \
         } while (0)
 
-#define uvc_warn_once(dev, warn, msg...) \
-        do { \
-                if (!test_and_set_bit(warn, &dev->warnings)) \
-                        printk(KERN_INFO "uvcvideo: " msg); \
-        } while (0)
-
-#define uvc_printk(level, msg...) \
-        printk(level "uvcvideo: " msg)
+#define uvcg_dbg(f, fmt, args...) \
+        dev_dbg(&(f)->config->cdev->gadget->dev, "%s: " fmt, (f)->name, ##args)
+#define uvcg_info(f, fmt, args...) \
+        dev_info(&(f)->config->cdev->gadget->dev, "%s: " fmt, (f)->name, ##args)
+#define uvcg_err(f, fmt, args...) \
+        dev_err(&(f)->config->cdev->gadget->dev, "%s: " fmt, (f)->name, ##args)
 
 /* ------------------------------------------------------------------------
  * Driver specific constants
@@ -73,6 +72,7 @@ extern unsigned int uvc_gadget_trace_param;
  */
 
 struct uvc_video {
+        struct uvc_device *uvc;
         struct usb_ep *ep;
 
         /* Frame parameters */
diff --git a/drivers/usb/gadget/function/uvc_configfs.c b/drivers/usb/gadget/function/uvc_configfs.c
index b51f0d278826..bc1e2af566c3 100644
--- a/drivers/usb/gadget/function/uvc_configfs.c
+++ b/drivers/usb/gadget/function/uvc_configfs.c
@@ -9,9 +9,16 @@
  *
  * Author: Andrzej Pietrasiewicz <andrzej.p@samsung.com>
  */
+
+#include <linux/sort.h>
+
 #include "u_uvc.h"
 #include "uvc_configfs.h"
 
+/* -----------------------------------------------------------------------------
+ * Global Utility Structures and Macros
+ */
+
 #define UVCG_STREAMING_CONTROL_SIZE     1
 
 #define UVC_ATTR(prefix, cname, aname) \
@@ -31,13 +38,93 @@ static struct configfs_attribute prefix##attr_##cname = { \
         .show           = prefix##cname##_show,                         \
 }
 
+#define le8_to_cpu(x)   (x)
+#define cpu_to_le8(x)   (x)
+
+static int uvcg_config_compare_u32(const void *l, const void *r)
+{
+        u32 li = *(const u32 *)l;
+        u32 ri = *(const u32 *)r;
+
+        return li < ri ? -1 : li == ri ? 0 : 1;
+}
+
 static inline struct f_uvc_opts *to_f_uvc_opts(struct config_item *item)
 {
         return container_of(to_config_group(item), struct f_uvc_opts,
                             func_inst.group);
 }
 
-/* control/header/<NAME> */
+struct uvcg_config_group_type {
+        struct config_item_type type;
+        const char *name;
+        const struct uvcg_config_group_type **children;
+        int (*create_children)(struct config_group *group);
+};
+
+static void uvcg_config_item_release(struct config_item *item)
+{
+        struct config_group *group = to_config_group(item);
+
+        kfree(group);
+}
+
+static struct configfs_item_operations uvcg_config_item_ops = {
+        .release        = uvcg_config_item_release,
+};
+
+static int uvcg_config_create_group(struct config_group *parent,
+                                    const struct uvcg_config_group_type *type);
+
+static int uvcg_config_create_children(struct config_group *group,
+                                const struct uvcg_config_group_type *type)
+{
+        const struct uvcg_config_group_type **child;
+        int ret;
+
+        if (type->create_children)
+                return type->create_children(group);
+
+        for (child = type->children; child && *child; ++child) {
+                ret = uvcg_config_create_group(group, *child);
+                if (ret < 0)
+                        return ret;
+        }
+
+        return 0;
+}
+
+static int uvcg_config_create_group(struct config_group *parent,
+                                    const struct uvcg_config_group_type *type)
+{
+        struct config_group *group;
+
+        group = kzalloc(sizeof(*group), GFP_KERNEL);
+        if (!group)
+                return -ENOMEM;
+
+        config_group_init_type_name(group, type->name, &type->type);
+        configfs_add_default_group(group, parent);
+
+        return uvcg_config_create_children(group, type);
+}
+
+static void uvcg_config_remove_children(struct config_group *group)
+{
+        struct config_group *child, *n;
+
+        list_for_each_entry_safe(child, n, &group->default_groups, group_entry) {
+                list_del(&child->group_entry);
+                uvcg_config_remove_children(child);
+                config_item_put(&child->cg_item);
+        }
+}
+
+/* -----------------------------------------------------------------------------
+ * control/header/<NAME>
+ * control/header
+ */
+
 DECLARE_UVC_HEADER_DESCRIPTOR(1);
 
 struct uvcg_control_header {
@@ -51,9 +138,9 @@ static struct uvcg_control_header *to_uvcg_control_header(struct config_item *it
         return container_of(item, struct uvcg_control_header, item);
 }
 
-#define UVCG_CTRL_HDR_ATTR(cname, aname, conv, str2u, uxx, vnoc, limit) \
+#define UVCG_CTRL_HDR_ATTR(cname, aname, bits, limit)                   \
 static ssize_t uvcg_control_header_##cname##_show(                      \
-        struct config_item *item, char *page)                   \
+        struct config_item *item, char *page)                           \
 {                                                                       \
         struct uvcg_control_header *ch = to_uvcg_control_header(item);  \
         struct f_uvc_opts *opts;                                        \
@@ -67,7 +154,7 @@ static ssize_t uvcg_control_header_##cname##_show(			\
         opts = to_f_uvc_opts(opts_item);                                \
                                                                         \
         mutex_lock(&opts->lock);                                        \
-        result = sprintf(page, "%d\n", conv(ch->desc.aname));           \
+        result = sprintf(page, "%u\n", le##bits##_to_cpu(ch->desc.aname));\
         mutex_unlock(&opts->lock);                                      \
                                                                         \
         mutex_unlock(su_mutex);                                         \
@@ -83,7 +170,7 @@ uvcg_control_header_##cname##_store(struct config_item *item,		\
         struct config_item *opts_item;                                  \
         struct mutex *su_mutex = &ch->item.ci_group->cg_subsys->su_mutex;\
         int ret;                                                        \
-        uxx num;                                                        \
+        u##bits num;                                                    \
                                                                         \
         mutex_lock(su_mutex); /* for navigating configfs hierarchy */   \
                                                                         \
@@ -96,7 +183,7 @@ uvcg_control_header_##cname##_store(struct config_item *item,		\
                 goto end;                                               \
         }                                                               \
                                                                         \
-        ret = str2u(page, 0, &num);                                     \
+        ret = kstrtou##bits(page, 0, &num);                             \
         if (ret)                                                        \
                 goto end;                                               \
                                                                         \
@@ -104,7 +191,7 @@ uvcg_control_header_##cname##_store(struct config_item *item,		\
                 ret = -EINVAL;                                          \
                 goto end;                                               \
         }                                                               \
-        ch->desc.aname = vnoc(num);                                     \
+        ch->desc.aname = cpu_to_le##bits(num);                          \
         ret = len;                                                      \
 end:                                                                    \
         mutex_unlock(&opts->lock);                                      \
@@ -114,11 +201,9 @@ end:									\
                                                                         \
 UVC_ATTR(uvcg_control_header_, cname, aname)
 
-UVCG_CTRL_HDR_ATTR(bcd_uvc, bcdUVC, le16_to_cpu, kstrtou16, u16, cpu_to_le16,
-                   0xffff);
+UVCG_CTRL_HDR_ATTR(bcd_uvc, bcdUVC, 16, 0xffff);
 
-UVCG_CTRL_HDR_ATTR(dw_clock_frequency, dwClockFrequency, le32_to_cpu, kstrtou32,
-                   u32, cpu_to_le32, 0x7fffffff);
+UVCG_CTRL_HDR_ATTR(dw_clock_frequency, dwClockFrequency, 32, 0x7fffffff);
 
 #undef UVCG_CTRL_HDR_ATTR
 
@@ -129,6 +214,7 @@ static struct configfs_attribute *uvcg_control_header_attrs[] = {
 };
 
 static const struct config_item_type uvcg_control_header_type = {
+        .ct_item_ops    = &uvcg_config_item_ops,
         .ct_attrs       = uvcg_control_header_attrs,
         .ct_owner       = THIS_MODULE,
 };
@@ -153,60 +239,42 @@ static struct config_item *uvcg_control_header_make(struct config_group *group,
         return &h->item;
 }
 
-static void uvcg_control_header_drop(struct config_group *group,
-                              struct config_item *item)
-{
-        struct uvcg_control_header *h = to_uvcg_control_header(item);
-
-        kfree(h);
-}
-
-/* control/header */
-static struct uvcg_control_header_grp {
-        struct config_group     group;
-} uvcg_control_header_grp;
-
 static struct configfs_group_operations uvcg_control_header_grp_ops = {
         .make_item              = uvcg_control_header_make,
-        .drop_item              = uvcg_control_header_drop,
 };
 
-static const struct config_item_type uvcg_control_header_grp_type = {
-        .ct_group_ops   = &uvcg_control_header_grp_ops,
-        .ct_owner       = THIS_MODULE,
+static const struct uvcg_config_group_type uvcg_control_header_grp_type = {
+        .type = {
+                .ct_item_ops    = &uvcg_config_item_ops,
+                .ct_group_ops   = &uvcg_control_header_grp_ops,
+                .ct_owner       = THIS_MODULE,
+        },
+        .name = "header",
 };
 
-/* control/processing/default */
-static struct uvcg_default_processing {
-        struct config_group     group;
-} uvcg_default_processing;
-
-static inline struct uvcg_default_processing
-*to_uvcg_default_processing(struct config_item *item)
-{
-        return container_of(to_config_group(item),
-                            struct uvcg_default_processing, group);
-}
+/* -----------------------------------------------------------------------------
+ * control/processing/default
+ */
 
-#define UVCG_DEFAULT_PROCESSING_ATTR(cname, aname, conv)                \
+#define UVCG_DEFAULT_PROCESSING_ATTR(cname, aname, bits)                \
 static ssize_t uvcg_default_processing_##cname##_show(                  \
         struct config_item *item, char *page)                           \
 {                                                                       \
-        struct uvcg_default_processing *dp = to_uvcg_default_processing(item); \
+        struct config_group *group = to_config_group(item);             \
         struct f_uvc_opts *opts;                                        \
         struct config_item *opts_item;                                  \
-        struct mutex *su_mutex = &dp->group.cg_subsys->su_mutex;        \
+        struct mutex *su_mutex = &group->cg_subsys->su_mutex;           \
         struct uvc_processing_unit_descriptor *pd;                      \
         int result;                                                     \
                                                                         \
         mutex_lock(su_mutex); /* for navigating configfs hierarchy */   \
                                                                         \
-        opts_item = dp->group.cg_item.ci_parent->ci_parent->ci_parent;  \
+        opts_item = group->cg_item.ci_parent->ci_parent->ci_parent;     \
         opts = to_f_uvc_opts(opts_item);                                \
         pd = &opts->uvc_processing;                                     \
                                                                         \
         mutex_lock(&opts->lock);                                        \
-        result = sprintf(page, "%d\n", conv(pd->aname));                \
+        result = sprintf(page, "%u\n", le##bits##_to_cpu(pd->aname));   \
         mutex_unlock(&opts->lock);                                      \
                                                                         \
         mutex_unlock(su_mutex);                                         \
@@ -215,37 +283,33 @@ static ssize_t uvcg_default_processing_##cname##_show(			\
                                                                         \
 UVC_ATTR_RO(uvcg_default_processing_, cname, aname)
 
-#define identity_conv(x) (x)
-
-UVCG_DEFAULT_PROCESSING_ATTR(b_unit_id, bUnitID, identity_conv);
-UVCG_DEFAULT_PROCESSING_ATTR(b_source_id, bSourceID, identity_conv);
-UVCG_DEFAULT_PROCESSING_ATTR(w_max_multiplier, wMaxMultiplier, le16_to_cpu);
-UVCG_DEFAULT_PROCESSING_ATTR(i_processing, iProcessing, identity_conv);
-
-#undef identity_conv
+UVCG_DEFAULT_PROCESSING_ATTR(b_unit_id, bUnitID, 8);
+UVCG_DEFAULT_PROCESSING_ATTR(b_source_id, bSourceID, 8);
+UVCG_DEFAULT_PROCESSING_ATTR(w_max_multiplier, wMaxMultiplier, 16);
+UVCG_DEFAULT_PROCESSING_ATTR(i_processing, iProcessing, 8);
 
 #undef UVCG_DEFAULT_PROCESSING_ATTR
 
 static ssize_t uvcg_default_processing_bm_controls_show(
         struct config_item *item, char *page)
 {
-        struct uvcg_default_processing *dp = to_uvcg_default_processing(item);
+        struct config_group *group = to_config_group(item);
         struct f_uvc_opts *opts;
         struct config_item *opts_item;
-        struct mutex *su_mutex = &dp->group.cg_subsys->su_mutex;
+        struct mutex *su_mutex = &group->cg_subsys->su_mutex;
         struct uvc_processing_unit_descriptor *pd;
         int result, i;
         char *pg = page;
 
         mutex_lock(su_mutex); /* for navigating configfs hierarchy */
 
-        opts_item = dp->group.cg_item.ci_parent->ci_parent->ci_parent;
+        opts_item = group->cg_item.ci_parent->ci_parent->ci_parent;
         opts = to_f_uvc_opts(opts_item);
         pd = &opts->uvc_processing;
 
         mutex_lock(&opts->lock);
         for (result = 0, i = 0; i < pd->bControlSize; ++i) {
-                result += sprintf(pg, "%d\n", pd->bmControls[i]);
+                result += sprintf(pg, "%u\n", pd->bmControls[i]);
                 pg = page + result;
         }
         mutex_unlock(&opts->lock);
@@ -266,54 +330,55 @@ static struct configfs_attribute *uvcg_default_processing_attrs[] = {
         NULL,
 };
 
-static const struct config_item_type uvcg_default_processing_type = {
-        .ct_attrs       = uvcg_default_processing_attrs,
-        .ct_owner       = THIS_MODULE,
+static const struct uvcg_config_group_type uvcg_default_processing_type = {
+        .type = {
+                .ct_item_ops    = &uvcg_config_item_ops,
+                .ct_attrs       = uvcg_default_processing_attrs,
+                .ct_owner       = THIS_MODULE,
+        },
+        .name = "default",
 };
 
-/* struct uvcg_processing {}; */
-
-/* control/processing */
-static struct uvcg_processing_grp {
-        struct config_group     group;
-} uvcg_processing_grp;
+/* -----------------------------------------------------------------------------
+ * control/processing
+ */
 
-static const struct config_item_type uvcg_processing_grp_type = {
-        .ct_owner = THIS_MODULE,
+static const struct uvcg_config_group_type uvcg_processing_grp_type = {
+        .type = {
+                .ct_item_ops    = &uvcg_config_item_ops,
+                .ct_owner       = THIS_MODULE,
+        },
+        .name = "processing",
+        .children = (const struct uvcg_config_group_type*[]) {
+                &uvcg_default_processing_type,
+                NULL,
+        },
 };
 
-/* control/terminal/camera/default */
-static struct uvcg_default_camera {
-        struct config_group     group;
-} uvcg_default_camera;
-
-static inline struct uvcg_default_camera
-*to_uvcg_default_camera(struct config_item *item)
-{
-        return container_of(to_config_group(item),
-                            struct uvcg_default_camera, group);
-}
+/* -----------------------------------------------------------------------------
+ * control/terminal/camera/default
+ */
 
-#define UVCG_DEFAULT_CAMERA_ATTR(cname, aname, conv)                    \
+#define UVCG_DEFAULT_CAMERA_ATTR(cname, aname, bits)                    \
 static ssize_t uvcg_default_camera_##cname##_show(                      \
         struct config_item *item, char *page)                           \
 {                                                                       \
-        struct uvcg_default_camera *dc = to_uvcg_default_camera(item);  \
+        struct config_group *group = to_config_group(item);             \
         struct f_uvc_opts *opts;                                        \
         struct config_item *opts_item;                                  \
-        struct mutex *su_mutex = &dc->group.cg_subsys->su_mutex;        \
+        struct mutex *su_mutex = &group->cg_subsys->su_mutex;           \
         struct uvc_camera_terminal_descriptor *cd;                      \
         int result;                                                     \
                                                                         \
         mutex_lock(su_mutex); /* for navigating configfs hierarchy */   \
                                                                         \
-        opts_item = dc->group.cg_item.ci_parent->ci_parent->ci_parent-> \
+        opts_item = group->cg_item.ci_parent->ci_parent->ci_parent->    \
                         ci_parent;                                      \
         opts = to_f_uvc_opts(opts_item);                                \
         cd = &opts->uvc_camera_terminal;                                \
                                                                         \
         mutex_lock(&opts->lock);                                        \
-        result = sprintf(page, "%d\n", conv(cd->aname));                \
+        result = sprintf(page, "%u\n", le##bits##_to_cpu(cd->aname));   \
         mutex_unlock(&opts->lock);                                      \
                                                                         \
         mutex_unlock(su_mutex);                                         \
@@ -323,44 +388,40 @@ static ssize_t uvcg_default_camera_##cname##_show(			\
                                                                         \
 UVC_ATTR_RO(uvcg_default_camera_, cname, aname)
 
-#define identity_conv(x) (x)
-
-UVCG_DEFAULT_CAMERA_ATTR(b_terminal_id, bTerminalID, identity_conv);
-UVCG_DEFAULT_CAMERA_ATTR(w_terminal_type, wTerminalType, le16_to_cpu);
-UVCG_DEFAULT_CAMERA_ATTR(b_assoc_terminal, bAssocTerminal, identity_conv);
-UVCG_DEFAULT_CAMERA_ATTR(i_terminal, iTerminal, identity_conv);
+UVCG_DEFAULT_CAMERA_ATTR(b_terminal_id, bTerminalID, 8);
+UVCG_DEFAULT_CAMERA_ATTR(w_terminal_type, wTerminalType, 16);
+UVCG_DEFAULT_CAMERA_ATTR(b_assoc_terminal, bAssocTerminal, 8);
+UVCG_DEFAULT_CAMERA_ATTR(i_terminal, iTerminal, 8);
 UVCG_DEFAULT_CAMERA_ATTR(w_objective_focal_length_min, wObjectiveFocalLengthMin,
-                         le16_to_cpu);
+                         16);
 UVCG_DEFAULT_CAMERA_ATTR(w_objective_focal_length_max, wObjectiveFocalLengthMax,
-                         le16_to_cpu);
+                         16);
 UVCG_DEFAULT_CAMERA_ATTR(w_ocular_focal_length, wOcularFocalLength,
-                         le16_to_cpu);
-
-#undef identity_conv
+                         16);
 
 #undef UVCG_DEFAULT_CAMERA_ATTR
 
 static ssize_t uvcg_default_camera_bm_controls_show(
         struct config_item *item, char *page)
 {
-        struct uvcg_default_camera *dc = to_uvcg_default_camera(item);
+        struct config_group *group = to_config_group(item);
         struct f_uvc_opts *opts;
         struct config_item *opts_item;
-        struct mutex *su_mutex = &dc->group.cg_subsys->su_mutex;
+        struct mutex *su_mutex = &group->cg_subsys->su_mutex;
         struct uvc_camera_terminal_descriptor *cd;
         int result, i;
         char *pg = page;
 
         mutex_lock(su_mutex); /* for navigating configfs hierarchy */
 
-        opts_item = dc->group.cg_item.ci_parent->ci_parent->ci_parent->
+        opts_item = group->cg_item.ci_parent->ci_parent->ci_parent->
                         ci_parent;
         opts = to_f_uvc_opts(opts_item);
         cd = &opts->uvc_camera_terminal;
 
         mutex_lock(&opts->lock);
         for (result = 0, i = 0; i < cd->bControlSize; ++i) {
-                result += sprintf(pg, "%d\n", cd->bmControls[i]);
+                result += sprintf(pg, "%u\n", cd->bmControls[i]);
                 pg = page + result;
         }
         mutex_unlock(&opts->lock);
@@ -383,54 +444,55 @@ static struct configfs_attribute *uvcg_default_camera_attrs[] = {
         NULL,
 };
 
-static const struct config_item_type uvcg_default_camera_type = {
-        .ct_attrs       = uvcg_default_camera_attrs,
-        .ct_owner       = THIS_MODULE,
+static const struct uvcg_config_group_type uvcg_default_camera_type = {
+        .type = {
+                .ct_item_ops    = &uvcg_config_item_ops,
+                .ct_attrs       = uvcg_default_camera_attrs,
+                .ct_owner       = THIS_MODULE,
+        },
+        .name = "default",
 };
 
-/* struct uvcg_camera {}; */
-
-/* control/terminal/camera */
-static struct uvcg_camera_grp {
-        struct config_group     group;
-} uvcg_camera_grp;
+/* -----------------------------------------------------------------------------
+ * control/terminal/camera
+ */
 
-static const struct config_item_type uvcg_camera_grp_type = {
-        .ct_owner = THIS_MODULE,
+static const struct uvcg_config_group_type uvcg_camera_grp_type = {
+        .type = {
+                .ct_item_ops    = &uvcg_config_item_ops,
+                .ct_owner       = THIS_MODULE,
+        },
+        .name = "camera",
+        .children = (const struct uvcg_config_group_type*[]) {
+                &uvcg_default_camera_type,
+                NULL,
+        },
 };
 
-/* control/terminal/output/default */
-static struct uvcg_default_output {
-        struct config_group     group;
-} uvcg_default_output;
-
-static inline struct uvcg_default_output
-*to_uvcg_default_output(struct config_item *item)
-{
-        return container_of(to_config_group(item),
-                            struct uvcg_default_output, group);
-}
+/* -----------------------------------------------------------------------------
+ * control/terminal/output/default
+ */
 
-#define UVCG_DEFAULT_OUTPUT_ATTR(cname, aname, conv)                    \
+#define UVCG_DEFAULT_OUTPUT_ATTR(cname, aname, bits)                    \
 static ssize_t uvcg_default_output_##cname##_show(                      \
-        struct config_item *item, char *page)                   \
+        struct config_item *item, char *page)                           \
 {                                                                       \
-        struct uvcg_default_output *dout = to_uvcg_default_output(item); \
+        struct config_group *group = to_config_group(item);             \
         struct f_uvc_opts *opts;                                        \
         struct config_item *opts_item;                                  \
-        struct mutex *su_mutex = &dout->group.cg_subsys->su_mutex;      \
+        struct mutex *su_mutex = &group->cg_subsys->su_mutex;           \
         struct uvc_output_terminal_descriptor *cd;                      \
         int result;                                                     \
                                                                         \
         mutex_lock(su_mutex); /* for navigating configfs hierarchy */   \
                                                                         \
-        opts_item = dout->group.cg_item.ci_parent->ci_parent->          \
+        opts_item = group->cg_item.ci_parent->ci_parent->               \
                         ci_parent->ci_parent;                           \
         opts = to_f_uvc_opts(opts_item);                                \
         cd = &opts->uvc_output_terminal;                                \
                                                                         \
         mutex_lock(&opts->lock);                                        \
-        result = sprintf(page, "%d\n", conv(cd->aname));                \
+        result = sprintf(page, "%u\n", le##bits##_to_cpu(cd->aname));   \
         mutex_unlock(&opts->lock);                                      \
                                                                         \
         mutex_unlock(su_mutex);                                         \
@@ -440,15 +502,11 @@ static ssize_t uvcg_default_output_##cname##_show(			\
                                                                         \
 UVC_ATTR_RO(uvcg_default_output_, cname, aname)
 
-#define identity_conv(x) (x)
-
-UVCG_DEFAULT_OUTPUT_ATTR(b_terminal_id, bTerminalID, identity_conv);
-UVCG_DEFAULT_OUTPUT_ATTR(w_terminal_type, wTerminalType, le16_to_cpu);
-UVCG_DEFAULT_OUTPUT_ATTR(b_assoc_terminal, bAssocTerminal, identity_conv);
-UVCG_DEFAULT_OUTPUT_ATTR(b_source_id, bSourceID, identity_conv);
-UVCG_DEFAULT_OUTPUT_ATTR(i_terminal, iTerminal, identity_conv);
-
-#undef identity_conv
+UVCG_DEFAULT_OUTPUT_ATTR(b_terminal_id, bTerminalID, 8);
+UVCG_DEFAULT_OUTPUT_ATTR(w_terminal_type, wTerminalType, 16);
+UVCG_DEFAULT_OUTPUT_ATTR(b_assoc_terminal, bAssocTerminal, 8);
+UVCG_DEFAULT_OUTPUT_ATTR(b_source_id, bSourceID, 8);
+UVCG_DEFAULT_OUTPUT_ATTR(i_terminal, iTerminal, 8);
 
 #undef UVCG_DEFAULT_OUTPUT_ATTR
 
@@ -461,47 +519,68 @@ static struct configfs_attribute *uvcg_default_output_attrs[] = {
         NULL,
 };
 
-static const struct config_item_type uvcg_default_output_type = {
-        .ct_attrs       = uvcg_default_output_attrs,
-        .ct_owner       = THIS_MODULE,
+static const struct uvcg_config_group_type uvcg_default_output_type = {
+        .type = {
+                .ct_item_ops    = &uvcg_config_item_ops,
+                .ct_attrs       = uvcg_default_output_attrs,
+                .ct_owner       = THIS_MODULE,
+        },
+        .name = "default",
 };
 
-/* struct uvcg_output {}; */
-
-/* control/terminal/output */
-static struct uvcg_output_grp {
-        struct config_group     group;
-} uvcg_output_grp;
+/* -----------------------------------------------------------------------------
+ * control/terminal/output
+ */
 
-static const struct config_item_type uvcg_output_grp_type = {
-        .ct_owner = THIS_MODULE,
+static const struct uvcg_config_group_type uvcg_output_grp_type = {
+        .type = {
+                .ct_item_ops    = &uvcg_config_item_ops,
+                .ct_owner       = THIS_MODULE,
+        },
+        .name = "output",
+        .children = (const struct uvcg_config_group_type*[]) {
+                &uvcg_default_output_type,
+                NULL,
+        },
 };
 
-/* control/terminal */
-static struct uvcg_terminal_grp {
-        struct config_group     group;
-} uvcg_terminal_grp;
+/* -----------------------------------------------------------------------------
+ * control/terminal
+ */
 
-static const struct config_item_type uvcg_terminal_grp_type = {
-        .ct_owner = THIS_MODULE,
+static const struct uvcg_config_group_type uvcg_terminal_grp_type = {
+        .type = {
+                .ct_item_ops    = &uvcg_config_item_ops,
+                .ct_owner       = THIS_MODULE,
+        },
+        .name = "terminal",
+        .children = (const struct uvcg_config_group_type*[]) {
+                &uvcg_camera_grp_type,
+                &uvcg_output_grp_type,
+                NULL,
+        },
 };
 
-/* control/class/{fs} */
-static struct uvcg_control_class {
-        struct config_group     group;
-} uvcg_control_class_fs, uvcg_control_class_ss;
+/* -----------------------------------------------------------------------------
+ * control/class/{fs|ss}
+ */
 
+struct uvcg_control_class_group {
+        struct config_group group;
+        const char *name;
+};
 
 static inline struct uvc_descriptor_header
 **uvcg_get_ctl_class_arr(struct config_item *i, struct f_uvc_opts *o)
 {
-        struct uvcg_control_class *cl = container_of(to_config_group(i),
-                struct uvcg_control_class, group);
+        struct uvcg_control_class_group *group =
+                container_of(i, struct uvcg_control_class_group,
+                             group.cg_item);
 
-        if (cl == &uvcg_control_class_fs)
+        if (!strcmp(group->name, "fs"))
                 return o->uvc_fs_control_cls;
 
-        if (cl == &uvcg_control_class_ss)
+        if (!strcmp(group->name, "ss"))
                 return o->uvc_ss_control_cls;
 
         return NULL;
@@ -544,6 +623,7 @@ static int uvcg_control_class_allow_link(struct config_item *src,
 unlock:
         mutex_unlock(&opts->lock);
 out:
+        config_item_put(header);
         mutex_unlock(su_mutex);
         return ret;
 }
@@ -579,10 +659,12 @@ static void uvcg_control_class_drop_link(struct config_item *src,
 unlock:
         mutex_unlock(&opts->lock);
 out:
+        config_item_put(header);
         mutex_unlock(su_mutex);
 }
 
 static struct configfs_item_operations uvcg_control_class_item_ops = {
+        .release        = uvcg_config_item_release,
         .allow_link     = uvcg_control_class_allow_link,
         .drop_link      = uvcg_control_class_drop_link,
 };
@@ -592,37 +674,99 @@ static const struct config_item_type uvcg_control_class_type = {
         .ct_owner       = THIS_MODULE,
 };
 
-/* control/class */
-static struct uvcg_control_class_grp {
-        struct config_group     group;
-} uvcg_control_class_grp;
+/* -----------------------------------------------------------------------------
+ * control/class
+ */
+
+static int uvcg_control_class_create_children(struct config_group *parent)
+{
+        static const char * const names[] = { "fs", "ss" };
+        unsigned int i;
 
-static const struct config_item_type uvcg_control_class_grp_type = {
-        .ct_owner = THIS_MODULE,
+        for (i = 0; i < ARRAY_SIZE(names); ++i) {
+                struct uvcg_control_class_group *group;
+
+                group = kzalloc(sizeof(*group), GFP_KERNEL);
+                if (!group)
+                        return -ENOMEM;
+
+                group->name = names[i];
+
+                config_group_init_type_name(&group->group, group->name,
+                                            &uvcg_control_class_type);
+                configfs_add_default_group(&group->group, parent);
+        }
+
+        return 0;
+}
+
+static const struct uvcg_config_group_type uvcg_control_class_grp_type = {
+        .type = {
+                .ct_item_ops    = &uvcg_config_item_ops,
+                .ct_owner       = THIS_MODULE,
+        },
+        .name = "class",
+        .create_children = uvcg_control_class_create_children,
 };
 
-/* control */
-static struct uvcg_control_grp {
-        struct config_group     group;
-} uvcg_control_grp;
+/* -----------------------------------------------------------------------------
+ * control
+ */
+
+static ssize_t uvcg_default_control_b_interface_number_show(
+        struct config_item *item, char *page)
+{
+        struct config_group *group = to_config_group(item);
+        struct mutex *su_mutex = &group->cg_subsys->su_mutex;
+        struct config_item *opts_item;
+        struct f_uvc_opts *opts;
+        int result = 0;
+
+        mutex_lock(su_mutex); /* for navigating configfs hierarchy */
+
+        opts_item = item->ci_parent;
+        opts = to_f_uvc_opts(opts_item);
+
+        mutex_lock(&opts->lock);
+        result += sprintf(page, "%u\n", opts->control_interface);
+        mutex_unlock(&opts->lock);
+
+        mutex_unlock(su_mutex);
+
+        return result;
+}
+
+UVC_ATTR_RO(uvcg_default_control_, b_interface_number, bInterfaceNumber);
 
-static const struct config_item_type uvcg_control_grp_type = {
-        .ct_owner = THIS_MODULE,
+static struct configfs_attribute *uvcg_default_control_attrs[] = {
+        &uvcg_default_control_attr_b_interface_number,
+        NULL,
 };
 
-/* streaming/uncompressed */
-static struct uvcg_uncompressed_grp {
-        struct config_group     group;
-} uvcg_uncompressed_grp;
+static const struct uvcg_config_group_type uvcg_control_grp_type = {
+        .type = {
+                .ct_item_ops    = &uvcg_config_item_ops,
+                .ct_attrs       = uvcg_default_control_attrs,
+                .ct_owner       = THIS_MODULE,
+        },
+        .name = "control",
+        .children = (const struct uvcg_config_group_type*[]) {
+                &uvcg_control_header_grp_type,
+                &uvcg_processing_grp_type,
+                &uvcg_terminal_grp_type,
+                &uvcg_control_class_grp_type,
+                NULL,
+        },
+};
 
-/* streaming/mjpeg */
-static struct uvcg_mjpeg_grp {
-        struct config_group     group;
-} uvcg_mjpeg_grp;
+/* -----------------------------------------------------------------------------
+ * streaming/uncompressed
+ * streaming/mjpeg
+ */
 
-static struct config_item *fmt_parent[] = {
-        &uvcg_uncompressed_grp.group.cg_item,
-        &uvcg_mjpeg_grp.group.cg_item,
+static const char * const uvcg_format_names[] = {
+        "uncompressed",
+        "mjpeg",
 };
 
 enum uvcg_format_type {
@@ -706,7 +850,11 @@ struct uvcg_format_ptr {
         struct list_head        entry;
 };
 
-/* streaming/header/<NAME> */
+/* -----------------------------------------------------------------------------
+ * streaming/header/<NAME>
+ * streaming/header
+ */
+
 struct uvcg_streaming_header {
         struct config_item                              item;
         struct uvc_input_header_descriptor              desc;
@@ -720,6 +868,8 @@ static struct uvcg_streaming_header *to_uvcg_streaming_header(struct config_item
         return container_of(item, struct uvcg_streaming_header, item);
 }
 
+static void uvcg_format_set_indices(struct config_group *fmt);
+
 static int uvcg_streaming_header_allow_link(struct config_item *src,
                                             struct config_item *target)
 {
@@ -744,10 +894,22 @@ static int uvcg_streaming_header_allow_link(struct config_item *src,
                 goto out;
         }
 
-        for (i = 0; i < ARRAY_SIZE(fmt_parent); ++i)
-                if (target->ci_parent == fmt_parent[i])
+        /*
+         * Linking is only allowed to direct children of the format nodes
+         * (streaming/uncompressed or streaming/mjpeg nodes). First check that
+         * the grand-parent of the target matches the grand-parent of the source
+         * (the streaming node), and then verify that the target parent is a
+         * format node.
+         */
+        if (src->ci_parent->ci_parent != target->ci_parent->ci_parent)
+                goto out;
+
+        for (i = 0; i < ARRAY_SIZE(uvcg_format_names); ++i) {
+                if (!strcmp(target->ci_parent->ci_name, uvcg_format_names[i]))
                         break;
-        if (i == ARRAY_SIZE(fmt_parent))
+        }
+
+        if (i == ARRAY_SIZE(uvcg_format_names))
                 goto out;
 
         target_fmt = container_of(to_config_group(target), struct uvcg_format,
@@ -755,6 +917,8 @@ static int uvcg_streaming_header_allow_link(struct config_item *src,
         if (!target_fmt)
                 goto out;
 
+        uvcg_format_set_indices(to_config_group(target));
+
         format_ptr = kzalloc(sizeof(*format_ptr), GFP_KERNEL);
         if (!format_ptr) {
                 ret = -ENOMEM;
@@ -764,6 +928,7 @@ static int uvcg_streaming_header_allow_link(struct config_item *src,
         format_ptr->fmt = target_fmt;
         list_add_tail(&format_ptr->entry, &src_hdr->formats);
         ++src_hdr->num_fmt;
+        ++target_fmt->linked;
 
 out:
         mutex_unlock(&opts->lock);
@@ -801,19 +966,22 @@ static void uvcg_streaming_header_drop_link(struct config_item *src,
                         break;
                 }
 
+        --target_fmt->linked;
+
 out:
         mutex_unlock(&opts->lock);
         mutex_unlock(su_mutex);
 }
 
 static struct configfs_item_operations uvcg_streaming_header_item_ops = {
-        .allow_link             = uvcg_streaming_header_allow_link,
-        .drop_link              = uvcg_streaming_header_drop_link,
+        .release        = uvcg_config_item_release,
+        .allow_link     = uvcg_streaming_header_allow_link,
+        .drop_link      = uvcg_streaming_header_drop_link,
 };
 
-#define UVCG_STREAMING_HEADER_ATTR(cname, aname, conv)                  \
+#define UVCG_STREAMING_HEADER_ATTR(cname, aname, bits)                  \
 static ssize_t uvcg_streaming_header_##cname##_show(                    \
-        struct config_item *item, char *page)                   \
+        struct config_item *item, char *page)                           \
 {                                                                       \
         struct uvcg_streaming_header *sh = to_uvcg_streaming_header(item); \
         struct f_uvc_opts *opts;                                        \
@@ -827,7 +995,7 @@ static ssize_t uvcg_streaming_header_##cname##_show(			\
         opts = to_f_uvc_opts(opts_item);                                \
                                                                         \
         mutex_lock(&opts->lock);                                        \
-        result = sprintf(page, "%d\n", conv(sh->desc.aname));           \
+        result = sprintf(page, "%u\n", le##bits##_to_cpu(sh->desc.aname));\
         mutex_unlock(&opts->lock);                                      \
                                                                         \
         mutex_unlock(su_mutex);                                         \
@@ -836,16 +1004,11 @@ static ssize_t uvcg_streaming_header_##cname##_show(			\
                                                                         \
 UVC_ATTR_RO(uvcg_streaming_header_, cname, aname)
 
-#define identity_conv(x) (x)
-
-UVCG_STREAMING_HEADER_ATTR(bm_info, bmInfo, identity_conv);
-UVCG_STREAMING_HEADER_ATTR(b_terminal_link, bTerminalLink, identity_conv);
-UVCG_STREAMING_HEADER_ATTR(b_still_capture_method, bStillCaptureMethod,
-                           identity_conv);
-UVCG_STREAMING_HEADER_ATTR(b_trigger_support, bTriggerSupport, identity_conv);
-UVCG_STREAMING_HEADER_ATTR(b_trigger_usage, bTriggerUsage, identity_conv);
-
-#undef identity_conv
+UVCG_STREAMING_HEADER_ATTR(bm_info, bmInfo, 8);
+UVCG_STREAMING_HEADER_ATTR(b_terminal_link, bTerminalLink, 8);
+UVCG_STREAMING_HEADER_ATTR(b_still_capture_method, bStillCaptureMethod, 8);
+UVCG_STREAMING_HEADER_ATTR(b_trigger_support, bTriggerSupport, 8);
+UVCG_STREAMING_HEADER_ATTR(b_trigger_usage, bTriggerUsage, 8);
 
 #undef UVCG_STREAMING_HEADER_ATTR
 
@@ -884,31 +1047,26 @@ static struct config_item
         return &h->item;
 }
 
-static void uvcg_streaming_header_drop(struct config_group *group,
-                              struct config_item *item)
-{
-        struct uvcg_streaming_header *h = to_uvcg_streaming_header(item);
-
-        kfree(h);
-}
-
-/* streaming/header */
-static struct uvcg_streaming_header_grp {
-        struct config_group     group;
-} uvcg_streaming_header_grp;
-
 static struct configfs_group_operations uvcg_streaming_header_grp_ops = {
         .make_item              = uvcg_streaming_header_make,
-        .drop_item              = uvcg_streaming_header_drop,
 };
 
-static const struct config_item_type uvcg_streaming_header_grp_type = {
-        .ct_group_ops   = &uvcg_streaming_header_grp_ops,
-        .ct_owner       = THIS_MODULE,
+static const struct uvcg_config_group_type uvcg_streaming_header_grp_type = {
+        .type = {
+                .ct_item_ops    = &uvcg_config_item_ops,
+                .ct_group_ops   = &uvcg_streaming_header_grp_ops,
+                .ct_owner       = THIS_MODULE,
+        },
+        .name = "header",
 };
 
-/* streaming/<mode>/<format>/<NAME> */
+/* -----------------------------------------------------------------------------
+ * streaming/<mode>/<format>/<NAME>
+ */
+
 struct uvcg_frame {
+        struct config_item      item;
+        enum uvcg_format_type   fmt_type;
         struct {
                 u8      b_length;
                 u8      b_descriptor_type;
@@ -924,8 +1082,6 @@ struct uvcg_frame {
                 u8      b_frame_interval_type;
         } __attribute__((packed)) frame;
         u32 *dw_frame_interval;
-        enum uvcg_format_type   fmt_type;
-        struct config_item      item;
 };
 
 static struct uvcg_frame *to_uvcg_frame(struct config_item *item)
@@ -933,7 +1089,7 @@ static struct uvcg_frame *to_uvcg_frame(struct config_item *item)
         return container_of(item, struct uvcg_frame, item);
 }
 
-#define UVCG_FRAME_ATTR(cname, aname, to_cpu_endian, to_little_endian, bits) \
+#define UVCG_FRAME_ATTR(cname, aname, bits) \
 static ssize_t uvcg_frame_##cname##_show(struct config_item *item, char *page)\
 {                                                                       \
         struct uvcg_frame *f = to_uvcg_frame(item);                     \
@@ -948,7 +1104,7 @@ static ssize_t uvcg_frame_##cname##_show(struct config_item *item, char *page)\
         opts = to_f_uvc_opts(opts_item);                                \
                                                                         \
         mutex_lock(&opts->lock);                                        \
-        result = sprintf(page, "%d\n", to_cpu_endian(f->frame.cname));  \
+        result = sprintf(page, "%u\n", f->frame.cname);                 \
         mutex_unlock(&opts->lock);                                      \
                                                                         \
         mutex_unlock(su_mutex);                                         \
@@ -963,8 +1119,8 @@ static ssize_t  uvcg_frame_##cname##_store(struct config_item *item,	\
         struct config_item *opts_item;                                  \
         struct uvcg_format *fmt;                                        \
         struct mutex *su_mutex = &f->item.ci_group->cg_subsys->su_mutex;\
+        typeof(f->frame.cname) num;                                     \
         int ret;                                                        \
-        u##bits num;                                                    \
                                                                         \
         ret = kstrtou##bits(page, 0, &num);                             \
         if (ret)                                                        \
@@ -982,7 +1138,7 @@ static ssize_t  uvcg_frame_##cname##_store(struct config_item *item,	\
                 goto end;                                               \
         }                                                               \
                                                                         \
-        f->frame.cname = to_little_endian(num);                         \
+        f->frame.cname = num;                                           \
         ret = len;                                                      \
 end:                                                                    \
         mutex_unlock(&opts->lock);                                      \
@@ -992,20 +1148,48 @@ end:									\
                                                                         \
 UVC_ATTR(uvcg_frame_, cname, aname);
 
-#define noop_conversion(x) (x)
+static ssize_t uvcg_frame_b_frame_index_show(struct config_item *item,
+                                             char *page)
+{
+        struct uvcg_frame *f = to_uvcg_frame(item);
+        struct uvcg_format *fmt;
+        struct f_uvc_opts *opts;
+        struct config_item *opts_item;
+        struct config_item *fmt_item;
+        struct mutex *su_mutex = &f->item.ci_group->cg_subsys->su_mutex;
+        int result;
+
+        mutex_lock(su_mutex); /* for navigating configfs hierarchy */
+
+        fmt_item = f->item.ci_parent;
+        fmt = to_uvcg_format(fmt_item);
 
-UVCG_FRAME_ATTR(bm_capabilities, bmCapabilities, noop_conversion,
-                noop_conversion, 8);
-UVCG_FRAME_ATTR(w_width, wWidth, le16_to_cpu, cpu_to_le16, 16);
-UVCG_FRAME_ATTR(w_height, wHeight, le16_to_cpu, cpu_to_le16, 16);
-UVCG_FRAME_ATTR(dw_min_bit_rate, dwMinBitRate, le32_to_cpu, cpu_to_le32, 32);
-UVCG_FRAME_ATTR(dw_max_bit_rate, dwMaxBitRate, le32_to_cpu, cpu_to_le32, 32);
-UVCG_FRAME_ATTR(dw_max_video_frame_buffer_size, dwMaxVideoFrameBufferSize,
-                le32_to_cpu, cpu_to_le32, 32);
-UVCG_FRAME_ATTR(dw_default_frame_interval, dwDefaultFrameInterval,
-                le32_to_cpu, cpu_to_le32, 32);
+        if (!fmt->linked) {
+                result = -EBUSY;
+                goto out;
+        }
 
-#undef noop_conversion
+        opts_item = fmt_item->ci_parent->ci_parent->ci_parent;
+        opts = to_f_uvc_opts(opts_item);
+
+        mutex_lock(&opts->lock);
+        result = sprintf(page, "%u\n", f->frame.b_frame_index);
+        mutex_unlock(&opts->lock);
+
+out:
+        mutex_unlock(su_mutex);
+        return result;
+}
+
+UVC_ATTR_RO(uvcg_frame_, b_frame_index, bFrameIndex);
+
+UVCG_FRAME_ATTR(bm_capabilities, bmCapabilities, 8);
+UVCG_FRAME_ATTR(w_width, wWidth, 16);
+UVCG_FRAME_ATTR(w_height, wHeight, 16);
+UVCG_FRAME_ATTR(dw_min_bit_rate, dwMinBitRate, 32);
+UVCG_FRAME_ATTR(dw_max_bit_rate, dwMaxBitRate, 32);
+UVCG_FRAME_ATTR(dw_max_video_frame_buffer_size, dwMaxVideoFrameBufferSize, 32);
+UVCG_FRAME_ATTR(dw_default_frame_interval, dwDefaultFrameInterval, 32);
 
 #undef UVCG_FRAME_ATTR
 
@@ -1026,8 +1210,7 @@ static ssize_t uvcg_frame_dw_frame_interval_show(struct config_item *item,
 
         mutex_lock(&opts->lock);
         for (result = 0, i = 0; i < frm->frame.b_frame_interval_type; ++i) {
-                result += sprintf(pg, "%d\n",
-                                  le32_to_cpu(frm->dw_frame_interval[i]));
+                result += sprintf(pg, "%u\n", frm->dw_frame_interval[i]);
                 pg = page + result;
         }
         mutex_unlock(&opts->lock);
@@ -1052,7 +1235,7 @@ static inline int __uvcg_fill_frm_intrv(char *buf, void *priv)
                 return ret;
 
         interv = priv;
-        **interv = cpu_to_le32(num);
+        **interv = num;
         ++*interv;
 
         return 0;
@@ -1129,6 +1312,8 @@ static ssize_t uvcg_frame_dw_frame_interval_store(struct config_item *item,
         kfree(ch->dw_frame_interval);
         ch->dw_frame_interval = frm_intrv;
         ch->frame.b_frame_interval_type = n;
+        sort(ch->dw_frame_interval, n, sizeof(*ch->dw_frame_interval),
+             uvcg_config_compare_u32, NULL);
         ret = len;
 
 end:
@@ -1140,6 +1325,7 @@ end:
 UVC_ATTR(uvcg_frame_, dw_frame_interval, dwFrameInterval);
 
 static struct configfs_attribute *uvcg_frame_attrs[] = {
+        &uvcg_frame_attr_b_frame_index,
         &uvcg_frame_attr_bm_capabilities,
         &uvcg_frame_attr_w_width,
         &uvcg_frame_attr_w_height,
@@ -1152,6 +1338,7 @@ static struct configfs_attribute *uvcg_frame_attrs[] = {
 };
 
 static const struct config_item_type uvcg_frame_type = {
+        .ct_item_ops    = &uvcg_config_item_ops,
         .ct_attrs       = uvcg_frame_attrs,
         .ct_owner       = THIS_MODULE,
 };
@@ -1170,12 +1357,12 @@ static struct config_item *uvcg_frame_make(struct config_group *group,
 
         h->frame.b_descriptor_type              = USB_DT_CS_INTERFACE;
         h->frame.b_frame_index                  = 1;
-        h->frame.w_width                        = cpu_to_le16(640);
-        h->frame.w_height                       = cpu_to_le16(360);
-        h->frame.dw_min_bit_rate                = cpu_to_le32(18432000);
-        h->frame.dw_max_bit_rate                = cpu_to_le32(55296000);
-        h->frame.dw_max_video_frame_buffer_size = cpu_to_le32(460800);
-        h->frame.dw_default_frame_interval      = cpu_to_le32(666666);
+        h->frame.w_width                        = 640;
+        h->frame.w_height                       = 360;
+        h->frame.dw_min_bit_rate                = 18432000;
+        h->frame.dw_max_bit_rate                = 55296000;
+        h->frame.dw_max_video_frame_buffer_size = 460800;
+        h->frame.dw_default_frame_interval      = 666666;
 
         opts_item = group->cg_item.ci_parent->ci_parent->ci_parent;
         opts = to_f_uvc_opts(opts_item);
@@ -1203,7 +1390,6 @@ static struct config_item *uvcg_frame_make(struct config_group *group,
 
 static void uvcg_frame_drop(struct config_group *group, struct config_item *item)
 {
-        struct uvcg_frame *h = to_uvcg_frame(item);
         struct uvcg_format *fmt;
         struct f_uvc_opts *opts;
         struct config_item *opts_item;
@@ -1214,11 +1400,31 @@ static void uvcg_frame_drop(struct config_group *group, struct config_item *item
         mutex_lock(&opts->lock);
         fmt = to_uvcg_format(&group->cg_item);
         --fmt->num_frames;
-        kfree(h);
         mutex_unlock(&opts->lock);
+
+        config_item_put(item);
+}
+
+static void uvcg_format_set_indices(struct config_group *fmt)
+{
+        struct config_item *ci;
+        unsigned int i = 1;
+
+        list_for_each_entry(ci, &fmt->cg_children, ci_entry) {
+                struct uvcg_frame *frm;
+
+                if (ci->ci_type != &uvcg_frame_type)
+                        continue;
+
+                frm = to_uvcg_frame(ci);
+                frm->frame.b_frame_index = i++;
+        }
 }
 
-/* streaming/uncompressed/<NAME> */
+/* -----------------------------------------------------------------------------
+ * streaming/uncompressed/<NAME>
+ */
+
 struct uvcg_uncompressed {
         struct uvcg_format              fmt;
         struct uvc_format_uncompressed  desc;
@@ -1290,7 +1496,7 @@ end:
 
 UVC_ATTR(uvcg_uncompressed_, guid_format, guidFormat);
 
-#define UVCG_UNCOMPRESSED_ATTR_RO(cname, aname, conv)                   \
+#define UVCG_UNCOMPRESSED_ATTR_RO(cname, aname, bits)                   \
 static ssize_t uvcg_uncompressed_##cname##_show(                        \
         struct config_item *item, char *page)                           \
 {                                                                       \
@@ -1306,7 +1512,7 @@ static ssize_t uvcg_uncompressed_##cname##_show(			\
         opts = to_f_uvc_opts(opts_item);                                \
                                                                         \
         mutex_lock(&opts->lock);                                        \
-        result = sprintf(page, "%d\n", conv(u->desc.aname));            \
+        result = sprintf(page, "%u\n", le##bits##_to_cpu(u->desc.aname));\
         mutex_unlock(&opts->lock);                                      \
                                                                         \
         mutex_unlock(su_mutex);                                         \
@@ -1315,7 +1521,7 @@ static ssize_t uvcg_uncompressed_##cname##_show(			\
                                                                         \
 UVC_ATTR_RO(uvcg_uncompressed_, cname, aname);
 
-#define UVCG_UNCOMPRESSED_ATTR(cname, aname, conv)                      \
+#define UVCG_UNCOMPRESSED_ATTR(cname, aname, bits)                      \
 static ssize_t uvcg_uncompressed_##cname##_show(                        \
         struct config_item *item, char *page)                           \
 {                                                                       \
@@ -1331,7 +1537,7 @@ static ssize_t uvcg_uncompressed_##cname##_show(			\
         opts = to_f_uvc_opts(opts_item);                                \
                                                                         \
         mutex_lock(&opts->lock);                                        \
-        result = sprintf(page, "%d\n", conv(u->desc.aname));            \
+        result = sprintf(page, "%u\n", le##bits##_to_cpu(u->desc.aname));\
         mutex_unlock(&opts->lock);                                      \
                                                                         \
         mutex_unlock(su_mutex);                                         \
@@ -1378,16 +1584,12 @@ end:									\
                                                                         \
 UVC_ATTR(uvcg_uncompressed_, cname, aname);
 
-#define identity_conv(x) (x)
-
-UVCG_UNCOMPRESSED_ATTR(b_bits_per_pixel, bBitsPerPixel, identity_conv);
-UVCG_UNCOMPRESSED_ATTR(b_default_frame_index, bDefaultFrameIndex,
-                       identity_conv);
-UVCG_UNCOMPRESSED_ATTR_RO(b_aspect_ratio_x, bAspectRatioX, identity_conv);
-UVCG_UNCOMPRESSED_ATTR_RO(b_aspect_ratio_y, bAspectRatioY, identity_conv);
-UVCG_UNCOMPRESSED_ATTR_RO(bm_interface_flags, bmInterfaceFlags, identity_conv);
-
-#undef identity_conv
+UVCG_UNCOMPRESSED_ATTR_RO(b_format_index, bFormatIndex, 8);
+UVCG_UNCOMPRESSED_ATTR(b_bits_per_pixel, bBitsPerPixel, 8);
+UVCG_UNCOMPRESSED_ATTR(b_default_frame_index, bDefaultFrameIndex, 8);
+UVCG_UNCOMPRESSED_ATTR_RO(b_aspect_ratio_x, bAspectRatioX, 8);
+UVCG_UNCOMPRESSED_ATTR_RO(b_aspect_ratio_y, bAspectRatioY, 8);
+UVCG_UNCOMPRESSED_ATTR_RO(bm_interface_flags, bmInterfaceFlags, 8);
 
 #undef UVCG_UNCOMPRESSED_ATTR
 #undef UVCG_UNCOMPRESSED_ATTR_RO
@@ -1410,6 +1612,7 @@ uvcg_uncompressed_bma_controls_store(struct config_item *item,
 UVC_ATTR(uvcg_uncompressed_, bma_controls, bmaControls);
 
 static struct configfs_attribute *uvcg_uncompressed_attrs[] = {
+        &uvcg_uncompressed_attr_b_format_index,
         &uvcg_uncompressed_attr_guid_format,
         &uvcg_uncompressed_attr_b_bits_per_pixel,
         &uvcg_uncompressed_attr_b_default_frame_index,
@@ -1421,6 +1624,7 @@ static struct configfs_attribute *uvcg_uncompressed_attrs[] = {
 };
 
 static const struct config_item_type uvcg_uncompressed_type = {
+        .ct_item_ops    = &uvcg_config_item_ops,
         .ct_group_ops   = &uvcg_uncompressed_group_ops,
         .ct_attrs       = uvcg_uncompressed_attrs,
         .ct_owner       = THIS_MODULE,
@@ -1457,25 +1661,23 @@ static struct config_group *uvcg_uncompressed_make(struct config_group *group,
         return &h->fmt.group;
 }
 
-static void uvcg_uncompressed_drop(struct config_group *group,
-                            struct config_item *item)
-{
-        struct uvcg_uncompressed *h = to_uvcg_uncompressed(item);
-
-        kfree(h);
-}
-
 static struct configfs_group_operations uvcg_uncompressed_grp_ops = {
         .make_group             = uvcg_uncompressed_make,
-        .drop_item              = uvcg_uncompressed_drop,
 };
 
-static const struct config_item_type uvcg_uncompressed_grp_type = {
-        .ct_group_ops   = &uvcg_uncompressed_grp_ops,
-        .ct_owner       = THIS_MODULE,
+static const struct uvcg_config_group_type uvcg_uncompressed_grp_type = {
+        .type = {
+                .ct_item_ops    = &uvcg_config_item_ops,
+                .ct_group_ops   = &uvcg_uncompressed_grp_ops,
+                .ct_owner       = THIS_MODULE,
+        },
+        .name = "uncompressed",
 };
 
-/* streaming/mjpeg/<NAME> */
+/* -----------------------------------------------------------------------------
+ * streaming/mjpeg/<NAME>
+ */
+
 struct uvcg_mjpeg {
         struct uvcg_format              fmt;
         struct uvc_format_mjpeg         desc;
@@ -1493,7 +1695,7 @@ static struct configfs_group_operations uvcg_mjpeg_group_ops = {
         .drop_item              = uvcg_frame_drop,
 };
 
-#define UVCG_MJPEG_ATTR_RO(cname, aname, conv)                          \
+#define UVCG_MJPEG_ATTR_RO(cname, aname, bits)                          \
 static ssize_t uvcg_mjpeg_##cname##_show(struct config_item *item, char *page)\
 {                                                                       \
         struct uvcg_mjpeg *u = to_uvcg_mjpeg(item);                     \
@@ -1508,7 +1710,7 @@ static ssize_t uvcg_mjpeg_##cname##_show(struct config_item *item, char *page)\
         opts = to_f_uvc_opts(opts_item);                                \
                                                                         \
         mutex_lock(&opts->lock);                                        \
-        result = sprintf(page, "%d\n", conv(u->desc.aname));            \
+        result = sprintf(page, "%u\n", le##bits##_to_cpu(u->desc.aname));\
         mutex_unlock(&opts->lock);                                      \
                                                                         \
         mutex_unlock(su_mutex);                                         \
@@ -1517,7 +1719,7 @@ static ssize_t uvcg_mjpeg_##cname##_show(struct config_item *item, char *page)\
                                                                         \
 UVC_ATTR_RO(uvcg_mjpeg_, cname, aname)
 
-#define UVCG_MJPEG_ATTR(cname, aname, conv)                             \
+#define UVCG_MJPEG_ATTR(cname, aname, bits)                             \
 static ssize_t uvcg_mjpeg_##cname##_show(struct config_item *item, char *page)\
 {                                                                       \
         struct uvcg_mjpeg *u = to_uvcg_mjpeg(item);                     \
@@ -1532,7 +1734,7 @@ static ssize_t uvcg_mjpeg_##cname##_show(struct config_item *item, char *page)\
         opts = to_f_uvc_opts(opts_item);                                \
                                                                         \
         mutex_lock(&opts->lock);                                        \
-        result = sprintf(page, "%d\n", conv(u->desc.aname));            \
+        result = sprintf(page, "%u\n", le##bits##_to_cpu(u->desc.aname));\
         mutex_unlock(&opts->lock);                                      \
                                                                         \
         mutex_unlock(su_mutex);                                         \
@@ -1579,16 +1781,12 @@ end:									\
                                                                         \
 UVC_ATTR(uvcg_mjpeg_, cname, aname)
 
-#define identity_conv(x) (x)
-
-UVCG_MJPEG_ATTR(b_default_frame_index, bDefaultFrameIndex,
-                       identity_conv);
-UVCG_MJPEG_ATTR_RO(bm_flags, bmFlags, identity_conv);
-UVCG_MJPEG_ATTR_RO(b_aspect_ratio_x, bAspectRatioX, identity_conv);
-UVCG_MJPEG_ATTR_RO(b_aspect_ratio_y, bAspectRatioY, identity_conv);
-UVCG_MJPEG_ATTR_RO(bm_interface_flags, bmInterfaceFlags, identity_conv);
-
-#undef identity_conv
+UVCG_MJPEG_ATTR_RO(b_format_index, bFormatIndex, 8);
+UVCG_MJPEG_ATTR(b_default_frame_index, bDefaultFrameIndex, 8);
+UVCG_MJPEG_ATTR_RO(bm_flags, bmFlags, 8);
+UVCG_MJPEG_ATTR_RO(b_aspect_ratio_x, bAspectRatioX, 8);
+UVCG_MJPEG_ATTR_RO(b_aspect_ratio_y, bAspectRatioY, 8);
+UVCG_MJPEG_ATTR_RO(bm_interface_flags, bmInterfaceFlags, 8);
 
 #undef UVCG_MJPEG_ATTR
 #undef UVCG_MJPEG_ATTR_RO
@@ -1611,6 +1809,7 @@ uvcg_mjpeg_bma_controls_store(struct config_item *item,
 UVC_ATTR(uvcg_mjpeg_, bma_controls, bmaControls);
 
 static struct configfs_attribute *uvcg_mjpeg_attrs[] = {
+        &uvcg_mjpeg_attr_b_format_index,
         &uvcg_mjpeg_attr_b_default_frame_index,
         &uvcg_mjpeg_attr_bm_flags,
         &uvcg_mjpeg_attr_b_aspect_ratio_x,
@@ -1621,6 +1820,7 @@ static struct configfs_attribute *uvcg_mjpeg_attrs[] = {
 };
 
 static const struct config_item_type uvcg_mjpeg_type = {
+        .ct_item_ops    = &uvcg_config_item_ops,
         .ct_group_ops   = &uvcg_mjpeg_group_ops,
         .ct_attrs       = uvcg_mjpeg_attrs,
         .ct_owner       = THIS_MODULE,
@@ -1651,56 +1851,42 @@ static struct config_group *uvcg_mjpeg_make(struct config_group *group,
         return &h->fmt.group;
 }
 
-static void uvcg_mjpeg_drop(struct config_group *group,
-                            struct config_item *item)
-{
-        struct uvcg_mjpeg *h = to_uvcg_mjpeg(item);
-
-        kfree(h);
-}
-
 static struct configfs_group_operations uvcg_mjpeg_grp_ops = {
         .make_group             = uvcg_mjpeg_make,
-        .drop_item              = uvcg_mjpeg_drop,
 };
 
-static const struct config_item_type uvcg_mjpeg_grp_type = {
-        .ct_group_ops   = &uvcg_mjpeg_grp_ops,
-        .ct_owner       = THIS_MODULE,
+static const struct uvcg_config_group_type uvcg_mjpeg_grp_type = {
+        .type = {
+                .ct_item_ops    = &uvcg_config_item_ops,
+                .ct_group_ops   = &uvcg_mjpeg_grp_ops,
+                .ct_owner       = THIS_MODULE,
+        },
+        .name = "mjpeg",
 };
 
-/* streaming/color_matching/default */
-static struct uvcg_default_color_matching {
-        struct config_group     group;
-} uvcg_default_color_matching;
-
-static inline struct uvcg_default_color_matching
-*to_uvcg_default_color_matching(struct config_item *item)
-{
-        return container_of(to_config_group(item),
-                            struct uvcg_default_color_matching, group);
-}
+/* -----------------------------------------------------------------------------
+ * streaming/color_matching/default
+ */
 
-#define UVCG_DEFAULT_COLOR_MATCHING_ATTR(cname, aname, conv)            \
+#define UVCG_DEFAULT_COLOR_MATCHING_ATTR(cname, aname, bits)            \
 static ssize_t uvcg_default_color_matching_##cname##_show(              \
-        struct config_item *item, char *page)           \
+        struct config_item *item, char *page)                           \
 {                                                                       \
-        struct uvcg_default_color_matching *dc =                        \
-                to_uvcg_default_color_matching(item);                   \
+        struct config_group *group = to_config_group(item);             \
         struct f_uvc_opts *opts;                                        \
         struct config_item *opts_item;                                  \
-        struct mutex *su_mutex = &dc->group.cg_subsys->su_mutex;        \
+        struct mutex *su_mutex = &group->cg_subsys->su_mutex;           \
         struct uvc_color_matching_descriptor *cd;                       \
         int result;                                                     \
                                                                         \
         mutex_lock(su_mutex); /* for navigating configfs hierarchy */   \
                                                                         \
-        opts_item = dc->group.cg_item.ci_parent->ci_parent->ci_parent;  \
+        opts_item = group->cg_item.ci_parent->ci_parent->ci_parent;     \
         opts = to_f_uvc_opts(opts_item);                                \
         cd = &opts->uvc_color_matching;                                 \
                                                                         \
         mutex_lock(&opts->lock);                                        \
-        result = sprintf(page, "%d\n", conv(cd->aname));                \
+        result = sprintf(page, "%u\n", le##bits##_to_cpu(cd->aname));   \
         mutex_unlock(&opts->lock);                                      \
                                                                         \
         mutex_unlock(su_mutex);                                         \
@@ -1709,16 +1895,10 @@ static ssize_t uvcg_default_color_matching_##cname##_show(		\
                                                                         \
 UVC_ATTR_RO(uvcg_default_color_matching_, cname, aname)
 
-#define identity_conv(x) (x)
-
-UVCG_DEFAULT_COLOR_MATCHING_ATTR(b_color_primaries, bColorPrimaries,
-                                 identity_conv);
+UVCG_DEFAULT_COLOR_MATCHING_ATTR(b_color_primaries, bColorPrimaries, 8);
 UVCG_DEFAULT_COLOR_MATCHING_ATTR(b_transfer_characteristics,
-                                 bTransferCharacteristics, identity_conv);
-UVCG_DEFAULT_COLOR_MATCHING_ATTR(b_matrix_coefficients, bMatrixCoefficients,
-                                 identity_conv);
-
-#undef identity_conv
+                                 bTransferCharacteristics, 8);
+UVCG_DEFAULT_COLOR_MATCHING_ATTR(b_matrix_coefficients, bMatrixCoefficients, 8);
 
 #undef UVCG_DEFAULT_COLOR_MATCHING_ATTR
 
@@ -1729,41 +1909,54 @@ static struct configfs_attribute *uvcg_default_color_matching_attrs[] = {
         NULL,
 };
 
-static const struct config_item_type uvcg_default_color_matching_type = {
-        .ct_attrs       = uvcg_default_color_matching_attrs,
-        .ct_owner       = THIS_MODULE,
+static const struct uvcg_config_group_type uvcg_default_color_matching_type = {
+        .type = {
+                .ct_item_ops    = &uvcg_config_item_ops,
+                .ct_attrs       = uvcg_default_color_matching_attrs,
+                .ct_owner       = THIS_MODULE,
+        },
+        .name = "default",
 };
 
-/* struct uvcg_color_matching {}; */
-
-/* streaming/color_matching */
-static struct uvcg_color_matching_grp {
-        struct config_group     group;
-} uvcg_color_matching_grp;
+/* -----------------------------------------------------------------------------
+ * streaming/color_matching
+ */
 
-static const struct config_item_type uvcg_color_matching_grp_type = {
-        .ct_owner = THIS_MODULE,
+static const struct uvcg_config_group_type uvcg_color_matching_grp_type = {
+        .type = {
+                .ct_item_ops    = &uvcg_config_item_ops,
+                .ct_owner       = THIS_MODULE,
+        },
+        .name = "color_matching",
+        .children = (const struct uvcg_config_group_type*[]) {
+                &uvcg_default_color_matching_type,
+                NULL,
+        },
 };
 
-/* streaming/class/{fs|hs|ss} */
-static struct uvcg_streaming_class {
-        struct config_group     group;
-} uvcg_streaming_class_fs, uvcg_streaming_class_hs, uvcg_streaming_class_ss;
+/* -----------------------------------------------------------------------------
+ * streaming/class/{fs|hs|ss}
+ */
 
+struct uvcg_streaming_class_group {
+        struct config_group group;
+        const char *name;
+};
 
 static inline struct uvc_descriptor_header
 ***__uvcg_get_stream_class_arr(struct config_item *i, struct f_uvc_opts *o)
 {
-        struct uvcg_streaming_class *cl = container_of(to_config_group(i),
-                struct uvcg_streaming_class, group);
+        struct uvcg_streaming_class_group *group =
+                container_of(i, struct uvcg_streaming_class_group,
+                             group.cg_item);
 
-        if (cl == &uvcg_streaming_class_fs)
+        if (!strcmp(group->name, "fs"))
                 return &o->uvc_fs_streaming_cls;
 
-        if (cl == &uvcg_streaming_class_hs)
+        if (!strcmp(group->name, "hs"))
                 return &o->uvc_hs_streaming_cls;
 
-        if (cl == &uvcg_streaming_class_ss)
+        if (!strcmp(group->name, "ss"))
                 return &o->uvc_ss_streaming_cls;
 
         return NULL;
@@ -1922,24 +2115,22 @@ static int __uvcg_fill_strm(void *priv1, void *priv2, void *priv3, int n,
                 struct uvcg_format *fmt = priv1;
 
                 if (fmt->type == UVCG_UNCOMPRESSED) {
-                        struct uvc_format_uncompressed *unc = *dest;
                         struct uvcg_uncompressed *u =
                                 container_of(fmt, struct uvcg_uncompressed,
                                              fmt);
 
+                        u->desc.bFormatIndex = n + 1;
+                        u->desc.bNumFrameDescriptors = fmt->num_frames;
                         memcpy(*dest, &u->desc, sizeof(u->desc));
                         *dest += sizeof(u->desc);
-                        unc->bNumFrameDescriptors = fmt->num_frames;
-                        unc->bFormatIndex = n + 1;
                 } else if (fmt->type == UVCG_MJPEG) {
-                        struct uvc_format_mjpeg *mjp = *dest;
                         struct uvcg_mjpeg *m =
                                 container_of(fmt, struct uvcg_mjpeg, fmt);
 
+                        m->desc.bFormatIndex = n + 1;
+                        m->desc.bNumFrameDescriptors = fmt->num_frames;
                         memcpy(*dest, &m->desc, sizeof(m->desc));
                         *dest += sizeof(m->desc);
-                        mjp->bNumFrameDescriptors = fmt->num_frames;
-                        mjp->bFormatIndex = n + 1;
                 } else {
                         return -EINVAL;
                 }
@@ -2038,6 +2229,7 @@ static int uvcg_streaming_class_allow_link(struct config_item *src,
 unlock:
         mutex_unlock(&opts->lock);
 out:
+        config_item_put(header);
         mutex_unlock(su_mutex);
         return ret;
 }
@@ -2078,10 +2270,12 @@ static void uvcg_streaming_class_drop_link(struct config_item *src,
 unlock:
         mutex_unlock(&opts->lock);
 out:
+        config_item_put(header);
         mutex_unlock(su_mutex);
 }
 
 static struct configfs_item_operations uvcg_streaming_class_item_ops = {
+        .release        = uvcg_config_item_release,
         .allow_link     = uvcg_streaming_class_allow_link,
         .drop_link      = uvcg_streaming_class_drop_link,
 };
@@ -2091,36 +2285,109 @@ static const struct config_item_type uvcg_streaming_class_type = {
         .ct_owner       = THIS_MODULE,
 };
 
-/* streaming/class */
-static struct uvcg_streaming_class_grp {
-        struct config_group     group;
-} uvcg_streaming_class_grp;
+/* -----------------------------------------------------------------------------
+ * streaming/class
+ */
+
+static int uvcg_streaming_class_create_children(struct config_group *parent)
+{
+        static const char * const names[] = { "fs", "hs", "ss" };
+        unsigned int i;
+
+        for (i = 0; i < ARRAY_SIZE(names); ++i) {
+                struct uvcg_streaming_class_group *group;
+
+                group = kzalloc(sizeof(*group), GFP_KERNEL);
+                if (!group)
+                        return -ENOMEM;
 
-static const struct config_item_type uvcg_streaming_class_grp_type = {
-        .ct_owner = THIS_MODULE,
+                group->name = names[i];
+
+                config_group_init_type_name(&group->group, group->name,
+                                            &uvcg_streaming_class_type);
+                configfs_add_default_group(&group->group, parent);
+        }
+
+        return 0;
+}
+
+static const struct uvcg_config_group_type uvcg_streaming_class_grp_type = {
+        .type = {
+                .ct_item_ops    = &uvcg_config_item_ops,
+                .ct_owner       = THIS_MODULE,
+        },
+        .name = "class",
+        .create_children = uvcg_streaming_class_create_children,
 };
 
-/* streaming */
-static struct uvcg_streaming_grp {
-        struct config_group     group;
-} uvcg_streaming_grp;
+/* -----------------------------------------------------------------------------
+ * streaming
+ */
 
-static const struct config_item_type uvcg_streaming_grp_type = {
-        .ct_owner = THIS_MODULE,
+static ssize_t uvcg_default_streaming_b_interface_number_show(
+        struct config_item *item, char *page)
+{
+        struct config_group *group = to_config_group(item);
+        struct mutex *su_mutex = &group->cg_subsys->su_mutex;
+        struct config_item *opts_item;
+        struct f_uvc_opts *opts;
+        int result = 0;
+
+        mutex_lock(su_mutex); /* for navigating configfs hierarchy */
+
+        opts_item = item->ci_parent;
+        opts = to_f_uvc_opts(opts_item);
+
+        mutex_lock(&opts->lock);
+        result += sprintf(page, "%u\n", opts->streaming_interface);
+        mutex_unlock(&opts->lock);
+
+        mutex_unlock(su_mutex);
+
+        return result;
+}
+
+UVC_ATTR_RO(uvcg_default_streaming_, b_interface_number, bInterfaceNumber);
+
+static struct configfs_attribute *uvcg_default_streaming_attrs[] = {
+        &uvcg_default_streaming_attr_b_interface_number,
+        NULL,
+};
+
+static const struct uvcg_config_group_type uvcg_streaming_grp_type = {
+        .type = {
+                .ct_item_ops    = &uvcg_config_item_ops,
+                .ct_attrs       = uvcg_default_streaming_attrs,
+                .ct_owner       = THIS_MODULE,
+        },
+        .name = "streaming",
+        .children = (const struct uvcg_config_group_type*[]) {
+                &uvcg_streaming_header_grp_type,
+                &uvcg_uncompressed_grp_type,
+                &uvcg_mjpeg_grp_type,
+                &uvcg_color_matching_grp_type,
+                &uvcg_streaming_class_grp_type,
+                NULL,
+        },
 };
 
-static void uvc_attr_release(struct config_item *item)
+/* -----------------------------------------------------------------------------
+ * UVC function
+ */
+
+static void uvc_func_item_release(struct config_item *item)
 {
         struct f_uvc_opts *opts = to_f_uvc_opts(item);
 
+        uvcg_config_remove_children(to_config_group(item));
         usb_put_function_instance(&opts->func_inst);
 }
 
-static struct configfs_item_operations uvc_item_ops = {
-        .release                = uvc_attr_release,
+static struct configfs_item_operations uvc_func_item_ops = {
+        .release        = uvc_func_item_release,
 };
 
-#define UVCG_OPTS_ATTR(cname, aname, conv, str2u, uxx, vnoc, limit)     \
+#define UVCG_OPTS_ATTR(cname, aname, limit)                             \
 static ssize_t f_uvc_opts_##cname##_show(                               \
         struct config_item *item, char *page)                           \
 {                                                                       \
@@ -2128,7 +2395,7 @@ static ssize_t f_uvc_opts_##cname##_show(				\
         int result;                                                     \
                                                                         \
         mutex_lock(&opts->lock);                                        \
-        result = sprintf(page, "%d\n", conv(opts->cname));              \
+        result = sprintf(page, "%u\n", opts->cname);                    \
         mutex_unlock(&opts->lock);                                      \
                                                                         \
         return result;                                                  \
@@ -2139,8 +2406,8 @@ f_uvc_opts_##cname##_store(struct config_item *item,			\
                            const char *page, size_t len)                \
 {                                                                       \
         struct f_uvc_opts *opts = to_f_uvc_opts(item);                  \
+        unsigned int num;                                               \
         int ret;                                                        \
-        uxx num;                                                        \
                                                                         \
         mutex_lock(&opts->lock);                                        \
         if (opts->refcnt) {                                             \
@@ -2148,7 +2415,7 @@ f_uvc_opts_##cname##_store(struct config_item *item,			\
                 goto end;                                               \
         }                                                               \
                                                                         \
-        ret = str2u(page, 0, &num);                                     \
+        ret = kstrtouint(page, 0, &num);                                \
         if (ret)                                                        \
                 goto end;                                               \
                                                                         \
@@ -2156,7 +2423,7 @@ f_uvc_opts_##cname##_store(struct config_item *item,			\
                 ret = -EINVAL;                                          \
                 goto end;                                               \
         }                                                               \
-        opts->cname = vnoc(num);                                        \
+        opts->cname = num;                                              \
         ret = len;                                                      \
 end:                                                                    \
         mutex_unlock(&opts->lock);                                      \
@@ -2165,16 +2432,9 @@ end:									\
                                                                         \
 UVC_ATTR(f_uvc_opts_, cname, cname)
 
-#define identity_conv(x) (x)
-
-UVCG_OPTS_ATTR(streaming_interval, streaming_interval, identity_conv,
-               kstrtou8, u8, identity_conv, 16);
-UVCG_OPTS_ATTR(streaming_maxpacket, streaming_maxpacket, le16_to_cpu,
-               kstrtou16, u16, le16_to_cpu, 3072);
-UVCG_OPTS_ATTR(streaming_maxburst, streaming_maxburst, identity_conv,
-               kstrtou8, u8, identity_conv, 15);
-
-#undef identity_conv
+UVCG_OPTS_ATTR(streaming_interval, streaming_interval, 16);
+UVCG_OPTS_ATTR(streaming_maxpacket, streaming_maxpacket, 3072);
+UVCG_OPTS_ATTR(streaming_maxburst, streaming_maxburst, 15);
 
 #undef UVCG_OPTS_ATTR
 
@@ -2185,123 +2445,31 @@ static struct configfs_attribute *uvc_attrs[] = {
         NULL,
 };
 
-static const struct config_item_type uvc_func_type = {
-        .ct_item_ops    = &uvc_item_ops,
-        .ct_attrs       = uvc_attrs,
-        .ct_owner       = THIS_MODULE,
+static const struct uvcg_config_group_type uvc_func_type = {
+        .type = {
+                .ct_item_ops    = &uvc_func_item_ops,
+                .ct_attrs       = uvc_attrs,
+                .ct_owner       = THIS_MODULE,
+        },
+        .name = "",
+        .children = (const struct uvcg_config_group_type*[]) {
+                &uvcg_control_grp_type,
+                &uvcg_streaming_grp_type,
+                NULL,
+        },
 };
 
 int uvcg_attach_configfs(struct f_uvc_opts *opts)
 {
-        config_group_init_type_name(&uvcg_control_header_grp.group,
-                                    "header",
-                                    &uvcg_control_header_grp_type);
-
-        config_group_init_type_name(&uvcg_default_processing.group,
-                        "default", &uvcg_default_processing_type);
-        config_group_init_type_name(&uvcg_processing_grp.group,
-                        "processing", &uvcg_processing_grp_type);
-        configfs_add_default_group(&uvcg_default_processing.group,
-                        &uvcg_processing_grp.group);
-
-        config_group_init_type_name(&uvcg_default_camera.group,
-                        "default", &uvcg_default_camera_type);
-        config_group_init_type_name(&uvcg_camera_grp.group,
-                        "camera", &uvcg_camera_grp_type);
-        configfs_add_default_group(&uvcg_default_camera.group,
-                        &uvcg_camera_grp.group);
-
-        config_group_init_type_name(&uvcg_default_output.group,
-                        "default", &uvcg_default_output_type);
-        config_group_init_type_name(&uvcg_output_grp.group,
-                        "output", &uvcg_output_grp_type);
-        configfs_add_default_group(&uvcg_default_output.group,
-                        &uvcg_output_grp.group);
-
-        config_group_init_type_name(&uvcg_terminal_grp.group,
-                        "terminal", &uvcg_terminal_grp_type);
-        configfs_add_default_group(&uvcg_camera_grp.group,
-                        &uvcg_terminal_grp.group);
-        configfs_add_default_group(&uvcg_output_grp.group,
-                        &uvcg_terminal_grp.group);
-
-        config_group_init_type_name(&uvcg_control_class_fs.group,
-                        "fs", &uvcg_control_class_type);
-        config_group_init_type_name(&uvcg_control_class_ss.group,
-                        "ss", &uvcg_control_class_type);
-        config_group_init_type_name(&uvcg_control_class_grp.group,
-                        "class",
-                        &uvcg_control_class_grp_type);
-        configfs_add_default_group(&uvcg_control_class_fs.group,
-                        &uvcg_control_class_grp.group);
-        configfs_add_default_group(&uvcg_control_class_ss.group,
-                        &uvcg_control_class_grp.group);
-
-        config_group_init_type_name(&uvcg_control_grp.group,
-                        "control",
-                        &uvcg_control_grp_type);
-        configfs_add_default_group(&uvcg_control_header_grp.group,
-                        &uvcg_control_grp.group);
-        configfs_add_default_group(&uvcg_processing_grp.group,
-                        &uvcg_control_grp.group);
-        configfs_add_default_group(&uvcg_terminal_grp.group,
-                        &uvcg_control_grp.group);
-        configfs_add_default_group(&uvcg_control_class_grp.group,
-                        &uvcg_control_grp.group);
-
-        config_group_init_type_name(&uvcg_streaming_header_grp.group,
-                                    "header",
-                                    &uvcg_streaming_header_grp_type);
-        config_group_init_type_name(&uvcg_uncompressed_grp.group,
-                                    "uncompressed",
-                                    &uvcg_uncompressed_grp_type);
-        config_group_init_type_name(&uvcg_mjpeg_grp.group,
-                                    "mjpeg",
-                                    &uvcg_mjpeg_grp_type);
-        config_group_init_type_name(&uvcg_default_color_matching.group,
-                                    "default",
-                                    &uvcg_default_color_matching_type);
-        config_group_init_type_name(&uvcg_color_matching_grp.group,
-                        "color_matching",
-                        &uvcg_color_matching_grp_type);
-        configfs_add_default_group(&uvcg_default_color_matching.group,
-                        &uvcg_color_matching_grp.group);
-
-        config_group_init_type_name(&uvcg_streaming_class_fs.group,
-                        "fs", &uvcg_streaming_class_type);
-        config_group_init_type_name(&uvcg_streaming_class_hs.group,
-                        "hs", &uvcg_streaming_class_type);
-        config_group_init_type_name(&uvcg_streaming_class_ss.group,
-                        "ss", &uvcg_streaming_class_type);
-        config_group_init_type_name(&uvcg_streaming_class_grp.group,
-                        "class", &uvcg_streaming_class_grp_type);
-        configfs_add_default_group(&uvcg_streaming_class_fs.group,
-                        &uvcg_streaming_class_grp.group);
-        configfs_add_default_group(&uvcg_streaming_class_hs.group,
-                        &uvcg_streaming_class_grp.group);
-        configfs_add_default_group(&uvcg_streaming_class_ss.group,
-                        &uvcg_streaming_class_grp.group);
-
-        config_group_init_type_name(&uvcg_streaming_grp.group,
-                        "streaming", &uvcg_streaming_grp_type);
-        configfs_add_default_group(&uvcg_streaming_header_grp.group,
-                        &uvcg_streaming_grp.group);
-        configfs_add_default_group(&uvcg_uncompressed_grp.group,
-                        &uvcg_streaming_grp.group);
-        configfs_add_default_group(&uvcg_mjpeg_grp.group,
-                        &uvcg_streaming_grp.group);
-        configfs_add_default_group(&uvcg_color_matching_grp.group,
-                        &uvcg_streaming_grp.group);
-        configfs_add_default_group(&uvcg_streaming_class_grp.group,
-                        &uvcg_streaming_grp.group);
-
-        config_group_init_type_name(&opts->func_inst.group,
-                        "",
-                        &uvc_func_type);
-        configfs_add_default_group(&uvcg_control_grp.group,
-                        &opts->func_inst.group);
-        configfs_add_default_group(&uvcg_streaming_grp.group,
-                        &opts->func_inst.group);
+        int ret;
 
-        return 0;
+        config_group_init_type_name(&opts->func_inst.group, uvc_func_type.name,
+                                    &uvc_func_type.type);
+
+        ret = uvcg_config_create_children(&opts->func_inst.group,
+                                          &uvc_func_type);
+        if (ret < 0)
+                config_group_put(&opts->func_inst.group);
+
+        return ret;
 }
diff --git a/drivers/usb/gadget/function/uvc_v4l2.c b/drivers/usb/gadget/function/uvc_v4l2.c
index 7f1ca3b57823..a1183eccee22 100644
--- a/drivers/usb/gadget/function/uvc_v4l2.c
+++ b/drivers/usb/gadget/function/uvc_v4l2.c
@@ -115,8 +115,8 @@ uvc_v4l2_set_format(struct file *file, void *fh, struct v4l2_format *fmt)
         }
 
         if (i == ARRAY_SIZE(uvc_formats)) {
-                printk(KERN_INFO "Unsupported format 0x%08x.\n",
-                        fmt->fmt.pix.pixelformat);
+                uvcg_info(&uvc->func, "Unsupported format 0x%08x.\n",
+                          fmt->fmt.pix.pixelformat);
                 return -EINVAL;
         }
 
diff --git a/drivers/usb/gadget/function/uvc_video.c b/drivers/usb/gadget/function/uvc_video.c
index d3567b90343a..5c042f380708 100644
--- a/drivers/usb/gadget/function/uvc_video.c
+++ b/drivers/usb/gadget/function/uvc_video.c
@@ -125,6 +125,23 @@ uvc_video_encode_isoc(struct usb_request *req, struct uvc_video *video,
  * Request handling
  */
 
+static int uvcg_video_ep_queue(struct uvc_video *video, struct usb_request *req)
+{
+        int ret;
+
+        ret = usb_ep_queue(video->ep, req, GFP_ATOMIC);
+        if (ret < 0) {
+                uvcg_err(&video->uvc->func, "Failed to queue request (%d).\n",
+                         ret);
+
+                /* Isochronous endpoints can't be halted. */
+                if (usb_endpoint_xfer_bulk(video->ep->desc))
+                        usb_ep_set_halt(video->ep);
+        }
+
+        return ret;
+}
+
 /*
  * I somehow feel that synchronisation won't be easy to achieve here. We have
  * three events that control USB requests submission:
@@ -169,13 +186,14 @@ uvc_video_complete(struct usb_ep *ep, struct usb_request *req)
                 break;
 
         case -ESHUTDOWN:        /* disconnect from host. */
-                printk(KERN_DEBUG "VS request cancelled.\n");
+                uvcg_dbg(&video->uvc->func, "VS request cancelled.\n");
                 uvcg_queue_cancel(queue, 1);
                 goto requeue;
 
         default:
-                printk(KERN_INFO "VS request completed with status %d.\n",
-                        req->status);
+                uvcg_info(&video->uvc->func,
+                          "VS request completed with status %d.\n",
+                          req->status);
                 uvcg_queue_cancel(queue, 0);
                 goto requeue;
         }
@@ -189,14 +207,13 @@ uvc_video_complete(struct usb_ep *ep, struct usb_request *req)
 
         video->encode(req, video, buf);
 
-        if ((ret = usb_ep_queue(ep, req, GFP_ATOMIC)) < 0) {
-                printk(KERN_INFO "Failed to queue request (%d).\n", ret);
-                usb_ep_set_halt(ep);
-                spin_unlock_irqrestore(&video->queue.irqlock, flags);
+        ret = uvcg_video_ep_queue(video, req);
+        spin_unlock_irqrestore(&video->queue.irqlock, flags);
+
+        if (ret < 0) {
                 uvcg_queue_cancel(queue, 0);
                 goto requeue;
         }
-        spin_unlock_irqrestore(&video->queue.irqlock, flags);
 
         return;
 
@@ -316,15 +333,13 @@ int uvcg_video_pump(struct uvc_video *video)
                 video->encode(req, video, buf);
 
                 /* Queue the USB request */
-                ret = usb_ep_queue(video->ep, req, GFP_ATOMIC);
+                ret = uvcg_video_ep_queue(video, req);
+                spin_unlock_irqrestore(&queue->irqlock, flags);
+
                 if (ret < 0) {
-                        printk(KERN_INFO "Failed to queue request (%d)\n", ret);
-                        usb_ep_set_halt(video->ep);
-                        spin_unlock_irqrestore(&queue->irqlock, flags);
                         uvcg_queue_cancel(queue, 0);
                         break;
                 }
-                spin_unlock_irqrestore(&queue->irqlock, flags);
         }
 
         spin_lock_irqsave(&video->req_lock, flags);
@@ -342,8 +357,8 @@ int uvcg_video_enable(struct uvc_video *video, int enable)
         int ret;
 
         if (video->ep == NULL) {
-                printk(KERN_INFO "Video enable failed, device is "
-                        "uninitialized.\n");
+                uvcg_info(&video->uvc->func,
+                          "Video enable failed, device is uninitialized.\n");
                 return -ENODEV;
         }
 
@@ -375,11 +390,12 @@ int uvcg_video_enable(struct uvc_video *video, int enable)
 /*
  * Initialize the UVC video stream.
  */
-int uvcg_video_init(struct uvc_video *video)
+int uvcg_video_init(struct uvc_video *video, struct uvc_device *uvc)
 {
         INIT_LIST_HEAD(&video->req_free);
         spin_lock_init(&video->req_lock);
 
+        video->uvc = uvc;
         video->fcc = V4L2_PIX_FMT_YUYV;
         video->bpp = 16;
         video->width = 320;
diff --git a/drivers/usb/gadget/function/uvc_video.h b/drivers/usb/gadget/function/uvc_video.h
index 7d77122b0ff9..278dc52c7604 100644
--- a/drivers/usb/gadget/function/uvc_video.h
+++ b/drivers/usb/gadget/function/uvc_video.h
@@ -18,6 +18,6 @@ int uvcg_video_pump(struct uvc_video *video);
 
 int uvcg_video_enable(struct uvc_video *video, int enable);
 
-int uvcg_video_init(struct uvc_video *video);
+int uvcg_video_init(struct uvc_video *video, struct uvc_device *uvc);
 
 #endif /* __UVC_VIDEO_H__ */
diff --git a/drivers/usb/gadget/udc/aspeed-vhub/epn.c b/drivers/usb/gadget/udc/aspeed-vhub/epn.c
index 5939eb1e97f2..4a28e3fbeb0b 100644
--- a/drivers/usb/gadget/udc/aspeed-vhub/epn.c
+++ b/drivers/usb/gadget/udc/aspeed-vhub/epn.c
@@ -353,7 +353,7 @@ static int ast_vhub_epn_queue(struct usb_ep* u_ep, struct usb_request *u_req,
         /* Endpoint enabled ? */
         if (!ep->epn.enabled || !u_ep->desc || !ep->dev || !ep->d_idx ||
             !ep->dev->enabled || ep->dev->suspended) {
-                EPDBG(ep,"Enqueing request on wrong or disabled EP\n");
+                EPDBG(ep, "Enqueuing request on wrong or disabled EP\n");
                 return -ESHUTDOWN;
         }
 
diff --git a/drivers/usb/gadget/udc/atmel_usba_udc.c b/drivers/usb/gadget/udc/atmel_usba_udc.c
index 17147b8c771e..11247322d587 100644
--- a/drivers/usb/gadget/udc/atmel_usba_udc.c
+++ b/drivers/usb/gadget/udc/atmel_usba_udc.c
@@ -2004,7 +2004,6 @@ static struct usba_ep * atmel_udc_of_init(struct platform_device *pdev,
                                                     struct usba_udc *udc)
 {
         u32 val;
-        const char *name;
         struct device_node *np = pdev->dev.of_node;
         const struct of_device_id *match;
         struct device_node *pp;
@@ -2018,6 +2017,8 @@ static struct usba_ep * atmel_udc_of_init(struct platform_device *pdev,
         udc->errata = match->data;
         udc->pmc = syscon_regmap_lookup_by_compatible("atmel,at91sam9g45-pmc");
         if (IS_ERR(udc->pmc))
+                udc->pmc = syscon_regmap_lookup_by_compatible("atmel,at91sam9rl-pmc");
+        if (IS_ERR(udc->pmc))
                 udc->pmc = syscon_regmap_lookup_by_compatible("atmel,at91sam9x5-pmc");
         if (udc->errata && IS_ERR(udc->pmc))
                 return ERR_CAST(udc->pmc);
@@ -2094,11 +2095,6 @@ static struct usba_ep * atmel_udc_of_init(struct platform_device *pdev,
                 ep->can_dma = of_property_read_bool(pp, "atmel,can-dma");
                 ep->can_isoc = of_property_read_bool(pp, "atmel,can-isoc");
 
-                ret = of_property_read_string(pp, "name", &name);
-                if (ret) {
-                        dev_err(&pdev->dev, "of_probe: name error(%d)\n", ret);
-                        goto err;
-                }
                 sprintf(ep->name, "ep%d", ep->index);
                 ep->ep.name = ep->name;
 
diff --git a/drivers/usb/gadget/udc/core.c b/drivers/usb/gadget/udc/core.c
index af88b48c1cea..87d6b12779f2 100644
--- a/drivers/usb/gadget/udc/core.c
+++ b/drivers/usb/gadget/udc/core.c
@@ -690,6 +690,9 @@ EXPORT_SYMBOL_GPL(usb_gadget_connect);
  * as a disconnect (when a VBUS session is active).  Not all systems
  * support software pullup controls.
  *
+ * Following a successful disconnect, invoke the ->disconnect() callback
+ * for the current gadget driver so that UDC drivers don't need to.
+ *
  * Returns zero on success, else negative errno.
  */
 int usb_gadget_disconnect(struct usb_gadget *gadget)
@@ -711,8 +714,10 @@ int usb_gadget_disconnect(struct usb_gadget *gadget)
         }
 
         ret = gadget->ops->pullup(gadget, 0);
-        if (!ret)
+        if (!ret) {
                 gadget->connected = 0;
+                gadget->udc->driver->disconnect(gadget);
+        }
 
 out:
         trace_usb_gadget_disconnect(gadget, ret);
@@ -1281,7 +1286,6 @@ static void usb_gadget_remove_driver(struct usb_udc *udc)
         kobject_uevent(&udc->dev.kobj, KOBJ_CHANGE);
 
         usb_gadget_disconnect(udc->gadget);
-        udc->driver->disconnect(udc->gadget);
         udc->driver->unbind(udc->gadget);
         usb_gadget_udc_stop(udc);
 
@@ -1471,7 +1475,6 @@ static ssize_t soft_connect_store(struct device *dev,
                 usb_gadget_connect(udc->gadget);
         } else if (sysfs_streq(buf, "disconnect")) {
                 usb_gadget_disconnect(udc->gadget);
-                udc->driver->disconnect(udc->gadget);
                 usb_gadget_udc_stop(udc);
         } else {
                 dev_err(dev, "unsupported command '%s'\n", buf);
diff --git a/drivers/usb/gadget/udc/fotg210-udc.c b/drivers/usb/gadget/udc/fotg210-udc.c
index 587c5037ff07..bc6abaea907d 100644
--- a/drivers/usb/gadget/udc/fotg210-udc.c
+++ b/drivers/usb/gadget/udc/fotg210-udc.c
@@ -741,7 +741,7 @@ static void fotg210_get_status(struct fotg210_udc *fotg210,
         fotg210->ep0_req->length = 2;
 
         spin_unlock(&fotg210->lock);
-        fotg210_ep_queue(fotg210->gadget.ep0, fotg210->ep0_req, GFP_KERNEL);
+        fotg210_ep_queue(fotg210->gadget.ep0, fotg210->ep0_req, GFP_ATOMIC);
         spin_lock(&fotg210->lock);
 }
 
diff --git a/drivers/usb/gadget/udc/fsl_udc_core.c b/drivers/usb/gadget/udc/fsl_udc_core.c
index be59309e848c..20141c3096f6 100644
--- a/drivers/usb/gadget/udc/fsl_udc_core.c
+++ b/drivers/usb/gadget/udc/fsl_udc_core.c
@@ -2234,8 +2234,10 @@ static void fsl_udc_release(struct device *dev)
         Internal structure setup functions
 *******************************************************************/
 /*------------------------------------------------------------------
- * init resource for globle controller
- * Return the udc handle on success or NULL on failure
+ * init resource for global controller called by fsl_udc_probe()
+ * On success the udc handle is initialized, on failure it is
+ * unchanged (reset).
+ * Return 0 on success and -1 on allocation failure
  ------------------------------------------------------------------*/
 static int struct_udc_setup(struct fsl_udc *udc,
                 struct platform_device *pdev)
@@ -2247,8 +2249,10 @@ static int struct_udc_setup(struct fsl_udc *udc,
         udc->phy_mode = pdata->phy_mode;
 
         udc->eps = kcalloc(udc->max_ep, sizeof(struct fsl_ep), GFP_KERNEL);
-        if (!udc->eps)
-                return -1;
+        if (!udc->eps) {
+                ERR("kmalloc udc endpoint status failed\n");
+                goto eps_alloc_failed;
+        }
 
         /* initialized QHs, take care of alignment */
         size = udc->max_ep * sizeof(struct ep_queue_head);
@@ -2262,8 +2266,7 @@ static int struct_udc_setup(struct fsl_udc *udc,
                                         &udc->ep_qh_dma, GFP_KERNEL);
         if (!udc->ep_qh) {
                 ERR("malloc QHs for udc failed\n");
-                kfree(udc->eps);
-                return -1;
+                goto ep_queue_alloc_failed;
         }
 
         udc->ep_qh_size = size;
@@ -2272,8 +2275,17 @@ static int struct_udc_setup(struct fsl_udc *udc,
         /* FIXME: fsl_alloc_request() ignores ep argument */
         udc->status_req = container_of(fsl_alloc_request(NULL, GFP_KERNEL),
                         struct fsl_req, req);
+        if (!udc->status_req) {
+                ERR("kzalloc for udc status request failed\n");
+                goto udc_status_alloc_failed;
+        }
+
         /* allocate a small amount of memory to get valid address */
         udc->status_req->req.buf = kmalloc(8, GFP_KERNEL);
+        if (!udc->status_req->req.buf) {
+                ERR("kzalloc for udc request buffer failed\n");
+                goto udc_req_buf_alloc_failed;
+        }
 
         udc->resume_state = USB_STATE_NOTATTACHED;
         udc->usb_state = USB_STATE_POWERED;
@@ -2281,6 +2293,18 @@ static int struct_udc_setup(struct fsl_udc *udc,
         udc->remote_wakeup = 0; /* default to 0 on reset */
 
         return 0;
+
+udc_req_buf_alloc_failed:
+        kfree(udc->status_req);
+udc_status_alloc_failed:
+        kfree(udc->ep_qh);
+        udc->ep_qh_size = 0;
+ep_queue_alloc_failed:
+        kfree(udc->eps);
+eps_alloc_failed:
+        udc->phy_mode = 0;
+        return -1;
+
 }
 
 /*----------------------------------------------------------------
diff --git a/drivers/usb/gadget/udc/mv_udc_core.c b/drivers/usb/gadget/udc/mv_udc_core.c
index 95f52232493b..cafde053788b 100644
--- a/drivers/usb/gadget/udc/mv_udc_core.c
+++ b/drivers/usb/gadget/udc/mv_udc_core.c
@@ -185,7 +185,7 @@ static int process_ep_req(struct mv_udc *udc, int index,
         else
                 bit_pos = 1 << (16 + curr_req->ep->ep_num);
 
-        while ((curr_dqh->curr_dtd_ptr == curr_dtd->td_dma)) {
+        while (curr_dqh->curr_dtd_ptr == curr_dtd->td_dma) {
                 if (curr_dtd->dtd_next == EP_QUEUE_HEAD_NEXT_TERMINATE) {
                         while (readl(&udc->op_regs->epstatus) & bit_pos)
                                 udelay(1);
diff --git a/drivers/usb/gadget/udc/net2280.c b/drivers/usb/gadget/udc/net2280.c
index b02ab2a8d927..e7dae5379e04 100644
--- a/drivers/usb/gadget/udc/net2280.c
+++ b/drivers/usb/gadget/udc/net2280.c
@@ -1550,9 +1550,6 @@ static int net2280_pullup(struct usb_gadget *_gadget, int is_on)
 
         spin_unlock_irqrestore(&dev->lock, flags);
 
-        if (!is_on && dev->driver)
-                dev->driver->disconnect(&dev->gadget);
-
         return 0;
 }
 
diff --git a/drivers/usb/gadget/udc/renesas_usb3.c b/drivers/usb/gadget/udc/renesas_usb3.c
index e1656f361e08..cdffbd1e0316 100644
--- a/drivers/usb/gadget/udc/renesas_usb3.c
+++ b/drivers/usb/gadget/udc/renesas_usb3.c
@@ -2437,6 +2437,9 @@ static ssize_t renesas_usb3_b_device_write(struct file *file,
         else
                 usb3->forced_b_device = false;
 
+        if (usb3->workaround_for_vbus)
+                usb3_disconnect(usb3);
+
         /* Let this driver call usb3_connect() anyway */
         usb3_check_id(usb3);
 
@@ -2600,6 +2603,13 @@ static const struct renesas_usb3_priv renesas_usb3_priv_gen3 = {
         .ramsize_per_pipe = SZ_4K,
 };
 
+static const struct renesas_usb3_priv renesas_usb3_priv_r8a77990 = {
+        .ramsize_per_ramif = SZ_16K,
+        .num_ramif = 4,
+        .ramsize_per_pipe = SZ_4K,
+        .workaround_for_vbus = true,
+};
+
 static const struct of_device_id usb3_of_match[] = {
         {
                 .compatible = "renesas,r8a7795-usb3-peri",
@@ -2618,6 +2628,10 @@ static const struct soc_device_attribute renesas_usb3_quirks_match[] = {
                 .soc_id = "r8a7795", .revision = "ES1.*",
                 .data = &renesas_usb3_priv_r8a7795_es1,
         },
+        {
+                .soc_id = "r8a77990",
+                .data = &renesas_usb3_priv_r8a77990,
+        },
         { /* sentinel */ },
 };
 
diff --git a/drivers/usb/gadget/udc/udc-xilinx.c b/drivers/usb/gadget/udc/udc-xilinx.c
index 6407e433bc78..b1f4104d1283 100644
--- a/drivers/usb/gadget/udc/udc-xilinx.c
+++ b/drivers/usb/gadget/udc/udc-xilinx.c
@@ -1078,7 +1078,7 @@ static int xudc_ep_queue(struct usb_ep *_ep, struct usb_request *_req,
         unsigned long flags;
 
         if (!ep->desc) {
-                dev_dbg(udc->dev, "%s:queing request to disabled %s\n",
+                dev_dbg(udc->dev, "%s: queuing request to disabled %s\n",
                         __func__, ep->name);
                 return -ESHUTDOWN;
         }
diff --git a/drivers/usb/host/Kconfig b/drivers/usb/host/Kconfig
index 1a4ea98cac2a..16758b12a5e9 100644
--- a/drivers/usb/host/Kconfig
+++ b/drivers/usb/host/Kconfig
@@ -276,7 +276,7 @@ config USB_EHCI_EXYNOS
         Enable support for the Samsung Exynos SOC's on-chip EHCI controller.
 
 config USB_EHCI_MV
-        bool "EHCI support for Marvell PXA/MMP USB controller"
+        tristate "EHCI support for Marvell PXA/MMP USB controller"
         depends on (ARCH_PXA || ARCH_MMP)
         select USB_EHCI_ROOT_HUB_TT
         ---help---
diff --git a/drivers/usb/host/Makefile b/drivers/usb/host/Makefile
index e6235269c151..84514f71ae44 100644
--- a/drivers/usb/host/Makefile
+++ b/drivers/usb/host/Makefile
@@ -87,6 +87,7 @@ obj-$(CONFIG_USB_IMX21_HCD)	+= imx21-hcd.o
 obj-$(CONFIG_USB_FSL_USB2)      += fsl-mph-dr-of.o
 obj-$(CONFIG_USB_EHCI_FSL)      += fsl-mph-dr-of.o
 obj-$(CONFIG_USB_EHCI_FSL)      += ehci-fsl.o
+obj-$(CONFIG_USB_EHCI_MV)       += ehci-mv.o
 obj-$(CONFIG_USB_HCD_BCMA)      += bcma-hcd.o
 obj-$(CONFIG_USB_HCD_SSB)       += ssb-hcd.o
 obj-$(CONFIG_USB_FOTG210_HCD)   += fotg210-hcd.o
diff --git a/drivers/usb/host/ehci-hcd.c b/drivers/usb/host/ehci-hcd.c
index 8608ac513fb7..cdafa97f632d 100644
--- a/drivers/usb/host/ehci-hcd.c
+++ b/drivers/usb/host/ehci-hcd.c
@@ -730,9 +730,9 @@ static irqreturn_t ehci_irq (struct usb_hcd *hcd)
         /* normal [4.15.1.2] or error [4.15.1.1] completion */
         if (likely ((status & (STS_INT|STS_ERR)) != 0)) {
                 if (likely ((status & STS_ERR) == 0))
-                        COUNT (ehci->stats.normal);
+                        INCR(ehci->stats.normal);
                 else
-                        COUNT (ehci->stats.error);
+                        INCR(ehci->stats.error);
                 bh = 1;
         }
 
@@ -756,7 +756,7 @@ static irqreturn_t ehci_irq (struct usb_hcd *hcd)
                 if (cmd & CMD_IAAD)
                         ehci_dbg(ehci, "IAA with IAAD still set?\n");
                 if (ehci->iaa_in_progress)
-                        COUNT(ehci->stats.iaa);
+                        INCR(ehci->stats.iaa);
                 end_iaa_cycle(ehci);
         }
 
@@ -1286,11 +1286,6 @@ MODULE_LICENSE ("GPL");
 #define PLATFORM_DRIVER         ehci_grlib_driver
 #endif
 
-#ifdef CONFIG_USB_EHCI_MV
-#include "ehci-mv.c"
-#define        PLATFORM_DRIVER         ehci_mv_driver
-#endif
-
 static int __init ehci_hcd_init(void)
 {
         int retval = 0;
diff --git a/drivers/usb/host/ehci-mv.c b/drivers/usb/host/ehci-mv.c
index de764459e05a..f26109eafdbf 100644
--- a/drivers/usb/host/ehci-mv.c
+++ b/drivers/usb/host/ehci-mv.c
@@ -12,24 +12,33 @@
 #include <linux/err.h>
 #include <linux/usb/otg.h>
 #include <linux/platform_data/mv_usb.h>
+#include <linux/io.h>
+
+#include <linux/usb/hcd.h>
+
+#include "ehci.h"
+
+/* registers */
+#define U2x_CAPREGS_OFFSET       0x100
 
 #define CAPLENGTH_MASK         (0xff)
 
-struct ehci_hcd_mv {
-        struct usb_hcd *hcd;
+#define hcd_to_ehci_hcd_mv(h) ((struct ehci_hcd_mv *)hcd_to_ehci(h)->priv)
 
+struct ehci_hcd_mv {
         /* Which mode does this ehci running OTG/Host ? */
         int mode;
 
-        void __iomem *phy_regs;
+        void __iomem *base;
         void __iomem *cap_regs;
         void __iomem *op_regs;
 
         struct usb_phy *otg;
+        struct clk *clk;
 
-        struct mv_usb_platform_data *pdata;
+        struct phy *phy;
 
-        struct clk *clk;
+        int (*set_vbus)(unsigned int vbus);
 };
 
 static void ehci_clock_enable(struct ehci_hcd_mv *ehci_mv)
@@ -44,29 +53,20 @@ static void ehci_clock_disable(struct ehci_hcd_mv *ehci_mv)
 
 static int mv_ehci_enable(struct ehci_hcd_mv *ehci_mv)
 {
-        int retval;
-
         ehci_clock_enable(ehci_mv);
-        if (ehci_mv->pdata->phy_init) {
-                retval = ehci_mv->pdata->phy_init(ehci_mv->phy_regs);
-                if (retval)
-                        return retval;
-        }
-
-        return 0;
+        return phy_init(ehci_mv->phy);
 }
 
 static void mv_ehci_disable(struct ehci_hcd_mv *ehci_mv)
 {
-        if (ehci_mv->pdata->phy_deinit)
-                ehci_mv->pdata->phy_deinit(ehci_mv->phy_regs);
+        phy_exit(ehci_mv->phy);
         ehci_clock_disable(ehci_mv);
 }
 
 static int mv_ehci_reset(struct usb_hcd *hcd)
 {
         struct device *dev = hcd->self.controller;
-        struct ehci_hcd_mv *ehci_mv = dev_get_drvdata(dev);
+        struct ehci_hcd_mv *ehci_mv = hcd_to_ehci_hcd_mv(hcd);
         int retval;
 
         if (ehci_mv == NULL) {
@@ -83,46 +83,11 @@ static int mv_ehci_reset(struct usb_hcd *hcd)
         return retval;
 }
 
-static const struct hc_driver mv_ehci_hc_driver = {
-        .description = hcd_name,
-        .product_desc = "Marvell EHCI",
-        .hcd_priv_size = sizeof(struct ehci_hcd),
-
-        /*
-         * generic hardware linkage
-         */
-        .irq = ehci_irq,
-        .flags = HCD_MEMORY | HCD_USB2 | HCD_BH,
-
-        /*
-         * basic lifecycle operations
-         */
-        .reset = mv_ehci_reset,
-        .start = ehci_run,
-        .stop = ehci_stop,
-        .shutdown = ehci_shutdown,
-
-        /*
-         * managing i/o requests and associated device resources
-         */
-        .urb_enqueue = ehci_urb_enqueue,
-        .urb_dequeue = ehci_urb_dequeue,
-        .endpoint_disable = ehci_endpoint_disable,
-        .endpoint_reset = ehci_endpoint_reset,
-        .clear_tt_buffer_complete = ehci_clear_tt_buffer_complete,
-
-        /*
-         * scheduling support
-         */
-        .get_frame_number = ehci_get_frame,
-
-        /*
-         * root hub support
-         */
-        .hub_status_data = ehci_hub_status_data,
-        .hub_control = ehci_hub_control,
-        .bus_suspend = ehci_bus_suspend,
-        .bus_resume = ehci_bus_resume,
+static struct hc_driver __read_mostly ehci_platform_hc_driver;
+
+static const struct ehci_driver_overrides platform_overrides __initconst = {
+        .reset =                mv_ehci_reset,
+        .extra_priv_size =      sizeof(struct ehci_hcd_mv),
 };
 
 static int mv_ehci_probe(struct platform_device *pdev)
@@ -135,27 +100,29 @@ static int mv_ehci_probe(struct platform_device *pdev)
         int retval = -ENODEV;
         u32 offset;
 
-        if (!pdata) {
-                dev_err(&pdev->dev, "missing platform_data\n");
-                return -ENODEV;
-        }
-
         if (usb_disabled())
                 return -ENODEV;
 
-        hcd = usb_create_hcd(&mv_ehci_hc_driver, &pdev->dev, "mv ehci");
+        hcd = usb_create_hcd(&ehci_platform_hc_driver, &pdev->dev, "mv ehci");
         if (!hcd)
                 return -ENOMEM;
 
-        ehci_mv = devm_kzalloc(&pdev->dev, sizeof(*ehci_mv), GFP_KERNEL);
-        if (ehci_mv == NULL) {
-                retval = -ENOMEM;
-                goto err_put_hcd;
+        platform_set_drvdata(pdev, hcd);
+        ehci_mv = hcd_to_ehci_hcd_mv(hcd);
+
+        ehci_mv->mode = MV_USB_MODE_HOST;
+        if (pdata) {
+                ehci_mv->mode = pdata->mode;
+                ehci_mv->set_vbus = pdata->set_vbus;
         }
 
-        platform_set_drvdata(pdev, ehci_mv);
-        ehci_mv->pdata = pdata;
-        ehci_mv->hcd = hcd;
+        ehci_mv->phy = devm_phy_get(&pdev->dev, "usb");
+        if (IS_ERR(ehci_mv->phy)) {
+                retval = PTR_ERR(ehci_mv->phy);
+                if (retval != -EPROBE_DEFER)
+                        dev_err(&pdev->dev, "Failed to get phy.\n");
+                goto err_put_hcd;
+        }
 
         ehci_mv->clk = devm_clk_get(&pdev->dev, NULL);
         if (IS_ERR(ehci_mv->clk)) {
@@ -164,17 +131,12 @@ static int mv_ehci_probe(struct platform_device *pdev)
                 goto err_put_hcd;
         }
 
-        r = platform_get_resource_byname(pdev, IORESOURCE_MEM, "phyregs");
-        ehci_mv->phy_regs = devm_ioremap_resource(&pdev->dev, r);
-        if (IS_ERR(ehci_mv->phy_regs)) {
-                retval = PTR_ERR(ehci_mv->phy_regs);
-                goto err_put_hcd;
-        }
 
-        r = platform_get_resource_byname(pdev, IORESOURCE_MEM, "capregs");
-        ehci_mv->cap_regs = devm_ioremap_resource(&pdev->dev, r);
-        if (IS_ERR(ehci_mv->cap_regs)) {
-                retval = PTR_ERR(ehci_mv->cap_regs);
+
+        r = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+        ehci_mv->base = devm_ioremap_resource(&pdev->dev, r);
+        if (IS_ERR(ehci_mv->base)) {
+                retval = PTR_ERR(ehci_mv->base);
                 goto err_put_hcd;
         }
 
@@ -184,6 +146,8 @@ static int mv_ehci_probe(struct platform_device *pdev)
                 goto err_put_hcd;
         }
 
+        ehci_mv->cap_regs =
+                (void __iomem *) ((unsigned long) ehci_mv->base + U2x_CAPREGS_OFFSET);
         offset = readl(ehci_mv->cap_regs) & CAPLENGTH_MASK;
         ehci_mv->op_regs =
                 (void __iomem *) ((unsigned long) ehci_mv->cap_regs + offset);
@@ -202,7 +166,6 @@ static int mv_ehci_probe(struct platform_device *pdev)
         ehci = hcd_to_ehci(hcd);
         ehci->caps = (struct ehci_caps *) ehci_mv->cap_regs;
 
-        ehci_mv->mode = pdata->mode;
         if (ehci_mv->mode == MV_USB_MODE_OTG) {
                 ehci_mv->otg = devm_usb_get_phy(&pdev->dev, USB_PHY_TYPE_USB2);
                 if (IS_ERR(ehci_mv->otg)) {
@@ -227,8 +190,8 @@ static int mv_ehci_probe(struct platform_device *pdev)
                 /* otg will enable clock before use as host */
                 mv_ehci_disable(ehci_mv);
         } else {
-                if (pdata->set_vbus)
-                        pdata->set_vbus(1);
+                if (ehci_mv->set_vbus)
+                        ehci_mv->set_vbus(1);
 
                 retval = usb_add_hcd(hcd, hcd->irq, IRQF_SHARED);
                 if (retval) {
@@ -239,9 +202,6 @@ static int mv_ehci_probe(struct platform_device *pdev)
                 device_wakeup_enable(hcd->self.controller);
         }
 
-        if (pdata->private_init)
-                pdata->private_init(ehci_mv->op_regs, ehci_mv->phy_regs);
-
         dev_info(&pdev->dev,
                  "successful find EHCI device with regs 0x%p irq %d"
                  " working in %s mode\n", hcd->regs, hcd->irq,
@@ -250,8 +210,8 @@ static int mv_ehci_probe(struct platform_device *pdev)
         return 0;
 
 err_set_vbus:
-        if (pdata->set_vbus)
-                pdata->set_vbus(0);
+        if (ehci_mv->set_vbus)
+                ehci_mv->set_vbus(0);
 err_disable_clk:
         mv_ehci_disable(ehci_mv);
 err_put_hcd:
@@ -262,8 +222,8 @@ err_put_hcd:
 
 static int mv_ehci_remove(struct platform_device *pdev)
 {
-        struct ehci_hcd_mv *ehci_mv = platform_get_drvdata(pdev);
-        struct usb_hcd *hcd = ehci_mv->hcd;
+        struct usb_hcd *hcd = platform_get_drvdata(pdev);
+        struct ehci_hcd_mv *ehci_mv = hcd_to_ehci_hcd_mv(hcd);
 
         if (hcd->rh_registered)
                 usb_remove_hcd(hcd);
@@ -272,8 +232,8 @@ static int mv_ehci_remove(struct platform_device *pdev)
                 otg_set_host(ehci_mv->otg->otg, NULL);
 
         if (ehci_mv->mode == MV_USB_MODE_HOST) {
-                if (ehci_mv->pdata->set_vbus)
-                        ehci_mv->pdata->set_vbus(0);
+                if (ehci_mv->set_vbus)
+                        ehci_mv->set_vbus(0);
 
                 mv_ehci_disable(ehci_mv);
         }
@@ -295,8 +255,7 @@ static const struct platform_device_id ehci_id_table[] = {
 
 static void mv_ehci_shutdown(struct platform_device *pdev)
 {
-        struct ehci_hcd_mv *ehci_mv = platform_get_drvdata(pdev);
-        struct usb_hcd *hcd = ehci_mv->hcd;
+        struct usb_hcd *hcd = platform_get_drvdata(pdev);
 
         if (!hcd->rh_registered)
                 return;
@@ -305,13 +264,41 @@ static void mv_ehci_shutdown(struct platform_device *pdev)
                 hcd->driver->shutdown(hcd);
 }
 
+static const struct of_device_id ehci_mv_dt_ids[] = {
+        { .compatible = "marvell,pxau2o-ehci", },
+        {},
+};
+
 static struct platform_driver ehci_mv_driver = {
         .probe = mv_ehci_probe,
         .remove = mv_ehci_remove,
         .shutdown = mv_ehci_shutdown,
         .driver = {
-                   .name = "mv-ehci",
-                   .bus = &platform_bus_type,
-                   },
+                .name = "mv-ehci",
+                .bus = &platform_bus_type,
+                .of_match_table = ehci_mv_dt_ids,
+        },
         .id_table = ehci_id_table,
 };
+
+static int __init ehci_platform_init(void)
+{
+        if (usb_disabled())
+                return -ENODEV;
+
+        ehci_init_driver(&ehci_platform_hc_driver, &platform_overrides);
+        return platform_driver_register(&ehci_mv_driver);
+}
+module_init(ehci_platform_init);
+
+static void __exit ehci_platform_cleanup(void)
+{
+        platform_driver_unregister(&ehci_mv_driver);
+}
+module_exit(ehci_platform_cleanup);
+
+MODULE_DESCRIPTION("Marvell EHCI driver");
+MODULE_AUTHOR("Chao Xie <chao.xie@marvell.com>");
+MODULE_AUTHOR("Neil Zhang <zhangwm@marvell.com>");
+MODULE_ALIAS("mv-ehci");
+MODULE_LICENSE("GPL");
diff --git a/drivers/usb/host/ehci-q.c b/drivers/usb/host/ehci-q.c
index 327630405695..aa2f77f1506d 100644
--- a/drivers/usb/host/ehci-q.c
+++ b/drivers/usb/host/ehci-q.c
@@ -245,12 +245,12 @@ ehci_urb_done(struct ehci_hcd *ehci, struct urb *urb, int status)
         }
 
         if (unlikely(urb->unlinked)) {
-                COUNT(ehci->stats.unlink);
+                INCR(ehci->stats.unlink);
         } else {
                 /* report non-error and short read status as zero */
                 if (status == -EINPROGRESS || status == -EREMOTEIO)
                         status = 0;
-                COUNT(ehci->stats.complete);
+                INCR(ehci->stats.complete);
         }
 
 #ifdef EHCI_URB_TRACE
diff --git a/drivers/usb/host/ehci-timer.c b/drivers/usb/host/ehci-timer.c
index 4fcebda4b79d..a79c8ac0a55f 100644
--- a/drivers/usb/host/ehci-timer.c
+++ b/drivers/usb/host/ehci-timer.c
@@ -347,7 +347,7 @@ static void ehci_iaa_watchdog(struct ehci_hcd *ehci)
          */
         status = ehci_readl(ehci, &ehci->regs->status);
         if ((status & STS_IAA) || !(cmd & CMD_IAAD)) {
-                COUNT(ehci->stats.lost_iaa);
+                INCR(ehci->stats.lost_iaa);
                 ehci_writel(ehci, STS_IAA, &ehci->regs->status);
         }
 
diff --git a/drivers/usb/host/ehci.h b/drivers/usb/host/ehci.h
index c8e9a48e1d51..ac5e967907d1 100644
--- a/drivers/usb/host/ehci.h
+++ b/drivers/usb/host/ehci.h
@@ -235,9 +235,9 @@ struct ehci_hcd {			/* one per controller */
         /* irq statistics */
 #ifdef EHCI_STATS
         struct ehci_stats       stats;
-#       define COUNT(x) ((x)++)
+#       define INCR(x) ((x)++)
 #else
-#       define COUNT(x)
+#       define INCR(x) do {} while (0)
 #endif
 
         /* debug files */
diff --git a/drivers/usb/host/fotg210-hcd.c b/drivers/usb/host/fotg210-hcd.c
index e64eb47770c8..0da68df259c8 100644
--- a/drivers/usb/host/fotg210-hcd.c
+++ b/drivers/usb/host/fotg210-hcd.c
@@ -31,6 +31,7 @@
 #include <linux/uaccess.h>
 #include <linux/platform_device.h>
 #include <linux/io.h>
+#include <linux/clk.h>
 
 #include <asm/byteorder.h>
 #include <asm/irq.h>
@@ -1285,7 +1286,7 @@ static void fotg210_iaa_watchdog(struct fotg210_hcd *fotg210)
                  */
                 status = fotg210_readl(fotg210, &fotg210->regs->status);
                 if ((status & STS_IAA) || !(cmd & CMD_IAAD)) {
-                        COUNT(fotg210->stats.lost_iaa);
+                        INCR(fotg210->stats.lost_iaa);
                         fotg210_writel(fotg210, STS_IAA,
                                         &fotg210->regs->status);
                 }
@@ -2204,12 +2205,12 @@ __acquires(fotg210->lock)
         }
 
         if (unlikely(urb->unlinked)) {
-                COUNT(fotg210->stats.unlink);
+                INCR(fotg210->stats.unlink);
         } else {
                 /* report non-error and short read status as zero */
                 if (status == -EINPROGRESS || status == -EREMOTEIO)
                         status = 0;
-                COUNT(fotg210->stats.complete);
+                INCR(fotg210->stats.complete);
         }
 
 #ifdef FOTG210_URB_TRACE
@@ -5153,9 +5154,9 @@ static irqreturn_t fotg210_irq(struct usb_hcd *hcd)
         /* normal [4.15.1.2] or error [4.15.1.1] completion */
         if (likely((status & (STS_INT|STS_ERR)) != 0)) {
                 if (likely((status & STS_ERR) == 0))
-                        COUNT(fotg210->stats.normal);
+                        INCR(fotg210->stats.normal);
                 else
-                        COUNT(fotg210->stats.error);
+                        INCR(fotg210->stats.error);
                 bh = 1;
         }
 
@@ -5180,7 +5181,7 @@ static irqreturn_t fotg210_irq(struct usb_hcd *hcd)
                 if (cmd & CMD_IAAD)
                         fotg210_dbg(fotg210, "IAA with IAAD still set?\n");
                 if (fotg210->async_iaa) {
-                        COUNT(fotg210->stats.iaa);
+                        INCR(fotg210->stats.iaa);
                         end_unlink_async(fotg210);
                 } else
                         fotg210_dbg(fotg210, "IAA with nothing unlinked?\n");
@@ -5596,7 +5597,7 @@ static int fotg210_hcd_probe(struct platform_device *pdev)
         hcd->regs = devm_ioremap_resource(&pdev->dev, res);
         if (IS_ERR(hcd->regs)) {
                 retval = PTR_ERR(hcd->regs);
-                goto failed;
+                goto failed_put_hcd;
         }
 
         hcd->rsrc_start = res->start;
@@ -5606,22 +5607,43 @@ static int fotg210_hcd_probe(struct platform_device *pdev)
 
         fotg210->caps = hcd->regs;
 
+        /* It's OK not to supply this clock */
+        fotg210->pclk = clk_get(dev, "PCLK");
+        if (!IS_ERR(fotg210->pclk)) {
+                retval = clk_prepare_enable(fotg210->pclk);
+                if (retval) {
+                        dev_err(dev, "failed to enable PCLK\n");
+                        goto failed_put_hcd;
+                }
+        } else if (PTR_ERR(fotg210->pclk) == -EPROBE_DEFER) {
+                /*
+                 * Percolate deferrals, for anything else,
+                 * just live without the clocking.
+                 */
+                retval = PTR_ERR(fotg210->pclk);
+                goto failed_dis_clk;
+        }
+
         retval = fotg210_setup(hcd);
         if (retval)
-                goto failed;
+                goto failed_dis_clk;
 
         fotg210_init(fotg210);
 
         retval = usb_add_hcd(hcd, irq, IRQF_SHARED);
         if (retval) {
                 dev_err(dev, "failed to add hcd with err %d\n", retval);
-                goto failed;
+                goto failed_dis_clk;
         }
         device_wakeup_enable(hcd->self.controller);
+        platform_set_drvdata(pdev, hcd);
 
         return retval;
 
-failed:
+failed_dis_clk:
+        if (!IS_ERR(fotg210->pclk))
+                clk_disable_unprepare(fotg210->pclk);
+failed_put_hcd:
         usb_put_hcd(hcd);
 fail_create_hcd:
         dev_err(dev, "init %s fail, %d\n", dev_name(dev), retval);
@@ -5635,11 +5657,11 @@ fail_create_hcd:
  */
 static int fotg210_hcd_remove(struct platform_device *pdev)
 {
-        struct device *dev = &pdev->dev;
-        struct usb_hcd *hcd = dev_get_drvdata(dev);
+        struct usb_hcd *hcd = platform_get_drvdata(pdev);
+        struct fotg210_hcd *fotg210 = hcd_to_fotg210(hcd);
 
-        if (!hcd)
-                return 0;
+        if (!IS_ERR(fotg210->pclk))
+                clk_disable_unprepare(fotg210->pclk);
 
         usb_remove_hcd(hcd);
         usb_put_hcd(hcd);
diff --git a/drivers/usb/host/fotg210.h b/drivers/usb/host/fotg210.h
index 7fcd785c7bc8..1b4db95e5c43 100644
--- a/drivers/usb/host/fotg210.h
+++ b/drivers/usb/host/fotg210.h
@@ -177,11 +177,14 @@ struct fotg210_hcd {			/* one per controller */
         /* irq statistics */
 #ifdef FOTG210_STATS
         struct fotg210_stats    stats;
-#       define COUNT(x) ((x)++)
+#       define INCR(x) ((x)++)
 #else
-#       define COUNT(x)
+#       define INCR(x) do {} while (0)
 #endif
 
+        /* silicon clock */
+        struct clk              *pclk;
+
         /* debug files */
         struct dentry           *debug_dir;
 };
diff --git a/drivers/usb/host/ohci-at91.c b/drivers/usb/host/ohci-at91.c
index e98673954020..ec6739ef3129 100644
--- a/drivers/usb/host/ohci-at91.c
+++ b/drivers/usb/host/ohci-at91.c
@@ -551,6 +551,8 @@ static int ohci_hcd_at91_drv_probe(struct platform_device *pdev)
                 pdata->overcurrent_pin[i] =
                         devm_gpiod_get_index_optional(&pdev->dev, "atmel,oc",
                                                       i, GPIOD_IN);
+                if (!pdata->overcurrent_pin[i])
+                        continue;
                 if (IS_ERR(pdata->overcurrent_pin[i])) {
                         err = PTR_ERR(pdata->overcurrent_pin[i]);
                         dev_err(&pdev->dev, "unable to claim gpio \"overcurrent\": %d\n", err);
diff --git a/drivers/usb/host/pci-quirks.c b/drivers/usb/host/pci-quirks.c
index 3625a5c1a41b..3ce71cbfbb58 100644
--- a/drivers/usb/host/pci-quirks.c
+++ b/drivers/usb/host/pci-quirks.c
@@ -783,15 +783,9 @@ static void quirk_usb_handoff_ohci(struct pci_dev *pdev)
         /* disable interrupts */
         writel((u32) ~0, base + OHCI_INTRDISABLE);
 
-        /* Reset the USB bus, if the controller isn't already in RESET */
-        if (control & OHCI_HCFS) {
-                /* Go into RESET, preserving RWC (and possibly IR) */
-                writel(control & OHCI_CTRL_MASK, base + OHCI_CONTROL);
-                readl(base + OHCI_CONTROL);
-
-                /* drive bus reset for at least 50 ms (7.1.7.5) */
-                msleep(50);
-        }
+        /* Go into the USB_RESET state, preserving RWC (and possibly IR) */
+        writel(control & OHCI_CTRL_MASK, base + OHCI_CONTROL);
+        readl(base + OHCI_CONTROL);
 
         /* software reset of the controller, preserving HcFmInterval */
         if (!no_fminterval)
diff --git a/drivers/usb/host/xhci-hub.c b/drivers/usb/host/xhci-hub.c
index 7e2a531ba321..12eea73d9f20 100644
--- a/drivers/usb/host/xhci-hub.c
+++ b/drivers/usb/host/xhci-hub.c
@@ -900,6 +900,7 @@ static u32 xhci_get_port_status(struct usb_hcd *hcd,
                                 set_bit(wIndex, &bus_state->resuming_ports);
                                 bus_state->resume_done[wIndex] = timeout;
                                 mod_timer(&hcd->rh_timer, timeout);
+                                usb_hcd_start_port_resume(&hcd->self, wIndex);
                         }
                 /* Has resume been signalled for USB_RESUME_TIME yet? */
                 } else if (time_after_eq(jiffies,
@@ -940,6 +941,7 @@ static u32 xhci_get_port_status(struct usb_hcd *hcd,
                                 clear_bit(wIndex, &bus_state->rexit_ports);
                         }
 
+                        usb_hcd_end_port_resume(&hcd->self, wIndex);
                         bus_state->port_c_suspend |= 1 << wIndex;
                         bus_state->suspended_ports &= ~(1 << wIndex);
                 } else {
@@ -962,6 +964,7 @@ static u32 xhci_get_port_status(struct usb_hcd *hcd,
             (raw_port_status & PORT_PLS_MASK) != XDEV_RESUME) {
                 bus_state->resume_done[wIndex] = 0;
                 clear_bit(wIndex, &bus_state->resuming_ports);
+                usb_hcd_end_port_resume(&hcd->self, wIndex);
         }
 
 
@@ -1337,6 +1340,7 @@ int xhci_hub_control(struct usb_hcd *hcd, u16 typeReq, u16 wValue,
                                         goto error;
 
                                 set_bit(wIndex, &bus_state->resuming_ports);
+                                usb_hcd_start_port_resume(&hcd->self, wIndex);
                                 xhci_set_link_state(xhci, ports[wIndex],
                                                     XDEV_RESUME);
                                 spin_unlock_irqrestore(&xhci->lock, flags);
@@ -1345,6 +1349,7 @@ int xhci_hub_control(struct usb_hcd *hcd, u16 typeReq, u16 wValue,
                                 xhci_set_link_state(xhci, ports[wIndex],
                                                         XDEV_U0);
                                 clear_bit(wIndex, &bus_state->resuming_ports);
+                                usb_hcd_end_port_resume(&hcd->self, wIndex);
                         }
                         bus_state->port_c_suspend |= 1 << wIndex;
 
diff --git a/drivers/usb/host/xhci-mtk-sch.c b/drivers/usb/host/xhci-mtk-sch.c
index fa33d6e5b1cb..fea555570ad4 100644
--- a/drivers/usb/host/xhci-mtk-sch.c
+++ b/drivers/usb/host/xhci-mtk-sch.c
@@ -13,14 +13,20 @@
 #include "xhci.h"
 #include "xhci-mtk.h"
 
+#define SSP_BW_BOUNDARY 130000
 #define SS_BW_BOUNDARY  51000
 /* table 5-5. High-speed Isoc Transaction Limits in usb_20 spec */
 #define HS_BW_BOUNDARY  6144
 /* usb2 spec section11.18.1: at most 188 FS bytes per microframe */
 #define FS_PAYLOAD_MAX 188
+/*
+ * max number of microframes for split transfer,
+ * for fs isoc in : 1 ss + 1 idle + 7 cs
+ */
+#define TT_MICROFRAMES_MAX 9
 
 /* mtk scheduler bitmasks */
-#define EP_BPKTS(p)     ((p) & 0x3f)
+#define EP_BPKTS(p)     ((p) & 0x7f)
 #define EP_BCSCOUNT(p)  (((p) & 0x7) << 8)
 #define EP_BBM(p)       ((p) << 11)
 #define EP_BOFFSET(p)   ((p) & 0x3fff)
@@ -51,7 +57,7 @@ static int get_bw_index(struct xhci_hcd *xhci, struct usb_device *udev,
 
         virt_dev = xhci->devs[udev->slot_id];
 
-        if (udev->speed == USB_SPEED_SUPER) {
+        if (udev->speed >= USB_SPEED_SUPER) {
                 if (usb_endpoint_dir_out(&ep->desc))
                         bw_index = (virt_dev->real_port - 1) * 2;
                 else
@@ -64,25 +70,167 @@ static int get_bw_index(struct xhci_hcd *xhci, struct usb_device *udev,
         return bw_index;
 }
 
+static u32 get_esit(struct xhci_ep_ctx *ep_ctx)
+{
+        u32 esit;
+
+        esit = 1 << CTX_TO_EP_INTERVAL(le32_to_cpu(ep_ctx->ep_info));
+        if (esit > XHCI_MTK_MAX_ESIT)
+                esit = XHCI_MTK_MAX_ESIT;
+
+        return esit;
+}
+
+static struct mu3h_sch_tt *find_tt(struct usb_device *udev)
+{
+        struct usb_tt *utt = udev->tt;
+        struct mu3h_sch_tt *tt, **tt_index, **ptt;
+        unsigned int port;
+        bool allocated_index = false;
+
+        if (!utt)
+                return NULL;    /* Not below a TT */
+
+        /*
+         * Find/create our data structure.
+         * For hubs with a single TT, we get it directly.
+         * For hubs with multiple TTs, there's an extra level of pointers.
+         */
+        tt_index = NULL;
+        if (utt->multi) {
+                tt_index = utt->hcpriv;
+                if (!tt_index) {        /* Create the index array */
+                        tt_index = kcalloc(utt->hub->maxchild,
+                                        sizeof(*tt_index), GFP_KERNEL);
+                        if (!tt_index)
+                                return ERR_PTR(-ENOMEM);
+                        utt->hcpriv = tt_index;
+                        allocated_index = true;
+                }
+                port = udev->ttport - 1;
+                ptt = &tt_index[port];
+        } else {
+                port = 0;
+                ptt = (struct mu3h_sch_tt **) &utt->hcpriv;
+        }
+
+        tt = *ptt;
+        if (!tt) {      /* Create the mu3h_sch_tt */
+                tt = kzalloc(sizeof(*tt), GFP_KERNEL);
+                if (!tt) {
+                        if (allocated_index) {
+                                utt->hcpriv = NULL;
+                                kfree(tt_index);
+                        }
+                        return ERR_PTR(-ENOMEM);
+                }
+                INIT_LIST_HEAD(&tt->ep_list);
+                tt->usb_tt = utt;
+                tt->tt_port = port;
+                *ptt = tt;
+        }
+
+        return tt;
+}
+
+/* Release the TT above udev, if it's not in use */
+static void drop_tt(struct usb_device *udev)
+{
+        struct usb_tt *utt = udev->tt;
+        struct mu3h_sch_tt *tt, **tt_index, **ptt;
+        int i, cnt;
+
+        if (!utt || !utt->hcpriv)
+                return;         /* Not below a TT, or never allocated */
+
+        cnt = 0;
+        if (utt->multi) {
+                tt_index = utt->hcpriv;
+                ptt = &tt_index[udev->ttport - 1];
+                /*  How many entries are left in tt_index? */
+                for (i = 0; i < utt->hub->maxchild; ++i)
+                        cnt += !!tt_index[i];
+        } else {
+                tt_index = NULL;
+                ptt = (struct mu3h_sch_tt **)&utt->hcpriv;
+        }
+
+        tt = *ptt;
+        if (!tt || !list_empty(&tt->ep_list))
+                return;         /* never allocated , or still in use*/
+
+        *ptt = NULL;
+        kfree(tt);
+
+        if (cnt == 1) {
+                utt->hcpriv = NULL;
+                kfree(tt_index);
+        }
+}
+
+static struct mu3h_sch_ep_info *create_sch_ep(struct usb_device *udev,
+        struct usb_host_endpoint *ep, struct xhci_ep_ctx *ep_ctx)
+{
+        struct mu3h_sch_ep_info *sch_ep;
+        struct mu3h_sch_tt *tt = NULL;
+        u32 len_bw_budget_table;
+        size_t mem_size;
+
+        if (is_fs_or_ls(udev->speed))
+                len_bw_budget_table = TT_MICROFRAMES_MAX;
+        else if ((udev->speed >= USB_SPEED_SUPER)
+                        && usb_endpoint_xfer_isoc(&ep->desc))
+                len_bw_budget_table = get_esit(ep_ctx);
+        else
+                len_bw_budget_table = 1;
+
+        mem_size = sizeof(struct mu3h_sch_ep_info) +
+                        len_bw_budget_table * sizeof(u32);
+        sch_ep = kzalloc(mem_size, GFP_KERNEL);
+        if (!sch_ep)
+                return ERR_PTR(-ENOMEM);
+
+        if (is_fs_or_ls(udev->speed)) {
+                tt = find_tt(udev);
+                if (IS_ERR(tt)) {
+                        kfree(sch_ep);
+                        return ERR_PTR(-ENOMEM);
+                }
+        }
+
+        sch_ep->sch_tt = tt;
+        sch_ep->ep = ep;
+
+        return sch_ep;
+}
+
 static void setup_sch_info(struct usb_device *udev,
                 struct xhci_ep_ctx *ep_ctx, struct mu3h_sch_ep_info *sch_ep)
 {
         u32 ep_type;
-        u32 ep_interval;
-        u32 max_packet_size;
+        u32 maxpkt;
         u32 max_burst;
         u32 mult;
         u32 esit_pkts;
+        u32 max_esit_payload;
+        u32 *bwb_table = sch_ep->bw_budget_table;
+        int i;
 
         ep_type = CTX_TO_EP_TYPE(le32_to_cpu(ep_ctx->ep_info2));
-        ep_interval = CTX_TO_EP_INTERVAL(le32_to_cpu(ep_ctx->ep_info));
-        max_packet_size = MAX_PACKET_DECODED(le32_to_cpu(ep_ctx->ep_info2));
+        maxpkt = MAX_PACKET_DECODED(le32_to_cpu(ep_ctx->ep_info2));
         max_burst = CTX_TO_MAX_BURST(le32_to_cpu(ep_ctx->ep_info2));
         mult = CTX_TO_EP_MULT(le32_to_cpu(ep_ctx->ep_info));
-
-        sch_ep->esit = 1 << ep_interval;
+        max_esit_payload =
+                (CTX_TO_MAX_ESIT_PAYLOAD_HI(
+                        le32_to_cpu(ep_ctx->ep_info)) << 16) |
+                 CTX_TO_MAX_ESIT_PAYLOAD(le32_to_cpu(ep_ctx->tx_info));
+
+        sch_ep->esit = get_esit(ep_ctx);
+        sch_ep->ep_type = ep_type;
+        sch_ep->maxpkt = maxpkt;
         sch_ep->offset = 0;
         sch_ep->burst_mode = 0;
+        sch_ep->repeat = 0;
 
         if (udev->speed == USB_SPEED_HIGH) {
                 sch_ep->cs_count = 0;
@@ -93,7 +241,6 @@ static void setup_sch_info(struct usb_device *udev,
                  * in a interval
                  */
                 sch_ep->num_budget_microframes = 1;
-                sch_ep->repeat = 0;
 
                 /*
                  * xHCI spec section6.2.3.4
@@ -101,19 +248,33 @@ static void setup_sch_info(struct usb_device *udev,
                  * opportunities per microframe
                  */
                 sch_ep->pkts = max_burst + 1;
-                sch_ep->bw_cost_per_microframe = max_packet_size * sch_ep->pkts;
-        } else if (udev->speed == USB_SPEED_SUPER) {
+                sch_ep->bw_cost_per_microframe = maxpkt * sch_ep->pkts;
+                bwb_table[0] = sch_ep->bw_cost_per_microframe;
+        } else if (udev->speed >= USB_SPEED_SUPER) {
                 /* usb3_r1 spec section4.4.7 & 4.4.8 */
                 sch_ep->cs_count = 0;
-                esit_pkts = (mult + 1) * (max_burst + 1);
+                sch_ep->burst_mode = 1;
+                /*
+                 * some device's (d)wBytesPerInterval is set as 0,
+                 * then max_esit_payload is 0, so evaluate esit_pkts from
+                 * mult and burst
+                 */
+                esit_pkts = DIV_ROUND_UP(max_esit_payload, maxpkt);
+                if (esit_pkts == 0)
+                        esit_pkts = (mult + 1) * (max_burst + 1);
+
                 if (ep_type == INT_IN_EP || ep_type == INT_OUT_EP) {
                         sch_ep->pkts = esit_pkts;
                         sch_ep->num_budget_microframes = 1;
-                        sch_ep->repeat = 0;
+                        bwb_table[0] = maxpkt * sch_ep->pkts;
                 }
 
                 if (ep_type == ISOC_IN_EP || ep_type == ISOC_OUT_EP) {
-                        if (esit_pkts <= sch_ep->esit)
+                        u32 remainder;
+
+                        if (sch_ep->esit == 1)
+                                sch_ep->pkts = esit_pkts;
+                        else if (esit_pkts <= sch_ep->esit)
                                 sch_ep->pkts = 1;
                         else
                                 sch_ep->pkts = roundup_pow_of_two(esit_pkts)
@@ -122,43 +283,48 @@ static void setup_sch_info(struct usb_device *udev,
                         sch_ep->num_budget_microframes =
                                 DIV_ROUND_UP(esit_pkts, sch_ep->pkts);
 
-                        if (sch_ep->num_budget_microframes > 1)
-                                sch_ep->repeat = 1;
-                        else
-                                sch_ep->repeat = 0;
+                        sch_ep->repeat = !!(sch_ep->num_budget_microframes > 1);
+                        sch_ep->bw_cost_per_microframe = maxpkt * sch_ep->pkts;
+
+                        remainder = sch_ep->bw_cost_per_microframe;
+                        remainder *= sch_ep->num_budget_microframes;
+                        remainder -= (maxpkt * esit_pkts);
+                        for (i = 0; i < sch_ep->num_budget_microframes - 1; i++)
+                                bwb_table[i] = sch_ep->bw_cost_per_microframe;
+
+                        /* last one <= bw_cost_per_microframe */
+                        bwb_table[i] = remainder;
                 }
-                sch_ep->bw_cost_per_microframe = max_packet_size * sch_ep->pkts;
         } else if (is_fs_or_ls(udev->speed)) {
+                sch_ep->pkts = 1; /* at most one packet for each microframe */
 
                 /*
-                 * usb_20 spec section11.18.4
-                 * assume worst cases
+                 * num_budget_microframes and cs_count will be updated when
+                 * check TT for INT_OUT_EP, ISOC/INT_IN_EP type
                  */
-                sch_ep->repeat = 0;
-                sch_ep->pkts = 1; /* at most one packet for each microframe */
-                if (ep_type == INT_IN_EP || ep_type == INT_OUT_EP) {
-                        sch_ep->cs_count = 3; /* at most need 3 CS*/
-                        /* one for SS and one for budgeted transaction */
-                        sch_ep->num_budget_microframes = sch_ep->cs_count + 2;
-                        sch_ep->bw_cost_per_microframe = max_packet_size;
-                }
-                if (ep_type == ISOC_OUT_EP) {
+                sch_ep->cs_count = DIV_ROUND_UP(maxpkt, FS_PAYLOAD_MAX);
+                sch_ep->num_budget_microframes = sch_ep->cs_count;
+                sch_ep->bw_cost_per_microframe =
+                        (maxpkt < FS_PAYLOAD_MAX) ? maxpkt : FS_PAYLOAD_MAX;
 
+                /* init budget table */
+                if (ep_type == ISOC_OUT_EP) {
+                        for (i = 0; i < sch_ep->num_budget_microframes; i++)
+                                bwb_table[i] =  sch_ep->bw_cost_per_microframe;
+                } else if (ep_type == INT_OUT_EP) {
+                        /* only first one consumes bandwidth, others as zero */
+                        bwb_table[0] = sch_ep->bw_cost_per_microframe;
+                } else { /* INT_IN_EP or ISOC_IN_EP */
+                        bwb_table[0] = 0; /* start split */
+                        bwb_table[1] = 0; /* idle */
                         /*
-                         * the best case FS budget assumes that 188 FS bytes
-                         * occur in each microframe
+                         * due to cs_count will be updated according to cs
+                         * position, assign all remainder budget array
+                         * elements as @bw_cost_per_microframe, but only first
+                         * @num_budget_microframes elements will be used later
                          */
-                        sch_ep->num_budget_microframes = DIV_ROUND_UP(
-                                max_packet_size, FS_PAYLOAD_MAX);
-                        sch_ep->bw_cost_per_microframe = FS_PAYLOAD_MAX;
-                        sch_ep->cs_count = sch_ep->num_budget_microframes;
-                }
-                if (ep_type == ISOC_IN_EP) {
-                        /* at most need additional two CS. */
-                        sch_ep->cs_count = DIV_ROUND_UP(
-                                max_packet_size, FS_PAYLOAD_MAX) + 2;
-                        sch_ep->num_budget_microframes = sch_ep->cs_count + 2;
-                        sch_ep->bw_cost_per_microframe = FS_PAYLOAD_MAX;
+                        for (i = 2; i < TT_MICROFRAMES_MAX; i++)
+                                bwb_table[i] =  sch_ep->bw_cost_per_microframe;
                 }
         }
 }
@@ -169,6 +335,7 @@ static u32 get_max_bw(struct mu3h_sch_bw_info *sch_bw,
 {
         u32 num_esit;
         u32 max_bw = 0;
+        u32 bw;
         int i;
         int j;
 
@@ -177,15 +344,17 @@ static u32 get_max_bw(struct mu3h_sch_bw_info *sch_bw,
                 u32 base = offset + i * sch_ep->esit;
 
                 for (j = 0; j < sch_ep->num_budget_microframes; j++) {
-                        if (sch_bw->bus_bw[base + j] > max_bw)
-                                max_bw = sch_bw->bus_bw[base + j];
+                        bw = sch_bw->bus_bw[base + j] +
+                                        sch_ep->bw_budget_table[j];
+                        if (bw > max_bw)
+                                max_bw = bw;
                 }
         }
         return max_bw;
 }
 
 static void update_bus_bw(struct mu3h_sch_bw_info *sch_bw,
-        struct mu3h_sch_ep_info *sch_ep, int bw_cost)
+        struct mu3h_sch_ep_info *sch_ep, bool used)
 {
         u32 num_esit;
         u32 base;
@@ -195,9 +364,105 @@ static void update_bus_bw(struct mu3h_sch_bw_info *sch_bw,
         num_esit = XHCI_MTK_MAX_ESIT / sch_ep->esit;
         for (i = 0; i < num_esit; i++) {
                 base = sch_ep->offset + i * sch_ep->esit;
+                for (j = 0; j < sch_ep->num_budget_microframes; j++) {
+                        if (used)
+                                sch_bw->bus_bw[base + j] +=
+                                        sch_ep->bw_budget_table[j];
+                        else
+                                sch_bw->bus_bw[base + j] -=
+                                        sch_ep->bw_budget_table[j];
+                }
+        }
+}
+
+static int check_sch_tt(struct usb_device *udev,
+        struct mu3h_sch_ep_info *sch_ep, u32 offset)
+{
+        struct mu3h_sch_tt *tt = sch_ep->sch_tt;
+        u32 extra_cs_count;
+        u32 fs_budget_start;
+        u32 start_ss, last_ss;
+        u32 start_cs, last_cs;
+        int i;
+
+        start_ss = offset % 8;
+        fs_budget_start = (start_ss + 1) % 8;
+
+        if (sch_ep->ep_type == ISOC_OUT_EP) {
+                last_ss = start_ss + sch_ep->cs_count - 1;
+
+                /*
+                 * usb_20 spec section11.18:
+                 * must never schedule Start-Split in Y6
+                 */
+                if (!(start_ss == 7 || last_ss < 6))
+                        return -ERANGE;
+
+                for (i = 0; i < sch_ep->cs_count; i++)
+                        if (test_bit(offset + i, tt->split_bit_map))
+                                return -ERANGE;
+
+        } else {
+                u32 cs_count = DIV_ROUND_UP(sch_ep->maxpkt, FS_PAYLOAD_MAX);
+
+                /*
+                 * usb_20 spec section11.18:
+                 * must never schedule Start-Split in Y6
+                 */
+                if (start_ss == 6)
+                        return -ERANGE;
+
+                /* one uframe for ss + one uframe for idle */
+                start_cs = (start_ss + 2) % 8;
+                last_cs = start_cs + cs_count - 1;
+
+                if (last_cs > 7)
+                        return -ERANGE;
+
+                if (sch_ep->ep_type == ISOC_IN_EP)
+                        extra_cs_count = (last_cs == 7) ? 1 : 2;
+                else /*  ep_type : INTR IN / INTR OUT */
+                        extra_cs_count = (fs_budget_start == 6) ? 1 : 2;
+
+                cs_count += extra_cs_count;
+                if (cs_count > 7)
+                        cs_count = 7; /* HW limit */
+
+                for (i = 0; i < cs_count + 2; i++) {
+                        if (test_bit(offset + i, tt->split_bit_map))
+                                return -ERANGE;
+                }
+
+                sch_ep->cs_count = cs_count;
+                /* one for ss, the other for idle */
+                sch_ep->num_budget_microframes = cs_count + 2;
+
+                /*
+                 * if interval=1, maxp >752, num_budge_micoframe is larger
+                 * than sch_ep->esit, will overstep boundary
+                 */
+                if (sch_ep->num_budget_microframes > sch_ep->esit)
+                        sch_ep->num_budget_microframes = sch_ep->esit;
+        }
+
+        return 0;
+}
+
+static void update_sch_tt(struct usb_device *udev,
+        struct mu3h_sch_ep_info *sch_ep)
+{
+        struct mu3h_sch_tt *tt = sch_ep->sch_tt;
+        u32 base, num_esit;
+        int i, j;
+
+        num_esit = XHCI_MTK_MAX_ESIT / sch_ep->esit;
+        for (i = 0; i < num_esit; i++) {
+                base = sch_ep->offset + i * sch_ep->esit;
                 for (j = 0; j < sch_ep->num_budget_microframes; j++)
-                        sch_bw->bus_bw[base + j] += bw_cost;
+                        set_bit(base + j, tt->split_bit_map);
         }
+
+        list_add_tail(&sch_ep->tt_endpoint, &tt->ep_list);
 }
 
 static int check_sch_bw(struct usb_device *udev,
@@ -205,17 +470,16 @@ static int check_sch_bw(struct usb_device *udev,
 {
         u32 offset;
         u32 esit;
-        u32 num_budget_microframes;
         u32 min_bw;
         u32 min_index;
         u32 worst_bw;
         u32 bw_boundary;
-
-        if (sch_ep->esit > XHCI_MTK_MAX_ESIT)
-                sch_ep->esit = XHCI_MTK_MAX_ESIT;
+        u32 min_num_budget;
+        u32 min_cs_count;
+        bool tt_offset_ok = false;
+        int ret;
 
         esit = sch_ep->esit;
-        num_budget_microframes = sch_ep->num_budget_microframes;
 
         /*
          * Search through all possible schedule microframes.
@@ -223,36 +487,56 @@ static int check_sch_bw(struct usb_device *udev,
          */
         min_bw = ~0;
         min_index = 0;
+        min_cs_count = sch_ep->cs_count;
+        min_num_budget = sch_ep->num_budget_microframes;
         for (offset = 0; offset < esit; offset++) {
-                if ((offset + num_budget_microframes) > sch_ep->esit)
-                        break;
+                if (is_fs_or_ls(udev->speed)) {
+                        ret = check_sch_tt(udev, sch_ep, offset);
+                        if (ret)
+                                continue;
+                        else
+                                tt_offset_ok = true;
+                }
 
-                /*
-                 * usb_20 spec section11.18:
-                 * must never schedule Start-Split in Y6
-                 */
-                if (is_fs_or_ls(udev->speed) && (offset % 8 == 6))
-                        continue;
+                if ((offset + sch_ep->num_budget_microframes) > sch_ep->esit)
+                        break;
 
                 worst_bw = get_max_bw(sch_bw, sch_ep, offset);
                 if (min_bw > worst_bw) {
                         min_bw = worst_bw;
                         min_index = offset;
+                        min_cs_count = sch_ep->cs_count;
+                        min_num_budget = sch_ep->num_budget_microframes;
                 }
                 if (min_bw == 0)
                         break;
         }
-        sch_ep->offset = min_index;
 
-        bw_boundary = (udev->speed == USB_SPEED_SUPER)
-                                ? SS_BW_BOUNDARY : HS_BW_BOUNDARY;
+        if (udev->speed == USB_SPEED_SUPER_PLUS)
+                bw_boundary = SSP_BW_BOUNDARY;
+        else if (udev->speed == USB_SPEED_SUPER)
+                bw_boundary = SS_BW_BOUNDARY;
+        else
+                bw_boundary = HS_BW_BOUNDARY;
 
         /* check bandwidth */
-        if (min_bw + sch_ep->bw_cost_per_microframe > bw_boundary)
+        if (min_bw > bw_boundary)
                 return -ERANGE;
 
+        sch_ep->offset = min_index;
+        sch_ep->cs_count = min_cs_count;
+        sch_ep->num_budget_microframes = min_num_budget;
+
+        if (is_fs_or_ls(udev->speed)) {
+                /* all offset for tt is not ok*/
+                if (!tt_offset_ok)
+                        return -ERANGE;
+
+                update_sch_tt(udev, sch_ep);
+        }
+
         /* update bus bandwidth info */
-        update_bus_bw(sch_bw, sch_ep, sch_ep->bw_cost_per_microframe);
+        update_bus_bw(sch_bw, sch_ep, 1);
 
         return 0;
 }
@@ -347,8 +631,8 @@ int xhci_mtk_add_ep_quirk(struct usb_hcd *hcd, struct usb_device *udev,
         bw_index = get_bw_index(xhci, udev, ep);
         sch_bw = &sch_array[bw_index];
 
-        sch_ep = kzalloc(sizeof(struct mu3h_sch_ep_info), GFP_NOIO);
-        if (!sch_ep)
+        sch_ep = create_sch_ep(udev, ep, ep_ctx);
+        if (IS_ERR_OR_NULL(sch_ep))
                 return -ENOMEM;
 
         setup_sch_info(udev, ep_ctx, sch_ep);
@@ -356,12 +640,14 @@ int xhci_mtk_add_ep_quirk(struct usb_hcd *hcd, struct usb_device *udev,
         ret = check_sch_bw(udev, sch_bw, sch_ep);
         if (ret) {
                 xhci_err(xhci, "Not enough bandwidth!\n");
+                if (is_fs_or_ls(udev->speed))
+                        drop_tt(udev);
+
                 kfree(sch_ep);
                 return -ENOSPC;
         }
 
         list_add_tail(&sch_ep->endpoint, &sch_bw->bw_ep_list);
-        sch_ep->ep = ep;
 
         ep_ctx->reserved[0] |= cpu_to_le32(EP_BPKTS(sch_ep->pkts)
                 | EP_BCSCOUNT(sch_ep->cs_count) | EP_BBM(sch_ep->burst_mode));
@@ -406,9 +692,12 @@ void xhci_mtk_drop_ep_quirk(struct usb_hcd *hcd, struct usb_device *udev,
 
         list_for_each_entry(sch_ep, &sch_bw->bw_ep_list, endpoint) {
                 if (sch_ep->ep == ep) {
-                        update_bus_bw(sch_bw, sch_ep,
-                                -sch_ep->bw_cost_per_microframe);
+                        update_bus_bw(sch_bw, sch_ep, 0);
                         list_del(&sch_ep->endpoint);
+                        if (is_fs_or_ls(udev->speed)) {
+                                list_del(&sch_ep->tt_endpoint);
+                                drop_tt(udev);
+                        }
                         kfree(sch_ep);
                         break;
                 }
diff --git a/drivers/usb/host/xhci-mtk.h b/drivers/usb/host/xhci-mtk.h
index cc59d80b663b..8be8c5f7ff62 100644
--- a/drivers/usb/host/xhci-mtk.h
+++ b/drivers/usb/host/xhci-mtk.h
@@ -20,6 +20,19 @@
 #define XHCI_MTK_MAX_ESIT       64
 
 /**
+ * @split_bit_map: used to avoid split microframes overlay
+ * @ep_list: Endpoints using this TT
+ * @usb_tt: usb TT related
+ * @tt_port: TT port number
+ */
+struct mu3h_sch_tt {
+        DECLARE_BITMAP(split_bit_map, XHCI_MTK_MAX_ESIT);
+        struct list_head ep_list;
+        struct usb_tt *usb_tt;
+        int tt_port;
+};
+
+/**
  * struct mu3h_sch_bw_info: schedule information for bandwidth domain
  *
  * @bus_bw: array to keep track of bandwidth already used at each uframes
@@ -41,6 +54,10 @@ struct mu3h_sch_bw_info {
  *              (@repeat==1) scheduled within the interval
  * @bw_cost_per_microframe: bandwidth cost per microframe
  * @endpoint: linked into bandwidth domain which it belongs to
+ * @tt_endpoint: linked into mu3h_sch_tt's list which it belongs to
+ * @sch_tt: mu3h_sch_tt linked into
+ * @ep_type: endpoint type
+ * @maxpkt: max packet size of endpoint
  * @ep: address of usb_host_endpoint struct
  * @offset: which uframe of the interval that transfer should be
  *              scheduled first time within the interval
@@ -57,12 +74,17 @@ struct mu3h_sch_bw_info {
  *              times; 1: distribute the (bMaxBurst+1)*(Mult+1) packets
  *              according to @pkts and @repeat. normal mode is used by
  *              default
+ * @bw_budget_table: table to record bandwidth budget per microframe
  */
 struct mu3h_sch_ep_info {
         u32 esit;
         u32 num_budget_microframes;
         u32 bw_cost_per_microframe;
         struct list_head endpoint;
+        struct list_head tt_endpoint;
+        struct mu3h_sch_tt *sch_tt;
+        u32 ep_type;
+        u32 maxpkt;
         void *ep;
         /*
          * mtk xHCI scheduling information put into reserved DWs
@@ -73,6 +95,7 @@ struct mu3h_sch_ep_info {
         u32 pkts;
         u32 cs_count;
         u32 burst_mode;
+        u32 bw_budget_table[0];
 };
 
 #define MU3C_U3_PORT_MAX 4
diff --git a/drivers/usb/host/xhci-pci.c b/drivers/usb/host/xhci-pci.c
index 51dd8e00c4f8..01c57055c0c5 100644
--- a/drivers/usb/host/xhci-pci.c
+++ b/drivers/usb/host/xhci-pci.c
@@ -41,6 +41,13 @@
 #define PCI_DEVICE_ID_INTEL_BROXTON_B_XHCI              0x1aa8
 #define PCI_DEVICE_ID_INTEL_APL_XHCI                    0x5aa8
 #define PCI_DEVICE_ID_INTEL_DNV_XHCI                    0x19d0
+#define PCI_DEVICE_ID_INTEL_ALPINE_RIDGE_2C_XHCI        0x15b5
+#define PCI_DEVICE_ID_INTEL_ALPINE_RIDGE_4C_XHCI        0x15b6
+#define PCI_DEVICE_ID_INTEL_ALPINE_RIDGE_C_2C_XHCI      0x15db
+#define PCI_DEVICE_ID_INTEL_ALPINE_RIDGE_C_4C_XHCI      0x15d4
+#define PCI_DEVICE_ID_INTEL_TITAN_RIDGE_2C_XHCI         0x15e9
+#define PCI_DEVICE_ID_INTEL_TITAN_RIDGE_4C_XHCI         0x15ec
+#define PCI_DEVICE_ID_INTEL_TITAN_RIDGE_DD_XHCI         0x15f0
 
 #define PCI_DEVICE_ID_AMD_PROMONTORYA_4                 0x43b9
 #define PCI_DEVICE_ID_AMD_PROMONTORYA_3                 0x43ba
@@ -193,6 +200,16 @@ static void xhci_pci_quirks(struct device *dev, struct xhci_hcd *xhci)
              pdev->device == PCI_DEVICE_ID_INTEL_DNV_XHCI))
                 xhci->quirks |= XHCI_MISSING_CAS;
 
+        if (pdev->vendor == PCI_VENDOR_ID_INTEL &&
+            (pdev->device == PCI_DEVICE_ID_INTEL_ALPINE_RIDGE_2C_XHCI ||
+             pdev->device == PCI_DEVICE_ID_INTEL_ALPINE_RIDGE_4C_XHCI ||
+             pdev->device == PCI_DEVICE_ID_INTEL_ALPINE_RIDGE_C_2C_XHCI ||
+             pdev->device == PCI_DEVICE_ID_INTEL_ALPINE_RIDGE_C_4C_XHCI ||
+             pdev->device == PCI_DEVICE_ID_INTEL_TITAN_RIDGE_2C_XHCI ||
+             pdev->device == PCI_DEVICE_ID_INTEL_TITAN_RIDGE_4C_XHCI ||
+             pdev->device == PCI_DEVICE_ID_INTEL_TITAN_RIDGE_DD_XHCI))
+                xhci->quirks |= XHCI_DEFAULT_PM_RUNTIME_ALLOW;
+
         if (pdev->vendor == PCI_VENDOR_ID_ETRON &&
                         pdev->device == PCI_DEVICE_ID_EJ168) {
                 xhci->quirks |= XHCI_RESET_ON_RESUME;
@@ -336,6 +353,9 @@ static int xhci_pci_probe(struct pci_dev *dev, const struct pci_device_id *id)
         /* USB-2 and USB-3 roothubs initialized, allow runtime pm suspend */
         pm_runtime_put_noidle(&dev->dev);
 
+        if (xhci->quirks & XHCI_DEFAULT_PM_RUNTIME_ALLOW)
+                pm_runtime_allow(&dev->dev);
+
         return 0;
 
 put_usb3_hcd:
@@ -353,6 +373,10 @@ static void xhci_pci_remove(struct pci_dev *dev)
 
         xhci = hcd_to_xhci(pci_get_drvdata(dev));
         xhci->xhc_state |= XHCI_STATE_REMOVING;
+
+        if (xhci->quirks & XHCI_DEFAULT_PM_RUNTIME_ALLOW)
+                pm_runtime_forbid(&dev->dev);
+
         if (xhci->shared_hcd) {
                 usb_remove_hcd(xhci->shared_hcd);
                 usb_put_hcd(xhci->shared_hcd);
diff --git a/drivers/usb/host/xhci-plat.c b/drivers/usb/host/xhci-plat.c
index 94e939249b2b..32b5574ad5c5 100644
--- a/drivers/usb/host/xhci-plat.c
+++ b/drivers/usb/host/xhci-plat.c
@@ -18,6 +18,7 @@
 #include <linux/usb/phy.h>
 #include <linux/slab.h>
 #include <linux/acpi.h>
+#include <linux/usb/of.h>
 
 #include "xhci.h"
 #include "xhci-plat.h"
@@ -305,6 +306,8 @@ static int xhci_plat_probe(struct platform_device *pdev)
                 hcd->skip_phy_initialization = 1;
         }
 
+        hcd->tpl_support = of_usb_host_tpl_support(sysdev->of_node);
+        xhci->shared_hcd->tpl_support = hcd->tpl_support;
         ret = usb_add_hcd(hcd, irq, IRQF_SHARED);
         if (ret)
                 goto disable_usb_phy;
diff --git a/drivers/usb/host/xhci-ring.c b/drivers/usb/host/xhci-ring.c
index f0a99aa0ac58..a8d92c90fb58 100644
--- a/drivers/usb/host/xhci-ring.c
+++ b/drivers/usb/host/xhci-ring.c
@@ -1155,6 +1155,10 @@ static void xhci_handle_cmd_reset_ep(struct xhci_hcd *xhci, int slot_id,
                 /* Clear our internal halted state */
                 xhci->devs[slot_id]->eps[ep_index].ep_state &= ~EP_HALTED;
         }
+
+        /* if this was a soft reset, then restart */
+        if ((le32_to_cpu(trb->generic.field[3])) & TRB_TSP)
+                ring_doorbell_for_active_rings(xhci, slot_id, ep_index);
 }
 
 static void xhci_handle_cmd_enable_slot(struct xhci_hcd *xhci, int slot_id,
@@ -1602,6 +1606,7 @@ static void handle_port_status(struct xhci_hcd *xhci,
                         set_bit(HCD_FLAG_POLL_RH, &hcd->flags);
                         mod_timer(&hcd->rh_timer,
                                   bus_state->resume_done[hcd_portnum]);
+                        usb_hcd_start_port_resume(&hcd->self, hcd_portnum);
                         bogus_port_status = true;
                 }
         }
@@ -2132,10 +2137,16 @@ static int process_bulk_intr_td(struct xhci_hcd *xhci, struct xhci_td *td,
         union xhci_trb *ep_trb, struct xhci_transfer_event *event,
         struct xhci_virt_ep *ep, int *status)
 {
+        struct xhci_slot_ctx *slot_ctx;
         struct xhci_ring *ep_ring;
         u32 trb_comp_code;
         u32 remaining, requested, ep_trb_len;
+        unsigned int slot_id;
+        int ep_index;
 
+        slot_id = TRB_TO_SLOT_ID(le32_to_cpu(event->flags));
+        slot_ctx = xhci_get_slot_ctx(xhci, xhci->devs[slot_id]->out_ctx);
+        ep_index = TRB_TO_EP_ID(le32_to_cpu(event->flags)) - 1;
         ep_ring = xhci_dma_to_transfer_ring(ep, le64_to_cpu(event->buffer));
         trb_comp_code = GET_COMP_CODE(le32_to_cpu(event->transfer_len));
         remaining = EVENT_TRB_LEN(le32_to_cpu(event->transfer_len));
@@ -2144,6 +2155,7 @@ static int process_bulk_intr_td(struct xhci_hcd *xhci, struct xhci_td *td,
 
         switch (trb_comp_code) {
         case COMP_SUCCESS:
+                ep_ring->err_count = 0;
                 /* handle success with untransferred data as short packet */
                 if (ep_trb != td->last_trb || remaining) {
                         xhci_warn(xhci, "WARN Successful completion on short TX\n");
@@ -2167,6 +2179,14 @@ static int process_bulk_intr_td(struct xhci_hcd *xhci, struct xhci_td *td,
                 ep_trb_len      = 0;
                 remaining       = 0;
                 break;
+        case COMP_USB_TRANSACTION_ERROR:
+                if ((ep_ring->err_count++ > MAX_SOFT_RETRY) ||
+                    le32_to_cpu(slot_ctx->tt_info) & TT_SLOT)
+                        break;
+                *status = 0;
+                xhci_cleanup_halted_endpoint(xhci, slot_id, ep_index,
+                                        ep_ring->stream_id, td, EP_SOFT_RESET);
+                return 0;
         default:
                 /* do nothing */
                 break;
diff --git a/drivers/usb/host/xhci-tegra.c b/drivers/usb/host/xhci-tegra.c
index 4b463e5202a4..6b5db344de30 100644
--- a/drivers/usb/host/xhci-tegra.c
+++ b/drivers/usb/host/xhci-tegra.c
@@ -18,6 +18,7 @@
 #include <linux/phy/tegra/xusb.h>
 #include <linux/platform_device.h>
 #include <linux/pm.h>
+#include <linux/pm_domain.h>
 #include <linux/pm_runtime.h>
 #include <linux/regulator/consumer.h>
 #include <linux/reset.h>
@@ -107,35 +108,35 @@
 #define IMEM_BLOCK_SIZE                         256
 
 struct tegra_xusb_fw_header {
-        u32 boot_loadaddr_in_imem;
-        u32 boot_codedfi_offset;
-        u32 boot_codetag;
-        u32 boot_codesize;
-        u32 phys_memaddr;
-        u16 reqphys_memsize;
-        u16 alloc_phys_memsize;
-        u32 rodata_img_offset;
-        u32 rodata_section_start;
-        u32 rodata_section_end;
-        u32 main_fnaddr;
-        u32 fwimg_cksum;
-        u32 fwimg_created_time;
-        u32 imem_resident_start;
-        u32 imem_resident_end;
-        u32 idirect_start;
-        u32 idirect_end;
-        u32 l2_imem_start;
-        u32 l2_imem_end;
-        u32 version_id;
+        __le32 boot_loadaddr_in_imem;
+        __le32 boot_codedfi_offset;
+        __le32 boot_codetag;
+        __le32 boot_codesize;
+        __le32 phys_memaddr;
+        __le16 reqphys_memsize;
+        __le16 alloc_phys_memsize;
+        __le32 rodata_img_offset;
+        __le32 rodata_section_start;
+        __le32 rodata_section_end;
+        __le32 main_fnaddr;
+        __le32 fwimg_cksum;
+        __le32 fwimg_created_time;
+        __le32 imem_resident_start;
+        __le32 imem_resident_end;
+        __le32 idirect_start;
+        __le32 idirect_end;
+        __le32 l2_imem_start;
+        __le32 l2_imem_end;
+        __le32 version_id;
         u8 init_ddirect;
         u8 reserved[3];
-        u32 phys_addr_log_buffer;
-        u32 total_log_entries;
-        u32 dequeue_ptr;
-        u32 dummy_var[2];
-        u32 fwimg_len;
+        __le32 phys_addr_log_buffer;
+        __le32 total_log_entries;
+        __le32 dequeue_ptr;
+        __le32 dummy_var[2];
+        __le32 fwimg_len;
         u8 magic[8];
-        u32 ss_low_power_entry_timeout;
+        __le32 ss_low_power_entry_timeout;
         u8 num_hsic_port;
         u8 padding[139]; /* Pad to 256 bytes */
 };
@@ -194,6 +195,11 @@ struct tegra_xusb {
         struct reset_control *host_rst;
         struct reset_control *ss_rst;
 
+        struct device *genpd_dev_host;
+        struct device *genpd_dev_ss;
+        struct device_link *genpd_dl_host;
+        struct device_link *genpd_dl_ss;
+
         struct phy **phys;
         unsigned int num_phys;
 
@@ -928,6 +934,57 @@ static int tegra_xusb_load_firmware(struct tegra_xusb *tegra)
         return 0;
 }
 
+static void tegra_xusb_powerdomain_remove(struct device *dev,
+                                          struct tegra_xusb *tegra)
+{
+        if (tegra->genpd_dl_ss)
+                device_link_del(tegra->genpd_dl_ss);
+        if (tegra->genpd_dl_host)
+                device_link_del(tegra->genpd_dl_host);
+        if (tegra->genpd_dev_ss)
+                dev_pm_domain_detach(tegra->genpd_dev_ss, true);
+        if (tegra->genpd_dev_host)
+                dev_pm_domain_detach(tegra->genpd_dev_host, true);
+}
+
+static int tegra_xusb_powerdomain_init(struct device *dev,
+                                       struct tegra_xusb *tegra)
+{
+        int err;
+
+        tegra->genpd_dev_host = dev_pm_domain_attach_by_name(dev, "xusb_host");
+        if (IS_ERR(tegra->genpd_dev_host)) {
+                err = PTR_ERR(tegra->genpd_dev_host);
+                dev_err(dev, "failed to get host pm-domain: %d\n", err);
+                return err;
+        }
+
+        tegra->genpd_dev_ss = dev_pm_domain_attach_by_name(dev, "xusb_ss");
+        if (IS_ERR(tegra->genpd_dev_ss)) {
+                err = PTR_ERR(tegra->genpd_dev_ss);
+                dev_err(dev, "failed to get superspeed pm-domain: %d\n", err);
+                return err;
+        }
+
+        tegra->genpd_dl_host = device_link_add(dev, tegra->genpd_dev_host,
+                                               DL_FLAG_PM_RUNTIME |
+                                               DL_FLAG_STATELESS);
+        if (!tegra->genpd_dl_host) {
+                dev_err(dev, "adding host device link failed!\n");
+                return -ENODEV;
+        }
+
+        tegra->genpd_dl_ss = device_link_add(dev, tegra->genpd_dev_ss,
+                                             DL_FLAG_PM_RUNTIME |
+                                             DL_FLAG_STATELESS);
+        if (!tegra->genpd_dl_ss) {
+                dev_err(dev, "adding superspeed device link failed!\n");
+                return -ENODEV;
+        }
+
+        return 0;
+}
+
 static int tegra_xusb_probe(struct platform_device *pdev)
 {
         struct tegra_xusb_mbox_msg msg;
@@ -1038,7 +1095,7 @@ static int tegra_xusb_probe(struct platform_device *pdev)
                 goto put_padctl;
         }
 
-        if (!pdev->dev.pm_domain) {
+        if (!of_property_read_bool(pdev->dev.of_node, "power-domains")) {
                 tegra->host_rst = devm_reset_control_get(&pdev->dev,
                                                          "xusb_host");
                 if (IS_ERR(tegra->host_rst)) {
@@ -1069,17 +1126,22 @@ static int tegra_xusb_probe(struct platform_device *pdev)
                                                         tegra->host_clk,
                                                         tegra->host_rst);
                 if (err) {
+                        tegra_powergate_power_off(TEGRA_POWERGATE_XUSBA);
                         dev_err(&pdev->dev,
                                 "failed to enable XUSBC domain: %d\n", err);
-                        goto disable_xusba;
+                        goto put_padctl;
                 }
+        } else {
+                err = tegra_xusb_powerdomain_init(&pdev->dev, tegra);
+                if (err)
+                        goto put_powerdomains;
         }
 
         tegra->supplies = devm_kcalloc(&pdev->dev, tegra->soc->num_supplies,
                                        sizeof(*tegra->supplies), GFP_KERNEL);
         if (!tegra->supplies) {
                 err = -ENOMEM;
-                goto disable_xusbc;
+                goto put_powerdomains;
         }
 
         for (i = 0; i < tegra->soc->num_supplies; i++)
@@ -1089,7 +1151,7 @@ static int tegra_xusb_probe(struct platform_device *pdev)
                                       tegra->supplies);
         if (err) {
                 dev_err(&pdev->dev, "failed to get regulators: %d\n", err);
-                goto disable_xusbc;
+                goto put_powerdomains;
         }
 
         for (i = 0; i < tegra->soc->num_types; i++)
@@ -1099,7 +1161,7 @@ static int tegra_xusb_probe(struct platform_device *pdev)
                                    sizeof(*tegra->phys), GFP_KERNEL);
         if (!tegra->phys) {
                 err = -ENOMEM;
-                goto disable_xusbc;
+                goto put_powerdomains;
         }
 
         for (i = 0, k = 0; i < tegra->soc->num_types; i++) {
@@ -1115,7 +1177,7 @@ static int tegra_xusb_probe(struct platform_device *pdev)
                                         "failed to get PHY %s: %ld\n", prop,
                                         PTR_ERR(phy));
                                 err = PTR_ERR(phy);
-                                goto disable_xusbc;
+                                goto put_powerdomains;
                         }
 
                         tegra->phys[k++] = phy;
@@ -1126,7 +1188,7 @@ static int tegra_xusb_probe(struct platform_device *pdev)
                                     dev_name(&pdev->dev));
         if (!tegra->hcd) {
                 err = -ENOMEM;
-                goto disable_xusbc;
+                goto put_powerdomains;
         }
 
         /*
@@ -1222,12 +1284,13 @@ put_rpm:
 disable_rpm:
         pm_runtime_disable(&pdev->dev);
         usb_put_hcd(tegra->hcd);
-disable_xusbc:
-        if (!pdev->dev.pm_domain)
+put_powerdomains:
+        if (!of_property_read_bool(pdev->dev.of_node, "power-domains")) {
                 tegra_powergate_power_off(TEGRA_POWERGATE_XUSBC);
-disable_xusba:
-        if (!pdev->dev.pm_domain)
                 tegra_powergate_power_off(TEGRA_POWERGATE_XUSBA);
+        } else {
+                tegra_xusb_powerdomain_remove(&pdev->dev, tegra);
+        }
 put_padctl:
         tegra_xusb_padctl_put(tegra->padctl);
         return err;
@@ -1249,6 +1312,13 @@ static int tegra_xusb_remove(struct platform_device *pdev)
         pm_runtime_put_sync(&pdev->dev);
         pm_runtime_disable(&pdev->dev);
 
+        if (!of_property_read_bool(pdev->dev.of_node, "power-domains")) {
+                tegra_powergate_power_off(TEGRA_POWERGATE_XUSBC);
+                tegra_powergate_power_off(TEGRA_POWERGATE_XUSBA);
+        } else {
+                tegra_xusb_powerdomain_remove(&pdev->dev, tegra);
+        }
+
         tegra_xusb_padctl_put(tegra->padctl);
 
         return 0;
diff --git a/drivers/usb/host/xhci.h b/drivers/usb/host/xhci.h
index 6230a578324c..bf0b3692dc9a 100644
--- a/drivers/usb/host/xhci.h
+++ b/drivers/usb/host/xhci.h
@@ -1496,6 +1496,7 @@ static inline const char *xhci_trb_type_string(u8 type)
 /* How much data is left before the 64KB boundary? */
 #define TRB_BUFF_LEN_UP_TO_BOUNDARY(addr)       (TRB_MAX_BUFF_SIZE - \
                                         (addr & (TRB_MAX_BUFF_SIZE - 1)))
+#define MAX_SOFT_RETRY          3
 
 struct xhci_segment {
         union xhci_trb          *trbs;
@@ -1583,6 +1584,7 @@ struct xhci_ring {
          * if we own the TRB (if we are the consumer).  See section 4.9.1.
          */
         u32                     cycle_state;
+        unsigned int            err_count;
         unsigned int            stream_id;
         unsigned int            num_segs;
         unsigned int            num_trbs_free;
@@ -1846,6 +1848,7 @@ struct xhci_hcd {
 #define XHCI_SUSPEND_DELAY      BIT_ULL(30)
 #define XHCI_INTEL_USB_ROLE_SW  BIT_ULL(31)
 #define XHCI_ZERO_64B_REGS      BIT_ULL(32)
+#define XHCI_DEFAULT_PM_RUNTIME_ALLOW   BIT_ULL(33)
 
         unsigned int            num_active_eps;
         unsigned int            limit_active_eps;
diff --git a/drivers/usb/misc/appledisplay.c b/drivers/usb/misc/appledisplay.c
index d746c26a8055..bd539f3058bc 100644
--- a/drivers/usb/misc/appledisplay.c
+++ b/drivers/usb/misc/appledisplay.c
@@ -146,8 +146,11 @@ static int appledisplay_bl_update_status(struct backlight_device *bd)
                 pdata->msgdata, 2,
                 ACD_USB_TIMEOUT);
         mutex_unlock(&pdata->sysfslock);
-        
-        return retval;
+
+        if (retval < 0)
+                return retval;
+        else
+                return 0;
 }
 
 static int appledisplay_bl_get_brightness(struct backlight_device *bd)
diff --git a/drivers/usb/misc/iowarrior.c b/drivers/usb/misc/iowarrior.c
index c2991b8a65ce..ba05dd80a020 100644
--- a/drivers/usb/misc/iowarrior.c
+++ b/drivers/usb/misc/iowarrior.c
@@ -808,8 +808,8 @@ static int iowarrior_probe(struct usb_interface *interface,
                          dev->int_in_endpoint->bInterval);
         /* create an internal buffer for interrupt data from the device */
         dev->read_queue =
-            kmalloc(((dev->report_size + 1) * MAX_INTERRUPT_BUFFER),
-                    GFP_KERNEL);
+            kmalloc_array(dev->report_size + 1, MAX_INTERRUPT_BUFFER,
+                          GFP_KERNEL);
         if (!dev->read_queue)
                 goto error;
         /* Get the serial-number of the chip */
diff --git a/drivers/usb/misc/trancevibrator.c b/drivers/usb/misc/trancevibrator.c
index b3e1f553954a..ac357ce2d1a6 100644
--- a/drivers/usb/misc/trancevibrator.c
+++ b/drivers/usb/misc/trancevibrator.c
@@ -46,7 +46,9 @@ static ssize_t speed_store(struct device *dev, struct device_attribute *attr,
         struct trancevibrator *tv = usb_get_intfdata(intf);
         int temp, retval, old;
 
-        temp = simple_strtoul(buf, NULL, 10);
+        retval = kstrtoint(buf, 10, &temp);
+        if (retval)
+                return retval;
         if (temp > 255)
                 temp = 255;
         else if (temp < 0)
diff --git a/drivers/usb/mtu3/mtu3_core.c b/drivers/usb/mtu3/mtu3_core.c
index d045d8458f81..ae70b9bfd797 100644
--- a/drivers/usb/mtu3/mtu3_core.c
+++ b/drivers/usb/mtu3/mtu3_core.c
@@ -185,8 +185,8 @@ static void mtu3_intr_enable(struct mtu3 *mtu)
 
         if (mtu->is_u3_ip) {
                 /* Enable U3 LTSSM interrupts */
-                value = HOT_RST_INTR | WARM_RST_INTR | VBUS_RISE_INTR |
-                    VBUS_FALL_INTR | ENTER_U3_INTR | EXIT_U3_INTR;
+                value = HOT_RST_INTR | WARM_RST_INTR |
+                        ENTER_U3_INTR | EXIT_U3_INTR;
                 mtu3_writel(mbase, U3D_LTSSM_INTR_ENABLE, value);
         }
 
diff --git a/drivers/usb/mtu3/mtu3_gadget.c b/drivers/usb/mtu3/mtu3_gadget.c
index 5c60a8c5a0b5..bbcd3332471d 100644
--- a/drivers/usb/mtu3/mtu3_gadget.c
+++ b/drivers/usb/mtu3/mtu3_gadget.c
@@ -585,6 +585,17 @@ static const struct usb_gadget_ops mtu3_gadget_ops = {
         .udc_stop = mtu3_gadget_stop,
 };
 
+static void mtu3_state_reset(struct mtu3 *mtu)
+{
+        mtu->address = 0;
+        mtu->ep0_state = MU3D_EP0_STATE_SETUP;
+        mtu->may_wakeup = 0;
+        mtu->u1_enable = 0;
+        mtu->u2_enable = 0;
+        mtu->delayed_status = false;
+        mtu->test_mode = false;
+}
+
 static void init_hw_ep(struct mtu3 *mtu, struct mtu3_ep *mep,
                 u32 epnum, u32 is_in)
 {
@@ -702,6 +713,7 @@ void mtu3_gadget_disconnect(struct mtu3 *mtu)
                 spin_lock(&mtu->lock);
         }
 
+        mtu3_state_reset(mtu);
         usb_gadget_set_state(&mtu->g, USB_STATE_NOTATTACHED);
 }
 
@@ -712,12 +724,6 @@ void mtu3_gadget_reset(struct mtu3 *mtu)
         /* report disconnect, if we didn't flush EP state */
         if (mtu->g.speed != USB_SPEED_UNKNOWN)
                 mtu3_gadget_disconnect(mtu);
-
-        mtu->address = 0;
-        mtu->ep0_state = MU3D_EP0_STATE_SETUP;
-        mtu->may_wakeup = 0;
-        mtu->u1_enable = 0;
-        mtu->u2_enable = 0;
-        mtu->delayed_status = false;
-        mtu->test_mode = false;
+        else
+                mtu3_state_reset(mtu);
 }
diff --git a/drivers/usb/phy/phy-ab8500-usb.c b/drivers/usb/phy/phy-ab8500-usb.c
index 66143ab8c043..aaf363f19714 100644
--- a/drivers/usb/phy/phy-ab8500-usb.c
+++ b/drivers/usb/phy/phy-ab8500-usb.c
@@ -505,15 +505,19 @@ static int abx500_usb_link_status_update(struct ab8500_usb *ab)
         if (is_ab8500(ab->ab8500)) {
                 enum ab8500_usb_link_status lsts;
 
-                abx500_get_register_interruptible(ab->dev,
+                ret = abx500_get_register_interruptible(ab->dev,
                                 AB8500_USB, AB8500_USB_LINE_STAT_REG, &reg);
+                if (ret < 0)
+                        return ret;
                 lsts = (reg >> 3) & 0x0F;
                 ret = ab8500_usb_link_status_update(ab, lsts);
         } else if (is_ab8505(ab->ab8500)) {
                 enum ab8505_usb_link_status lsts;
 
-                abx500_get_register_interruptible(ab->dev,
+                ret = abx500_get_register_interruptible(ab->dev,
                                 AB8500_USB, AB8505_USB_LINE_STAT_REG, &reg);
+                if (ret < 0)
+                        return ret;
                 lsts = (reg >> 3) & 0x1F;
                 ret = ab8505_usb_link_status_update(ab, lsts);
         }
diff --git a/drivers/usb/phy/phy-mxs-usb.c b/drivers/usb/phy/phy-mxs-usb.c
index e5aa24c1e4fd..1b1bb0ad40c3 100644
--- a/drivers/usb/phy/phy-mxs-usb.c
+++ b/drivers/usb/phy/phy-mxs-usb.c
@@ -563,7 +563,7 @@ static enum usb_charger_type mxs_charger_primary_detection(struct mxs_phy *x)
         regmap_read(regmap, ANADIG_USB1_CHRG_DET_STAT, &val);
         if (!(val & ANADIG_USB1_CHRG_DET_STAT_CHRG_DETECTED)) {
                 chgr_type = SDP_TYPE;
-                dev_dbg(x->phy.dev, "It is a stardard downstream port\n");
+                dev_dbg(x->phy.dev, "It is a standard downstream port\n");
         }
 
         /* Disable charger detector */
diff --git a/drivers/usb/renesas_usbhs/common.c b/drivers/usb/renesas_usbhs/common.c
index 4310df46639d..a3e1290d682d 100644
--- a/drivers/usb/renesas_usbhs/common.c
+++ b/drivers/usb/renesas_usbhs/common.c
@@ -5,6 +5,7 @@
  * Copyright (C) 2011 Renesas Solutions Corp.
  * Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
  */
+#include <linux/clk.h>
 #include <linux/err.h>
 #include <linux/gpio.h>
 #include <linux/io.h>
@@ -12,6 +13,7 @@
 #include <linux/of_device.h>
 #include <linux/of_gpio.h>
 #include <linux/pm_runtime.h>
+#include <linux/reset.h>
 #include <linux/slab.h>
 #include <linux/sysfs.h>
 #include "common.h"
@@ -290,6 +292,79 @@ static void usbhsc_set_buswait(struct usbhs_priv *priv)
                 usbhs_bset(priv, BUSWAIT, 0x000F, wait);
 }
 
+static bool usbhsc_is_multi_clks(struct usbhs_priv *priv)
+{
+        if (priv->dparam.type == USBHS_TYPE_RCAR_GEN3 ||
+            priv->dparam.type == USBHS_TYPE_RCAR_GEN3_WITH_PLL)
+                return true;
+
+        return false;
+}
+
+static int usbhsc_clk_get(struct device *dev, struct usbhs_priv *priv)
+{
+        if (!usbhsc_is_multi_clks(priv))
+                return 0;
+
+        /* The first clock should exist */
+        priv->clks[0] = of_clk_get(dev->of_node, 0);
+        if (IS_ERR(priv->clks[0]))
+                return PTR_ERR(priv->clks[0]);
+
+        /*
+         * To backward compatibility with old DT, this driver checks the return
+         * value if it's -ENOENT or not.
+         */
+        priv->clks[1] = of_clk_get(dev->of_node, 1);
+        if (PTR_ERR(priv->clks[1]) == -ENOENT)
+                priv->clks[1] = NULL;
+        else if (IS_ERR(priv->clks[1]))
+                return PTR_ERR(priv->clks[1]);
+
+        return 0;
+}
+
+static void usbhsc_clk_put(struct usbhs_priv *priv)
+{
+        int i;
+
+        if (!usbhsc_is_multi_clks(priv))
+                return;
+
+        for (i = 0; i < ARRAY_SIZE(priv->clks); i++)
+                clk_put(priv->clks[i]);
+}
+
+static int usbhsc_clk_prepare_enable(struct usbhs_priv *priv)
+{
+        int i, ret;
+
+        if (!usbhsc_is_multi_clks(priv))
+                return 0;
+
+        for (i = 0; i < ARRAY_SIZE(priv->clks); i++) {
+                ret = clk_prepare_enable(priv->clks[i]);
+                if (ret) {
+                        while (--i >= 0)
+                                clk_disable_unprepare(priv->clks[i]);
+                        return ret;
+                }
+        }
+
+        return ret;
+}
+
+static void usbhsc_clk_disable_unprepare(struct usbhs_priv *priv)
+{
+        int i;
+
+        if (!usbhsc_is_multi_clks(priv))
+                return;
+
+        for (i = 0; i < ARRAY_SIZE(priv->clks); i++)
+                clk_disable_unprepare(priv->clks[i]);
+}
+
 /*
  *              platform default param
  */
@@ -340,6 +415,10 @@ static void usbhsc_power_ctrl(struct usbhs_priv *priv, int enable)
                 /* enable PM */
                 pm_runtime_get_sync(dev);
 
+                /* enable clks */
+                if (usbhsc_clk_prepare_enable(priv))
+                        return;
+
                 /* enable platform power */
                 usbhs_platform_call(priv, power_ctrl, pdev, priv->base, enable);
 
@@ -352,6 +431,9 @@ static void usbhsc_power_ctrl(struct usbhs_priv *priv, int enable)
                 /* disable platform power */
                 usbhs_platform_call(priv, power_ctrl, pdev, priv->base, enable);
 
+                /* disable clks */
+                usbhsc_clk_disable_unprepare(priv);
+
                 /* disable PM */
                 pm_runtime_put_sync(dev);
         }
@@ -478,6 +560,10 @@ static const struct of_device_id usbhs_of_match[] = {
                 .data = (void *)USBHS_TYPE_RCAR_GEN3,
         },
         {
+                .compatible = "renesas,usbhs-r8a77990",
+                .data = (void *)USBHS_TYPE_RCAR_GEN3_WITH_PLL,
+        },
+        {
                 .compatible = "renesas,usbhs-r8a77995",
                 .data = (void *)USBHS_TYPE_RCAR_GEN3_WITH_PLL,
         },
@@ -574,6 +660,10 @@ static int usbhs_probe(struct platform_device *pdev)
                         return PTR_ERR(priv->edev);
         }
 
+        priv->rsts = devm_reset_control_array_get_optional_shared(&pdev->dev);
+        if (IS_ERR(priv->rsts))
+                return PTR_ERR(priv->rsts);
+
         /*
          * care platform info
          */
@@ -591,15 +681,6 @@ static int usbhs_probe(struct platform_device *pdev)
                 break;
         case USBHS_TYPE_RCAR_GEN3_WITH_PLL:
                 priv->pfunc = usbhs_rcar3_with_pll_ops;
-                if (!IS_ERR_OR_NULL(priv->edev)) {
-                        priv->nb.notifier_call = priv->pfunc.notifier;
-                        ret = devm_extcon_register_notifier(&pdev->dev,
-                                                            priv->edev,
-                                                            EXTCON_USB_HOST,
-                                                            &priv->nb);
-                        if (ret < 0)
-                                dev_err(&pdev->dev, "no notifier registered\n");
-                }
                 break;
         case USBHS_TYPE_RZA1:
                 priv->pfunc = usbhs_rza1_ops;
@@ -658,6 +739,14 @@ static int usbhs_probe(struct platform_device *pdev)
         /* dev_set_drvdata should be called after usbhs_mod_init */
         platform_set_drvdata(pdev, priv);
 
+        ret = reset_control_deassert(priv->rsts);
+        if (ret)
+                goto probe_fail_rst;
+
+        ret = usbhsc_clk_get(&pdev->dev, priv);
+        if (ret)
+                goto probe_fail_clks;
+
         /*
          * deviece reset here because
          * USB device might be used in boot loader.
@@ -711,6 +800,10 @@ static int usbhs_probe(struct platform_device *pdev)
         return ret;
 
 probe_end_mod_exit:
+        usbhsc_clk_put(priv);
+probe_fail_clks:
+        reset_control_assert(priv->rsts);
+probe_fail_rst:
         usbhs_mod_remove(priv);
 probe_end_fifo_exit:
         usbhs_fifo_remove(priv);
@@ -739,6 +832,8 @@ static int usbhs_remove(struct platform_device *pdev)
         pm_runtime_disable(&pdev->dev);
 
         usbhs_platform_call(priv, hardware_exit, pdev);
+        usbhsc_clk_put(priv);
+        reset_control_assert(priv->rsts);
         usbhs_mod_remove(priv);
         usbhs_fifo_remove(priv);
         usbhs_pipe_remove(priv);
diff --git a/drivers/usb/renesas_usbhs/common.h b/drivers/usb/renesas_usbhs/common.h
index 6137f7942c05..3777af848a35 100644
--- a/drivers/usb/renesas_usbhs/common.h
+++ b/drivers/usb/renesas_usbhs/common.h
@@ -8,8 +8,10 @@
 #ifndef RENESAS_USB_DRIVER_H
 #define RENESAS_USB_DRIVER_H
 
+#include <linux/clk.h>
 #include <linux/extcon.h>
 #include <linux/platform_device.h>
+#include <linux/reset.h>
 #include <linux/usb/renesas_usbhs.h>
 
 struct usbhs_priv;
@@ -255,7 +257,6 @@ struct usbhs_priv {
         struct platform_device *pdev;
 
         struct extcon_dev *edev;
-        struct notifier_block nb;
 
         spinlock_t              lock;
 
@@ -277,6 +278,8 @@ struct usbhs_priv {
         struct usbhs_fifo_info fifo_info;
 
         struct phy *phy;
+        struct reset_control *rsts;
+        struct clk *clks[2];
 };
 
 /*
diff --git a/drivers/usb/renesas_usbhs/rcar3.c b/drivers/usb/renesas_usbhs/rcar3.c
index d0ea4ff89622..aa3820448286 100644
--- a/drivers/usb/renesas_usbhs/rcar3.c
+++ b/drivers/usb/renesas_usbhs/rcar3.c
@@ -27,7 +27,6 @@
  * Remarks: bit[31:11] and bit[9:6] should be 0
  */
 #define UGCTRL2_RESERVED_3      0x00000001      /* bit[3:0] should be B'0001 */
-#define UGCTRL2_USB0SEL_EHCI    0x00000010
 #define UGCTRL2_USB0SEL_HSUSB   0x00000020
 #define UGCTRL2_USB0SEL_OTG     0x00000030
 #define UGCTRL2_VBUSSEL         0x00000400
@@ -50,14 +49,6 @@ static void usbhs_rcar3_set_ugctrl2(struct usbhs_priv *priv, u32 val)
         usbhs_write32(priv, UGCTRL2, val | UGCTRL2_RESERVED_3);
 }
 
-static void usbhs_rcar3_set_usbsel(struct usbhs_priv *priv, bool ehci)
-{
-        if (ehci)
-                usbhs_rcar3_set_ugctrl2(priv, UGCTRL2_USB0SEL_EHCI);
-        else
-                usbhs_rcar3_set_ugctrl2(priv, UGCTRL2_USB0SEL_HSUSB);
-}
-
 static int usbhs_rcar3_power_ctrl(struct platform_device *pdev,
                                 void __iomem *base, int enable)
 {
@@ -83,14 +74,11 @@ static int usbhs_rcar3_power_and_pll_ctrl(struct platform_device *pdev,
         struct usbhs_priv *priv = usbhs_pdev_to_priv(pdev);
         u32 val;
         int timeout = 1000;
-        bool is_host = false;
 
         if (enable) {
                 usbhs_write32(priv, UGCTRL, 0); /* release PLLRESET */
-                if (priv->edev)
-                        is_host = extcon_get_state(priv->edev, EXTCON_USB_HOST);
-
-                usbhs_rcar3_set_usbsel(priv, is_host);
+                usbhs_rcar3_set_ugctrl2(priv,
+                                        UGCTRL2_USB0SEL_OTG | UGCTRL2_VBUSSEL);
 
                 usbhs_bset(priv, LPSTS, LPSTS_SUSPM, LPSTS_SUSPM);
                 do {
@@ -112,16 +100,6 @@ static int usbhs_rcar3_get_id(struct platform_device *pdev)
         return USBHS_GADGET;
 }
 
-static int usbhs_rcar3_notifier(struct notifier_block *nb, unsigned long event,
-                                void *data)
-{
-        struct usbhs_priv *priv = container_of(nb, struct usbhs_priv, nb);
-
-        usbhs_rcar3_set_usbsel(priv, !!event);
-
-        return NOTIFY_DONE;
-}
-
 const struct renesas_usbhs_platform_callback usbhs_rcar3_ops = {
         .power_ctrl = usbhs_rcar3_power_ctrl,
         .get_id = usbhs_rcar3_get_id,
@@ -130,5 +108,4 @@ const struct renesas_usbhs_platform_callback usbhs_rcar3_ops = {
 const struct renesas_usbhs_platform_callback usbhs_rcar3_with_pll_ops = {
         .power_ctrl = usbhs_rcar3_power_and_pll_ctrl,
         .get_id = usbhs_rcar3_get_id,
-        .notifier = usbhs_rcar3_notifier,
 };
diff --git a/drivers/usb/serial/cypress_m8.c b/drivers/usb/serial/cypress_m8.c
index e0035c023120..ed51bc48eea6 100644
--- a/drivers/usb/serial/cypress_m8.c
+++ b/drivers/usb/serial/cypress_m8.c
@@ -378,7 +378,7 @@ static int cypress_serial_control(struct tty_struct *tty,
                         retval = -ENOTTY;
                         goto out;
                 }
-                dev_dbg(dev, "%s - retreiving serial line settings\n", __func__);
+                dev_dbg(dev, "%s - retrieving serial line settings\n", __func__);
                 do {
                         retval = usb_control_msg(port->serial->dev,
                                         usb_rcvctrlpipe(port->serial->dev, 0),
@@ -769,7 +769,7 @@ send:
 
         usb_fill_int_urb(port->interrupt_out_urb, port->serial->dev,
                 usb_sndintpipe(port->serial->dev, port->interrupt_out_endpointAddress),
-                port->interrupt_out_buffer, port->interrupt_out_size,
+                port->interrupt_out_buffer, actual_size,
                 cypress_write_int_callback, port, priv->write_urb_interval);
         result = usb_submit_urb(port->interrupt_out_urb, GFP_ATOMIC);
         if (result) {
@@ -863,7 +863,7 @@ static void cypress_set_termios(struct tty_struct *tty,
         struct cypress_private *priv = usb_get_serial_port_data(port);
         struct device *dev = &port->dev;
         int data_bits, stop_bits, parity_type, parity_enable;
-        unsigned cflag, iflag;
+        unsigned int cflag;
         unsigned long flags;
         __u8 oldlines;
         int linechange = 0;
@@ -899,7 +899,6 @@ static void cypress_set_termios(struct tty_struct *tty,
         tty->termios.c_cflag &= ~(CMSPAR|CRTSCTS);
 
         cflag = tty->termios.c_cflag;
-        iflag = tty->termios.c_iflag;
 
         /* check if there are new settings */
         if (old_termios) {
diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c
index 758ba789e997..609198d9594c 100644
--- a/drivers/usb/serial/ftdi_sio.c
+++ b/drivers/usb/serial/ftdi_sio.c
@@ -39,6 +39,7 @@
 #include <linux/uaccess.h>
 #include <linux/usb.h>
 #include <linux/serial.h>
+#include <linux/gpio/driver.h>
 #include <linux/usb/serial.h>
 #include "ftdi_sio.h"
 #include "ftdi_sio_ids.h"
@@ -72,6 +73,15 @@ struct ftdi_private {
         unsigned int latency;           /* latency setting in use */
         unsigned short max_packet_size;
         struct mutex cfg_lock; /* Avoid mess by parallel calls of config ioctl() and change_speed() */
+#ifdef CONFIG_GPIOLIB
+        struct gpio_chip gc;
+        struct mutex gpio_lock; /* protects GPIO state */
+        bool gpio_registered;   /* is the gpiochip in kernel registered */
+        bool gpio_used;         /* true if the user requested a gpio */
+        u8 gpio_altfunc;        /* which pins are in gpio mode */
+        u8 gpio_output;         /* pin directions cache */
+        u8 gpio_value;          /* pin value for outputs */
+#endif
 };
 
 /* struct ftdi_sio_quirk is used by devices requiring special attention. */
@@ -1764,6 +1774,375 @@ static void remove_sysfs_attrs(struct usb_serial_port *port)
 
 }
 
+#ifdef CONFIG_GPIOLIB
+
+static int ftdi_set_bitmode(struct usb_serial_port *port, u8 mode)
+{
+        struct ftdi_private *priv = usb_get_serial_port_data(port);
+        struct usb_serial *serial = port->serial;
+        int result;
+        u16 val;
+
+        val = (mode << 8) | (priv->gpio_output << 4) | priv->gpio_value;
+        result = usb_control_msg(serial->dev,
+                                 usb_sndctrlpipe(serial->dev, 0),
+                                 FTDI_SIO_SET_BITMODE_REQUEST,
+                                 FTDI_SIO_SET_BITMODE_REQUEST_TYPE, val,
+                                 priv->interface, NULL, 0, WDR_TIMEOUT);
+        if (result < 0) {
+                dev_err(&serial->interface->dev,
+                        "bitmode request failed for value 0x%04x: %d\n",
+                        val, result);
+        }
+
+        return result;
+}
+
+static int ftdi_set_cbus_pins(struct usb_serial_port *port)
+{
+        return ftdi_set_bitmode(port, FTDI_SIO_BITMODE_CBUS);
+}
+
+static int ftdi_exit_cbus_mode(struct usb_serial_port *port)
+{
+        struct ftdi_private *priv = usb_get_serial_port_data(port);
+
+        priv->gpio_output = 0;
+        priv->gpio_value = 0;
+        return ftdi_set_bitmode(port, FTDI_SIO_BITMODE_RESET);
+}
+
+static int ftdi_gpio_request(struct gpio_chip *gc, unsigned int offset)
+{
+        struct usb_serial_port *port = gpiochip_get_data(gc);
+        struct ftdi_private *priv = usb_get_serial_port_data(port);
+        int result;
+
+        if (priv->gpio_altfunc & BIT(offset))
+                return -ENODEV;
+
+        mutex_lock(&priv->gpio_lock);
+        if (!priv->gpio_used) {
+                /* Set default pin states, as we cannot get them from device */
+                priv->gpio_output = 0x00;
+                priv->gpio_value = 0x00;
+                result = ftdi_set_cbus_pins(port);
+                if (result) {
+                        mutex_unlock(&priv->gpio_lock);
+                        return result;
+                }
+
+                priv->gpio_used = true;
+        }
+        mutex_unlock(&priv->gpio_lock);
+
+        return 0;
+}
+
+static int ftdi_read_cbus_pins(struct usb_serial_port *port)
+{
+        struct ftdi_private *priv = usb_get_serial_port_data(port);
+        struct usb_serial *serial = port->serial;
+        unsigned char *buf;
+        int result;
+
+        buf = kmalloc(1, GFP_KERNEL);
+        if (!buf)
+                return -ENOMEM;
+
+        result = usb_control_msg(serial->dev,
+                                 usb_rcvctrlpipe(serial->dev, 0),
+                                 FTDI_SIO_READ_PINS_REQUEST,
+                                 FTDI_SIO_READ_PINS_REQUEST_TYPE, 0,
+                                 priv->interface, buf, 1, WDR_TIMEOUT);
+        if (result < 1) {
+                if (result >= 0)
+                        result = -EIO;
+        } else {
+                result = buf[0];
+        }
+
+        kfree(buf);
+
+        return result;
+}
+
+static int ftdi_gpio_get(struct gpio_chip *gc, unsigned int gpio)
+{
+        struct usb_serial_port *port = gpiochip_get_data(gc);
+        int result;
+
+        result = ftdi_read_cbus_pins(port);
+        if (result < 0)
+                return result;
+
+        return !!(result & BIT(gpio));
+}
+
+static void ftdi_gpio_set(struct gpio_chip *gc, unsigned int gpio, int value)
+{
+        struct usb_serial_port *port = gpiochip_get_data(gc);
+        struct ftdi_private *priv = usb_get_serial_port_data(port);
+
+        mutex_lock(&priv->gpio_lock);
+
+        if (value)
+                priv->gpio_value |= BIT(gpio);
+        else
+                priv->gpio_value &= ~BIT(gpio);
+
+        ftdi_set_cbus_pins(port);
+
+        mutex_unlock(&priv->gpio_lock);
+}
+
+static int ftdi_gpio_get_multiple(struct gpio_chip *gc, unsigned long *mask,
+                                        unsigned long *bits)
+{
+        struct usb_serial_port *port = gpiochip_get_data(gc);
+        int result;
+
+        result = ftdi_read_cbus_pins(port);
+        if (result < 0)
+                return result;
+
+        *bits = result & *mask;
+
+        return 0;
+}
+
+static void ftdi_gpio_set_multiple(struct gpio_chip *gc, unsigned long *mask,
+                                        unsigned long *bits)
+{
+        struct usb_serial_port *port = gpiochip_get_data(gc);
+        struct ftdi_private *priv = usb_get_serial_port_data(port);
+
+        mutex_lock(&priv->gpio_lock);
+
+        priv->gpio_value &= ~(*mask);
+        priv->gpio_value |= *bits & *mask;
+        ftdi_set_cbus_pins(port);
+
+        mutex_unlock(&priv->gpio_lock);
+}
+
+static int ftdi_gpio_direction_get(struct gpio_chip *gc, unsigned int gpio)
+{
+        struct usb_serial_port *port = gpiochip_get_data(gc);
+        struct ftdi_private *priv = usb_get_serial_port_data(port);
+
+        return !(priv->gpio_output & BIT(gpio));
+}
+
+static int ftdi_gpio_direction_input(struct gpio_chip *gc, unsigned int gpio)
+{
+        struct usb_serial_port *port = gpiochip_get_data(gc);
+        struct ftdi_private *priv = usb_get_serial_port_data(port);
+        int result;
+
+        mutex_lock(&priv->gpio_lock);
+
+        priv->gpio_output &= ~BIT(gpio);
+        result = ftdi_set_cbus_pins(port);
+
+        mutex_unlock(&priv->gpio_lock);
+
+        return result;
+}
+
+static int ftdi_gpio_direction_output(struct gpio_chip *gc, unsigned int gpio,
+                                        int value)
+{
+        struct usb_serial_port *port = gpiochip_get_data(gc);
+        struct ftdi_private *priv = usb_get_serial_port_data(port);
+        int result;
+
+        mutex_lock(&priv->gpio_lock);
+
+        priv->gpio_output |= BIT(gpio);
+        if (value)
+                priv->gpio_value |= BIT(gpio);
+        else
+                priv->gpio_value &= ~BIT(gpio);
+
+        result = ftdi_set_cbus_pins(port);
+
+        mutex_unlock(&priv->gpio_lock);
+
+        return result;
+}
+
+static int ftdi_read_eeprom(struct usb_serial *serial, void *dst, u16 addr,
+                                u16 nbytes)
+{
+        int read = 0;
+
+        if (addr % 2 != 0)
+                return -EINVAL;
+        if (nbytes % 2 != 0)
+                return -EINVAL;
+
+        /* Read EEPROM two bytes at a time */
+        while (read < nbytes) {
+                int rv;
+
+                rv = usb_control_msg(serial->dev,
+                                     usb_rcvctrlpipe(serial->dev, 0),
+                                     FTDI_SIO_READ_EEPROM_REQUEST,
+                                     FTDI_SIO_READ_EEPROM_REQUEST_TYPE,
+                                     0, (addr + read) / 2, dst + read, 2,
+                                     WDR_TIMEOUT);
+                if (rv < 2) {
+                        if (rv >= 0)
+                                return -EIO;
+                        else
+                                return rv;
+                }
+
+                read += rv;
+        }
+
+        return 0;
+}
+
+static int ftdi_gpio_init_ft232r(struct usb_serial_port *port)
+{
+        struct ftdi_private *priv = usb_get_serial_port_data(port);
+        u16 cbus_config;
+        u8 *buf;
+        int ret;
+        int i;
+
+        buf = kmalloc(2, GFP_KERNEL);
+        if (!buf)
+                return -ENOMEM;
+
+        ret = ftdi_read_eeprom(port->serial, buf, 0x14, 2);
+        if (ret < 0)
+                goto out_free;
+
+        cbus_config = le16_to_cpup((__le16 *)buf);
+        dev_dbg(&port->dev, "cbus_config = 0x%04x\n", cbus_config);
+
+        priv->gc.ngpio = 4;
+
+        priv->gpio_altfunc = 0xff;
+        for (i = 0; i < priv->gc.ngpio; ++i) {
+                if ((cbus_config & 0xf) == FTDI_FT232R_CBUS_MUX_GPIO)
+                        priv->gpio_altfunc &= ~BIT(i);
+                cbus_config >>= 4;
+        }
+out_free:
+        kfree(buf);
+
+        return ret;
+}
+
+static int ftdi_gpio_init_ftx(struct usb_serial_port *port)
+{
+        struct ftdi_private *priv = usb_get_serial_port_data(port);
+        struct usb_serial *serial = port->serial;
+        const u16 cbus_cfg_addr = 0x1a;
+        const u16 cbus_cfg_size = 4;
+        u8 *cbus_cfg_buf;
+        int result;
+        u8 i;
+
+        cbus_cfg_buf = kmalloc(cbus_cfg_size, GFP_KERNEL);
+        if (!cbus_cfg_buf)
+                return -ENOMEM;
+
+        result = ftdi_read_eeprom(serial, cbus_cfg_buf,
+                                  cbus_cfg_addr, cbus_cfg_size);
+        if (result < 0)
+                goto out_free;
+
+        /* FIXME: FT234XD alone has 1 GPIO, but how to recognize this IC? */
+        priv->gc.ngpio = 4;
+
+        /* Determine which pins are configured for CBUS bitbanging */
+        priv->gpio_altfunc = 0xff;
+        for (i = 0; i < priv->gc.ngpio; ++i) {
+                if (cbus_cfg_buf[i] == FTDI_FTX_CBUS_MUX_GPIO)
+                        priv->gpio_altfunc &= ~BIT(i);
+        }
+
+out_free:
+        kfree(cbus_cfg_buf);
+
+        return result;
+}
+
+static int ftdi_gpio_init(struct usb_serial_port *port)
+{
+        struct ftdi_private *priv = usb_get_serial_port_data(port);
+        struct usb_serial *serial = port->serial;
+        int result;
+
+        switch (priv->chip_type) {
+        case FT232RL:
+                result = ftdi_gpio_init_ft232r(port);
+                break;
+        case FTX:
+                result = ftdi_gpio_init_ftx(port);
+                break;
+        default:
+                return 0;
+        }
+
+        if (result < 0)
+                return result;
+
+        mutex_init(&priv->gpio_lock);
+
+        priv->gc.label = "ftdi-cbus";
+        priv->gc.request = ftdi_gpio_request;
+        priv->gc.get_direction = ftdi_gpio_direction_get;
+        priv->gc.direction_input = ftdi_gpio_direction_input;
+        priv->gc.direction_output = ftdi_gpio_direction_output;
+        priv->gc.get = ftdi_gpio_get;
+        priv->gc.set = ftdi_gpio_set;
+        priv->gc.get_multiple = ftdi_gpio_get_multiple;
+        priv->gc.set_multiple = ftdi_gpio_set_multiple;
+        priv->gc.owner = THIS_MODULE;
+        priv->gc.parent = &serial->interface->dev;
+        priv->gc.base = -1;
+        priv->gc.can_sleep = true;
+
+        result = gpiochip_add_data(&priv->gc, port);
+        if (!result)
+                priv->gpio_registered = true;
+
+        return result;
+}
+
+static void ftdi_gpio_remove(struct usb_serial_port *port)
+{
+        struct ftdi_private *priv = usb_get_serial_port_data(port);
+
+        if (priv->gpio_registered) {
+                gpiochip_remove(&priv->gc);
+                priv->gpio_registered = false;
+        }
+
+        if (priv->gpio_used) {
+                /* Exiting CBUS-mode does not reset pin states. */
+                ftdi_exit_cbus_mode(port);
+                priv->gpio_used = false;
+        }
+}
+
+#else
+
+static int ftdi_gpio_init(struct usb_serial_port *port)
+{
+        return 0;
+}
+
+static void ftdi_gpio_remove(struct usb_serial_port *port) { }
+
+#endif  /* CONFIG_GPIOLIB */
+
 /*
  * ***************************************************************************
  * FTDI driver specific functions
@@ -1792,7 +2171,7 @@ static int ftdi_sio_port_probe(struct usb_serial_port *port)
 {
         struct ftdi_private *priv;
         const struct ftdi_sio_quirk *quirk = usb_get_serial_data(port->serial);
-
+        int result;
 
         priv = kzalloc(sizeof(struct ftdi_private), GFP_KERNEL);
         if (!priv)
@@ -1811,6 +2190,14 @@ static int ftdi_sio_port_probe(struct usb_serial_port *port)
                 priv->latency = 16;
         write_latency_timer(port);
         create_sysfs_attrs(port);
+
+        result = ftdi_gpio_init(port);
+        if (result < 0) {
+                dev_err(&port->serial->interface->dev,
+                        "GPIO initialisation failed: %d\n",
+                        result);
+        }
+
         return 0;
 }
 
@@ -1928,6 +2315,8 @@ static int ftdi_sio_port_remove(struct usb_serial_port *port)
 {
         struct ftdi_private *priv = usb_get_serial_port_data(port);
 
+        ftdi_gpio_remove(port);
+
         remove_sysfs_attrs(port);
 
         kfree(priv);
diff --git a/drivers/usb/serial/ftdi_sio.h b/drivers/usb/serial/ftdi_sio.h
index dcd0b6e05baf..a79a1325b4d9 100644
--- a/drivers/usb/serial/ftdi_sio.h
+++ b/drivers/usb/serial/ftdi_sio.h
@@ -35,7 +35,10 @@
 #define FTDI_SIO_SET_EVENT_CHAR         6 /* Set the event character */
 #define FTDI_SIO_SET_ERROR_CHAR         7 /* Set the error character */
 #define FTDI_SIO_SET_LATENCY_TIMER      9 /* Set the latency timer */
-#define FTDI_SIO_GET_LATENCY_TIMER      10 /* Get the latency timer */
+#define FTDI_SIO_GET_LATENCY_TIMER      0x0a /* Get the latency timer */
+#define FTDI_SIO_SET_BITMODE            0x0b /* Set bitbang mode */
+#define FTDI_SIO_READ_PINS              0x0c /* Read immediate value of pins */
+#define FTDI_SIO_READ_EEPROM            0x90 /* Read EEPROM */
 
 /* Interface indices for FT2232, FT2232H and FT4232H devices */
 #define INTERFACE_A             1
@@ -433,6 +436,29 @@ enum ftdi_sio_baudrate {
  *         1 = active
  */
 
+/* FTDI_SIO_SET_BITMODE */
+#define FTDI_SIO_SET_BITMODE_REQUEST_TYPE 0x40
+#define FTDI_SIO_SET_BITMODE_REQUEST FTDI_SIO_SET_BITMODE
+
+/* Possible bitmodes for FTDI_SIO_SET_BITMODE_REQUEST */
+#define FTDI_SIO_BITMODE_RESET          0x00
+#define FTDI_SIO_BITMODE_CBUS           0x20
+
+/* FTDI_SIO_READ_PINS */
+#define FTDI_SIO_READ_PINS_REQUEST_TYPE 0xc0
+#define FTDI_SIO_READ_PINS_REQUEST FTDI_SIO_READ_PINS
+
+/*
+ * FTDI_SIO_READ_EEPROM
+ *
+ * EEPROM format found in FTDI AN_201, "FT-X MTP memory Configuration",
+ * http://www.ftdichip.com/Support/Documents/AppNotes/AN_201_FT-X%20MTP%20Memory%20Configuration.pdf
+ */
+#define FTDI_SIO_READ_EEPROM_REQUEST_TYPE 0xc0
+#define FTDI_SIO_READ_EEPROM_REQUEST FTDI_SIO_READ_EEPROM
+
+#define FTDI_FTX_CBUS_MUX_GPIO          0x8
+#define FTDI_FT232R_CBUS_MUX_GPIO       0xa
 
 
 /* Descriptors returned by the device
diff --git a/drivers/usb/storage/Kconfig b/drivers/usb/storage/Kconfig
index ec84758f0e23..6fd427284b12 100644
--- a/drivers/usb/storage/Kconfig
+++ b/drivers/usb/storage/Kconfig
@@ -23,16 +23,16 @@ config USB_STORAGE
           To compile this driver as a module, choose M here: the
           module will be called usb-storage.
 
+if USB_STORAGE
+
 config USB_STORAGE_DEBUG
         bool "USB Mass Storage verbose debug"
-        depends on USB_STORAGE
         help
           Say Y here in order to have the USB Mass Storage code generate
           verbose debugging messages.
 
 config USB_STORAGE_REALTEK
         tristate "Realtek Card Reader support"
-        depends on USB_STORAGE
         help
           Say Y here to include additional code to support the power-saving function
           for Realtek RTS51xx USB card readers.
@@ -46,7 +46,6 @@ config REALTEK_AUTOPM
 
 config USB_STORAGE_DATAFAB
         tristate "Datafab Compact Flash Reader support"
-        depends on USB_STORAGE
         help
           Support for certain Datafab CompactFlash readers.
           Datafab has a web page at <http://www.datafab.com/>.
@@ -55,7 +54,6 @@ config USB_STORAGE_DATAFAB
 
 config USB_STORAGE_FREECOM
         tristate "Freecom USB/ATAPI Bridge support"
-        depends on USB_STORAGE
         help
           Support for the Freecom USB to IDE/ATAPI adaptor.
           Freecom has a web page at <http://www.freecom.de/>.
@@ -64,7 +62,6 @@ config USB_STORAGE_FREECOM
 
 config USB_STORAGE_ISD200
         tristate "ISD-200 USB/ATA Bridge support"
-        depends on USB_STORAGE
         ---help---
           Say Y here if you want to use USB Mass Store devices based
           on the In-Systems Design ISD-200 USB/ATA bridge.
@@ -82,7 +79,6 @@ config USB_STORAGE_ISD200
 
 config USB_STORAGE_USBAT
         tristate "USBAT/USBAT02-based storage support"
-        depends on USB_STORAGE
         help
           Say Y here to include additional code to support storage devices
           based on the SCM/Shuttle USBAT/USBAT02 processors.
@@ -105,7 +101,6 @@ config USB_STORAGE_USBAT
 
 config USB_STORAGE_SDDR09
         tristate "SanDisk SDDR-09 (and other SmartMedia, including DPCM) support"
-        depends on USB_STORAGE
         help
           Say Y here to include additional code to support the Sandisk SDDR-09
           SmartMedia reader in the USB Mass Storage driver.
@@ -115,7 +110,6 @@ config USB_STORAGE_SDDR09
 
 config USB_STORAGE_SDDR55
         tristate "SanDisk SDDR-55 SmartMedia support"
-        depends on USB_STORAGE
         help
           Say Y here to include additional code to support the Sandisk SDDR-55
           SmartMedia reader in the USB Mass Storage driver.
@@ -124,7 +118,6 @@ config USB_STORAGE_SDDR55
 
 config USB_STORAGE_JUMPSHOT
         tristate "Lexar Jumpshot Compact Flash Reader"
-        depends on USB_STORAGE
         help
           Say Y here to include additional code to support the Lexar Jumpshot
           USB CompactFlash reader.
@@ -133,7 +126,6 @@ config USB_STORAGE_JUMPSHOT
 
 config USB_STORAGE_ALAUDA
         tristate "Olympus MAUSB-10/Fuji DPC-R1 support"
-        depends on USB_STORAGE
         help
           Say Y here to include additional code to support the Olympus MAUSB-10
           and Fujifilm DPC-R1 USB Card reader/writer devices.
@@ -145,7 +137,6 @@ config USB_STORAGE_ALAUDA
 
 config USB_STORAGE_ONETOUCH
         tristate "Support OneTouch Button on Maxtor Hard Drives"
-        depends on USB_STORAGE
         depends on INPUT=y || INPUT=USB_STORAGE
         help
           Say Y here to include additional code to support the Maxtor OneTouch
@@ -160,7 +151,6 @@ config USB_STORAGE_ONETOUCH
 
 config USB_STORAGE_KARMA
         tristate "Support for Rio Karma music player"
-        depends on USB_STORAGE
         help
           Say Y here to include additional code to support the Rio Karma
           USB interface.
@@ -174,7 +164,6 @@ config USB_STORAGE_KARMA
 
 config USB_STORAGE_CYPRESS_ATACB
         tristate "SAT emulation on Cypress USB/ATA Bridge with ATACB"
-        depends on USB_STORAGE
         ---help---
           Say Y here if you want to use SAT (ata pass through) on devices based
           on the Cypress USB/ATA bridge supporting ATACB. This will allow you
@@ -187,19 +176,15 @@ config USB_STORAGE_CYPRESS_ATACB
 
 config USB_STORAGE_ENE_UB6250
         tristate "USB ENE card reader support"
-        depends on SCSI
-        depends on USB_STORAGE
         ---help---
           Say Y here if you wish to control a ENE SD/MS Card reader.
           Note that this driver does not support SM cards.
 
-          This option depends on 'SCSI' support being enabled, but you
-          probably also need 'SCSI device support: SCSI disk support'
-          (BLK_DEV_SD) for most USB storage devices.
-
           To compile this driver as a module, choose M here: the
           module will be called ums-eneub6250.
 
+endif # USB_STORAGE
+
 config USB_UAS
         tristate "USB Attached SCSI"
         depends on SCSI && USB_STORAGE
diff --git a/drivers/usb/storage/isd200.c b/drivers/usb/storage/isd200.c
index f5e4500d9970..2b474d60b4db 100644
--- a/drivers/usb/storage/isd200.c
+++ b/drivers/usb/storage/isd200.c
@@ -1153,7 +1153,7 @@ static int isd200_get_inquiry_data( struct us_data *us )
                                 /* Fill in vendor identification fields */
                                 src = (__be16 *)&id[ATA_ID_PROD];
                                 dest = (__u16*)info->InquiryData.VendorId;
-                                for (i=0;i<4;i++)
+                                for (i = 0; i < 4; i++)
                                         dest[i] = be16_to_cpu(src[i]);
 
                                 src = (__be16 *)&id[ATA_ID_PROD + 8/2];
diff --git a/drivers/usb/typec/Kconfig b/drivers/usb/typec/Kconfig
index 00878c386dd0..30a847c2089d 100644
--- a/drivers/usb/typec/Kconfig
+++ b/drivers/usb/typec/Kconfig
@@ -45,50 +45,7 @@ menuconfig TYPEC
 
 if TYPEC
 
-config TYPEC_TCPM
-        tristate "USB Type-C Port Controller Manager"
-        depends on USB
-        select USB_ROLE_SWITCH
-        select POWER_SUPPLY
-        help
-          The Type-C Port Controller Manager provides a USB PD and USB Type-C
-          state machine for use with Type-C Port Controllers.
-
-if TYPEC_TCPM
-
-config TYPEC_TCPCI
-        tristate "Type-C Port Controller Interface driver"
-        depends on I2C
-        select REGMAP_I2C
-        help
-          Type-C Port Controller driver for TCPCI-compliant controller.
-
-config TYPEC_RT1711H
-        tristate "Richtek RT1711H Type-C chip driver"
-        depends on I2C
-        select TYPEC_TCPCI
-        help
-          Richtek RT1711H Type-C chip driver that works with
-          Type-C Port Controller Manager to provide USB PD and USB
-          Type-C functionalities.
-
-source "drivers/usb/typec/fusb302/Kconfig"
-
-config TYPEC_WCOVE
-        tristate "Intel WhiskeyCove PMIC USB Type-C PHY driver"
-        depends on ACPI
-        depends on INTEL_SOC_PMIC
-        depends on INTEL_PMC_IPC
-        depends on BXT_WC_PMIC_OPREGION
-        help
-          This driver adds support for USB Type-C detection on Intel Broxton
-          platforms that have Intel Whiskey Cove PMIC. The driver can detect the
-          role and cable orientation.
-
-          To compile this driver as module, choose M here: the module will be
-          called typec_wcove
-
-endif # TYPEC_TCPM
+source "drivers/usb/typec/tcpm/Kconfig"
 
 source "drivers/usb/typec/ucsi/Kconfig"
 
diff --git a/drivers/usb/typec/Makefile b/drivers/usb/typec/Makefile
index 45b0aef428a8..6696b7263d61 100644
--- a/drivers/usb/typec/Makefile
+++ b/drivers/usb/typec/Makefile
@@ -2,11 +2,7 @@
 obj-$(CONFIG_TYPEC)             += typec.o
 typec-y                         := class.o mux.o bus.o
 obj-$(CONFIG_TYPEC)             += altmodes/
-obj-$(CONFIG_TYPEC_TCPM)        += tcpm.o
-obj-y                           += fusb302/
-obj-$(CONFIG_TYPEC_WCOVE)       += typec_wcove.o
+obj-$(CONFIG_TYPEC_TCPM)        += tcpm/
 obj-$(CONFIG_TYPEC_UCSI)        += ucsi/
 obj-$(CONFIG_TYPEC_TPS6598X)    += tps6598x.o
 obj-$(CONFIG_TYPEC)             += mux/
-obj-$(CONFIG_TYPEC_TCPCI)       += tcpci.o
-obj-$(CONFIG_TYPEC_RT1711H)     += tcpci_rt1711h.o
diff --git a/drivers/usb/typec/class.c b/drivers/usb/typec/class.c
index e61dffb27a0c..5db0593ca0bd 100644
--- a/drivers/usb/typec/class.c
+++ b/drivers/usb/typec/class.c
@@ -1322,7 +1322,7 @@ void typec_set_pwr_role(struct typec_port *port, enum typec_role role)
 EXPORT_SYMBOL_GPL(typec_set_pwr_role);
 
 /**
- * typec_set_pwr_role - Report VCONN source change
+ * typec_set_vconn_role - Report VCONN source change
  * @port: The USB Type-C Port which VCONN role changed
  * @role: Source when @port is sourcing VCONN, or Sink when it's not
  *
@@ -1500,7 +1500,7 @@ typec_port_register_altmode(struct typec_port *port,
 
         sprintf(id, "id%04xm%02x", desc->svid, desc->mode);
 
-        mux = typec_mux_get(port->dev.parent, id);
+        mux = typec_mux_get(&port->dev, id);
         if (IS_ERR(mux))
                 return ERR_CAST(mux);
 
@@ -1540,18 +1540,6 @@ struct typec_port *typec_register_port(struct device *parent,
                 return ERR_PTR(id);
         }
 
-        port->sw = typec_switch_get(cap->fwnode ? &port->dev : parent);
-        if (IS_ERR(port->sw)) {
-                ret = PTR_ERR(port->sw);
-                goto err_switch;
-        }
-
-        port->mux = typec_mux_get(parent, "typec-mux");
-        if (IS_ERR(port->mux)) {
-                ret = PTR_ERR(port->mux);
-                goto err_mux;
-        }
-
         switch (cap->type) {
         case TYPEC_PORT_SRC:
                 port->pwr_role = TYPEC_SOURCE;
@@ -1592,13 +1580,26 @@ struct typec_port *typec_register_port(struct device *parent,
         port->port_type = cap->type;
         port->prefer_role = cap->prefer_role;
 
+        device_initialize(&port->dev);
         port->dev.class = typec_class;
         port->dev.parent = parent;
         port->dev.fwnode = cap->fwnode;
         port->dev.type = &typec_port_dev_type;
         dev_set_name(&port->dev, "port%d", id);
 
-        ret = device_register(&port->dev);
+        port->sw = typec_switch_get(&port->dev);
+        if (IS_ERR(port->sw)) {
+                put_device(&port->dev);
+                return ERR_CAST(port->sw);
+        }
+
+        port->mux = typec_mux_get(&port->dev, "typec-mux");
+        if (IS_ERR(port->mux)) {
+                put_device(&port->dev);
+                return ERR_CAST(port->mux);
+        }
+
+        ret = device_add(&port->dev);
         if (ret) {
                 dev_err(parent, "failed to register port (%d)\n", ret);
                 put_device(&port->dev);
@@ -1606,15 +1607,6 @@ struct typec_port *typec_register_port(struct device *parent,
         }
 
         return port;
-
-err_mux:
-        typec_switch_put(port->sw);
-
-err_switch:
-        ida_simple_remove(&typec_index_ida, port->id);
-        kfree(port);
-
-        return ERR_PTR(ret);
 }
 EXPORT_SYMBOL_GPL(typec_register_port);
 
diff --git a/drivers/usb/typec/fusb302/Kconfig b/drivers/usb/typec/fusb302/Kconfig
deleted file mode 100644
index fce099ff39fe..000000000000
--- a/drivers/usb/typec/fusb302/Kconfig
+++ /dev/null
@@ -1,7 +0,0 @@
-config TYPEC_FUSB302
-        tristate "Fairchild FUSB302 Type-C chip driver"
-        depends on I2C
-        help
-          The Fairchild FUSB302 Type-C chip driver that works with
-          Type-C Port Controller Manager to provide USB PD and USB
-          Type-C functionalities.
diff --git a/drivers/usb/typec/fusb302/Makefile b/drivers/usb/typec/fusb302/Makefile
deleted file mode 100644
index 3b51b33631a0..000000000000
--- a/drivers/usb/typec/fusb302/Makefile
+++ /dev/null
@@ -1,2 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0
-obj-$(CONFIG_TYPEC_FUSB302)     += fusb302.o
diff --git a/drivers/usb/typec/tcpm/Kconfig b/drivers/usb/typec/tcpm/Kconfig
new file mode 100644
index 000000000000..f03ea8a61768
--- /dev/null
+++ b/drivers/usb/typec/tcpm/Kconfig
@@ -0,0 +1,52 @@
+config TYPEC_TCPM
+        tristate "USB Type-C Port Controller Manager"
+        depends on USB
+        select USB_ROLE_SWITCH
+        select POWER_SUPPLY
+        help
+          The Type-C Port Controller Manager provides a USB PD and USB Type-C
+          state machine for use with Type-C Port Controllers.
+
+if TYPEC_TCPM
+
+config TYPEC_TCPCI
+        tristate "Type-C Port Controller Interface driver"
+        depends on I2C
+        select REGMAP_I2C
+        help
+          Type-C Port Controller driver for TCPCI-compliant controller.
+
+if TYPEC_TCPCI
+
+config TYPEC_RT1711H
+        tristate "Richtek RT1711H Type-C chip driver"
+        help
+          Richtek RT1711H Type-C chip driver that works with
+          Type-C Port Controller Manager to provide USB PD and USB
+          Type-C functionalities.
+
+endif # TYPEC_TCPCI
+
+config TYPEC_FUSB302
+        tristate "Fairchild FUSB302 Type-C chip driver"
+        depends on I2C
+        help
+          The Fairchild FUSB302 Type-C chip driver that works with
+          Type-C Port Controller Manager to provide USB PD and USB
+          Type-C functionalities.
+
+config TYPEC_WCOVE
+        tristate "Intel WhiskeyCove PMIC USB Type-C PHY driver"
+        depends on ACPI
+        depends on INTEL_SOC_PMIC
+        depends on INTEL_PMC_IPC
+        depends on BXT_WC_PMIC_OPREGION
+        help
+          This driver adds support for USB Type-C on Intel Broxton platforms
+          that have Intel Whiskey Cove PMIC. The driver works with USB Type-C
+          Port Controller Manager to provide USB PD and Type-C functionalities.
+
+          To compile this driver as module, choose M here: the module will be
+          called typec_wcove.ko
+
+endif # TYPEC_TCPM
diff --git a/drivers/usb/typec/tcpm/Makefile b/drivers/usb/typec/tcpm/Makefile
new file mode 100644
index 000000000000..a5ff6c8eb892
--- /dev/null
+++ b/drivers/usb/typec/tcpm/Makefile
@@ -0,0 +1,7 @@
+# SPDX-License-Identifier: GPL-2.0
+obj-$(CONFIG_TYPEC_TCPM)        += tcpm.o
+obj-$(CONFIG_TYPEC_FUSB302)     += fusb302.o
+obj-$(CONFIG_TYPEC_WCOVE)       += typec_wcove.o
+typec_wcove-y                   := wcove.o
+obj-$(CONFIG_TYPEC_TCPCI)       += tcpci.o
+obj-$(CONFIG_TYPEC_RT1711H)     += tcpci_rt1711h.o
diff --git a/drivers/usb/typec/fusb302/fusb302.c b/drivers/usb/typec/tcpm/fusb302.c
index 82bed9810be6..43b64d9309d0 100644
--- a/drivers/usb/typec/fusb302/fusb302.c
+++ b/drivers/usb/typec/tcpm/fusb302.c
@@ -42,19 +42,12 @@
 #define T_BC_LVL_DEBOUNCE_DELAY_MS 30
 
 enum toggling_mode {
-        TOGGLINE_MODE_OFF,
+        TOGGLING_MODE_OFF,
         TOGGLING_MODE_DRP,
         TOGGLING_MODE_SNK,
         TOGGLING_MODE_SRC,
 };
 
-static const char * const toggling_mode_name[] = {
-        [TOGGLINE_MODE_OFF]     = "toggling_OFF",
-        [TOGGLING_MODE_DRP]     = "toggling_DRP",
-        [TOGGLING_MODE_SNK]     = "toggling_SNK",
-        [TOGGLING_MODE_SRC]     = "toggling_SRC",
-};
-
 enum src_current_status {
         SRC_CURRENT_DEFAULT,
         SRC_CURRENT_MEDIUM,
@@ -601,7 +594,7 @@ static int fusb302_set_toggling(struct fusb302_chip *chip,
         chip->intr_comp_chng = false;
         /* configure toggling mode: none/snk/src/drp */
         switch (mode) {
-        case TOGGLINE_MODE_OFF:
+        case TOGGLING_MODE_OFF:
                 ret = fusb302_i2c_mask_write(chip, FUSB_REG_CONTROL2,
                                              FUSB_REG_CONTROL2_MODE_MASK,
                                              FUSB_REG_CONTROL2_MODE_NONE);
@@ -633,7 +626,7 @@ static int fusb302_set_toggling(struct fusb302_chip *chip,
                 break;
         }
 
-        if (mode == TOGGLINE_MODE_OFF) {
+        if (mode == TOGGLING_MODE_OFF) {
                 /* mask TOGDONE interrupt */
                 ret = fusb302_i2c_set_bits(chip, FUSB_REG_MASKA,
                                            FUSB_REG_MASKA_TOGDONE);
@@ -686,6 +679,7 @@ static int tcpm_set_cc(struct tcpc_dev *dev, enum typec_cc_status cc)
         int ret = 0;
         bool pull_up, pull_down;
         u8 rd_mda;
+        enum toggling_mode mode;
 
         mutex_lock(&chip->lock);
         switch (cc) {
@@ -709,7 +703,7 @@ static int tcpm_set_cc(struct tcpc_dev *dev, enum typec_cc_status cc)
                 ret = -EINVAL;
                 goto done;
         }
-        ret = fusb302_set_toggling(chip, TOGGLINE_MODE_OFF);
+        ret = fusb302_set_toggling(chip, TOGGLING_MODE_OFF);
         if (ret < 0) {
                 fusb302_log(chip, "cannot stop toggling, ret=%d", ret);
                 goto done;
@@ -771,6 +765,29 @@ static int tcpm_set_cc(struct tcpc_dev *dev, enum typec_cc_status cc)
                 chip->intr_comp_chng = false;
         }
         fusb302_log(chip, "cc := %s", typec_cc_status_name[cc]);
+
+        /* Enable detection for fixed SNK or SRC only roles */
+        switch (cc) {
+        case TYPEC_CC_RD:
+                mode = TOGGLING_MODE_SNK;
+                break;
+        case TYPEC_CC_RP_DEF:
+        case TYPEC_CC_RP_1_5:
+        case TYPEC_CC_RP_3_0:
+                mode = TOGGLING_MODE_SRC;
+                break;
+        default:
+                mode = TOGGLING_MODE_OFF;
+                break;
+        }
+
+        if (mode != TOGGLING_MODE_OFF) {
+                ret = fusb302_set_toggling(chip, mode);
+                if (ret < 0)
+                        fusb302_log(chip,
+                                    "cannot set fixed role toggling mode, ret=%d",
+                                    ret);
+        }
 done:
         mutex_unlock(&chip->lock);
 
@@ -1178,10 +1195,6 @@ static const u32 src_pdo[] = {
         PDO_FIXED(5000, 400, PDO_FIXED_FLAGS),
 };
 
-static const u32 snk_pdo[] = {
-        PDO_FIXED(5000, 400, PDO_FIXED_FLAGS),
-};
-
 static const struct tcpc_config fusb302_tcpc_config = {
         .src_pdo = src_pdo,
         .nr_src_pdo = ARRAY_SIZE(src_pdo),
@@ -1303,7 +1316,7 @@ static int fusb302_handle_togdone_snk(struct fusb302_chip *chip,
                 tcpm_cc_change(chip->tcpm_port);
         }
         /* turn off toggling */
-        ret = fusb302_set_toggling(chip, TOGGLINE_MODE_OFF);
+        ret = fusb302_set_toggling(chip, TOGGLING_MODE_OFF);
         if (ret < 0) {
                 fusb302_log(chip,
                             "cannot set toggling mode off, ret=%d", ret);
@@ -1399,7 +1412,7 @@ static int fusb302_handle_togdone_src(struct fusb302_chip *chip,
                 tcpm_cc_change(chip->tcpm_port);
         }
         /* turn off toggling */
-        ret = fusb302_set_toggling(chip, TOGGLINE_MODE_OFF);
+        ret = fusb302_set_toggling(chip, TOGGLING_MODE_OFF);
         if (ret < 0) {
                 fusb302_log(chip,
                             "cannot set toggling mode off, ret=%d", ret);
@@ -1730,12 +1743,14 @@ static int fusb302_probe(struct i2c_client *client,
                 return -ENOMEM;
 
         chip->i2c_client = client;
-        i2c_set_clientdata(client, chip);
         chip->dev = &client->dev;
         chip->tcpc_config = fusb302_tcpc_config;
         chip->tcpc_dev.config = &chip->tcpc_config;
         mutex_init(&chip->lock);
 
+        chip->tcpc_dev.fwnode =
+                device_get_named_child_node(dev, "connector");
+
         if (!device_property_read_u32(dev, "fcs,operating-sink-microwatt", &v))
                 chip->tcpc_config.operating_snk_mw = v / 1000;
 
@@ -1756,22 +1771,17 @@ static int fusb302_probe(struct i2c_client *client,
                         return -EPROBE_DEFER;
         }
 
-        fusb302_debugfs_init(chip);
+        chip->vbus = devm_regulator_get(chip->dev, "vbus");
+        if (IS_ERR(chip->vbus))
+                return PTR_ERR(chip->vbus);
 
         chip->wq = create_singlethread_workqueue(dev_name(chip->dev));
-        if (!chip->wq) {
-                ret = -ENOMEM;
-                goto clear_client_data;
-        }
+        if (!chip->wq)
+                return -ENOMEM;
+
         INIT_DELAYED_WORK(&chip->bc_lvl_handler, fusb302_bc_lvl_handler_work);
         init_tcpc_dev(&chip->tcpc_dev);
 
-        chip->vbus = devm_regulator_get(chip->dev, "vbus");
-        if (IS_ERR(chip->vbus)) {
-                ret = PTR_ERR(chip->vbus);
-                goto destroy_workqueue;
-        }
-
         if (client->irq) {
                 chip->gpio_int_n_irq = client->irq;
         } else {
@@ -1797,15 +1807,15 @@ static int fusb302_probe(struct i2c_client *client,
                 goto tcpm_unregister_port;
         }
         enable_irq_wake(chip->gpio_int_n_irq);
+        fusb302_debugfs_init(chip);
+        i2c_set_clientdata(client, chip);
+
         return ret;
 
 tcpm_unregister_port:
         tcpm_unregister_port(chip->tcpm_port);
 destroy_workqueue:
         destroy_workqueue(chip->wq);
-clear_client_data:
-        i2c_set_clientdata(client, NULL);
-        fusb302_debugfs_exit(chip);
 
         return ret;
 }
@@ -1816,7 +1826,6 @@ static int fusb302_remove(struct i2c_client *client)
 
         tcpm_unregister_port(chip->tcpm_port);
         destroy_workqueue(chip->wq);
-        i2c_set_clientdata(client, NULL);
         fusb302_debugfs_exit(chip);
 
         return 0;
diff --git a/drivers/usb/typec/fusb302/fusb302_reg.h b/drivers/usb/typec/tcpm/fusb302_reg.h
index 00b39d365478..00b39d365478 100644
--- a/drivers/usb/typec/fusb302/fusb302_reg.h
+++ b/drivers/usb/typec/tcpm/fusb302_reg.h
diff --git a/drivers/usb/typec/tcpci.c b/drivers/usb/typec/tcpm/tcpci.c
index ac6b418b15f1..ac6b418b15f1 100644
--- a/drivers/usb/typec/tcpci.c
+++ b/drivers/usb/typec/tcpm/tcpci.c
diff --git a/drivers/usb/typec/tcpci.h b/drivers/usb/typec/tcpm/tcpci.h
index 303ebde26546..303ebde26546 100644
--- a/drivers/usb/typec/tcpci.h
+++ b/drivers/usb/typec/tcpm/tcpci.h
diff --git a/drivers/usb/typec/tcpci_rt1711h.c b/drivers/usb/typec/tcpm/tcpci_rt1711h.c
index 017389021b96..017389021b96 100644
--- a/drivers/usb/typec/tcpci_rt1711h.c
+++ b/drivers/usb/typec/tcpm/tcpci_rt1711h.c
diff --git a/drivers/usb/typec/tcpm.c b/drivers/usb/typec/tcpm/tcpm.c
index 4f1f4215f3d6..dbbd71f754d0 100644
--- a/drivers/usb/typec/tcpm.c
+++ b/drivers/usb/typec/tcpm/tcpm.c
@@ -1430,8 +1430,8 @@ static enum pdo_err tcpm_caps_err(struct tcpm_port *port, const u32 *pdo,
                                 if (pdo_apdo_type(pdo[i]) != APDO_TYPE_PPS)
                                         break;
 
-                                if (pdo_pps_apdo_max_current(pdo[i]) <
-                                    pdo_pps_apdo_max_current(pdo[i - 1]))
+                                if (pdo_pps_apdo_max_voltage(pdo[i]) <
+                                    pdo_pps_apdo_max_voltage(pdo[i - 1]))
                                         return PDO_ERR_PPS_APDO_NOT_SORTED;
                                 else if (pdo_pps_apdo_min_voltage(pdo[i]) ==
                                           pdo_pps_apdo_min_voltage(pdo[i - 1]) &&
@@ -2209,7 +2209,7 @@ static unsigned int tcpm_pd_select_pps_apdo(struct tcpm_port *port)
 {
         unsigned int i, j, max_mw = 0, max_mv = 0;
         unsigned int min_src_mv, max_src_mv, src_ma, src_mw;
-        unsigned int min_snk_mv, max_snk_mv, snk_ma;
+        unsigned int min_snk_mv, max_snk_mv;
         u32 pdo;
         unsigned int src_pdo = 0, snk_pdo = 0;
 
@@ -2253,8 +2253,6 @@ static unsigned int tcpm_pd_select_pps_apdo(struct tcpm_port *port)
                                                 pdo_pps_apdo_min_voltage(pdo);
                                         max_snk_mv =
                                                 pdo_pps_apdo_max_voltage(pdo);
-                                        snk_ma =
-                                                pdo_pps_apdo_max_current(pdo);
                                         break;
                                 default:
                                         tcpm_log(port,
@@ -2402,7 +2400,7 @@ static int tcpm_pd_send_request(struct tcpm_port *port)
 
 static int tcpm_pd_build_pps_request(struct tcpm_port *port, u32 *rdo)
 {
-        unsigned int out_mv, op_ma, op_mw, min_mv, max_mv, max_ma, flags;
+        unsigned int out_mv, op_ma, op_mw, max_mv, max_ma, flags;
         enum pd_pdo_type type;
         unsigned int src_pdo_index;
         u32 pdo;
@@ -2420,7 +2418,6 @@ static int tcpm_pd_build_pps_request(struct tcpm_port *port, u32 *rdo)
                         tcpm_log(port, "Invalid APDO selected!");
                         return -EINVAL;
                 }
-                min_mv = port->pps_data.min_volt;
                 max_mv = port->pps_data.max_volt;
                 max_ma = port->pps_data.max_curr;
                 out_mv = port->pps_data.out_volt;
@@ -4116,6 +4113,9 @@ static int tcpm_pps_set_op_curr(struct tcpm_port *port, u16 op_curr)
                 goto port_unlock;
         }
 
+        /* Round down operating current to align with PPS valid steps */
+        op_curr = op_curr - (op_curr % RDO_PROG_CURR_MA_STEP);
+
         reinit_completion(&port->pps_complete);
         port->pps_data.op_curr = op_curr;
         port->pps_status = 0;
@@ -4169,6 +4169,9 @@ static int tcpm_pps_set_out_volt(struct tcpm_port *port, u16 out_volt)
                 goto port_unlock;
         }
 
+        /* Round down output voltage to align with PPS valid steps */
+        out_volt = out_volt - (out_volt % RDO_PROG_VOLT_MV_STEP);
+
         reinit_completion(&port->pps_complete);
         port->pps_data.out_volt = out_volt;
         port->pps_status = 0;
diff --git a/drivers/usb/typec/typec_wcove.c b/drivers/usb/typec/tcpm/wcove.c
index 423208e19383..423208e19383 100644
--- a/drivers/usb/typec/typec_wcove.c
+++ b/drivers/usb/typec/tcpm/wcove.c
diff --git a/drivers/usb/usbip/vudc_main.c b/drivers/usb/usbip/vudc_main.c
index 3fc22037a82f..390733e6937e 100644
--- a/drivers/usb/usbip/vudc_main.c
+++ b/drivers/usb/usbip/vudc_main.c
@@ -73,6 +73,10 @@ static int __init init(void)
 cleanup:
         list_for_each_entry_safe(udc_dev, udc_dev2, &vudc_devices, dev_entry) {
                 list_del(&udc_dev->dev_entry);
+                /*
+                 * Just do platform_device_del() here, put_vudc_device()
+                 * calls the platform_device_put()
+                 */
                 platform_device_del(udc_dev->pdev);
                 put_vudc_device(udc_dev);
         }
@@ -89,7 +93,11 @@ static void __exit cleanup(void)
 
         list_for_each_entry_safe(udc_dev, udc_dev2, &vudc_devices, dev_entry) {
                 list_del(&udc_dev->dev_entry);
-                platform_device_unregister(udc_dev->pdev);
+                /*
+                 * Just do platform_device_del() here, put_vudc_device()
+                 * calls the platform_device_put()
+                 */
+                platform_device_del(udc_dev->pdev);
                 put_vudc_device(udc_dev);
         }
         platform_driver_unregister(&vudc_driver);
diff --git a/drivers/usb/wusbcore/wa-rpipe.c b/drivers/usb/wusbcore/wa-rpipe.c
index 38884aac862b..a5734cbcd5ad 100644
--- a/drivers/usb/wusbcore/wa-rpipe.c
+++ b/drivers/usb/wusbcore/wa-rpipe.c
@@ -470,9 +470,7 @@ error:
 int wa_rpipes_create(struct wahc *wa)
 {
         wa->rpipes = le16_to_cpu(wa->wa_descr->wNumRPipes);
-        wa->rpipe_bm = kcalloc(BITS_TO_LONGS(wa->rpipes),
-                               sizeof(unsigned long),
-                               GFP_KERNEL);
+        wa->rpipe_bm = bitmap_zalloc(wa->rpipes, GFP_KERNEL);
         if (wa->rpipe_bm == NULL)
                 return -ENOMEM;
         return 0;
@@ -487,7 +485,7 @@ void wa_rpipes_destroy(struct wahc *wa)
                 dev_err(dev, "BUG: pipes not released on exit: %*pb\n",
                         wa->rpipes, wa->rpipe_bm);
         }
-        kfree(wa->rpipe_bm);
+        bitmap_free(wa->rpipe_bm);
 }
 
 /*
diff --git a/include/dt-bindings/usb/pd.h b/include/dt-bindings/usb/pd.h
index 7b7a92fefa0a..985f2bbd4d24 100644
--- a/include/dt-bindings/usb/pd.h
+++ b/include/dt-bindings/usb/pd.h
@@ -59,4 +59,30 @@
         (PDO_TYPE(PDO_TYPE_VAR) | PDO_VAR_MIN_VOLT(min_mv) |    \
          PDO_VAR_MAX_VOLT(max_mv) | PDO_VAR_MAX_CURR(max_ma))
 
+#define APDO_TYPE_PPS           0
+
+#define PDO_APDO_TYPE_SHIFT     28      /* Only valid value currently is 0x0 - PPS */
+#define PDO_APDO_TYPE_MASK      0x3
+
+#define PDO_APDO_TYPE(t)        ((t) << PDO_APDO_TYPE_SHIFT)
+
+#define PDO_PPS_APDO_MAX_VOLT_SHIFT     17      /* 100mV units */
+#define PDO_PPS_APDO_MIN_VOLT_SHIFT     8       /* 100mV units */
+#define PDO_PPS_APDO_MAX_CURR_SHIFT     0       /* 50mA units */
+
+#define PDO_PPS_APDO_VOLT_MASK  0xff
+#define PDO_PPS_APDO_CURR_MASK  0x7f
+
+#define PDO_PPS_APDO_MIN_VOLT(mv)       \
+        ((((mv) / 100) & PDO_PPS_APDO_VOLT_MASK) << PDO_PPS_APDO_MIN_VOLT_SHIFT)
+#define PDO_PPS_APDO_MAX_VOLT(mv)       \
+        ((((mv) / 100) & PDO_PPS_APDO_VOLT_MASK) << PDO_PPS_APDO_MAX_VOLT_SHIFT)
+#define PDO_PPS_APDO_MAX_CURR(ma)       \
+        ((((ma) / 50) & PDO_PPS_APDO_CURR_MASK) << PDO_PPS_APDO_MAX_CURR_SHIFT)
+
+#define PDO_PPS_APDO(min_mv, max_mv, max_ma)                                    \
+        (PDO_TYPE(PDO_TYPE_APDO) | PDO_APDO_TYPE(APDO_TYPE_PPS) |               \
+         PDO_PPS_APDO_MIN_VOLT(min_mv) | PDO_PPS_APDO_MAX_VOLT(max_mv) |        \
+         PDO_PPS_APDO_MAX_CURR(max_ma))
+
  #endif /* __DT_POWER_DELIVERY_H */
diff --git a/include/linux/device.h b/include/linux/device.h
index 983506789402..90224e75ade4 100644
--- a/include/linux/device.h
+++ b/include/linux/device.h
@@ -774,6 +774,30 @@ void device_connection_add(struct device_connection *con);
 void device_connection_remove(struct device_connection *con);
 
 /**
+ * device_connections_add - Add multiple device connections at once
+ * @cons: Zero terminated array of device connection descriptors
+ */
+static inline void device_connections_add(struct device_connection *cons)
+{
+        struct device_connection *c;
+
+        for (c = cons; c->endpoint[0]; c++)
+                device_connection_add(c);
+}
+
+/**
+ * device_connections_remove - Remove multiple device connections at once
+ * @cons: Zero terminated array of device connection descriptors
+ */
+static inline void device_connections_remove(struct device_connection *cons)
+{
+        struct device_connection *c;
+
+        for (c = cons; c->endpoint[0]; c++)
+                device_connection_remove(c);
+}
+
+/**
  * enum device_link_state - Device link states.
  * @DL_STATE_NONE: The presence of the drivers is not being tracked.
  * @DL_STATE_DORMANT: None of the supplier/consumer drivers is present.
diff --git a/include/linux/phy/phy-qcom-ufs.h b/include/linux/phy/phy-qcom-ufs.h
deleted file mode 100644
index 0a2c18a9771d..000000000000
--- a/include/linux/phy/phy-qcom-ufs.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright (c) 2013-2015, Linux Foundation. All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 and
- * only version 2 as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- */
-
-#ifndef PHY_QCOM_UFS_H_
-#define PHY_QCOM_UFS_H_
-
-#include "phy.h"
-
-/**
- * ufs_qcom_phy_enable_dev_ref_clk() - Enable the device
- * ref clock.
- * @phy: reference to a generic phy.
- */
-void ufs_qcom_phy_enable_dev_ref_clk(struct phy *phy);
-
-/**
- * ufs_qcom_phy_disable_dev_ref_clk() - Disable the device
- * ref clock.
- * @phy: reference to a generic phy.
- */
-void ufs_qcom_phy_disable_dev_ref_clk(struct phy *phy);
-
-int ufs_qcom_phy_set_tx_lane_enable(struct phy *phy, u32 tx_lanes);
-void ufs_qcom_phy_save_controller_version(struct phy *phy,
-                        u8 major, u16 minor, u16 step);
-
-#endif /* PHY_QCOM_UFS_H_ */
diff --git a/include/linux/platform_data/ehci-sh.h b/include/linux/platform_data/ehci-sh.h
index 5c15a738e116..219bd79dabfc 100644
--- a/include/linux/platform_data/ehci-sh.h
+++ b/include/linux/platform_data/ehci-sh.h
@@ -1,21 +1,9 @@
-/*
+/* SPDX-License-Identifier: GPL-2.0
+ *
  * EHCI SuperH driver platform data
  *
  * Copyright (C) 2012  Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com>
  * Copyright (C) 2012  Renesas Solutions Corp.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
 #ifndef __USB_EHCI_SH_H
diff --git a/include/linux/platform_data/mv_usb.h b/include/linux/platform_data/mv_usb.h
index 98b7925f1a2d..c0f624aca81c 100644
--- a/include/linux/platform_data/mv_usb.h
+++ b/include/linux/platform_data/mv_usb.h
@@ -48,6 +48,5 @@ struct mv_usb_platform_data {
         int     (*phy_init)(void __iomem *regbase);
         void    (*phy_deinit)(void __iomem *regbase);
         int     (*set_vbus)(unsigned int vbus);
-        int     (*private_init)(void __iomem *opregs, void __iomem *phyregs);
 };
 #endif
diff --git a/include/linux/usb/chipidea.h b/include/linux/usb/chipidea.h
index 07f99362bc90..63758c399e4e 100644
--- a/include/linux/usb/chipidea.h
+++ b/include/linux/usb/chipidea.h
@@ -77,6 +77,12 @@ struct ci_hdrc_platform_data {
         struct ci_hdrc_cable            vbus_extcon;
         struct ci_hdrc_cable            id_extcon;
         u32                     phy_clkgate_delay_us;
+
+        /* pins */
+        struct pinctrl *pctl;
+        struct pinctrl_state *pins_default;
+        struct pinctrl_state *pins_host;
+        struct pinctrl_state *pins_device;
 };
 
 /* Default offset of capability registers */
diff --git a/include/uapi/linux/usb/tmc.h b/include/uapi/linux/usb/tmc.h
index 729af2f861a4..fdd4d88a7b95 100644
--- a/include/uapi/linux/usb/tmc.h
+++ b/include/uapi/linux/usb/tmc.h
@@ -4,6 +4,7 @@
  * Copyright (C) 2008 Novell, Inc.
  * Copyright (C) 2008 Greg Kroah-Hartman <gregkh@suse.de>
  * Copyright (C) 2015 Dave Penkler <dpenkler@gmail.com>
+ * Copyright (C) 2018 IVI Foundation, Inc.
  *
  * This file holds USB constants defined by the USB Device Class
  * and USB488 Subclass Definitions for Test and Measurement devices
@@ -40,11 +41,38 @@
 #define USBTMC488_REQUEST_GOTO_LOCAL                    161
 #define USBTMC488_REQUEST_LOCAL_LOCKOUT                 162
 
+struct usbtmc_request {
+        __u8 bRequestType;
+        __u8 bRequest;
+        __u16 wValue;
+        __u16 wIndex;
+        __u16 wLength;
+} __attribute__ ((packed));
+
+struct usbtmc_ctrlrequest {
+        struct usbtmc_request req;
+        void __user *data; /* pointer to user space */
+} __attribute__ ((packed));
+
 struct usbtmc_termchar {
         __u8 term_char;
         __u8 term_char_enabled;
 } __attribute__ ((packed));
 
+/*
+ * usbtmc_message->flags:
+ */
+#define USBTMC_FLAG_ASYNC               0x0001
+#define USBTMC_FLAG_APPEND              0x0002
+#define USBTMC_FLAG_IGNORE_TRAILER      0x0004
+
+struct usbtmc_message {
+        __u32 transfer_size; /* size of bytes to transfer */
+        __u32 transferred; /* size of received/written bytes */
+        __u32 flags; /* bit 0: 0 = synchronous; 1 = asynchronous */
+        void __user *message; /* pointer to header and data in user space */
+} __attribute__ ((packed));
+
 /* Request values for USBTMC driver's ioctl entry point */
 #define USBTMC_IOC_NR                   91
 #define USBTMC_IOCTL_INDICATOR_PULSE    _IO(USBTMC_IOC_NR, 1)
@@ -53,10 +81,15 @@ struct usbtmc_termchar {
 #define USBTMC_IOCTL_ABORT_BULK_IN      _IO(USBTMC_IOC_NR, 4)
 #define USBTMC_IOCTL_CLEAR_OUT_HALT     _IO(USBTMC_IOC_NR, 6)
 #define USBTMC_IOCTL_CLEAR_IN_HALT      _IO(USBTMC_IOC_NR, 7)
+#define USBTMC_IOCTL_CTRL_REQUEST       _IOWR(USBTMC_IOC_NR, 8, struct usbtmc_ctrlrequest)
 #define USBTMC_IOCTL_GET_TIMEOUT        _IOR(USBTMC_IOC_NR, 9, __u32)
 #define USBTMC_IOCTL_SET_TIMEOUT        _IOW(USBTMC_IOC_NR, 10, __u32)
 #define USBTMC_IOCTL_EOM_ENABLE         _IOW(USBTMC_IOC_NR, 11, __u8)
 #define USBTMC_IOCTL_CONFIG_TERMCHAR    _IOW(USBTMC_IOC_NR, 12, struct usbtmc_termchar)
+#define USBTMC_IOCTL_WRITE              _IOWR(USBTMC_IOC_NR, 13, struct usbtmc_message)
+#define USBTMC_IOCTL_READ               _IOWR(USBTMC_IOC_NR, 14, struct usbtmc_message)
+#define USBTMC_IOCTL_WRITE_RESULT       _IOWR(USBTMC_IOC_NR, 15, __u32)
+#define USBTMC_IOCTL_API_VERSION        _IOR(USBTMC_IOC_NR, 16, __u32)
 
 #define USBTMC488_IOCTL_GET_CAPS        _IOR(USBTMC_IOC_NR, 17, unsigned char)
 #define USBTMC488_IOCTL_READ_STB        _IOR(USBTMC_IOC_NR, 18, unsigned char)
@@ -64,6 +97,14 @@ struct usbtmc_termchar {
 #define USBTMC488_IOCTL_GOTO_LOCAL      _IO(USBTMC_IOC_NR, 20)
 #define USBTMC488_IOCTL_LOCAL_LOCKOUT   _IO(USBTMC_IOC_NR, 21)
 #define USBTMC488_IOCTL_TRIGGER         _IO(USBTMC_IOC_NR, 22)
+#define USBTMC488_IOCTL_WAIT_SRQ        _IOW(USBTMC_IOC_NR, 23, __u32)
+
+#define USBTMC_IOCTL_MSG_IN_ATTR        _IOR(USBTMC_IOC_NR, 24, __u8)
+#define USBTMC_IOCTL_AUTO_ABORT         _IOW(USBTMC_IOC_NR, 25, __u8)
+
+/* Cancel and cleanup asynchronous calls */
+#define USBTMC_IOCTL_CANCEL_IO          _IO(USBTMC_IOC_NR, 35)
+#define USBTMC_IOCTL_CLEANUP_IO         _IO(USBTMC_IOC_NR, 36)
 
 /* Driver encoded usb488 capabilities */
 #define USBTMC488_CAPABILITY_TRIGGER         1
diff --git a/include/uapi/linux/usb/video.h b/include/uapi/linux/usb/video.h
index ff6cc6cb4227..d854cb19c42c 100644
--- a/include/uapi/linux/usb/video.h
+++ b/include/uapi/linux/usb/video.h
@@ -192,14 +192,14 @@ struct uvc_descriptor_header {
 
 /* 3.7.2. Video Control Interface Header Descriptor */
 struct uvc_header_descriptor {
-        __u8  bLength;
-        __u8  bDescriptorType;
-        __u8  bDescriptorSubType;
-        __u16 bcdUVC;
-        __u16 wTotalLength;
-        __u32 dwClockFrequency;
-        __u8  bInCollection;
-        __u8  baInterfaceNr[];
+        __u8   bLength;
+        __u8   bDescriptorType;
+        __u8   bDescriptorSubType;
+        __le16 bcdUVC;
+        __le16 wTotalLength;
+        __le32 dwClockFrequency;
+        __u8   bInCollection;
+        __u8   baInterfaceNr[];
 } __attribute__((__packed__));
 
 #define UVC_DT_HEADER_SIZE(n)                           (12+(n))
@@ -209,57 +209,57 @@ struct uvc_header_descriptor {
 
 #define DECLARE_UVC_HEADER_DESCRIPTOR(n)                \
 struct UVC_HEADER_DESCRIPTOR(n) {                       \
-        __u8  bLength;                                  \
-        __u8  bDescriptorType;                          \
-        __u8  bDescriptorSubType;                       \
-        __u16 bcdUVC;                                   \
-        __u16 wTotalLength;                             \
-        __u32 dwClockFrequency;                         \
-        __u8  bInCollection;                            \
-        __u8  baInterfaceNr[n];                         \
+        __u8   bLength;                                 \
+        __u8   bDescriptorType;                         \
+        __u8   bDescriptorSubType;                      \
+        __le16 bcdUVC;                                  \
+        __le16 wTotalLength;                            \
+        __le32 dwClockFrequency;                        \
+        __u8   bInCollection;                           \
+        __u8   baInterfaceNr[n];                        \
 } __attribute__ ((packed))
 
 /* 3.7.2.1. Input Terminal Descriptor */
 struct uvc_input_terminal_descriptor {
-        __u8  bLength;
-        __u8  bDescriptorType;
-        __u8  bDescriptorSubType;
-        __u8  bTerminalID;
-        __u16 wTerminalType;
-        __u8  bAssocTerminal;
-        __u8  iTerminal;
+        __u8   bLength;
+        __u8   bDescriptorType;
+        __u8   bDescriptorSubType;
+        __u8   bTerminalID;
+        __le16 wTerminalType;
+        __u8   bAssocTerminal;
+        __u8   iTerminal;
 } __attribute__((__packed__));
 
 #define UVC_DT_INPUT_TERMINAL_SIZE                      8
 
 /* 3.7.2.2. Output Terminal Descriptor */
 struct uvc_output_terminal_descriptor {
-        __u8  bLength;
-        __u8  bDescriptorType;
-        __u8  bDescriptorSubType;
-        __u8  bTerminalID;
-        __u16 wTerminalType;
-        __u8  bAssocTerminal;
-        __u8  bSourceID;
-        __u8  iTerminal;
+        __u8   bLength;
+        __u8   bDescriptorType;
+        __u8   bDescriptorSubType;
+        __u8   bTerminalID;
+        __le16 wTerminalType;
+        __u8   bAssocTerminal;
+        __u8   bSourceID;
+        __u8   iTerminal;
 } __attribute__((__packed__));
 
 #define UVC_DT_OUTPUT_TERMINAL_SIZE                     9
 
 /* 3.7.2.3. Camera Terminal Descriptor */
 struct uvc_camera_terminal_descriptor {
-        __u8  bLength;
-        __u8  bDescriptorType;
-        __u8  bDescriptorSubType;
-        __u8  bTerminalID;
-        __u16 wTerminalType;
-        __u8  bAssocTerminal;
-        __u8  iTerminal;
-        __u16 wObjectiveFocalLengthMin;
-        __u16 wObjectiveFocalLengthMax;
-        __u16 wOcularFocalLength;
-        __u8  bControlSize;
-        __u8  bmControls[3];
+        __u8   bLength;
+        __u8   bDescriptorType;
+        __u8   bDescriptorSubType;
+        __u8   bTerminalID;
+        __le16 wTerminalType;
+        __u8   bAssocTerminal;
+        __u8   iTerminal;
+        __le16 wObjectiveFocalLengthMin;
+        __le16 wObjectiveFocalLengthMax;
+        __le16 wOcularFocalLength;
+        __u8   bControlSize;
+        __u8   bmControls[3];
 } __attribute__((__packed__));
 
 #define UVC_DT_CAMERA_TERMINAL_SIZE(n)                  (15+(n))
@@ -293,15 +293,15 @@ struct UVC_SELECTOR_UNIT_DESCRIPTOR(n) {		\
 
 /* 3.7.2.5. Processing Unit Descriptor */
 struct uvc_processing_unit_descriptor {
-        __u8  bLength;
-        __u8  bDescriptorType;
-        __u8  bDescriptorSubType;
-        __u8  bUnitID;
-        __u8  bSourceID;
-        __u16 wMaxMultiplier;
-        __u8  bControlSize;
-        __u8  bmControls[2];
-        __u8  iProcessing;
+        __u8   bLength;
+        __u8   bDescriptorType;
+        __u8   bDescriptorSubType;
+        __u8   bUnitID;
+        __u8   bSourceID;
+        __le16 wMaxMultiplier;
+        __u8   bControlSize;
+        __u8   bmControls[2];
+        __u8   iProcessing;
 } __attribute__((__packed__));
 
 #define UVC_DT_PROCESSING_UNIT_SIZE(n)                  (9+(n))
@@ -343,29 +343,29 @@ struct UVC_EXTENSION_UNIT_DESCRIPTOR(p, n) {		\
 
 /* 3.8.2.2. Video Control Interrupt Endpoint Descriptor */
 struct uvc_control_endpoint_descriptor {
-        __u8  bLength;
-        __u8  bDescriptorType;
-        __u8  bDescriptorSubType;
-        __u16 wMaxTransferSize;
+        __u8   bLength;
+        __u8   bDescriptorType;
+        __u8   bDescriptorSubType;
+        __le16 wMaxTransferSize;
 } __attribute__((__packed__));
 
 #define UVC_DT_CONTROL_ENDPOINT_SIZE                    5
 
 /* 3.9.2.1. Input Header Descriptor */
 struct uvc_input_header_descriptor {
-        __u8  bLength;
-        __u8  bDescriptorType;
-        __u8  bDescriptorSubType;
-        __u8  bNumFormats;
-        __u16 wTotalLength;
-        __u8  bEndpointAddress;
-        __u8  bmInfo;
-        __u8  bTerminalLink;
-        __u8  bStillCaptureMethod;
-        __u8  bTriggerSupport;
-        __u8  bTriggerUsage;
-        __u8  bControlSize;
-        __u8  bmaControls[];
+        __u8   bLength;
+        __u8   bDescriptorType;
+        __u8   bDescriptorSubType;
+        __u8   bNumFormats;
+        __le16 wTotalLength;
+        __u8   bEndpointAddress;
+        __u8   bmInfo;
+        __u8   bTerminalLink;
+        __u8   bStillCaptureMethod;
+        __u8   bTriggerSupport;
+        __u8   bTriggerUsage;
+        __u8   bControlSize;
+        __u8   bmaControls[];
 } __attribute__((__packed__));
 
 #define UVC_DT_INPUT_HEADER_SIZE(n, p)                  (13+(n*p))
@@ -375,32 +375,32 @@ struct uvc_input_header_descriptor {
 
 #define DECLARE_UVC_INPUT_HEADER_DESCRIPTOR(n, p)       \
 struct UVC_INPUT_HEADER_DESCRIPTOR(n, p) {              \
-        __u8  bLength;                                  \
-        __u8  bDescriptorType;                          \
-        __u8  bDescriptorSubType;                       \
-        __u8  bNumFormats;                              \
-        __u16 wTotalLength;                             \
-        __u8  bEndpointAddress;                         \
-        __u8  bmInfo;                                   \
-        __u8  bTerminalLink;                            \
-        __u8  bStillCaptureMethod;                      \
-        __u8  bTriggerSupport;                          \
-        __u8  bTriggerUsage;                            \
-        __u8  bControlSize;                             \
-        __u8  bmaControls[p][n];                        \
+        __u8   bLength;                                 \
+        __u8   bDescriptorType;                         \
+        __u8   bDescriptorSubType;                      \
+        __u8   bNumFormats;                             \
+        __le16 wTotalLength;                            \
+        __u8   bEndpointAddress;                        \
+        __u8   bmInfo;                                  \
+        __u8   bTerminalLink;                           \
+        __u8   bStillCaptureMethod;                     \
+        __u8   bTriggerSupport;                         \
+        __u8   bTriggerUsage;                           \
+        __u8   bControlSize;                            \
+        __u8   bmaControls[p][n];                       \
 } __attribute__ ((packed))
 
 /* 3.9.2.2. Output Header Descriptor */
 struct uvc_output_header_descriptor {
-        __u8  bLength;
-        __u8  bDescriptorType;
-        __u8  bDescriptorSubType;
-        __u8  bNumFormats;
-        __u16 wTotalLength;
-        __u8  bEndpointAddress;
-        __u8  bTerminalLink;
-        __u8  bControlSize;
-        __u8  bmaControls[];
+        __u8   bLength;
+        __u8   bDescriptorType;
+        __u8   bDescriptorSubType;
+        __u8   bNumFormats;
+        __le16 wTotalLength;
+        __u8   bEndpointAddress;
+        __u8   bTerminalLink;
+        __u8   bControlSize;
+        __u8   bmaControls[];
 } __attribute__((__packed__));
 
 #define UVC_DT_OUTPUT_HEADER_SIZE(n, p)                 (9+(n*p))
@@ -410,15 +410,15 @@ struct uvc_output_header_descriptor {
 
 #define DECLARE_UVC_OUTPUT_HEADER_DESCRIPTOR(n, p)      \
 struct UVC_OUTPUT_HEADER_DESCRIPTOR(n, p) {             \
-        __u8  bLength;                                  \
-        __u8  bDescriptorType;                          \
-        __u8  bDescriptorSubType;                       \
-        __u8  bNumFormats;                              \
-        __u16 wTotalLength;                             \
-        __u8  bEndpointAddress;                         \
-        __u8  bTerminalLink;                            \
-        __u8  bControlSize;                             \
-        __u8  bmaControls[p][n];                        \
+        __u8   bLength;                                 \
+        __u8   bDescriptorType;                         \
+        __u8   bDescriptorSubType;                      \
+        __u8   bNumFormats;                             \
+        __le16 wTotalLength;                            \
+        __u8   bEndpointAddress;                        \
+        __u8   bTerminalLink;                           \
+        __u8   bControlSize;                            \
+        __u8   bmaControls[p][n];                       \
 } __attribute__ ((packed))
 
 /* 3.9.2.6. Color matching descriptor */
@@ -473,19 +473,19 @@ struct uvc_format_uncompressed {
 
 /* Uncompressed Payload - 3.1.2. Uncompressed Video Frame Descriptor */
 struct uvc_frame_uncompressed {
-        __u8  bLength;
-        __u8  bDescriptorType;
-        __u8  bDescriptorSubType;
-        __u8  bFrameIndex;
-        __u8  bmCapabilities;
-        __u16 wWidth;
-        __u16 wHeight;
-        __u32 dwMinBitRate;
-        __u32 dwMaxBitRate;
-        __u32 dwMaxVideoFrameBufferSize;
-        __u32 dwDefaultFrameInterval;
-        __u8  bFrameIntervalType;
-        __u32 dwFrameInterval[];
+        __u8   bLength;
+        __u8   bDescriptorType;
+        __u8   bDescriptorSubType;
+        __u8   bFrameIndex;
+        __u8   bmCapabilities;
+        __le16 wWidth;
+        __le16 wHeight;
+        __le32 dwMinBitRate;
+        __le32 dwMaxBitRate;
+        __le32 dwMaxVideoFrameBufferSize;
+        __le32 dwDefaultFrameInterval;
+        __u8   bFrameIntervalType;
+        __le32 dwFrameInterval[];
 } __attribute__((__packed__));
 
 #define UVC_DT_FRAME_UNCOMPRESSED_SIZE(n)               (26+4*(n))
@@ -495,19 +495,19 @@ struct uvc_frame_uncompressed {
 
 #define DECLARE_UVC_FRAME_UNCOMPRESSED(n)               \
 struct UVC_FRAME_UNCOMPRESSED(n) {                      \
-        __u8  bLength;                                  \
-        __u8  bDescriptorType;                          \
-        __u8  bDescriptorSubType;                       \
-        __u8  bFrameIndex;                              \
-        __u8  bmCapabilities;                           \
-        __u16 wWidth;                                   \
-        __u16 wHeight;                                  \
-        __u32 dwMinBitRate;                             \
-        __u32 dwMaxBitRate;                             \
-        __u32 dwMaxVideoFrameBufferSize;                \
-        __u32 dwDefaultFrameInterval;                   \
-        __u8  bFrameIntervalType;                       \
-        __u32 dwFrameInterval[n];                       \
+        __u8   bLength;                                 \
+        __u8   bDescriptorType;                         \
+        __u8   bDescriptorSubType;                      \
+        __u8   bFrameIndex;                             \
+        __u8   bmCapabilities;                          \
+        __le16 wWidth;                                  \
+        __le16 wHeight;                                 \
+        __le32 dwMinBitRate;                            \
+        __le32 dwMaxBitRate;                            \
+        __le32 dwMaxVideoFrameBufferSize;               \
+        __le32 dwDefaultFrameInterval;                  \
+        __u8   bFrameIntervalType;                      \
+        __le32 dwFrameInterval[n];                      \
 } __attribute__ ((packed))
 
 /* MJPEG Payload - 3.1.1. MJPEG Video Format Descriptor */
@@ -529,19 +529,19 @@ struct uvc_format_mjpeg {
 
 /* MJPEG Payload - 3.1.2. MJPEG Video Frame Descriptor */
 struct uvc_frame_mjpeg {
-        __u8  bLength;
-        __u8  bDescriptorType;
-        __u8  bDescriptorSubType;
-        __u8  bFrameIndex;
-        __u8  bmCapabilities;
-        __u16 wWidth;
-        __u16 wHeight;
-        __u32 dwMinBitRate;
-        __u32 dwMaxBitRate;
-        __u32 dwMaxVideoFrameBufferSize;
-        __u32 dwDefaultFrameInterval;
-        __u8  bFrameIntervalType;
-        __u32 dwFrameInterval[];
+        __u8   bLength;
+        __u8   bDescriptorType;
+        __u8   bDescriptorSubType;
+        __u8   bFrameIndex;
+        __u8   bmCapabilities;
+        __le16 wWidth;
+        __le16 wHeight;
+        __le32 dwMinBitRate;
+        __le32 dwMaxBitRate;
+        __le32 dwMaxVideoFrameBufferSize;
+        __le32 dwDefaultFrameInterval;
+        __u8   bFrameIntervalType;
+        __le32 dwFrameInterval[];
 } __attribute__((__packed__));
 
 #define UVC_DT_FRAME_MJPEG_SIZE(n)                      (26+4*(n))
@@ -551,19 +551,19 @@ struct uvc_frame_mjpeg {
 
 #define DECLARE_UVC_FRAME_MJPEG(n)                      \
 struct UVC_FRAME_MJPEG(n) {                             \
-        __u8  bLength;                                  \
-        __u8  bDescriptorType;                          \
-        __u8  bDescriptorSubType;                       \
-        __u8  bFrameIndex;                              \
-        __u8  bmCapabilities;                           \
-        __u16 wWidth;                                   \
-        __u16 wHeight;                                  \
-        __u32 dwMinBitRate;                             \
-        __u32 dwMaxBitRate;                             \
-        __u32 dwMaxVideoFrameBufferSize;                \
-        __u32 dwDefaultFrameInterval;                   \
-        __u8  bFrameIntervalType;                       \
-        __u32 dwFrameInterval[n];                       \
+        __u8   bLength;                                 \
+        __u8   bDescriptorType;                         \
+        __u8   bDescriptorSubType;                      \
+        __u8   bFrameIndex;                             \
+        __u8   bmCapabilities;                          \
+        __le16 wWidth;                                  \
+        __le16 wHeight;                                 \
+        __le32 dwMinBitRate;                            \
+        __le32 dwMaxBitRate;                            \
+        __le32 dwMaxVideoFrameBufferSize;               \
+        __le32 dwDefaultFrameInterval;                  \
+        __u8   bFrameIntervalType;                      \
+        __le32 dwFrameInterval[n];                      \
 } __attribute__ ((packed))
 
 #endif /* __LINUX_USB_VIDEO_H */
diff --git a/tools/usb/usbip/libsrc/usbip_host_common.c b/tools/usb/usbip/libsrc/usbip_host_common.c
index dc93fadbee96..d79c7581b175 100644
--- a/tools/usb/usbip/libsrc/usbip_host_common.c
+++ b/tools/usb/usbip/libsrc/usbip_host_common.c
@@ -43,7 +43,7 @@ static int32_t read_attr_usbip_status(struct usbip_usb_device *udev)
         int size;
         int fd;
         int length;
-        char status;
+        char status[2] = { 0 };
         int value = 0;
 
         size = snprintf(status_attr_path, sizeof(status_attr_path),
@@ -61,14 +61,14 @@ static int32_t read_attr_usbip_status(struct usbip_usb_device *udev)
                 return -1;
         }
 
-        length = read(fd, &status, 1);
+        length = read(fd, status, 1);
         if (length < 0) {
                 err("error reading attribute %s", status_attr_path);
                 close(fd);
                 return -1;
         }
 
-        value = atoi(&status);
+        value = atoi(status);
 
         return value;
 }
diff --git a/tools/usb/usbip/libsrc/vhci_driver.c b/tools/usb/usbip/libsrc/vhci_driver.c
index 4204359c9fee..8159fd98680b 100644
--- a/tools/usb/usbip/libsrc/vhci_driver.c
+++ b/tools/usb/usbip/libsrc/vhci_driver.c
@@ -150,7 +150,7 @@ static int get_nports(struct udev_device *hc_device)
 
 static int vhci_hcd_filter(const struct dirent *dirent)
 {
-        return strcmp(dirent->d_name, "vhci_hcd") >= 0;
+        return !strncmp(dirent->d_name, "vhci_hcd.", 9);
 }
 
 static int get_ncontrollers(void)