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

Pull USB/PHY updates from Greg KH:
 "Here's the big set of USB/PHY patches for 4.10-rc1.

  A number of new drivers are here in this set of changes. We have a new
  USB controller type "mtu3", a new usb-serial driver, and the usual
  churn in the gadget subsystem and the xhci host controller driver,
  along with a few other new small drivers added. And lots of little
  other changes all over the USB and PHY driver tree. Full details are
  in the shortlog

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

* tag 'usb-4.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb: (309 commits)
  USB: serial: option: add dlink dwm-158
  USB: serial: option: add support for Telit LE922A PIDs 0x1040, 0x1041
  USB: OHCI: nxp: fix code warnings
  USB: OHCI: nxp: remove useless extern declaration
  USB: OHCI: at91: remove useless extern declaration
  usb: misc: rio500: fix result type for error message
  usb: mtu3: fix U3 port link issue
  usb: mtu3: enable auto switch from U3 to U2
  usbip: fix warning in vhci_hcd_probe/lockdep_init_map
  usb: core: usbport: Use proper LED API to fix potential crash
  usbip: add missing compile time generated files to .gitignore
  usb: hcd.h: construct hub class request constants from simpler constants
  USB: OHCI: ohci-pxa27x: remove useless functions
  USB: OHCI: omap: remove useless extern declaration
  USB: OHCI: ohci-omap: remove useless functions
  USB: OHCI: ohci-s3c2410: remove useless functions
  USB: cdc-acm: add device id for GW Instek AFG-125
  fsl/usb: Workarourd for USB erratum-A005697
  usb: hub: Wait for connection to be reestablished after port reset
  usbip: vudc: Refactor init_vudc_hw() to be more obvious
  ...

220 files changed, 14119 insertions, 5002 deletions

diff --git a/Documentation/ABI/stable/sysfs-devices b/Documentation/ABI/stable/sysfs-devices
index df449d79b563..35c457f8ce73 100644
--- a/Documentation/ABI/stable/sysfs-devices
+++ b/Documentation/ABI/stable/sysfs-devices
@@ -8,3 +8,17 @@ Description:
                 Any device associated with a device-tree node will have
                 an of_path symlink pointing to the corresponding device
                 node in /sys/firmware/devicetree/
+
+What:           /sys/devices/*/devspec
+Date:           October 2016
+Contact:        Device Tree mailing list <devicetree@vger.kernel.org>
+Description:
+                If CONFIG_OF is enabled, then this file is present. When
+                read, it returns full name of the device node.
+
+What:           /sys/devices/*/obppath
+Date:           October 2016
+Contact:        Device Tree mailing list <devicetree@vger.kernel.org>
+Description:
+                If CONFIG_OF is enabled, then this file is present. When
+                read, it returns full name of the device node.
diff --git a/Documentation/ABI/testing/sysfs-platform-phy-rcar-gen3-usb2 b/Documentation/ABI/testing/sysfs-platform-phy-rcar-gen3-usb2
new file mode 100644
index 000000000000..6212697bbf6f
--- /dev/null
+++ b/Documentation/ABI/testing/sysfs-platform-phy-rcar-gen3-usb2
@@ -0,0 +1,15 @@
+What:           /sys/devices/platform/<phy-name>/role
+Date:           October 2016
+KernelVersion:  4.10
+Contact:        Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
+Description:
+                This file can be read and write.
+                The file can show/change the phy mode for role swap of usb.
+
+                Write the following strings to change the mode:
+                 "host" - switching mode from peripheral to host.
+                 "peripheral" - switching mode from host to peripheral.
+
+                Read the file, then it shows the following strings:
+                 "host" - The mode is host now.
+                 "peripheral" - The mode is peripheral now.
diff --git a/Documentation/devicetree/bindings/extcon/extcon-usb-gpio.txt b/Documentation/devicetree/bindings/extcon/extcon-usb-gpio.txt
index af0b903de293..dfc14f71e81f 100644
--- a/Documentation/devicetree/bindings/extcon/extcon-usb-gpio.txt
+++ b/Documentation/devicetree/bindings/extcon/extcon-usb-gpio.txt
@@ -5,7 +5,10 @@ connected to a GPIO pin.
 
 Required properties:
 - compatible: Should be "linux,extcon-usb-gpio"
+
+Either one of id-gpio or vbus-gpio must be present. Both can be present as well.
 - id-gpio: gpio for USB ID pin. See gpio binding.
+- vbus-gpio: gpio for USB VBUS pin.
 
 Example: Examples of extcon-usb-gpio node in dra7-evm.dts as listed below:
         extcon_usb1 {
diff --git a/Documentation/devicetree/bindings/phy/meson-usb2-phy.txt b/Documentation/devicetree/bindings/phy/meson8b-usb2-phy.txt
index 9da5ea234154..5fa73b9d20f5 100644
--- a/Documentation/devicetree/bindings/phy/meson-usb2-phy.txt
+++ b/Documentation/devicetree/bindings/phy/meson8b-usb2-phy.txt
@@ -1,4 +1,4 @@
-* Amlogic USB2 PHY
+* Amlogic Meson8b and GXBB USB2 PHY
 
 Required properties:
 - compatible:   Depending on the platform this should be one of:
@@ -16,10 +16,10 @@ Optional properties:
 
 Example:
 
-usb0_phy: usb_phy@0 {
+usb0_phy: usb-phy@c0000000 {
         compatible = "amlogic,meson-gxbb-usb2-phy";
         #phy-cells = <0>;
-        reg = <0x0 0x0 0x0 0x20>;
+        reg = <0x0 0xc0000000 0x0 0x20>;
         resets = <&reset RESET_USB_OTG>;
         clocks = <&clkc CLKID_USB>, <&clkc CLKID_USB0>;
         clock-names = "usb_general", "usb";
diff --git a/Documentation/devicetree/bindings/usb/da8xx-usb.txt b/Documentation/devicetree/bindings/usb/da8xx-usb.txt
new file mode 100644
index 000000000000..ccb844aba7d4
--- /dev/null
+++ b/Documentation/devicetree/bindings/usb/da8xx-usb.txt
@@ -0,0 +1,43 @@
+TI DA8xx MUSB
+~~~~~~~~~~~~~
+For DA8xx/OMAP-L1x/AM17xx/AM18xx platforms.
+
+Required properties:
+~~~~~~~~~~~~~~~~~~~~
+ - compatible : Should be set to "ti,da830-musb".
+
+ - reg: Offset and length of the USB controller register set.
+
+ - interrupts: The USB interrupt number.
+
+ - interrupt-names: Should be set to "mc".
+
+ - dr_mode: The USB operation mode. Should be one of "host", "peripheral" or "otg".
+
+ - phys: Phandle for the PHY device
+
+ - phy-names: Should be "usb-phy"
+
+Optional properties:
+~~~~~~~~~~~~~~~~~~~~
+ - vbus-supply: Phandle to a regulator providing the USB bus power.
+
+Example:
+        usb_phy: usb-phy {
+                compatible = "ti,da830-usb-phy";
+                #phy-cells = <0>;
+                status = "okay";
+        };
+        usb0: usb@200000 {
+                compatible = "ti,da830-musb";
+                reg =   <0x00200000 0x10000>;
+                interrupts = <58>;
+                interrupt-names = "mc";
+
+                dr_mode = "host";
+                vbus-supply = <&usb_vbus>;
+                phys = <&usb_phy 0>;
+                phy-names = "usb-phy";
+
+                status = "okay";
+        };
diff --git a/Documentation/devicetree/bindings/usb/dwc2.txt b/Documentation/devicetree/bindings/usb/dwc2.txt
index 2c30a5479069..6c7c2bce6d0c 100644
--- a/Documentation/devicetree/bindings/usb/dwc2.txt
+++ b/Documentation/devicetree/bindings/usb/dwc2.txt
@@ -12,6 +12,7 @@ Required properties:
   - "lantiq,xrx200-usb": The DWC2 USB controller instance in Lantiq XRX SoCs;
   - "amlogic,meson8b-usb": The DWC2 USB controller instance in Amlogic Meson8b SoCs;
   - "amlogic,meson-gxbb-usb": The DWC2 USB controller instance in Amlogic S905 SoCs;
+  - "amcc,dwc-otg": The DWC2 USB controller instance in AMCC Canyonlands 460EX SoCs;
   - snps,dwc2: A generic DWC2 USB controller with default parameters.
 - reg : Should contain 1 register range (address and length)
 - interrupts : Should contain 1 interrupt
@@ -25,11 +26,13 @@ Optional properties:
 Refer to phy/phy-bindings.txt for generic phy consumer properties
 - dr_mode: shall be one of "host", "peripheral" and "otg"
   Refer to usb/generic.txt
-- g-use-dma: enable dma usage in gadget driver.
 - g-rx-fifo-size: size of rx fifo size in gadget mode.
 - g-np-tx-fifo-size: size of non-periodic tx fifo size in gadget mode.
 - g-tx-fifo-size: size of periodic tx fifo per endpoint (except ep0) in gadget mode.
 
+Deprecated properties:
+- g-use-dma: gadget DMA mode is automatically detected
+
 Example:
 
         usb@101c0000 {
diff --git a/Documentation/devicetree/bindings/usb/mt8173-mtu3.txt b/Documentation/devicetree/bindings/usb/mt8173-mtu3.txt
new file mode 100644
index 000000000000..e049d199bf0d
--- /dev/null
+++ b/Documentation/devicetree/bindings/usb/mt8173-mtu3.txt
@@ -0,0 +1,87 @@
+The device node for Mediatek USB3.0 DRD controller
+
+Required properties:
+ - compatible : should be "mediatek,mt8173-mtu3"
+ - reg : specifies physical base address and size of the registers
+ - reg-names: should be "mac" for device IP and "ippc" for IP port control
+ - interrupts : interrupt used by the device IP
+ - power-domains : a phandle to USB power domain node to control USB's
+        mtcmos
+ - vusb33-supply : regulator of USB avdd3.3v
+ - clocks : a list of phandle + clock-specifier pairs, one for each
+        entry in clock-names
+ - clock-names : must contain "sys_ck" for clock of controller;
+        "wakeup_deb_p0" and "wakeup_deb_p1" are optional, they are
+        depends on "mediatek,enable-wakeup"
+ - phys : a list of phandle + phy specifier pairs
+ - dr_mode : should be one of "host", "peripheral" or "otg",
+        refer to usb/generic.txt
+
+Optional properties:
+ - #address-cells, #size-cells : should be '2' if the device has sub-nodes
+        with 'reg' property
+ - ranges : allows valid 1:1 translation between child's address space and
+        parent's address space
+ - extcon : external connector for vbus and idpin changes detection, needed
+        when supports dual-role mode.
+ - vbus-supply : reference to the VBUS regulator, needed when supports
+        dual-role mode.
+ - pinctl-names : a pinctrl state named "default" must be defined,
+        "id_float" and "id_ground" are optinal which depends on
+        "mediatek,enable-manual-drd"
+ - pinctrl-0 : pin control group
+        See: Documentation/devicetree/bindings/pinctrl/pinctrl-binding.txt
+
+ - maximum-speed : valid arguments are "super-speed", "high-speed" and
+        "full-speed"; refer to usb/generic.txt
+ - enable-manual-drd : supports manual dual-role switch via debugfs; usually
+        used when receptacle is TYPE-A and also wants to support dual-role
+        mode.
+ - mediatek,enable-wakeup : supports ip sleep wakeup used by host mode
+ - mediatek,syscon-wakeup : phandle to syscon used to access USB wakeup
+        control register, it depends on "mediatek,enable-wakeup".
+
+Sub-nodes:
+The xhci should be added as subnode to mtu3 as shown in the following example
+if host mode is enabled. The DT binding details of xhci can be found in:
+Documentation/devicetree/bindings/usb/mt8173-xhci.txt
+
+Example:
+ssusb: usb@11271000 {
+        compatible = "mediatek,mt8173-mtu3";
+        reg = <0 0x11271000 0 0x3000>,
+              <0 0x11280700 0 0x0100>;
+        reg-names = "mac", "ippc";
+        interrupts = <GIC_SPI 64 IRQ_TYPE_LEVEL_LOW>;
+        phys = <&phy_port0 PHY_TYPE_USB3>,
+               <&phy_port1 PHY_TYPE_USB2>;
+        power-domains = <&scpsys MT8173_POWER_DOMAIN_USB>;
+        clocks = <&topckgen CLK_TOP_USB30_SEL>,
+                 <&pericfg CLK_PERI_USB0>,
+                 <&pericfg CLK_PERI_USB1>;
+        clock-names = "sys_ck",
+                      "wakeup_deb_p0",
+                      "wakeup_deb_p1";
+        vusb33-supply = <&mt6397_vusb_reg>;
+        vbus-supply = <&usb_p0_vbus>;
+        extcon = <&extcon_usb>;
+        dr_mode = "otg";
+        mediatek,enable-wakeup;
+        mediatek,syscon-wakeup = <&pericfg>;
+        #address-cells = <2>;
+        #size-cells = <2>;
+        ranges;
+        status = "disabled";
+
+        usb_host: xhci@11270000 {
+                compatible = "mediatek,mt8173-xhci";
+                reg = <0 0x11270000 0 0x1000>;
+                reg-names = "mac";
+                interrupts = <GIC_SPI 115 IRQ_TYPE_LEVEL_LOW>;
+                power-domains = <&scpsys MT8173_POWER_DOMAIN_USB>;
+                clocks = <&topckgen CLK_TOP_USB30_SEL>;
+                clock-names = "sys_ck";
+                vusb33-supply = <&mt6397_vusb_reg>;
+                status = "disabled";
+        };
+};
diff --git a/Documentation/devicetree/bindings/usb/mt8173-xhci.txt b/Documentation/devicetree/bindings/usb/mt8173-xhci.txt
index b3a7ffa48852..2a930bd52b94 100644
--- a/Documentation/devicetree/bindings/usb/mt8173-xhci.txt
+++ b/Documentation/devicetree/bindings/usb/mt8173-xhci.txt
@@ -2,10 +2,18 @@ MT8173 xHCI
 
 The device node for Mediatek SOC USB3.0 host controller
 
+There are two scenarios: the first one only supports xHCI driver;
+the second one supports dual-role mode, and the host is based on xHCI
+driver. Take account of backward compatibility, we divide bindings
+into two parts.
+
+1st: only supports xHCI driver
+------------------------------------------------------------------------
+
 Required properties:
  - compatible : should contain "mediatek,mt8173-xhci"
- - reg : specifies physical base address and size of the registers,
-        the first one for MAC, the second for IPPC
+ - reg : specifies physical base address and size of the registers
+ - reg-names: should be "mac" for xHCI MAC and "ippc" for IP port control
  - interrupts : interrupt used by the controller
  - power-domains : a phandle to USB power domain node to control USB's
         mtcmos
@@ -27,12 +35,16 @@ Optional properties:
         control register, it depends on "mediatek,wakeup-src".
  - vbus-supply : reference to the VBUS regulator;
  - usb3-lpm-capable : supports USB3.0 LPM
+ - pinctrl-names : a pinctrl state named "default" must be defined
+ - pinctrl-0 : pin control group
+        See: Documentation/devicetree/bindings/pinctrl/pinctrl-binding.txt
 
 Example:
 usb30: usb@11270000 {
         compatible = "mediatek,mt8173-xhci";
         reg = <0 0x11270000 0 0x1000>,
               <0 0x11280700 0 0x0100>;
+        reg-names = "mac", "ippc";
         interrupts = <GIC_SPI 115 IRQ_TYPE_LEVEL_LOW>;
         power-domains = <&scpsys MT8173_POWER_DOMAIN_USB>;
         clocks = <&topckgen CLK_TOP_USB30_SEL>,
@@ -49,3 +61,41 @@ usb30: usb@11270000 {
         mediatek,syscon-wakeup = <&pericfg>;
         mediatek,wakeup-src = <1>;
 };
+
+2nd: dual-role mode with xHCI driver
+------------------------------------------------------------------------
+
+In the case, xhci is added as subnode to mtu3. An example and the DT binding
+details of mtu3 can be found in:
+Documentation/devicetree/bindings/usb/mtu3.txt
+
+Required properties:
+ - compatible : should contain "mediatek,mt8173-xhci"
+ - reg : specifies physical base address and size of the registers
+ - reg-names: should be "mac" for xHCI MAC
+ - interrupts : interrupt used by the host controller
+ - power-domains : a phandle to USB power domain node to control USB's
+        mtcmos
+ - vusb33-supply : regulator of USB avdd3.3v
+
+ - clocks : a list of phandle + clock-specifier pairs, one for each
+        entry in clock-names
+ - clock-names : must be
+        "sys_ck": for clock of xHCI MAC
+
+Optional properties:
+ - vbus-supply : reference to the VBUS regulator;
+ - usb3-lpm-capable : supports USB3.0 LPM
+
+Example:
+usb30: usb@11270000 {
+        compatible = "mediatek,mt8173-xhci";
+        reg = <0 0x11270000 0 0x1000>;
+        reg-names = "mac";
+        interrupts = <GIC_SPI 115 IRQ_TYPE_LEVEL_LOW>;
+        power-domains = <&scpsys MT8173_POWER_DOMAIN_USB>;
+        clocks = <&topckgen CLK_TOP_USB30_SEL>;
+        clock-names = "sys_ck";
+        vusb33-supply = <&mt6397_vusb_reg>;
+        usb3-lpm-capable;
+};
diff --git a/Documentation/devicetree/bindings/usb/ohci-da8xx.txt b/Documentation/devicetree/bindings/usb/ohci-da8xx.txt
new file mode 100644
index 000000000000..2dc8f67eda39
--- /dev/null
+++ b/Documentation/devicetree/bindings/usb/ohci-da8xx.txt
@@ -0,0 +1,23 @@
+DA8XX USB OHCI controller
+
+Required properties:
+
+ - compatible: Should be "ti,da830-ohci"
+ - reg:        Should contain one register range i.e. start and length
+ - interrupts: Description of the interrupt line
+ - phys:       Phandle for the PHY device
+ - phy-names:  Should be "usb-phy"
+
+Optional properties:
+ - vbus-supply: phandle of regulator that controls vbus power / over-current
+
+Example:
+
+ohci: usb@0225000 {
+        compatible = "ti,da830-ohci";
+        reg = <0x225000 0x1000>;
+        interrupts = <59>;
+        phys = <&usb_phy 1>;
+        phy-names = "usb-phy";
+        vbus-supply = <&reg_usb_ohci>;
+};
diff --git a/Documentation/devicetree/bindings/usb/s3c2410-usb.txt b/Documentation/devicetree/bindings/usb/s3c2410-usb.txt
new file mode 100644
index 000000000000..e45b38ce2986
--- /dev/null
+++ b/Documentation/devicetree/bindings/usb/s3c2410-usb.txt
@@ -0,0 +1,22 @@
+Samsung S3C2410 and compatible SoC USB controller
+
+OHCI
+
+Required properties:
+ - compatible: should be "samsung,s3c2410-ohci" for USB host controller
+ - reg: address and lenght of the controller memory mapped region
+ - interrupts: interrupt number for the USB OHCI controller
+ - clocks: Should reference the bus and host clocks
+ - clock-names: Should contain two strings
+                "usb-bus-host" for the USB bus clock
+                "usb-host" for the USB host clock
+
+Example:
+
+usb0: ohci@49000000 {
+        compatible = "samsung,s3c2410-ohci";
+        reg = <0x49000000 0x100>;
+        interrupts = <0 0 26 3>;
+        clocks = <&clocks UCLK>, <&clocks HCLK_USBH>;
+        clock-names = "usb-bus-host", "usb-host";
+};
diff --git a/Documentation/devicetree/bindings/usb/usb-xhci.txt b/Documentation/devicetree/bindings/usb/usb-xhci.txt
index 966885c636d0..0b7d8576001c 100644
--- a/Documentation/devicetree/bindings/usb/usb-xhci.txt
+++ b/Documentation/devicetree/bindings/usb/usb-xhci.txt
@@ -11,6 +11,7 @@ Required properties:
     - "renesas,xhci-r8a7791" for r8a7791 SoC
     - "renesas,xhci-r8a7793" for r8a7793 SoC
     - "renesas,xhci-r8a7795" for r8a7795 SoC
+    - "renesas,xhci-r8a7796" for r8a7796 SoC
     - "renesas,rcar-gen2-xhci" for a generic R-Car Gen2 compatible device
     - "renesas,rcar-gen3-xhci" for a generic R-Car Gen3 compatible device
     - "xhci-platform" (deprecated)
diff --git a/arch/arm/boot/dts/rk3036.dtsi b/arch/arm/boot/dts/rk3036.dtsi
index a935523a1eb8..7c2dc19925a1 100644
--- a/arch/arm/boot/dts/rk3036.dtsi
+++ b/arch/arm/boot/dts/rk3036.dtsi
@@ -204,7 +204,6 @@
                 g-np-tx-fifo-size = <16>;
                 g-rx-fifo-size = <275>;
                 g-tx-fifo-size = <256 128 128 64 64 32>;
-                g-use-dma;
                 status = "disabled";
         };
 
diff --git a/arch/arm/boot/dts/rk3288.dtsi b/arch/arm/boot/dts/rk3288.dtsi
index 17ec2e2d7a60..74a749c566ee 100644
--- a/arch/arm/boot/dts/rk3288.dtsi
+++ b/arch/arm/boot/dts/rk3288.dtsi
@@ -596,7 +596,6 @@
                 g-np-tx-fifo-size = <16>;
                 g-rx-fifo-size = <275>;
                 g-tx-fifo-size = <256 128 128 64 64 32>;
-                g-use-dma;
                 phys = <&usbphy0>;
                 phy-names = "usb2-phy";
                 status = "disabled";
diff --git a/arch/arm/boot/dts/rk3xxx.dtsi b/arch/arm/boot/dts/rk3xxx.dtsi
index e15beb3c671e..8fbd3c806fa0 100644
--- a/arch/arm/boot/dts/rk3xxx.dtsi
+++ b/arch/arm/boot/dts/rk3xxx.dtsi
@@ -181,7 +181,6 @@
                 g-np-tx-fifo-size = <16>;
                 g-rx-fifo-size = <275>;
                 g-tx-fifo-size = <256 128 128 64 64 32>;
-                g-use-dma;
                 phys = <&usbphy0>;
                 phy-names = "usb2-phy";
                 status = "disabled";
diff --git a/arch/arm64/boot/dts/hisilicon/hi6220.dtsi b/arch/arm64/boot/dts/hisilicon/hi6220.dtsi
index 17839db585d5..e0ea60382087 100644
--- a/arch/arm64/boot/dts/hisilicon/hi6220.dtsi
+++ b/arch/arm64/boot/dts/hisilicon/hi6220.dtsi
@@ -747,7 +747,6 @@
                         clocks = <&sys_ctrl HI6220_USBOTG_HCLK>;
                         clock-names = "otg";
                         dr_mode = "otg";
-                        g-use-dma;
                         g-rx-fifo-size = <512>;
                         g-np-tx-fifo-size = <128>;
                         g-tx-fifo-size = <128 128 128 128 128 128>;
diff --git a/arch/arm64/boot/dts/mediatek/mt8173-evb.dts b/arch/arm64/boot/dts/mediatek/mt8173-evb.dts
index 2a7f731c7759..0ecaad4333a7 100644
--- a/arch/arm64/boot/dts/mediatek/mt8173-evb.dts
+++ b/arch/arm64/boot/dts/mediatek/mt8173-evb.dts
@@ -34,15 +34,6 @@
 
         chosen { };
 
-        usb_p1_vbus: regulator@0 {
-                compatible = "regulator-fixed";
-                regulator-name = "usb_vbus";
-                regulator-min-microvolt = <5000000>;
-                regulator-max-microvolt = <5000000>;
-                gpio = <&pio 130 GPIO_ACTIVE_HIGH>;
-                enable-active-high;
-        };
-
         connector {
                 compatible = "hdmi-connector";
                 label = "hdmi";
@@ -54,6 +45,29 @@
                         };
                 };
         };
+
+        extcon_usb: extcon_iddig {
+                compatible = "linux,extcon-usb-gpio";
+                id-gpio = <&pio 16 GPIO_ACTIVE_HIGH>;
+        };
+
+        usb_p1_vbus: regulator@0 {
+                compatible = "regulator-fixed";
+                regulator-name = "usb_vbus";
+                regulator-min-microvolt = <5000000>;
+                regulator-max-microvolt = <5000000>;
+                gpio = <&pio 130 GPIO_ACTIVE_HIGH>;
+                enable-active-high;
+        };
+
+        usb_p0_vbus: regulator@1 {
+                compatible = "regulator-fixed";
+                regulator-name = "vbus";
+                regulator-min-microvolt = <5000000>;
+                regulator-max-microvolt = <5000000>;
+                gpio = <&pio 9 GPIO_ACTIVE_HIGH>;
+                enable-active-high;
+        };
 };
 
 &cec {
@@ -243,6 +257,20 @@
                         bias-pull-down = <MTK_PUPD_SET_R1R0_10>;
                 };
         };
+
+        usb_id_pins_float: usb_iddig_pull_up {
+                pins_iddig {
+                        pinmux = <MT8173_PIN_16_IDDIG__FUNC_IDDIG>;
+                        bias-pull-up;
+                };
+        };
+
+        usb_id_pins_ground: usb_iddig_pull_down {
+                pins_iddig {
+                        pinmux = <MT8173_PIN_16_IDDIG__FUNC_IDDIG>;
+                        bias-pull-down;
+                };
+        };
 };
 
 &pwm0 {
@@ -469,12 +497,25 @@
         status = "okay";
 };
 
+&ssusb {
+        vusb33-supply = <&mt6397_vusb_reg>;
+        vbus-supply = <&usb_p0_vbus>;
+        extcon = <&extcon_usb>;
+        dr_mode = "otg";
+        mediatek,enable-wakeup;
+        pinctrl-names = "default", "id_float", "id_ground";
+        pinctrl-0 = <&usb_id_pins_float>;
+        pinctrl-1 = <&usb_id_pins_float>;
+        pinctrl-2 = <&usb_id_pins_ground>;
+        status = "okay";
+};
+
 &uart0 {
         status = "okay";
 };
 
-&usb30 {
+&usb_host {
         vusb33-supply = <&mt6397_vusb_reg>;
         vbus-supply = <&usb_p1_vbus>;
-        mediatek,wakeup-src = <1>;
+        status = "okay";
 };
diff --git a/arch/arm64/boot/dts/mediatek/mt8173.dtsi b/arch/arm64/boot/dts/mediatek/mt8173.dtsi
index 1c71e256601d..c2d588ca59b7 100644
--- a/arch/arm64/boot/dts/mediatek/mt8173.dtsi
+++ b/arch/arm64/boot/dts/mediatek/mt8173.dtsi
@@ -707,11 +707,14 @@
                         status = "disabled";
                 };
 
-                usb30: usb@11270000 {
-                        compatible = "mediatek,mt8173-xhci";
-                        reg = <0 0x11270000 0 0x1000>,
+                ssusb: usb@11271000 {
+                        compatible = "mediatek,mt8173-mtu3";
+                        reg = <0 0x11271000 0 0x3000>,
                               <0 0x11280700 0 0x0100>;
-                        interrupts = <GIC_SPI 115 IRQ_TYPE_LEVEL_LOW>;
+                        reg-names = "mac", "ippc";
+                        interrupts = <GIC_SPI 64 IRQ_TYPE_LEVEL_LOW>;
+                        phys = <&phy_port0 PHY_TYPE_USB3>,
+                               <&phy_port1 PHY_TYPE_USB2>;
                         power-domains = <&scpsys MT8173_POWER_DOMAIN_USB>;
                         clocks = <&topckgen CLK_TOP_USB30_SEL>,
                                  <&pericfg CLK_PERI_USB0>,
@@ -719,10 +722,22 @@
                         clock-names = "sys_ck",
                                       "wakeup_deb_p0",
                                       "wakeup_deb_p1";
-                        phys = <&phy_port0 PHY_TYPE_USB3>,
-                               <&phy_port1 PHY_TYPE_USB2>;
                         mediatek,syscon-wakeup = <&pericfg>;
-                        status = "okay";
+                        #address-cells = <2>;
+                        #size-cells = <2>;
+                        ranges;
+                        status = "disabled";
+
+                        usb_host: xhci@11270000 {
+                                compatible = "mediatek,mt8173-xhci";
+                                reg = <0 0x11270000 0 0x1000>;
+                                reg-names = "mac";
+                                interrupts = <GIC_SPI 115 IRQ_TYPE_LEVEL_LOW>;
+                                power-domains = <&scpsys MT8173_POWER_DOMAIN_USB>;
+                                clocks = <&topckgen CLK_TOP_USB30_SEL>;
+                                clock-names = "sys_ck";
+                                status = "disabled";
+                        };
                 };
 
                 u3phy: usb-phy@11290000 {
diff --git a/arch/arm64/boot/dts/rockchip/rk3368.dtsi b/arch/arm64/boot/dts/rockchip/rk3368.dtsi
index 0fcb2147c9f9..df231c4df5a5 100644
--- a/arch/arm64/boot/dts/rockchip/rk3368.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3368.dtsi
@@ -537,7 +537,6 @@
                 g-np-tx-fifo-size = <16>;
                 g-rx-fifo-size = <275>;
                 g-tx-fifo-size = <256 128 128 64 64 32>;
-                g-use-dma;
                 status = "disabled";
         };
 
diff --git a/drivers/extcon/extcon-usb-gpio.c b/drivers/extcon/extcon-usb-gpio.c
index a27d350f69e3..d589c5feff3d 100644
--- a/drivers/extcon/extcon-usb-gpio.c
+++ b/drivers/extcon/extcon-usb-gpio.c
@@ -24,7 +24,6 @@
 #include <linux/module.h>
 #include <linux/of_gpio.h>
 #include <linux/platform_device.h>
-#include <linux/pm_wakeirq.h>
 #include <linux/slab.h>
 #include <linux/workqueue.h>
 #include <linux/acpi.h>
@@ -36,7 +35,9 @@ struct usb_extcon_info {
         struct extcon_dev *edev;
 
         struct gpio_desc *id_gpiod;
+        struct gpio_desc *vbus_gpiod;
         int id_irq;
+        int vbus_irq;
 
         unsigned long debounce_jiffies;
         struct delayed_work wq_detcable;
@@ -48,31 +49,47 @@ static const unsigned int usb_extcon_cable[] = {
         EXTCON_NONE,
 };
 
+/*
+ * "USB" = VBUS and "USB-HOST" = !ID, so we have:
+ * Both "USB" and "USB-HOST" can't be set as active at the
+ * same time so if "USB-HOST" is active (i.e. ID is 0)  we keep "USB" inactive
+ * even if VBUS is on.
+ *
+ *  State              |    ID   |   VBUS
+ * ----------------------------------------
+ *  [1] USB            |    H    |    H
+ *  [2] none           |    H    |    L
+ *  [3] USB-HOST       |    L    |    H
+ *  [4] USB-HOST       |    L    |    L
+ *
+ * In case we have only one of these signals:
+ * - VBUS only - we want to distinguish between [1] and [2], so ID is always 1.
+ * - ID only - we want to distinguish between [1] and [4], so VBUS = ID.
+*/
 static void usb_extcon_detect_cable(struct work_struct *work)
 {
-        int id;
+        int id, vbus;
         struct usb_extcon_info *info = container_of(to_delayed_work(work),
                                                     struct usb_extcon_info,
                                                     wq_detcable);
 
-        /* check ID and update cable state */
-        id = gpiod_get_value_cansleep(info->id_gpiod);
-        if (id) {
-                /*
-                 * ID = 1 means USB HOST cable detached.
-                 * As we don't have event for USB peripheral cable attached,
-                 * we simulate USB peripheral attach here.
-                 */
+        /* check ID and VBUS and update cable state */
+        id = info->id_gpiod ?
+                gpiod_get_value_cansleep(info->id_gpiod) : 1;
+        vbus = info->vbus_gpiod ?
+                gpiod_get_value_cansleep(info->vbus_gpiod) : id;
+
+        /* at first we clean states which are no longer active */
+        if (id)
                 extcon_set_state_sync(info->edev, EXTCON_USB_HOST, false);
-                extcon_set_state_sync(info->edev, EXTCON_USB, true);
-        } else {
-                /*
-                 * ID = 0 means USB HOST cable attached.
-                 * As we don't have event for USB peripheral cable detached,
-                 * we simulate USB peripheral detach here.
-                 */
+        if (!vbus)
                 extcon_set_state_sync(info->edev, EXTCON_USB, false);
+
+        if (!id) {
                 extcon_set_state_sync(info->edev, EXTCON_USB_HOST, true);
+        } else {
+                if (vbus)
+                        extcon_set_state_sync(info->edev, EXTCON_USB, true);
         }
 }
 
@@ -101,12 +118,21 @@ static int usb_extcon_probe(struct platform_device *pdev)
                 return -ENOMEM;
 
         info->dev = dev;
-        info->id_gpiod = devm_gpiod_get(&pdev->dev, "id", GPIOD_IN);
-        if (IS_ERR(info->id_gpiod)) {
-                dev_err(dev, "failed to get ID GPIO\n");
-                return PTR_ERR(info->id_gpiod);
+        info->id_gpiod = devm_gpiod_get_optional(&pdev->dev, "id", GPIOD_IN);
+        info->vbus_gpiod = devm_gpiod_get_optional(&pdev->dev, "vbus",
+                                                   GPIOD_IN);
+
+        if (!info->id_gpiod && !info->vbus_gpiod) {
+                dev_err(dev, "failed to get gpios\n");
+                return -ENODEV;
         }
 
+        if (IS_ERR(info->id_gpiod))
+                return PTR_ERR(info->id_gpiod);
+
+        if (IS_ERR(info->vbus_gpiod))
+                return PTR_ERR(info->vbus_gpiod);
+
         info->edev = devm_extcon_dev_allocate(dev, usb_extcon_cable);
         if (IS_ERR(info->edev)) {
                 dev_err(dev, "failed to allocate extcon device\n");
@@ -119,32 +145,56 @@ static int usb_extcon_probe(struct platform_device *pdev)
                 return ret;
         }
 
-        ret = gpiod_set_debounce(info->id_gpiod,
-                                 USB_GPIO_DEBOUNCE_MS * 1000);
+        if (info->id_gpiod)
+                ret = gpiod_set_debounce(info->id_gpiod,
+                                         USB_GPIO_DEBOUNCE_MS * 1000);
+        if (!ret && info->vbus_gpiod)
+                ret = gpiod_set_debounce(info->vbus_gpiod,
+                                         USB_GPIO_DEBOUNCE_MS * 1000);
+
         if (ret < 0)
                 info->debounce_jiffies = msecs_to_jiffies(USB_GPIO_DEBOUNCE_MS);
 
         INIT_DELAYED_WORK(&info->wq_detcable, usb_extcon_detect_cable);
 
-        info->id_irq = gpiod_to_irq(info->id_gpiod);
-        if (info->id_irq < 0) {
-                dev_err(dev, "failed to get ID IRQ\n");
-                return info->id_irq;
+        if (info->id_gpiod) {
+                info->id_irq = gpiod_to_irq(info->id_gpiod);
+                if (info->id_irq < 0) {
+                        dev_err(dev, "failed to get ID IRQ\n");
+                        return info->id_irq;
+                }
+
+                ret = devm_request_threaded_irq(dev, info->id_irq, NULL,
+                                                usb_irq_handler,
+                                                IRQF_TRIGGER_RISING |
+                                                IRQF_TRIGGER_FALLING | IRQF_ONESHOT,
+                                                pdev->name, info);
+                if (ret < 0) {
+                        dev_err(dev, "failed to request handler for ID IRQ\n");
+                        return ret;
+                }
         }
 
-        ret = devm_request_threaded_irq(dev, info->id_irq, NULL,
-                                        usb_irq_handler,
-                                        IRQF_TRIGGER_RISING |
-                                        IRQF_TRIGGER_FALLING | IRQF_ONESHOT,
-                                        pdev->name, info);
-        if (ret < 0) {
-                dev_err(dev, "failed to request handler for ID IRQ\n");
-                return ret;
+        if (info->vbus_gpiod) {
+                info->vbus_irq = gpiod_to_irq(info->vbus_gpiod);
+                if (info->vbus_irq < 0) {
+                        dev_err(dev, "failed to get VBUS IRQ\n");
+                        return info->vbus_irq;
+                }
+
+                ret = devm_request_threaded_irq(dev, info->vbus_irq, NULL,
+                                                usb_irq_handler,
+                                                IRQF_TRIGGER_RISING |
+                                                IRQF_TRIGGER_FALLING | IRQF_ONESHOT,
+                                                pdev->name, info);
+                if (ret < 0) {
+                        dev_err(dev, "failed to request handler for VBUS IRQ\n");
+                        return ret;
+                }
         }
 
         platform_set_drvdata(pdev, info);
         device_init_wakeup(dev, true);
-        dev_pm_set_wake_irq(dev, info->id_irq);
 
         /* Perform initial detection */
         usb_extcon_detect_cable(&info->wq_detcable.work);
@@ -157,8 +207,6 @@ static int usb_extcon_remove(struct platform_device *pdev)
         struct usb_extcon_info *info = platform_get_drvdata(pdev);
 
         cancel_delayed_work_sync(&info->wq_detcable);
-
-        dev_pm_clear_wake_irq(&pdev->dev);
         device_init_wakeup(&pdev->dev, false);
 
         return 0;
@@ -170,12 +218,32 @@ static int usb_extcon_suspend(struct device *dev)
         struct usb_extcon_info *info = dev_get_drvdata(dev);
         int ret = 0;
 
+        if (device_may_wakeup(dev)) {
+                if (info->id_gpiod) {
+                        ret = enable_irq_wake(info->id_irq);
+                        if (ret)
+                                return ret;
+                }
+                if (info->vbus_gpiod) {
+                        ret = enable_irq_wake(info->vbus_irq);
+                        if (ret) {
+                                if (info->id_gpiod)
+                                        disable_irq_wake(info->id_irq);
+
+                                return ret;
+                        }
+                }
+        }
+
         /*
          * We don't want to process any IRQs after this point
          * as GPIOs used behind I2C subsystem might not be
          * accessible until resume completes. So disable IRQ.
          */
-        disable_irq(info->id_irq);
+        if (info->id_gpiod)
+                disable_irq(info->id_irq);
+        if (info->vbus_gpiod)
+                disable_irq(info->vbus_irq);
 
         return ret;
 }
@@ -185,7 +253,28 @@ static int usb_extcon_resume(struct device *dev)
         struct usb_extcon_info *info = dev_get_drvdata(dev);
         int ret = 0;
 
-        enable_irq(info->id_irq);
+        if (device_may_wakeup(dev)) {
+                if (info->id_gpiod) {
+                        ret = disable_irq_wake(info->id_irq);
+                        if (ret)
+                                return ret;
+                }
+                if (info->vbus_gpiod) {
+                        ret = disable_irq_wake(info->vbus_irq);
+                        if (ret) {
+                                if (info->id_gpiod)
+                                        enable_irq_wake(info->id_irq);
+
+                                return ret;
+                        }
+                }
+        }
+
+        if (info->id_gpiod)
+                enable_irq(info->id_irq);
+        if (info->vbus_gpiod)
+                enable_irq(info->vbus_irq);
+
         if (!device_may_wakeup(dev))
                 queue_delayed_work(system_power_efficient_wq,
                                    &info->wq_detcable, 0);
diff --git a/drivers/media/usb/usbtv/usbtv-core.c b/drivers/media/usb/usbtv/usbtv-core.c
index dc76fd41e00f..ceb953be0770 100644
--- a/drivers/media/usb/usbtv/usbtv-core.c
+++ b/drivers/media/usb/usbtv/usbtv-core.c
@@ -71,6 +71,7 @@ static int usbtv_probe(struct usb_interface *intf,
         int size;
         struct device *dev = &intf->dev;
         struct usbtv *usbtv;
+        struct usb_host_endpoint *ep;
 
         /* Checks that the device is what we think it is. */
         if (intf->num_altsetting != 2)
@@ -78,10 +79,12 @@ static int usbtv_probe(struct usb_interface *intf,
         if (intf->altsetting[1].desc.bNumEndpoints != 4)
                 return -ENODEV;
 
+        ep = &intf->altsetting[1].endpoint[0];
+
         /* Packet size is split into 11 bits of base size and count of
          * extra multiplies of it.*/
-        size = usb_endpoint_maxp(&intf->altsetting[1].endpoint[0].desc);
-        size = (size & 0x07ff) * (((size & 0x1800) >> 11) + 1);
+        size = usb_endpoint_maxp(&ep->desc);
+        size = (size & 0x07ff) * usb_endpoint_maxp_mult(&ep->desc);
 
         /* Device structure */
         usbtv = kzalloc(sizeof(struct usbtv), GFP_KERNEL);
diff --git a/drivers/media/usb/uvc/uvc_video.c b/drivers/media/usb/uvc/uvc_video.c
index b5589d5f5da4..f3c1c852e401 100644
--- a/drivers/media/usb/uvc/uvc_video.c
+++ b/drivers/media/usb/uvc/uvc_video.c
@@ -1467,6 +1467,7 @@ static unsigned int uvc_endpoint_max_bpi(struct usb_device *dev,
                                          struct usb_host_endpoint *ep)
 {
         u16 psize;
+        u16 mult;
 
         switch (dev->speed) {
         case USB_SPEED_SUPER:
@@ -1474,7 +1475,8 @@ static unsigned int uvc_endpoint_max_bpi(struct usb_device *dev,
                 return le16_to_cpu(ep->ss_ep_comp.wBytesPerInterval);
         case USB_SPEED_HIGH:
                 psize = usb_endpoint_maxp(&ep->desc);
-                return (psize & 0x07ff) * (1 + ((psize >> 11) & 3));
+                mult = usb_endpoint_maxp_mult(&ep->desc);
+                return (psize & 0x07ff) * mult;
         case USB_SPEED_WIRELESS:
                 psize = usb_endpoint_maxp(&ep->desc);
                 return psize;
@@ -1551,7 +1553,7 @@ static int uvc_init_video_bulk(struct uvc_streaming *stream,
         u16 psize;
         u32 size;
 
-        psize = usb_endpoint_maxp(&ep->desc) & 0x7ff;
+        psize = usb_endpoint_maxp(&ep->desc);
         size = stream->ctrl.dwMaxPayloadTransferSize;
         stream->bulk.max_payload_size = size;
 
diff --git a/drivers/phy/Kconfig b/drivers/phy/Kconfig
index fe00f9134d51..e8eb7f225a88 100644
--- a/drivers/phy/Kconfig
+++ b/drivers/phy/Kconfig
@@ -129,16 +129,6 @@ config PHY_MIPHY28LP
           Enable this to support the miphy transceiver (for SATA/PCIE/USB3)
           that is part of STMicroelectronics STiH407 SoC.
 
-config PHY_MIPHY365X
-        tristate "STMicroelectronics MIPHY365X PHY driver for STiH41x series"
-        depends on ARCH_STI
-        depends on HAS_IOMEM
-        depends on OF
-        select GENERIC_PHY
-        help
-          Enable this to support the miphy transceiver (for SATA/PCIE)
-          that is part of STMicroelectronics STiH41x SoC series.
-
 config PHY_RCAR_GEN2
         tristate "Renesas R-Car generation 2 USB PHY driver"
         depends on ARCH_RENESAS
@@ -373,7 +363,9 @@ config PHY_ROCKCHIP_INNO_USB2
         tristate "Rockchip INNO USB2PHY Driver"
         depends on (ARCH_ROCKCHIP || COMPILE_TEST) && OF
         depends on COMMON_CLK
+        depends on USB_SUPPORT
         select GENERIC_PHY
+        select USB_COMMON
         help
           Support for Rockchip USB2.0 PHY with Innosilicon IP block.
 
@@ -438,14 +430,6 @@ config PHY_STIH407_USB
           Enable this support to enable the picoPHY device used by USB2
           and USB3 controllers on STMicroelectronics STiH407 SoC families.
 
-config PHY_STIH41X_USB
-        tristate "STMicroelectronics USB2 PHY driver for STiH41x series"
-        depends on ARCH_STI
-        select GENERIC_PHY
-        help
-          Enable this to support the USB transceiver that is part of
-          STMicroelectronics STiH41x SoC series.
-
 config PHY_QCOM_UFS
         tristate "Qualcomm UFS PHY driver"
         depends on OF && ARCH_QCOM
@@ -489,4 +473,17 @@ config PHY_NS2_PCIE
         help
           Enable this to support the Broadcom Northstar2 PCIe PHY.
           If unsure, say N.
+
+config PHY_MESON8B_USB2
+        tristate "Meson8b and GXBB USB2 PHY driver"
+        default ARCH_MESON
+        depends on OF && (ARCH_MESON || COMPILE_TEST)
+        depends on USB_SUPPORT
+        select USB_COMMON
+        select GENERIC_PHY
+        help
+          Enable this to support the Meson USB2 PHYs found in Meson8b
+          and GXBB SoCs.
+          If unsure, say N.
+
 endmenu
diff --git a/drivers/phy/Makefile b/drivers/phy/Makefile
index a534cf5be07d..65eb2f436a41 100644
--- a/drivers/phy/Makefile
+++ b/drivers/phy/Makefile
@@ -18,7 +18,6 @@ obj-$(CONFIG_PHY_PXA_28NM_USB2)		+= phy-pxa-28nm-usb2.o
 obj-$(CONFIG_PHY_PXA_28NM_HSIC)         += phy-pxa-28nm-hsic.o
 obj-$(CONFIG_PHY_MVEBU_SATA)            += phy-mvebu-sata.o
 obj-$(CONFIG_PHY_MIPHY28LP)             += phy-miphy28lp.o
-obj-$(CONFIG_PHY_MIPHY365X)             += phy-miphy365x.o
 obj-$(CONFIG_PHY_RCAR_GEN2)             += phy-rcar-gen2.o
 obj-$(CONFIG_PHY_RCAR_GEN3_USB2)        += phy-rcar-gen3-usb2.o
 obj-$(CONFIG_OMAP_CONTROL_PHY)          += phy-omap-control.o
@@ -50,7 +49,6 @@ obj-$(CONFIG_PHY_ST_SPEAR1310_MIPHY)	+= phy-spear1310-miphy.o
 obj-$(CONFIG_PHY_ST_SPEAR1340_MIPHY)    += phy-spear1340-miphy.o
 obj-$(CONFIG_PHY_XGENE)                 += phy-xgene.o
 obj-$(CONFIG_PHY_STIH407_USB)           += phy-stih407-usb.o
-obj-$(CONFIG_PHY_STIH41X_USB)           += phy-stih41x-usb.o
 obj-$(CONFIG_PHY_QCOM_UFS)      += phy-qcom-ufs.o
 obj-$(CONFIG_PHY_QCOM_UFS)      += phy-qcom-ufs-qmp-20nm.o
 obj-$(CONFIG_PHY_QCOM_UFS)      += phy-qcom-ufs-qmp-14nm.o
@@ -60,3 +58,4 @@ obj-$(CONFIG_PHY_PISTACHIO_USB)		+= phy-pistachio-usb.o
 obj-$(CONFIG_PHY_CYGNUS_PCIE)           += phy-bcm-cygnus-pcie.o
 obj-$(CONFIG_ARCH_TEGRA) += tegra/
 obj-$(CONFIG_PHY_NS2_PCIE)              += phy-bcm-ns2-pcie.o
+obj-$(CONFIG_PHY_MESON8B_USB2)          += phy-meson8b-usb2.o
diff --git a/drivers/phy/phy-berlin-sata.c b/drivers/phy/phy-berlin-sata.c
index f84a33a1bdd9..2c7a57f2d595 100644
--- a/drivers/phy/phy-berlin-sata.c
+++ b/drivers/phy/phy-berlin-sata.c
@@ -85,7 +85,6 @@ static int phy_berlin_sata_power_on(struct phy *phy)
         struct phy_berlin_desc *desc = phy_get_drvdata(phy);
         struct phy_berlin_priv *priv = dev_get_drvdata(phy->dev.parent);
         void __iomem *ctrl_reg = priv->base + 0x60 + (desc->index * 0x80);
-        int ret = 0;
         u32 regval;
 
         clk_prepare_enable(priv->clk);
@@ -130,7 +129,7 @@ static int phy_berlin_sata_power_on(struct phy *phy)
 
         clk_disable_unprepare(priv->clk);
 
-        return ret;
+        return 0;
 }
 
 static int phy_berlin_sata_power_off(struct phy *phy)
diff --git a/drivers/phy/phy-brcm-sata.c b/drivers/phy/phy-brcm-sata.c
index 8ffc44afdb75..ccbc3d994998 100644
--- a/drivers/phy/phy-brcm-sata.c
+++ b/drivers/phy/phy-brcm-sata.c
@@ -140,7 +140,7 @@ static inline void __iomem *brcm_sata_pcb_base(struct brcm_sata_port *port)
         default:
                 dev_err(priv->dev, "invalid phy version\n");
                 break;
-        };
+        }
 
         return priv->phy_base + (port->portnum * size);
 }
@@ -157,7 +157,7 @@ static inline void __iomem *brcm_sata_ctrl_base(struct brcm_sata_port *port)
         default:
                 dev_err(priv->dev, "invalid phy version\n");
                 break;
-        };
+        }
 
         return priv->ctrl_base + (port->portnum * size);
 }
@@ -365,7 +365,7 @@ static int brcm_sata_phy_init(struct phy *phy)
                 break;
         default:
                 rc = -ENODEV;
-        };
+        }
 
         return rc;
 }
diff --git a/drivers/phy/phy-da8xx-usb.c b/drivers/phy/phy-da8xx-usb.c
index c85fb0b59729..1b82bff6330f 100644
--- a/drivers/phy/phy-da8xx-usb.c
+++ b/drivers/phy/phy-da8xx-usb.c
@@ -23,6 +23,8 @@
 #include <linux/platform_device.h>
 #include <linux/regmap.h>
 
+#define PHY_INIT_BITS   (CFGCHIP2_SESENDEN | CFGCHIP2_VBDTCTEN)
+
 struct da8xx_usb_phy {
         struct phy_provider     *phy_provider;
         struct phy              *usb11_phy;
@@ -208,6 +210,9 @@ static int da8xx_usb_phy_probe(struct platform_device *pdev)
                         dev_warn(dev, "Failed to create usb20 phy lookup\n");
         }
 
+        regmap_write_bits(d_phy->regmap, CFGCHIP(2),
+                          PHY_INIT_BITS, PHY_INIT_BITS);
+
         return 0;
 }
 
diff --git a/drivers/phy/phy-exynos-mipi-video.c b/drivers/phy/phy-exynos-mipi-video.c
index 8b851f718123..6bee04cc4d53 100644
--- a/drivers/phy/phy-exynos-mipi-video.c
+++ b/drivers/phy/phy-exynos-mipi-video.c
@@ -229,19 +229,6 @@ struct exynos_mipi_video_phy {
         spinlock_t slock;
 };
 
-static inline int __is_running(const struct exynos_mipi_phy_desc *data,
-                        struct exynos_mipi_video_phy *state)
-{
-        u32 val;
-        int ret;
-
-        ret = regmap_read(state->regmaps[data->resetn_map], data->resetn_reg, &val);
-        if (ret)
-                return 0;
-
-        return val & data->resetn_val;
-}
-
 static int __set_phy_state(const struct exynos_mipi_phy_desc *data,
                            struct exynos_mipi_video_phy *state, unsigned int on)
 {
@@ -251,7 +238,7 @@ static int __set_phy_state(const struct exynos_mipi_phy_desc *data,
 
         /* disable in PMU sysreg */
         if (!on && data->coupled_phy_id >= 0 &&
-            !__is_running(state->phys[data->coupled_phy_id].data, state)) {
+            state->phys[data->coupled_phy_id].phy->power_count == 0) {
                 regmap_read(state->regmaps[data->enable_map], data->enable_reg,
                             &val);
                 val &= ~data->enable_val;
diff --git a/drivers/phy/phy-exynos4210-usb2.c b/drivers/phy/phy-exynos4210-usb2.c
index f30bbb0fb3b2..1f50e1004828 100644
--- a/drivers/phy/phy-exynos4210-usb2.c
+++ b/drivers/phy/phy-exynos4210-usb2.c
@@ -141,7 +141,7 @@ static void exynos4210_isol(struct samsung_usb2_phy_instance *inst, bool on)
                 break;
         default:
                 return;
-        };
+        }
 
         regmap_update_bits(drv->reg_pmu, offset, mask, on ? 0 : mask);
 }
@@ -179,7 +179,7 @@ static void exynos4210_phy_pwr(struct samsung_usb2_phy_instance *inst, bool on)
                 rstbits =       EXYNOS_4210_URSTCON_PHY1_P1P2 |
                                 EXYNOS_4210_URSTCON_HOST_LINK_P2;
                 break;
-        };
+        }
 
         if (on) {
                 clk = readl(drv->reg_phy + EXYNOS_4210_UPHYCLK);
diff --git a/drivers/phy/phy-exynos4x12-usb2.c b/drivers/phy/phy-exynos4x12-usb2.c
index 765da90a536f..7f27a91acf87 100644
--- a/drivers/phy/phy-exynos4x12-usb2.c
+++ b/drivers/phy/phy-exynos4x12-usb2.c
@@ -187,7 +187,7 @@ static void exynos4x12_isol(struct samsung_usb2_phy_instance *inst, bool on)
                 break;
         default:
                 return;
-        };
+        }
 
         regmap_update_bits(drv->reg_pmu, offset, mask, on ? 0 : mask);
 }
@@ -237,7 +237,7 @@ static void exynos4x12_phy_pwr(struct samsung_usb2_phy_instance *inst, bool on)
                 rstbits =       EXYNOS_4x12_URSTCON_HSIC1 |
                                 EXYNOS_4x12_URSTCON_HOST_LINK_P1;
                 break;
-        };
+        }
 
         if (on) {
                 pwr = readl(drv->reg_phy + EXYNOS_4x12_UPHYPWR);
diff --git a/drivers/phy/phy-exynos5250-usb2.c b/drivers/phy/phy-exynos5250-usb2.c
index 2ed1735a076a..aad806272305 100644
--- a/drivers/phy/phy-exynos5250-usb2.c
+++ b/drivers/phy/phy-exynos5250-usb2.c
@@ -192,7 +192,7 @@ static void exynos5250_isol(struct samsung_usb2_phy_instance *inst, bool on)
                 break;
         default:
                 return;
-        };
+        }
 
         regmap_update_bits(drv->reg_pmu, offset, mask, on ? 0 : mask);
 }
diff --git a/drivers/phy/phy-meson8b-usb2.c b/drivers/phy/phy-meson8b-usb2.c
new file mode 100644
index 000000000000..33c9f4ba157d
--- /dev/null
+++ b/drivers/phy/phy-meson8b-usb2.c
@@ -0,0 +1,286 @@
+/*
+ * Meson8b and GXBB USB2 PHY driver
+ *
+ * Copyright (C) 2016 Martin Blumenstingl <martin.blumenstingl@googlemail.com>
+ *
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <linux/clk.h>
+#include <linux/delay.h>
+#include <linux/io.h>
+#include <linux/module.h>
+#include <linux/of_device.h>
+#include <linux/reset.h>
+#include <linux/phy/phy.h>
+#include <linux/platform_device.h>
+#include <linux/usb/of.h>
+
+#define REG_CONFIG                                      0x00
+        #define REG_CONFIG_CLK_EN                       BIT(0)
+        #define REG_CONFIG_CLK_SEL_MASK                 GENMASK(3, 1)
+        #define REG_CONFIG_CLK_DIV_MASK                 GENMASK(10, 4)
+        #define REG_CONFIG_CLK_32k_ALTSEL               BIT(15)
+        #define REG_CONFIG_TEST_TRIG                    BIT(31)
+
+#define REG_CTRL                                        0x04
+        #define REG_CTRL_SOFT_PRST                      BIT(0)
+        #define REG_CTRL_SOFT_HRESET                    BIT(1)
+        #define REG_CTRL_SS_SCALEDOWN_MODE_MASK         GENMASK(3, 2)
+        #define REG_CTRL_CLK_DET_RST                    BIT(4)
+        #define REG_CTRL_INTR_SEL                       BIT(5)
+        #define REG_CTRL_CLK_DETECTED                   BIT(8)
+        #define REG_CTRL_SOF_SENT_RCVD_TGL              BIT(9)
+        #define REG_CTRL_SOF_TOGGLE_OUT                 BIT(10)
+        #define REG_CTRL_POWER_ON_RESET                 BIT(15)
+        #define REG_CTRL_SLEEPM                         BIT(16)
+        #define REG_CTRL_TX_BITSTUFF_ENN_H              BIT(17)
+        #define REG_CTRL_TX_BITSTUFF_ENN                BIT(18)
+        #define REG_CTRL_COMMON_ON                      BIT(19)
+        #define REG_CTRL_REF_CLK_SEL_MASK               GENMASK(21, 20)
+        #define REG_CTRL_REF_CLK_SEL_SHIFT              20
+        #define REG_CTRL_FSEL_MASK                      GENMASK(24, 22)
+        #define REG_CTRL_FSEL_SHIFT                     22
+        #define REG_CTRL_PORT_RESET                     BIT(25)
+        #define REG_CTRL_THREAD_ID_MASK                 GENMASK(31, 26)
+
+#define REG_ENDP_INTR                                   0x08
+
+/* bits [31:26], [24:21] and [15:3] seem to be read-only */
+#define REG_ADP_BC                                      0x0c
+        #define REG_ADP_BC_VBUS_VLD_EXT_SEL             BIT(0)
+        #define REG_ADP_BC_VBUS_VLD_EXT                 BIT(1)
+        #define REG_ADP_BC_OTG_DISABLE                  BIT(2)
+        #define REG_ADP_BC_ID_PULLUP                    BIT(3)
+        #define REG_ADP_BC_DRV_VBUS                     BIT(4)
+        #define REG_ADP_BC_ADP_PRB_EN                   BIT(5)
+        #define REG_ADP_BC_ADP_DISCHARGE                BIT(6)
+        #define REG_ADP_BC_ADP_CHARGE                   BIT(7)
+        #define REG_ADP_BC_SESS_END                     BIT(8)
+        #define REG_ADP_BC_DEVICE_SESS_VLD              BIT(9)
+        #define REG_ADP_BC_B_VALID                      BIT(10)
+        #define REG_ADP_BC_A_VALID                      BIT(11)
+        #define REG_ADP_BC_ID_DIG                       BIT(12)
+        #define REG_ADP_BC_VBUS_VALID                   BIT(13)
+        #define REG_ADP_BC_ADP_PROBE                    BIT(14)
+        #define REG_ADP_BC_ADP_SENSE                    BIT(15)
+        #define REG_ADP_BC_ACA_ENABLE                   BIT(16)
+        #define REG_ADP_BC_DCD_ENABLE                   BIT(17)
+        #define REG_ADP_BC_VDAT_DET_EN_B                BIT(18)
+        #define REG_ADP_BC_VDAT_SRC_EN_B                BIT(19)
+        #define REG_ADP_BC_CHARGE_SEL                   BIT(20)
+        #define REG_ADP_BC_CHARGE_DETECT                BIT(21)
+        #define REG_ADP_BC_ACA_PIN_RANGE_C              BIT(22)
+        #define REG_ADP_BC_ACA_PIN_RANGE_B              BIT(23)
+        #define REG_ADP_BC_ACA_PIN_RANGE_A              BIT(24)
+        #define REG_ADP_BC_ACA_PIN_GND                  BIT(25)
+        #define REG_ADP_BC_ACA_PIN_FLOAT                BIT(26)
+
+#define REG_DBG_UART                                    0x14
+
+#define REG_TEST                                        0x18
+        #define REG_TEST_DATA_IN_MASK                   GENMASK(3, 0)
+        #define REG_TEST_EN_MASK                        GENMASK(7, 4)
+        #define REG_TEST_ADDR_MASK                      GENMASK(11, 8)
+        #define REG_TEST_DATA_OUT_SEL                   BIT(12)
+        #define REG_TEST_CLK                            BIT(13)
+        #define REG_TEST_VA_TEST_EN_B_MASK              GENMASK(15, 14)
+        #define REG_TEST_DATA_OUT_MASK                  GENMASK(19, 16)
+        #define REG_TEST_DISABLE_ID_PULLUP              BIT(20)
+
+#define REG_TUNE                                        0x1c
+        #define REG_TUNE_TX_RES_TUNE_MASK               GENMASK(1, 0)
+        #define REG_TUNE_TX_HSXV_TUNE_MASK              GENMASK(3, 2)
+        #define REG_TUNE_TX_VREF_TUNE_MASK              GENMASK(7, 4)
+        #define REG_TUNE_TX_RISE_TUNE_MASK              GENMASK(9, 8)
+        #define REG_TUNE_TX_PREEMP_PULSE_TUNE           BIT(10)
+        #define REG_TUNE_TX_PREEMP_AMP_TUNE_MASK        GENMASK(12, 11)
+        #define REG_TUNE_TX_FSLS_TUNE_MASK              GENMASK(16, 13)
+        #define REG_TUNE_SQRX_TUNE_MASK                 GENMASK(19, 17)
+        #define REG_TUNE_OTG_TUNE                       GENMASK(22, 20)
+        #define REG_TUNE_COMP_DIS_TUNE                  GENMASK(25, 23)
+        #define REG_TUNE_HOST_DM_PULLDOWN               BIT(26)
+        #define REG_TUNE_HOST_DP_PULLDOWN               BIT(27)
+
+#define RESET_COMPLETE_TIME                             500
+#define ACA_ENABLE_COMPLETE_TIME                        50
+
+struct phy_meson8b_usb2_priv {
+        void __iomem            *regs;
+        enum usb_dr_mode        dr_mode;
+        struct clk              *clk_usb_general;
+        struct clk              *clk_usb;
+        struct reset_control    *reset;
+};
+
+static u32 phy_meson8b_usb2_read(struct phy_meson8b_usb2_priv *phy_priv,
+                                 u32 reg)
+{
+        return readl(phy_priv->regs + reg);
+}
+
+static void phy_meson8b_usb2_mask_bits(struct phy_meson8b_usb2_priv *phy_priv,
+                                       u32 reg, u32 mask, u32 value)
+{
+        u32 data;
+
+        data = phy_meson8b_usb2_read(phy_priv, reg);
+        data &= ~mask;
+        data |= (value & mask);
+
+        writel(data, phy_priv->regs + reg);
+}
+
+static int phy_meson8b_usb2_power_on(struct phy *phy)
+{
+        struct phy_meson8b_usb2_priv *priv = phy_get_drvdata(phy);
+        int ret;
+
+        if (!IS_ERR_OR_NULL(priv->reset)) {
+                ret = reset_control_reset(priv->reset);
+                if (ret) {
+                        dev_err(&phy->dev, "Failed to trigger USB reset\n");
+                        return ret;
+                }
+        }
+
+        ret = clk_prepare_enable(priv->clk_usb_general);
+        if (ret) {
+                dev_err(&phy->dev, "Failed to enable USB general clock\n");
+                return ret;
+        }
+
+        ret = clk_prepare_enable(priv->clk_usb);
+        if (ret) {
+                dev_err(&phy->dev, "Failed to enable USB DDR clock\n");
+                clk_disable_unprepare(priv->clk_usb_general);
+                return ret;
+        }
+
+        phy_meson8b_usb2_mask_bits(priv, REG_CONFIG, REG_CONFIG_CLK_32k_ALTSEL,
+                                   REG_CONFIG_CLK_32k_ALTSEL);
+
+        phy_meson8b_usb2_mask_bits(priv, REG_CTRL, REG_CTRL_REF_CLK_SEL_MASK,
+                                   0x2 << REG_CTRL_REF_CLK_SEL_SHIFT);
+
+        phy_meson8b_usb2_mask_bits(priv, REG_CTRL, REG_CTRL_FSEL_MASK,
+                                   0x5 << REG_CTRL_FSEL_SHIFT);
+
+        /* reset the PHY */
+        phy_meson8b_usb2_mask_bits(priv, REG_CTRL, REG_CTRL_POWER_ON_RESET,
+                                   REG_CTRL_POWER_ON_RESET);
+        udelay(RESET_COMPLETE_TIME);
+        phy_meson8b_usb2_mask_bits(priv, REG_CTRL, REG_CTRL_POWER_ON_RESET, 0);
+        udelay(RESET_COMPLETE_TIME);
+
+        phy_meson8b_usb2_mask_bits(priv, REG_CTRL, REG_CTRL_SOF_TOGGLE_OUT,
+                                   REG_CTRL_SOF_TOGGLE_OUT);
+
+        if (priv->dr_mode == USB_DR_MODE_HOST) {
+                phy_meson8b_usb2_mask_bits(priv, REG_ADP_BC,
+                                           REG_ADP_BC_ACA_ENABLE,
+                                           REG_ADP_BC_ACA_ENABLE);
+
+                udelay(ACA_ENABLE_COMPLETE_TIME);
+
+                if (phy_meson8b_usb2_read(priv, REG_ADP_BC) &
+                        REG_ADP_BC_ACA_PIN_FLOAT) {
+                        dev_warn(&phy->dev, "USB ID detect failed!\n");
+                        clk_disable_unprepare(priv->clk_usb);
+                        clk_disable_unprepare(priv->clk_usb_general);
+                        return -EINVAL;
+                }
+        }
+
+        return 0;
+}
+
+static int phy_meson8b_usb2_power_off(struct phy *phy)
+{
+        struct phy_meson8b_usb2_priv *priv = phy_get_drvdata(phy);
+
+        clk_disable_unprepare(priv->clk_usb);
+        clk_disable_unprepare(priv->clk_usb_general);
+
+        return 0;
+}
+
+static const struct phy_ops phy_meson8b_usb2_ops = {
+        .power_on       = phy_meson8b_usb2_power_on,
+        .power_off      = phy_meson8b_usb2_power_off,
+        .owner          = THIS_MODULE,
+};
+
+static int phy_meson8b_usb2_probe(struct platform_device *pdev)
+{
+        struct phy_meson8b_usb2_priv *priv;
+        struct resource *res;
+        struct phy *phy;
+        struct phy_provider *phy_provider;
+
+        priv = devm_kzalloc(&pdev->dev, sizeof(*priv), GFP_KERNEL);
+        if (!priv)
+                return -ENOMEM;
+
+        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+        priv->regs = devm_ioremap_resource(&pdev->dev, res);
+        if (IS_ERR(priv->regs))
+                return PTR_ERR(priv->regs);
+
+        priv->clk_usb_general = devm_clk_get(&pdev->dev, "usb_general");
+        if (IS_ERR(priv->clk_usb_general))
+                return PTR_ERR(priv->clk_usb_general);
+
+        priv->clk_usb = devm_clk_get(&pdev->dev, "usb");
+        if (IS_ERR(priv->clk_usb))
+                return PTR_ERR(priv->clk_usb);
+
+        priv->reset = devm_reset_control_get_optional_shared(&pdev->dev, NULL);
+        if (PTR_ERR(priv->reset) == -EPROBE_DEFER)
+                return PTR_ERR(priv->reset);
+
+        priv->dr_mode = of_usb_get_dr_mode_by_phy(pdev->dev.of_node, -1);
+        if (priv->dr_mode == USB_DR_MODE_UNKNOWN) {
+                dev_err(&pdev->dev,
+                        "missing dual role configuration of the controller\n");
+                return -EINVAL;
+        }
+
+        phy = devm_phy_create(&pdev->dev, NULL, &phy_meson8b_usb2_ops);
+        if (IS_ERR(phy)) {
+                dev_err(&pdev->dev, "failed to create PHY\n");
+                return PTR_ERR(phy);
+        }
+
+        phy_set_drvdata(phy, priv);
+
+        phy_provider =
+                devm_of_phy_provider_register(&pdev->dev, of_phy_simple_xlate);
+
+        return PTR_ERR_OR_ZERO(phy_provider);
+}
+
+static const struct of_device_id phy_meson8b_usb2_of_match[] = {
+        { .compatible = "amlogic,meson8b-usb2-phy", },
+        { .compatible = "amlogic,meson-gxbb-usb2-phy", },
+        { },
+};
+MODULE_DEVICE_TABLE(of, phy_meson8b_usb2_of_match);
+
+static struct platform_driver phy_meson8b_usb2_driver = {
+        .probe  = phy_meson8b_usb2_probe,
+        .driver = {
+                .name           = "phy-meson-usb2",
+                .of_match_table = phy_meson8b_usb2_of_match,
+        },
+};
+module_platform_driver(phy_meson8b_usb2_driver);
+
+MODULE_AUTHOR("Martin Blumenstingl <martin.blumenstingl@googlemail.com>");
+MODULE_DESCRIPTION("Meson8b and GXBB USB2 PHY driver");
+MODULE_LICENSE("GPL");
diff --git a/drivers/phy/phy-miphy365x.c b/drivers/phy/phy-miphy365x.c
deleted file mode 100644
index e661f3b36eaa..000000000000
--- a/drivers/phy/phy-miphy365x.c
+++ /dev/null
@@ -1,625 +0,0 @@
-/*
- * Copyright (C) 2014 STMicroelectronics – All Rights Reserved
- *
- * STMicroelectronics PHY driver MiPHY365 (for SoC STiH416).
- *
- * Authors: Alexandre Torgue <alexandre.torgue@st.com>
- *          Lee Jones <lee.jones@linaro.org>
- *
- * 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/platform_device.h>
-#include <linux/io.h>
-#include <linux/kernel.h>
-#include <linux/module.h>
-#include <linux/of.h>
-#include <linux/of_platform.h>
-#include <linux/of_address.h>
-#include <linux/clk.h>
-#include <linux/phy/phy.h>
-#include <linux/delay.h>
-#include <linux/mfd/syscon.h>
-#include <linux/regmap.h>
-
-#include <dt-bindings/phy/phy.h>
-
-#define HFC_TIMEOUT             100
-
-#define SYSCFG_SELECT_SATA_MASK BIT(1)
-#define SYSCFG_SELECT_SATA_POS  1
-
-/* MiPHY365x register definitions */
-#define RESET_REG               0x00
-#define RST_PLL                 BIT(1)
-#define RST_PLL_CAL             BIT(2)
-#define RST_RX                  BIT(4)
-#define RST_MACRO               BIT(7)
-
-#define STATUS_REG              0x01
-#define IDLL_RDY                BIT(0)
-#define PLL_RDY                 BIT(1)
-#define DES_BIT_LOCK            BIT(2)
-#define DES_SYMBOL_LOCK         BIT(3)
-
-#define CTRL_REG                0x02
-#define TERM_EN                 BIT(0)
-#define PCI_EN                  BIT(2)
-#define DES_BIT_LOCK_EN         BIT(3)
-#define TX_POL                  BIT(5)
-
-#define INT_CTRL_REG            0x03
-
-#define BOUNDARY1_REG           0x10
-#define SPDSEL_SEL              BIT(0)
-
-#define BOUNDARY3_REG           0x12
-#define TX_SPDSEL_GEN1_VAL      0
-#define TX_SPDSEL_GEN2_VAL      0x01
-#define TX_SPDSEL_GEN3_VAL      0x02
-#define RX_SPDSEL_GEN1_VAL      0
-#define RX_SPDSEL_GEN2_VAL      (0x01 << 3)
-#define RX_SPDSEL_GEN3_VAL      (0x02 << 3)
-
-#define PCIE_REG                0x16
-
-#define BUF_SEL_REG             0x20
-#define CONF_GEN_SEL_GEN3       0x02
-#define CONF_GEN_SEL_GEN2       0x01
-#define PD_VDDTFILTER           BIT(4)
-
-#define TXBUF1_REG              0x21
-#define SWING_VAL               0x04
-#define SWING_VAL_GEN1          0x03
-#define PREEMPH_VAL             (0x3 << 5)
-
-#define TXBUF2_REG              0x22
-#define TXSLEW_VAL              0x2
-#define TXSLEW_VAL_GEN1         0x4
-
-#define RXBUF_OFFSET_CTRL_REG   0x23
-
-#define RXBUF_REG               0x25
-#define SDTHRES_VAL             0x01
-#define EQ_ON3                  (0x03 << 4)
-#define EQ_ON1                  (0x01 << 4)
-
-#define COMP_CTRL1_REG          0x40
-#define START_COMSR             BIT(0)
-#define START_COMZC             BIT(1)
-#define COMSR_DONE              BIT(2)
-#define COMZC_DONE              BIT(3)
-#define COMP_AUTO_LOAD          BIT(4)
-
-#define COMP_CTRL2_REG          0x41
-#define COMP_2MHZ_RAT_GEN1      0x1e
-#define COMP_2MHZ_RAT           0xf
-
-#define COMP_CTRL3_REG          0x42
-#define COMSR_COMP_REF          0x33
-
-#define COMP_IDLL_REG           0x47
-#define COMZC_IDLL              0x2a
-
-#define PLL_CTRL1_REG           0x50
-#define PLL_START_CAL           BIT(0)
-#define BUF_EN                  BIT(2)
-#define SYNCHRO_TX              BIT(3)
-#define SSC_EN                  BIT(6)
-#define CONFIG_PLL              BIT(7)
-
-#define PLL_CTRL2_REG           0x51
-#define BYPASS_PLL_CAL          BIT(1)
-
-#define PLL_RAT_REG             0x52
-
-#define PLL_SSC_STEP_MSB_REG    0x56
-#define PLL_SSC_STEP_MSB_VAL    0x03
-
-#define PLL_SSC_STEP_LSB_REG    0x57
-#define PLL_SSC_STEP_LSB_VAL    0x63
-
-#define PLL_SSC_PER_MSB_REG     0x58
-#define PLL_SSC_PER_MSB_VAL     0
-
-#define PLL_SSC_PER_LSB_REG     0x59
-#define PLL_SSC_PER_LSB_VAL     0xf1
-
-#define IDLL_TEST_REG           0x72
-#define START_CLK_HF            BIT(6)
-
-#define DES_BITLOCK_REG         0x86
-#define BIT_LOCK_LEVEL          0x01
-#define BIT_LOCK_CNT_512        (0x03 << 5)
-
-struct miphy365x_phy {
-        struct phy *phy;
-        void __iomem *base;
-        bool pcie_tx_pol_inv;
-        bool sata_tx_pol_inv;
-        u32 sata_gen;
-        u32 ctrlreg;
-        u8 type;
-};
-
-struct miphy365x_dev {
-        struct device *dev;
-        struct regmap *regmap;
-        struct mutex miphy_mutex;
-        struct miphy365x_phy **phys;
-        int nphys;
-};
-
-/*
- * These values are represented in Device tree. They are considered to be ABI
- * and although they can be extended any existing values must not change.
- */
-enum miphy_sata_gen {
-        SATA_GEN1 = 1,
-        SATA_GEN2,
-        SATA_GEN3
-};
-
-static u8 rx_tx_spd[] = {
-        0, /* GEN0 doesn't exist. */
-        TX_SPDSEL_GEN1_VAL | RX_SPDSEL_GEN1_VAL,
-        TX_SPDSEL_GEN2_VAL | RX_SPDSEL_GEN2_VAL,
-        TX_SPDSEL_GEN3_VAL | RX_SPDSEL_GEN3_VAL
-};
-
-/*
- * This function selects the system configuration,
- * either two SATA, one SATA and one PCIe, or two PCIe lanes.
- */
-static int miphy365x_set_path(struct miphy365x_phy *miphy_phy,
-                              struct miphy365x_dev *miphy_dev)
-{
-        bool sata = (miphy_phy->type == PHY_TYPE_SATA);
-
-        return regmap_update_bits(miphy_dev->regmap,
-                                  miphy_phy->ctrlreg,
-                                  SYSCFG_SELECT_SATA_MASK,
-                                  sata << SYSCFG_SELECT_SATA_POS);
-}
-
-static int miphy365x_init_pcie_port(struct miphy365x_phy *miphy_phy,
-                                    struct miphy365x_dev *miphy_dev)
-{
-        u8 val;
-
-        if (miphy_phy->pcie_tx_pol_inv) {
-                /* Invert Tx polarity and clear pci_txdetect_pol bit */
-                val = TERM_EN | PCI_EN | DES_BIT_LOCK_EN | TX_POL;
-                writeb_relaxed(val, miphy_phy->base + CTRL_REG);
-                writeb_relaxed(0x00, miphy_phy->base + PCIE_REG);
-        }
-
-        return 0;
-}
-
-static inline int miphy365x_hfc_not_rdy(struct miphy365x_phy *miphy_phy,
-                                        struct miphy365x_dev *miphy_dev)
-{
-        unsigned long timeout = jiffies + msecs_to_jiffies(HFC_TIMEOUT);
-        u8 mask = IDLL_RDY | PLL_RDY;
-        u8 regval;
-
-        do {
-                regval = readb_relaxed(miphy_phy->base + STATUS_REG);
-                if (!(regval & mask))
-                        return 0;
-
-                usleep_range(2000, 2500);
-        } while (time_before(jiffies, timeout));
-
-        dev_err(miphy_dev->dev, "HFC ready timeout!\n");
-        return -EBUSY;
-}
-
-static inline int miphy365x_rdy(struct miphy365x_phy *miphy_phy,
-                                struct miphy365x_dev *miphy_dev)
-{
-        unsigned long timeout = jiffies + msecs_to_jiffies(HFC_TIMEOUT);
-        u8 mask = IDLL_RDY | PLL_RDY;
-        u8 regval;
-
-        do {
-                regval = readb_relaxed(miphy_phy->base + STATUS_REG);
-                if ((regval & mask) == mask)
-                        return 0;
-
-                usleep_range(2000, 2500);
-        } while (time_before(jiffies, timeout));
-
-        dev_err(miphy_dev->dev, "PHY not ready timeout!\n");
-        return -EBUSY;
-}
-
-static inline void miphy365x_set_comp(struct miphy365x_phy *miphy_phy,
-                                      struct miphy365x_dev *miphy_dev)
-{
-        u8 val, mask;
-
-        if (miphy_phy->sata_gen == SATA_GEN1)
-                writeb_relaxed(COMP_2MHZ_RAT_GEN1,
-                               miphy_phy->base + COMP_CTRL2_REG);
-        else
-                writeb_relaxed(COMP_2MHZ_RAT,
-                               miphy_phy->base + COMP_CTRL2_REG);
-
-        if (miphy_phy->sata_gen != SATA_GEN3) {
-                writeb_relaxed(COMSR_COMP_REF,
-                               miphy_phy->base + COMP_CTRL3_REG);
-                /*
-                 * Force VCO current to value defined by address 0x5A
-                 * and disable PCIe100Mref bit
-                 * Enable auto load compensation for pll_i_bias
-                 */
-                writeb_relaxed(BYPASS_PLL_CAL, miphy_phy->base + PLL_CTRL2_REG);
-                writeb_relaxed(COMZC_IDLL, miphy_phy->base + COMP_IDLL_REG);
-        }
-
-        /*
-         * Force restart compensation and enable auto load
-         * for Comzc_Tx, Comzc_Rx and Comsr on macro
-         */
-        val = START_COMSR | START_COMZC | COMP_AUTO_LOAD;
-        writeb_relaxed(val, miphy_phy->base + COMP_CTRL1_REG);
-
-        mask = COMSR_DONE | COMZC_DONE;
-        while ((readb_relaxed(miphy_phy->base + COMP_CTRL1_REG) & mask) != mask)
-                cpu_relax();
-}
-
-static inline void miphy365x_set_ssc(struct miphy365x_phy *miphy_phy,
-                                     struct miphy365x_dev *miphy_dev)
-{
-        u8 val;
-
-        /*
-         * SSC Settings. SSC will be enabled through Link
-         * SSC Ampl. = 0.4%
-         * SSC Freq = 31KHz
-         */
-        writeb_relaxed(PLL_SSC_STEP_MSB_VAL,
-                       miphy_phy->base + PLL_SSC_STEP_MSB_REG);
-        writeb_relaxed(PLL_SSC_STEP_LSB_VAL,
-                       miphy_phy->base + PLL_SSC_STEP_LSB_REG);
-        writeb_relaxed(PLL_SSC_PER_MSB_VAL,
-                       miphy_phy->base + PLL_SSC_PER_MSB_REG);
-        writeb_relaxed(PLL_SSC_PER_LSB_VAL,
-                       miphy_phy->base + PLL_SSC_PER_LSB_REG);
-
-        /* SSC Settings complete */
-        if (miphy_phy->sata_gen == SATA_GEN1) {
-                val = PLL_START_CAL | BUF_EN | SYNCHRO_TX | CONFIG_PLL;
-                writeb_relaxed(val, miphy_phy->base + PLL_CTRL1_REG);
-        } else {
-                val = SSC_EN | PLL_START_CAL | BUF_EN | SYNCHRO_TX | CONFIG_PLL;
-                writeb_relaxed(val, miphy_phy->base + PLL_CTRL1_REG);
-        }
-}
-
-static int miphy365x_init_sata_port(struct miphy365x_phy *miphy_phy,
-                                    struct miphy365x_dev *miphy_dev)
-{
-        int ret;
-        u8 val;
-
-        /*
-         * Force PHY macro reset, PLL calibration reset, PLL reset
-         * and assert Deserializer Reset
-         */
-        val = RST_PLL | RST_PLL_CAL | RST_RX | RST_MACRO;
-        writeb_relaxed(val, miphy_phy->base + RESET_REG);
-
-        if (miphy_phy->sata_tx_pol_inv)
-                writeb_relaxed(TX_POL, miphy_phy->base + CTRL_REG);
-
-        /*
-         * Force macro1 to use rx_lspd, tx_lspd
-         * Force Rx_Clock on first I-DLL phase
-         * Force Des in HP mode on macro, rx_lspd, tx_lspd for Gen2/3
-         */
-        writeb_relaxed(SPDSEL_SEL, miphy_phy->base + BOUNDARY1_REG);
-        writeb_relaxed(START_CLK_HF, miphy_phy->base + IDLL_TEST_REG);
-        val = rx_tx_spd[miphy_phy->sata_gen];
-        writeb_relaxed(val, miphy_phy->base + BOUNDARY3_REG);
-
-        /* Wait for HFC_READY = 0 */
-        ret = miphy365x_hfc_not_rdy(miphy_phy, miphy_dev);
-        if (ret)
-                return ret;
-
-        /* Compensation Recalibration */
-        miphy365x_set_comp(miphy_phy, miphy_dev);
-
-        switch (miphy_phy->sata_gen) {
-        case SATA_GEN3:
-                /*
-                 * TX Swing target 550-600mv peak to peak diff
-                 * Tx Slew target 90-110ps rising/falling time
-                 * Rx Eq ON3, Sigdet threshold SDTH1
-                 */
-                val = PD_VDDTFILTER | CONF_GEN_SEL_GEN3;
-                writeb_relaxed(val, miphy_phy->base + BUF_SEL_REG);
-                val = SWING_VAL | PREEMPH_VAL;
-                writeb_relaxed(val, miphy_phy->base + TXBUF1_REG);
-                writeb_relaxed(TXSLEW_VAL, miphy_phy->base + TXBUF2_REG);
-                writeb_relaxed(0x00, miphy_phy->base + RXBUF_OFFSET_CTRL_REG);
-                val = SDTHRES_VAL | EQ_ON3;
-                writeb_relaxed(val, miphy_phy->base + RXBUF_REG);
-                break;
-        case SATA_GEN2:
-                /*
-                 * conf gen sel=0x1 to program Gen2 banked registers
-                 * VDDT filter ON
-                 * Tx Swing target 550-600mV peak-to-peak diff
-                 * Tx Slew target 90-110 ps rising/falling time
-                 * RX Equalization ON1, Sigdet threshold SDTH1
-                 */
-                writeb_relaxed(CONF_GEN_SEL_GEN2,
-                               miphy_phy->base + BUF_SEL_REG);
-                writeb_relaxed(SWING_VAL, miphy_phy->base + TXBUF1_REG);
-                writeb_relaxed(TXSLEW_VAL, miphy_phy->base + TXBUF2_REG);
-                val = SDTHRES_VAL | EQ_ON1;
-                writeb_relaxed(val, miphy_phy->base + RXBUF_REG);
-                break;
-        case SATA_GEN1:
-                /*
-                 * conf gen sel = 00b to program Gen1 banked registers
-                 * VDDT filter ON
-                 * Tx Swing target 500-550mV peak-to-peak diff
-                 * Tx Slew target120-140 ps rising/falling time
-                 */
-                writeb_relaxed(PD_VDDTFILTER, miphy_phy->base + BUF_SEL_REG);
-                writeb_relaxed(SWING_VAL_GEN1, miphy_phy->base + TXBUF1_REG);
-                writeb_relaxed(TXSLEW_VAL_GEN1, miphy_phy->base + TXBUF2_REG);
-                break;
-        default:
-                break;
-        }
-
-        /* Force Macro1 in partial mode & release pll cal reset */
-        writeb_relaxed(RST_RX, miphy_phy->base + RESET_REG);
-        usleep_range(100, 150);
-
-        miphy365x_set_ssc(miphy_phy, miphy_dev);
-
-        /* Wait for phy_ready */
-        ret = miphy365x_rdy(miphy_phy, miphy_dev);
-        if (ret)
-                return ret;
-
-        /*
-         * Enable macro1 to use rx_lspd & tx_lspd
-         * Release Rx_Clock on first I-DLL phase on macro1
-         * Assert deserializer reset
-         * des_bit_lock_en is set
-         * bit lock detection strength
-         * Deassert deserializer reset
-         */
-        writeb_relaxed(0x00, miphy_phy->base + BOUNDARY1_REG);
-        writeb_relaxed(0x00, miphy_phy->base + IDLL_TEST_REG);
-        writeb_relaxed(RST_RX, miphy_phy->base + RESET_REG);
-        val = miphy_phy->sata_tx_pol_inv ?
-                (TX_POL | DES_BIT_LOCK_EN) : DES_BIT_LOCK_EN;
-        writeb_relaxed(val, miphy_phy->base + CTRL_REG);
-
-        val = BIT_LOCK_CNT_512 | BIT_LOCK_LEVEL;
-        writeb_relaxed(val, miphy_phy->base + DES_BITLOCK_REG);
-        writeb_relaxed(0x00, miphy_phy->base + RESET_REG);
-
-        return 0;
-}
-
-static int miphy365x_init(struct phy *phy)
-{
-        struct miphy365x_phy *miphy_phy = phy_get_drvdata(phy);
-        struct miphy365x_dev *miphy_dev = dev_get_drvdata(phy->dev.parent);
-        int ret = 0;
-
-        mutex_lock(&miphy_dev->miphy_mutex);
-
-        ret = miphy365x_set_path(miphy_phy, miphy_dev);
-        if (ret) {
-                mutex_unlock(&miphy_dev->miphy_mutex);
-                return ret;
-        }
-
-        /* Initialise Miphy for PCIe or SATA */
-        if (miphy_phy->type == PHY_TYPE_PCIE)
-                ret = miphy365x_init_pcie_port(miphy_phy, miphy_dev);
-        else
-                ret = miphy365x_init_sata_port(miphy_phy, miphy_dev);
-
-        mutex_unlock(&miphy_dev->miphy_mutex);
-
-        return ret;
-}
-
-static int miphy365x_get_addr(struct device *dev,
-                struct miphy365x_phy *miphy_phy, int index)
-{
-        struct device_node *phynode = miphy_phy->phy->dev.of_node;
-        const char *name;
-        int type = miphy_phy->type;
-        int ret;
-
-        ret = of_property_read_string_index(phynode, "reg-names", index, &name);
-        if (ret) {
-                dev_err(dev, "no reg-names property not found\n");
-                return ret;
-        }
-
-        if (!((!strncmp(name, "sata", 4) && type == PHY_TYPE_SATA) ||
-              (!strncmp(name, "pcie", 4) && type == PHY_TYPE_PCIE)))
-                return 0;
-
-        miphy_phy->base = of_iomap(phynode, index);
-        if (!miphy_phy->base) {
-                dev_err(dev, "Failed to map %s\n", phynode->full_name);
-                return -EINVAL;
-        }
-
-        return 0;
-}
-
-static struct phy *miphy365x_xlate(struct device *dev,
-                                   struct of_phandle_args *args)
-{
-        struct miphy365x_dev *miphy_dev = dev_get_drvdata(dev);
-        struct miphy365x_phy *miphy_phy = NULL;
-        struct device_node *phynode = args->np;
-        int ret, index;
-
-        if (args->args_count != 1) {
-                dev_err(dev, "Invalid number of cells in 'phy' property\n");
-                return ERR_PTR(-EINVAL);
-        }
-
-        for (index = 0; index < miphy_dev->nphys; index++)
-                if (phynode == miphy_dev->phys[index]->phy->dev.of_node) {
-                        miphy_phy = miphy_dev->phys[index];
-                        break;
-                }
-
-        if (!miphy_phy) {
-                dev_err(dev, "Failed to find appropriate phy\n");
-                return ERR_PTR(-EINVAL);
-        }
-
-        miphy_phy->type = args->args[0];
-
-        if (!(miphy_phy->type == PHY_TYPE_SATA ||
-              miphy_phy->type == PHY_TYPE_PCIE)) {
-                dev_err(dev, "Unsupported device type: %d\n", miphy_phy->type);
-                return ERR_PTR(-EINVAL);
-        }
-
-        /* Each port handles SATA and PCIE - third entry is always sysconf. */
-        for (index = 0; index < 3; index++) {
-                ret = miphy365x_get_addr(dev, miphy_phy, index);
-                if (ret < 0)
-                        return ERR_PTR(ret);
-        }
-
-        return miphy_phy->phy;
-}
-
-static const struct phy_ops miphy365x_ops = {
-        .init           = miphy365x_init,
-        .owner          = THIS_MODULE,
-};
-
-static int miphy365x_of_probe(struct device_node *phynode,
-                              struct miphy365x_phy *miphy_phy)
-{
-        of_property_read_u32(phynode, "st,sata-gen", &miphy_phy->sata_gen);
-        if (!miphy_phy->sata_gen)
-                miphy_phy->sata_gen = SATA_GEN1;
-
-        miphy_phy->pcie_tx_pol_inv =
-                of_property_read_bool(phynode, "st,pcie-tx-pol-inv");
-
-        miphy_phy->sata_tx_pol_inv =
-                of_property_read_bool(phynode, "st,sata-tx-pol-inv");
-
-        return 0;
-}
-
-static int miphy365x_probe(struct platform_device *pdev)
-{
-        struct device_node *child, *np = pdev->dev.of_node;
-        struct miphy365x_dev *miphy_dev;
-        struct phy_provider *provider;
-        struct phy *phy;
-        int ret, port = 0;
-
-        miphy_dev = devm_kzalloc(&pdev->dev, sizeof(*miphy_dev), GFP_KERNEL);
-        if (!miphy_dev)
-                return -ENOMEM;
-
-        miphy_dev->nphys = of_get_child_count(np);
-        miphy_dev->phys = devm_kcalloc(&pdev->dev, miphy_dev->nphys,
-                                       sizeof(*miphy_dev->phys), GFP_KERNEL);
-        if (!miphy_dev->phys)
-                return -ENOMEM;
-
-        miphy_dev->regmap = syscon_regmap_lookup_by_phandle(np, "st,syscfg");
-        if (IS_ERR(miphy_dev->regmap)) {
-                dev_err(miphy_dev->dev, "No syscfg phandle specified\n");
-                return PTR_ERR(miphy_dev->regmap);
-        }
-
-        miphy_dev->dev = &pdev->dev;
-
-        dev_set_drvdata(&pdev->dev, miphy_dev);
-
-        mutex_init(&miphy_dev->miphy_mutex);
-
-        for_each_child_of_node(np, child) {
-                struct miphy365x_phy *miphy_phy;
-
-                miphy_phy = devm_kzalloc(&pdev->dev, sizeof(*miphy_phy),
-                                         GFP_KERNEL);
-                if (!miphy_phy) {
-                        ret = -ENOMEM;
-                        goto put_child;
-                }
-
-                miphy_dev->phys[port] = miphy_phy;
-
-                phy = devm_phy_create(&pdev->dev, child, &miphy365x_ops);
-                if (IS_ERR(phy)) {
-                        dev_err(&pdev->dev, "failed to create PHY\n");
-                        ret = PTR_ERR(phy);
-                        goto put_child;
-                }
-
-                miphy_dev->phys[port]->phy = phy;
-
-                ret = miphy365x_of_probe(child, miphy_phy);
-                if (ret)
-                        goto put_child;
-
-                phy_set_drvdata(phy, miphy_dev->phys[port]);
-
-                port++;
-                /* sysconfig offsets are indexed from 1 */
-                ret = of_property_read_u32_index(np, "st,syscfg", port,
-                                        &miphy_phy->ctrlreg);
-                if (ret) {
-                        dev_err(&pdev->dev, "No sysconfig offset found\n");
-                        goto put_child;
-                }
-        }
-
-        provider = devm_of_phy_provider_register(&pdev->dev, miphy365x_xlate);
-        return PTR_ERR_OR_ZERO(provider);
-put_child:
-        of_node_put(child);
-        return ret;
-}
-
-static const struct of_device_id miphy365x_of_match[] = {
-        { .compatible = "st,miphy365x-phy", },
-        { },
-};
-MODULE_DEVICE_TABLE(of, miphy365x_of_match);
-
-static struct platform_driver miphy365x_driver = {
-        .probe  = miphy365x_probe,
-        .driver = {
-                .name   = "miphy365x-phy",
-                .of_match_table = miphy365x_of_match,
-        }
-};
-module_platform_driver(miphy365x_driver);
-
-MODULE_AUTHOR("Alexandre Torgue <alexandre.torgue@st.com>");
-MODULE_DESCRIPTION("STMicroelectronics miphy365x driver");
-MODULE_LICENSE("GPL v2");
diff --git a/drivers/phy/phy-rcar-gen3-usb2.c b/drivers/phy/phy-rcar-gen3-usb2.c
index 3d97eadd247d..c63da1b955c1 100644
--- a/drivers/phy/phy-rcar-gen3-usb2.c
+++ b/drivers/phy/phy-rcar-gen3-usb2.c
@@ -70,6 +70,7 @@
 #define USB2_LINECTRL1_DP_RPD           BIT(18)
 #define USB2_LINECTRL1_DMRPD_EN         BIT(17)
 #define USB2_LINECTRL1_DM_RPD           BIT(16)
+#define USB2_LINECTRL1_OPMODE_NODRV     BIT(6)
 
 /* ADPCTRL */
 #define USB2_ADPCTRL_OTGSESSVLD         BIT(20)
@@ -161,6 +162,43 @@ static void rcar_gen3_init_for_peri(struct rcar_gen3_chan *ch)
         schedule_work(&ch->work);
 }
 
+static void rcar_gen3_init_for_b_host(struct rcar_gen3_chan *ch)
+{
+        void __iomem *usb2_base = ch->base;
+        u32 val;
+
+        val = readl(usb2_base + USB2_LINECTRL1);
+        writel(val | USB2_LINECTRL1_OPMODE_NODRV, usb2_base + USB2_LINECTRL1);
+
+        rcar_gen3_set_linectrl(ch, 1, 1);
+        rcar_gen3_set_host_mode(ch, 1);
+        rcar_gen3_enable_vbus_ctrl(ch, 0);
+
+        val = readl(usb2_base + USB2_LINECTRL1);
+        writel(val & ~USB2_LINECTRL1_OPMODE_NODRV, usb2_base + USB2_LINECTRL1);
+}
+
+static void rcar_gen3_init_for_a_peri(struct rcar_gen3_chan *ch)
+{
+        rcar_gen3_set_linectrl(ch, 0, 1);
+        rcar_gen3_set_host_mode(ch, 0);
+        rcar_gen3_enable_vbus_ctrl(ch, 1);
+}
+
+static void rcar_gen3_init_from_a_peri_to_a_host(struct rcar_gen3_chan *ch)
+{
+        void __iomem *usb2_base = ch->base;
+        u32 val;
+
+        val = readl(usb2_base + USB2_OBINTEN);
+        writel(val & ~USB2_OBINT_BITS, usb2_base + USB2_OBINTEN);
+
+        rcar_gen3_enable_vbus_ctrl(ch, 0);
+        rcar_gen3_init_for_host(ch);
+
+        writel(val | USB2_OBINT_BITS, usb2_base + USB2_OBINTEN);
+}
+
 static bool rcar_gen3_check_id(struct rcar_gen3_chan *ch)
 {
         return !!(readl(ch->base + USB2_ADPCTRL) & USB2_ADPCTRL_IDDIG);
@@ -174,6 +212,65 @@ static void rcar_gen3_device_recognition(struct rcar_gen3_chan *ch)
                 rcar_gen3_init_for_peri(ch);
 }
 
+static bool rcar_gen3_is_host(struct rcar_gen3_chan *ch)
+{
+        return !(readl(ch->base + USB2_COMMCTRL) & USB2_COMMCTRL_OTG_PERI);
+}
+
+static ssize_t role_store(struct device *dev, struct device_attribute *attr,
+                          const char *buf, size_t count)
+{
+        struct rcar_gen3_chan *ch = dev_get_drvdata(dev);
+        bool is_b_device, is_host, new_mode_is_host;
+
+        if (!ch->has_otg || !ch->phy->init_count)
+                return -EIO;
+
+        /*
+         * is_b_device: true is B-Device. false is A-Device.
+         * If {new_mode_}is_host: true is Host mode. false is Peripheral mode.
+         */
+        is_b_device = rcar_gen3_check_id(ch);
+        is_host = rcar_gen3_is_host(ch);
+        if (!strncmp(buf, "host", strlen("host")))
+                new_mode_is_host = true;
+        else if (!strncmp(buf, "peripheral", strlen("peripheral")))
+                new_mode_is_host = false;
+        else
+                return -EINVAL;
+
+        /* If current and new mode is the same, this returns the error */
+        if (is_host == new_mode_is_host)
+                return -EINVAL;
+
+        if (new_mode_is_host) {         /* And is_host must be false */
+                if (!is_b_device)       /* A-Peripheral */
+                        rcar_gen3_init_from_a_peri_to_a_host(ch);
+                else                    /* B-Peripheral */
+                        rcar_gen3_init_for_b_host(ch);
+        } else {                        /* And is_host must be true */
+                if (!is_b_device)       /* A-Host */
+                        rcar_gen3_init_for_a_peri(ch);
+                else                    /* B-Host */
+                        rcar_gen3_init_for_peri(ch);
+        }
+
+        return count;
+}
+
+static ssize_t role_show(struct device *dev, struct device_attribute *attr,
+                         char *buf)
+{
+        struct rcar_gen3_chan *ch = dev_get_drvdata(dev);
+
+        if (!ch->has_otg || !ch->phy->init_count)
+                return -EIO;
+
+        return sprintf(buf, "%s\n", rcar_gen3_is_host(ch) ? "host" :
+                                                            "peripheral");
+}
+static DEVICE_ATTR_RW(role);
+
 static void rcar_gen3_init_otg(struct rcar_gen3_chan *ch)
 {
         void __iomem *usb2_base = ch->base;
@@ -351,21 +448,40 @@ static int rcar_gen3_phy_usb2_probe(struct platform_device *pdev)
                 channel->vbus = NULL;
         }
 
+        platform_set_drvdata(pdev, channel);
         phy_set_drvdata(channel->phy, channel);
 
         provider = devm_of_phy_provider_register(dev, of_phy_simple_xlate);
-        if (IS_ERR(provider))
+        if (IS_ERR(provider)) {
                 dev_err(dev, "Failed to register PHY provider\n");
+        } else if (channel->has_otg) {
+                int ret;
+
+                ret = device_create_file(dev, &dev_attr_role);
+                if (ret < 0)
+                        return ret;
+        }
 
         return PTR_ERR_OR_ZERO(provider);
 }
 
+static int rcar_gen3_phy_usb2_remove(struct platform_device *pdev)
+{
+        struct rcar_gen3_chan *channel = platform_get_drvdata(pdev);
+
+        if (channel->has_otg)
+                device_remove_file(&pdev->dev, &dev_attr_role);
+
+        return 0;
+};
+
 static struct platform_driver rcar_gen3_phy_usb2_driver = {
         .driver = {
                 .name           = "phy_rcar_gen3_usb2",
                 .of_match_table = rcar_gen3_phy_usb2_match_table,
         },
         .probe  = rcar_gen3_phy_usb2_probe,
+        .remove = rcar_gen3_phy_usb2_remove,
 };
 module_platform_driver(rcar_gen3_phy_usb2_driver);
 
diff --git a/drivers/phy/phy-rockchip-emmc.c b/drivers/phy/phy-rockchip-emmc.c
index fd57345ffed2..f1b24f18e9b2 100644
--- a/drivers/phy/phy-rockchip-emmc.c
+++ b/drivers/phy/phy-rockchip-emmc.c
@@ -132,7 +132,7 @@ static int rockchip_emmc_phy_power(struct phy *phy, bool on_off)
                 default:
                         ideal_rate = 200000000;
                         break;
-                };
+                }
 
                 diff = (rate > ideal_rate) ?
                         rate - ideal_rate : ideal_rate - rate;
diff --git a/drivers/phy/phy-rockchip-inno-usb2.c b/drivers/phy/phy-rockchip-inno-usb2.c
index ac203107b071..2f99ec95079c 100644
--- a/drivers/phy/phy-rockchip-inno-usb2.c
+++ b/drivers/phy/phy-rockchip-inno-usb2.c
@@ -17,6 +17,7 @@
 #include <linux/clk.h>
 #include <linux/clk-provider.h>
 #include <linux/delay.h>
+#include <linux/extcon.h>
 #include <linux/interrupt.h>
 #include <linux/io.h>
 #include <linux/gpio/consumer.h>
@@ -30,11 +31,15 @@
 #include <linux/of_platform.h>
 #include <linux/phy/phy.h>
 #include <linux/platform_device.h>
+#include <linux/power_supply.h>
 #include <linux/regmap.h>
 #include <linux/mfd/syscon.h>
+#include <linux/usb/of.h>
+#include <linux/usb/otg.h>
 
 #define BIT_WRITEABLE_SHIFT     16
-#define SCHEDULE_DELAY  (60 * HZ)
+#define SCHEDULE_DELAY          (60 * HZ)
+#define OTG_SCHEDULE_DELAY      (2 * HZ)
 
 enum rockchip_usb2phy_port_id {
         USB2PHY_PORT_OTG,
@@ -49,6 +54,37 @@ enum rockchip_usb2phy_host_state {
         PHY_STATE_FS_LS_ONLINE  = 4,
 };
 
+/**
+ * Different states involved in USB charger detection.
+ * USB_CHG_STATE_UNDEFINED      USB charger is not connected or detection
+ *                              process is not yet started.
+ * USB_CHG_STATE_WAIT_FOR_DCD   Waiting for Data pins contact.
+ * USB_CHG_STATE_DCD_DONE       Data pin contact is detected.
+ * USB_CHG_STATE_PRIMARY_DONE   Primary detection is completed (Detects
+ *                              between SDP and DCP/CDP).
+ * USB_CHG_STATE_SECONDARY_DONE Secondary detection is completed (Detects
+ *                              between DCP and CDP).
+ * USB_CHG_STATE_DETECTED       USB charger type is determined.
+ */
+enum usb_chg_state {
+        USB_CHG_STATE_UNDEFINED = 0,
+        USB_CHG_STATE_WAIT_FOR_DCD,
+        USB_CHG_STATE_DCD_DONE,
+        USB_CHG_STATE_PRIMARY_DONE,
+        USB_CHG_STATE_SECONDARY_DONE,
+        USB_CHG_STATE_DETECTED,
+};
+
+static const unsigned int rockchip_usb2phy_extcon_cable[] = {
+        EXTCON_USB,
+        EXTCON_USB_HOST,
+        EXTCON_CHG_USB_SDP,
+        EXTCON_CHG_USB_CDP,
+        EXTCON_CHG_USB_DCP,
+        EXTCON_CHG_USB_SLOW,
+        EXTCON_NONE,
+};
+
 struct usb2phy_reg {
         unsigned int    offset;
         unsigned int    bitend;
@@ -58,19 +94,55 @@ struct usb2phy_reg {
 };
 
 /**
+ * struct rockchip_chg_det_reg: usb charger detect registers
+ * @cp_det: charging port detected successfully.
+ * @dcp_det: dedicated charging port detected successfully.
+ * @dp_det: assert data pin connect successfully.
+ * @idm_sink_en: open dm sink curren.
+ * @idp_sink_en: open dp sink current.
+ * @idp_src_en: open dm source current.
+ * @rdm_pdwn_en: open dm pull down resistor.
+ * @vdm_src_en: open dm voltage source.
+ * @vdp_src_en: open dp voltage source.
+ * @opmode: utmi operational mode.
+ */
+struct rockchip_chg_det_reg {
+        struct usb2phy_reg      cp_det;
+        struct usb2phy_reg      dcp_det;
+        struct usb2phy_reg      dp_det;
+        struct usb2phy_reg      idm_sink_en;
+        struct usb2phy_reg      idp_sink_en;
+        struct usb2phy_reg      idp_src_en;
+        struct usb2phy_reg      rdm_pdwn_en;
+        struct usb2phy_reg      vdm_src_en;
+        struct usb2phy_reg      vdp_src_en;
+        struct usb2phy_reg      opmode;
+};
+
+/**
  * struct rockchip_usb2phy_port_cfg: usb-phy port configuration.
  * @phy_sus: phy suspend register.
+ * @bvalid_det_en: vbus valid rise detection enable register.
+ * @bvalid_det_st: vbus valid rise detection status register.
+ * @bvalid_det_clr: vbus valid rise detection clear register.
  * @ls_det_en: linestate detection enable register.
  * @ls_det_st: linestate detection state register.
  * @ls_det_clr: linestate detection clear register.
+ * @utmi_avalid: utmi vbus avalid status register.
+ * @utmi_bvalid: utmi vbus bvalid status register.
  * @utmi_ls: utmi linestate state register.
  * @utmi_hstdet: utmi host disconnect register.
  */
 struct rockchip_usb2phy_port_cfg {
         struct usb2phy_reg      phy_sus;
+        struct usb2phy_reg      bvalid_det_en;
+        struct usb2phy_reg      bvalid_det_st;
+        struct usb2phy_reg      bvalid_det_clr;
         struct usb2phy_reg      ls_det_en;
         struct usb2phy_reg      ls_det_st;
         struct usb2phy_reg      ls_det_clr;
+        struct usb2phy_reg      utmi_avalid;
+        struct usb2phy_reg      utmi_bvalid;
         struct usb2phy_reg      utmi_ls;
         struct usb2phy_reg      utmi_hstdet;
 };
@@ -80,31 +152,51 @@ struct rockchip_usb2phy_port_cfg {
  * @reg: the address offset of grf for usb-phy config.
  * @num_ports: specify how many ports that the phy has.
  * @clkout_ctl: keep on/turn off output clk of phy.
+ * @chg_det: charger detection registers.
  */
 struct rockchip_usb2phy_cfg {
         unsigned int    reg;
         unsigned int    num_ports;
         struct usb2phy_reg      clkout_ctl;
         const struct rockchip_usb2phy_port_cfg  port_cfgs[USB2PHY_NUM_PORTS];
+        const struct rockchip_chg_det_reg       chg_det;
 };
 
 /**
  * struct rockchip_usb2phy_port: usb-phy port data.
  * @port_id: flag for otg port or host port.
  * @suspended: phy suspended flag.
+ * @utmi_avalid: utmi avalid status usage flag.
+ *      true    - use avalid to get vbus status
+ *      flase   - use bvalid to get vbus status
+ * @vbus_attached: otg device vbus status.
+ * @bvalid_irq: IRQ number assigned for vbus valid rise detection.
  * @ls_irq: IRQ number assigned for linestate detection.
  * @mutex: for register updating in sm_work.
- * @sm_work: OTG state machine work.
+ * @chg_work: charge detect work.
+ * @otg_sm_work: OTG state machine work.
+ * @sm_work: HOST state machine work.
  * @phy_cfg: port register configuration, assigned by driver data.
+ * @event_nb: hold event notification callback.
+ * @state: define OTG enumeration states before device reset.
+ * @mode: the dr_mode of the controller.
  */
 struct rockchip_usb2phy_port {
         struct phy      *phy;
         unsigned int    port_id;
         bool            suspended;
+        bool            utmi_avalid;
+        bool            vbus_attached;
+        int             bvalid_irq;
         int             ls_irq;
         struct mutex    mutex;
+        struct          delayed_work chg_work;
+        struct          delayed_work otg_sm_work;
         struct          delayed_work sm_work;
         const struct    rockchip_usb2phy_port_cfg *port_cfg;
+        struct notifier_block   event_nb;
+        enum usb_otg_state      state;
+        enum usb_dr_mode        mode;
 };
 
 /**
@@ -113,6 +205,11 @@ struct rockchip_usb2phy_port {
  * @clk: clock struct of phy input clk.
  * @clk480m: clock struct of phy output clk.
  * @clk_hw: clock struct of phy output clk management.
+ * @chg_state: states involved in USB charger detection.
+ * @chg_type: USB charger types.
+ * @dcd_retries: The retry count used to track Data contact
+ *               detection process.
+ * @edev: extcon device for notification registration
  * @phy_cfg: phy register configuration, assigned by driver data.
  * @ports: phy port instance.
  */
@@ -122,6 +219,10 @@ struct rockchip_usb2phy {
         struct clk      *clk;
         struct clk      *clk480m;
         struct clk_hw   clk480m_hw;
+        enum usb_chg_state      chg_state;
+        enum power_supply_type  chg_type;
+        u8                      dcd_retries;
+        struct extcon_dev       *edev;
         const struct rockchip_usb2phy_cfg       *phy_cfg;
         struct rockchip_usb2phy_port    ports[USB2PHY_NUM_PORTS];
 };
@@ -153,7 +254,7 @@ static inline bool property_enabled(struct rockchip_usb2phy *rphy,
         return tmp == reg->enable;
 }
 
-static int rockchip_usb2phy_clk480m_enable(struct clk_hw *hw)
+static int rockchip_usb2phy_clk480m_prepare(struct clk_hw *hw)
 {
         struct rockchip_usb2phy *rphy =
                 container_of(hw, struct rockchip_usb2phy, clk480m_hw);
@@ -165,14 +266,14 @@ static int rockchip_usb2phy_clk480m_enable(struct clk_hw *hw)
                 if (ret)
                         return ret;
 
-                /* waitting for the clk become stable */
-                mdelay(1);
+                /* waiting for the clk become stable */
+                usleep_range(1200, 1300);
         }
 
         return 0;
 }
 
-static void rockchip_usb2phy_clk480m_disable(struct clk_hw *hw)
+static void rockchip_usb2phy_clk480m_unprepare(struct clk_hw *hw)
 {
         struct rockchip_usb2phy *rphy =
                 container_of(hw, struct rockchip_usb2phy, clk480m_hw);
@@ -181,7 +282,7 @@ static void rockchip_usb2phy_clk480m_disable(struct clk_hw *hw)
         property_enable(rphy, &rphy->phy_cfg->clkout_ctl, false);
 }
 
-static int rockchip_usb2phy_clk480m_enabled(struct clk_hw *hw)
+static int rockchip_usb2phy_clk480m_prepared(struct clk_hw *hw)
 {
         struct rockchip_usb2phy *rphy =
                 container_of(hw, struct rockchip_usb2phy, clk480m_hw);
@@ -197,9 +298,9 @@ rockchip_usb2phy_clk480m_recalc_rate(struct clk_hw *hw,
 }
 
 static const struct clk_ops rockchip_usb2phy_clkout_ops = {
-        .enable = rockchip_usb2phy_clk480m_enable,
-        .disable = rockchip_usb2phy_clk480m_disable,
-        .is_enabled = rockchip_usb2phy_clk480m_enabled,
+        .prepare = rockchip_usb2phy_clk480m_prepare,
+        .unprepare = rockchip_usb2phy_clk480m_unprepare,
+        .is_prepared = rockchip_usb2phy_clk480m_prepared,
         .recalc_rate = rockchip_usb2phy_clk480m_recalc_rate,
 };
 
@@ -263,33 +364,84 @@ err_ret:
         return ret;
 }
 
-static int rockchip_usb2phy_init(struct phy *phy)
+static int rockchip_usb2phy_extcon_register(struct rockchip_usb2phy *rphy)
 {
-        struct rockchip_usb2phy_port *rport = phy_get_drvdata(phy);
-        struct rockchip_usb2phy *rphy = dev_get_drvdata(phy->dev.parent);
         int ret;
+        struct device_node *node = rphy->dev->of_node;
+        struct extcon_dev *edev;
+
+        if (of_property_read_bool(node, "extcon")) {
+                edev = extcon_get_edev_by_phandle(rphy->dev, 0);
+                if (IS_ERR(edev)) {
+                        if (PTR_ERR(edev) != -EPROBE_DEFER)
+                                dev_err(rphy->dev, "Invalid or missing extcon\n");
+                        return PTR_ERR(edev);
+                }
+        } else {
+                /* Initialize extcon device */
+                edev = devm_extcon_dev_allocate(rphy->dev,
+                                                rockchip_usb2phy_extcon_cable);
 
-        if (rport->port_id == USB2PHY_PORT_HOST) {
-                /* clear linestate and enable linestate detect irq */
-                mutex_lock(&rport->mutex);
+                if (IS_ERR(edev))
+                        return -ENOMEM;
 
-                ret = property_enable(rphy, &rport->port_cfg->ls_det_clr, true);
+                ret = devm_extcon_dev_register(rphy->dev, edev);
                 if (ret) {
-                        mutex_unlock(&rport->mutex);
+                        dev_err(rphy->dev, "failed to register extcon device\n");
                         return ret;
                 }
+        }
 
-                ret = property_enable(rphy, &rport->port_cfg->ls_det_en, true);
-                if (ret) {
-                        mutex_unlock(&rport->mutex);
-                        return ret;
+        rphy->edev = edev;
+
+        return 0;
+}
+
+static int rockchip_usb2phy_init(struct phy *phy)
+{
+        struct rockchip_usb2phy_port *rport = phy_get_drvdata(phy);
+        struct rockchip_usb2phy *rphy = dev_get_drvdata(phy->dev.parent);
+        int ret = 0;
+
+        mutex_lock(&rport->mutex);
+
+        if (rport->port_id == USB2PHY_PORT_OTG) {
+                if (rport->mode != USB_DR_MODE_HOST) {
+                        /* clear bvalid status and enable bvalid detect irq */
+                        ret = property_enable(rphy,
+                                              &rport->port_cfg->bvalid_det_clr,
+                                              true);
+                        if (ret)
+                                goto out;
+
+                        ret = property_enable(rphy,
+                                              &rport->port_cfg->bvalid_det_en,
+                                              true);
+                        if (ret)
+                                goto out;
+
+                        schedule_delayed_work(&rport->otg_sm_work,
+                                              OTG_SCHEDULE_DELAY);
+                } else {
+                        /* If OTG works in host only mode, do nothing. */
+                        dev_dbg(&rport->phy->dev, "mode %d\n", rport->mode);
                 }
+        } else if (rport->port_id == USB2PHY_PORT_HOST) {
+                /* clear linestate and enable linestate detect irq */
+                ret = property_enable(rphy, &rport->port_cfg->ls_det_clr, true);
+                if (ret)
+                        goto out;
+
+                ret = property_enable(rphy, &rport->port_cfg->ls_det_en, true);
+                if (ret)
+                        goto out;
 
-                mutex_unlock(&rport->mutex);
                 schedule_delayed_work(&rport->sm_work, SCHEDULE_DELAY);
         }
 
-        return 0;
+out:
+        mutex_unlock(&rport->mutex);
+        return ret;
 }
 
 static int rockchip_usb2phy_power_on(struct phy *phy)
@@ -340,7 +492,11 @@ static int rockchip_usb2phy_exit(struct phy *phy)
 {
         struct rockchip_usb2phy_port *rport = phy_get_drvdata(phy);
 
-        if (rport->port_id == USB2PHY_PORT_HOST)
+        if (rport->port_id == USB2PHY_PORT_OTG &&
+            rport->mode != USB_DR_MODE_HOST) {
+                cancel_delayed_work_sync(&rport->otg_sm_work);
+                cancel_delayed_work_sync(&rport->chg_work);
+        } else if (rport->port_id == USB2PHY_PORT_HOST)
                 cancel_delayed_work_sync(&rport->sm_work);
 
         return 0;
@@ -354,6 +510,249 @@ static const struct phy_ops rockchip_usb2phy_ops = {
         .owner          = THIS_MODULE,
 };
 
+static void rockchip_usb2phy_otg_sm_work(struct work_struct *work)
+{
+        struct rockchip_usb2phy_port *rport =
+                container_of(work, struct rockchip_usb2phy_port,
+                             otg_sm_work.work);
+        struct rockchip_usb2phy *rphy = dev_get_drvdata(rport->phy->dev.parent);
+        static unsigned int cable;
+        unsigned long delay;
+        bool vbus_attach, sch_work, notify_charger;
+
+        if (rport->utmi_avalid)
+                vbus_attach =
+                        property_enabled(rphy, &rport->port_cfg->utmi_avalid);
+        else
+                vbus_attach =
+                        property_enabled(rphy, &rport->port_cfg->utmi_bvalid);
+
+        sch_work = false;
+        notify_charger = false;
+        delay = OTG_SCHEDULE_DELAY;
+        dev_dbg(&rport->phy->dev, "%s otg sm work\n",
+                usb_otg_state_string(rport->state));
+
+        switch (rport->state) {
+        case OTG_STATE_UNDEFINED:
+                rport->state = OTG_STATE_B_IDLE;
+                if (!vbus_attach)
+                        rockchip_usb2phy_power_off(rport->phy);
+                /* fall through */
+        case OTG_STATE_B_IDLE:
+                if (extcon_get_cable_state_(rphy->edev, EXTCON_USB_HOST) > 0) {
+                        dev_dbg(&rport->phy->dev, "usb otg host connect\n");
+                        rport->state = OTG_STATE_A_HOST;
+                        rockchip_usb2phy_power_on(rport->phy);
+                        return;
+                } else if (vbus_attach) {
+                        dev_dbg(&rport->phy->dev, "vbus_attach\n");
+                        switch (rphy->chg_state) {
+                        case USB_CHG_STATE_UNDEFINED:
+                                schedule_delayed_work(&rport->chg_work, 0);
+                                return;
+                        case USB_CHG_STATE_DETECTED:
+                                switch (rphy->chg_type) {
+                                case POWER_SUPPLY_TYPE_USB:
+                                        dev_dbg(&rport->phy->dev,
+                                                "sdp cable is connecetd\n");
+                                        rockchip_usb2phy_power_on(rport->phy);
+                                        rport->state = OTG_STATE_B_PERIPHERAL;
+                                        notify_charger = true;
+                                        sch_work = true;
+                                        cable = EXTCON_CHG_USB_SDP;
+                                        break;
+                                case POWER_SUPPLY_TYPE_USB_DCP:
+                                        dev_dbg(&rport->phy->dev,
+                                                "dcp cable is connecetd\n");
+                                        rockchip_usb2phy_power_off(rport->phy);
+                                        notify_charger = true;
+                                        sch_work = true;
+                                        cable = EXTCON_CHG_USB_DCP;
+                                        break;
+                                case POWER_SUPPLY_TYPE_USB_CDP:
+                                        dev_dbg(&rport->phy->dev,
+                                                "cdp cable is connecetd\n");
+                                        rockchip_usb2phy_power_on(rport->phy);
+                                        rport->state = OTG_STATE_B_PERIPHERAL;
+                                        notify_charger = true;
+                                        sch_work = true;
+                                        cable = EXTCON_CHG_USB_CDP;
+                                        break;
+                                default:
+                                        break;
+                                }
+                                break;
+                        default:
+                                break;
+                        }
+                } else {
+                        notify_charger = true;
+                        rphy->chg_state = USB_CHG_STATE_UNDEFINED;
+                        rphy->chg_type = POWER_SUPPLY_TYPE_UNKNOWN;
+                }
+
+                if (rport->vbus_attached != vbus_attach) {
+                        rport->vbus_attached = vbus_attach;
+
+                        if (notify_charger && rphy->edev)
+                                extcon_set_cable_state_(rphy->edev,
+                                                        cable, vbus_attach);
+                }
+                break;
+        case OTG_STATE_B_PERIPHERAL:
+                if (!vbus_attach) {
+                        dev_dbg(&rport->phy->dev, "usb disconnect\n");
+                        rphy->chg_state = USB_CHG_STATE_UNDEFINED;
+                        rphy->chg_type = POWER_SUPPLY_TYPE_UNKNOWN;
+                        rport->state = OTG_STATE_B_IDLE;
+                        delay = 0;
+                        rockchip_usb2phy_power_off(rport->phy);
+                }
+                sch_work = true;
+                break;
+        case OTG_STATE_A_HOST:
+                if (extcon_get_cable_state_(rphy->edev, EXTCON_USB_HOST) == 0) {
+                        dev_dbg(&rport->phy->dev, "usb otg host disconnect\n");
+                        rport->state = OTG_STATE_B_IDLE;
+                        rockchip_usb2phy_power_off(rport->phy);
+                }
+                break;
+        default:
+                break;
+        }
+
+        if (sch_work)
+                schedule_delayed_work(&rport->otg_sm_work, delay);
+}
+
+static const char *chg_to_string(enum power_supply_type chg_type)
+{
+        switch (chg_type) {
+        case POWER_SUPPLY_TYPE_USB:
+                return "USB_SDP_CHARGER";
+        case POWER_SUPPLY_TYPE_USB_DCP:
+                return "USB_DCP_CHARGER";
+        case POWER_SUPPLY_TYPE_USB_CDP:
+                return "USB_CDP_CHARGER";
+        default:
+                return "INVALID_CHARGER";
+        }
+}
+
+static void rockchip_chg_enable_dcd(struct rockchip_usb2phy *rphy,
+                                    bool en)
+{
+        property_enable(rphy, &rphy->phy_cfg->chg_det.rdm_pdwn_en, en);
+        property_enable(rphy, &rphy->phy_cfg->chg_det.idp_src_en, en);
+}
+
+static void rockchip_chg_enable_primary_det(struct rockchip_usb2phy *rphy,
+                                            bool en)
+{
+        property_enable(rphy, &rphy->phy_cfg->chg_det.vdp_src_en, en);
+        property_enable(rphy, &rphy->phy_cfg->chg_det.idm_sink_en, en);
+}
+
+static void rockchip_chg_enable_secondary_det(struct rockchip_usb2phy *rphy,
+                                              bool en)
+{
+        property_enable(rphy, &rphy->phy_cfg->chg_det.vdm_src_en, en);
+        property_enable(rphy, &rphy->phy_cfg->chg_det.idp_sink_en, en);
+}
+
+#define CHG_DCD_POLL_TIME       (100 * HZ / 1000)
+#define CHG_DCD_MAX_RETRIES     6
+#define CHG_PRIMARY_DET_TIME    (40 * HZ / 1000)
+#define CHG_SECONDARY_DET_TIME  (40 * HZ / 1000)
+static void rockchip_chg_detect_work(struct work_struct *work)
+{
+        struct rockchip_usb2phy_port *rport =
+                container_of(work, struct rockchip_usb2phy_port, chg_work.work);
+        struct rockchip_usb2phy *rphy = dev_get_drvdata(rport->phy->dev.parent);
+        bool is_dcd, tmout, vout;
+        unsigned long delay;
+
+        dev_dbg(&rport->phy->dev, "chg detection work state = %d\n",
+                rphy->chg_state);
+        switch (rphy->chg_state) {
+        case USB_CHG_STATE_UNDEFINED:
+                if (!rport->suspended)
+                        rockchip_usb2phy_power_off(rport->phy);
+                /* put the controller in non-driving mode */
+                property_enable(rphy, &rphy->phy_cfg->chg_det.opmode, false);
+                /* Start DCD processing stage 1 */
+                rockchip_chg_enable_dcd(rphy, true);
+                rphy->chg_state = USB_CHG_STATE_WAIT_FOR_DCD;
+                rphy->dcd_retries = 0;
+                delay = CHG_DCD_POLL_TIME;
+                break;
+        case USB_CHG_STATE_WAIT_FOR_DCD:
+                /* get data contact detection status */
+                is_dcd = property_enabled(rphy, &rphy->phy_cfg->chg_det.dp_det);
+                tmout = ++rphy->dcd_retries == CHG_DCD_MAX_RETRIES;
+                /* stage 2 */
+                if (is_dcd || tmout) {
+                        /* stage 4 */
+                        /* Turn off DCD circuitry */
+                        rockchip_chg_enable_dcd(rphy, false);
+                        /* Voltage Source on DP, Probe on DM */
+                        rockchip_chg_enable_primary_det(rphy, true);
+                        delay = CHG_PRIMARY_DET_TIME;
+                        rphy->chg_state = USB_CHG_STATE_DCD_DONE;
+                } else {
+                        /* stage 3 */
+                        delay = CHG_DCD_POLL_TIME;
+                }
+                break;
+        case USB_CHG_STATE_DCD_DONE:
+                vout = property_enabled(rphy, &rphy->phy_cfg->chg_det.cp_det);
+                rockchip_chg_enable_primary_det(rphy, false);
+                if (vout) {
+                        /* Voltage Source on DM, Probe on DP  */
+                        rockchip_chg_enable_secondary_det(rphy, true);
+                        delay = CHG_SECONDARY_DET_TIME;
+                        rphy->chg_state = USB_CHG_STATE_PRIMARY_DONE;
+                } else {
+                        if (rphy->dcd_retries == CHG_DCD_MAX_RETRIES) {
+                                /* floating charger found */
+                                rphy->chg_type = POWER_SUPPLY_TYPE_USB_DCP;
+                                rphy->chg_state = USB_CHG_STATE_DETECTED;
+                                delay = 0;
+                        } else {
+                                rphy->chg_type = POWER_SUPPLY_TYPE_USB;
+                                rphy->chg_state = USB_CHG_STATE_DETECTED;
+                                delay = 0;
+                        }
+                }
+                break;
+        case USB_CHG_STATE_PRIMARY_DONE:
+                vout = property_enabled(rphy, &rphy->phy_cfg->chg_det.dcp_det);
+                /* Turn off voltage source */
+                rockchip_chg_enable_secondary_det(rphy, false);
+                if (vout)
+                        rphy->chg_type = POWER_SUPPLY_TYPE_USB_DCP;
+                else
+                        rphy->chg_type = POWER_SUPPLY_TYPE_USB_CDP;
+                /* fall through */
+        case USB_CHG_STATE_SECONDARY_DONE:
+                rphy->chg_state = USB_CHG_STATE_DETECTED;
+                delay = 0;
+                /* fall through */
+        case USB_CHG_STATE_DETECTED:
+                /* put the controller in normal mode */
+                property_enable(rphy, &rphy->phy_cfg->chg_det.opmode, true);
+                rockchip_usb2phy_otg_sm_work(&rport->otg_sm_work.work);
+                dev_info(&rport->phy->dev, "charger = %s\n",
+                         chg_to_string(rphy->chg_type));
+                return;
+        default:
+                return;
+        }
+
+        schedule_delayed_work(&rport->chg_work, delay);
+}
+
 /*
  * The function manage host-phy port state and suspend/resume phy port
  * to save power.
@@ -485,6 +884,26 @@ static irqreturn_t rockchip_usb2phy_linestate_irq(int irq, void *data)
         return IRQ_HANDLED;
 }
 
+static irqreturn_t rockchip_usb2phy_bvalid_irq(int irq, void *data)
+{
+        struct rockchip_usb2phy_port *rport = data;
+        struct rockchip_usb2phy *rphy = dev_get_drvdata(rport->phy->dev.parent);
+
+        if (!property_enabled(rphy, &rport->port_cfg->bvalid_det_st))
+                return IRQ_NONE;
+
+        mutex_lock(&rport->mutex);
+
+        /* clear bvalid detect irq pending status */
+        property_enable(rphy, &rport->port_cfg->bvalid_det_clr, true);
+
+        mutex_unlock(&rport->mutex);
+
+        rockchip_usb2phy_otg_sm_work(&rport->otg_sm_work.work);
+
+        return IRQ_HANDLED;
+}
+
 static int rockchip_usb2phy_host_port_init(struct rockchip_usb2phy *rphy,
                                            struct rockchip_usb2phy_port *rport,
                                            struct device_node *child_np)
@@ -509,13 +928,86 @@ static int rockchip_usb2phy_host_port_init(struct rockchip_usb2phy *rphy,
                                         IRQF_ONESHOT,
                                         "rockchip_usb2phy", rport);
         if (ret) {
-                dev_err(rphy->dev, "failed to request irq handle\n");
+                dev_err(rphy->dev, "failed to request linestate irq handle\n");
                 return ret;
         }
 
         return 0;
 }
 
+static int rockchip_otg_event(struct notifier_block *nb,
+                              unsigned long event, void *ptr)
+{
+        struct rockchip_usb2phy_port *rport =
+                container_of(nb, struct rockchip_usb2phy_port, event_nb);
+
+        schedule_delayed_work(&rport->otg_sm_work, OTG_SCHEDULE_DELAY);
+
+        return NOTIFY_DONE;
+}
+
+static int rockchip_usb2phy_otg_port_init(struct rockchip_usb2phy *rphy,
+                                          struct rockchip_usb2phy_port *rport,
+                                          struct device_node *child_np)
+{
+        int ret;
+
+        rport->port_id = USB2PHY_PORT_OTG;
+        rport->port_cfg = &rphy->phy_cfg->port_cfgs[USB2PHY_PORT_OTG];
+        rport->state = OTG_STATE_UNDEFINED;
+
+        /*
+         * set suspended flag to true, but actually don't
+         * put phy in suspend mode, it aims to enable usb
+         * phy and clock in power_on() called by usb controller
+         * driver during probe.
+         */
+        rport->suspended = true;
+        rport->vbus_attached = false;
+
+        mutex_init(&rport->mutex);
+
+        rport->mode = of_usb_get_dr_mode_by_phy(child_np, -1);
+        if (rport->mode == USB_DR_MODE_HOST) {
+                ret = 0;
+                goto out;
+        }
+
+        INIT_DELAYED_WORK(&rport->chg_work, rockchip_chg_detect_work);
+        INIT_DELAYED_WORK(&rport->otg_sm_work, rockchip_usb2phy_otg_sm_work);
+
+        rport->utmi_avalid =
+                of_property_read_bool(child_np, "rockchip,utmi-avalid");
+
+        rport->bvalid_irq = of_irq_get_byname(child_np, "otg-bvalid");
+        if (rport->bvalid_irq < 0) {
+                dev_err(rphy->dev, "no vbus valid irq provided\n");
+                ret = rport->bvalid_irq;
+                goto out;
+        }
+
+        ret = devm_request_threaded_irq(rphy->dev, rport->bvalid_irq, NULL,
+                                        rockchip_usb2phy_bvalid_irq,
+                                        IRQF_ONESHOT,
+                                        "rockchip_usb2phy_bvalid", rport);
+        if (ret) {
+                dev_err(rphy->dev, "failed to request otg-bvalid irq handle\n");
+                goto out;
+        }
+
+        if (!IS_ERR(rphy->edev)) {
+                rport->event_nb.notifier_call = rockchip_otg_event;
+
+                ret = extcon_register_notifier(rphy->edev, EXTCON_USB_HOST,
+                                               &rport->event_nb);
+                if (ret)
+                        dev_err(rphy->dev, "register USB HOST notifier failed\n");
+        }
+
+out:
+        return ret;
+}
+
 static int rockchip_usb2phy_probe(struct platform_device *pdev)
 {
         struct device *dev = &pdev->dev;
@@ -553,8 +1045,14 @@ static int rockchip_usb2phy_probe(struct platform_device *pdev)
 
         rphy->dev = dev;
         phy_cfgs = match->data;
+        rphy->chg_state = USB_CHG_STATE_UNDEFINED;
+        rphy->chg_type = POWER_SUPPLY_TYPE_UNKNOWN;
         platform_set_drvdata(pdev, rphy);
 
+        ret = rockchip_usb2phy_extcon_register(rphy);
+        if (ret)
+                return ret;
+
         /* find out a proper config which can be matched with dt. */
         index = 0;
         while (phy_cfgs[index].reg) {
@@ -591,13 +1089,9 @@ static int rockchip_usb2phy_probe(struct platform_device *pdev)
                 struct rockchip_usb2phy_port *rport = &rphy->ports[index];
                 struct phy *phy;
 
-                /*
-                 * This driver aim to support both otg-port and host-port,
-                 * but unfortunately, the otg part is not ready in current,
-                 * so this comments and below codes are interim, which should
-                 * be changed after otg-port is supplied soon.
-                 */
-                if (of_node_cmp(child_np->name, "host-port"))
+                /* This driver aims to support both otg-port and host-port */
+                if (of_node_cmp(child_np->name, "host-port") &&
+                    of_node_cmp(child_np->name, "otg-port"))
                         goto next_child;
 
                 phy = devm_phy_create(dev, child_np, &rockchip_usb2phy_ops);
@@ -610,9 +1104,18 @@ static int rockchip_usb2phy_probe(struct platform_device *pdev)
                 rport->phy = phy;
                 phy_set_drvdata(rport->phy, rport);
 
-                ret = rockchip_usb2phy_host_port_init(rphy, rport, child_np);
-                if (ret)
-                        goto put_child;
+                /* initialize otg/host port separately */
+                if (!of_node_cmp(child_np->name, "host-port")) {
+                        ret = rockchip_usb2phy_host_port_init(rphy, rport,
+                                                              child_np);
+                        if (ret)
+                                goto put_child;
+                } else {
+                        ret = rockchip_usb2phy_otg_port_init(rphy, rport,
+                                                             child_np);
+                        if (ret)
+                                goto put_child;
+                }
 
 next_child:
                 /* to prevent out of boundary */
@@ -654,10 +1157,18 @@ static const struct rockchip_usb2phy_cfg rk3366_phy_cfgs[] = {
 
 static const struct rockchip_usb2phy_cfg rk3399_phy_cfgs[] = {
         {
-                .reg = 0xe450,
+                .reg            = 0xe450,
                 .num_ports      = 2,
                 .clkout_ctl     = { 0xe450, 4, 4, 1, 0 },
                 .port_cfgs      = {
+                        [USB2PHY_PORT_OTG] = {
+                                .phy_sus        = { 0xe454, 1, 0, 2, 1 },
+                                .bvalid_det_en  = { 0xe3c0, 3, 3, 0, 1 },
+                                .bvalid_det_st  = { 0xe3e0, 3, 3, 0, 1 },
+                                .bvalid_det_clr = { 0xe3d0, 3, 3, 0, 1 },
+                                .utmi_avalid    = { 0xe2ac, 7, 7, 0, 1 },
+                                .utmi_bvalid    = { 0xe2ac, 12, 12, 0, 1 },
+                        },
                         [USB2PHY_PORT_HOST] = {
                                 .phy_sus        = { 0xe458, 1, 0, 0x2, 0x1 },
                                 .ls_det_en      = { 0xe3c0, 6, 6, 0, 1 },
@@ -667,12 +1178,32 @@ static const struct rockchip_usb2phy_cfg rk3399_phy_cfgs[] = {
                                 .utmi_hstdet    = { 0xe2ac, 23, 23, 0, 1 }
                         }
                 },
+                .chg_det = {
+                        .opmode         = { 0xe454, 3, 0, 5, 1 },
+                        .cp_det         = { 0xe2ac, 2, 2, 0, 1 },
+                        .dcp_det        = { 0xe2ac, 1, 1, 0, 1 },
+                        .dp_det         = { 0xe2ac, 0, 0, 0, 1 },
+                        .idm_sink_en    = { 0xe450, 8, 8, 0, 1 },
+                        .idp_sink_en    = { 0xe450, 7, 7, 0, 1 },
+                        .idp_src_en     = { 0xe450, 9, 9, 0, 1 },
+                        .rdm_pdwn_en    = { 0xe450, 10, 10, 0, 1 },
+                        .vdm_src_en     = { 0xe450, 12, 12, 0, 1 },
+                        .vdp_src_en     = { 0xe450, 11, 11, 0, 1 },
+                },
         },
         {
-                .reg = 0xe460,
+                .reg            = 0xe460,
                 .num_ports      = 2,
                 .clkout_ctl     = { 0xe460, 4, 4, 1, 0 },
                 .port_cfgs      = {
+                        [USB2PHY_PORT_OTG] = {
+                                .phy_sus        = { 0xe464, 1, 0, 2, 1 },
+                                .bvalid_det_en  = { 0xe3c0, 8, 8, 0, 1 },
+                                .bvalid_det_st  = { 0xe3e0, 8, 8, 0, 1 },
+                                .bvalid_det_clr = { 0xe3d0, 8, 8, 0, 1 },
+                                .utmi_avalid    = { 0xe2ac, 10, 10, 0, 1 },
+                                .utmi_bvalid    = { 0xe2ac, 16, 16, 0, 1 },
+                        },
                         [USB2PHY_PORT_HOST] = {
                                 .phy_sus        = { 0xe468, 1, 0, 0x2, 0x1 },
                                 .ls_det_en      = { 0xe3c0, 11, 11, 0, 1 },
diff --git a/drivers/phy/phy-s5pv210-usb2.c b/drivers/phy/phy-s5pv210-usb2.c
index 004d320767e4..f6f72339bbc3 100644
--- a/drivers/phy/phy-s5pv210-usb2.c
+++ b/drivers/phy/phy-s5pv210-usb2.c
@@ -103,7 +103,7 @@ static void s5pv210_isol(struct samsung_usb2_phy_instance *inst, bool on)
                 break;
         default:
                 return;
-        };
+        }
 
         regmap_update_bits(drv->reg_pmu, S5PV210_USB_ISOL_OFFSET,
                                                         mask, on ? 0 : mask);
@@ -127,7 +127,7 @@ static void s5pv210_phy_pwr(struct samsung_usb2_phy_instance *inst, bool on)
                 rstbits =       S5PV210_URSTCON_PHY1_ALL |
                                 S5PV210_URSTCON_HOST_LINK_ALL;
                 break;
-        };
+        }
 
         if (on) {
                 writel(drv->ref_reg_val, drv->reg_phy + S5PV210_UPHYCLK);
diff --git a/drivers/phy/phy-stih41x-usb.c b/drivers/phy/phy-stih41x-usb.c
deleted file mode 100644
index 0ac74639ad02..000000000000
--- a/drivers/phy/phy-stih41x-usb.c
+++ /dev/null
@@ -1,188 +0,0 @@
-/*
- * Copyright (C) 2014 STMicroelectronics
- *
- * STMicroelectronics PHY driver for STiH41x USB.
- *
- * Author: Maxime Coquelin <maxime.coquelin@st.com>
- *
- * 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/platform_device.h>
-#include <linux/io.h>
-#include <linux/kernel.h>
-#include <linux/module.h>
-#include <linux/of.h>
-#include <linux/of_platform.h>
-#include <linux/clk.h>
-#include <linux/phy/phy.h>
-#include <linux/regmap.h>
-#include <linux/mfd/syscon.h>
-
-#define SYSCFG332  0x80
-#define SYSCFG2520 0x820
-
-/**
- * struct stih41x_usb_cfg - SoC specific PHY register mapping
- * @syscfg: Offset in syscfg registers bank
- * @cfg_mask: Bits mask for PHY configuration
- * @cfg: Static configuration value for PHY
- * @oscok: Notify the PHY oscillator clock is ready
- *         Setting this bit enable the PHY
- */
-struct stih41x_usb_cfg {
-        u32 syscfg;
-        u32 cfg_mask;
-        u32 cfg;
-        u32 oscok;
-};
-
-/**
- * struct stih41x_usb_phy - Private data for the PHY
- * @dev: device for this controller
- * @regmap: Syscfg registers bank in which PHY is configured
- * @cfg: SoC specific PHY register mapping
- * @clk: Oscillator used by the PHY
- */
-struct stih41x_usb_phy {
-        struct device *dev;
-        struct regmap *regmap;
-        const struct stih41x_usb_cfg *cfg;
-        struct clk *clk;
-};
-
-static struct stih41x_usb_cfg stih415_usb_phy_cfg = {
-        .syscfg = SYSCFG332,
-        .cfg_mask = 0x3f,
-        .cfg = 0x38,
-        .oscok = BIT(6),
-};
-
-static struct stih41x_usb_cfg stih416_usb_phy_cfg = {
-        .syscfg = SYSCFG2520,
-        .cfg_mask = 0x33f,
-        .cfg = 0x238,
-        .oscok = BIT(6),
-};
-
-static int stih41x_usb_phy_init(struct phy *phy)
-{
-        struct stih41x_usb_phy *phy_dev = phy_get_drvdata(phy);
-
-        return regmap_update_bits(phy_dev->regmap, phy_dev->cfg->syscfg,
-                           phy_dev->cfg->cfg_mask, phy_dev->cfg->cfg);
-}
-
-static int stih41x_usb_phy_power_on(struct phy *phy)
-{
-        struct stih41x_usb_phy *phy_dev = phy_get_drvdata(phy);
-        int ret;
-
-        ret = clk_prepare_enable(phy_dev->clk);
-        if (ret) {
-                dev_err(phy_dev->dev, "Failed to enable osc_phy clock\n");
-                return ret;
-        }
-
-        ret = regmap_update_bits(phy_dev->regmap, phy_dev->cfg->syscfg,
-                                 phy_dev->cfg->oscok, phy_dev->cfg->oscok);
-        if (ret)
-                clk_disable_unprepare(phy_dev->clk);
-
-        return ret;
-}
-
-static int stih41x_usb_phy_power_off(struct phy *phy)
-{
-        struct stih41x_usb_phy *phy_dev = phy_get_drvdata(phy);
-        int ret;
-
-        ret = regmap_update_bits(phy_dev->regmap, phy_dev->cfg->syscfg,
-                        phy_dev->cfg->oscok, 0);
-        if (ret) {
-                dev_err(phy_dev->dev, "Failed to clear oscok bit\n");
-                return ret;
-        }
-
-        clk_disable_unprepare(phy_dev->clk);
-
-        return 0;
-}
-
-static const struct phy_ops stih41x_usb_phy_ops = {
-        .init           = stih41x_usb_phy_init,
-        .power_on       = stih41x_usb_phy_power_on,
-        .power_off      = stih41x_usb_phy_power_off,
-        .owner          = THIS_MODULE,
-};
-
-static const struct of_device_id stih41x_usb_phy_of_match[];
-
-static int stih41x_usb_phy_probe(struct platform_device *pdev)
-{
-        struct device_node *np = pdev->dev.of_node;
-        const struct of_device_id *match;
-        struct stih41x_usb_phy *phy_dev;
-        struct device *dev = &pdev->dev;
-        struct phy_provider *phy_provider;
-        struct phy *phy;
-
-        phy_dev = devm_kzalloc(dev, sizeof(*phy_dev), GFP_KERNEL);
-        if (!phy_dev)
-                return -ENOMEM;
-
-        match = of_match_device(stih41x_usb_phy_of_match, &pdev->dev);
-        if (!match)
-                return -ENODEV;
-
-        phy_dev->cfg = match->data;
-
-        phy_dev->regmap = syscon_regmap_lookup_by_phandle(np, "st,syscfg");
-        if (IS_ERR(phy_dev->regmap)) {
-                dev_err(dev, "No syscfg phandle specified\n");
-                return PTR_ERR(phy_dev->regmap);
-        }
-
-        phy_dev->clk = devm_clk_get(dev, "osc_phy");
-        if (IS_ERR(phy_dev->clk)) {
-                dev_err(dev, "osc_phy clk not found\n");
-                return PTR_ERR(phy_dev->clk);
-        }
-
-        phy = devm_phy_create(dev, NULL, &stih41x_usb_phy_ops);
-
-        if (IS_ERR(phy)) {
-                dev_err(dev, "failed to create phy\n");
-                return PTR_ERR(phy);
-        }
-
-        phy_dev->dev = dev;
-
-        phy_set_drvdata(phy, phy_dev);
-
-        phy_provider = devm_of_phy_provider_register(dev, of_phy_simple_xlate);
-        return PTR_ERR_OR_ZERO(phy_provider);
-}
-
-static const struct of_device_id stih41x_usb_phy_of_match[] = {
-        { .compatible = "st,stih415-usb-phy", .data = &stih415_usb_phy_cfg },
-        { .compatible = "st,stih416-usb-phy", .data = &stih416_usb_phy_cfg },
-        { /* sentinel */ },
-};
-MODULE_DEVICE_TABLE(of, stih41x_usb_phy_of_match);
-
-static struct platform_driver stih41x_usb_phy_driver = {
-        .probe  = stih41x_usb_phy_probe,
-        .driver = {
-                .name   = "stih41x-usb-phy",
-                .of_match_table = stih41x_usb_phy_of_match,
-        }
-};
-module_platform_driver(stih41x_usb_phy_driver);
-
-MODULE_AUTHOR("Maxime Coquelin <maxime.coquelin@st.com>");
-MODULE_DESCRIPTION("STMicroelectronics USB PHY driver for STiH41x series");
-MODULE_LICENSE("GPL v2");
diff --git a/drivers/phy/phy-sun4i-usb.c b/drivers/phy/phy-sun4i-usb.c
index fec34f5213c4..bf28a0fdd569 100644
--- a/drivers/phy/phy-sun4i-usb.c
+++ b/drivers/phy/phy-sun4i-usb.c
@@ -436,25 +436,31 @@ static int sun4i_usb_phy_set_mode(struct phy *_phy, enum phy_mode mode)
 {
         struct sun4i_usb_phy *phy = phy_get_drvdata(_phy);
         struct sun4i_usb_phy_data *data = to_sun4i_usb_phy_data(phy);
+        int new_mode;
 
         if (phy->index != 0)
                 return -EINVAL;
 
         switch (mode) {
         case PHY_MODE_USB_HOST:
-                data->dr_mode = USB_DR_MODE_HOST;
+                new_mode = USB_DR_MODE_HOST;
                 break;
         case PHY_MODE_USB_DEVICE:
-                data->dr_mode = USB_DR_MODE_PERIPHERAL;
+                new_mode = USB_DR_MODE_PERIPHERAL;
                 break;
         case PHY_MODE_USB_OTG:
-                data->dr_mode = USB_DR_MODE_OTG;
+                new_mode = USB_DR_MODE_OTG;
                 break;
         default:
                 return -EINVAL;
         }
 
-        dev_info(&_phy->dev, "Changing dr_mode to %d\n", (int)data->dr_mode);
+        if (new_mode != data->dr_mode) {
+                dev_info(&_phy->dev, "Changing dr_mode to %d\n", new_mode);
+                data->dr_mode = new_mode;
+        }
+
+        data->id_det = -1; /* Force reprocessing of id */
         data->force_session_end = true;
         queue_delayed_work(system_wq, &data->detect, 0);
 
diff --git a/drivers/phy/phy-ti-pipe3.c b/drivers/phy/phy-ti-pipe3.c
index bf46844dc387..9c84d32c6f60 100644
--- a/drivers/phy/phy-ti-pipe3.c
+++ b/drivers/phy/phy-ti-pipe3.c
@@ -537,10 +537,7 @@ static int ti_pipe3_get_pll_base(struct ti_pipe3 *phy)
         res = platform_get_resource_byname(pdev, IORESOURCE_MEM,
                                            "pll_ctrl");
         phy->pll_ctrl_base = devm_ioremap_resource(dev, res);
-        if (IS_ERR(phy->pll_ctrl_base))
-                return PTR_ERR(phy->pll_ctrl_base);
-
-        return 0;
+        return PTR_ERR_OR_ZERO(phy->pll_ctrl_base);
 }
 
 static int ti_pipe3_probe(struct platform_device *pdev)
@@ -592,10 +589,7 @@ static int ti_pipe3_probe(struct platform_device *pdev)
         ti_pipe3_power_off(generic_phy);
 
         phy_provider = devm_of_phy_provider_register(dev, of_phy_simple_xlate);
-        if (IS_ERR(phy_provider))
-                return PTR_ERR(phy_provider);
-
-        return 0;
+        return PTR_ERR_OR_ZERO(phy_provider);
 }
 
 static int ti_pipe3_remove(struct platform_device *pdev)
diff --git a/drivers/phy/phy-twl4030-usb.c b/drivers/phy/phy-twl4030-usb.c
index 547ca7b3f098..2990b3965460 100644
--- a/drivers/phy/phy-twl4030-usb.c
+++ b/drivers/phy/phy-twl4030-usb.c
@@ -317,6 +317,9 @@ static enum musb_vbus_id_status
                         linkstat = MUSB_VBUS_OFF;
         }
 
+        kobject_uevent(&twl->dev->kobj, linkstat == MUSB_VBUS_VALID
+                                        ? KOBJ_ONLINE : KOBJ_OFFLINE);
+
         dev_dbg(twl->dev, "HW_CONDITIONS 0x%02x/%d; link %d\n",
                         status, status, linkstat);
 
diff --git a/drivers/phy/tegra/xusb-tegra124.c b/drivers/phy/tegra/xusb-tegra124.c
index 119957249a51..c45cbedc6634 100644
--- a/drivers/phy/tegra/xusb-tegra124.c
+++ b/drivers/phy/tegra/xusb-tegra124.c
@@ -1483,7 +1483,6 @@ static int tegra124_usb3_port_enable(struct tegra_xusb_port *port)
         struct tegra_xusb_padctl *padctl = port->padctl;
         struct tegra_xusb_lane *lane = usb3->base.lane;
         unsigned int index = port->index, offset;
-        int ret = 0;
         u32 value;
 
         value = padctl_readl(padctl, XUSB_PADCTL_SS_PORT_MAP);
@@ -1612,7 +1611,7 @@ static int tegra124_usb3_port_enable(struct tegra_xusb_port *port)
         value &= ~XUSB_PADCTL_ELPG_PROGRAM_SSPX_ELPG_CLAMP_EN(index);
         padctl_writel(padctl, value, XUSB_PADCTL_ELPG_PROGRAM);
 
-        return ret;
+        return 0;
 }
 
 static void tegra124_usb3_port_disable(struct tegra_xusb_port *port)
diff --git a/drivers/phy/tegra/xusb.c b/drivers/phy/tegra/xusb.c
index 873424ab0e32..3cbcb2537657 100644
--- a/drivers/phy/tegra/xusb.c
+++ b/drivers/phy/tegra/xusb.c
@@ -561,10 +561,7 @@ static int tegra_xusb_usb2_port_parse_dt(struct tegra_xusb_usb2_port *usb2)
         usb2->internal = of_property_read_bool(np, "nvidia,internal");
 
         usb2->supply = devm_regulator_get(&port->dev, "vbus");
-        if (IS_ERR(usb2->supply))
-                return PTR_ERR(usb2->supply);
-
-        return 0;
+        return PTR_ERR_OR_ZERO(usb2->supply);
 }
 
 static int tegra_xusb_add_usb2_port(struct tegra_xusb_padctl *padctl,
@@ -731,10 +728,7 @@ static int tegra_xusb_usb3_port_parse_dt(struct tegra_xusb_usb3_port *usb3)
         usb3->internal = of_property_read_bool(np, "nvidia,internal");
 
         usb3->supply = devm_regulator_get(&port->dev, "vbus");
-        if (IS_ERR(usb3->supply))
-                return PTR_ERR(usb3->supply);
-
-        return 0;
+        return PTR_ERR_OR_ZERO(usb3->supply);
 }
 
 static int tegra_xusb_add_usb3_port(struct tegra_xusb_padctl *padctl,
diff --git a/drivers/usb/Kconfig b/drivers/usb/Kconfig
index 644e978cbd3e..fbe493d44e81 100644
--- a/drivers/usb/Kconfig
+++ b/drivers/usb/Kconfig
@@ -95,6 +95,8 @@ source "drivers/usb/usbip/Kconfig"
 
 endif
 
+source "drivers/usb/mtu3/Kconfig"
+
 source "drivers/usb/musb/Kconfig"
 
 source "drivers/usb/dwc3/Kconfig"
diff --git a/drivers/usb/Makefile b/drivers/usb/Makefile
index dca78565eb55..7791af6c102c 100644
--- a/drivers/usb/Makefile
+++ b/drivers/usb/Makefile
@@ -12,6 +12,7 @@ obj-$(CONFIG_USB_DWC2)		+= dwc2/
 obj-$(CONFIG_USB_ISP1760)       += isp1760/
 
 obj-$(CONFIG_USB_MON)           += mon/
+obj-$(CONFIG_USB_MTU3)          += mtu3/
 
 obj-$(CONFIG_PCI)               += host/
 obj-$(CONFIG_USB_EHCI_HCD)      += host/
diff --git a/drivers/usb/chipidea/ci_hdrc_imx.c b/drivers/usb/chipidea/ci_hdrc_imx.c
index 099179457f60..5f4a8157fad8 100644
--- a/drivers/usb/chipidea/ci_hdrc_imx.c
+++ b/drivers/usb/chipidea/ci_hdrc_imx.c
@@ -18,6 +18,7 @@
 #include <linux/pm_runtime.h>
 #include <linux/dma-mapping.h>
 #include <linux/usb/chipidea.h>
+#include <linux/usb/of.h>
 #include <linux/clk.h>
 
 #include "ci.h"
@@ -146,6 +147,9 @@ static struct imx_usbmisc_data *usbmisc_get_init_data(struct device *dev)
         if (of_find_property(np, "external-vbus-divider", NULL))
                 data->evdo = 1;
 
+        if (of_usb_get_phy_mode(np) == USBPHY_INTERFACE_MODE_ULPI)
+                data->ulpi = 1;
+
         return data;
 }
 
diff --git a/drivers/usb/chipidea/ci_hdrc_imx.h b/drivers/usb/chipidea/ci_hdrc_imx.h
index 409aa5ca8dda..d666c9f036ba 100644
--- a/drivers/usb/chipidea/ci_hdrc_imx.h
+++ b/drivers/usb/chipidea/ci_hdrc_imx.h
@@ -19,6 +19,7 @@ struct imx_usbmisc_data {
         unsigned int disable_oc:1; /* over current detect disabled */
         unsigned int oc_polarity:1; /* over current polarity if oc enabled */
         unsigned int evdo:1; /* set external vbus divider option */
+        unsigned int ulpi:1; /* connected to an ULPI phy */
 };
 
 int imx_usbmisc_init(struct imx_usbmisc_data *);
diff --git a/drivers/usb/chipidea/udc.c b/drivers/usb/chipidea/udc.c
index c9e80ad48fdc..cf132f057137 100644
--- a/drivers/usb/chipidea/udc.c
+++ b/drivers/usb/chipidea/udc.c
@@ -365,7 +365,7 @@ static int add_td_to_list(struct ci_hw_ep *hwep, struct ci_hw_req *hwreq,
                 if (hwreq->req.length == 0
                                 || hwreq->req.length % hwep->ep.maxpacket)
                         mul++;
-                node->ptr->token |= mul << __ffs(TD_MULTO);
+                node->ptr->token |= cpu_to_le32(mul << __ffs(TD_MULTO));
         }
 
         temp = (u32) (hwreq->req.dma + hwreq->req.actual);
@@ -504,7 +504,7 @@ static int _hardware_enqueue(struct ci_hw_ep *hwep, struct ci_hw_req *hwreq)
                 if (hwreq->req.length == 0
                                 || hwreq->req.length % hwep->ep.maxpacket)
                         mul++;
-                hwep->qh.ptr->cap |= mul << __ffs(QH_MULT);
+                hwep->qh.ptr->cap |= cpu_to_le32(mul << __ffs(QH_MULT));
         }
 
         ret = hw_ep_prime(ci, hwep->num, hwep->dir,
@@ -529,7 +529,7 @@ static void free_pending_td(struct ci_hw_ep *hwep)
 static int reprime_dtd(struct ci_hdrc *ci, struct ci_hw_ep *hwep,
                                            struct td_node *node)
 {
-        hwep->qh.ptr->td.next = node->dma;
+        hwep->qh.ptr->td.next = cpu_to_le32(node->dma);
         hwep->qh.ptr->td.token &=
                 cpu_to_le32(~(TD_STATUS_HALTED | TD_STATUS_ACTIVE));
 
@@ -821,7 +821,7 @@ static int _ep_queue(struct usb_ep *ep, struct usb_request *req,
         }
 
         if (usb_endpoint_xfer_isoc(hwep->ep.desc) &&
-            hwreq->req.length > (1 + hwep->ep.mult) * hwep->ep.maxpacket) {
+            hwreq->req.length > hwep->ep.mult * hwep->ep.maxpacket) {
                 dev_err(hwep->ci->dev, "request length too big for isochronous\n");
                 return -EMSGSIZE;
         }
@@ -1253,8 +1253,8 @@ static int ep_enable(struct usb_ep *ep,
         hwep->num  = usb_endpoint_num(desc);
         hwep->type = usb_endpoint_type(desc);
 
-        hwep->ep.maxpacket = usb_endpoint_maxp(desc) & 0x07ff;
-        hwep->ep.mult = QH_ISO_MULT(usb_endpoint_maxp(desc));
+        hwep->ep.maxpacket = usb_endpoint_maxp(desc);
+        hwep->ep.mult = usb_endpoint_maxp_mult(desc);
 
         if (hwep->type == USB_ENDPOINT_XFER_CONTROL)
                 cap |= QH_IOS;
diff --git a/drivers/usb/chipidea/udc.h b/drivers/usb/chipidea/udc.h
index e66df0020bd4..2ecd1174d66c 100644
--- a/drivers/usb/chipidea/udc.h
+++ b/drivers/usb/chipidea/udc.h
@@ -22,11 +22,11 @@
 /* DMA layout of transfer descriptors */
 struct ci_hw_td {
         /* 0 */
-        u32 next;
+        __le32 next;
 #define TD_TERMINATE          BIT(0)
 #define TD_ADDR_MASK          (0xFFFFFFEUL << 5)
         /* 1 */
-        u32 token;
+        __le32 token;
 #define TD_STATUS             (0x00FFUL <<  0)
 #define TD_STATUS_TR_ERR      BIT(3)
 #define TD_STATUS_DT_ERR      BIT(5)
@@ -36,7 +36,7 @@ struct ci_hw_td {
 #define TD_IOC                BIT(15)
 #define TD_TOTAL_BYTES        (0x7FFFUL << 16)
         /* 2 */
-        u32 page[5];
+        __le32 page[5];
 #define TD_CURR_OFFSET        (0x0FFFUL <<  0)
 #define TD_FRAME_NUM          (0x07FFUL <<  0)
 #define TD_RESERVED_MASK      (0x0FFFUL <<  0)
@@ -45,18 +45,18 @@ struct ci_hw_td {
 /* DMA layout of queue heads */
 struct ci_hw_qh {
         /* 0 */
-        u32 cap;
+        __le32 cap;
 #define QH_IOS                BIT(15)
 #define QH_MAX_PKT            (0x07FFUL << 16)
 #define QH_ZLT                BIT(29)
 #define QH_MULT               (0x0003UL << 30)
 #define QH_ISO_MULT(x)          ((x >> 11) & 0x03)
         /* 1 */
-        u32 curr;
+        __le32 curr;
         /* 2 - 8 */
         struct ci_hw_td         td;
         /* 9 */
-        u32 RESERVED;
+        __le32 RESERVED;
         struct usb_ctrlrequest   setup;
 } __attribute__ ((packed, aligned(4)));
 
diff --git a/drivers/usb/chipidea/usbmisc_imx.c b/drivers/usb/chipidea/usbmisc_imx.c
index 20d02a5e418d..e77a4ed4f021 100644
--- a/drivers/usb/chipidea/usbmisc_imx.c
+++ b/drivers/usb/chipidea/usbmisc_imx.c
@@ -46,11 +46,23 @@
 
 #define MX53_USB_OTG_PHY_CTRL_0_OFFSET  0x08
 #define MX53_USB_OTG_PHY_CTRL_1_OFFSET  0x0c
+#define MX53_USB_CTRL_1_OFFSET          0x10
+#define MX53_USB_CTRL_1_H2_XCVR_CLK_SEL_MASK (0x11 << 2)
+#define MX53_USB_CTRL_1_H2_XCVR_CLK_SEL_ULPI BIT(2)
+#define MX53_USB_CTRL_1_H3_XCVR_CLK_SEL_MASK (0x11 << 6)
+#define MX53_USB_CTRL_1_H3_XCVR_CLK_SEL_ULPI BIT(6)
 #define MX53_USB_UH2_CTRL_OFFSET        0x14
 #define MX53_USB_UH3_CTRL_OFFSET        0x18
+#define MX53_USB_CLKONOFF_CTRL_OFFSET   0x24
+#define MX53_USB_CLKONOFF_CTRL_H2_INT60CKOFF BIT(21)
+#define MX53_USB_CLKONOFF_CTRL_H3_INT60CKOFF BIT(22)
 #define MX53_BM_OVER_CUR_DIS_H1         BIT(5)
 #define MX53_BM_OVER_CUR_DIS_OTG        BIT(8)
 #define MX53_BM_OVER_CUR_DIS_UHx        BIT(30)
+#define MX53_USB_CTRL_1_UH2_ULPI_EN     BIT(26)
+#define MX53_USB_CTRL_1_UH3_ULPI_EN     BIT(27)
+#define MX53_USB_UHx_CTRL_WAKE_UP_EN    BIT(7)
+#define MX53_USB_UHx_CTRL_ULPI_INT_EN   BIT(8)
 #define MX53_USB_PHYCTRL1_PLLDIV_MASK   0x3
 #define MX53_USB_PLL_DIV_24_MHZ         0x01
 
@@ -199,31 +211,77 @@ static int usbmisc_imx53_init(struct imx_usbmisc_data *data)
         val |= MX53_USB_PLL_DIV_24_MHZ;
         writel(val, usbmisc->base + MX53_USB_OTG_PHY_CTRL_1_OFFSET);
 
-        if (data->disable_oc) {
-                spin_lock_irqsave(&usbmisc->lock, flags);
-                switch (data->index) {
-                case 0:
+        spin_lock_irqsave(&usbmisc->lock, flags);
+
+        switch (data->index) {
+        case 0:
+                if (data->disable_oc) {
                         reg = usbmisc->base + MX53_USB_OTG_PHY_CTRL_0_OFFSET;
                         val = readl(reg) | MX53_BM_OVER_CUR_DIS_OTG;
-                        break;
-                case 1:
+                        writel(val, reg);
+                }
+                break;
+        case 1:
+                if (data->disable_oc) {
                         reg = usbmisc->base + MX53_USB_OTG_PHY_CTRL_0_OFFSET;
                         val = readl(reg) | MX53_BM_OVER_CUR_DIS_H1;
-                        break;
-                case 2:
+                        writel(val, reg);
+                }
+                break;
+        case 2:
+                if (data->ulpi) {
+                        /* set USBH2 into ULPI-mode. */
+                        reg = usbmisc->base + MX53_USB_CTRL_1_OFFSET;
+                        val = readl(reg) | MX53_USB_CTRL_1_UH2_ULPI_EN;
+                        /* select ULPI clock */
+                        val &= ~MX53_USB_CTRL_1_H2_XCVR_CLK_SEL_MASK;
+                        val |= MX53_USB_CTRL_1_H2_XCVR_CLK_SEL_ULPI;
+                        writel(val, reg);
+                        /* Set interrupt wake up enable */
+                        reg = usbmisc->base + MX53_USB_UH2_CTRL_OFFSET;
+                        val = readl(reg) | MX53_USB_UHx_CTRL_WAKE_UP_EN
+                                | MX53_USB_UHx_CTRL_ULPI_INT_EN;
+                        writel(val, reg);
+                        /* Disable internal 60Mhz clock */
+                        reg = usbmisc->base + MX53_USB_CLKONOFF_CTRL_OFFSET;
+                        val = readl(reg) | MX53_USB_CLKONOFF_CTRL_H2_INT60CKOFF;
+                        writel(val, reg);
+                }
+                if (data->disable_oc) {
                         reg = usbmisc->base + MX53_USB_UH2_CTRL_OFFSET;
                         val = readl(reg) | MX53_BM_OVER_CUR_DIS_UHx;
-                        break;
-                case 3:
+                        writel(val, reg);
+                }
+                break;
+        case 3:
+                if (data->ulpi) {
+                        /* set USBH3 into ULPI-mode. */
+                        reg = usbmisc->base + MX53_USB_CTRL_1_OFFSET;
+                        val = readl(reg) | MX53_USB_CTRL_1_UH3_ULPI_EN;
+                        /* select ULPI clock */
+                        val &= ~MX53_USB_CTRL_1_H3_XCVR_CLK_SEL_MASK;
+                        val |= MX53_USB_CTRL_1_H3_XCVR_CLK_SEL_ULPI;
+                        writel(val, reg);
+                        /* Set interrupt wake up enable */
                         reg = usbmisc->base + MX53_USB_UH3_CTRL_OFFSET;
-                        val = readl(reg) | MX53_BM_OVER_CUR_DIS_UHx;
-                        break;
+                        val = readl(reg) | MX53_USB_UHx_CTRL_WAKE_UP_EN
+                                | MX53_USB_UHx_CTRL_ULPI_INT_EN;
+                        writel(val, reg);
+                        /* Disable internal 60Mhz clock */
+                        reg = usbmisc->base + MX53_USB_CLKONOFF_CTRL_OFFSET;
+                        val = readl(reg) | MX53_USB_CLKONOFF_CTRL_H3_INT60CKOFF;
+                        writel(val, reg);
                 }
-                if (reg && val)
+                if (data->disable_oc) {
+                        reg = usbmisc->base + MX53_USB_UH3_CTRL_OFFSET;
+                        val = readl(reg) | MX53_BM_OVER_CUR_DIS_UHx;
                         writel(val, reg);
-                spin_unlock_irqrestore(&usbmisc->lock, flags);
+                }
+                break;
         }
 
+        spin_unlock_irqrestore(&usbmisc->lock, flags);
+
         return 0;
 }
 
diff --git a/drivers/usb/class/cdc-acm.c b/drivers/usb/class/cdc-acm.c
index fada988512a1..e35b1508d3eb 100644
--- a/drivers/usb/class/cdc-acm.c
+++ b/drivers/usb/class/cdc-acm.c
@@ -133,8 +133,8 @@ static int acm_ctrl_msg(struct acm *acm, int request, int value,
                 buf, len, 5000);
 
         dev_dbg(&acm->control->dev,
-                        "%s - rq 0x%02x, val %#x, len %#x, result %d\n",
-                        __func__, request, value, len, retval);
+                "%s - rq 0x%02x, val %#x, len %#x, result %d\n",
+                __func__, request, value, len, retval);
 
         usb_autopm_put_interface(acm->control);
 
@@ -158,6 +158,17 @@ static inline int acm_set_control(struct acm *acm, int control)
 #define acm_send_break(acm, ms) \
         acm_ctrl_msg(acm, USB_CDC_REQ_SEND_BREAK, ms, NULL, 0)
 
+static void acm_kill_urbs(struct acm *acm)
+{
+        int i;
+
+        usb_kill_urb(acm->ctrlurb);
+        for (i = 0; i < ACM_NW; i++)
+                usb_kill_urb(acm->wb[i].urb);
+        for (i = 0; i < acm->rx_buflimit; i++)
+                usb_kill_urb(acm->read_urbs[i]);
+}
+
 /*
  * Write buffer management.
  * All of these assume proper locks taken by the caller.
@@ -291,13 +302,13 @@ static void acm_ctrl_irq(struct urb *urb)
         case -ESHUTDOWN:
                 /* this urb is terminated, clean up */
                 dev_dbg(&acm->control->dev,
-                                "%s - urb shutting down with status: %d\n",
-                                __func__, status);
+                        "%s - urb shutting down with status: %d\n",
+                        __func__, status);
                 return;
         default:
                 dev_dbg(&acm->control->dev,
-                                "%s - nonzero urb status received: %d\n",
-                                __func__, status);
+                        "%s - nonzero urb status received: %d\n",
+                        __func__, status);
                 goto exit;
         }
 
@@ -306,16 +317,16 @@ static void acm_ctrl_irq(struct urb *urb)
         data = (unsigned char *)(dr + 1);
         switch (dr->bNotificationType) {
         case USB_CDC_NOTIFY_NETWORK_CONNECTION:
-                dev_dbg(&acm->control->dev, "%s - network connection: %d\n",
-                                                        __func__, dr->wValue);
+                dev_dbg(&acm->control->dev,
+                        "%s - network connection: %d\n", __func__, dr->wValue);
                 break;
 
         case USB_CDC_NOTIFY_SERIAL_STATE:
                 newctrl = get_unaligned_le16(data);
 
                 if (!acm->clocal && (acm->ctrlin & ~newctrl & ACM_CTRL_DCD)) {
-                        dev_dbg(&acm->control->dev, "%s - calling hangup\n",
-                                        __func__);
+                        dev_dbg(&acm->control->dev,
+                                "%s - calling hangup\n", __func__);
                         tty_port_tty_hangup(&acm->port, false);
                 }
 
@@ -357,8 +368,8 @@ static void acm_ctrl_irq(struct urb *urb)
 exit:
         retval = usb_submit_urb(urb, GFP_ATOMIC);
         if (retval && retval != -EPERM)
-                dev_err(&acm->control->dev, "%s - usb_submit_urb failed: %d\n",
-                                                        __func__, retval);
+                dev_err(&acm->control->dev,
+                        "%s - usb_submit_urb failed: %d\n", __func__, retval);
 }
 
 static int acm_submit_read_urb(struct acm *acm, int index, gfp_t mem_flags)
@@ -372,8 +383,8 @@ static int acm_submit_read_urb(struct acm *acm, int index, gfp_t mem_flags)
         if (res) {
                 if (res != -EPERM) {
                         dev_err(&acm->data->dev,
-                                        "urb %d failed submission with %d\n",
-                                        index, res);
+                                "urb %d failed submission with %d\n",
+                                index, res);
                 }
                 set_bit(index, &acm->read_urbs_free);
                 return res;
@@ -416,30 +427,43 @@ static void acm_read_bulk_callback(struct urb *urb)
         int status = urb->status;
 
         dev_vdbg(&acm->data->dev, "got urb %d, len %d, status %d\n",
-                                        rb->index, urb->actual_length,
-                                        status);
+                rb->index, urb->actual_length, status);
+
+        set_bit(rb->index, &acm->read_urbs_free);
 
         if (!acm->dev) {
-                set_bit(rb->index, &acm->read_urbs_free);
                 dev_dbg(&acm->data->dev, "%s - disconnected\n", __func__);
                 return;
         }
 
-        if (status) {
-                set_bit(rb->index, &acm->read_urbs_free);
-                if ((status != -ENOENT) || (urb->actual_length == 0))
-                        return;
+        switch (status) {
+        case 0:
+                usb_mark_last_busy(acm->dev);
+                acm_process_read_urb(acm, urb);
+                break;
+        case -EPIPE:
+                set_bit(EVENT_RX_STALL, &acm->flags);
+                schedule_work(&acm->work);
+                return;
+        case -ENOENT:
+        case -ECONNRESET:
+        case -ESHUTDOWN:
+                dev_dbg(&acm->data->dev,
+                        "%s - urb shutting down with status: %d\n",
+                        __func__, status);
+                return;
+        default:
+                dev_dbg(&acm->data->dev,
+                        "%s - nonzero urb status received: %d\n",
+                        __func__, status);
+                break;
         }
 
-        usb_mark_last_busy(acm->dev);
-
-        acm_process_read_urb(acm, urb);
         /*
          * Unthrottle may run on another CPU which needs to see events
          * in the same order. Submission has an implict barrier
          */
         smp_mb__before_atomic();
-        set_bit(rb->index, &acm->read_urbs_free);
 
         /* throttle device if requested by tty */
         spin_lock_irqsave(&acm->read_lock, flags);
@@ -469,14 +493,30 @@ static void acm_write_bulk(struct urb *urb)
         spin_lock_irqsave(&acm->write_lock, flags);
         acm_write_done(acm, wb);
         spin_unlock_irqrestore(&acm->write_lock, flags);
+        set_bit(EVENT_TTY_WAKEUP, &acm->flags);
         schedule_work(&acm->work);
 }
 
 static void acm_softint(struct work_struct *work)
 {
+        int i;
         struct acm *acm = container_of(work, struct acm, work);
 
-        tty_port_tty_wakeup(&acm->port);
+        if (test_bit(EVENT_RX_STALL, &acm->flags)) {
+                if (!(usb_autopm_get_interface(acm->data))) {
+                        for (i = 0; i < acm->rx_buflimit; i++)
+                                usb_kill_urb(acm->read_urbs[i]);
+                        usb_clear_halt(acm->dev, acm->in);
+                        acm_submit_read_urbs(acm, GFP_KERNEL);
+                        usb_autopm_put_interface(acm->data);
+                }
+                clear_bit(EVENT_RX_STALL, &acm->flags);
+        }
+
+        if (test_bit(EVENT_TTY_WAKEUP, &acm->flags)) {
+                tty_port_tty_wakeup(&acm->port);
+                clear_bit(EVENT_TTY_WAKEUP, &acm->flags);
+        }
 }
 
 /*
@@ -608,7 +648,6 @@ static void acm_port_shutdown(struct tty_port *port)
         struct acm *acm = container_of(port, struct acm, port);
         struct urb *urb;
         struct acm_wb *wb;
-        int i;
 
         /*
          * Need to grab write_lock to prevent race with resume, but no need to
@@ -630,11 +669,7 @@ static void acm_port_shutdown(struct tty_port *port)
                 usb_autopm_put_interface_async(acm->control);
         }
 
-        usb_kill_urb(acm->ctrlurb);
-        for (i = 0; i < ACM_NW; i++)
-                usb_kill_urb(acm->wb[i].urb);
-        for (i = 0; i < acm->rx_buflimit; i++)
-                usb_kill_urb(acm->read_urbs[i]);
+        acm_kill_urbs(acm);
 }
 
 static void acm_tty_cleanup(struct tty_struct *tty)
@@ -837,8 +872,8 @@ static int acm_tty_break_ctl(struct tty_struct *tty, int state)
 
         retval = acm_send_break(acm, state ? 0xffff : 0);
         if (retval < 0)
-                dev_dbg(&acm->control->dev, "%s - send break failed\n",
-                                                                __func__);
+                dev_dbg(&acm->control->dev,
+                        "%s - send break failed\n", __func__);
         return retval;
 }
 
@@ -877,9 +912,6 @@ static int get_serial_info(struct acm *acm, struct serial_struct __user *info)
 {
         struct serial_struct tmp;
 
-        if (!info)
-                return -EINVAL;
-
         memset(&tmp, 0, sizeof(tmp));
         tmp.flags = ASYNC_LOW_LATENCY;
         tmp.xmit_fifo_size = acm->writesize;
@@ -969,25 +1001,20 @@ static int wait_serial_change(struct acm *acm, unsigned long arg)
         return rv;
 }
 
-static int get_serial_usage(struct acm *acm,
-                            struct serial_icounter_struct __user *count)
+static int acm_tty_get_icount(struct tty_struct *tty,
+                                        struct serial_icounter_struct *icount)
 {
-        struct serial_icounter_struct icount;
-        int rv = 0;
-
-        memset(&icount, 0, sizeof(icount));
-        icount.dsr = acm->iocount.dsr;
-        icount.rng = acm->iocount.rng;
-        icount.dcd = acm->iocount.dcd;
-        icount.frame = acm->iocount.frame;
-        icount.overrun = acm->iocount.overrun;
-        icount.parity = acm->iocount.parity;
-        icount.brk = acm->iocount.brk;
+        struct acm *acm = tty->driver_data;
 
-        if (copy_to_user(count, &icount, sizeof(icount)) > 0)
-                rv = -EFAULT;
+        icount->dsr = acm->iocount.dsr;
+        icount->rng = acm->iocount.rng;
+        icount->dcd = acm->iocount.dcd;
+        icount->frame = acm->iocount.frame;
+        icount->overrun = acm->iocount.overrun;
+        icount->parity = acm->iocount.parity;
+        icount->brk = acm->iocount.brk;
 
-        return rv;
+        return 0;
 }
 
 static int acm_tty_ioctl(struct tty_struct *tty,
@@ -1012,9 +1039,6 @@ static int acm_tty_ioctl(struct tty_struct *tty,
                 rv = wait_serial_change(acm, arg);
                 usb_autopm_put_interface(acm->control);
                 break;
-        case TIOCGICOUNT:
-                rv = get_serial_usage(acm, (struct serial_icounter_struct __user *) arg);
-                break;
         }
 
         return rv;
@@ -1088,19 +1112,17 @@ static void acm_write_buffers_free(struct acm *acm)
 {
         int i;
         struct acm_wb *wb;
-        struct usb_device *usb_dev = interface_to_usbdev(acm->control);
 
         for (wb = &acm->wb[0], i = 0; i < ACM_NW; i++, wb++)
-                usb_free_coherent(usb_dev, acm->writesize, wb->buf, wb->dmah);
+                usb_free_coherent(acm->dev, acm->writesize, wb->buf, wb->dmah);
 }
 
 static void acm_read_buffers_free(struct acm *acm)
 {
-        struct usb_device *usb_dev = interface_to_usbdev(acm->control);
         int i;
 
         for (i = 0; i < acm->rx_buflimit; i++)
-                usb_free_coherent(usb_dev, acm->readsize,
+                usb_free_coherent(acm->dev, acm->readsize,
                           acm->read_buffers[i].base, acm->read_buffers[i].dma);
 }
 
@@ -1345,9 +1367,16 @@ made_compressed_probe:
         spin_lock_init(&acm->write_lock);
         spin_lock_init(&acm->read_lock);
         mutex_init(&acm->mutex);
-        acm->is_int_ep = usb_endpoint_xfer_int(epread);
-        if (acm->is_int_ep)
+        if (usb_endpoint_xfer_int(epread)) {
                 acm->bInterval = epread->bInterval;
+                acm->in = usb_rcvintpipe(usb_dev, epread->bEndpointAddress);
+        } else {
+                acm->in = usb_rcvbulkpipe(usb_dev, epread->bEndpointAddress);
+        }
+        if (usb_endpoint_xfer_int(epwrite))
+                acm->out = usb_sndintpipe(usb_dev, epwrite->bEndpointAddress);
+        else
+                acm->out = usb_sndbulkpipe(usb_dev, epwrite->bEndpointAddress);
         tty_port_init(&acm->port);
         acm->port.ops = &acm_port_ops;
         init_usb_anchor(&acm->delayed);
@@ -1382,20 +1411,15 @@ made_compressed_probe:
 
                 urb->transfer_flags |= URB_NO_TRANSFER_DMA_MAP;
                 urb->transfer_dma = rb->dma;
-                if (acm->is_int_ep) {
-                        usb_fill_int_urb(urb, acm->dev,
-                                         usb_rcvintpipe(usb_dev, epread->bEndpointAddress),
-                                         rb->base,
+                if (usb_endpoint_xfer_int(epread))
+                        usb_fill_int_urb(urb, acm->dev, acm->in, rb->base,
                                          acm->readsize,
                                          acm_read_bulk_callback, rb,
                                          acm->bInterval);
-                } else {
-                        usb_fill_bulk_urb(urb, acm->dev,
-                                          usb_rcvbulkpipe(usb_dev, epread->bEndpointAddress),
-                                          rb->base,
+                else
+                        usb_fill_bulk_urb(urb, acm->dev, acm->in, rb->base,
                                           acm->readsize,
                                           acm_read_bulk_callback, rb);
-                }
 
                 acm->read_urbs[i] = urb;
                 __set_bit(i, &acm->read_urbs_free);
@@ -1408,12 +1432,10 @@ made_compressed_probe:
                         goto alloc_fail7;
 
                 if (usb_endpoint_xfer_int(epwrite))
-                        usb_fill_int_urb(snd->urb, usb_dev,
-                                usb_sndintpipe(usb_dev, epwrite->bEndpointAddress),
+                        usb_fill_int_urb(snd->urb, usb_dev, acm->out,
                                 NULL, acm->writesize, acm_write_bulk, snd, epwrite->bInterval);
                 else
-                        usb_fill_bulk_urb(snd->urb, usb_dev,
-                                usb_sndbulkpipe(usb_dev, epwrite->bEndpointAddress),
+                        usb_fill_bulk_urb(snd->urb, usb_dev, acm->out,
                                 NULL, acm->writesize, acm_write_bulk, snd);
                 snd->urb->transfer_flags |= URB_NO_TRANSFER_DMA_MAP;
                 if (quirks & SEND_ZERO_PACKET)
@@ -1485,8 +1507,8 @@ skip_countries:
         }
 
         if (quirks & CLEAR_HALT_CONDITIONS) {
-                usb_clear_halt(usb_dev, usb_rcvbulkpipe(usb_dev, epread->bEndpointAddress));
-                usb_clear_halt(usb_dev, usb_sndbulkpipe(usb_dev, epwrite->bEndpointAddress));
+                usb_clear_halt(usb_dev, acm->in);
+                usb_clear_halt(usb_dev, acm->out);
         }
 
         return 0;
@@ -1520,25 +1542,10 @@ alloc_fail:
         return rv;
 }
 
-static void stop_data_traffic(struct acm *acm)
-{
-        int i;
-
-        usb_kill_urb(acm->ctrlurb);
-        for (i = 0; i < ACM_NW; i++)
-                usb_kill_urb(acm->wb[i].urb);
-        for (i = 0; i < acm->rx_buflimit; i++)
-                usb_kill_urb(acm->read_urbs[i]);
-
-        cancel_work_sync(&acm->work);
-}
-
 static void acm_disconnect(struct usb_interface *intf)
 {
         struct acm *acm = usb_get_intfdata(intf);
-        struct usb_device *usb_dev = interface_to_usbdev(intf);
         struct tty_struct *tty;
-        int i;
 
         /* sibling interface is already cleaning up */
         if (!acm)
@@ -1564,17 +1571,13 @@ static void acm_disconnect(struct usb_interface *intf)
                 tty_kref_put(tty);
         }
 
-        stop_data_traffic(acm);
+        acm_kill_urbs(acm);
+        cancel_work_sync(&acm->work);
 
         tty_unregister_device(acm_tty_driver, acm->minor);
 
-        usb_free_urb(acm->ctrlurb);
-        for (i = 0; i < ACM_NW; i++)
-                usb_free_urb(acm->wb[i].urb);
-        for (i = 0; i < acm->rx_buflimit; i++)
-                usb_free_urb(acm->read_urbs[i]);
         acm_write_buffers_free(acm);
-        usb_free_coherent(usb_dev, acm->ctrlsize, acm->ctrl_buffer, acm->ctrl_dma);
+        usb_free_coherent(acm->dev, acm->ctrlsize, acm->ctrl_buffer, acm->ctrl_dma);
         acm_read_buffers_free(acm);
 
         if (!acm->combined_interfaces)
@@ -1603,7 +1606,8 @@ static int acm_suspend(struct usb_interface *intf, pm_message_t message)
         if (cnt)
                 return 0;
 
-        stop_data_traffic(acm);
+        acm_kill_urbs(acm);
+        cancel_work_sync(&acm->work);
 
         return 0;
 }
@@ -1657,6 +1661,15 @@ static int acm_reset_resume(struct usb_interface *intf)
 
 #endif /* CONFIG_PM */
 
+static int acm_pre_reset(struct usb_interface *intf)
+{
+        struct acm *acm = usb_get_intfdata(intf);
+
+        clear_bit(EVENT_RX_STALL, &acm->flags);
+
+        return 0;
+}
+
 #define NOKIA_PCSUITE_ACM_INFO(x) \
                 USB_DEVICE_AND_INTERFACE_INFO(0x0421, x, \
                 USB_CLASS_COMM, USB_CDC_SUBCLASS_ACM, \
@@ -1719,6 +1732,7 @@ static const struct usb_device_id acm_ids[] = {
         { USB_DEVICE(0x20df, 0x0001), /* Simtec Electronics Entropy Key */
         .driver_info = QUIRK_CONTROL_LINE_STATE, },
         { USB_DEVICE(0x2184, 0x001c) }, /* GW Instek AFG-2225 */
+        { USB_DEVICE(0x2184, 0x0036) }, /* GW Instek AFG-125 */
         { USB_DEVICE(0x22b8, 0x6425), /* Motorola MOTOMAGX phones */
         },
         /* Motorola H24 HSPA module: */
@@ -1898,6 +1912,7 @@ static struct usb_driver acm_driver = {
         .resume =       acm_resume,
         .reset_resume = acm_reset_resume,
 #endif
+        .pre_reset =    acm_pre_reset,
         .id_table =     acm_ids,
 #ifdef CONFIG_PM
         .supports_autosuspend = 1,
@@ -1927,6 +1942,7 @@ static const struct tty_operations acm_ops = {
         .set_termios =          acm_tty_set_termios,
         .tiocmget =             acm_tty_tiocmget,
         .tiocmset =             acm_tty_tiocmset,
+        .get_icount =           acm_tty_get_icount,
 };
 
 /*
diff --git a/drivers/usb/class/cdc-acm.h b/drivers/usb/class/cdc-acm.h
index 1f1eabfd8462..c980f11cdf56 100644
--- a/drivers/usb/class/cdc-acm.h
+++ b/drivers/usb/class/cdc-acm.h
@@ -83,6 +83,7 @@ struct acm {
         struct usb_device *dev;                         /* the corresponding usb device */
         struct usb_interface *control;                  /* control interface */
         struct usb_interface *data;                     /* data interface */
+        unsigned in, out;                               /* i/o pipes */
         struct tty_port port;                           /* our tty port data */
         struct urb *ctrlurb;                            /* urbs */
         u8 *ctrl_buffer;                                /* buffers of urbs */
@@ -102,6 +103,9 @@ struct acm {
         spinlock_t write_lock;
         struct mutex mutex;
         bool disconnected;
+        unsigned long flags;
+#               define EVENT_TTY_WAKEUP 0
+#               define EVENT_RX_STALL   1
         struct usb_cdc_line_coding line;                /* bits, stop, parity */
         struct work_struct work;                        /* work queue entry for line discipline waking up */
         unsigned int ctrlin;                            /* input control lines (DCD, DSR, RI, break, overruns) */
@@ -116,7 +120,6 @@ struct acm {
         unsigned int ctrl_caps;                         /* control capabilities from the class specific header */
         unsigned int susp_count;                        /* number of suspended interfaces */
         unsigned int combined_interfaces:1;             /* control and data collapsed */
-        unsigned int is_int_ep:1;                       /* interrupt endpoints contrary to spec used */
         unsigned int throttled:1;                       /* actually throttled */
         unsigned int throttle_req:1;                    /* throttle requested */
         u8 bInterval;
diff --git a/drivers/usb/class/usbtmc.c b/drivers/usb/class/usbtmc.c
index a6c1fae7d52a..f03692ec5520 100644
--- a/drivers/usb/class/usbtmc.c
+++ b/drivers/usb/class/usbtmc.c
@@ -157,6 +157,7 @@ static int usbtmc_open(struct inode *inode, struct file *filp)
         }
 
         data = usb_get_intfdata(intf);
+        /* Protect reference to data from file structure until release */
         kref_get(&data->kref);
 
         /* Store pointer in file structure's private data field */
@@ -531,7 +532,7 @@ static int usbtmc488_ioctl_simple(struct usbtmc_device_data *data,
 }
 
 /*
- * Sends a REQUEST_DEV_DEP_MSG_IN message on the Bulk-IN endpoint.
+ * Sends a REQUEST_DEV_DEP_MSG_IN message on the Bulk-OUT endpoint.
  * @transfer_size: number of bytes to request from the device.
  *
  * See the USBTMC specification, Table 4.
@@ -1471,7 +1472,7 @@ static int usbtmc_probe(struct usb_interface *intf,
                 if (!data->iin_urb)
                         goto error_register;
 
-                /* will reference data in int urb */
+                /* Protect interrupt in endpoint data until iin_urb is freed */
                 kref_get(&data->kref);
 
                 /* allocate buffer for interrupt in */
diff --git a/drivers/usb/core/buffer.c b/drivers/usb/core/buffer.c
index 98e39f91723a..b9bf6e2eb6fe 100644
--- a/drivers/usb/core/buffer.c
+++ b/drivers/usb/core/buffer.c
@@ -3,6 +3,9 @@
  *
  * This implementation plugs in through generic "usb_bus" level methods,
  * and should work with all USB controllers, regardless of bus type.
+ *
+ * Released under the GPLv2 only.
+ * SPDX-License-Identifier: GPL-2.0
  */
 
 #include <linux/module.h>
diff --git a/drivers/usb/core/config.c b/drivers/usb/core/config.c
index a2d90aca779f..0aa9e7d697a5 100644
--- a/drivers/usb/core/config.c
+++ b/drivers/usb/core/config.c
@@ -1,3 +1,8 @@
+/*
+ * Released under the GPLv2 only.
+ * SPDX-License-Identifier: GPL-2.0
+ */
+
 #include <linux/usb.h>
 #include <linux/usb/ch9.h>
 #include <linux/usb/hcd.h>
diff --git a/drivers/usb/core/devices.c b/drivers/usb/core/devices.c
index ef04b50e6bbb..f2987ddb1cde 100644
--- a/drivers/usb/core/devices.c
+++ b/drivers/usb/core/devices.c
@@ -182,14 +182,8 @@ static char *usb_dump_endpoint_descriptor(int speed, char *start, char *end,
 
         dir = usb_endpoint_dir_in(desc) ? 'I' : 'O';
 
-        if (speed == USB_SPEED_HIGH) {
-                switch (usb_endpoint_maxp(desc) & (0x03 << 11)) {
-                case 1 << 11:
-                        bandwidth = 2; break;
-                case 2 << 11:
-                        bandwidth = 3; break;
-                }
-        }
+        if (speed == USB_SPEED_HIGH)
+                bandwidth = usb_endpoint_maxp_mult(desc);
 
         /* this isn't checking for illegal values */
         switch (usb_endpoint_type(desc)) {
@@ -233,7 +227,7 @@ static char *usb_dump_endpoint_descriptor(int speed, char *start, char *end,
 
         start += sprintf(start, format_endpt, desc->bEndpointAddress, dir,
                          desc->bmAttributes, type,
-                         (usb_endpoint_maxp(desc) & 0x07ff) *
+                         usb_endpoint_maxp(desc) *
                          bandwidth,
                          interval, unit);
         return start;
diff --git a/drivers/usb/core/driver.c b/drivers/usb/core/driver.c
index dadd1e8dfe09..cdee5130638b 100644
--- a/drivers/usb/core/driver.c
+++ b/drivers/usb/core/driver.c
@@ -15,6 +15,9 @@
  *              (usb_device_id matching changes by Adam J. Richter)
  *      (C) Copyright Greg Kroah-Hartman 2002-2003
  *
+ * Released under the GPLv2 only.
+ * SPDX-License-Identifier: GPL-2.0
+ *
  * NOTE! This is not actually a driver at all, rather this is
  * just a collection of helper routines that implement the
  * matching, probing, releasing, suspending and resuming for
diff --git a/drivers/usb/core/endpoint.c b/drivers/usb/core/endpoint.c
index 101983b7e8d2..a60bc830a056 100644
--- a/drivers/usb/core/endpoint.c
+++ b/drivers/usb/core/endpoint.c
@@ -5,8 +5,10 @@
  * (C) Copyright 2002,2004 IBM Corp.
  * (C) Copyright 2006 Novell Inc.
  *
- * Endpoint sysfs stuff
+ * Released under the GPLv2 only.
+ * SPDX-License-Identifier: GPL-2.0
  *
+ * Endpoint sysfs stuff
  */
 
 #include <linux/kernel.h>
@@ -50,8 +52,7 @@ static ssize_t wMaxPacketSize_show(struct device *dev,
                                    struct device_attribute *attr, char *buf)
 {
         struct ep_device *ep = to_ep_device(dev);
-        return sprintf(buf, "%04x\n",
-                        usb_endpoint_maxp(ep->desc) & 0x07ff);
+        return sprintf(buf, "%04x\n", usb_endpoint_maxp(ep->desc));
 }
 static DEVICE_ATTR_RO(wMaxPacketSize);
 
diff --git a/drivers/usb/core/file.c b/drivers/usb/core/file.c
index 822ced9639aa..e26bd5e773ad 100644
--- a/drivers/usb/core/file.c
+++ b/drivers/usb/core/file.c
@@ -13,6 +13,8 @@
  *     (usb_device_id matching changes by Adam J. Richter)
  * (C) Copyright Greg Kroah-Hartman 2002-2003
  *
+ * Released under the GPLv2 only.
+ * SPDX-License-Identifier: GPL-2.0
  */
 
 #include <linux/module.h>
diff --git a/drivers/usb/core/generic.c b/drivers/usb/core/generic.c
index 358ca8dd784f..bd3e0c5a6db2 100644
--- a/drivers/usb/core/generic.c
+++ b/drivers/usb/core/generic.c
@@ -15,6 +15,8 @@
  *              (usb_device_id matching changes by Adam J. Richter)
  *      (C) Copyright Greg Kroah-Hartman 2002-2003
  *
+ * Released under the GPLv2 only.
+ * SPDX-License-Identifier: GPL-2.0
  */
 
 #include <linux/usb.h>
diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c
index cbb146736f57..143454ea385b 100644
--- a/drivers/usb/core/hub.c
+++ b/drivers/usb/core/hub.c
@@ -6,6 +6,8 @@
  * (C) Copyright 1999 Gregory P. Smith
  * (C) Copyright 2001 Brad Hards (bhards@bigpond.net.au)
  *
+ * Released under the GPLv2 only.
+ * SPDX-License-Identifier: GPL-2.0
  */
 
 #include <linux/kernel.h>
@@ -101,6 +103,8 @@ EXPORT_SYMBOL_GPL(ehci_cf_port_reset_rwsem);
 
 static void hub_release(struct kref *kref);
 static int usb_reset_and_verify_device(struct usb_device *udev);
+static void hub_usb3_port_prepare_disable(struct usb_hub *hub,
+                                          struct usb_port *port_dev);
 
 static inline char *portspeed(struct usb_hub *hub, int portstatus)
 {
@@ -899,82 +903,28 @@ static int hub_set_port_link_state(struct usb_hub *hub, int port1,
 }
 
 /*
- * If USB 3.0 ports are placed into the Disabled state, they will no longer
- * detect any device connects or disconnects.  This is generally not what the
- * USB core wants, since it expects a disabled port to produce a port status
- * change event when a new device connects.
- *
- * Instead, set the link state to Disabled, wait for the link to settle into
- * that state, clear any change bits, and then put the port into the RxDetect
- * state.
+ * USB-3 does not have a similar link state as USB-2 that will avoid negotiating
+ * a connection with a plugged-in cable but will signal the host when the cable
+ * is unplugged. Disable remote wake and set link state to U3 for USB-3 devices
  */
-static int hub_usb3_port_disable(struct usb_hub *hub, int port1)
-{
-        int ret;
-        int total_time;
-        u16 portchange, portstatus;
-
-        if (!hub_is_superspeed(hub->hdev))
-                return -EINVAL;
-
-        ret = hub_port_status(hub, port1, &portstatus, &portchange);
-        if (ret < 0)
-                return ret;
-
-        /*
-         * USB controller Advanced Micro Devices, Inc. [AMD] FCH USB XHCI
-         * Controller [1022:7814] will have spurious result making the following
-         * usb 3.0 device hotplugging route to the 2.0 root hub and recognized
-         * as high-speed device if we set the usb 3.0 port link state to
-         * Disabled. Since it's already in USB_SS_PORT_LS_RX_DETECT state, we
-         * check the state here to avoid the bug.
-         */
-        if ((portstatus & USB_PORT_STAT_LINK_STATE) ==
-                                USB_SS_PORT_LS_RX_DETECT) {
-                dev_dbg(&hub->ports[port1 - 1]->dev,
-                         "Not disabling port; link state is RxDetect\n");
-                return ret;
-        }
-
-        ret = hub_set_port_link_state(hub, port1, USB_SS_PORT_LS_SS_DISABLED);
-        if (ret)
-                return ret;
-
-        /* Wait for the link to enter the disabled state. */
-        for (total_time = 0; ; total_time += HUB_DEBOUNCE_STEP) {
-                ret = hub_port_status(hub, port1, &portstatus, &portchange);
-                if (ret < 0)
-                        return ret;
-
-                if ((portstatus & USB_PORT_STAT_LINK_STATE) ==
-                                USB_SS_PORT_LS_SS_DISABLED)
-                        break;
-                if (total_time >= HUB_DEBOUNCE_TIMEOUT)
-                        break;
-                msleep(HUB_DEBOUNCE_STEP);
-        }
-        if (total_time >= HUB_DEBOUNCE_TIMEOUT)
-                dev_warn(&hub->ports[port1 - 1]->dev,
-                                "Could not disable after %d ms\n", total_time);
-
-        return hub_set_port_link_state(hub, port1, USB_SS_PORT_LS_RX_DETECT);
-}
-
 static int hub_port_disable(struct usb_hub *hub, int port1, int set_state)
 {
         struct usb_port *port_dev = hub->ports[port1 - 1];
         struct usb_device *hdev = hub->hdev;
         int ret = 0;
 
-        if (port_dev->child && set_state)
-                usb_set_device_state(port_dev->child, USB_STATE_NOTATTACHED);
         if (!hub->error) {
-                if (hub_is_superspeed(hub->hdev))
-                        ret = hub_usb3_port_disable(hub, port1);
-                else
+                if (hub_is_superspeed(hub->hdev)) {
+                        hub_usb3_port_prepare_disable(hub, port_dev);
+                        ret = hub_set_port_link_state(hub, port_dev->portnum,
+                                                      USB_SS_PORT_LS_U3);
+                } else {
                         ret = usb_clear_port_feature(hdev, port1,
                                         USB_PORT_FEAT_ENABLE);
+                }
         }
+        if (port_dev->child && set_state)
+                usb_set_device_state(port_dev->child, USB_STATE_NOTATTACHED);
         if (ret && ret != -ENODEV)
                 dev_err(&port_dev->dev, "cannot disable (err = %d)\n", ret);
         return ret;
@@ -2731,8 +2681,15 @@ static int hub_port_wait_reset(struct usb_hub *hub, int port1,
                 if (ret < 0)
                         return ret;
 
-                /* The port state is unknown until the reset completes. */
-                if (!(portstatus & USB_PORT_STAT_RESET))
+                /*
+                 * The port state is unknown until the reset completes.
+                 *
+                 * On top of that, some chips may require additional time
+                 * to re-establish a connection after the reset is complete,
+                 * so also wait for the connection to be re-established.
+                 */
+                if (!(portstatus & USB_PORT_STAT_RESET) &&
+                    (portstatus & USB_PORT_STAT_CONNECTION))
                         break;
 
                 /* switch to the long delay after two short delay failures */
@@ -4140,6 +4097,26 @@ void usb_unlocked_enable_lpm(struct usb_device *udev)
 }
 EXPORT_SYMBOL_GPL(usb_unlocked_enable_lpm);
 
+/* usb3 devices use U3 for disabled, make sure remote wakeup is disabled */
+static void hub_usb3_port_prepare_disable(struct usb_hub *hub,
+                                          struct usb_port *port_dev)
+{
+        struct usb_device *udev = port_dev->child;
+        int ret;
+
+        if (udev && udev->port_is_suspended && udev->do_remote_wakeup) {
+                ret = hub_set_port_link_state(hub, port_dev->portnum,
+                                              USB_SS_PORT_LS_U0);
+                if (!ret) {
+                        msleep(USB_RESUME_TIMEOUT);
+                        ret = usb_disable_remote_wakeup(udev);
+                }
+                if (ret)
+                        dev_warn(&udev->dev,
+                                 "Port disable: can't disable remote wake\n");
+                udev->do_remote_wakeup = 0;
+        }
+}
 
 #else   /* CONFIG_PM */
 
@@ -4147,6 +4124,9 @@ EXPORT_SYMBOL_GPL(usb_unlocked_enable_lpm);
 #define hub_resume              NULL
 #define hub_reset_resume        NULL
 
+static inline void hub_usb3_port_prepare_disable(struct usb_hub *hub,
+                                                 struct usb_port *port_dev) { }
+
 int usb_disable_lpm(struct usb_device *udev)
 {
         return 0;
diff --git a/drivers/usb/core/ledtrig-usbport.c b/drivers/usb/core/ledtrig-usbport.c
index 3ed5162677ad..1713248ab15a 100644
--- a/drivers/usb/core/ledtrig-usbport.c
+++ b/drivers/usb/core/ledtrig-usbport.c
@@ -74,8 +74,7 @@ static void usbport_trig_update_count(struct usbport_trig_data *usbport_data)
 
         usbport_data->count = 0;
         usb_for_each_dev(usbport_data, usbport_trig_usb_dev_check);
-        led_cdev->brightness_set(led_cdev,
-                                 usbport_data->count ? LED_FULL : LED_OFF);
+        led_set_brightness(led_cdev, usbport_data->count ? LED_FULL : LED_OFF);
 }
 
 /***************************************
@@ -228,12 +227,12 @@ static int usbport_trig_notify(struct notifier_block *nb, unsigned long action,
         case USB_DEVICE_ADD:
                 usbport_trig_add_usb_dev_ports(usb_dev, usbport_data);
                 if (observed && usbport_data->count++ == 0)
-                        led_cdev->brightness_set(led_cdev, LED_FULL);
+                        led_set_brightness(led_cdev, LED_FULL);
                 return NOTIFY_OK;
         case USB_DEVICE_REMOVE:
                 usbport_trig_remove_usb_dev_ports(usbport_data, usb_dev);
                 if (observed && --usbport_data->count == 0)
-                        led_cdev->brightness_set(led_cdev, LED_OFF);
+                        led_set_brightness(led_cdev, LED_OFF);
                 return NOTIFY_OK;
         }
 
diff --git a/drivers/usb/core/message.c b/drivers/usb/core/message.c
index 3a4707746157..dea55914d641 100644
--- a/drivers/usb/core/message.c
+++ b/drivers/usb/core/message.c
@@ -1,5 +1,8 @@
 /*
  * message.c - synchronous message handling
+ *
+ * Released under the GPLv2 only.
+ * SPDX-License-Identifier: GPL-2.0
  */
 
 #include <linux/pci.h>  /* for scatterlist macros */
diff --git a/drivers/usb/core/notify.c b/drivers/usb/core/notify.c
index 7728c91dfa2e..b12a463a3e22 100644
--- a/drivers/usb/core/notify.c
+++ b/drivers/usb/core/notify.c
@@ -6,6 +6,8 @@
  * notifier functions originally based on those in kernel/sys.c
  * but fixed up to not be so broken.
  *
+ * Released under the GPLv2 only.
+ * SPDX-License-Identifier: GPL-2.0
  */
 
 
diff --git a/drivers/usb/core/sysfs.c b/drivers/usb/core/sysfs.c
index c953a0f1c695..dfc68ed24db1 100644
--- a/drivers/usb/core/sysfs.c
+++ b/drivers/usb/core/sysfs.c
@@ -7,6 +7,8 @@
  *
  * All of the sysfs file attributes for usb devices and interfaces.
  *
+ * Released under the GPLv2 only.
+ * SPDX-License-Identifier: GPL-2.0
  */
 
 
@@ -14,6 +16,7 @@
 #include <linux/string.h>
 #include <linux/usb.h>
 #include <linux/usb/quirks.h>
+#include <linux/of.h>
 #include "usb.h"
 
 /* Active configuration fields */
@@ -104,6 +107,17 @@ static ssize_t bConfigurationValue_store(struct device *dev,
 static DEVICE_ATTR_IGNORE_LOCKDEP(bConfigurationValue, S_IRUGO | S_IWUSR,
                 bConfigurationValue_show, bConfigurationValue_store);
 
+#ifdef CONFIG_OF
+static ssize_t devspec_show(struct device *dev, struct device_attribute *attr,
+                            char *buf)
+{
+        struct device_node *of_node = dev->of_node;
+
+        return sprintf(buf, "%s\n", of_node_full_name(of_node));
+}
+static DEVICE_ATTR_RO(devspec);
+#endif
+
 /* String fields */
 #define usb_string_attr(name)                                           \
 static ssize_t  name##_show(struct device *dev,                         \
@@ -786,6 +800,9 @@ static struct attribute *dev_attrs[] = {
         &dev_attr_remove.attr,
         &dev_attr_removable.attr,
         &dev_attr_ltm_capable.attr,
+#ifdef CONFIG_OF
+        &dev_attr_devspec.attr,
+#endif
         NULL,
 };
 static struct attribute_group dev_attr_grp = {
diff --git a/drivers/usb/core/urb.c b/drivers/usb/core/urb.c
index a9039696476e..d75cb8c0f7df 100644
--- a/drivers/usb/core/urb.c
+++ b/drivers/usb/core/urb.c
@@ -1,3 +1,8 @@
+/*
+ * Released under the GPLv2 only.
+ * SPDX-License-Identifier: GPL-2.0
+ */
+
 #include <linux/module.h>
 #include <linux/string.h>
 #include <linux/bitops.h>
@@ -407,11 +412,8 @@ int usb_submit_urb(struct urb *urb, gfp_t mem_flags)
                 }
 
                 /* "high bandwidth" mode, 1-3 packets/uframe? */
-                if (dev->speed == USB_SPEED_HIGH) {
-                        int     mult = 1 + ((max >> 11) & 0x03);
-                        max &= 0x07ff;
-                        max *= mult;
-                }
+                if (dev->speed == USB_SPEED_HIGH)
+                        max *= usb_endpoint_maxp_mult(&ep->desc);
 
                 if (urb->number_of_packets <= 0)
                         return -EINVAL;
diff --git a/drivers/usb/core/usb.c b/drivers/usb/core/usb.c
index 592151461017..a2ccc69fb45c 100644
--- a/drivers/usb/core/usb.c
+++ b/drivers/usb/core/usb.c
@@ -12,6 +12,9 @@
  *     (usb_device_id matching changes by Adam J. Richter)
  * (C) Copyright Greg Kroah-Hartman 2002-2003
  *
+ * Released under the GPLv2 only.
+ * SPDX-License-Identifier: GPL-2.0
+ *
  * NOTE! This is not actually a driver at all, rather this is
  * just a collection of helper routines that implement the
  * generic USB things that the real drivers can use..
diff --git a/drivers/usb/core/usb.h b/drivers/usb/core/usb.h
index 53318126ed91..dc6949248823 100644
--- a/drivers/usb/core/usb.h
+++ b/drivers/usb/core/usb.h
@@ -1,3 +1,8 @@
+/*
+ * Released under the GPLv2 only.
+ * SPDX-License-Identifier: GPL-2.0
+ */
+
 #include <linux/pm.h>
 #include <linux/acpi.h>
 
diff --git a/drivers/usb/dwc2/Makefile b/drivers/usb/dwc2/Makefile
index 50fdaace1e73..b9237e1e45d0 100644
--- a/drivers/usb/dwc2/Makefile
+++ b/drivers/usb/dwc2/Makefile
@@ -3,6 +3,7 @@ ccflags-$(CONFIG_USB_DWC2_VERBOSE)	+= -DVERBOSE_DEBUG
 
 obj-$(CONFIG_USB_DWC2)                  += dwc2.o
 dwc2-y                                  := core.o core_intr.o platform.o
+dwc2-y                                  += params.o
 
 ifneq ($(filter y,$(CONFIG_USB_DWC2_HOST) $(CONFIG_USB_DWC2_DUAL_ROLE)),)
         dwc2-y                          += hcd.o hcd_intr.o
diff --git a/drivers/usb/dwc2/core.c b/drivers/usb/dwc2/core.c
index 4c0fa0b17353..11d8ae9aead1 100644
--- a/drivers/usb/dwc2/core.c
+++ b/drivers/usb/dwc2/core.c
@@ -135,7 +135,7 @@ int dwc2_exit_hibernation(struct dwc2_hsotg *hsotg, bool restore)
         u32 pcgcctl;
         int ret = 0;
 
-        if (!hsotg->core_params->hibernation)
+        if (!hsotg->params.hibernation)
                 return -ENOTSUPP;
 
         pcgcctl = dwc2_readl(hsotg->regs + PCGCTL);
@@ -188,7 +188,7 @@ int dwc2_enter_hibernation(struct dwc2_hsotg *hsotg)
         u32 pcgcctl;
         int ret = 0;
 
-        if (!hsotg->core_params->hibernation)
+        if (!hsotg->params.hibernation)
                 return -ENOTSUPP;
 
         /* Backup all registers */
@@ -445,7 +445,7 @@ static bool dwc2_force_mode(struct dwc2_hsotg *hsotg, bool host)
  * the force mode. We only need to call this once during probe if
  * dr_mode == OTG.
  */
-static void dwc2_clear_force_mode(struct dwc2_hsotg *hsotg)
+void dwc2_clear_force_mode(struct dwc2_hsotg *hsotg)
 {
         u32 gusbcfg;
 
@@ -541,7 +541,7 @@ void dwc2_dump_host_registers(struct dwc2_hsotg *hsotg)
         addr = hsotg->regs + HAINTMSK;
         dev_dbg(hsotg->dev, "HAINTMSK    @0x%08lX : 0x%08X\n",
                 (unsigned long)addr, dwc2_readl(addr));
-        if (hsotg->core_params->dma_desc_enable > 0) {
+        if (hsotg->params.dma_desc_enable > 0) {
                 addr = hsotg->regs + HFLBADDR;
                 dev_dbg(hsotg->dev, "HFLBADDR @0x%08lX : 0x%08X\n",
                         (unsigned long)addr, dwc2_readl(addr));
@@ -551,7 +551,7 @@ void dwc2_dump_host_registers(struct dwc2_hsotg *hsotg)
         dev_dbg(hsotg->dev, "HPRT0       @0x%08lX : 0x%08X\n",
                 (unsigned long)addr, dwc2_readl(addr));
 
-        for (i = 0; i < hsotg->core_params->host_channels; i++) {
+        for (i = 0; i < hsotg->params.host_channels; i++) {
                 dev_dbg(hsotg->dev, "Host Channel %d Specific Registers\n", i);
                 addr = hsotg->regs + HCCHAR(i);
                 dev_dbg(hsotg->dev, "HCCHAR      @0x%08lX : 0x%08X\n",
@@ -571,7 +571,7 @@ void dwc2_dump_host_registers(struct dwc2_hsotg *hsotg)
                 addr = hsotg->regs + HCDMA(i);
                 dev_dbg(hsotg->dev, "HCDMA       @0x%08lX : 0x%08X\n",
                         (unsigned long)addr, dwc2_readl(addr));
-                if (hsotg->core_params->dma_desc_enable > 0) {
+                if (hsotg->params.dma_desc_enable > 0) {
                         addr = hsotg->regs + HCDMAB(i);
                         dev_dbg(hsotg->dev, "HCDMAB      @0x%08lX : 0x%08X\n",
                                 (unsigned long)addr, dwc2_readl(addr));
@@ -735,704 +735,13 @@ void dwc2_flush_rx_fifo(struct dwc2_hsotg *hsotg)
         udelay(1);
 }
 
-#define DWC2_OUT_OF_BOUNDS(a, b, c)     ((a) < (b) || (a) > (c))
-
-/* Parameter access functions */
-void dwc2_set_param_otg_cap(struct dwc2_hsotg *hsotg, int val)
-{
-        int valid = 1;
-
-        switch (val) {
-        case DWC2_CAP_PARAM_HNP_SRP_CAPABLE:
-                if (hsotg->hw_params.op_mode != GHWCFG2_OP_MODE_HNP_SRP_CAPABLE)
-                        valid = 0;
-                break;
-        case DWC2_CAP_PARAM_SRP_ONLY_CAPABLE:
-                switch (hsotg->hw_params.op_mode) {
-                case GHWCFG2_OP_MODE_HNP_SRP_CAPABLE:
-                case GHWCFG2_OP_MODE_SRP_ONLY_CAPABLE:
-                case GHWCFG2_OP_MODE_SRP_CAPABLE_DEVICE:
-                case GHWCFG2_OP_MODE_SRP_CAPABLE_HOST:
-                        break;
-                default:
-                        valid = 0;
-                        break;
-                }
-                break;
-        case DWC2_CAP_PARAM_NO_HNP_SRP_CAPABLE:
-                /* always valid */
-                break;
-        default:
-                valid = 0;
-                break;
-        }
-
-        if (!valid) {
-                if (val >= 0)
-                        dev_err(hsotg->dev,
-                                "%d invalid for otg_cap parameter. Check HW configuration.\n",
-                                val);
-                switch (hsotg->hw_params.op_mode) {
-                case GHWCFG2_OP_MODE_HNP_SRP_CAPABLE:
-                        val = DWC2_CAP_PARAM_HNP_SRP_CAPABLE;
-                        break;
-                case GHWCFG2_OP_MODE_SRP_ONLY_CAPABLE:
-                case GHWCFG2_OP_MODE_SRP_CAPABLE_DEVICE:
-                case GHWCFG2_OP_MODE_SRP_CAPABLE_HOST:
-                        val = DWC2_CAP_PARAM_SRP_ONLY_CAPABLE;
-                        break;
-                default:
-                        val = DWC2_CAP_PARAM_NO_HNP_SRP_CAPABLE;
-                        break;
-                }
-                dev_dbg(hsotg->dev, "Setting otg_cap to %d\n", val);
-        }
-
-        hsotg->core_params->otg_cap = val;
-}
-
-void dwc2_set_param_dma_enable(struct dwc2_hsotg *hsotg, int val)
-{
-        int valid = 1;
-
-        if (val > 0 && hsotg->hw_params.arch == GHWCFG2_SLAVE_ONLY_ARCH)
-                valid = 0;
-        if (val < 0)
-                valid = 0;
-
-        if (!valid) {
-                if (val >= 0)
-                        dev_err(hsotg->dev,
-                                "%d invalid for dma_enable parameter. Check HW configuration.\n",
-                                val);
-                val = hsotg->hw_params.arch != GHWCFG2_SLAVE_ONLY_ARCH;
-                dev_dbg(hsotg->dev, "Setting dma_enable to %d\n", val);
-        }
-
-        hsotg->core_params->dma_enable = val;
-}
-
-void dwc2_set_param_dma_desc_enable(struct dwc2_hsotg *hsotg, int val)
-{
-        int valid = 1;
-
-        if (val > 0 && (hsotg->core_params->dma_enable <= 0 ||
-                        !hsotg->hw_params.dma_desc_enable))
-                valid = 0;
-        if (val < 0)
-                valid = 0;
-
-        if (!valid) {
-                if (val >= 0)
-                        dev_err(hsotg->dev,
-                                "%d invalid for dma_desc_enable parameter. Check HW configuration.\n",
-                                val);
-                val = (hsotg->core_params->dma_enable > 0 &&
-                        hsotg->hw_params.dma_desc_enable);
-                dev_dbg(hsotg->dev, "Setting dma_desc_enable to %d\n", val);
-        }
-
-        hsotg->core_params->dma_desc_enable = val;
-}
-
-void dwc2_set_param_dma_desc_fs_enable(struct dwc2_hsotg *hsotg, int val)
-{
-        int valid = 1;
-
-        if (val > 0 && (hsotg->core_params->dma_enable <= 0 ||
-                        !hsotg->hw_params.dma_desc_enable))
-                valid = 0;
-        if (val < 0)
-                valid = 0;
-
-        if (!valid) {
-                if (val >= 0)
-                        dev_err(hsotg->dev,
-                                "%d invalid for dma_desc_fs_enable parameter. Check HW configuration.\n",
-                                val);
-                val = (hsotg->core_params->dma_enable > 0 &&
-                        hsotg->hw_params.dma_desc_enable);
-        }
-
-        hsotg->core_params->dma_desc_fs_enable = val;
-        dev_dbg(hsotg->dev, "Setting dma_desc_fs_enable to %d\n", val);
-}
-
-void dwc2_set_param_host_support_fs_ls_low_power(struct dwc2_hsotg *hsotg,
-                                                 int val)
-{
-        if (DWC2_OUT_OF_BOUNDS(val, 0, 1)) {
-                if (val >= 0) {
-                        dev_err(hsotg->dev,
-                                "Wrong value for host_support_fs_low_power\n");
-                        dev_err(hsotg->dev,
-                                "host_support_fs_low_power must be 0 or 1\n");
-                }
-                val = 0;
-                dev_dbg(hsotg->dev,
-                        "Setting host_support_fs_low_power to %d\n", val);
-        }
-
-        hsotg->core_params->host_support_fs_ls_low_power = val;
-}
-
-void dwc2_set_param_enable_dynamic_fifo(struct dwc2_hsotg *hsotg, int val)
-{
-        int valid = 1;
-
-        if (val > 0 && !hsotg->hw_params.enable_dynamic_fifo)
-                valid = 0;
-        if (val < 0)
-                valid = 0;
-
-        if (!valid) {
-                if (val >= 0)
-                        dev_err(hsotg->dev,
-                                "%d invalid for enable_dynamic_fifo parameter. Check HW configuration.\n",
-                                val);
-                val = hsotg->hw_params.enable_dynamic_fifo;
-                dev_dbg(hsotg->dev, "Setting enable_dynamic_fifo to %d\n", val);
-        }
-
-        hsotg->core_params->enable_dynamic_fifo = val;
-}
-
-void dwc2_set_param_host_rx_fifo_size(struct dwc2_hsotg *hsotg, int val)
-{
-        int valid = 1;
-
-        if (val < 16 || val > hsotg->hw_params.host_rx_fifo_size)
-                valid = 0;
-
-        if (!valid) {
-                if (val >= 0)
-                        dev_err(hsotg->dev,
-                                "%d invalid for host_rx_fifo_size. Check HW configuration.\n",
-                                val);
-                val = hsotg->hw_params.host_rx_fifo_size;
-                dev_dbg(hsotg->dev, "Setting host_rx_fifo_size to %d\n", val);
-        }
-
-        hsotg->core_params->host_rx_fifo_size = val;
-}
-
-void dwc2_set_param_host_nperio_tx_fifo_size(struct dwc2_hsotg *hsotg, int val)
-{
-        int valid = 1;
-
-        if (val < 16 || val > hsotg->hw_params.host_nperio_tx_fifo_size)
-                valid = 0;
-
-        if (!valid) {
-                if (val >= 0)
-                        dev_err(hsotg->dev,
-                                "%d invalid for host_nperio_tx_fifo_size. Check HW configuration.\n",
-                                val);
-                val = hsotg->hw_params.host_nperio_tx_fifo_size;
-                dev_dbg(hsotg->dev, "Setting host_nperio_tx_fifo_size to %d\n",
-                        val);
-        }
-
-        hsotg->core_params->host_nperio_tx_fifo_size = val;
-}
-
-void dwc2_set_param_host_perio_tx_fifo_size(struct dwc2_hsotg *hsotg, int val)
-{
-        int valid = 1;
-
-        if (val < 16 || val > hsotg->hw_params.host_perio_tx_fifo_size)
-                valid = 0;
-
-        if (!valid) {
-                if (val >= 0)
-                        dev_err(hsotg->dev,
-                                "%d invalid for host_perio_tx_fifo_size. Check HW configuration.\n",
-                                val);
-                val = hsotg->hw_params.host_perio_tx_fifo_size;
-                dev_dbg(hsotg->dev, "Setting host_perio_tx_fifo_size to %d\n",
-                        val);
-        }
-
-        hsotg->core_params->host_perio_tx_fifo_size = val;
-}
-
-void dwc2_set_param_max_transfer_size(struct dwc2_hsotg *hsotg, int val)
-{
-        int valid = 1;
-
-        if (val < 2047 || val > hsotg->hw_params.max_transfer_size)
-                valid = 0;
-
-        if (!valid) {
-                if (val >= 0)
-                        dev_err(hsotg->dev,
-                                "%d invalid for max_transfer_size. Check HW configuration.\n",
-                                val);
-                val = hsotg->hw_params.max_transfer_size;
-                dev_dbg(hsotg->dev, "Setting max_transfer_size to %d\n", val);
-        }
-
-        hsotg->core_params->max_transfer_size = val;
-}
-
-void dwc2_set_param_max_packet_count(struct dwc2_hsotg *hsotg, int val)
-{
-        int valid = 1;
-
-        if (val < 15 || val > hsotg->hw_params.max_packet_count)
-                valid = 0;
-
-        if (!valid) {
-                if (val >= 0)
-                        dev_err(hsotg->dev,
-                                "%d invalid for max_packet_count. Check HW configuration.\n",
-                                val);
-                val = hsotg->hw_params.max_packet_count;
-                dev_dbg(hsotg->dev, "Setting max_packet_count to %d\n", val);
-        }
-
-        hsotg->core_params->max_packet_count = val;
-}
-
-void dwc2_set_param_host_channels(struct dwc2_hsotg *hsotg, int val)
-{
-        int valid = 1;
-
-        if (val < 1 || val > hsotg->hw_params.host_channels)
-                valid = 0;
-
-        if (!valid) {
-                if (val >= 0)
-                        dev_err(hsotg->dev,
-                                "%d invalid for host_channels. Check HW configuration.\n",
-                                val);
-                val = hsotg->hw_params.host_channels;
-                dev_dbg(hsotg->dev, "Setting host_channels to %d\n", val);
-        }
-
-        hsotg->core_params->host_channels = val;
-}
-
-void dwc2_set_param_phy_type(struct dwc2_hsotg *hsotg, int val)
-{
-        int valid = 0;
-        u32 hs_phy_type, fs_phy_type;
-
-        if (DWC2_OUT_OF_BOUNDS(val, DWC2_PHY_TYPE_PARAM_FS,
-                               DWC2_PHY_TYPE_PARAM_ULPI)) {
-                if (val >= 0) {
-                        dev_err(hsotg->dev, "Wrong value for phy_type\n");
-                        dev_err(hsotg->dev, "phy_type must be 0, 1 or 2\n");
-                }
-
-                valid = 0;
-        }
-
-        hs_phy_type = hsotg->hw_params.hs_phy_type;
-        fs_phy_type = hsotg->hw_params.fs_phy_type;
-        if (val == DWC2_PHY_TYPE_PARAM_UTMI &&
-            (hs_phy_type == GHWCFG2_HS_PHY_TYPE_UTMI ||
-             hs_phy_type == GHWCFG2_HS_PHY_TYPE_UTMI_ULPI))
-                valid = 1;
-        else if (val == DWC2_PHY_TYPE_PARAM_ULPI &&
-                 (hs_phy_type == GHWCFG2_HS_PHY_TYPE_ULPI ||
-                  hs_phy_type == GHWCFG2_HS_PHY_TYPE_UTMI_ULPI))
-                valid = 1;
-        else if (val == DWC2_PHY_TYPE_PARAM_FS &&
-                 fs_phy_type == GHWCFG2_FS_PHY_TYPE_DEDICATED)
-                valid = 1;
-
-        if (!valid) {
-                if (val >= 0)
-                        dev_err(hsotg->dev,
-                                "%d invalid for phy_type. Check HW configuration.\n",
-                                val);
-                val = DWC2_PHY_TYPE_PARAM_FS;
-                if (hs_phy_type != GHWCFG2_HS_PHY_TYPE_NOT_SUPPORTED) {
-                        if (hs_phy_type == GHWCFG2_HS_PHY_TYPE_UTMI ||
-                            hs_phy_type == GHWCFG2_HS_PHY_TYPE_UTMI_ULPI)
-                                val = DWC2_PHY_TYPE_PARAM_UTMI;
-                        else
-                                val = DWC2_PHY_TYPE_PARAM_ULPI;
-                }
-                dev_dbg(hsotg->dev, "Setting phy_type to %d\n", val);
-        }
-
-        hsotg->core_params->phy_type = val;
-}
-
-static int dwc2_get_param_phy_type(struct dwc2_hsotg *hsotg)
-{
-        return hsotg->core_params->phy_type;
-}
-
-void dwc2_set_param_speed(struct dwc2_hsotg *hsotg, int val)
-{
-        int valid = 1;
-
-        if (DWC2_OUT_OF_BOUNDS(val, 0, 1)) {
-                if (val >= 0) {
-                        dev_err(hsotg->dev, "Wrong value for speed parameter\n");
-                        dev_err(hsotg->dev, "max_speed parameter must be 0 or 1\n");
-                }
-                valid = 0;
-        }
-
-        if (val == DWC2_SPEED_PARAM_HIGH &&
-            dwc2_get_param_phy_type(hsotg) == DWC2_PHY_TYPE_PARAM_FS)
-                valid = 0;
-
-        if (!valid) {
-                if (val >= 0)
-                        dev_err(hsotg->dev,
-                                "%d invalid for speed parameter. Check HW configuration.\n",
-                                val);
-                val = dwc2_get_param_phy_type(hsotg) == DWC2_PHY_TYPE_PARAM_FS ?
-                                DWC2_SPEED_PARAM_FULL : DWC2_SPEED_PARAM_HIGH;
-                dev_dbg(hsotg->dev, "Setting speed to %d\n", val);
-        }
-
-        hsotg->core_params->speed = val;
-}
-
-void dwc2_set_param_host_ls_low_power_phy_clk(struct dwc2_hsotg *hsotg, int val)
-{
-        int valid = 1;
-
-        if (DWC2_OUT_OF_BOUNDS(val, DWC2_HOST_LS_LOW_POWER_PHY_CLK_PARAM_48MHZ,
-                               DWC2_HOST_LS_LOW_POWER_PHY_CLK_PARAM_6MHZ)) {
-                if (val >= 0) {
-                        dev_err(hsotg->dev,
-                                "Wrong value for host_ls_low_power_phy_clk parameter\n");
-                        dev_err(hsotg->dev,
-                                "host_ls_low_power_phy_clk must be 0 or 1\n");
-                }
-                valid = 0;
-        }
-
-        if (val == DWC2_HOST_LS_LOW_POWER_PHY_CLK_PARAM_48MHZ &&
-            dwc2_get_param_phy_type(hsotg) == DWC2_PHY_TYPE_PARAM_FS)
-                valid = 0;
-
-        if (!valid) {
-                if (val >= 0)
-                        dev_err(hsotg->dev,
-                                "%d invalid for host_ls_low_power_phy_clk. Check HW configuration.\n",
-                                val);
-                val = dwc2_get_param_phy_type(hsotg) == DWC2_PHY_TYPE_PARAM_FS
-                        ? DWC2_HOST_LS_LOW_POWER_PHY_CLK_PARAM_6MHZ
-                        : DWC2_HOST_LS_LOW_POWER_PHY_CLK_PARAM_48MHZ;
-                dev_dbg(hsotg->dev, "Setting host_ls_low_power_phy_clk to %d\n",
-                        val);
-        }
-
-        hsotg->core_params->host_ls_low_power_phy_clk = val;
-}
-
-void dwc2_set_param_phy_ulpi_ddr(struct dwc2_hsotg *hsotg, int val)
-{
-        if (DWC2_OUT_OF_BOUNDS(val, 0, 1)) {
-                if (val >= 0) {
-                        dev_err(hsotg->dev, "Wrong value for phy_ulpi_ddr\n");
-                        dev_err(hsotg->dev, "phy_upli_ddr must be 0 or 1\n");
-                }
-                val = 0;
-                dev_dbg(hsotg->dev, "Setting phy_upli_ddr to %d\n", val);
-        }
-
-        hsotg->core_params->phy_ulpi_ddr = val;
-}
-
-void dwc2_set_param_phy_ulpi_ext_vbus(struct dwc2_hsotg *hsotg, int val)
-{
-        if (DWC2_OUT_OF_BOUNDS(val, 0, 1)) {
-                if (val >= 0) {
-                        dev_err(hsotg->dev,
-                                "Wrong value for phy_ulpi_ext_vbus\n");
-                        dev_err(hsotg->dev,
-                                "phy_ulpi_ext_vbus must be 0 or 1\n");
-                }
-                val = 0;
-                dev_dbg(hsotg->dev, "Setting phy_ulpi_ext_vbus to %d\n", val);
-        }
-
-        hsotg->core_params->phy_ulpi_ext_vbus = val;
-}
-
-void dwc2_set_param_phy_utmi_width(struct dwc2_hsotg *hsotg, int val)
-{
-        int valid = 0;
-
-        switch (hsotg->hw_params.utmi_phy_data_width) {
-        case GHWCFG4_UTMI_PHY_DATA_WIDTH_8:
-                valid = (val == 8);
-                break;
-        case GHWCFG4_UTMI_PHY_DATA_WIDTH_16:
-                valid = (val == 16);
-                break;
-        case GHWCFG4_UTMI_PHY_DATA_WIDTH_8_OR_16:
-                valid = (val == 8 || val == 16);
-                break;
-        }
-
-        if (!valid) {
-                if (val >= 0) {
-                        dev_err(hsotg->dev,
-                                "%d invalid for phy_utmi_width. Check HW configuration.\n",
-                                val);
-                }
-                val = (hsotg->hw_params.utmi_phy_data_width ==
-                       GHWCFG4_UTMI_PHY_DATA_WIDTH_8) ? 8 : 16;
-                dev_dbg(hsotg->dev, "Setting phy_utmi_width to %d\n", val);
-        }
-
-        hsotg->core_params->phy_utmi_width = val;
-}
-
-void dwc2_set_param_ulpi_fs_ls(struct dwc2_hsotg *hsotg, int val)
-{
-        if (DWC2_OUT_OF_BOUNDS(val, 0, 1)) {
-                if (val >= 0) {
-                        dev_err(hsotg->dev, "Wrong value for ulpi_fs_ls\n");
-                        dev_err(hsotg->dev, "ulpi_fs_ls must be 0 or 1\n");
-                }
-                val = 0;
-                dev_dbg(hsotg->dev, "Setting ulpi_fs_ls to %d\n", val);
-        }
-
-        hsotg->core_params->ulpi_fs_ls = val;
-}
-
-void dwc2_set_param_ts_dline(struct dwc2_hsotg *hsotg, int val)
-{
-        if (DWC2_OUT_OF_BOUNDS(val, 0, 1)) {
-                if (val >= 0) {
-                        dev_err(hsotg->dev, "Wrong value for ts_dline\n");
-                        dev_err(hsotg->dev, "ts_dline must be 0 or 1\n");
-                }
-                val = 0;
-                dev_dbg(hsotg->dev, "Setting ts_dline to %d\n", val);
-        }
-
-        hsotg->core_params->ts_dline = val;
-}
-
-void dwc2_set_param_i2c_enable(struct dwc2_hsotg *hsotg, int val)
-{
-        int valid = 1;
-
-        if (DWC2_OUT_OF_BOUNDS(val, 0, 1)) {
-                if (val >= 0) {
-                        dev_err(hsotg->dev, "Wrong value for i2c_enable\n");
-                        dev_err(hsotg->dev, "i2c_enable must be 0 or 1\n");
-                }
-
-                valid = 0;
-        }
-
-        if (val == 1 && !(hsotg->hw_params.i2c_enable))
-                valid = 0;
-
-        if (!valid) {
-                if (val >= 0)
-                        dev_err(hsotg->dev,
-                                "%d invalid for i2c_enable. Check HW configuration.\n",
-                                val);
-                val = hsotg->hw_params.i2c_enable;
-                dev_dbg(hsotg->dev, "Setting i2c_enable to %d\n", val);
-        }
-
-        hsotg->core_params->i2c_enable = val;
-}
-
-void dwc2_set_param_en_multiple_tx_fifo(struct dwc2_hsotg *hsotg, int val)
-{
-        int valid = 1;
-
-        if (DWC2_OUT_OF_BOUNDS(val, 0, 1)) {
-                if (val >= 0) {
-                        dev_err(hsotg->dev,
-                                "Wrong value for en_multiple_tx_fifo,\n");
-                        dev_err(hsotg->dev,
-                                "en_multiple_tx_fifo must be 0 or 1\n");
-                }
-                valid = 0;
-        }
-
-        if (val == 1 && !hsotg->hw_params.en_multiple_tx_fifo)
-                valid = 0;
-
-        if (!valid) {
-                if (val >= 0)
-                        dev_err(hsotg->dev,
-                                "%d invalid for parameter en_multiple_tx_fifo. Check HW configuration.\n",
-                                val);
-                val = hsotg->hw_params.en_multiple_tx_fifo;
-                dev_dbg(hsotg->dev, "Setting en_multiple_tx_fifo to %d\n", val);
-        }
-
-        hsotg->core_params->en_multiple_tx_fifo = val;
-}
-
-void dwc2_set_param_reload_ctl(struct dwc2_hsotg *hsotg, int val)
-{
-        int valid = 1;
-
-        if (DWC2_OUT_OF_BOUNDS(val, 0, 1)) {
-                if (val >= 0) {
-                        dev_err(hsotg->dev,
-                                "'%d' invalid for parameter reload_ctl\n", val);
-                        dev_err(hsotg->dev, "reload_ctl must be 0 or 1\n");
-                }
-                valid = 0;
-        }
-
-        if (val == 1 && hsotg->hw_params.snpsid < DWC2_CORE_REV_2_92a)
-                valid = 0;
-
-        if (!valid) {
-                if (val >= 0)
-                        dev_err(hsotg->dev,
-                                "%d invalid for parameter reload_ctl. Check HW configuration.\n",
-                                val);
-                val = hsotg->hw_params.snpsid >= DWC2_CORE_REV_2_92a;
-                dev_dbg(hsotg->dev, "Setting reload_ctl to %d\n", val);
-        }
-
-        hsotg->core_params->reload_ctl = val;
-}
-
-void dwc2_set_param_ahbcfg(struct dwc2_hsotg *hsotg, int val)
-{
-        if (val != -1)
-                hsotg->core_params->ahbcfg = val;
-        else
-                hsotg->core_params->ahbcfg = GAHBCFG_HBSTLEN_INCR4 <<
-                                                GAHBCFG_HBSTLEN_SHIFT;
-}
-
-void dwc2_set_param_otg_ver(struct dwc2_hsotg *hsotg, int val)
-{
-        if (DWC2_OUT_OF_BOUNDS(val, 0, 1)) {
-                if (val >= 0) {
-                        dev_err(hsotg->dev,
-                                "'%d' invalid for parameter otg_ver\n", val);
-                        dev_err(hsotg->dev,
-                                "otg_ver must be 0 (for OTG 1.3 support) or 1 (for OTG 2.0 support)\n");
-                }
-                val = 0;
-                dev_dbg(hsotg->dev, "Setting otg_ver to %d\n", val);
-        }
-
-        hsotg->core_params->otg_ver = val;
-}
-
-static void dwc2_set_param_uframe_sched(struct dwc2_hsotg *hsotg, int val)
-{
-        if (DWC2_OUT_OF_BOUNDS(val, 0, 1)) {
-                if (val >= 0) {
-                        dev_err(hsotg->dev,
-                                "'%d' invalid for parameter uframe_sched\n",
-                                val);
-                        dev_err(hsotg->dev, "uframe_sched must be 0 or 1\n");
-                }
-                val = 1;
-                dev_dbg(hsotg->dev, "Setting uframe_sched to %d\n", val);
-        }
-
-        hsotg->core_params->uframe_sched = val;
-}
-
-static void dwc2_set_param_external_id_pin_ctl(struct dwc2_hsotg *hsotg,
-                int val)
-{
-        if (DWC2_OUT_OF_BOUNDS(val, 0, 1)) {
-                if (val >= 0) {
-                        dev_err(hsotg->dev,
-                                "'%d' invalid for parameter external_id_pin_ctl\n",
-                                val);
-                        dev_err(hsotg->dev, "external_id_pin_ctl must be 0 or 1\n");
-                }
-                val = 0;
-                dev_dbg(hsotg->dev, "Setting external_id_pin_ctl to %d\n", val);
-        }
-
-        hsotg->core_params->external_id_pin_ctl = val;
-}
-
-static void dwc2_set_param_hibernation(struct dwc2_hsotg *hsotg,
-                int val)
-{
-        if (DWC2_OUT_OF_BOUNDS(val, 0, 1)) {
-                if (val >= 0) {
-                        dev_err(hsotg->dev,
-                                "'%d' invalid for parameter hibernation\n",
-                                val);
-                        dev_err(hsotg->dev, "hibernation must be 0 or 1\n");
-                }
-                val = 0;
-                dev_dbg(hsotg->dev, "Setting hibernation to %d\n", val);
-        }
-
-        hsotg->core_params->hibernation = val;
-}
-
-/*
- * This function is called during module intialization to pass module parameters
- * for the DWC_otg core.
- */
-void dwc2_set_parameters(struct dwc2_hsotg *hsotg,
-                         const struct dwc2_core_params *params)
-{
-        dev_dbg(hsotg->dev, "%s()\n", __func__);
-
-        dwc2_set_param_otg_cap(hsotg, params->otg_cap);
-        dwc2_set_param_dma_enable(hsotg, params->dma_enable);
-        dwc2_set_param_dma_desc_enable(hsotg, params->dma_desc_enable);
-        dwc2_set_param_dma_desc_fs_enable(hsotg, params->dma_desc_fs_enable);
-        dwc2_set_param_host_support_fs_ls_low_power(hsotg,
-                        params->host_support_fs_ls_low_power);
-        dwc2_set_param_enable_dynamic_fifo(hsotg,
-                        params->enable_dynamic_fifo);
-        dwc2_set_param_host_rx_fifo_size(hsotg,
-                        params->host_rx_fifo_size);
-        dwc2_set_param_host_nperio_tx_fifo_size(hsotg,
-                        params->host_nperio_tx_fifo_size);
-        dwc2_set_param_host_perio_tx_fifo_size(hsotg,
-                        params->host_perio_tx_fifo_size);
-        dwc2_set_param_max_transfer_size(hsotg,
-                        params->max_transfer_size);
-        dwc2_set_param_max_packet_count(hsotg,
-                        params->max_packet_count);
-        dwc2_set_param_host_channels(hsotg, params->host_channels);
-        dwc2_set_param_phy_type(hsotg, params->phy_type);
-        dwc2_set_param_speed(hsotg, params->speed);
-        dwc2_set_param_host_ls_low_power_phy_clk(hsotg,
-                        params->host_ls_low_power_phy_clk);
-        dwc2_set_param_phy_ulpi_ddr(hsotg, params->phy_ulpi_ddr);
-        dwc2_set_param_phy_ulpi_ext_vbus(hsotg,
-                        params->phy_ulpi_ext_vbus);
-        dwc2_set_param_phy_utmi_width(hsotg, params->phy_utmi_width);
-        dwc2_set_param_ulpi_fs_ls(hsotg, params->ulpi_fs_ls);
-        dwc2_set_param_ts_dline(hsotg, params->ts_dline);
-        dwc2_set_param_i2c_enable(hsotg, params->i2c_enable);
-        dwc2_set_param_en_multiple_tx_fifo(hsotg,
-                        params->en_multiple_tx_fifo);
-        dwc2_set_param_reload_ctl(hsotg, params->reload_ctl);
-        dwc2_set_param_ahbcfg(hsotg, params->ahbcfg);
-        dwc2_set_param_otg_ver(hsotg, params->otg_ver);
-        dwc2_set_param_uframe_sched(hsotg, params->uframe_sched);
-        dwc2_set_param_external_id_pin_ctl(hsotg, params->external_id_pin_ctl);
-        dwc2_set_param_hibernation(hsotg, params->hibernation);
-}
-
 /*
  * Forces either host or device mode if the controller is not
  * currently in that mode.
  *
  * Returns true if the mode was forced.
  */
-static bool dwc2_force_mode_if_needed(struct dwc2_hsotg *hsotg, bool host)
+bool dwc2_force_mode_if_needed(struct dwc2_hsotg *hsotg, bool host)
 {
         if (host && dwc2_is_host_mode(hsotg))
                 return false;
@@ -1442,232 +751,9 @@ static bool dwc2_force_mode_if_needed(struct dwc2_hsotg *hsotg, bool host)
         return dwc2_force_mode(hsotg, host);
 }
 
-/*
- * Gets host hardware parameters. Forces host mode if not currently in
- * host mode. Should be called immediately after a core soft reset in
- * order to get the reset values.
- */
-static void dwc2_get_host_hwparams(struct dwc2_hsotg *hsotg)
-{
-        struct dwc2_hw_params *hw = &hsotg->hw_params;
-        u32 gnptxfsiz;
-        u32 hptxfsiz;
-        bool forced;
-
-        if (hsotg->dr_mode == USB_DR_MODE_PERIPHERAL)
-                return;
-
-        forced = dwc2_force_mode_if_needed(hsotg, true);
-
-        gnptxfsiz = dwc2_readl(hsotg->regs + GNPTXFSIZ);
-        hptxfsiz = dwc2_readl(hsotg->regs + HPTXFSIZ);
-        dev_dbg(hsotg->dev, "gnptxfsiz=%08x\n", gnptxfsiz);
-        dev_dbg(hsotg->dev, "hptxfsiz=%08x\n", hptxfsiz);
-
-        if (forced)
-                dwc2_clear_force_mode(hsotg);
-
-        hw->host_nperio_tx_fifo_size = (gnptxfsiz & FIFOSIZE_DEPTH_MASK) >>
-                                       FIFOSIZE_DEPTH_SHIFT;
-        hw->host_perio_tx_fifo_size = (hptxfsiz & FIFOSIZE_DEPTH_MASK) >>
-                                      FIFOSIZE_DEPTH_SHIFT;
-}
-
-/*
- * Gets device hardware parameters. Forces device mode if not
- * currently in device mode. Should be called immediately after a core
- * soft reset in order to get the reset values.
- */
-static void dwc2_get_dev_hwparams(struct dwc2_hsotg *hsotg)
-{
-        struct dwc2_hw_params *hw = &hsotg->hw_params;
-        bool forced;
-        u32 gnptxfsiz;
-
-        if (hsotg->dr_mode == USB_DR_MODE_HOST)
-                return;
-
-        forced = dwc2_force_mode_if_needed(hsotg, false);
-
-        gnptxfsiz = dwc2_readl(hsotg->regs + GNPTXFSIZ);
-        dev_dbg(hsotg->dev, "gnptxfsiz=%08x\n", gnptxfsiz);
-
-        if (forced)
-                dwc2_clear_force_mode(hsotg);
-
-        hw->dev_nperio_tx_fifo_size = (gnptxfsiz & FIFOSIZE_DEPTH_MASK) >>
-                                       FIFOSIZE_DEPTH_SHIFT;
-}
-
-/**
- * During device initialization, read various hardware configuration
- * registers and interpret the contents.
- */
-int dwc2_get_hwparams(struct dwc2_hsotg *hsotg)
-{
-        struct dwc2_hw_params *hw = &hsotg->hw_params;
-        unsigned width;
-        u32 hwcfg1, hwcfg2, hwcfg3, hwcfg4;
-        u32 grxfsiz;
-
-        /*
-         * Attempt to ensure this device is really a DWC_otg Controller.
-         * Read and verify the GSNPSID register contents. The value should be
-         * 0x45f42xxx or 0x45f43xxx, which corresponds to either "OT2" or "OT3",
-         * as in "OTG version 2.xx" or "OTG version 3.xx".
-         */
-        hw->snpsid = dwc2_readl(hsotg->regs + GSNPSID);
-        if ((hw->snpsid & 0xfffff000) != 0x4f542000 &&
-            (hw->snpsid & 0xfffff000) != 0x4f543000) {
-                dev_err(hsotg->dev, "Bad value for GSNPSID: 0x%08x\n",
-                        hw->snpsid);
-                return -ENODEV;
-        }
-
-        dev_dbg(hsotg->dev, "Core Release: %1x.%1x%1x%1x (snpsid=%x)\n",
-                hw->snpsid >> 12 & 0xf, hw->snpsid >> 8 & 0xf,
-                hw->snpsid >> 4 & 0xf, hw->snpsid & 0xf, hw->snpsid);
-
-        hwcfg1 = dwc2_readl(hsotg->regs + GHWCFG1);
-        hwcfg2 = dwc2_readl(hsotg->regs + GHWCFG2);
-        hwcfg3 = dwc2_readl(hsotg->regs + GHWCFG3);
-        hwcfg4 = dwc2_readl(hsotg->regs + GHWCFG4);
-        grxfsiz = dwc2_readl(hsotg->regs + GRXFSIZ);
-
-        dev_dbg(hsotg->dev, "hwcfg1=%08x\n", hwcfg1);
-        dev_dbg(hsotg->dev, "hwcfg2=%08x\n", hwcfg2);
-        dev_dbg(hsotg->dev, "hwcfg3=%08x\n", hwcfg3);
-        dev_dbg(hsotg->dev, "hwcfg4=%08x\n", hwcfg4);
-        dev_dbg(hsotg->dev, "grxfsiz=%08x\n", grxfsiz);
-
-        /*
-         * Host specific hardware parameters. Reading these parameters
-         * requires the controller to be in host mode. The mode will
-         * be forced, if necessary, to read these values.
-         */
-        dwc2_get_host_hwparams(hsotg);
-        dwc2_get_dev_hwparams(hsotg);
-
-        /* hwcfg1 */
-        hw->dev_ep_dirs = hwcfg1;
-
-        /* hwcfg2 */
-        hw->op_mode = (hwcfg2 & GHWCFG2_OP_MODE_MASK) >>
-                      GHWCFG2_OP_MODE_SHIFT;
-        hw->arch = (hwcfg2 & GHWCFG2_ARCHITECTURE_MASK) >>
-                   GHWCFG2_ARCHITECTURE_SHIFT;
-        hw->enable_dynamic_fifo = !!(hwcfg2 & GHWCFG2_DYNAMIC_FIFO);
-        hw->host_channels = 1 + ((hwcfg2 & GHWCFG2_NUM_HOST_CHAN_MASK) >>
-                                GHWCFG2_NUM_HOST_CHAN_SHIFT);
-        hw->hs_phy_type = (hwcfg2 & GHWCFG2_HS_PHY_TYPE_MASK) >>
-                          GHWCFG2_HS_PHY_TYPE_SHIFT;
-        hw->fs_phy_type = (hwcfg2 & GHWCFG2_FS_PHY_TYPE_MASK) >>
-                          GHWCFG2_FS_PHY_TYPE_SHIFT;
-        hw->num_dev_ep = (hwcfg2 & GHWCFG2_NUM_DEV_EP_MASK) >>
-                         GHWCFG2_NUM_DEV_EP_SHIFT;
-        hw->nperio_tx_q_depth =
-                (hwcfg2 & GHWCFG2_NONPERIO_TX_Q_DEPTH_MASK) >>
-                GHWCFG2_NONPERIO_TX_Q_DEPTH_SHIFT << 1;
-        hw->host_perio_tx_q_depth =
-                (hwcfg2 & GHWCFG2_HOST_PERIO_TX_Q_DEPTH_MASK) >>
-                GHWCFG2_HOST_PERIO_TX_Q_DEPTH_SHIFT << 1;
-        hw->dev_token_q_depth =
-                (hwcfg2 & GHWCFG2_DEV_TOKEN_Q_DEPTH_MASK) >>
-                GHWCFG2_DEV_TOKEN_Q_DEPTH_SHIFT;
-
-        /* hwcfg3 */
-        width = (hwcfg3 & GHWCFG3_XFER_SIZE_CNTR_WIDTH_MASK) >>
-                GHWCFG3_XFER_SIZE_CNTR_WIDTH_SHIFT;
-        hw->max_transfer_size = (1 << (width + 11)) - 1;
-        width = (hwcfg3 & GHWCFG3_PACKET_SIZE_CNTR_WIDTH_MASK) >>
-                GHWCFG3_PACKET_SIZE_CNTR_WIDTH_SHIFT;
-        hw->max_packet_count = (1 << (width + 4)) - 1;
-        hw->i2c_enable = !!(hwcfg3 & GHWCFG3_I2C);
-        hw->total_fifo_size = (hwcfg3 & GHWCFG3_DFIFO_DEPTH_MASK) >>
-                              GHWCFG3_DFIFO_DEPTH_SHIFT;
-
-        /* hwcfg4 */
-        hw->en_multiple_tx_fifo = !!(hwcfg4 & GHWCFG4_DED_FIFO_EN);
-        hw->num_dev_perio_in_ep = (hwcfg4 & GHWCFG4_NUM_DEV_PERIO_IN_EP_MASK) >>
-                                  GHWCFG4_NUM_DEV_PERIO_IN_EP_SHIFT;
-        hw->dma_desc_enable = !!(hwcfg4 & GHWCFG4_DESC_DMA);
-        hw->power_optimized = !!(hwcfg4 & GHWCFG4_POWER_OPTIMIZ);
-        hw->utmi_phy_data_width = (hwcfg4 & GHWCFG4_UTMI_PHY_DATA_WIDTH_MASK) >>
-                                  GHWCFG4_UTMI_PHY_DATA_WIDTH_SHIFT;
-
-        /* fifo sizes */
-        hw->host_rx_fifo_size = (grxfsiz & GRXFSIZ_DEPTH_MASK) >>
-                                GRXFSIZ_DEPTH_SHIFT;
-
-        dev_dbg(hsotg->dev, "Detected values from hardware:\n");
-        dev_dbg(hsotg->dev, "  op_mode=%d\n",
-                hw->op_mode);
-        dev_dbg(hsotg->dev, "  arch=%d\n",
-                hw->arch);
-        dev_dbg(hsotg->dev, "  dma_desc_enable=%d\n",
-                hw->dma_desc_enable);
-        dev_dbg(hsotg->dev, "  power_optimized=%d\n",
-                hw->power_optimized);
-        dev_dbg(hsotg->dev, "  i2c_enable=%d\n",
-                hw->i2c_enable);
-        dev_dbg(hsotg->dev, "  hs_phy_type=%d\n",
-                hw->hs_phy_type);
-        dev_dbg(hsotg->dev, "  fs_phy_type=%d\n",
-                hw->fs_phy_type);
-        dev_dbg(hsotg->dev, "  utmi_phy_data_width=%d\n",
-                hw->utmi_phy_data_width);
-        dev_dbg(hsotg->dev, "  num_dev_ep=%d\n",
-                hw->num_dev_ep);
-        dev_dbg(hsotg->dev, "  num_dev_perio_in_ep=%d\n",
-                hw->num_dev_perio_in_ep);
-        dev_dbg(hsotg->dev, "  host_channels=%d\n",
-                hw->host_channels);
-        dev_dbg(hsotg->dev, "  max_transfer_size=%d\n",
-                hw->max_transfer_size);
-        dev_dbg(hsotg->dev, "  max_packet_count=%d\n",
-                hw->max_packet_count);
-        dev_dbg(hsotg->dev, "  nperio_tx_q_depth=0x%0x\n",
-                hw->nperio_tx_q_depth);
-        dev_dbg(hsotg->dev, "  host_perio_tx_q_depth=0x%0x\n",
-                hw->host_perio_tx_q_depth);
-        dev_dbg(hsotg->dev, "  dev_token_q_depth=0x%0x\n",
-                hw->dev_token_q_depth);
-        dev_dbg(hsotg->dev, "  enable_dynamic_fifo=%d\n",
-                hw->enable_dynamic_fifo);
-        dev_dbg(hsotg->dev, "  en_multiple_tx_fifo=%d\n",
-                hw->en_multiple_tx_fifo);
-        dev_dbg(hsotg->dev, "  total_fifo_size=%d\n",
-                hw->total_fifo_size);
-        dev_dbg(hsotg->dev, "  host_rx_fifo_size=%d\n",
-                hw->host_rx_fifo_size);
-        dev_dbg(hsotg->dev, "  host_nperio_tx_fifo_size=%d\n",
-                hw->host_nperio_tx_fifo_size);
-        dev_dbg(hsotg->dev, "  host_perio_tx_fifo_size=%d\n",
-                hw->host_perio_tx_fifo_size);
-        dev_dbg(hsotg->dev, "\n");
-
-        return 0;
-}
-
-/*
- * Sets all parameters to the given value.
- *
- * Assumes that the dwc2_core_params struct contains only integers.
- */
-void dwc2_set_all_params(struct dwc2_core_params *params, int value)
-{
-        int *p = (int *)params;
-        size_t size = sizeof(*params) / sizeof(*p);
-        int i;
-
-        for (i = 0; i < size; i++)
-                p[i] = value;
-}
-
-
 u16 dwc2_get_otg_version(struct dwc2_hsotg *hsotg)
 {
-        return hsotg->core_params->otg_ver == 1 ? 0x0200 : 0x0103;
+        return hsotg->params.otg_ver == 1 ? 0x0200 : 0x0103;
 }
 
 bool dwc2_is_controller_alive(struct dwc2_hsotg *hsotg)
diff --git a/drivers/usb/dwc2/core.h b/drivers/usb/dwc2/core.h
index 2a21a0414b1d..9548d3e03453 100644
--- a/drivers/usb/dwc2/core.h
+++ b/drivers/usb/dwc2/core.h
@@ -172,6 +172,11 @@ struct dwc2_hsotg_req;
  * @periodic: Set if this is a periodic ep, such as Interrupt
  * @isochronous: Set if this is a isochronous ep
  * @send_zlp: Set if we need to send a zero-length packet.
+ * @desc_list_dma: The DMA address of descriptor chain currently in use.
+ * @desc_list: Pointer to descriptor DMA chain head currently in use.
+ * @desc_count: Count of entries within the DMA descriptor chain of EP.
+ * @isoc_chain_num: Number of ISOC chain currently in use - either 0 or 1.
+ * @next_desc: index of next free descriptor in the ISOC chain under SW control.
  * @total_data: The total number of data bytes done.
  * @fifo_size: The size of the FIFO (for periodic IN endpoints)
  * @fifo_load: The amount of data loaded into the FIFO (periodic IN)
@@ -219,6 +224,13 @@ struct dwc2_hsotg_ep {
 #define TARGET_FRAME_INITIAL   0xFFFFFFFF
         bool                    frame_overrun;
 
+        dma_addr_t              desc_list_dma;
+        struct dwc2_dma_desc    *desc_list;
+        u8                      desc_count;
+
+        unsigned char           isoc_chain_num;
+        unsigned int            next_desc;
+
         char                    name[10];
 };
 
@@ -286,7 +298,7 @@ enum dwc2_ep0_state {
  * @otg_ver:            OTG version supported
  *                       0 - 1.3 (default)
  *                       1 - 2.0
- * @dma_enable:         Specifies whether to use slave or DMA mode for accessing
+ * @host_dma:           Specifies whether to use slave or DMA mode for accessing
  *                      the data FIFOs. The driver will automatically detect the
  *                      value for this parameter if none is specified.
  *                       0 - Slave (always available)
@@ -314,7 +326,8 @@ enum dwc2_ep0_state {
  * @enable_dynamic_fifo: 0 - Use coreConsultant-specified FIFO size parameters
  *                       1 - Allow dynamic FIFO sizing (default, if available)
  * @en_multiple_tx_fifo: Specifies whether dedicated per-endpoint transmit FIFOs
- *                      are enabled
+ *                      are enabled for non-periodic IN endpoints in device
+ *                      mode.
  * @host_rx_fifo_size:  Number of 4-byte words in the Rx FIFO in host mode when
  *                      dynamic FIFO sizing is enabled
  *                       16 to 32768
@@ -417,6 +430,20 @@ enum dwc2_ep0_state {
  *                      needed.
  *                      0 - No (default)
  *                      1 - Yes
+ * @g_dma:              Enables gadget dma usage (default: autodetect).
+ * @g_dma_desc:         Enables gadget descriptor DMA (default: autodetect).
+ * @g_rx_fifo_size:     The periodic rx fifo size for the device, in
+ *                      DWORDS from 16-32768 (default: 2048 if
+ *                      possible, otherwise autodetect).
+ * @g_np_tx_fifo_size:  The non-periodic tx fifo size for the device in
+ *                      DWORDS from 16-32768 (default: 1024 if
+ *                      possible, otherwise autodetect).
+ * @g_tx_fifo_size:     An array of TX fifo sizes in dedicated fifo
+ *                      mode. Each value corresponds to one EP
+ *                      starting from EP1 (max 15 values). Sizes are
+ *                      in DWORDS with possible values from from
+ *                      16-32768 (default: 256, 256, 256, 256, 768,
+ *                      768, 768, 768, 0, 0, 0, 0, 0, 0, 0).
  *
  * The following parameters may be specified when starting the module. These
  * parameters define how the DWC_otg controller should be configured. A
@@ -430,11 +457,18 @@ struct dwc2_core_params {
          * dwc2_set_all_params!
          */
         int otg_cap;
+#define DWC2_CAP_PARAM_HNP_SRP_CAPABLE          0
+#define DWC2_CAP_PARAM_SRP_ONLY_CAPABLE         1
+#define DWC2_CAP_PARAM_NO_HNP_SRP_CAPABLE       2
+
         int otg_ver;
-        int dma_enable;
         int dma_desc_enable;
         int dma_desc_fs_enable;
         int speed;
+#define DWC2_SPEED_PARAM_HIGH   0
+#define DWC2_SPEED_PARAM_FULL   1
+#define DWC2_SPEED_PARAM_LOW    2
+
         int enable_dynamic_fifo;
         int en_multiple_tx_fifo;
         int host_rx_fifo_size;
@@ -444,19 +478,44 @@ struct dwc2_core_params {
         int max_packet_count;
         int host_channels;
         int phy_type;
+#define DWC2_PHY_TYPE_PARAM_FS          0
+#define DWC2_PHY_TYPE_PARAM_UTMI        1
+#define DWC2_PHY_TYPE_PARAM_ULPI        2
+
         int phy_utmi_width;
         int phy_ulpi_ddr;
         int phy_ulpi_ext_vbus;
+#define DWC2_PHY_ULPI_INTERNAL_VBUS     0
+#define DWC2_PHY_ULPI_EXTERNAL_VBUS     1
+
         int i2c_enable;
         int ulpi_fs_ls;
         int host_support_fs_ls_low_power;
         int host_ls_low_power_phy_clk;
+#define DWC2_HOST_LS_LOW_POWER_PHY_CLK_PARAM_48MHZ      0
+#define DWC2_HOST_LS_LOW_POWER_PHY_CLK_PARAM_6MHZ       1
+
         int ts_dline;
         int reload_ctl;
         int ahbcfg;
         int uframe_sched;
         int external_id_pin_ctl;
         int hibernation;
+
+        /*
+         * The following parameters are *only* set via device
+         * properties and cannot be set directly in this structure.
+         */
+
+        /* Host parameters */
+        bool host_dma;
+
+        /* Gadget parameters */
+        bool g_dma;
+        bool g_dma_desc;
+        u16 g_rx_fifo_size;
+        u16 g_np_tx_fifo_size;
+        u32 g_tx_fifo_size[MAX_EPS_CHANNELS];
 };
 
 /**
@@ -516,10 +575,9 @@ struct dwc2_hw_params {
         unsigned op_mode:3;
         unsigned arch:2;
         unsigned dma_desc_enable:1;
-        unsigned dma_desc_fs_enable:1;
         unsigned enable_dynamic_fifo:1;
         unsigned en_multiple_tx_fifo:1;
-        unsigned host_rx_fifo_size:16;
+        unsigned rx_fifo_size:16;
         unsigned host_nperio_tx_fifo_size:16;
         unsigned dev_nperio_tx_fifo_size:16;
         unsigned host_perio_tx_fifo_size:16;
@@ -839,11 +897,13 @@ struct dwc2_hregs_backup {
  * @ctrl_req:           Request for EP0 control packets.
  * @ep0_state:          EP0 control transfers state
  * @test_mode:          USB test mode requested by the host
+ * @setup_desc_dma:     EP0 setup stage desc chain DMA address
+ * @setup_desc:         EP0 setup stage desc chain pointer
+ * @ctrl_in_desc_dma:   EP0 IN data phase desc chain DMA address
+ * @ctrl_in_desc:       EP0 IN data phase desc chain pointer
+ * @ctrl_out_desc_dma:  EP0 OUT data phase desc chain DMA address
+ * @ctrl_out_desc:      EP0 OUT data phase desc chain pointer
  * @eps:                The endpoints being supplied to the gadget framework
- * @g_using_dma:          Indicate if dma usage is enabled
- * @g_rx_fifo_sz:         Contains rx fifo size value
- * @g_np_g_tx_fifo_sz:      Contains Non-Periodic tx fifo size value
- * @g_tx_fifo_sz:         Contains tx fifo size value per endpoints
  */
 struct dwc2_hsotg {
         struct device *dev;
@@ -851,7 +911,7 @@ struct dwc2_hsotg {
         /** Params detected from hardware */
         struct dwc2_hw_params hw_params;
         /** Params to actually use */
-        struct dwc2_core_params *core_params;
+        struct dwc2_core_params params;
         enum usb_otg_state op_state;
         enum usb_dr_mode dr_mode;
         unsigned int hcd_enabled:1;
@@ -891,6 +951,8 @@ struct dwc2_hsotg {
 #define DWC2_CORE_REV_2_94a     0x4f54294a
 #define DWC2_CORE_REV_3_00a     0x4f54300a
 #define DWC2_CORE_REV_3_10a     0x4f54310a
+#define DWC2_FS_IOT_REV_1_00a   0x5531100a
+#define DWC2_HS_IOT_REV_1_00a   0x5532100a
 
 #if IS_ENABLED(CONFIG_USB_DWC2_HOST) || IS_ENABLED(CONFIG_USB_DWC2_DUAL_ROLE)
         union dwc2_hcd_internal_flags {
@@ -986,15 +1048,18 @@ struct dwc2_hsotg {
         enum dwc2_ep0_state ep0_state;
         u8 test_mode;
 
+        dma_addr_t setup_desc_dma[2];
+        struct dwc2_dma_desc *setup_desc[2];
+        dma_addr_t ctrl_in_desc_dma;
+        struct dwc2_dma_desc *ctrl_in_desc;
+        dma_addr_t ctrl_out_desc_dma;
+        struct dwc2_dma_desc *ctrl_out_desc;
+
         struct usb_gadget gadget;
         unsigned int enabled:1;
         unsigned int connected:1;
         struct dwc2_hsotg_ep *eps_in[MAX_EPS_CHANNELS];
         struct dwc2_hsotg_ep *eps_out[MAX_EPS_CHANNELS];
-        u32 g_using_dma;
-        u32 g_rx_fifo_sz;
-        u32 g_np_g_tx_fifo_sz;
-        u32 g_tx_fifo_sz[MAX_EPS_CHANNELS];
 #endif /* CONFIG_USB_DWC2_PERIPHERAL || CONFIG_USB_DWC2_DUAL_ROLE */
 };
 
@@ -1016,6 +1081,22 @@ enum dwc2_halt_status {
         DWC2_HC_XFER_URB_DEQUEUE,
 };
 
+/* Core version information */
+static inline bool dwc2_is_iot(struct dwc2_hsotg *hsotg)
+{
+        return (hsotg->hw_params.snpsid & 0xfff00000) == 0x55300000;
+}
+
+static inline bool dwc2_is_fs_iot(struct dwc2_hsotg *hsotg)
+{
+        return (hsotg->hw_params.snpsid & 0xffff0000) == 0x55310000;
+}
+
+static inline bool dwc2_is_hs_iot(struct dwc2_hsotg *hsotg)
+{
+        return (hsotg->hw_params.snpsid & 0xffff0000) == 0x55320000;
+}
+
 /*
  * The following functions support initialization of the core driver component
  * and the DWC_otg controller
@@ -1025,6 +1106,8 @@ extern int dwc2_core_reset_and_force_dr_mode(struct dwc2_hsotg *hsotg);
 extern int dwc2_enter_hibernation(struct dwc2_hsotg *hsotg);
 extern int dwc2_exit_hibernation(struct dwc2_hsotg *hsotg, bool restore);
 
+bool dwc2_force_mode_if_needed(struct dwc2_hsotg *hsotg, bool host);
+void dwc2_clear_force_mode(struct dwc2_hsotg *hsotg);
 void dwc2_force_dr_mode(struct dwc2_hsotg *hsotg);
 
 extern bool dwc2_is_controller_alive(struct dwc2_hsotg *hsotg);
@@ -1044,217 +1127,16 @@ extern void dwc2_disable_global_interrupts(struct dwc2_hsotg *hcd);
 /* This function should be called on every hardware interrupt. */
 extern irqreturn_t dwc2_handle_common_intr(int irq, void *dev);
 
-/* OTG Core Parameters */
-
-/*
- * Specifies the OTG capabilities. The driver will automatically
- * detect the value for this parameter if none is specified.
- * 0 - HNP and SRP capable (default)
- * 1 - SRP Only capable
- * 2 - No HNP/SRP capable
- */
-extern void dwc2_set_param_otg_cap(struct dwc2_hsotg *hsotg, int val);
-#define DWC2_CAP_PARAM_HNP_SRP_CAPABLE          0
-#define DWC2_CAP_PARAM_SRP_ONLY_CAPABLE         1
-#define DWC2_CAP_PARAM_NO_HNP_SRP_CAPABLE       2
-
-/*
- * Specifies whether to use slave or DMA mode for accessing the data
- * FIFOs. The driver will automatically detect the value for this
- * parameter if none is specified.
- * 0 - Slave
- * 1 - DMA (default, if available)
- */
-extern void dwc2_set_param_dma_enable(struct dwc2_hsotg *hsotg, int val);
-
-/*
- * When DMA mode is enabled specifies whether to use
- * address DMA or DMA Descritor mode for accessing the data
- * FIFOs in device mode. The driver will automatically detect
- * the value for this parameter if none is specified.
- * 0 - address DMA
- * 1 - DMA Descriptor(default, if available)
- */
-extern void dwc2_set_param_dma_desc_enable(struct dwc2_hsotg *hsotg, int val);
-
-/*
- * When DMA mode is enabled specifies whether to use
- * address DMA or DMA Descritor mode with full speed devices
- * for accessing the data FIFOs in host mode.
- * 0 - address DMA
- * 1 - FS DMA Descriptor(default, if available)
- */
-extern void dwc2_set_param_dma_desc_fs_enable(struct dwc2_hsotg *hsotg,
-                                              int val);
-
-/*
- * Specifies the maximum speed of operation in host and device mode.
- * The actual speed depends on the speed of the attached device and
- * the value of phy_type. The actual speed depends on the speed of the
- * attached device.
- * 0 - High Speed (default)
- * 1 - Full Speed
- */
-extern void dwc2_set_param_speed(struct dwc2_hsotg *hsotg, int val);
-#define DWC2_SPEED_PARAM_HIGH   0
-#define DWC2_SPEED_PARAM_FULL   1
-
-/*
- * Specifies whether low power mode is supported when attached
- * to a Full Speed or Low Speed device in host mode.
- *
- * 0 - Don't support low power mode (default)
- * 1 - Support low power mode
- */
-extern void dwc2_set_param_host_support_fs_ls_low_power(
-                struct dwc2_hsotg *hsotg, int val);
-
-/*
- * Specifies the PHY clock rate in low power mode when connected to a
- * Low Speed device in host mode. This parameter is applicable only if
- * HOST_SUPPORT_FS_LS_LOW_POWER is enabled. If PHY_TYPE is set to FS
- * then defaults to 6 MHZ otherwise 48 MHZ.
- *
- * 0 - 48 MHz
- * 1 - 6 MHz
- */
-extern void dwc2_set_param_host_ls_low_power_phy_clk(struct dwc2_hsotg *hsotg,
-                                                     int val);
-#define DWC2_HOST_LS_LOW_POWER_PHY_CLK_PARAM_48MHZ      0
-#define DWC2_HOST_LS_LOW_POWER_PHY_CLK_PARAM_6MHZ       1
-
-/*
- * 0 - Use cC FIFO size parameters
- * 1 - Allow dynamic FIFO sizing (default)
- */
-extern void dwc2_set_param_enable_dynamic_fifo(struct dwc2_hsotg *hsotg,
-                                               int val);
-
-/*
- * Number of 4-byte words in the Rx FIFO in host mode when dynamic
- * FIFO sizing is enabled.
- * 16 to 32768 (default 1024)
- */
-extern void dwc2_set_param_host_rx_fifo_size(struct dwc2_hsotg *hsotg, int val);
-
-/*
- * Number of 4-byte words in the non-periodic Tx FIFO in host mode
- * when Dynamic FIFO sizing is enabled in the core.
- * 16 to 32768 (default 256)
- */
-extern void dwc2_set_param_host_nperio_tx_fifo_size(struct dwc2_hsotg *hsotg,
-                                                    int val);
-
-/*
- * Number of 4-byte words in the host periodic Tx FIFO when dynamic
- * FIFO sizing is enabled.
- * 16 to 32768 (default 256)
- */
-extern void dwc2_set_param_host_perio_tx_fifo_size(struct dwc2_hsotg *hsotg,
-                                                   int val);
-
-/*
- * The maximum transfer size supported in bytes.
- * 2047 to 65,535  (default 65,535)
- */
-extern void dwc2_set_param_max_transfer_size(struct dwc2_hsotg *hsotg, int val);
-
-/*
- * The maximum number of packets in a transfer.
- * 15 to 511  (default 511)
- */
-extern void dwc2_set_param_max_packet_count(struct dwc2_hsotg *hsotg, int val);
-
-/*
- * The number of host channel registers to use.
- * 1 to 16 (default 11)
- * Note: The FPGA configuration supports a maximum of 11 host channels.
- */
-extern void dwc2_set_param_host_channels(struct dwc2_hsotg *hsotg, int val);
-
-/*
- * Specifies the type of PHY interface to use. By default, the driver
- * will automatically detect the phy_type.
- *
- * 0 - Full Speed PHY
- * 1 - UTMI+ (default)
- * 2 - ULPI
- */
-extern void dwc2_set_param_phy_type(struct dwc2_hsotg *hsotg, int val);
-#define DWC2_PHY_TYPE_PARAM_FS          0
-#define DWC2_PHY_TYPE_PARAM_UTMI        1
-#define DWC2_PHY_TYPE_PARAM_ULPI        2
-
-/*
- * Specifies the UTMI+ Data Width. This parameter is
- * applicable for a PHY_TYPE of UTMI+ or ULPI. (For a ULPI
- * PHY_TYPE, this parameter indicates the data width between
- * the MAC and the ULPI Wrapper.) Also, this parameter is
- * applicable only if the OTG_HSPHY_WIDTH cC parameter was set
- * to "8 and 16 bits", meaning that the core has been
- * configured to work at either data path width.
- *
- * 8 or 16 bits (default 16)
- */
-extern void dwc2_set_param_phy_utmi_width(struct dwc2_hsotg *hsotg, int val);
-
-/*
- * Specifies whether the ULPI operates at double or single
- * data rate. This parameter is only applicable if PHY_TYPE is
- * ULPI.
- *
- * 0 - single data rate ULPI interface with 8 bit wide data
- * bus (default)
- * 1 - double data rate ULPI interface with 4 bit wide data
- * bus
- */
-extern void dwc2_set_param_phy_ulpi_ddr(struct dwc2_hsotg *hsotg, int val);
-
-/*
- * Specifies whether to use the internal or external supply to
- * drive the vbus with a ULPI phy.
- */
-extern void dwc2_set_param_phy_ulpi_ext_vbus(struct dwc2_hsotg *hsotg, int val);
-#define DWC2_PHY_ULPI_INTERNAL_VBUS     0
-#define DWC2_PHY_ULPI_EXTERNAL_VBUS     1
-
-/*
- * Specifies whether to use the I2Cinterface for full speed PHY. This
- * parameter is only applicable if PHY_TYPE is FS.
- * 0 - No (default)
- * 1 - Yes
- */
-extern void dwc2_set_param_i2c_enable(struct dwc2_hsotg *hsotg, int val);
-
-extern void dwc2_set_param_ulpi_fs_ls(struct dwc2_hsotg *hsotg, int val);
-
-extern void dwc2_set_param_ts_dline(struct dwc2_hsotg *hsotg, int val);
-
-/*
- * Specifies whether dedicated transmit FIFOs are
- * enabled for non periodic IN endpoints in device mode
- * 0 - No
- * 1 - Yes
- */
-extern void dwc2_set_param_en_multiple_tx_fifo(struct dwc2_hsotg *hsotg,
-                                               int val);
-
-extern void dwc2_set_param_reload_ctl(struct dwc2_hsotg *hsotg, int val);
-
-extern void dwc2_set_param_ahbcfg(struct dwc2_hsotg *hsotg, int val);
-
-extern void dwc2_set_param_otg_ver(struct dwc2_hsotg *hsotg, int val);
-
-extern void dwc2_set_parameters(struct dwc2_hsotg *hsotg,
-                                const struct dwc2_core_params *params);
-
-extern void dwc2_set_all_params(struct dwc2_core_params *params, int value);
-
-extern int dwc2_get_hwparams(struct dwc2_hsotg *hsotg);
+/* The device ID match table */
+extern const struct of_device_id dwc2_of_match_table[];
 
 extern int dwc2_lowlevel_hw_enable(struct dwc2_hsotg *hsotg);
 extern int dwc2_lowlevel_hw_disable(struct dwc2_hsotg *hsotg);
 
+/* Parameters */
+int dwc2_get_hwparams(struct dwc2_hsotg *hsotg);
+int dwc2_init_params(struct dwc2_hsotg *hsotg);
+
 /*
  * The following functions check the controller's OTG operation mode
  * capability (GHWCFG2.OTG_MODE).
diff --git a/drivers/usb/dwc2/core_intr.c b/drivers/usb/dwc2/core_intr.c
index d85c5c9f96c1..5b228ba6045f 100644
--- a/drivers/usb/dwc2/core_intr.c
+++ b/drivers/usb/dwc2/core_intr.c
@@ -159,9 +159,9 @@ static void dwc2_handle_otg_intr(struct dwc2_hsotg *hsotg)
                         " ++OTG Interrupt: Session Request Success Status Change++\n");
                 gotgctl = dwc2_readl(hsotg->regs + GOTGCTL);
                 if (gotgctl & GOTGCTL_SESREQSCS) {
-                        if (hsotg->core_params->phy_type ==
+                        if (hsotg->params.phy_type ==
                                         DWC2_PHY_TYPE_PARAM_FS
-                            && hsotg->core_params->i2c_enable > 0) {
+                            && hsotg->params.i2c_enable > 0) {
                                 hsotg->srp_success = 1;
                         } else {
                                 /* Clear Session Request */
@@ -370,7 +370,7 @@ static void dwc2_handle_wakeup_detected_intr(struct dwc2_hsotg *hsotg)
                 /* Change to L0 state */
                 hsotg->lx_state = DWC2_L0;
         } else {
-                if (hsotg->core_params->hibernation)
+                if (hsotg->params.hibernation)
                         return;
 
                 if (hsotg->lx_state != DWC2_L1) {
diff --git a/drivers/usb/dwc2/debugfs.c b/drivers/usb/dwc2/debugfs.c
index 55d91f24f94a..0a130916a91c 100644
--- a/drivers/usb/dwc2/debugfs.c
+++ b/drivers/usb/dwc2/debugfs.c
@@ -213,7 +213,7 @@ static int fifo_show(struct seq_file *seq, void *v)
         val = dwc2_readl(regs + GNPTXFSIZ);
         seq_printf(seq, "NPTXFIFO: Size %d, Start 0x%08x\n",
                    val >> FIFOSIZE_DEPTH_SHIFT,
-                   val & FIFOSIZE_DEPTH_MASK);
+                   val & FIFOSIZE_STARTADDR_MASK);
 
         seq_puts(seq, "\nPeriodic TXFIFOs:\n");
 
diff --git a/drivers/usb/dwc2/gadget.c b/drivers/usb/dwc2/gadget.c
index 24fbebc9b409..b95930f20d90 100644
--- a/drivers/usb/dwc2/gadget.c
+++ b/drivers/usb/dwc2/gadget.c
@@ -93,7 +93,18 @@ static void dwc2_hsotg_dump(struct dwc2_hsotg *hsotg);
  */
 static inline bool using_dma(struct dwc2_hsotg *hsotg)
 {
-        return hsotg->g_using_dma;
+        return hsotg->params.g_dma;
+}
+
+/*
+ * using_desc_dma - return the descriptor DMA status of the driver.
+ * @hsotg: The driver state.
+ *
+ * Return true if we're using descriptor DMA.
+ */
+static inline bool using_desc_dma(struct dwc2_hsotg *hsotg)
+{
+        return hsotg->params.g_dma_desc;
 }
 
 /**
@@ -190,16 +201,17 @@ static void dwc2_hsotg_init_fifo(struct dwc2_hsotg *hsotg)
         unsigned int addr;
         int timeout;
         u32 val;
+        u32 *txfsz = hsotg->params.g_tx_fifo_size;
 
         /* Reset fifo map if not correctly cleared during previous session */
         WARN_ON(hsotg->fifo_map);
         hsotg->fifo_map = 0;
 
         /* set RX/NPTX FIFO sizes */
-        dwc2_writel(hsotg->g_rx_fifo_sz, hsotg->regs + GRXFSIZ);
-        dwc2_writel((hsotg->g_rx_fifo_sz << FIFOSIZE_STARTADDR_SHIFT) |
-                (hsotg->g_np_g_tx_fifo_sz << FIFOSIZE_DEPTH_SHIFT),
-                hsotg->regs + GNPTXFSIZ);
+        dwc2_writel(hsotg->params.g_rx_fifo_size, hsotg->regs + GRXFSIZ);
+        dwc2_writel((hsotg->params.g_rx_fifo_size << FIFOSIZE_STARTADDR_SHIFT) |
+                    (hsotg->params.g_np_tx_fifo_size << FIFOSIZE_DEPTH_SHIFT),
+                    hsotg->regs + GNPTXFSIZ);
 
         /*
          * arange all the rest of the TX FIFOs, as some versions of this
@@ -209,7 +221,7 @@ static void dwc2_hsotg_init_fifo(struct dwc2_hsotg *hsotg)
          */
 
         /* start at the end of the GNPTXFSIZ, rounded up */
-        addr = hsotg->g_rx_fifo_sz + hsotg->g_np_g_tx_fifo_sz;
+        addr = hsotg->params.g_rx_fifo_size + hsotg->params.g_np_tx_fifo_size;
 
         /*
          * Configure fifos sizes from provided configuration and assign
@@ -217,15 +229,16 @@ static void dwc2_hsotg_init_fifo(struct dwc2_hsotg *hsotg)
          * given endpoint.
          */
         for (ep = 1; ep < MAX_EPS_CHANNELS; ep++) {
-                if (!hsotg->g_tx_fifo_sz[ep])
+                if (!txfsz[ep])
                         continue;
                 val = addr;
-                val |= hsotg->g_tx_fifo_sz[ep] << FIFOSIZE_DEPTH_SHIFT;
-                WARN_ONCE(addr + hsotg->g_tx_fifo_sz[ep] > hsotg->fifo_mem,
+                val |= txfsz[ep] << FIFOSIZE_DEPTH_SHIFT;
+                WARN_ONCE(addr + txfsz[ep] > hsotg->fifo_mem,
                           "insufficient fifo memory");
-                addr += hsotg->g_tx_fifo_sz[ep];
+                addr += txfsz[ep];
 
                 dwc2_writel(val, hsotg->regs + DPTXFSIZN(ep));
+                val = dwc2_readl(hsotg->regs + DPTXFSIZN(ep));
         }
 
         /*
@@ -303,12 +316,55 @@ static void dwc2_hsotg_unmap_dma(struct dwc2_hsotg *hsotg,
                                 struct dwc2_hsotg_req *hs_req)
 {
         struct usb_request *req = &hs_req->req;
+        usb_gadget_unmap_request(&hsotg->gadget, req, hs_ep->dir_in);
+}
 
-        /* ignore this if we're not moving any data */
-        if (hs_req->req.length == 0)
-                return;
+/*
+ * dwc2_gadget_alloc_ctrl_desc_chains - allocate DMA descriptor chains
+ * for Control endpoint
+ * @hsotg: The device state.
+ *
+ * This function will allocate 4 descriptor chains for EP 0: 2 for
+ * Setup stage, per one for IN and OUT data/status transactions.
+ */
+static int dwc2_gadget_alloc_ctrl_desc_chains(struct dwc2_hsotg *hsotg)
+{
+        hsotg->setup_desc[0] =
+                dmam_alloc_coherent(hsotg->dev,
+                                    sizeof(struct dwc2_dma_desc),
+                                    &hsotg->setup_desc_dma[0],
+                                    GFP_KERNEL);
+        if (!hsotg->setup_desc[0])
+                goto fail;
+
+        hsotg->setup_desc[1] =
+                dmam_alloc_coherent(hsotg->dev,
+                                    sizeof(struct dwc2_dma_desc),
+                                    &hsotg->setup_desc_dma[1],
+                                    GFP_KERNEL);
+        if (!hsotg->setup_desc[1])
+                goto fail;
+
+        hsotg->ctrl_in_desc =
+                dmam_alloc_coherent(hsotg->dev,
+                                    sizeof(struct dwc2_dma_desc),
+                                    &hsotg->ctrl_in_desc_dma,
+                                    GFP_KERNEL);
+        if (!hsotg->ctrl_in_desc)
+                goto fail;
+
+        hsotg->ctrl_out_desc =
+                dmam_alloc_coherent(hsotg->dev,
+                                    sizeof(struct dwc2_dma_desc),
+                                    &hsotg->ctrl_out_desc_dma,
+                                    GFP_KERNEL);
+        if (!hsotg->ctrl_out_desc)
+                goto fail;
 
-        usb_gadget_unmap_request(&hsotg->gadget, req, hs_ep->dir_in);
+        return 0;
+
+fail:
+        return -ENOMEM;
 }
 
 /**
@@ -541,6 +597,273 @@ static u32 dwc2_hsotg_read_frameno(struct dwc2_hsotg *hsotg)
 }
 
 /**
+ * dwc2_gadget_get_chain_limit - get the maximum data payload value of the
+ * DMA descriptor chain prepared for specific endpoint
+ * @hs_ep: The endpoint
+ *
+ * Return the maximum data that can be queued in one go on a given endpoint
+ * depending on its descriptor chain capacity so that transfers that
+ * are too long can be split.
+ */
+static unsigned int dwc2_gadget_get_chain_limit(struct dwc2_hsotg_ep *hs_ep)
+{
+        int is_isoc = hs_ep->isochronous;
+        unsigned int maxsize;
+
+        if (is_isoc)
+                maxsize = hs_ep->dir_in ? DEV_DMA_ISOC_TX_NBYTES_LIMIT :
+                                           DEV_DMA_ISOC_RX_NBYTES_LIMIT;
+        else
+                maxsize = DEV_DMA_NBYTES_LIMIT;
+
+        /* Above size of one descriptor was chosen, multiple it */
+        maxsize *= MAX_DMA_DESC_NUM_GENERIC;
+
+        return maxsize;
+}
+
+/*
+ * dwc2_gadget_get_desc_params - get DMA descriptor parameters.
+ * @hs_ep: The endpoint
+ * @mask: RX/TX bytes mask to be defined
+ *
+ * Returns maximum data payload for one descriptor after analyzing endpoint
+ * characteristics.
+ * DMA descriptor transfer bytes limit depends on EP type:
+ * Control out - MPS,
+ * Isochronous - descriptor rx/tx bytes bitfield limit,
+ * Control In/Bulk/Interrupt - multiple of mps. This will allow to not
+ * have concatenations from various descriptors within one packet.
+ *
+ * Selects corresponding mask for RX/TX bytes as well.
+ */
+static u32 dwc2_gadget_get_desc_params(struct dwc2_hsotg_ep *hs_ep, u32 *mask)
+{
+        u32 mps = hs_ep->ep.maxpacket;
+        int dir_in = hs_ep->dir_in;
+        u32 desc_size = 0;
+
+        if (!hs_ep->index && !dir_in) {
+                desc_size = mps;
+                *mask = DEV_DMA_NBYTES_MASK;
+        } else if (hs_ep->isochronous) {
+                if (dir_in) {
+                        desc_size = DEV_DMA_ISOC_TX_NBYTES_LIMIT;
+                        *mask = DEV_DMA_ISOC_TX_NBYTES_MASK;
+                } else {
+                        desc_size = DEV_DMA_ISOC_RX_NBYTES_LIMIT;
+                        *mask = DEV_DMA_ISOC_RX_NBYTES_MASK;
+                }
+        } else {
+                desc_size = DEV_DMA_NBYTES_LIMIT;
+                *mask = DEV_DMA_NBYTES_MASK;
+
+                /* Round down desc_size to be mps multiple */
+                desc_size -= desc_size % mps;
+        }
+
+        return desc_size;
+}
+
+/*
+ * dwc2_gadget_config_nonisoc_xfer_ddma - prepare non ISOC DMA desc chain.
+ * @hs_ep: The endpoint
+ * @dma_buff: DMA address to use
+ * @len: Length of the transfer
+ *
+ * This function will iterate over descriptor chain and fill its entries
+ * with corresponding information based on transfer data.
+ */
+static void dwc2_gadget_config_nonisoc_xfer_ddma(struct dwc2_hsotg_ep *hs_ep,
+                                                 dma_addr_t dma_buff,
+                                                 unsigned int len)
+{
+        struct dwc2_hsotg *hsotg = hs_ep->parent;
+        int dir_in = hs_ep->dir_in;
+        struct dwc2_dma_desc *desc = hs_ep->desc_list;
+        u32 mps = hs_ep->ep.maxpacket;
+        u32 maxsize = 0;
+        u32 offset = 0;
+        u32 mask = 0;
+        int i;
+
+        maxsize = dwc2_gadget_get_desc_params(hs_ep, &mask);
+
+        hs_ep->desc_count = (len / maxsize) +
+                                ((len % maxsize) ? 1 : 0);
+        if (len == 0)
+                hs_ep->desc_count = 1;
+
+        for (i = 0; i < hs_ep->desc_count; ++i) {
+                desc->status = 0;
+                desc->status |= (DEV_DMA_BUFF_STS_HBUSY
+                                 << DEV_DMA_BUFF_STS_SHIFT);
+
+                if (len > maxsize) {
+                        if (!hs_ep->index && !dir_in)
+                                desc->status |= (DEV_DMA_L | DEV_DMA_IOC);
+
+                        desc->status |= (maxsize <<
+                                                DEV_DMA_NBYTES_SHIFT & mask);
+                        desc->buf = dma_buff + offset;
+
+                        len -= maxsize;
+                        offset += maxsize;
+                } else {
+                        desc->status |= (DEV_DMA_L | DEV_DMA_IOC);
+
+                        if (dir_in)
+                                desc->status |= (len % mps) ? DEV_DMA_SHORT :
+                                        ((hs_ep->send_zlp) ? DEV_DMA_SHORT : 0);
+                        if (len > maxsize)
+                                dev_err(hsotg->dev, "wrong len %d\n", len);
+
+                        desc->status |=
+                                len << DEV_DMA_NBYTES_SHIFT & mask;
+                        desc->buf = dma_buff + offset;
+                }
+
+                desc->status &= ~DEV_DMA_BUFF_STS_MASK;
+                desc->status |= (DEV_DMA_BUFF_STS_HREADY
+                                 << DEV_DMA_BUFF_STS_SHIFT);
+                desc++;
+        }
+}
+
+/*
+ * dwc2_gadget_fill_isoc_desc - fills next isochronous descriptor in chain.
+ * @hs_ep: The isochronous endpoint.
+ * @dma_buff: usb requests dma buffer.
+ * @len: usb request transfer length.
+ *
+ * Finds out index of first free entry either in the bottom or up half of
+ * descriptor chain depend on which is under SW control and not processed
+ * by HW. Then fills that descriptor with the data of the arrived usb request,
+ * frame info, sets Last and IOC bits increments next_desc. If filled
+ * descriptor is not the first one, removes L bit from the previous descriptor
+ * status.
+ */
+static int dwc2_gadget_fill_isoc_desc(struct dwc2_hsotg_ep *hs_ep,
+                                      dma_addr_t dma_buff, unsigned int len)
+{
+        struct dwc2_dma_desc *desc;
+        struct dwc2_hsotg *hsotg = hs_ep->parent;
+        u32 index;
+        u32 maxsize = 0;
+        u32 mask = 0;
+
+        maxsize = dwc2_gadget_get_desc_params(hs_ep, &mask);
+        if (len > maxsize) {
+                dev_err(hsotg->dev, "wrong len %d\n", len);
+                return -EINVAL;
+        }
+
+        /*
+         * If SW has already filled half of chain, then return and wait for
+         * the other chain to be processed by HW.
+         */
+        if (hs_ep->next_desc == MAX_DMA_DESC_NUM_GENERIC / 2)
+                return -EBUSY;
+
+        /* Increment frame number by interval for IN */
+        if (hs_ep->dir_in)
+                dwc2_gadget_incr_frame_num(hs_ep);
+
+        index = (MAX_DMA_DESC_NUM_GENERIC / 2) * hs_ep->isoc_chain_num +
+                 hs_ep->next_desc;
+
+        /* Sanity check of calculated index */
+        if ((hs_ep->isoc_chain_num && index > MAX_DMA_DESC_NUM_GENERIC) ||
+            (!hs_ep->isoc_chain_num && index > MAX_DMA_DESC_NUM_GENERIC / 2)) {
+                dev_err(hsotg->dev, "wrong index %d for iso chain\n", index);
+                return -EINVAL;
+        }
+
+        desc = &hs_ep->desc_list[index];
+
+        /* Clear L bit of previous desc if more than one entries in the chain */
+        if (hs_ep->next_desc)
+                hs_ep->desc_list[index - 1].status &= ~DEV_DMA_L;
+
+        dev_dbg(hsotg->dev, "%s: Filling ep %d, dir %s isoc desc # %d\n",
+                __func__, hs_ep->index, hs_ep->dir_in ? "in" : "out", index);
+
+        desc->status = 0;
+        desc->status |= (DEV_DMA_BUFF_STS_HBUSY << DEV_DMA_BUFF_STS_SHIFT);
+
+        desc->buf = dma_buff;
+        desc->status |= (DEV_DMA_L | DEV_DMA_IOC |
+                         ((len << DEV_DMA_NBYTES_SHIFT) & mask));
+
+        if (hs_ep->dir_in) {
+                desc->status |= ((hs_ep->mc << DEV_DMA_ISOC_PID_SHIFT) &
+                                 DEV_DMA_ISOC_PID_MASK) |
+                                ((len % hs_ep->ep.maxpacket) ?
+                                 DEV_DMA_SHORT : 0) |
+                                ((hs_ep->target_frame <<
+                                  DEV_DMA_ISOC_FRNUM_SHIFT) &
+                                 DEV_DMA_ISOC_FRNUM_MASK);
+        }
+
+        desc->status &= ~DEV_DMA_BUFF_STS_MASK;
+        desc->status |= (DEV_DMA_BUFF_STS_HREADY << DEV_DMA_BUFF_STS_SHIFT);
+
+        /* Update index of last configured entry in the chain */
+        hs_ep->next_desc++;
+
+        return 0;
+}
+
+/*
+ * dwc2_gadget_start_isoc_ddma - start isochronous transfer in DDMA
+ * @hs_ep: The isochronous endpoint.
+ *
+ * Prepare first descriptor chain for isochronous endpoints. Afterwards
+ * write DMA address to HW and enable the endpoint.
+ *
+ * Switch between descriptor chains via isoc_chain_num to give SW opportunity
+ * to prepare second descriptor chain while first one is being processed by HW.
+ */
+static void dwc2_gadget_start_isoc_ddma(struct dwc2_hsotg_ep *hs_ep)
+{
+        struct dwc2_hsotg *hsotg = hs_ep->parent;
+        struct dwc2_hsotg_req *hs_req, *treq;
+        int index = hs_ep->index;
+        int ret;
+        u32 dma_reg;
+        u32 depctl;
+        u32 ctrl;
+
+        if (list_empty(&hs_ep->queue)) {
+                dev_dbg(hsotg->dev, "%s: No requests in queue\n", __func__);
+                return;
+        }
+
+        list_for_each_entry_safe(hs_req, treq, &hs_ep->queue, queue) {
+                ret = dwc2_gadget_fill_isoc_desc(hs_ep, hs_req->req.dma,
+                                                 hs_req->req.length);
+                if (ret) {
+                        dev_dbg(hsotg->dev, "%s: desc chain full\n", __func__);
+                        break;
+                }
+        }
+
+        depctl = hs_ep->dir_in ? DIEPCTL(index) : DOEPCTL(index);
+        dma_reg = hs_ep->dir_in ? DIEPDMA(index) : DOEPDMA(index);
+
+        /* write descriptor chain address to control register */
+        dwc2_writel(hs_ep->desc_list_dma, hsotg->regs + dma_reg);
+
+        ctrl = dwc2_readl(hsotg->regs + depctl);
+        ctrl |= DXEPCTL_EPENA | DXEPCTL_CNAK;
+        dwc2_writel(ctrl, hsotg->regs + depctl);
+
+        /* Switch ISOC descriptor chain number being processed by SW*/
+        hs_ep->isoc_chain_num = (hs_ep->isoc_chain_num ^ 1) & 0x1;
+        hs_ep->next_desc = 0;
+}
+
+/**
  * dwc2_hsotg_start_req - start a USB request from an endpoint's queue
  * @hsotg: The controller state.
  * @hs_ep: The endpoint to process a request for
@@ -565,6 +888,7 @@ static void dwc2_hsotg_start_req(struct dwc2_hsotg *hsotg,
         unsigned length;
         unsigned packets;
         unsigned maxreq;
+        unsigned int dma_reg;
 
         if (index != 0) {
                 if (hs_ep->req && !continuing) {
@@ -579,6 +903,7 @@ static void dwc2_hsotg_start_req(struct dwc2_hsotg *hsotg,
                 }
         }
 
+        dma_reg = dir_in ? DIEPDMA(index) : DOEPDMA(index);
         epctrl_reg = dir_in ? DIEPCTL(index) : DOEPCTL(index);
         epsize_reg = dir_in ? DIEPTSIZ(index) : DOEPTSIZ(index);
 
@@ -598,7 +923,11 @@ static void dwc2_hsotg_start_req(struct dwc2_hsotg *hsotg,
         dev_dbg(hsotg->dev, "ureq->length:%d ureq->actual:%d\n",
                 ureq->length, ureq->actual);
 
-        maxreq = get_ep_limit(hs_ep);
+        if (!using_desc_dma(hsotg))
+                maxreq = get_ep_limit(hs_ep);
+        else
+                maxreq = dwc2_gadget_get_chain_limit(hs_ep);
+
         if (length > maxreq) {
                 int round = maxreq % hs_ep->ep.maxpacket;
 
@@ -650,22 +979,51 @@ static void dwc2_hsotg_start_req(struct dwc2_hsotg *hsotg,
         /* store the request as the current one we're doing */
         hs_ep->req = hs_req;
 
-        /* write size / packets */
-        dwc2_writel(epsize, hsotg->regs + epsize_reg);
+        if (using_desc_dma(hsotg)) {
+                u32 offset = 0;
+                u32 mps = hs_ep->ep.maxpacket;
 
-        if (using_dma(hsotg) && !continuing) {
-                unsigned int dma_reg;
+                /* Adjust length: EP0 - MPS, other OUT EPs - multiple of MPS */
+                if (!dir_in) {
+                        if (!index)
+                                length = mps;
+                        else if (length % mps)
+                                length += (mps - (length % mps));
+                }
 
                 /*
-                 * write DMA address to control register, buffer already
-                 * synced by dwc2_hsotg_ep_queue().
+                 * If more data to send, adjust DMA for EP0 out data stage.
+                 * ureq->dma stays unchanged, hence increment it by already
+                 * passed passed data count before starting new transaction.
                  */
+                if (!index && hsotg->ep0_state == DWC2_EP0_DATA_OUT &&
+                    continuing)
+                        offset = ureq->actual;
 
-                dma_reg = dir_in ? DIEPDMA(index) : DOEPDMA(index);
-                dwc2_writel(ureq->dma, hsotg->regs + dma_reg);
+                /* Fill DDMA chain entries */
+                dwc2_gadget_config_nonisoc_xfer_ddma(hs_ep, ureq->dma + offset,
+                                                     length);
 
-                dev_dbg(hsotg->dev, "%s: %pad => 0x%08x\n",
-                        __func__, &ureq->dma, dma_reg);
+                /* write descriptor chain address to control register */
+                dwc2_writel(hs_ep->desc_list_dma, hsotg->regs + dma_reg);
+
+                dev_dbg(hsotg->dev, "%s: %08x pad => 0x%08x\n",
+                        __func__, (u32)hs_ep->desc_list_dma, dma_reg);
+        } else {
+                /* write size / packets */
+                dwc2_writel(epsize, hsotg->regs + epsize_reg);
+
+                if (using_dma(hsotg) && !continuing && (length != 0)) {
+                        /*
+                         * write DMA address to control register, buffer
+                         * already synced by dwc2_hsotg_ep_queue().
+                         */
+
+                        dwc2_writel(ureq->dma, hsotg->regs + dma_reg);
+
+                        dev_dbg(hsotg->dev, "%s: %pad => 0x%08x\n",
+                                __func__, &ureq->dma, dma_reg);
+                }
         }
 
         if (hs_ep->isochronous && hs_ep->interval == 1) {
@@ -738,13 +1096,8 @@ static int dwc2_hsotg_map_dma(struct dwc2_hsotg *hsotg,
                              struct dwc2_hsotg_ep *hs_ep,
                              struct usb_request *req)
 {
-        struct dwc2_hsotg_req *hs_req = our_req(req);
         int ret;
 
-        /* if the length is zero, ignore the DMA data */
-        if (hs_req->req.length == 0)
-                return 0;
-
         ret = usb_gadget_map_request(&hsotg->gadget, req, hs_ep->dir_in);
         if (ret)
                 goto dma_error;
@@ -835,6 +1188,41 @@ static bool dwc2_gadget_target_frame_elapsed(struct dwc2_hsotg_ep *hs_ep)
         return false;
 }
 
+/*
+ * dwc2_gadget_set_ep0_desc_chain - Set EP's desc chain pointers
+ * @hsotg: The driver state
+ * @hs_ep: the ep descriptor chain is for
+ *
+ * Called to update EP0 structure's pointers depend on stage of
+ * control transfer.
+ */
+static int dwc2_gadget_set_ep0_desc_chain(struct dwc2_hsotg *hsotg,
+                                          struct dwc2_hsotg_ep *hs_ep)
+{
+        switch (hsotg->ep0_state) {
+        case DWC2_EP0_SETUP:
+        case DWC2_EP0_STATUS_OUT:
+                hs_ep->desc_list = hsotg->setup_desc[0];
+                hs_ep->desc_list_dma = hsotg->setup_desc_dma[0];
+                break;
+        case DWC2_EP0_DATA_IN:
+        case DWC2_EP0_STATUS_IN:
+                hs_ep->desc_list = hsotg->ctrl_in_desc;
+                hs_ep->desc_list_dma = hsotg->ctrl_in_desc_dma;
+                break;
+        case DWC2_EP0_DATA_OUT:
+                hs_ep->desc_list = hsotg->ctrl_out_desc;
+                hs_ep->desc_list_dma = hsotg->ctrl_out_desc_dma;
+                break;
+        default:
+                dev_err(hsotg->dev, "invalid EP 0 state in queue %d\n",
+                        hsotg->ep0_state);
+                return -EINVAL;
+        }
+
+        return 0;
+}
+
 static int dwc2_hsotg_ep_queue(struct usb_ep *ep, struct usb_request *req,
                               gfp_t gfp_flags)
 {
@@ -870,10 +1258,32 @@ static int dwc2_hsotg_ep_queue(struct usb_ep *ep, struct usb_request *req,
                 if (ret)
                         return ret;
         }
+        /* If using descriptor DMA configure EP0 descriptor chain pointers */
+        if (using_desc_dma(hs) && !hs_ep->index) {
+                ret = dwc2_gadget_set_ep0_desc_chain(hs, hs_ep);
+                if (ret)
+                        return ret;
+        }
 
         first = list_empty(&hs_ep->queue);
         list_add_tail(&hs_req->queue, &hs_ep->queue);
 
+        /*
+         * Handle DDMA isochronous transfers separately - just add new entry
+         * to the half of descriptor chain that is not processed by HW.
+         * Transfer will be started once SW gets either one of NAK or
+         * OutTknEpDis interrupts.
+         */
+        if (using_desc_dma(hs) && hs_ep->isochronous &&
+            hs_ep->target_frame != TARGET_FRAME_INITIAL) {
+                ret = dwc2_gadget_fill_isoc_desc(hs_ep, hs_req->req.dma,
+                                                 hs_req->req.length);
+                if (ret)
+                        dev_dbg(hs->dev, "%s: ISO desc chain full\n", __func__);
+
+                return 0;
+        }
+
         if (first) {
                 if (!hs_ep->isochronous) {
                         dwc2_hsotg_start_req(hs, hs_ep, hs_req, false);
@@ -1099,10 +1509,8 @@ static int dwc2_hsotg_ep_sethalt(struct usb_ep *ep, int value, bool now);
  */
 static struct dwc2_hsotg_req *get_ep_head(struct dwc2_hsotg_ep *hs_ep)
 {
-        if (list_empty(&hs_ep->queue))
-                return NULL;
-
-        return list_first_entry(&hs_ep->queue, struct dwc2_hsotg_req, queue);
+        return list_first_entry_or_null(&hs_ep->queue, struct dwc2_hsotg_req,
+                                        queue);
 }
 
 /**
@@ -1440,14 +1848,21 @@ static void dwc2_hsotg_program_zlp(struct dwc2_hsotg *hsotg,
 
         if (hs_ep->dir_in)
                 dev_dbg(hsotg->dev, "Sending zero-length packet on ep%d\n",
-                                                                        index);
+                        index);
         else
                 dev_dbg(hsotg->dev, "Receiving zero-length packet on ep%d\n",
-                                                                        index);
+                        index);
+        if (using_desc_dma(hsotg)) {
+                /* Not specific buffer needed for ep0 ZLP */
+                dma_addr_t dma = hs_ep->desc_list_dma;
 
-        dwc2_writel(DXEPTSIZ_MC(1) | DXEPTSIZ_PKTCNT(1) |
-                    DXEPTSIZ_XFERSIZE(0), hsotg->regs +
-                    epsiz_reg);
+                dwc2_gadget_set_ep0_desc_chain(hsotg, hs_ep);
+                dwc2_gadget_config_nonisoc_xfer_ddma(hs_ep, dma, 0);
+        } else {
+                dwc2_writel(DXEPTSIZ_MC(1) | DXEPTSIZ_PKTCNT(1) |
+                            DXEPTSIZ_XFERSIZE(0), hsotg->regs +
+                            epsiz_reg);
+        }
 
         ctrl = dwc2_readl(hsotg->regs + epctl_reg);
         ctrl |= DXEPCTL_CNAK;  /* clear NAK set by core */
@@ -1510,6 +1925,10 @@ static void dwc2_hsotg_complete_request(struct dwc2_hsotg *hsotg,
                 spin_lock(&hsotg->lock);
         }
 
+        /* In DDMA don't need to proceed to starting of next ISOC request */
+        if (using_desc_dma(hsotg) && hs_ep->isochronous)
+                return;
+
         /*
          * Look to see if there is anything else to do. Note, the completion
          * of the previous request may have caused a new request to be started
@@ -1521,6 +1940,115 @@ static void dwc2_hsotg_complete_request(struct dwc2_hsotg *hsotg,
         }
 }
 
+/*
+ * dwc2_gadget_complete_isoc_request_ddma - complete an isoc request in DDMA
+ * @hs_ep: The endpoint the request was on.
+ *
+ * Get first request from the ep queue, determine descriptor on which complete
+ * happened. SW based on isoc_chain_num discovers which half of the descriptor
+ * chain is currently in use by HW, adjusts dma_address and calculates index
+ * of completed descriptor based on the value of DEPDMA register. Update actual
+ * length of request, giveback to gadget.
+ */
+static void dwc2_gadget_complete_isoc_request_ddma(struct dwc2_hsotg_ep *hs_ep)
+{
+        struct dwc2_hsotg *hsotg = hs_ep->parent;
+        struct dwc2_hsotg_req *hs_req;
+        struct usb_request *ureq;
+        int index;
+        dma_addr_t dma_addr;
+        u32 dma_reg;
+        u32 depdma;
+        u32 desc_sts;
+        u32 mask;
+
+        hs_req = get_ep_head(hs_ep);
+        if (!hs_req) {
+                dev_warn(hsotg->dev, "%s: ISOC EP queue empty\n", __func__);
+                return;
+        }
+        ureq = &hs_req->req;
+
+        dma_addr = hs_ep->desc_list_dma;
+
+        /*
+         * If lower half of  descriptor chain is currently use by SW,
+         * that means higher half is being processed by HW, so shift
+         * DMA address to higher half of descriptor chain.
+         */
+        if (!hs_ep->isoc_chain_num)
+                dma_addr += sizeof(struct dwc2_dma_desc) *
+                            (MAX_DMA_DESC_NUM_GENERIC / 2);
+
+        dma_reg = hs_ep->dir_in ? DIEPDMA(hs_ep->index) : DOEPDMA(hs_ep->index);
+        depdma = dwc2_readl(hsotg->regs + dma_reg);
+
+        index = (depdma - dma_addr) / sizeof(struct dwc2_dma_desc) - 1;
+        desc_sts = hs_ep->desc_list[index].status;
+
+        mask = hs_ep->dir_in ? DEV_DMA_ISOC_TX_NBYTES_MASK :
+               DEV_DMA_ISOC_RX_NBYTES_MASK;
+        ureq->actual = ureq->length -
+                       ((desc_sts & mask) >> DEV_DMA_ISOC_NBYTES_SHIFT);
+
+        /* Adjust actual length for ISOC Out if length is not align of 4 */
+        if (!hs_ep->dir_in && ureq->length & 0x3)
+                ureq->actual += 4 - (ureq->length & 0x3);
+
+        dwc2_hsotg_complete_request(hsotg, hs_ep, hs_req, 0);
+}
+
+/*
+ * dwc2_gadget_start_next_isoc_ddma - start next isoc request, if any.
+ * @hs_ep: The isochronous endpoint to be re-enabled.
+ *
+ * If ep has been disabled due to last descriptor servicing (IN endpoint) or
+ * BNA (OUT endpoint) check the status of other half of descriptor chain that
+ * was under SW control till HW was busy and restart the endpoint if needed.
+ */
+static void dwc2_gadget_start_next_isoc_ddma(struct dwc2_hsotg_ep *hs_ep)
+{
+        struct dwc2_hsotg *hsotg = hs_ep->parent;
+        u32 depctl;
+        u32 dma_reg;
+        u32 ctrl;
+        u32 dma_addr = hs_ep->desc_list_dma;
+        unsigned char index = hs_ep->index;
+
+        dma_reg = hs_ep->dir_in ? DIEPDMA(index) : DOEPDMA(index);
+        depctl = hs_ep->dir_in ? DIEPCTL(index) : DOEPCTL(index);
+
+        ctrl = dwc2_readl(hsotg->regs + depctl);
+
+        /*
+         * EP was disabled if HW has processed last descriptor or BNA was set.
+         * So restart ep if SW has prepared new descriptor chain in ep_queue
+         * routine while HW was busy.
+         */
+        if (!(ctrl & DXEPCTL_EPENA)) {
+                if (!hs_ep->next_desc) {
+                        dev_dbg(hsotg->dev, "%s: No more ISOC requests\n",
+                                __func__);
+                        return;
+                }
+
+                dma_addr += sizeof(struct dwc2_dma_desc) *
+                            (MAX_DMA_DESC_NUM_GENERIC / 2) *
+                            hs_ep->isoc_chain_num;
+                dwc2_writel(dma_addr, hsotg->regs + dma_reg);
+
+                ctrl |= DXEPCTL_EPENA | DXEPCTL_CNAK;
+                dwc2_writel(ctrl, hsotg->regs + depctl);
+
+                /* Switch ISOC descriptor chain number being processed by SW*/
+                hs_ep->isoc_chain_num = (hs_ep->isoc_chain_num ^ 1) & 0x1;
+                hs_ep->next_desc = 0;
+
+                dev_dbg(hsotg->dev, "%s: Restarted isochronous endpoint\n",
+                        __func__);
+        }
+}
+
 /**
  * dwc2_hsotg_rx_data - receive data from the FIFO for an endpoint
  * @hsotg: The device state.
@@ -1618,6 +2146,36 @@ static void dwc2_hsotg_change_ep_iso_parity(struct dwc2_hsotg *hsotg,
         dwc2_writel(ctrl, hsotg->regs + epctl_reg);
 }
 
+/*
+ * dwc2_gadget_get_xfersize_ddma - get transferred bytes amount from desc
+ * @hs_ep - The endpoint on which transfer went
+ *
+ * Iterate over endpoints descriptor chain and get info on bytes remained
+ * in DMA descriptors after transfer has completed. Used for non isoc EPs.
+ */
+static unsigned int dwc2_gadget_get_xfersize_ddma(struct dwc2_hsotg_ep *hs_ep)
+{
+        struct dwc2_hsotg *hsotg = hs_ep->parent;
+        unsigned int bytes_rem = 0;
+        struct dwc2_dma_desc *desc = hs_ep->desc_list;
+        int i;
+        u32 status;
+
+        if (!desc)
+                return -EINVAL;
+
+        for (i = 0; i < hs_ep->desc_count; ++i) {
+                status = desc->status;
+                bytes_rem += status & DEV_DMA_NBYTES_MASK;
+
+                if (status & DEV_DMA_STS_MASK)
+                        dev_err(hsotg->dev, "descriptor %d closed with %x\n",
+                                i, status & DEV_DMA_STS_MASK);
+        }
+
+        return bytes_rem;
+}
+
 /**
  * dwc2_hsotg_handle_outdone - handle receiving OutDone/SetupDone from RXFIFO
  * @hsotg: The device instance
@@ -1648,6 +2206,9 @@ static void dwc2_hsotg_handle_outdone(struct dwc2_hsotg *hsotg, int epnum)
                 return;
         }
 
+        if (using_desc_dma(hsotg))
+                size_left = dwc2_gadget_get_xfersize_ddma(hs_ep);
+
         if (using_dma(hsotg)) {
                 unsigned size_done;
 
@@ -1682,7 +2243,9 @@ static void dwc2_hsotg_handle_outdone(struct dwc2_hsotg *hsotg, int epnum)
                  */
         }
 
-        if (epnum == 0 && hsotg->ep0_state == DWC2_EP0_DATA_OUT) {
+        /* DDMA IN status phase will start from StsPhseRcvd interrupt */
+        if (!using_desc_dma(hsotg) && epnum == 0 &&
+            hsotg->ep0_state == DWC2_EP0_DATA_OUT) {
                 /* Move to STATUS IN */
                 dwc2_hsotg_ep0_zlp(hsotg, true);
                 return;
@@ -1812,17 +2375,17 @@ static u32 dwc2_hsotg_ep0_mps(unsigned int mps)
  * @hsotg: The driver state.
  * @ep: The index number of the endpoint
  * @mps: The maximum packet size in bytes
+ * @mc: The multicount value
  *
  * Configure the maximum packet size for the given endpoint, updating
  * the hardware control registers to reflect this.
  */
 static void dwc2_hsotg_set_ep_maxpacket(struct dwc2_hsotg *hsotg,
-                        unsigned int ep, unsigned int mps, unsigned int dir_in)
+                                        unsigned int ep, unsigned int mps,
+                                        unsigned int mc, unsigned int dir_in)
 {
         struct dwc2_hsotg_ep *hs_ep;
         void __iomem *regs = hsotg->regs;
-        u32 mpsval;
-        u32 mcval;
         u32 reg;
 
         hs_ep = index_to_ep(hsotg, ep, dir_in);
@@ -1830,32 +2393,32 @@ static void dwc2_hsotg_set_ep_maxpacket(struct dwc2_hsotg *hsotg,
                 return;
 
         if (ep == 0) {
+                u32 mps_bytes = mps;
+
                 /* EP0 is a special case */
-                mpsval = dwc2_hsotg_ep0_mps(mps);
-                if (mpsval > 3)
+                mps = dwc2_hsotg_ep0_mps(mps_bytes);
+                if (mps > 3)
                         goto bad_mps;
-                hs_ep->ep.maxpacket = mps;
+                hs_ep->ep.maxpacket = mps_bytes;
                 hs_ep->mc = 1;
         } else {
-                mpsval = mps & DXEPCTL_MPS_MASK;
-                if (mpsval > 1024)
+                if (mps > 1024)
                         goto bad_mps;
-                mcval = ((mps >> 11) & 0x3) + 1;
-                hs_ep->mc = mcval;
-                if (mcval > 3)
+                hs_ep->mc = mc;
+                if (mc > 3)
                         goto bad_mps;
-                hs_ep->ep.maxpacket = mpsval;
+                hs_ep->ep.maxpacket = mps;
         }
 
         if (dir_in) {
                 reg = dwc2_readl(regs + DIEPCTL(ep));
                 reg &= ~DXEPCTL_MPS_MASK;
-                reg |= mpsval;
+                reg |= mps;
                 dwc2_writel(reg, regs + DIEPCTL(ep));
         } else {
                 reg = dwc2_readl(regs + DOEPCTL(ep));
                 reg &= ~DXEPCTL_MPS_MASK;
-                reg |= mpsval;
+                reg |= mps;
                 dwc2_writel(reg, regs + DOEPCTL(ep));
         }
 
@@ -1954,6 +2517,13 @@ static void dwc2_hsotg_complete_in(struct dwc2_hsotg *hsotg,
         /* Finish ZLP handling for IN EP0 transactions */
         if (hs_ep->index == 0 && hsotg->ep0_state == DWC2_EP0_STATUS_IN) {
                 dev_dbg(hsotg->dev, "zlp packet sent\n");
+
+                /*
+                 * While send zlp for DWC2_EP0_STATUS_IN EP direction was
+                 * changed to IN. Change back to complete OUT transfer request
+                 */
+                hs_ep->dir_in = 0;
+
                 dwc2_hsotg_complete_request(hsotg, hs_ep, hs_req, 0);
                 if (hsotg->test_mode) {
                         int ret;
@@ -1979,8 +2549,14 @@ static void dwc2_hsotg_complete_in(struct dwc2_hsotg *hsotg,
          * past the end of the buffer (DMA transfers are always 32bit
          * aligned).
          */
-
-        size_left = DXEPTSIZ_XFERSIZE_GET(epsize);
+        if (using_desc_dma(hsotg)) {
+                size_left = dwc2_gadget_get_xfersize_ddma(hs_ep);
+                if (size_left < 0)
+                        dev_err(hsotg->dev, "error parsing DDMA results %d\n",
+                                size_left);
+        } else {
+                size_left = DXEPTSIZ_XFERSIZE_GET(epsize);
+        }
 
         size_done = hs_ep->size_loaded - size_left;
         size_done += hs_ep->last_load;
@@ -2128,12 +2704,28 @@ static void dwc2_gadget_handle_out_token_ep_disabled(struct dwc2_hsotg_ep *ep)
         struct dwc2_hsotg *hsotg = ep->parent;
         int dir_in = ep->dir_in;
         u32 doepmsk;
+        u32 tmp;
 
         if (dir_in || !ep->isochronous)
                 return;
 
+        /*
+         * Store frame in which irq was asserted here, as
+         * it can change while completing request below.
+         */
+        tmp = dwc2_hsotg_read_frameno(hsotg);
+
         dwc2_hsotg_complete_request(hsotg, ep, get_ep_head(ep), -ENODATA);
 
+        if (using_desc_dma(hsotg)) {
+                if (ep->target_frame == TARGET_FRAME_INITIAL) {
+                        /* Start first ISO Out */
+                        ep->target_frame = tmp;
+                        dwc2_gadget_start_isoc_ddma(ep);
+                }
+                return;
+        }
+
         if (ep->interval > 1 &&
             ep->target_frame == TARGET_FRAME_INITIAL) {
                 u32 dsts;
@@ -2182,6 +2774,12 @@ static void dwc2_gadget_handle_nak(struct dwc2_hsotg_ep *hs_ep)
 
         if (hs_ep->target_frame == TARGET_FRAME_INITIAL) {
                 hs_ep->target_frame = dwc2_hsotg_read_frameno(hsotg);
+
+                if (using_desc_dma(hsotg)) {
+                        dwc2_gadget_start_isoc_ddma(hs_ep);
+                        return;
+                }
+
                 if (hs_ep->interval > 1) {
                         u32 ctrl = dwc2_readl(hsotg->regs +
                                               DIEPCTL(hs_ep->index));
@@ -2237,8 +2835,15 @@ static void dwc2_hsotg_epint(struct dwc2_hsotg *hsotg, unsigned int idx,
         if (idx == 0 && (ints & (DXEPINT_SETUP | DXEPINT_SETUP_RCVD)))
                 ints &= ~DXEPINT_XFERCOMPL;
 
-        if (ints & DXEPINT_STSPHSERCVD)
-                dev_dbg(hsotg->dev, "%s: StsPhseRcvd asserted\n", __func__);
+        /*
+         * Don't process XferCompl interrupt in DDMA if EP0 is still in SETUP
+         * stage and xfercomplete was generated without SETUP phase done
+         * interrupt. SW should parse received setup packet only after host's
+         * exit from setup phase of control transfer.
+         */
+        if (using_desc_dma(hsotg) && idx == 0 && !hs_ep->dir_in &&
+            hsotg->ep0_state == DWC2_EP0_SETUP && !(ints & DXEPINT_SETUP))
+                ints &= ~DXEPINT_XFERCOMPL;
 
         if (ints & DXEPINT_XFERCOMPL) {
                 dev_dbg(hsotg->dev,
@@ -2246,11 +2851,17 @@ static void dwc2_hsotg_epint(struct dwc2_hsotg *hsotg, unsigned int idx,
                         __func__, dwc2_readl(hsotg->regs + epctl_reg),
                         dwc2_readl(hsotg->regs + epsiz_reg));
 
-                /*
-                 * we get OutDone from the FIFO, so we only need to look
-                 * at completing IN requests here
-                 */
-                if (dir_in) {
+                /* In DDMA handle isochronous requests separately */
+                if (using_desc_dma(hsotg) && hs_ep->isochronous) {
+                        dwc2_gadget_complete_isoc_request_ddma(hs_ep);
+                        /* Try to start next isoc request */
+                        dwc2_gadget_start_next_isoc_ddma(hs_ep);
+                } else if (dir_in) {
+                        /*
+                         * We get OutDone from the FIFO, so we only
+                         * need to look at completing IN requests here
+                         * if operating slave mode
+                         */
                         if (hs_ep->isochronous && hs_ep->interval > 1)
                                 dwc2_gadget_incr_frame_num(hs_ep);
 
@@ -2302,9 +2913,30 @@ static void dwc2_hsotg_epint(struct dwc2_hsotg *hsotg, unsigned int idx,
                 }
         }
 
+        if (ints & DXEPINT_STSPHSERCVD) {
+                dev_dbg(hsotg->dev, "%s: StsPhseRcvd\n", __func__);
+
+                /* Move to STATUS IN for DDMA */
+                if (using_desc_dma(hsotg))
+                        dwc2_hsotg_ep0_zlp(hsotg, true);
+        }
+
         if (ints & DXEPINT_BACK2BACKSETUP)
                 dev_dbg(hsotg->dev, "%s: B2BSetup/INEPNakEff\n", __func__);
 
+        if (ints & DXEPINT_BNAINTR) {
+                dev_dbg(hsotg->dev, "%s: BNA interrupt\n", __func__);
+
+                /*
+                 * Try to start next isoc request, if any.
+                 * Sometimes the endpoint remains enabled after BNA interrupt
+                 * assertion, which is not expected, hence we can enter here
+                 * couple of times.
+                 */
+                if (hs_ep->isochronous)
+                        dwc2_gadget_start_next_isoc_ddma(hs_ep);
+        }
+
         if (dir_in && !hs_ep->isochronous) {
                 /* not sure if this is important, but we'll clear it anyway */
                 if (ints & DXEPINT_INTKNTXFEMP) {
@@ -2372,6 +3004,8 @@ static void dwc2_hsotg_irq_enumdone(struct dwc2_hsotg *hsotg)
 
         case DSTS_ENUMSPD_LS:
                 hsotg->gadget.speed = USB_SPEED_LOW;
+                ep0_mps = 8;
+                ep_mps = 8;
                 /*
                  * note, we don't actually support LS in this driver at the
                  * moment, and the documentation seems to imply that it isn't
@@ -2390,13 +3024,15 @@ static void dwc2_hsotg_irq_enumdone(struct dwc2_hsotg *hsotg)
         if (ep0_mps) {
                 int i;
                 /* Initialize ep0 for both in and out directions */
-                dwc2_hsotg_set_ep_maxpacket(hsotg, 0, ep0_mps, 1);
-                dwc2_hsotg_set_ep_maxpacket(hsotg, 0, ep0_mps, 0);
+                dwc2_hsotg_set_ep_maxpacket(hsotg, 0, ep0_mps, 0, 1);
+                dwc2_hsotg_set_ep_maxpacket(hsotg, 0, ep0_mps, 0, 0);
                 for (i = 1; i < hsotg->num_of_eps; i++) {
                         if (hsotg->eps_in[i])
-                                dwc2_hsotg_set_ep_maxpacket(hsotg, i, ep_mps, 1);
+                                dwc2_hsotg_set_ep_maxpacket(hsotg, i, ep_mps,
+                                                            0, 1);
                         if (hsotg->eps_out[i])
-                                dwc2_hsotg_set_ep_maxpacket(hsotg, i, ep_mps, 0);
+                                dwc2_hsotg_set_ep_maxpacket(hsotg, i, ep_mps,
+                                                            0, 0);
                 }
         }
 
@@ -2516,6 +3152,7 @@ void dwc2_hsotg_core_init_disconnected(struct dwc2_hsotg *hsotg,
         u32 intmsk;
         u32 val;
         u32 usbcfg;
+        u32 dcfg = 0;
 
         /* Kill any ep0 requests as controller will be reinitialized */
         kill_all_requests(hsotg, hsotg->eps_out[0], -ECONNRESET);
@@ -2534,10 +3171,17 @@ void dwc2_hsotg_core_init_disconnected(struct dwc2_hsotg *hsotg,
         usbcfg &= ~(GUSBCFG_TOUTCAL_MASK | GUSBCFG_PHYIF16 | GUSBCFG_SRPCAP |
                 GUSBCFG_HNPCAP);
 
-        /* set the PLL on, remove the HNP/SRP and set the PHY */
-        val = (hsotg->phyif == GUSBCFG_PHYIF8) ? 9 : 5;
-        usbcfg |= hsotg->phyif | GUSBCFG_TOUTCAL(7) |
-                (val << GUSBCFG_USBTRDTIM_SHIFT);
+        if (hsotg->params.phy_type == DWC2_PHY_TYPE_PARAM_FS &&
+            (hsotg->params.speed == DWC2_SPEED_PARAM_FULL ||
+             hsotg->params.speed == DWC2_SPEED_PARAM_LOW)) {
+                /* FS/LS Dedicated Transceiver Interface */
+                usbcfg |= GUSBCFG_PHYSEL;
+        } else {
+                /* set the PLL on, remove the HNP/SRP and set the PHY */
+                val = (hsotg->phyif == GUSBCFG_PHYIF8) ? 9 : 5;
+                usbcfg |= hsotg->phyif | GUSBCFG_TOUTCAL(7) |
+                        (val << GUSBCFG_USBTRDTIM_SHIFT);
+        }
         dwc2_writel(usbcfg, hsotg->regs + GUSBCFG);
 
         dwc2_hsotg_init_fifo(hsotg);
@@ -2545,7 +3189,23 @@ void dwc2_hsotg_core_init_disconnected(struct dwc2_hsotg *hsotg,
         if (!is_usb_reset)
                 __orr32(hsotg->regs + DCTL, DCTL_SFTDISCON);
 
-        dwc2_writel(DCFG_EPMISCNT(1) | DCFG_DEVSPD_HS,  hsotg->regs + DCFG);
+        dcfg |= DCFG_EPMISCNT(1);
+
+        switch (hsotg->params.speed) {
+        case DWC2_SPEED_PARAM_LOW:
+                dcfg |= DCFG_DEVSPD_LS;
+                break;
+        case DWC2_SPEED_PARAM_FULL:
+                if (hsotg->params.phy_type == DWC2_PHY_TYPE_PARAM_FS)
+                        dcfg |= DCFG_DEVSPD_FS48;
+                else
+                        dcfg |= DCFG_DEVSPD_FS;
+                break;
+        default:
+                dcfg |= DCFG_DEVSPD_HS;
+        }
+
+        dwc2_writel(dcfg,  hsotg->regs + DCFG);
 
         /* Clear any pending OTG interrupts */
         dwc2_writel(0xffffffff, hsotg->regs + GOTGINT);
@@ -2556,23 +3216,31 @@ void dwc2_hsotg_core_init_disconnected(struct dwc2_hsotg *hsotg,
                 GINTSTS_GOUTNAKEFF | GINTSTS_GINNAKEFF |
                 GINTSTS_USBRST | GINTSTS_RESETDET |
                 GINTSTS_ENUMDONE | GINTSTS_OTGINT |
-                GINTSTS_USBSUSP | GINTSTS_WKUPINT |
-                GINTSTS_INCOMPL_SOIN | GINTSTS_INCOMPL_SOOUT;
+                GINTSTS_USBSUSP | GINTSTS_WKUPINT;
 
-        if (hsotg->core_params->external_id_pin_ctl <= 0)
+        if (!using_desc_dma(hsotg))
+                intmsk |= GINTSTS_INCOMPL_SOIN | GINTSTS_INCOMPL_SOOUT;
+
+        if (hsotg->params.external_id_pin_ctl <= 0)
                 intmsk |= GINTSTS_CONIDSTSCHNG;
 
         dwc2_writel(intmsk, hsotg->regs + GINTMSK);
 
-        if (using_dma(hsotg))
+        if (using_dma(hsotg)) {
                 dwc2_writel(GAHBCFG_GLBL_INTR_EN | GAHBCFG_DMA_EN |
                             (GAHBCFG_HBSTLEN_INCR4 << GAHBCFG_HBSTLEN_SHIFT),
                             hsotg->regs + GAHBCFG);
-        else
+
+                /* Set DDMA mode support in the core if needed */
+                if (using_desc_dma(hsotg))
+                        __orr32(hsotg->regs + DCFG, DCFG_DESCDMA_EN);
+
+        } else {
                 dwc2_writel(((hsotg->dedicated_fifos) ?
                                                 (GAHBCFG_NP_TXF_EMP_LVL |
                                                  GAHBCFG_P_TXF_EMP_LVL) : 0) |
                             GAHBCFG_GLBL_INTR_EN, hsotg->regs + GAHBCFG);
+        }
 
         /*
          * If INTknTXFEmpMsk is enabled, it's important to disable ep interrupts
@@ -2588,13 +3256,18 @@ void dwc2_hsotg_core_init_disconnected(struct dwc2_hsotg *hsotg,
 
         /*
          * don't need XferCompl, we get that from RXFIFO in slave mode. In
-         * DMA mode we may need this.
+         * DMA mode we may need this and StsPhseRcvd.
          */
-        dwc2_writel((using_dma(hsotg) ? (DIEPMSK_XFERCOMPLMSK) : 0) |
+        dwc2_writel((using_dma(hsotg) ? (DIEPMSK_XFERCOMPLMSK |
+                DOEPMSK_STSPHSERCVDMSK) : 0) |
                 DOEPMSK_EPDISBLDMSK | DOEPMSK_AHBERRMSK |
-                DOEPMSK_SETUPMSK | DOEPMSK_STSPHSERCVDMSK,
+                DOEPMSK_SETUPMSK,
                 hsotg->regs + DOEPMSK);
 
+        /* Enable BNA interrupt for DDMA */
+        if (using_desc_dma(hsotg))
+                __orr32(hsotg->regs + DOEPMSK, DOEPMSK_BNAMSK);
+
         dwc2_writel(0, hsotg->regs + DAINTMSK);
 
         dev_dbg(hsotg->dev, "EP0: DIEPCTL0=0x%08x, DOEPCTL0=0x%08x\n",
@@ -2935,6 +3608,95 @@ irq_retry:
         return IRQ_HANDLED;
 }
 
+static int dwc2_hsotg_wait_bit_set(struct dwc2_hsotg *hs_otg, u32 reg,
+                                   u32 bit, u32 timeout)
+{
+        u32 i;
+
+        for (i = 0; i < timeout; i++) {
+                if (dwc2_readl(hs_otg->regs + reg) & bit)
+                        return 0;
+                udelay(1);
+        }
+
+        return -ETIMEDOUT;
+}
+
+static void dwc2_hsotg_ep_stop_xfr(struct dwc2_hsotg *hsotg,
+                                   struct dwc2_hsotg_ep *hs_ep)
+{
+        u32 epctrl_reg;
+        u32 epint_reg;
+
+        epctrl_reg = hs_ep->dir_in ? DIEPCTL(hs_ep->index) :
+                DOEPCTL(hs_ep->index);
+        epint_reg = hs_ep->dir_in ? DIEPINT(hs_ep->index) :
+                DOEPINT(hs_ep->index);
+
+        dev_dbg(hsotg->dev, "%s: stopping transfer on %s\n", __func__,
+                hs_ep->name);
+
+        if (hs_ep->dir_in) {
+                if (hsotg->dedicated_fifos || hs_ep->periodic) {
+                        __orr32(hsotg->regs + epctrl_reg, DXEPCTL_SNAK);
+                        /* Wait for Nak effect */
+                        if (dwc2_hsotg_wait_bit_set(hsotg, epint_reg,
+                                                    DXEPINT_INEPNAKEFF, 100))
+                                dev_warn(hsotg->dev,
+                                         "%s: timeout DIEPINT.NAKEFF\n",
+                                         __func__);
+                } else {
+                        __orr32(hsotg->regs + DCTL, DCTL_SGNPINNAK);
+                        /* Wait for Nak effect */
+                        if (dwc2_hsotg_wait_bit_set(hsotg, GINTSTS,
+                                                    GINTSTS_GINNAKEFF, 100))
+                                dev_warn(hsotg->dev,
+                                         "%s: timeout GINTSTS.GINNAKEFF\n",
+                                         __func__);
+                }
+        } else {
+                if (!(dwc2_readl(hsotg->regs + GINTSTS) & GINTSTS_GOUTNAKEFF))
+                        __orr32(hsotg->regs + DCTL, DCTL_SGOUTNAK);
+
+                /* Wait for global nak to take effect */
+                if (dwc2_hsotg_wait_bit_set(hsotg, GINTSTS,
+                                            GINTSTS_GOUTNAKEFF, 100))
+                        dev_warn(hsotg->dev, "%s: timeout GINTSTS.GOUTNAKEFF\n",
+                                 __func__);
+        }
+
+        /* Disable ep */
+        __orr32(hsotg->regs + epctrl_reg, DXEPCTL_EPDIS | DXEPCTL_SNAK);
+
+        /* Wait for ep to be disabled */
+        if (dwc2_hsotg_wait_bit_set(hsotg, epint_reg, DXEPINT_EPDISBLD, 100))
+                dev_warn(hsotg->dev,
+                         "%s: timeout DOEPCTL.EPDisable\n", __func__);
+
+        /* Clear EPDISBLD interrupt */
+        __orr32(hsotg->regs + epint_reg, DXEPINT_EPDISBLD);
+
+        if (hs_ep->dir_in) {
+                unsigned short fifo_index;
+
+                if (hsotg->dedicated_fifos || hs_ep->periodic)
+                        fifo_index = hs_ep->fifo_index;
+                else
+                        fifo_index = 0;
+
+                /* Flush TX FIFO */
+                dwc2_flush_tx_fifo(hsotg, fifo_index);
+
+                /* Clear Global In NP NAK in Shared FIFO for non periodic ep */
+                if (!hsotg->dedicated_fifos && !hs_ep->periodic)
+                        __orr32(hsotg->regs + DCTL, DCTL_CGNPINNAK);
+
+        } else {
+                /* Remove global NAKs */
+                __orr32(hsotg->regs + DCTL, DCTL_CGOUTNAK);
+        }
+}
+
 /**
  * dwc2_hsotg_ep_enable - enable the given endpoint
  * @ep: The USB endpint to configure
@@ -2952,6 +3714,7 @@ static int dwc2_hsotg_ep_enable(struct usb_ep *ep,
         u32 epctrl_reg;
         u32 epctrl;
         u32 mps;
+        u32 mc;
         u32 mask;
         unsigned int dir_in;
         unsigned int i, val, size;
@@ -2975,6 +3738,7 @@ static int dwc2_hsotg_ep_enable(struct usb_ep *ep,
         }
 
         mps = usb_endpoint_maxp(desc);
+        mc = usb_endpoint_maxp_mult(desc);
 
         /* note, we handle this here instead of dwc2_hsotg_set_ep_maxpacket */
 
@@ -2984,6 +3748,18 @@ static int dwc2_hsotg_ep_enable(struct usb_ep *ep,
         dev_dbg(hsotg->dev, "%s: read DxEPCTL=0x%08x from 0x%08x\n",
                 __func__, epctrl, epctrl_reg);
 
+        /* Allocate DMA descriptor chain for non-ctrl endpoints */
+        if (using_desc_dma(hsotg)) {
+                hs_ep->desc_list = dma_alloc_coherent(hsotg->dev,
+                        MAX_DMA_DESC_NUM_GENERIC *
+                        sizeof(struct dwc2_dma_desc),
+                        &hs_ep->desc_list_dma, GFP_KERNEL);
+                if (!hs_ep->desc_list) {
+                        ret = -ENOMEM;
+                        goto error2;
+                }
+        }
+
         spin_lock_irqsave(&hsotg->lock, flags);
 
         epctrl &= ~(DXEPCTL_EPTYPE_MASK | DXEPCTL_MPS_MASK);
@@ -2996,7 +3772,7 @@ static int dwc2_hsotg_ep_enable(struct usb_ep *ep,
         epctrl |= DXEPCTL_USBACTEP;
 
         /* update the endpoint state */
-        dwc2_hsotg_set_ep_maxpacket(hsotg, hs_ep->index, mps, dir_in);
+        dwc2_hsotg_set_ep_maxpacket(hsotg, hs_ep->index, mps, mc, dir_in);
 
         /* default, set to non-periodic */
         hs_ep->isochronous = 0;
@@ -3011,6 +3787,8 @@ static int dwc2_hsotg_ep_enable(struct usb_ep *ep,
                 hs_ep->isochronous = 1;
                 hs_ep->interval = 1 << (desc->bInterval - 1);
                 hs_ep->target_frame = TARGET_FRAME_INITIAL;
+                hs_ep->isoc_chain_num = 0;
+                hs_ep->next_desc = 0;
                 if (dir_in) {
                         hs_ep->periodic = 1;
                         mask = dwc2_readl(hsotg->regs + DIEPMSK);
@@ -3067,7 +3845,7 @@ static int dwc2_hsotg_ep_enable(struct usb_ep *ep,
                         dev_err(hsotg->dev,
                                 "%s: No suitable fifo found\n", __func__);
                         ret = -ENOMEM;
-                        goto error;
+                        goto error1;
                 }
                 hsotg->fifo_map |= 1 << fifo_index;
                 epctrl |= DXEPCTL_TXFNUM(fifo_index);
@@ -3089,8 +3867,17 @@ static int dwc2_hsotg_ep_enable(struct usb_ep *ep,
         /* enable the endpoint interrupt */
         dwc2_hsotg_ctrl_epint(hsotg, index, dir_in, 1);
 
-error:
+error1:
         spin_unlock_irqrestore(&hsotg->lock, flags);
+
+error2:
+        if (ret && using_desc_dma(hsotg) && hs_ep->desc_list) {
+                dma_free_coherent(hsotg->dev, MAX_DMA_DESC_NUM_GENERIC *
+                        sizeof(struct dwc2_dma_desc),
+                        hs_ep->desc_list, hs_ep->desc_list_dma);
+                hs_ep->desc_list = NULL;
+        }
+
         return ret;
 }
 
@@ -3115,11 +3902,23 @@ static int dwc2_hsotg_ep_disable(struct usb_ep *ep)
                 return -EINVAL;
         }
 
+        /* Remove DMA memory allocated for non-control Endpoints */
+        if (using_desc_dma(hsotg)) {
+                dma_free_coherent(hsotg->dev, MAX_DMA_DESC_NUM_GENERIC *
+                                  sizeof(struct dwc2_dma_desc),
+                                  hs_ep->desc_list, hs_ep->desc_list_dma);
+                hs_ep->desc_list = NULL;
+        }
+
         epctrl_reg = dir_in ? DIEPCTL(index) : DOEPCTL(index);
 
         spin_lock_irqsave(&hsotg->lock, flags);
 
         ctrl = dwc2_readl(hsotg->regs + epctrl_reg);
+
+        if (ctrl & DXEPCTL_EPENA)
+                dwc2_hsotg_ep_stop_xfr(hsotg, hs_ep);
+
         ctrl &= ~DXEPCTL_EPENA;
         ctrl &= ~DXEPCTL_USBACTEP;
         ctrl |= DXEPCTL_SNAK;
@@ -3158,77 +3957,6 @@ static bool on_list(struct dwc2_hsotg_ep *ep, struct dwc2_hsotg_req *test)
         return false;
 }
 
-static int dwc2_hsotg_wait_bit_set(struct dwc2_hsotg *hs_otg, u32 reg,
-                                                        u32 bit, u32 timeout)
-{
-        u32 i;
-
-        for (i = 0; i < timeout; i++) {
-                if (dwc2_readl(hs_otg->regs + reg) & bit)
-                        return 0;
-                udelay(1);
-        }
-
-        return -ETIMEDOUT;
-}
-
-static void dwc2_hsotg_ep_stop_xfr(struct dwc2_hsotg *hsotg,
-                                                struct dwc2_hsotg_ep *hs_ep)
-{
-        u32 epctrl_reg;
-        u32 epint_reg;
-
-        epctrl_reg = hs_ep->dir_in ? DIEPCTL(hs_ep->index) :
-                DOEPCTL(hs_ep->index);
-        epint_reg = hs_ep->dir_in ? DIEPINT(hs_ep->index) :
-                DOEPINT(hs_ep->index);
-
-        dev_dbg(hsotg->dev, "%s: stopping transfer on %s\n", __func__,
-                        hs_ep->name);
-        if (hs_ep->dir_in) {
-                __orr32(hsotg->regs + epctrl_reg, DXEPCTL_SNAK);
-                /* Wait for Nak effect */
-                if (dwc2_hsotg_wait_bit_set(hsotg, epint_reg,
-                                                DXEPINT_INEPNAKEFF, 100))
-                        dev_warn(hsotg->dev,
-                                "%s: timeout DIEPINT.NAKEFF\n", __func__);
-        } else {
-                if (!(dwc2_readl(hsotg->regs + GINTSTS) & GINTSTS_GOUTNAKEFF))
-                        __orr32(hsotg->regs + DCTL, DCTL_SGOUTNAK);
-
-                /* Wait for global nak to take effect */
-                if (dwc2_hsotg_wait_bit_set(hsotg, GINTSTS,
-                                                GINTSTS_GOUTNAKEFF, 100))
-                        dev_warn(hsotg->dev,
-                                "%s: timeout GINTSTS.GOUTNAKEFF\n", __func__);
-        }
-
-        /* Disable ep */
-        __orr32(hsotg->regs + epctrl_reg, DXEPCTL_EPDIS | DXEPCTL_SNAK);
-
-        /* Wait for ep to be disabled */
-        if (dwc2_hsotg_wait_bit_set(hsotg, epint_reg, DXEPINT_EPDISBLD, 100))
-                dev_warn(hsotg->dev,
-                        "%s: timeout DOEPCTL.EPDisable\n", __func__);
-
-        if (hs_ep->dir_in) {
-                if (hsotg->dedicated_fifos) {
-                        dwc2_writel(GRSTCTL_TXFNUM(hs_ep->fifo_index) |
-                                GRSTCTL_TXFFLSH, hsotg->regs + GRSTCTL);
-                        /* Wait for fifo flush */
-                        if (dwc2_hsotg_wait_bit_set(hsotg, GRSTCTL,
-                                                        GRSTCTL_TXFFLSH, 100))
-                                dev_warn(hsotg->dev,
-                                        "%s: timeout flushing fifos\n",
-                                        __func__);
-                }
-                /* TODO: Flush shared tx fifo */
-        } else {
-                /* Remove global NAKs */
-                __bic32(hsotg->regs + DCTL, DCTL_SGOUTNAK);
-        }
-}
-
 /**
  * dwc2_hsotg_ep_dequeue - dequeue given endpoint
  * @ep: The endpoint to dequeue.
@@ -3665,14 +4393,21 @@ static void dwc2_hsotg_initep(struct dwc2_hsotg *hsotg,
 
         hs_ep->parent = hsotg;
         hs_ep->ep.name = hs_ep->name;
-        usb_ep_set_maxpacket_limit(&hs_ep->ep, epnum ? 1024 : EP0_MPS_LIMIT);
+
+        if (hsotg->params.speed == DWC2_SPEED_PARAM_LOW)
+                usb_ep_set_maxpacket_limit(&hs_ep->ep, 8);
+        else
+                usb_ep_set_maxpacket_limit(&hs_ep->ep,
+                                           epnum ? 1024 : EP0_MPS_LIMIT);
         hs_ep->ep.ops = &dwc2_hsotg_ep_ops;
 
         if (epnum == 0) {
                 hs_ep->ep.caps.type_control = true;
         } else {
-                hs_ep->ep.caps.type_iso = true;
-                hs_ep->ep.caps.type_bulk = true;
+                if (hsotg->params.speed != DWC2_SPEED_PARAM_LOW) {
+                        hs_ep->ep.caps.type_iso = true;
+                        hs_ep->ep.caps.type_bulk = true;
+                }
                 hs_ep->ep.caps.type_int = true;
         }
 
@@ -3802,51 +4537,6 @@ static void dwc2_hsotg_dump(struct dwc2_hsotg *hsotg)
 #endif
 }
 
-#ifdef CONFIG_OF
-static void dwc2_hsotg_of_probe(struct dwc2_hsotg *hsotg)
-{
-        struct device_node *np = hsotg->dev->of_node;
-        u32 len = 0;
-        u32 i = 0;
-
-        /* Enable dma if requested in device tree */
-        hsotg->g_using_dma = of_property_read_bool(np, "g-use-dma");
-
-        /*
-        * Register TX periodic fifo size per endpoint.
-        * EP0 is excluded since it has no fifo configuration.
-        */
-        if (!of_find_property(np, "g-tx-fifo-size", &len))
-                goto rx_fifo;
-
-        len /= sizeof(u32);
-
-        /* Read tx fifo sizes other than ep0 */
-        if (of_property_read_u32_array(np, "g-tx-fifo-size",
-                                                &hsotg->g_tx_fifo_sz[1], len))
-                goto rx_fifo;
-
-        /* Add ep0 */
-        len++;
-
-        /* Make remaining TX fifos unavailable */
-        if (len < MAX_EPS_CHANNELS) {
-                for (i = len; i < MAX_EPS_CHANNELS; i++)
-                        hsotg->g_tx_fifo_sz[i] = 0;
-        }
-
-rx_fifo:
-        /* Register RX fifo size */
-        of_property_read_u32(np, "g-rx-fifo-size", &hsotg->g_rx_fifo_sz);
-
-        /* Register NPTX fifo size */
-        of_property_read_u32(np, "g-np-tx-fifo-size",
-                                                &hsotg->g_np_g_tx_fifo_sz);
-}
-#else
-static inline void dwc2_hsotg_of_probe(struct dwc2_hsotg *hsotg) { }
-#endif
-
 /**
  * dwc2_gadget_init - init function for gadget
  * @dwc2: The data structure for the DWC2 driver.
@@ -3857,33 +4547,11 @@ int dwc2_gadget_init(struct dwc2_hsotg *hsotg, int irq)
         struct device *dev = hsotg->dev;
         int epnum;
         int ret;
-        int i;
-        u32 p_tx_fifo[] = DWC2_G_P_LEGACY_TX_FIFO_SIZE;
-
-        /* Initialize to legacy fifo configuration values */
-        hsotg->g_rx_fifo_sz = 2048;
-        hsotg->g_np_g_tx_fifo_sz = 1024;
-        memcpy(&hsotg->g_tx_fifo_sz[1], p_tx_fifo, sizeof(p_tx_fifo));
-        /* Device tree specific probe */
-        dwc2_hsotg_of_probe(hsotg);
-
-        /* Check against largest possible value. */
-        if (hsotg->g_np_g_tx_fifo_sz >
-            hsotg->hw_params.dev_nperio_tx_fifo_size) {
-                dev_warn(dev, "Specified GNPTXFDEP=%d > %d\n",
-                         hsotg->g_np_g_tx_fifo_sz,
-                         hsotg->hw_params.dev_nperio_tx_fifo_size);
-                hsotg->g_np_g_tx_fifo_sz =
-                        hsotg->hw_params.dev_nperio_tx_fifo_size;
-        }
 
         /* Dump fifo information */
         dev_dbg(dev, "NonPeriodic TXFIFO size: %d\n",
-                                                hsotg->g_np_g_tx_fifo_sz);
-        dev_dbg(dev, "RXFIFO size: %d\n", hsotg->g_rx_fifo_sz);
-        for (i = 0; i < MAX_EPS_CHANNELS; i++)
-                dev_dbg(dev, "Periodic TXFIFO%2d size: %d\n", i,
-                                                hsotg->g_tx_fifo_sz[i]);
+                hsotg->params.g_np_tx_fifo_size);
+        dev_dbg(dev, "RXFIFO size: %d\n", hsotg->params.g_rx_fifo_size);
 
         hsotg->gadget.max_speed = USB_SPEED_HIGH;
         hsotg->gadget.ops = &dwc2_hsotg_gadget_ops;
@@ -3909,6 +4577,12 @@ int dwc2_gadget_init(struct dwc2_hsotg *hsotg, int irq)
         if (!hsotg->ep0_buff)
                 return -ENOMEM;
 
+        if (using_desc_dma(hsotg)) {
+                ret = dwc2_gadget_alloc_ctrl_desc_chains(hsotg);
+                if (ret < 0)
+                        return ret;
+        }
+
         ret = devm_request_irq(hsotg->dev, irq, dwc2_hsotg_irq, IRQF_SHARED,
                                 dev_name(hsotg->dev), hsotg);
         if (ret < 0) {
diff --git a/drivers/usb/dwc2/hcd.c b/drivers/usb/dwc2/hcd.c
index df5a06578005..911c3b36ac06 100644
--- a/drivers/usb/dwc2/hcd.c
+++ b/drivers/usb/dwc2/hcd.c
@@ -79,9 +79,9 @@ static void dwc2_enable_common_interrupts(struct dwc2_hsotg *hsotg)
         /* Enable the interrupts in the GINTMSK */
         intmsk = GINTSTS_MODEMIS | GINTSTS_OTGINT;
 
-        if (hsotg->core_params->dma_enable <= 0)
+        if (hsotg->params.host_dma <= 0)
                 intmsk |= GINTSTS_RXFLVL;
-        if (hsotg->core_params->external_id_pin_ctl <= 0)
+        if (hsotg->params.external_id_pin_ctl <= 0)
                 intmsk |= GINTSTS_CONIDSTSCHNG;
 
         intmsk |= GINTSTS_WKUPINT | GINTSTS_USBSUSP |
@@ -100,8 +100,8 @@ static void dwc2_init_fs_ls_pclk_sel(struct dwc2_hsotg *hsotg)
 
         if ((hsotg->hw_params.hs_phy_type == GHWCFG2_HS_PHY_TYPE_ULPI &&
              hsotg->hw_params.fs_phy_type == GHWCFG2_FS_PHY_TYPE_DEDICATED &&
-             hsotg->core_params->ulpi_fs_ls > 0) ||
-            hsotg->core_params->phy_type == DWC2_PHY_TYPE_PARAM_FS) {
+             hsotg->params.ulpi_fs_ls > 0) ||
+            hsotg->params.phy_type == DWC2_PHY_TYPE_PARAM_FS) {
                 /* Full speed PHY */
                 val = HCFG_FSLSPCLKSEL_48_MHZ;
         } else {
@@ -152,7 +152,7 @@ static int dwc2_fs_phy_init(struct dwc2_hsotg *hsotg, bool select_phy)
         if (dwc2_is_host_mode(hsotg))
                 dwc2_init_fs_ls_pclk_sel(hsotg);
 
-        if (hsotg->core_params->i2c_enable > 0) {
+        if (hsotg->params.i2c_enable > 0) {
                 dev_dbg(hsotg->dev, "FS PHY enabling I2C\n");
 
                 /* Program GUSBCFG.OtgUtmiFsSel to I2C */
@@ -189,20 +189,20 @@ static int dwc2_hs_phy_init(struct dwc2_hsotg *hsotg, bool select_phy)
          * so only program the first time. Do a soft reset immediately after
          * setting phyif.
          */
-        switch (hsotg->core_params->phy_type) {
+        switch (hsotg->params.phy_type) {
         case DWC2_PHY_TYPE_PARAM_ULPI:
                 /* ULPI interface */
                 dev_dbg(hsotg->dev, "HS ULPI PHY selected\n");
                 usbcfg |= GUSBCFG_ULPI_UTMI_SEL;
                 usbcfg &= ~(GUSBCFG_PHYIF16 | GUSBCFG_DDRSEL);
-                if (hsotg->core_params->phy_ulpi_ddr > 0)
+                if (hsotg->params.phy_ulpi_ddr > 0)
                         usbcfg |= GUSBCFG_DDRSEL;
                 break;
         case DWC2_PHY_TYPE_PARAM_UTMI:
                 /* UTMI+ interface */
                 dev_dbg(hsotg->dev, "HS UTMI+ PHY selected\n");
                 usbcfg &= ~(GUSBCFG_ULPI_UTMI_SEL | GUSBCFG_PHYIF16);
-                if (hsotg->core_params->phy_utmi_width == 16)
+                if (hsotg->params.phy_utmi_width == 16)
                         usbcfg |= GUSBCFG_PHYIF16;
                 break;
         default:
@@ -230,9 +230,10 @@ static int dwc2_phy_init(struct dwc2_hsotg *hsotg, bool select_phy)
         u32 usbcfg;
         int retval = 0;
 
-        if (hsotg->core_params->speed == DWC2_SPEED_PARAM_FULL &&
-            hsotg->core_params->phy_type == DWC2_PHY_TYPE_PARAM_FS) {
-                /* If FS mode with FS PHY */
+        if ((hsotg->params.speed == DWC2_SPEED_PARAM_FULL ||
+             hsotg->params.speed == DWC2_SPEED_PARAM_LOW) &&
+            hsotg->params.phy_type == DWC2_PHY_TYPE_PARAM_FS) {
+                /* If FS/LS mode with FS/LS PHY */
                 retval = dwc2_fs_phy_init(hsotg, select_phy);
                 if (retval)
                         return retval;
@@ -245,7 +246,7 @@ static int dwc2_phy_init(struct dwc2_hsotg *hsotg, bool select_phy)
 
         if (hsotg->hw_params.hs_phy_type == GHWCFG2_HS_PHY_TYPE_ULPI &&
             hsotg->hw_params.fs_phy_type == GHWCFG2_FS_PHY_TYPE_DEDICATED &&
-            hsotg->core_params->ulpi_fs_ls > 0) {
+            hsotg->params.ulpi_fs_ls > 0) {
                 dev_dbg(hsotg->dev, "Setting ULPI FSLS\n");
                 usbcfg = dwc2_readl(hsotg->regs + GUSBCFG);
                 usbcfg |= GUSBCFG_ULPI_FS_LS;
@@ -272,9 +273,9 @@ static int dwc2_gahbcfg_init(struct dwc2_hsotg *hsotg)
 
         case GHWCFG2_INT_DMA_ARCH:
                 dev_dbg(hsotg->dev, "Internal DMA Mode\n");
-                if (hsotg->core_params->ahbcfg != -1) {
+                if (hsotg->params.ahbcfg != -1) {
                         ahbcfg &= GAHBCFG_CTRL_MASK;
-                        ahbcfg |= hsotg->core_params->ahbcfg &
+                        ahbcfg |= hsotg->params.ahbcfg &
                                   ~GAHBCFG_CTRL_MASK;
                 }
                 break;
@@ -285,21 +286,21 @@ static int dwc2_gahbcfg_init(struct dwc2_hsotg *hsotg)
                 break;
         }
 
-        dev_dbg(hsotg->dev, "dma_enable:%d dma_desc_enable:%d\n",
-                hsotg->core_params->dma_enable,
-                hsotg->core_params->dma_desc_enable);
+        dev_dbg(hsotg->dev, "host_dma:%d dma_desc_enable:%d\n",
+                hsotg->params.host_dma,
+                hsotg->params.dma_desc_enable);
 
-        if (hsotg->core_params->dma_enable > 0) {
-                if (hsotg->core_params->dma_desc_enable > 0)
+        if (hsotg->params.host_dma > 0) {
+                if (hsotg->params.dma_desc_enable > 0)
                         dev_dbg(hsotg->dev, "Using Descriptor DMA mode\n");
                 else
                         dev_dbg(hsotg->dev, "Using Buffer DMA mode\n");
         } else {
                 dev_dbg(hsotg->dev, "Using Slave mode\n");
-                hsotg->core_params->dma_desc_enable = 0;
+                hsotg->params.dma_desc_enable = 0;
         }
 
-        if (hsotg->core_params->dma_enable > 0)
+        if (hsotg->params.host_dma > 0)
                 ahbcfg |= GAHBCFG_DMA_EN;
 
         dwc2_writel(ahbcfg, hsotg->regs + GAHBCFG);
@@ -316,10 +317,10 @@ static void dwc2_gusbcfg_init(struct dwc2_hsotg *hsotg)
 
         switch (hsotg->hw_params.op_mode) {
         case GHWCFG2_OP_MODE_HNP_SRP_CAPABLE:
-                if (hsotg->core_params->otg_cap ==
+                if (hsotg->params.otg_cap ==
                                 DWC2_CAP_PARAM_HNP_SRP_CAPABLE)
                         usbcfg |= GUSBCFG_HNPCAP;
-                if (hsotg->core_params->otg_cap !=
+                if (hsotg->params.otg_cap !=
                                 DWC2_CAP_PARAM_NO_HNP_SRP_CAPABLE)
                         usbcfg |= GUSBCFG_SRPCAP;
                 break;
@@ -327,7 +328,7 @@ static void dwc2_gusbcfg_init(struct dwc2_hsotg *hsotg)
         case GHWCFG2_OP_MODE_SRP_ONLY_CAPABLE:
         case GHWCFG2_OP_MODE_SRP_CAPABLE_DEVICE:
         case GHWCFG2_OP_MODE_SRP_CAPABLE_HOST:
-                if (hsotg->core_params->otg_cap !=
+                if (hsotg->params.otg_cap !=
                                 DWC2_CAP_PARAM_NO_HNP_SRP_CAPABLE)
                         usbcfg |= GUSBCFG_SRPCAP;
                 break;
@@ -390,7 +391,7 @@ static void dwc2_disable_host_interrupts(struct dwc2_hsotg *hsotg)
  */
 static void dwc2_calculate_dynamic_fifo(struct dwc2_hsotg *hsotg)
 {
-        struct dwc2_core_params *params = hsotg->core_params;
+        struct dwc2_core_params *params = &hsotg->params;
         struct dwc2_hw_params *hw = &hsotg->hw_params;
         u32 rxfsiz, nptxfsiz, ptxfsiz, total_fifo_size;
 
@@ -449,7 +450,7 @@ static void dwc2_calculate_dynamic_fifo(struct dwc2_hsotg *hsotg)
 
 static void dwc2_config_fifos(struct dwc2_hsotg *hsotg)
 {
-        struct dwc2_core_params *params = hsotg->core_params;
+        struct dwc2_core_params *params = &hsotg->params;
         u32 nptxfsiz, hptxfsiz, dfifocfg, grxfsiz;
 
         if (!params->enable_dynamic_fifo)
@@ -490,7 +491,7 @@ static void dwc2_config_fifos(struct dwc2_hsotg *hsotg)
         dev_dbg(hsotg->dev, "new hptxfsiz=%08x\n",
                 dwc2_readl(hsotg->regs + HPTXFSIZ));
 
-        if (hsotg->core_params->en_multiple_tx_fifo > 0 &&
+        if (hsotg->params.en_multiple_tx_fifo > 0 &&
             hsotg->hw_params.snpsid <= DWC2_CORE_REV_2_94a) {
                 /*
                  * Global DFIFOCFG calculation for Host mode -
@@ -598,7 +599,7 @@ static void dwc2_dump_channel_info(struct dwc2_hsotg *hsotg,
                                    struct dwc2_host_chan *chan)
 {
 #ifdef VERBOSE_DEBUG
-        int num_channels = hsotg->core_params->host_channels;
+        int num_channels = hsotg->params.host_channels;
         struct dwc2_qh *qh;
         u32 hcchar;
         u32 hcsplt;
@@ -648,6 +649,35 @@ static void dwc2_dump_channel_info(struct dwc2_hsotg *hsotg,
 #endif /* VERBOSE_DEBUG */
 }
 
+static int _dwc2_hcd_start(struct usb_hcd *hcd);
+
+static void dwc2_host_start(struct dwc2_hsotg *hsotg)
+{
+        struct usb_hcd *hcd = dwc2_hsotg_to_hcd(hsotg);
+
+        hcd->self.is_b_host = dwc2_hcd_is_b_host(hsotg);
+        _dwc2_hcd_start(hcd);
+}
+
+static void dwc2_host_disconnect(struct dwc2_hsotg *hsotg)
+{
+        struct usb_hcd *hcd = dwc2_hsotg_to_hcd(hsotg);
+
+        hcd->self.is_b_host = 0;
+}
+
+static void dwc2_host_hub_info(struct dwc2_hsotg *hsotg, void *context,
+                               int *hub_addr, int *hub_port)
+{
+        struct urb *urb = context;
+
+        if (urb->dev->tt)
+                *hub_addr = urb->dev->tt->hub->devnum;
+        else
+                *hub_addr = 0;
+        *hub_port = urb->dev->ttport;
+}
+
 /*
  * =========================================================================
  *  Low Level Host Channel Access Functions
@@ -741,7 +771,7 @@ static void dwc2_hc_enable_dma_ints(struct dwc2_hsotg *hsotg,
          * For Descriptor DMA mode core halts the channel on AHB error.
          * Interrupt is not required.
          */
-        if (hsotg->core_params->dma_desc_enable <= 0) {
+        if (hsotg->params.dma_desc_enable <= 0) {
                 if (dbg_hc(chan))
                         dev_vdbg(hsotg->dev, "desc DMA disabled\n");
                 hcintmsk |= HCINTMSK_AHBERR;
@@ -774,7 +804,7 @@ static void dwc2_hc_enable_ints(struct dwc2_hsotg *hsotg,
 {
         u32 intmsk;
 
-        if (hsotg->core_params->dma_enable > 0) {
+        if (hsotg->params.host_dma > 0) {
                 if (dbg_hc(chan))
                         dev_vdbg(hsotg->dev, "DMA enabled\n");
                 dwc2_hc_enable_dma_ints(hsotg, chan);
@@ -994,7 +1024,7 @@ void dwc2_hc_halt(struct dwc2_hsotg *hsotg, struct dwc2_host_chan *chan,
 
         /* No need to set the bit in DDMA for disabling the channel */
         /* TODO check it everywhere channel is disabled */
-        if (hsotg->core_params->dma_desc_enable <= 0) {
+        if (hsotg->params.dma_desc_enable <= 0) {
                 if (dbg_hc(chan))
                         dev_vdbg(hsotg->dev, "desc DMA disabled\n");
                 hcchar |= HCCHAR_CHENA;
@@ -1004,7 +1034,7 @@ void dwc2_hc_halt(struct dwc2_hsotg *hsotg, struct dwc2_host_chan *chan,
         }
         hcchar |= HCCHAR_CHDIS;
 
-        if (hsotg->core_params->dma_enable <= 0) {
+        if (hsotg->params.host_dma <= 0) {
                 if (dbg_hc(chan))
                         dev_vdbg(hsotg->dev, "DMA not enabled\n");
                 hcchar |= HCCHAR_CHENA;
@@ -1143,7 +1173,7 @@ static void dwc2_hc_set_even_odd_frame(struct dwc2_hsotg *hsotg,
                 fifo_space = (dwc2_readl(hsotg->regs + HPTXSTS) &
                               TXSTS_FSPCAVAIL_MASK) >> TXSTS_FSPCAVAIL_SHIFT;
                 bytes_in_fifo = sizeof(u32) *
-                                (hsotg->core_params->host_perio_tx_fifo_size -
+                                (hsotg->params.host_perio_tx_fifo_size -
                                  fifo_space);
 
                 /*
@@ -1339,8 +1369,8 @@ static void dwc2_hc_do_ping(struct dwc2_hsotg *hsotg,
 static void dwc2_hc_start_transfer(struct dwc2_hsotg *hsotg,
                                    struct dwc2_host_chan *chan)
 {
-        u32 max_hc_xfer_size = hsotg->core_params->max_transfer_size;
-        u16 max_hc_pkt_count = hsotg->core_params->max_packet_count;
+        u32 max_hc_xfer_size = hsotg->params.max_transfer_size;
+        u16 max_hc_pkt_count = hsotg->params.max_packet_count;
         u32 hcchar;
         u32 hctsiz = 0;
         u16 num_packets;
@@ -1350,7 +1380,7 @@ static void dwc2_hc_start_transfer(struct dwc2_hsotg *hsotg,
                 dev_vdbg(hsotg->dev, "%s()\n", __func__);
 
         if (chan->do_ping) {
-                if (hsotg->core_params->dma_enable <= 0) {
+                if (hsotg->params.host_dma <= 0) {
                         if (dbg_hc(chan))
                                 dev_vdbg(hsotg->dev, "ping, no DMA\n");
                         dwc2_hc_do_ping(hsotg, chan);
@@ -1478,7 +1508,7 @@ static void dwc2_hc_start_transfer(struct dwc2_hsotg *hsotg,
                          TSIZ_SC_MC_PID_SHIFT);
         }
 
-        if (hsotg->core_params->dma_enable > 0) {
+        if (hsotg->params.host_dma > 0) {
                 dwc2_writel((u32)chan->xfer_dma,
                             hsotg->regs + HCDMA(chan->hc_num));
                 if (dbg_hc(chan))
@@ -1521,7 +1551,7 @@ static void dwc2_hc_start_transfer(struct dwc2_hsotg *hsotg,
         chan->xfer_started = 1;
         chan->requests++;
 
-        if (hsotg->core_params->dma_enable <= 0 &&
+        if (hsotg->params.host_dma <= 0 &&
             !chan->ep_is_in && chan->xfer_len > 0)
                 /* Load OUT packet into the appropriate Tx FIFO */
                 dwc2_hc_write_packet(hsotg, chan);
@@ -1799,12 +1829,12 @@ void dwc2_hcd_start(struct dwc2_hsotg *hsotg)
 /* Must be called with interrupt disabled and spinlock held */
 static void dwc2_hcd_cleanup_channels(struct dwc2_hsotg *hsotg)
 {
-        int num_channels = hsotg->core_params->host_channels;
+        int num_channels = hsotg->params.host_channels;
         struct dwc2_host_chan *channel;
         u32 hcchar;
         int i;
 
-        if (hsotg->core_params->dma_enable <= 0) {
+        if (hsotg->params.host_dma <= 0) {
                 /* Flush out any channel requests in slave mode */
                 for (i = 0; i < num_channels; i++) {
                         channel = hsotg->hc_ptr_array[i];
@@ -1840,9 +1870,9 @@ static void dwc2_hcd_cleanup_channels(struct dwc2_hsotg *hsotg)
                 channel->qh = NULL;
         }
         /* All channels have been freed, mark them available */
-        if (hsotg->core_params->uframe_sched > 0) {
+        if (hsotg->params.uframe_sched > 0) {
                 hsotg->available_host_channels =
-                        hsotg->core_params->host_channels;
+                        hsotg->params.host_channels;
         } else {
                 hsotg->non_periodic_channels = 0;
                 hsotg->periodic_channels = 0;
@@ -2077,7 +2107,7 @@ static int dwc2_hcd_urb_dequeue(struct dwc2_hsotg *hsotg,
          * Free the QTD and clean up the associated QH. Leave the QH in the
          * schedule if it has any remaining QTDs.
          */
-        if (hsotg->core_params->dma_desc_enable <= 0) {
+        if (hsotg->params.dma_desc_enable <= 0) {
                 u8 in_process = urb_qtd->in_process;
 
                 dwc2_hcd_qtd_unlink_and_free(hsotg, urb_qtd, qh);
@@ -2185,13 +2215,13 @@ static int dwc2_core_init(struct dwc2_hsotg *hsotg, bool initial_setup)
 
         /* Set ULPI External VBUS bit if needed */
         usbcfg &= ~GUSBCFG_ULPI_EXT_VBUS_DRV;
-        if (hsotg->core_params->phy_ulpi_ext_vbus ==
+        if (hsotg->params.phy_ulpi_ext_vbus ==
                                 DWC2_PHY_ULPI_EXTERNAL_VBUS)
                 usbcfg |= GUSBCFG_ULPI_EXT_VBUS_DRV;
 
         /* Set external TS Dline pulsing bit if needed */
         usbcfg &= ~GUSBCFG_TERMSELDLPULSE;
-        if (hsotg->core_params->ts_dline > 0)
+        if (hsotg->params.ts_dline > 0)
                 usbcfg |= GUSBCFG_TERMSELDLPULSE;
 
         dwc2_writel(usbcfg, hsotg->regs + GUSBCFG);
@@ -2230,10 +2260,10 @@ static int dwc2_core_init(struct dwc2_hsotg *hsotg, bool initial_setup)
         /* Program the GOTGCTL register */
         otgctl = dwc2_readl(hsotg->regs + GOTGCTL);
         otgctl &= ~GOTGCTL_OTGVER;
-        if (hsotg->core_params->otg_ver > 0)
+        if (hsotg->params.otg_ver > 0)
                 otgctl |= GOTGCTL_OTGVER;
         dwc2_writel(otgctl, hsotg->regs + GOTGCTL);
-        dev_dbg(hsotg->dev, "OTG VER PARAM: %d\n", hsotg->core_params->otg_ver);
+        dev_dbg(hsotg->dev, "OTG VER PARAM: %d\n", hsotg->params.otg_ver);
 
         /* Clear the SRP success bit for FS-I2c */
         hsotg->srp_success = 0;
@@ -2277,7 +2307,8 @@ static void dwc2_core_host_init(struct dwc2_hsotg *hsotg)
 
         /* Initialize Host Configuration Register */
         dwc2_init_fs_ls_pclk_sel(hsotg);
-        if (hsotg->core_params->speed == DWC2_SPEED_PARAM_FULL) {
+        if (hsotg->params.speed == DWC2_SPEED_PARAM_FULL ||
+            hsotg->params.speed == DWC2_SPEED_PARAM_LOW) {
                 hcfg = dwc2_readl(hsotg->regs + HCFG);
                 hcfg |= HCFG_FSLSSUPP;
                 dwc2_writel(hcfg, hsotg->regs + HCFG);
@@ -2288,13 +2319,13 @@ static void dwc2_core_host_init(struct dwc2_hsotg *hsotg)
          * runtime. This bit needs to be programmed during initial configuration
          * and its value must not be changed during runtime.
          */
-        if (hsotg->core_params->reload_ctl > 0) {
+        if (hsotg->params.reload_ctl > 0) {
                 hfir = dwc2_readl(hsotg->regs + HFIR);
                 hfir |= HFIR_RLDCTRL;
                 dwc2_writel(hfir, hsotg->regs + HFIR);
         }
 
-        if (hsotg->core_params->dma_desc_enable > 0) {
+        if (hsotg->params.dma_desc_enable > 0) {
                 u32 op_mode = hsotg->hw_params.op_mode;
 
                 if (hsotg->hw_params.snpsid < DWC2_CORE_REV_2_90a ||
@@ -2306,7 +2337,7 @@ static void dwc2_core_host_init(struct dwc2_hsotg *hsotg)
                                 "Hardware does not support descriptor DMA mode -\n");
                         dev_err(hsotg->dev,
                                 "falling back to buffer DMA mode.\n");
-                        hsotg->core_params->dma_desc_enable = 0;
+                        hsotg->params.dma_desc_enable = 0;
                 } else {
                         hcfg = dwc2_readl(hsotg->regs + HCFG);
                         hcfg |= HCFG_DESCDMA;
@@ -2332,12 +2363,12 @@ static void dwc2_core_host_init(struct dwc2_hsotg *hsotg)
         otgctl &= ~GOTGCTL_HSTSETHNPEN;
         dwc2_writel(otgctl, hsotg->regs + GOTGCTL);
 
-        if (hsotg->core_params->dma_desc_enable <= 0) {
+        if (hsotg->params.dma_desc_enable <= 0) {
                 int num_channels, i;
                 u32 hcchar;
 
                 /* Flush out any leftover queued requests */
-                num_channels = hsotg->core_params->host_channels;
+                num_channels = hsotg->params.host_channels;
                 for (i = 0; i < num_channels; i++) {
                         hcchar = dwc2_readl(hsotg->regs + HCCHAR(i));
                         hcchar &= ~HCCHAR_CHENA;
@@ -2399,9 +2430,9 @@ static void dwc2_hcd_reinit(struct dwc2_hsotg *hsotg)
         hsotg->flags.d32 = 0;
         hsotg->non_periodic_qh_ptr = &hsotg->non_periodic_sched_active;
 
-        if (hsotg->core_params->uframe_sched > 0) {
+        if (hsotg->params.uframe_sched > 0) {
                 hsotg->available_host_channels =
-                        hsotg->core_params->host_channels;
+                        hsotg->params.host_channels;
         } else {
                 hsotg->non_periodic_channels = 0;
                 hsotg->periodic_channels = 0;
@@ -2415,7 +2446,7 @@ static void dwc2_hcd_reinit(struct dwc2_hsotg *hsotg)
                                  hc_list_entry)
                 list_del_init(&chan->hc_list_entry);
 
-        num_channels = hsotg->core_params->host_channels;
+        num_channels = hsotg->params.host_channels;
         for (i = 0; i < num_channels; i++) {
                 chan = hsotg->hc_ptr_array[i];
                 list_add_tail(&chan->hc_list_entry, &hsotg->free_hc_list);
@@ -2457,7 +2488,7 @@ static void dwc2_hc_init_xfer(struct dwc2_hsotg *hsotg,
                         chan->do_ping = 0;
                         chan->ep_is_in = 0;
                         chan->data_pid_start = DWC2_HC_PID_SETUP;
-                        if (hsotg->core_params->dma_enable > 0)
+                        if (hsotg->params.host_dma > 0)
                                 chan->xfer_dma = urb->setup_dma;
                         else
                                 chan->xfer_buf = urb->setup_packet;
@@ -2484,7 +2515,7 @@ static void dwc2_hc_init_xfer(struct dwc2_hsotg *hsotg,
                                 chan->do_ping = 0;
                         chan->data_pid_start = DWC2_HC_PID_DATA1;
                         chan->xfer_len = 0;
-                        if (hsotg->core_params->dma_enable > 0)
+                        if (hsotg->params.host_dma > 0)
                                 chan->xfer_dma = hsotg->status_buf_dma;
                         else
                                 chan->xfer_buf = hsotg->status_buf;
@@ -2502,13 +2533,13 @@ static void dwc2_hc_init_xfer(struct dwc2_hsotg *hsotg,
 
         case USB_ENDPOINT_XFER_ISOC:
                 chan->ep_type = USB_ENDPOINT_XFER_ISOC;
-                if (hsotg->core_params->dma_desc_enable > 0)
+                if (hsotg->params.dma_desc_enable > 0)
                         break;
 
                 frame_desc = &urb->iso_descs[qtd->isoc_frame_index];
                 frame_desc->status = 0;
 
-                if (hsotg->core_params->dma_enable > 0) {
+                if (hsotg->params.host_dma > 0) {
                         chan->xfer_dma = urb->dma;
                         chan->xfer_dma += frame_desc->offset +
                                         qtd->isoc_split_offset;
@@ -2690,7 +2721,7 @@ static int dwc2_assign_and_init_hc(struct dwc2_hsotg *hsotg, struct dwc2_qh *qh)
                 !dwc2_hcd_is_pipe_in(&urb->pipe_info))
                 urb->actual_length = urb->length;
 
-        if (hsotg->core_params->dma_enable > 0)
+        if (hsotg->params.host_dma > 0)
                 chan->xfer_dma = urb->dma + urb->actual_length;
         else
                 chan->xfer_buf = (u8 *)urb->buf + urb->actual_length;
@@ -2715,7 +2746,7 @@ static int dwc2_assign_and_init_hc(struct dwc2_hsotg *hsotg, struct dwc2_qh *qh)
                  */
                 chan->multi_count = dwc2_hb_mult(qh->maxp);
 
-        if (hsotg->core_params->dma_desc_enable > 0) {
+        if (hsotg->params.dma_desc_enable > 0) {
                 chan->desc_list_addr = qh->desc_list_dma;
                 chan->desc_list_sz = qh->desc_list_sz;
         }
@@ -2752,7 +2783,7 @@ enum dwc2_transaction_type dwc2_hcd_select_transactions(
         while (qh_ptr != &hsotg->periodic_sched_ready) {
                 if (list_empty(&hsotg->free_hc_list))
                         break;
-                if (hsotg->core_params->uframe_sched > 0) {
+                if (hsotg->params.uframe_sched > 0) {
                         if (hsotg->available_host_channels <= 1)
                                 break;
                         hsotg->available_host_channels--;
@@ -2776,17 +2807,17 @@ enum dwc2_transaction_type dwc2_hcd_select_transactions(
          * schedule. Some free host channels may not be used if they are
          * reserved for periodic transfers.
          */
-        num_channels = hsotg->core_params->host_channels;
+        num_channels = hsotg->params.host_channels;
         qh_ptr = hsotg->non_periodic_sched_inactive.next;
         while (qh_ptr != &hsotg->non_periodic_sched_inactive) {
-                if (hsotg->core_params->uframe_sched <= 0 &&
+                if (hsotg->params.uframe_sched <= 0 &&
                     hsotg->non_periodic_channels >= num_channels -
                                                 hsotg->periodic_channels)
                         break;
                 if (list_empty(&hsotg->free_hc_list))
                         break;
                 qh = list_entry(qh_ptr, struct dwc2_qh, qh_list_entry);
-                if (hsotg->core_params->uframe_sched > 0) {
+                if (hsotg->params.uframe_sched > 0) {
                         if (hsotg->available_host_channels < 1)
                                 break;
                         hsotg->available_host_channels--;
@@ -2808,7 +2839,7 @@ enum dwc2_transaction_type dwc2_hcd_select_transactions(
                 else
                         ret_val = DWC2_TRANSACTION_ALL;
 
-                if (hsotg->core_params->uframe_sched <= 0)
+                if (hsotg->params.uframe_sched <= 0)
                         hsotg->non_periodic_channels++;
         }
 
@@ -2847,8 +2878,8 @@ static int dwc2_queue_transaction(struct dwc2_hsotg *hsotg,
                 list_move_tail(&chan->split_order_list_entry,
                                &hsotg->split_order);
 
-        if (hsotg->core_params->dma_enable > 0) {
-                if (hsotg->core_params->dma_desc_enable > 0) {
+        if (hsotg->params.host_dma > 0) {
+                if (hsotg->params.dma_desc_enable > 0) {
                         if (!chan->xfer_started ||
                             chan->ep_type == USB_ENDPOINT_XFER_ISOC) {
                                 dwc2_hcd_start_xfer_ddma(hsotg, chan->qh);
@@ -2957,7 +2988,7 @@ static void dwc2_process_periodic_channels(struct dwc2_hsotg *hsotg)
                  * The flag prevents any halts to get into the request queue in
                  * the middle of multiple high-bandwidth packets getting queued.
                  */
-                if (hsotg->core_params->dma_enable <= 0 &&
+                if (hsotg->params.host_dma <= 0 &&
                                 qh->channel->multi_count > 1)
                         hsotg->queuing_high_bandwidth = 1;
 
@@ -2976,7 +3007,7 @@ static void dwc2_process_periodic_channels(struct dwc2_hsotg *hsotg)
                  * controller automatically handles multiple packets for
                  * high-bandwidth transfers.
                  */
-                if (hsotg->core_params->dma_enable > 0 || status == 0 ||
+                if (hsotg->params.host_dma > 0 || status == 0 ||
                     qh->channel->requests == qh->channel->multi_count) {
                         qh_ptr = qh_ptr->next;
                         /*
@@ -2993,7 +3024,7 @@ static void dwc2_process_periodic_channels(struct dwc2_hsotg *hsotg)
 
 exit:
         if (no_queue_space || no_fifo_space ||
-            (hsotg->core_params->dma_enable <= 0 &&
+            (hsotg->params.host_dma <= 0 &&
              !list_empty(&hsotg->periodic_sched_assigned))) {
                 /*
                  * May need to queue more transactions as the request
@@ -3073,7 +3104,7 @@ static void dwc2_process_non_periodic_channels(struct dwc2_hsotg *hsotg)
                 tx_status = dwc2_readl(hsotg->regs + GNPTXSTS);
                 qspcavail = (tx_status & TXSTS_QSPCAVAIL_MASK) >>
                             TXSTS_QSPCAVAIL_SHIFT;
-                if (hsotg->core_params->dma_enable <= 0 && qspcavail == 0) {
+                if (hsotg->params.host_dma <= 0 && qspcavail == 0) {
                         no_queue_space = 1;
                         break;
                 }
@@ -3106,7 +3137,7 @@ next:
                                         hsotg->non_periodic_qh_ptr->next;
         } while (hsotg->non_periodic_qh_ptr != orig_qh_ptr);
 
-        if (hsotg->core_params->dma_enable <= 0) {
+        if (hsotg->params.host_dma <= 0) {
                 tx_status = dwc2_readl(hsotg->regs + GNPTXSTS);
                 qspcavail = (tx_status & TXSTS_QSPCAVAIL_MASK) >>
                             TXSTS_QSPCAVAIL_SHIFT;
@@ -3307,7 +3338,7 @@ static void dwc2_port_suspend(struct dwc2_hsotg *hsotg, u16 windex)
          * If hibernation is supported, Phy clock will be suspended
          * after registers are backuped.
          */
-        if (!hsotg->core_params->hibernation) {
+        if (!hsotg->params.hibernation) {
                 /* Suspend the Phy Clock */
                 pcgctl = dwc2_readl(hsotg->regs + PCGCTL);
                 pcgctl |= PCGCTL_STOPPCLK;
@@ -3342,7 +3373,7 @@ static void dwc2_port_resume(struct dwc2_hsotg *hsotg)
          * If hibernation is supported, Phy clock is already resumed
          * after registers restore.
          */
-        if (!hsotg->core_params->hibernation) {
+        if (!hsotg->params.hibernation) {
                 pcgctl = dwc2_readl(hsotg->regs + PCGCTL);
                 pcgctl &= ~PCGCTL_STOPPCLK;
                 dwc2_writel(pcgctl, hsotg->regs + PCGCTL);
@@ -3569,7 +3600,7 @@ static int dwc2_hcd_hub_control(struct dwc2_hsotg *hsotg, u16 typereq,
                         port_status |= USB_PORT_STAT_TEST;
                 /* USB_PORT_FEAT_INDICATOR unsupported always 0 */
 
-                if (hsotg->core_params->dma_desc_fs_enable) {
+                if (hsotg->params.dma_desc_fs_enable) {
                         /*
                          * Enable descriptor DMA only if a full speed
                          * device is connected.
@@ -3583,7 +3614,7 @@ static int dwc2_hcd_hub_control(struct dwc2_hsotg *hsotg, u16 typereq,
                                 u32 hcfg;
 
                                 dev_info(hsotg->dev, "Enabling descriptor DMA mode\n");
-                                hsotg->core_params->dma_desc_enable = 1;
+                                hsotg->params.dma_desc_enable = 1;
                                 hcfg = dwc2_readl(hsotg->regs + HCFG);
                                 hcfg |= HCFG_DESCDMA;
                                 dwc2_writel(hcfg, hsotg->regs + HCFG);
@@ -3824,7 +3855,7 @@ void dwc2_hcd_dump_state(struct dwc2_hsotg *hsotg)
         u32 p_tx_status;
         int i;
 
-        num_channels = hsotg->core_params->host_channels;
+        num_channels = hsotg->params.host_channels;
         dev_dbg(hsotg->dev, "\n");
         dev_dbg(hsotg->dev,
                 "************************************************************\n");
@@ -4020,35 +4051,6 @@ static struct dwc2_hsotg *dwc2_hcd_to_hsotg(struct usb_hcd *hcd)
         return p->hsotg;
 }
 
-static int _dwc2_hcd_start(struct usb_hcd *hcd);
-
-void dwc2_host_start(struct dwc2_hsotg *hsotg)
-{
-        struct usb_hcd *hcd = dwc2_hsotg_to_hcd(hsotg);
-
-        hcd->self.is_b_host = dwc2_hcd_is_b_host(hsotg);
-        _dwc2_hcd_start(hcd);
-}
-
-void dwc2_host_disconnect(struct dwc2_hsotg *hsotg)
-{
-        struct usb_hcd *hcd = dwc2_hsotg_to_hcd(hsotg);
-
-        hcd->self.is_b_host = 0;
-}
-
-void dwc2_host_hub_info(struct dwc2_hsotg *hsotg, void *context, int *hub_addr,
-                        int *hub_port)
-{
-        struct urb *urb = context;
-
-        if (urb->dev->tt)
-                *hub_addr = urb->dev->tt->hub->devnum;
-        else
-                *hub_addr = 0;
-        *hub_port = urb->dev->ttport;
-}
-
 /**
  * dwc2_host_get_tt_info() - Get the dwc2_tt associated with context
  *
@@ -4365,7 +4367,7 @@ static int _dwc2_hcd_suspend(struct usb_hcd *hcd)
         if (!HCD_HW_ACCESSIBLE(hcd))
                 goto unlock;
 
-        if (!hsotg->core_params->hibernation)
+        if (!hsotg->params.hibernation)
                 goto skip_power_saving;
 
         /*
@@ -4417,7 +4419,7 @@ static int _dwc2_hcd_resume(struct usb_hcd *hcd)
         if (hsotg->lx_state != DWC2_L2)
                 goto unlock;
 
-        if (!hsotg->core_params->hibernation) {
+        if (!hsotg->params.hibernation) {
                 hsotg->lx_state = DWC2_L0;
                 goto unlock;
         }
@@ -4510,9 +4512,6 @@ static void dwc2_dump_urb_info(struct usb_hcd *hcd, struct urb *urb,
         case PIPE_ISOCHRONOUS:
                 pipetype = "ISOCHRONOUS";
                 break;
-        default:
-                pipetype = "UNKNOWN";
-                break;
         }
 
         dev_vdbg(hsotg->dev, "  Endpoint type: %s %s (%s)\n", pipetype,
@@ -4609,8 +4608,6 @@ static int _dwc2_hcd_urb_enqueue(struct usb_hcd *hcd, struct urb *urb,
         case PIPE_INTERRUPT:
                 ep_type = USB_ENDPOINT_XFER_INT;
                 break;
-        default:
-                dev_warn(hsotg->dev, "Wrong ep type\n");
         }
 
         dwc2_urb = dwc2_hcd_urb_alloc(hsotg, urb->number_of_packets,
@@ -4919,7 +4916,7 @@ static void dwc2_hcd_free(struct dwc2_hsotg *hsotg)
                 }
         }
 
-        if (hsotg->core_params->dma_enable > 0) {
+        if (hsotg->params.host_dma > 0) {
                 if (hsotg->status_buf) {
                         dma_free_coherent(hsotg->dev, DWC2_HCD_STATUS_BUF_SIZE,
                                           hsotg->status_buf,
@@ -4999,16 +4996,16 @@ int dwc2_hcd_init(struct dwc2_hsotg *hsotg, int irq)
         hsotg->last_frame_num = HFNUM_MAX_FRNUM;
 
         /* Check if the bus driver or platform code has setup a dma_mask */
-        if (hsotg->core_params->dma_enable > 0 &&
+        if (hsotg->params.host_dma > 0 &&
             hsotg->dev->dma_mask == NULL) {
                 dev_warn(hsotg->dev,
                          "dma_mask not set, disabling DMA\n");
-                hsotg->core_params->dma_enable = 0;
-                hsotg->core_params->dma_desc_enable = 0;
+                hsotg->params.host_dma = 0;
+                hsotg->params.dma_desc_enable = 0;
         }
 
         /* Set device flags indicating whether the HCD supports DMA */
-        if (hsotg->core_params->dma_enable > 0) {
+        if (hsotg->params.host_dma > 0) {
                 if (dma_set_mask(hsotg->dev, DMA_BIT_MASK(32)) < 0)
                         dev_warn(hsotg->dev, "can't set DMA mask\n");
                 if (dma_set_coherent_mask(hsotg->dev, DMA_BIT_MASK(32)) < 0)
@@ -5019,7 +5016,7 @@ int dwc2_hcd_init(struct dwc2_hsotg *hsotg, int irq)
         if (!hcd)
                 goto error1;
 
-        if (hsotg->core_params->dma_enable <= 0)
+        if (hsotg->params.host_dma <= 0)
                 hcd->self.uses_dma = 0;
 
         hcd->has_tt = 1;
@@ -5067,7 +5064,7 @@ int dwc2_hcd_init(struct dwc2_hsotg *hsotg, int irq)
          * in the controller. Initialize the channel descriptor array.
          */
         INIT_LIST_HEAD(&hsotg->free_hc_list);
-        num_channels = hsotg->core_params->host_channels;
+        num_channels = hsotg->params.host_channels;
         memset(&hsotg->hc_ptr_array[0], 0, sizeof(hsotg->hc_ptr_array));
 
         for (i = 0; i < num_channels; i++) {
@@ -5091,7 +5088,7 @@ int dwc2_hcd_init(struct dwc2_hsotg *hsotg, int irq)
          * done after usb_add_hcd since that function allocates the DMA buffer
          * pool.
          */
-        if (hsotg->core_params->dma_enable > 0)
+        if (hsotg->params.host_dma > 0)
                 hsotg->status_buf = dma_alloc_coherent(hsotg->dev,
                                         DWC2_HCD_STATUS_BUF_SIZE,
                                         &hsotg->status_buf_dma, GFP_KERNEL);
@@ -5107,10 +5104,10 @@ int dwc2_hcd_init(struct dwc2_hsotg *hsotg, int irq)
          * DMA mode.
          * Alignment must be set to 512 bytes.
          */
-        if (hsotg->core_params->dma_desc_enable ||
-            hsotg->core_params->dma_desc_fs_enable) {
+        if (hsotg->params.dma_desc_enable ||
+            hsotg->params.dma_desc_fs_enable) {
                 hsotg->desc_gen_cache = kmem_cache_create("dwc2-gen-desc",
-                                sizeof(struct dwc2_hcd_dma_desc) *
+                                sizeof(struct dwc2_dma_desc) *
                                 MAX_DMA_DESC_NUM_GENERIC, 512, SLAB_CACHE_DMA,
                                 NULL);
                 if (!hsotg->desc_gen_cache) {
@@ -5121,12 +5118,12 @@ int dwc2_hcd_init(struct dwc2_hsotg *hsotg, int irq)
                          * Disable descriptor dma mode since it will not be
                          * usable.
                          */
-                        hsotg->core_params->dma_desc_enable = 0;
-                        hsotg->core_params->dma_desc_fs_enable = 0;
+                        hsotg->params.dma_desc_enable = 0;
+                        hsotg->params.dma_desc_fs_enable = 0;
                 }
 
                 hsotg->desc_hsisoc_cache = kmem_cache_create("dwc2-hsisoc-desc",
-                                sizeof(struct dwc2_hcd_dma_desc) *
+                                sizeof(struct dwc2_dma_desc) *
                                 MAX_DMA_DESC_NUM_HS_ISOC, 512, 0, NULL);
                 if (!hsotg->desc_hsisoc_cache) {
                         dev_err(hsotg->dev,
@@ -5138,8 +5135,8 @@ int dwc2_hcd_init(struct dwc2_hsotg *hsotg, int irq)
                          * Disable descriptor dma mode since it will not be
                          * usable.
                          */
-                        hsotg->core_params->dma_desc_enable = 0;
-                        hsotg->core_params->dma_desc_fs_enable = 0;
+                        hsotg->params.dma_desc_enable = 0;
+                        hsotg->params.dma_desc_fs_enable = 0;
                 }
         }
 
@@ -5184,7 +5181,6 @@ error3:
 error2:
         usb_put_hcd(hcd);
 error1:
-        kfree(hsotg->core_params);
 
 #ifdef CONFIG_USB_DWC2_TRACK_MISSED_SOFS
         kfree(hsotg->last_frame_num_array);
@@ -5250,7 +5246,7 @@ int dwc2_backup_host_registers(struct dwc2_hsotg *hsotg)
         hr = &hsotg->hr_backup;
         hr->hcfg = dwc2_readl(hsotg->regs + HCFG);
         hr->haintmsk = dwc2_readl(hsotg->regs + HAINTMSK);
-        for (i = 0; i < hsotg->core_params->host_channels; ++i)
+        for (i = 0; i < hsotg->params.host_channels; ++i)
                 hr->hcintmsk[i] = dwc2_readl(hsotg->regs + HCINTMSK(i));
 
         hr->hprt0 = dwc2_read_hprt0(hsotg);
@@ -5286,7 +5282,7 @@ int dwc2_restore_host_registers(struct dwc2_hsotg *hsotg)
         dwc2_writel(hr->hcfg, hsotg->regs + HCFG);
         dwc2_writel(hr->haintmsk, hsotg->regs + HAINTMSK);
 
-        for (i = 0; i < hsotg->core_params->host_channels; ++i)
+        for (i = 0; i < hsotg->params.host_channels; ++i)
                 dwc2_writel(hr->hcintmsk[i], hsotg->regs + HCINTMSK(i));
 
         dwc2_writel(hr->hprt0, hsotg->regs + HPRT0);
diff --git a/drivers/usb/dwc2/hcd.h b/drivers/usb/dwc2/hcd.h
index 7758bfb644ff..1ed5fa2beff4 100644
--- a/drivers/usb/dwc2/hcd.h
+++ b/drivers/usb/dwc2/hcd.h
@@ -348,7 +348,7 @@ struct dwc2_qh {
         struct list_head qtd_list;
         struct dwc2_host_chan *channel;
         struct list_head qh_list_entry;
-        struct dwc2_hcd_dma_desc *desc_list;
+        struct dwc2_dma_desc *desc_list;
         dma_addr_t desc_list_dma;
         u32 desc_list_sz;
         u32 *n_bytes;
@@ -793,11 +793,6 @@ extern void dwc2_hcd_dump_frrem(struct dwc2_hsotg *hsotg);
 #define URB_SEND_ZERO_PACKET    0x2
 
 /* Host driver callbacks */
-
-extern void dwc2_host_start(struct dwc2_hsotg *hsotg);
-extern void dwc2_host_disconnect(struct dwc2_hsotg *hsotg);
-extern void dwc2_host_hub_info(struct dwc2_hsotg *hsotg, void *context,
-                               int *hub_addr, int *hub_port);
 extern struct dwc2_tt *dwc2_host_get_tt_info(struct dwc2_hsotg *hsotg,
                                              void *context, gfp_t mem_flags,
                                              int *ttport);
diff --git a/drivers/usb/dwc2/hcd_ddma.c b/drivers/usb/dwc2/hcd_ddma.c
index 0e1d42b5dec5..cf0367768cb3 100644
--- a/drivers/usb/dwc2/hcd_ddma.c
+++ b/drivers/usb/dwc2/hcd_ddma.c
@@ -95,7 +95,7 @@ static int dwc2_desc_list_alloc(struct dwc2_hsotg *hsotg, struct dwc2_qh *qh,
         else
                 desc_cache = hsotg->desc_gen_cache;
 
-        qh->desc_list_sz = sizeof(struct dwc2_hcd_dma_desc) *
+        qh->desc_list_sz = sizeof(struct dwc2_dma_desc) *
                                                 dwc2_max_desc_num(qh);
 
         qh->desc_list = kmem_cache_zalloc(desc_cache, flags | GFP_DMA);
@@ -297,7 +297,7 @@ static void dwc2_release_channel_ddma(struct dwc2_hsotg *hsotg,
         struct dwc2_host_chan *chan = qh->channel;
 
         if (dwc2_qh_is_non_per(qh)) {
-                if (hsotg->core_params->uframe_sched > 0)
+                if (hsotg->params.uframe_sched > 0)
                         hsotg->available_host_channels++;
                 else
                         hsotg->non_periodic_channels--;
@@ -322,7 +322,7 @@ static void dwc2_release_channel_ddma(struct dwc2_hsotg *hsotg,
         qh->ntd = 0;
 
         if (qh->desc_list)
-                memset(qh->desc_list, 0, sizeof(struct dwc2_hcd_dma_desc) *
+                memset(qh->desc_list, 0, sizeof(struct dwc2_dma_desc) *
                        dwc2_max_desc_num(qh));
 }
 
@@ -404,7 +404,7 @@ void dwc2_hcd_qh_free_ddma(struct dwc2_hsotg *hsotg, struct dwc2_qh *qh)
 
         if ((qh->ep_type == USB_ENDPOINT_XFER_ISOC ||
              qh->ep_type == USB_ENDPOINT_XFER_INT) &&
-            (hsotg->core_params->uframe_sched > 0 ||
+            (hsotg->params.uframe_sched > 0 ||
              !hsotg->periodic_channels) && hsotg->frame_list) {
                 dwc2_per_sched_disable(hsotg);
                 dwc2_frame_list_free(hsotg);
@@ -542,7 +542,7 @@ static void dwc2_fill_host_isoc_dma_desc(struct dwc2_hsotg *hsotg,
                                          struct dwc2_qh *qh, u32 max_xfer_size,
                                          u16 idx)
 {
-        struct dwc2_hcd_dma_desc *dma_desc = &qh->desc_list[idx];
+        struct dwc2_dma_desc *dma_desc = &qh->desc_list[idx];
         struct dwc2_hcd_iso_packet_desc *frame_desc;
 
         memset(dma_desc, 0, sizeof(*dma_desc));
@@ -571,8 +571,8 @@ static void dwc2_fill_host_isoc_dma_desc(struct dwc2_hsotg *hsotg,
 
         dma_sync_single_for_device(hsotg->dev,
                         qh->desc_list_dma +
-                        (idx * sizeof(struct dwc2_hcd_dma_desc)),
-                        sizeof(struct dwc2_hcd_dma_desc),
+                        (idx * sizeof(struct dwc2_dma_desc)),
+                        sizeof(struct dwc2_dma_desc),
                         DMA_TO_DEVICE);
 }
 
@@ -645,8 +645,8 @@ static void dwc2_init_isoc_dma_desc(struct dwc2_hsotg *hsotg,
                 qh->desc_list[idx].status |= HOST_DMA_IOC;
                 dma_sync_single_for_device(hsotg->dev,
                                            qh->desc_list_dma + (idx *
-                                           sizeof(struct dwc2_hcd_dma_desc)),
-                                           sizeof(struct dwc2_hcd_dma_desc),
+                                           sizeof(struct dwc2_dma_desc)),
+                                           sizeof(struct dwc2_dma_desc),
                                            DMA_TO_DEVICE);
         }
 #else
@@ -679,8 +679,8 @@ static void dwc2_init_isoc_dma_desc(struct dwc2_hsotg *hsotg,
         qh->desc_list[idx].status |= HOST_DMA_IOC;
         dma_sync_single_for_device(hsotg->dev,
                                    qh->desc_list_dma +
-                                   (idx * sizeof(struct dwc2_hcd_dma_desc)),
-                                   sizeof(struct dwc2_hcd_dma_desc),
+                                   (idx * sizeof(struct dwc2_dma_desc)),
+                                   sizeof(struct dwc2_dma_desc),
                                    DMA_TO_DEVICE);
 #endif
 }
@@ -690,11 +690,11 @@ static void dwc2_fill_host_dma_desc(struct dwc2_hsotg *hsotg,
                                     struct dwc2_qtd *qtd, struct dwc2_qh *qh,
                                     int n_desc)
 {
-        struct dwc2_hcd_dma_desc *dma_desc = &qh->desc_list[n_desc];
+        struct dwc2_dma_desc *dma_desc = &qh->desc_list[n_desc];
         int len = chan->xfer_len;
 
-        if (len > MAX_DMA_DESC_SIZE - (chan->max_packet - 1))
-                len = MAX_DMA_DESC_SIZE - (chan->max_packet - 1);
+        if (len > HOST_DMA_NBYTES_LIMIT - (chan->max_packet - 1))
+                len = HOST_DMA_NBYTES_LIMIT - (chan->max_packet - 1);
 
         if (chan->ep_is_in) {
                 int num_packets;
@@ -721,8 +721,8 @@ static void dwc2_fill_host_dma_desc(struct dwc2_hsotg *hsotg,
 
         dma_sync_single_for_device(hsotg->dev,
                                    qh->desc_list_dma +
-                                   (n_desc * sizeof(struct dwc2_hcd_dma_desc)),
-                                   sizeof(struct dwc2_hcd_dma_desc),
+                                   (n_desc * sizeof(struct dwc2_dma_desc)),
+                                   sizeof(struct dwc2_dma_desc),
                                    DMA_TO_DEVICE);
 
         /*
@@ -778,8 +778,8 @@ static void dwc2_init_non_isoc_dma_desc(struct dwc2_hsotg *hsotg,
                                 dma_sync_single_for_device(hsotg->dev,
                                         qh->desc_list_dma +
                                         ((n_desc - 1) *
-                                        sizeof(struct dwc2_hcd_dma_desc)),
-                                        sizeof(struct dwc2_hcd_dma_desc),
+                                        sizeof(struct dwc2_dma_desc)),
+                                        sizeof(struct dwc2_dma_desc),
                                         DMA_TO_DEVICE);
                         }
                         dwc2_fill_host_dma_desc(hsotg, chan, qtd, qh, n_desc);
@@ -808,8 +808,8 @@ static void dwc2_init_non_isoc_dma_desc(struct dwc2_hsotg *hsotg,
                          n_desc - 1, &qh->desc_list[n_desc - 1]);
                 dma_sync_single_for_device(hsotg->dev,
                                            qh->desc_list_dma + (n_desc - 1) *
-                                           sizeof(struct dwc2_hcd_dma_desc),
-                                           sizeof(struct dwc2_hcd_dma_desc),
+                                           sizeof(struct dwc2_dma_desc),
+                                           sizeof(struct dwc2_dma_desc),
                                            DMA_TO_DEVICE);
                 if (n_desc > 1) {
                         qh->desc_list[0].status |= HOST_DMA_A;
@@ -817,7 +817,7 @@ static void dwc2_init_non_isoc_dma_desc(struct dwc2_hsotg *hsotg,
                                  &qh->desc_list[0]);
                         dma_sync_single_for_device(hsotg->dev,
                                         qh->desc_list_dma,
-                                        sizeof(struct dwc2_hcd_dma_desc),
+                                        sizeof(struct dwc2_dma_desc),
                                         DMA_TO_DEVICE);
                 }
                 chan->ntd = n_desc;
@@ -893,7 +893,7 @@ static int dwc2_cmpl_host_isoc_dma_desc(struct dwc2_hsotg *hsotg,
                                         struct dwc2_qtd *qtd,
                                         struct dwc2_qh *qh, u16 idx)
 {
-        struct dwc2_hcd_dma_desc *dma_desc;
+        struct dwc2_dma_desc *dma_desc;
         struct dwc2_hcd_iso_packet_desc *frame_desc;
         u16 remain = 0;
         int rc = 0;
@@ -902,8 +902,8 @@ static int dwc2_cmpl_host_isoc_dma_desc(struct dwc2_hsotg *hsotg,
                 return -EINVAL;
 
         dma_sync_single_for_cpu(hsotg->dev, qh->desc_list_dma + (idx *
-                                sizeof(struct dwc2_hcd_dma_desc)),
-                                sizeof(struct dwc2_hcd_dma_desc),
+                                sizeof(struct dwc2_dma_desc)),
+                                sizeof(struct dwc2_dma_desc),
                                 DMA_FROM_DEVICE);
 
         dma_desc = &qh->desc_list[idx];
@@ -1066,7 +1066,7 @@ stop_scan:
 static int dwc2_update_non_isoc_urb_state_ddma(struct dwc2_hsotg *hsotg,
                                         struct dwc2_host_chan *chan,
                                         struct dwc2_qtd *qtd,
-                                        struct dwc2_hcd_dma_desc *dma_desc,
+                                        struct dwc2_dma_desc *dma_desc,
                                         enum dwc2_halt_status halt_status,
                                         u32 n_bytes, int *xfer_done)
 {
@@ -1154,7 +1154,7 @@ static int dwc2_process_non_isoc_desc(struct dwc2_hsotg *hsotg,
 {
         struct dwc2_qh *qh = chan->qh;
         struct dwc2_hcd_urb *urb = qtd->urb;
-        struct dwc2_hcd_dma_desc *dma_desc;
+        struct dwc2_dma_desc *dma_desc;
         u32 n_bytes;
         int failed;
 
@@ -1165,8 +1165,8 @@ static int dwc2_process_non_isoc_desc(struct dwc2_hsotg *hsotg,
 
         dma_sync_single_for_cpu(hsotg->dev,
                                 qh->desc_list_dma + (desc_num *
-                                sizeof(struct dwc2_hcd_dma_desc)),
-                                sizeof(struct dwc2_hcd_dma_desc),
+                                sizeof(struct dwc2_dma_desc)),
+                                sizeof(struct dwc2_dma_desc),
                                 DMA_FROM_DEVICE);
 
         dma_desc = &qh->desc_list[desc_num];
diff --git a/drivers/usb/dwc2/hcd_intr.c b/drivers/usb/dwc2/hcd_intr.c
index 906f223542ee..b8f4b6aaf1d0 100644
--- a/drivers/usb/dwc2/hcd_intr.c
+++ b/drivers/usb/dwc2/hcd_intr.c
@@ -256,7 +256,7 @@ static void dwc2_perio_tx_fifo_empty_intr(struct dwc2_hsotg *hsotg)
 static void dwc2_hprt0_enable(struct dwc2_hsotg *hsotg, u32 hprt0,
                               u32 *hprt0_modify)
 {
-        struct dwc2_core_params *params = hsotg->core_params;
+        struct dwc2_core_params *params = &hsotg->params;
         int do_reset = 0;
         u32 usbcfg;
         u32 prtspd;
@@ -395,10 +395,10 @@ static void dwc2_port_intr(struct dwc2_hsotg *hsotg)
                         dwc2_hprt0_enable(hsotg, hprt0, &hprt0_modify);
                 } else {
                         hsotg->flags.b.port_enable_change = 1;
-                        if (hsotg->core_params->dma_desc_fs_enable) {
+                        if (hsotg->params.dma_desc_fs_enable) {
                                 u32 hcfg;
 
-                                hsotg->core_params->dma_desc_enable = 0;
+                                hsotg->params.dma_desc_enable = 0;
                                 hsotg->new_connection = false;
                                 hcfg = dwc2_readl(hsotg->regs + HCFG);
                                 hcfg &= ~HCFG_DESCDMA;
@@ -604,7 +604,7 @@ static enum dwc2_halt_status dwc2_update_isoc_urb_state(
                 /* Skip whole frame */
                 if (chan->qh->do_split &&
                     chan->ep_type == USB_ENDPOINT_XFER_ISOC && chan->ep_is_in &&
-                    hsotg->core_params->dma_enable > 0) {
+                    hsotg->params.host_dma > 0) {
                         qtd->complete_split = 0;
                         qtd->isoc_split_offset = 0;
                 }
@@ -743,7 +743,7 @@ cleanup:
         dwc2_hc_cleanup(hsotg, chan);
         list_add_tail(&chan->hc_list_entry, &hsotg->free_hc_list);
 
-        if (hsotg->core_params->uframe_sched > 0) {
+        if (hsotg->params.uframe_sched > 0) {
                 hsotg->available_host_channels++;
         } else {
                 switch (chan->ep_type) {
@@ -789,7 +789,7 @@ static void dwc2_halt_channel(struct dwc2_hsotg *hsotg,
         if (dbg_hc(chan))
                 dev_vdbg(hsotg->dev, "%s()\n", __func__);
 
-        if (hsotg->core_params->dma_enable > 0) {
+        if (hsotg->params.host_dma > 0) {
                 if (dbg_hc(chan))
                         dev_vdbg(hsotg->dev, "DMA enabled\n");
                 dwc2_release_channel(hsotg, chan, qtd, halt_status);
@@ -915,6 +915,8 @@ static int dwc2_xfercomp_isoc_split_in(struct dwc2_hsotg *hsotg,
 {
         struct dwc2_hcd_iso_packet_desc *frame_desc;
         u32 len;
+        u32 hctsiz;
+        u32 pid;
 
         if (!qtd->urb)
                 return 0;
@@ -932,7 +934,10 @@ static int dwc2_xfercomp_isoc_split_in(struct dwc2_hsotg *hsotg,
 
         qtd->isoc_split_offset += len;
 
-        if (frame_desc->actual_length >= frame_desc->length) {
+        hctsiz = dwc2_readl(hsotg->regs + HCTSIZ(chnum));
+        pid = (hctsiz & TSIZ_SC_MC_PID_MASK) >> TSIZ_SC_MC_PID_SHIFT;
+
+        if (frame_desc->actual_length >= frame_desc->length || pid == 0) {
                 frame_desc->status = 0;
                 qtd->isoc_frame_index++;
                 qtd->complete_split = 0;
@@ -974,7 +979,7 @@ static void dwc2_hc_xfercomp_intr(struct dwc2_hsotg *hsotg,
 
         pipe_type = dwc2_hcd_get_pipe_type(&urb->pipe_info);
 
-        if (hsotg->core_params->dma_desc_enable > 0) {
+        if (hsotg->params.dma_desc_enable > 0) {
                 dwc2_hcd_complete_xfer_ddma(hsotg, chan, chnum, halt_status);
                 if (pipe_type == USB_ENDPOINT_XFER_ISOC)
                         /* Do not disable the interrupt, just clear it */
@@ -985,7 +990,7 @@ static void dwc2_hc_xfercomp_intr(struct dwc2_hsotg *hsotg,
         /* Handle xfer complete on CSPLIT */
         if (chan->qh->do_split) {
                 if (chan->ep_type == USB_ENDPOINT_XFER_ISOC && chan->ep_is_in &&
-                    hsotg->core_params->dma_enable > 0) {
+                    hsotg->params.host_dma > 0) {
                         if (qtd->complete_split &&
                             dwc2_xfercomp_isoc_split_in(hsotg, chan, chnum,
                                                         qtd))
@@ -1097,7 +1102,7 @@ static void dwc2_hc_stall_intr(struct dwc2_hsotg *hsotg,
         dev_dbg(hsotg->dev, "--Host Channel %d Interrupt: STALL Received--\n",
                 chnum);
 
-        if (hsotg->core_params->dma_desc_enable > 0) {
+        if (hsotg->params.dma_desc_enable > 0) {
                 dwc2_hcd_complete_xfer_ddma(hsotg, chan, chnum,
                                             DWC2_HC_XFER_STALL);
                 goto handle_stall_done;
@@ -1207,7 +1212,7 @@ static void dwc2_hc_nak_intr(struct dwc2_hsotg *hsotg,
         switch (dwc2_hcd_get_pipe_type(&qtd->urb->pipe_info)) {
         case USB_ENDPOINT_XFER_CONTROL:
         case USB_ENDPOINT_XFER_BULK:
-                if (hsotg->core_params->dma_enable > 0 && chan->ep_is_in) {
+                if (hsotg->params.host_dma > 0 && chan->ep_is_in) {
                         /*
                          * NAK interrupts are enabled on bulk/control IN
                          * transfers in DMA mode for the sole purpose of
@@ -1353,7 +1358,7 @@ static void dwc2_hc_nyet_intr(struct dwc2_hsotg *hsotg,
          */
         if (chan->do_split && chan->complete_split) {
                 if (chan->ep_is_in && chan->ep_type == USB_ENDPOINT_XFER_ISOC &&
-                    hsotg->core_params->dma_enable > 0) {
+                    hsotg->params.host_dma > 0) {
                         qtd->complete_split = 0;
                         qtd->isoc_split_offset = 0;
                         qtd->isoc_frame_index++;
@@ -1374,7 +1379,7 @@ static void dwc2_hc_nyet_intr(struct dwc2_hsotg *hsotg,
                         struct dwc2_qh *qh = chan->qh;
                         bool past_end;
 
-                        if (hsotg->core_params->uframe_sched <= 0) {
+                        if (hsotg->params.uframe_sched <= 0) {
                                 int frnum = dwc2_hcd_get_frame_number(hsotg);
 
                                 /* Don't have num_hs_transfers; simple logic */
@@ -1467,7 +1472,7 @@ static void dwc2_hc_babble_intr(struct dwc2_hsotg *hsotg,
 
         dwc2_hc_handle_tt_clear(hsotg, chan, qtd);
 
-        if (hsotg->core_params->dma_desc_enable > 0) {
+        if (hsotg->params.dma_desc_enable > 0) {
                 dwc2_hcd_complete_xfer_ddma(hsotg, chan, chnum,
                                             DWC2_HC_XFER_BABBLE_ERR);
                 goto disable_int;
@@ -1572,7 +1577,7 @@ static void dwc2_hc_ahberr_intr(struct dwc2_hsotg *hsotg,
         dev_err(hsotg->dev, "  Interval: %d\n", urb->interval);
 
         /* Core halts the channel for Descriptor DMA mode */
-        if (hsotg->core_params->dma_desc_enable > 0) {
+        if (hsotg->params.dma_desc_enable > 0) {
                 dwc2_hcd_complete_xfer_ddma(hsotg, chan, chnum,
                                             DWC2_HC_XFER_AHB_ERR);
                 goto handle_ahberr_done;
@@ -1604,7 +1609,7 @@ static void dwc2_hc_xacterr_intr(struct dwc2_hsotg *hsotg,
 
         dwc2_hc_handle_tt_clear(hsotg, chan, qtd);
 
-        if (hsotg->core_params->dma_desc_enable > 0) {
+        if (hsotg->params.dma_desc_enable > 0) {
                 dwc2_hcd_complete_xfer_ddma(hsotg, chan, chnum,
                                             DWC2_HC_XFER_XACT_ERR);
                 goto handle_xacterr_done;
@@ -1798,8 +1803,8 @@ static void dwc2_hc_chhltd_intr_dma(struct dwc2_hsotg *hsotg,
 
         if (chan->halt_status == DWC2_HC_XFER_URB_DEQUEUE ||
             (chan->halt_status == DWC2_HC_XFER_AHB_ERR &&
-             hsotg->core_params->dma_desc_enable <= 0)) {
-                if (hsotg->core_params->dma_desc_enable > 0)
+             hsotg->params.dma_desc_enable <= 0)) {
+                if (hsotg->params.dma_desc_enable > 0)
                         dwc2_hcd_complete_xfer_ddma(hsotg, chan, chnum,
                                                     chan->halt_status);
                 else
@@ -1830,7 +1835,7 @@ static void dwc2_hc_chhltd_intr_dma(struct dwc2_hsotg *hsotg,
         } else if (chan->hcint & HCINTMSK_STALL) {
                 dwc2_hc_stall_intr(hsotg, chan, chnum, qtd);
         } else if ((chan->hcint & HCINTMSK_XACTERR) &&
-                   hsotg->core_params->dma_desc_enable <= 0) {
+                   hsotg->params.dma_desc_enable <= 0) {
                 if (out_nak_enh) {
                         if (chan->hcint &
                             (HCINTMSK_NYET | HCINTMSK_NAK | HCINTMSK_ACK)) {
@@ -1850,10 +1855,10 @@ static void dwc2_hc_chhltd_intr_dma(struct dwc2_hsotg *hsotg,
                  */
                 dwc2_hc_xacterr_intr(hsotg, chan, chnum, qtd);
         } else if ((chan->hcint & HCINTMSK_XCS_XACT) &&
-                   hsotg->core_params->dma_desc_enable > 0) {
+                   hsotg->params.dma_desc_enable > 0) {
                 dwc2_hc_xacterr_intr(hsotg, chan, chnum, qtd);
         } else if ((chan->hcint & HCINTMSK_AHBERR) &&
-                   hsotg->core_params->dma_desc_enable > 0) {
+                   hsotg->params.dma_desc_enable > 0) {
                 dwc2_hc_ahberr_intr(hsotg, chan, chnum, qtd);
         } else if (chan->hcint & HCINTMSK_BBLERR) {
                 dwc2_hc_babble_intr(hsotg, chan, chnum, qtd);
@@ -1946,7 +1951,7 @@ static void dwc2_hc_chhltd_intr(struct dwc2_hsotg *hsotg,
                 dev_vdbg(hsotg->dev, "--Host Channel %d Interrupt: Channel Halted--\n",
                          chnum);
 
-        if (hsotg->core_params->dma_enable > 0) {
+        if (hsotg->params.host_dma > 0) {
                 dwc2_hc_chhltd_intr_dma(hsotg, chan, chnum, qtd);
         } else {
                 if (!dwc2_halt_status_ok(hsotg, chan, chnum, qtd))
@@ -2023,7 +2028,7 @@ static void dwc2_hc_n_intr(struct dwc2_hsotg *hsotg, int chnum)
                  * interrupt unmasked
                  */
                 WARN_ON(hcint != HCINTMSK_CHHLTD);
-                if (hsotg->core_params->dma_desc_enable > 0)
+                if (hsotg->params.dma_desc_enable > 0)
                         dwc2_hcd_complete_xfer_ddma(hsotg, chan, chnum,
                                                     chan->halt_status);
                 else
@@ -2051,7 +2056,7 @@ static void dwc2_hc_n_intr(struct dwc2_hsotg *hsotg, int chnum)
         qtd = list_first_entry(&chan->qh->qtd_list, struct dwc2_qtd,
                                qtd_list_entry);
 
-        if (hsotg->core_params->dma_enable <= 0) {
+        if (hsotg->params.host_dma <= 0) {
                 if ((hcint & HCINTMSK_CHHLTD) && hcint != HCINTMSK_CHHLTD)
                         hcint &= ~HCINTMSK_CHHLTD;
         }
@@ -2156,7 +2161,7 @@ static void dwc2_hc_intr(struct dwc2_hsotg *hsotg)
                 }
         }
 
-        for (i = 0; i < hsotg->core_params->host_channels; i++) {
+        for (i = 0; i < hsotg->params.host_channels; i++) {
                 if (haint & (1 << i))
                         dwc2_hc_n_intr(hsotg, i);
         }
diff --git a/drivers/usb/dwc2/hcd_queue.c b/drivers/usb/dwc2/hcd_queue.c
index 13754353251f..5713f03a4e56 100644
--- a/drivers/usb/dwc2/hcd_queue.c
+++ b/drivers/usb/dwc2/hcd_queue.c
@@ -75,7 +75,7 @@ static int dwc2_periodic_channel_available(struct dwc2_hsotg *hsotg)
         int status;
         int num_channels;
 
-        num_channels = hsotg->core_params->host_channels;
+        num_channels = hsotg->params.host_channels;
         if (hsotg->periodic_channels + hsotg->non_periodic_channels <
                                                                 num_channels
             && hsotg->periodic_channels < num_channels - 1) {
@@ -355,6 +355,37 @@ static void pmap_unschedule(unsigned long *map, int bits_per_period,
         }
 }
 
+/**
+ * dwc2_get_ls_map() - Get the map used for the given qh
+ *
+ * @hsotg: The HCD state structure for the DWC OTG controller.
+ * @qh:    QH for the periodic transfer.
+ *
+ * We'll always get the periodic map out of our TT.  Note that even if we're
+ * running the host straight in low speed / full speed mode it appears as if
+ * a TT is allocated for us, so we'll use it.  If that ever changes we can
+ * add logic here to get a map out of "hsotg" if !qh->do_split.
+ *
+ * Returns: the map or NULL if a map couldn't be found.
+ */
+static unsigned long *dwc2_get_ls_map(struct dwc2_hsotg *hsotg,
+                                      struct dwc2_qh *qh)
+{
+        unsigned long *map;
+
+        /* Don't expect to be missing a TT and be doing low speed scheduling */
+        if (WARN_ON(!qh->dwc_tt))
+                return NULL;
+
+        /* Get the map and adjust if this is a multi_tt hub */
+        map = qh->dwc_tt->periodic_bitmaps;
+        if (qh->dwc_tt->usb_tt->multi)
+                map += DWC2_ELEMENTS_PER_LS_BITMAP * qh->ttport;
+
+        return map;
+}
+
+#ifdef DWC2_PRINT_SCHEDULE
 /*
  * cat_printf() - A printf() + strcat() helper
  *
@@ -454,35 +485,6 @@ static void pmap_print(unsigned long *map, int bits_per_period,
         }
 }
 
-/**
- * dwc2_get_ls_map() - Get the map used for the given qh
- *
- * @hsotg: The HCD state structure for the DWC OTG controller.
- * @qh:    QH for the periodic transfer.
- *
- * We'll always get the periodic map out of our TT.  Note that even if we're
- * running the host straight in low speed / full speed mode it appears as if
- * a TT is allocated for us, so we'll use it.  If that ever changes we can
- * add logic here to get a map out of "hsotg" if !qh->do_split.
- *
- * Returns: the map or NULL if a map couldn't be found.
- */
-static unsigned long *dwc2_get_ls_map(struct dwc2_hsotg *hsotg,
-                                      struct dwc2_qh *qh)
-{
-        unsigned long *map;
-
-        /* Don't expect to be missing a TT and be doing low speed scheduling */
-        if (WARN_ON(!qh->dwc_tt))
-                return NULL;
-
-        /* Get the map and adjust if this is a multi_tt hub */
-        map = qh->dwc_tt->periodic_bitmaps;
-        if (qh->dwc_tt->usb_tt->multi)
-                map += DWC2_ELEMENTS_PER_LS_BITMAP * qh->ttport;
-
-        return map;
-}
 
 struct dwc2_qh_print_data {
         struct dwc2_hsotg *hsotg;
@@ -519,9 +521,6 @@ static void dwc2_qh_schedule_print(struct dwc2_hsotg *hsotg,
          * If we don't have tracing turned on, don't run unless the special
          * define is turned on.
          */
-#ifndef DWC2_PRINT_SCHEDULE
-        return;
-#endif
 
         if (qh->schedule_low_speed) {
                 unsigned long *map = dwc2_get_ls_map(hsotg, qh);
@@ -559,8 +558,12 @@ static void dwc2_qh_schedule_print(struct dwc2_hsotg *hsotg,
                            DWC2_HS_SCHEDULE_UFRAMES, "uFrame", "us",
                            dwc2_qh_print, &print_data);
         }
-
+        return;
 }
+#else
+static inline void dwc2_qh_schedule_print(struct dwc2_hsotg *hsotg,
+                                          struct dwc2_qh *qh) {};
+#endif
 
 /**
  * dwc2_ls_pmap_schedule() - Schedule a low speed QH
@@ -1104,7 +1107,7 @@ static void dwc2_pick_first_frame(struct dwc2_hsotg *hsotg, struct dwc2_qh *qh)
         next_active_frame = earliest_frame;
 
         /* Get the "no microframe schduler" out of the way... */
-        if (hsotg->core_params->uframe_sched <= 0) {
+        if (hsotg->params.uframe_sched <= 0) {
                 if (qh->do_split)
                         /* Splits are active at microframe 0 minus 1 */
                         next_active_frame |= 0x7;
@@ -1197,7 +1200,7 @@ static int dwc2_do_reserve(struct dwc2_hsotg *hsotg, struct dwc2_qh *qh)
 {
         int status;
 
-        if (hsotg->core_params->uframe_sched > 0) {
+        if (hsotg->params.uframe_sched > 0) {
                 status = dwc2_uframe_schedule(hsotg, qh);
         } else {
                 status = dwc2_periodic_channel_available(hsotg);
@@ -1218,7 +1221,7 @@ static int dwc2_do_reserve(struct dwc2_hsotg *hsotg, struct dwc2_qh *qh)
                 return status;
         }
 
-        if (hsotg->core_params->uframe_sched <= 0)
+        if (hsotg->params.uframe_sched <= 0)
                 /* Reserve periodic channel */
                 hsotg->periodic_channels++;
 
@@ -1254,7 +1257,7 @@ static void dwc2_do_unreserve(struct dwc2_hsotg *hsotg, struct dwc2_qh *qh)
         /* Update claimed usecs per (micro)frame */
         hsotg->periodic_usecs -= qh->host_us;
 
-        if (hsotg->core_params->uframe_sched > 0) {
+        if (hsotg->params.uframe_sched > 0) {
                 dwc2_uframe_unschedule(hsotg, qh);
         } else {
                 /* Release periodic channel reservation */
@@ -1328,7 +1331,7 @@ static int dwc2_check_max_xfer_size(struct dwc2_hsotg *hsotg,
         int status = 0;
 
         max_xfer_size = dwc2_max_packet(qh->maxp) * dwc2_hb_mult(qh->maxp);
-        max_channel_xfer_size = hsotg->core_params->max_transfer_size;
+        max_channel_xfer_size = hsotg->params.max_transfer_size;
 
         if (max_xfer_size > max_channel_xfer_size) {
                 dev_err(hsotg->dev,
@@ -1391,7 +1394,7 @@ static int dwc2_schedule_periodic(struct dwc2_hsotg *hsotg, struct dwc2_qh *qh)
 
         qh->unreserve_pending = 0;
 
-        if (hsotg->core_params->dma_desc_enable > 0)
+        if (hsotg->params.dma_desc_enable > 0)
                 /* Don't rely on SOF and start in ready schedule */
                 list_add_tail(&qh->qh_list_entry, &hsotg->periodic_sched_ready);
         else
@@ -1599,7 +1602,7 @@ struct dwc2_qh *dwc2_hcd_qh_create(struct dwc2_hsotg *hsotg,
 
         dwc2_qh_init(hsotg, qh, urb, mem_flags);
 
-        if (hsotg->core_params->dma_desc_enable > 0 &&
+        if (hsotg->params.dma_desc_enable > 0 &&
             dwc2_hcd_qh_init_ddma(hsotg, qh, mem_flags) < 0) {
                 dwc2_hcd_qh_free(hsotg, qh);
                 return NULL;
@@ -1711,7 +1714,7 @@ void dwc2_hcd_qh_unlink(struct dwc2_hsotg *hsotg, struct dwc2_qh *qh)
         dwc2_deschedule_periodic(hsotg, qh);
         hsotg->periodic_qh_count--;
         if (!hsotg->periodic_qh_count &&
-            hsotg->core_params->dma_desc_enable <= 0) {
+            hsotg->params.dma_desc_enable <= 0) {
                 intr_mask = dwc2_readl(hsotg->regs + GINTMSK);
                 intr_mask &= ~GINTSTS_SOF;
                 dwc2_writel(intr_mask, hsotg->regs + GINTMSK);
diff --git a/drivers/usb/dwc2/hw.h b/drivers/usb/dwc2/hw.h
index 91058441e62a..5be056b39e5c 100644
--- a/drivers/usb/dwc2/hw.h
+++ b/drivers/usb/dwc2/hw.h
@@ -412,6 +412,7 @@
 /* Device mode registers */
 
 #define DCFG                            HSOTG_REG(0x800)
+#define DCFG_DESCDMA_EN                 (1 << 23)
 #define DCFG_EPMISCNT_MASK              (0x1f << 18)
 #define DCFG_EPMISCNT_SHIFT             18
 #define DCFG_EPMISCNT_LIMIT             0x1f
@@ -473,6 +474,7 @@
 #define DIEPMSK_XFERCOMPLMSK            (1 << 0)
 
 #define DOEPMSK                         HSOTG_REG(0x814)
+#define DOEPMSK_BNAMSK                  (1 << 9)
 #define DOEPMSK_BACK2BACKSETUP          (1 << 6)
 #define DOEPMSK_STSPHSERCVDMSK          (1 << 5)
 #define DOEPMSK_OUTTKNEPDISMSK          (1 << 4)
@@ -790,7 +792,8 @@
 #define HCFIFO(_ch)                     HSOTG_REG(0x1000 + 0x1000 * (_ch))
 
 /**
- * struct dwc2_hcd_dma_desc - Host-mode DMA descriptor structure
+ * struct dwc2_dma_desc - DMA descriptor structure,
+ * used for both host and gadget modes
  *
  * @status: DMA descriptor status quadlet
  * @buf:    DMA descriptor data buffer pointer
@@ -798,10 +801,12 @@
  * DMA Descriptor structure contains two quadlets:
  * Status quadlet and Data buffer pointer.
  */
-struct dwc2_hcd_dma_desc {
+struct dwc2_dma_desc {
         u32 status;
         u32 buf;
-};
+} __packed;
+
+/* Host Mode DMA descriptor status quadlet */
 
 #define HOST_DMA_A                      (1 << 31)
 #define HOST_DMA_STS_MASK               (0x3 << 28)
@@ -817,8 +822,43 @@ struct dwc2_hcd_dma_desc {
 #define HOST_DMA_ISOC_NBYTES_SHIFT      0
 #define HOST_DMA_NBYTES_MASK            (0x1ffff << 0)
 #define HOST_DMA_NBYTES_SHIFT           0
+#define HOST_DMA_NBYTES_LIMIT           131071
+
+/* Device Mode DMA descriptor status quadlet */
+
+#define DEV_DMA_BUFF_STS_MASK           (0x3 << 30)
+#define DEV_DMA_BUFF_STS_SHIFT          30
+#define DEV_DMA_BUFF_STS_HREADY         0
+#define DEV_DMA_BUFF_STS_DMABUSY        1
+#define DEV_DMA_BUFF_STS_DMADONE        2
+#define DEV_DMA_BUFF_STS_HBUSY          3
+#define DEV_DMA_STS_MASK                (0x3 << 28)
+#define DEV_DMA_STS_SHIFT               28
+#define DEV_DMA_STS_SUCC                0
+#define DEV_DMA_STS_BUFF_FLUSH          1
+#define DEV_DMA_STS_BUFF_ERR            3
+#define DEV_DMA_L                       (1 << 27)
+#define DEV_DMA_SHORT                   (1 << 26)
+#define DEV_DMA_IOC                     (1 << 25)
+#define DEV_DMA_SR                      (1 << 24)
+#define DEV_DMA_MTRF                    (1 << 23)
+#define DEV_DMA_ISOC_PID_MASK           (0x3 << 23)
+#define DEV_DMA_ISOC_PID_SHIFT          23
+#define DEV_DMA_ISOC_PID_DATA0          0
+#define DEV_DMA_ISOC_PID_DATA2          1
+#define DEV_DMA_ISOC_PID_DATA1          2
+#define DEV_DMA_ISOC_PID_MDATA          3
+#define DEV_DMA_ISOC_FRNUM_MASK         (0x7ff << 12)
+#define DEV_DMA_ISOC_FRNUM_SHIFT        12
+#define DEV_DMA_ISOC_TX_NBYTES_MASK     (0xfff << 0)
+#define DEV_DMA_ISOC_TX_NBYTES_LIMIT    0xfff
+#define DEV_DMA_ISOC_RX_NBYTES_MASK     (0x7ff << 0)
+#define DEV_DMA_ISOC_RX_NBYTES_LIMIT    0x7ff
+#define DEV_DMA_ISOC_NBYTES_SHIFT       0
+#define DEV_DMA_NBYTES_MASK             (0xffff << 0)
+#define DEV_DMA_NBYTES_SHIFT            0
+#define DEV_DMA_NBYTES_LIMIT            0xffff
 
-#define MAX_DMA_DESC_SIZE               131071
 #define MAX_DMA_DESC_NUM_GENERIC        64
 #define MAX_DMA_DESC_NUM_HS_ISOC        256
 
diff --git a/drivers/usb/dwc2/params.c b/drivers/usb/dwc2/params.c
new file mode 100644
index 000000000000..a786256535b6
--- /dev/null
+++ b/drivers/usb/dwc2/params.c
@@ -0,0 +1,1435 @@
+/*
+ * Copyright (C) 2004-2016 Synopsys, Inc.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions, and the following disclaimer,
+ *    without modification.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. The names of the above-listed copyright holders may not be used
+ *    to endorse or promote products derived from this software without
+ *    specific prior written permission.
+ *
+ * ALTERNATIVELY, this software may be distributed under the terms of the
+ * GNU General Public License ("GPL") as published by the Free Software
+ * Foundation; either version 2 of the License, or (at your option) any
+ * later version.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+ * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/of_device.h>
+
+#include "core.h"
+
+static const struct dwc2_core_params params_hi6220 = {
+        .otg_cap                        = 2,    /* No HNP/SRP capable */
+        .otg_ver                        = 0,    /* 1.3 */
+        .dma_desc_enable                = 0,
+        .dma_desc_fs_enable             = 0,
+        .speed                          = 0,    /* High Speed */
+        .enable_dynamic_fifo            = 1,
+        .en_multiple_tx_fifo            = 1,
+        .host_rx_fifo_size              = 512,
+        .host_nperio_tx_fifo_size       = 512,
+        .host_perio_tx_fifo_size        = 512,
+        .max_transfer_size              = 65535,
+        .max_packet_count               = 511,
+        .host_channels                  = 16,
+        .phy_type                       = 1,    /* UTMI */
+        .phy_utmi_width                 = 8,
+        .phy_ulpi_ddr                   = 0,    /* Single */
+        .phy_ulpi_ext_vbus              = 0,
+        .i2c_enable                     = 0,
+        .ulpi_fs_ls                     = 0,
+        .host_support_fs_ls_low_power   = 0,
+        .host_ls_low_power_phy_clk      = 0,    /* 48 MHz */
+        .ts_dline                       = 0,
+        .reload_ctl                     = 0,
+        .ahbcfg                         = GAHBCFG_HBSTLEN_INCR16 <<
+                                          GAHBCFG_HBSTLEN_SHIFT,
+        .uframe_sched                   = 0,
+        .external_id_pin_ctl            = -1,
+        .hibernation                    = -1,
+};
+
+static const struct dwc2_core_params params_bcm2835 = {
+        .otg_cap                        = 0,    /* HNP/SRP capable */
+        .otg_ver                        = 0,    /* 1.3 */
+        .dma_desc_enable                = 0,
+        .dma_desc_fs_enable             = 0,
+        .speed                          = 0,    /* High Speed */
+        .enable_dynamic_fifo            = 1,
+        .en_multiple_tx_fifo            = 1,
+        .host_rx_fifo_size              = 774,  /* 774 DWORDs */
+        .host_nperio_tx_fifo_size       = 256,  /* 256 DWORDs */
+        .host_perio_tx_fifo_size        = 512,  /* 512 DWORDs */
+        .max_transfer_size              = 65535,
+        .max_packet_count               = 511,
+        .host_channels                  = 8,
+        .phy_type                       = 1,    /* UTMI */
+        .phy_utmi_width                 = 8,    /* 8 bits */
+        .phy_ulpi_ddr                   = 0,    /* Single */
+        .phy_ulpi_ext_vbus              = 0,
+        .i2c_enable                     = 0,
+        .ulpi_fs_ls                     = 0,
+        .host_support_fs_ls_low_power   = 0,
+        .host_ls_low_power_phy_clk      = 0,    /* 48 MHz */
+        .ts_dline                       = 0,
+        .reload_ctl                     = 0,
+        .ahbcfg                         = 0x10,
+        .uframe_sched                   = 0,
+        .external_id_pin_ctl            = -1,
+        .hibernation                    = -1,
+};
+
+static const struct dwc2_core_params params_rk3066 = {
+        .otg_cap                        = 2,    /* non-HNP/non-SRP */
+        .otg_ver                        = -1,
+        .dma_desc_enable                = 0,
+        .dma_desc_fs_enable             = 0,
+        .speed                          = -1,
+        .enable_dynamic_fifo            = 1,
+        .en_multiple_tx_fifo            = -1,
+        .host_rx_fifo_size              = 525,  /* 525 DWORDs */
+        .host_nperio_tx_fifo_size       = 128,  /* 128 DWORDs */
+        .host_perio_tx_fifo_size        = 256,  /* 256 DWORDs */
+        .max_transfer_size              = -1,
+        .max_packet_count               = -1,
+        .host_channels                  = -1,
+        .phy_type                       = -1,
+        .phy_utmi_width                 = -1,
+        .phy_ulpi_ddr                   = -1,
+        .phy_ulpi_ext_vbus              = -1,
+        .i2c_enable                     = -1,
+        .ulpi_fs_ls                     = -1,
+        .host_support_fs_ls_low_power   = -1,
+        .host_ls_low_power_phy_clk      = -1,
+        .ts_dline                       = -1,
+        .reload_ctl                     = -1,
+        .ahbcfg                         = GAHBCFG_HBSTLEN_INCR16 <<
+                                          GAHBCFG_HBSTLEN_SHIFT,
+        .uframe_sched                   = -1,
+        .external_id_pin_ctl            = -1,
+        .hibernation                    = -1,
+};
+
+static const struct dwc2_core_params params_ltq = {
+        .otg_cap                        = 2,    /* non-HNP/non-SRP */
+        .otg_ver                        = -1,
+        .dma_desc_enable                = -1,
+        .dma_desc_fs_enable             = -1,
+        .speed                          = -1,
+        .enable_dynamic_fifo            = -1,
+        .en_multiple_tx_fifo            = -1,
+        .host_rx_fifo_size              = 288,  /* 288 DWORDs */
+        .host_nperio_tx_fifo_size       = 128,  /* 128 DWORDs */
+        .host_perio_tx_fifo_size        = 96,   /* 96 DWORDs */
+        .max_transfer_size              = 65535,
+        .max_packet_count               = 511,
+        .host_channels                  = -1,
+        .phy_type                       = -1,
+        .phy_utmi_width                 = -1,
+        .phy_ulpi_ddr                   = -1,
+        .phy_ulpi_ext_vbus              = -1,
+        .i2c_enable                     = -1,
+        .ulpi_fs_ls                     = -1,
+        .host_support_fs_ls_low_power   = -1,
+        .host_ls_low_power_phy_clk      = -1,
+        .ts_dline                       = -1,
+        .reload_ctl                     = -1,
+        .ahbcfg                         = GAHBCFG_HBSTLEN_INCR16 <<
+                                          GAHBCFG_HBSTLEN_SHIFT,
+        .uframe_sched                   = -1,
+        .external_id_pin_ctl            = -1,
+        .hibernation                    = -1,
+};
+
+static const struct dwc2_core_params params_amlogic = {
+        .otg_cap                        = DWC2_CAP_PARAM_NO_HNP_SRP_CAPABLE,
+        .otg_ver                        = -1,
+        .dma_desc_enable                = 0,
+        .dma_desc_fs_enable             = 0,
+        .speed                          = DWC2_SPEED_PARAM_HIGH,
+        .enable_dynamic_fifo            = 1,
+        .en_multiple_tx_fifo            = -1,
+        .host_rx_fifo_size              = 512,
+        .host_nperio_tx_fifo_size       = 500,
+        .host_perio_tx_fifo_size        = 500,
+        .max_transfer_size              = -1,
+        .max_packet_count               = -1,
+        .host_channels                  = 16,
+        .phy_type                       = DWC2_PHY_TYPE_PARAM_UTMI,
+        .phy_utmi_width                 = -1,
+        .phy_ulpi_ddr                   = -1,
+        .phy_ulpi_ext_vbus              = -1,
+        .i2c_enable                     = -1,
+        .ulpi_fs_ls                     = -1,
+        .host_support_fs_ls_low_power   = -1,
+        .host_ls_low_power_phy_clk      = -1,
+        .ts_dline                       = -1,
+        .reload_ctl                     = 1,
+        .ahbcfg                         = GAHBCFG_HBSTLEN_INCR8 <<
+                                          GAHBCFG_HBSTLEN_SHIFT,
+        .uframe_sched                   = 0,
+        .external_id_pin_ctl            = -1,
+        .hibernation                    = -1,
+};
+
+static const struct dwc2_core_params params_default = {
+        .otg_cap                        = -1,
+        .otg_ver                        = -1,
+
+        /*
+         * Disable descriptor dma mode by default as the HW can support
+         * it, but does not support it for SPLIT transactions.
+         * Disable it for FS devices as well.
+         */
+        .dma_desc_enable                = 0,
+        .dma_desc_fs_enable             = 0,
+
+        .speed                          = -1,
+        .enable_dynamic_fifo            = -1,
+        .en_multiple_tx_fifo            = -1,
+        .host_rx_fifo_size              = -1,
+        .host_nperio_tx_fifo_size       = -1,
+        .host_perio_tx_fifo_size        = -1,
+        .max_transfer_size              = -1,
+        .max_packet_count               = -1,
+        .host_channels                  = -1,
+        .phy_type                       = -1,
+        .phy_utmi_width                 = -1,
+        .phy_ulpi_ddr                   = -1,
+        .phy_ulpi_ext_vbus              = -1,
+        .i2c_enable                     = -1,
+        .ulpi_fs_ls                     = -1,
+        .host_support_fs_ls_low_power   = -1,
+        .host_ls_low_power_phy_clk      = -1,
+        .ts_dline                       = -1,
+        .reload_ctl                     = -1,
+        .ahbcfg                         = -1,
+        .uframe_sched                   = -1,
+        .external_id_pin_ctl            = -1,
+        .hibernation                    = -1,
+};
+
+const struct of_device_id dwc2_of_match_table[] = {
+        { .compatible = "brcm,bcm2835-usb", .data = &params_bcm2835 },
+        { .compatible = "hisilicon,hi6220-usb", .data = &params_hi6220 },
+        { .compatible = "rockchip,rk3066-usb", .data = &params_rk3066 },
+        { .compatible = "lantiq,arx100-usb", .data = &params_ltq },
+        { .compatible = "lantiq,xrx200-usb", .data = &params_ltq },
+        { .compatible = "snps,dwc2", .data = NULL },
+        { .compatible = "samsung,s3c6400-hsotg", .data = NULL},
+        { .compatible = "amlogic,meson8b-usb", .data = &params_amlogic },
+        { .compatible = "amlogic,meson-gxbb-usb", .data = &params_amlogic },
+        { .compatible = "amcc,dwc-otg", .data = NULL },
+        {},
+};
+MODULE_DEVICE_TABLE(of, dwc2_of_match_table);
+
+static void dwc2_get_device_property(struct dwc2_hsotg *hsotg,
+                                     char *property, u8 size, u64 *value)
+{
+        u8 val8;
+        u16 val16;
+        u32 val32;
+
+        switch (size) {
+        case 0:
+                *value = device_property_read_bool(hsotg->dev, property);
+                break;
+        case 1:
+                if (device_property_read_u8(hsotg->dev, property, &val8))
+                        return;
+
+                *value = val8;
+                break;
+        case 2:
+                if (device_property_read_u16(hsotg->dev, property, &val16))
+                        return;
+
+                *value = val16;
+                break;
+        case 4:
+                if (device_property_read_u32(hsotg->dev, property, &val32))
+                        return;
+
+                *value = val32;
+                break;
+        case 8:
+                if (device_property_read_u64(hsotg->dev, property, value))
+                        return;
+
+                break;
+        default:
+                /*
+                 * The size is checked by the only function that calls
+                 * this so this should never happen.
+                 */
+                WARN_ON(1);
+                return;
+        }
+}
+
+static void dwc2_set_core_param(void *param, u8 size, u64 value)
+{
+        switch (size) {
+        case 0:
+                *((bool *)param) = !!value;
+                break;
+        case 1:
+                *((u8 *)param) = (u8)value;
+                break;
+        case 2:
+                *((u16 *)param) = (u16)value;
+                break;
+        case 4:
+                *((u32 *)param) = (u32)value;
+                break;
+        case 8:
+                *((u64 *)param) = (u64)value;
+                break;
+        default:
+                /*
+                 * The size is checked by the only function that calls
+                 * this so this should never happen.
+                 */
+                WARN_ON(1);
+                return;
+        }
+}
+
+/**
+ * dwc2_set_param() - Set a core parameter
+ *
+ * @hsotg: Programming view of the DWC_otg controller
+ * @param: Pointer to the parameter to set
+ * @lookup: True if the property should be looked up
+ * @property: The device property to read
+ * @legacy: The param value to set if @property is not available. This
+ *          will typically be the legacy value set in the static
+ *          params structure.
+ * @def: The default value
+ * @min: The minimum value
+ * @max: The maximum value
+ * @size: The size of the core parameter in bytes, or 0 for bool.
+ *
+ * This function looks up @property and sets the @param to that value.
+ * If the property doesn't exist it uses the passed-in @value. It will
+ * verify that the value falls between @min and @max. If it doesn't,
+ * it will output an error and set the parameter to either @def or,
+ * failing that, to @min.
+ *
+ * The @size is used to write to @param and to query the device
+ * properties so that this same function can be used with different
+ * types of parameters.
+ */
+static void dwc2_set_param(struct dwc2_hsotg *hsotg, void *param,
+                           bool lookup, char *property, u64 legacy,
+                           u64 def, u64 min, u64 max, u8 size)
+{
+        u64 sizemax;
+        u64 value;
+
+        if (WARN_ON(!hsotg || !param || !property))
+                return;
+
+        if (WARN((size > 8) || ((size & (size - 1)) != 0),
+                 "Invalid size %d for %s\n", size, property))
+                return;
+
+        dev_vdbg(hsotg->dev, "%s: Setting %s: legacy=%llu, def=%llu, min=%llu, max=%llu, size=%d\n",
+                 __func__, property, legacy, def, min, max, size);
+
+        sizemax = (1ULL << (size * 8)) - 1;
+        value = legacy;
+
+        /* Override legacy settings. */
+        if (lookup)
+                dwc2_get_device_property(hsotg, property, size, &value);
+
+        /*
+         * While the value is not valid, try setting it to the default
+         * value, and failing that, set it to the minimum.
+         */
+        while ((value < min) || (value > max)) {
+                /* Print an error unless the value is set to auto. */
+                if (value != sizemax)
+                        dev_err(hsotg->dev, "Invalid value %llu for param %s\n",
+                                value, property);
+
+                /*
+                 * If we are already the default, just set it to the
+                 * minimum.
+                 */
+                if (value == def) {
+                        dev_vdbg(hsotg->dev, "%s: setting value to min=%llu\n",
+                                 __func__, min);
+                        value = min;
+                        break;
+                }
+
+                /* Try the default value */
+                dev_vdbg(hsotg->dev, "%s: setting value to default=%llu\n",
+                         __func__, def);
+                value = def;
+        }
+
+        dev_dbg(hsotg->dev, "Setting %s to %llu\n", property, value);
+        dwc2_set_core_param(param, size, value);
+}
+
+/**
+ * dwc2_set_param_u16() - Set a u16 parameter
+ *
+ * See dwc2_set_param().
+ */
+static void dwc2_set_param_u16(struct dwc2_hsotg *hsotg, u16 *param,
+                               bool lookup, char *property, u16 legacy,
+                               u16 def, u16 min, u16 max)
+{
+        dwc2_set_param(hsotg, param, lookup, property,
+                       legacy, def, min, max, 2);
+}
+
+/**
+ * dwc2_set_param_bool() - Set a bool parameter
+ *
+ * See dwc2_set_param().
+ *
+ * Note: there is no 'legacy' argument here because there is no legacy
+ * source of bool params.
+ */
+static void dwc2_set_param_bool(struct dwc2_hsotg *hsotg, bool *param,
+                                bool lookup, char *property,
+                                bool def, bool min, bool max)
+{
+        dwc2_set_param(hsotg, param, lookup, property,
+                       def, def, min, max, 0);
+}
+
+#define DWC2_OUT_OF_BOUNDS(a, b, c)     ((a) < (b) || (a) > (c))
+
+/* Parameter access functions */
+static void dwc2_set_param_otg_cap(struct dwc2_hsotg *hsotg, int val)
+{
+        int valid = 1;
+
+        switch (val) {
+        case DWC2_CAP_PARAM_HNP_SRP_CAPABLE:
+                if (hsotg->hw_params.op_mode != GHWCFG2_OP_MODE_HNP_SRP_CAPABLE)
+                        valid = 0;
+                break;
+        case DWC2_CAP_PARAM_SRP_ONLY_CAPABLE:
+                switch (hsotg->hw_params.op_mode) {
+                case GHWCFG2_OP_MODE_HNP_SRP_CAPABLE:
+                case GHWCFG2_OP_MODE_SRP_ONLY_CAPABLE:
+                case GHWCFG2_OP_MODE_SRP_CAPABLE_DEVICE:
+                case GHWCFG2_OP_MODE_SRP_CAPABLE_HOST:
+                        break;
+                default:
+                        valid = 0;
+                        break;
+                }
+                break;
+        case DWC2_CAP_PARAM_NO_HNP_SRP_CAPABLE:
+                /* always valid */
+                break;
+        default:
+                valid = 0;
+                break;
+        }
+
+        if (!valid) {
+                if (val >= 0)
+                        dev_err(hsotg->dev,
+                                "%d invalid for otg_cap parameter. Check HW configuration.\n",
+                                val);
+                switch (hsotg->hw_params.op_mode) {
+                case GHWCFG2_OP_MODE_HNP_SRP_CAPABLE:
+                        val = DWC2_CAP_PARAM_HNP_SRP_CAPABLE;
+                        break;
+                case GHWCFG2_OP_MODE_SRP_ONLY_CAPABLE:
+                case GHWCFG2_OP_MODE_SRP_CAPABLE_DEVICE:
+                case GHWCFG2_OP_MODE_SRP_CAPABLE_HOST:
+                        val = DWC2_CAP_PARAM_SRP_ONLY_CAPABLE;
+                        break;
+                default:
+                        val = DWC2_CAP_PARAM_NO_HNP_SRP_CAPABLE;
+                        break;
+                }
+                dev_dbg(hsotg->dev, "Setting otg_cap to %d\n", val);
+        }
+
+        hsotg->params.otg_cap = val;
+}
+
+static void dwc2_set_param_dma_desc_enable(struct dwc2_hsotg *hsotg, int val)
+{
+        int valid = 1;
+
+        if (val > 0 && (hsotg->params.host_dma <= 0 ||
+                        !hsotg->hw_params.dma_desc_enable))
+                valid = 0;
+        if (val < 0)
+                valid = 0;
+
+        if (!valid) {
+                if (val >= 0)
+                        dev_err(hsotg->dev,
+                                "%d invalid for dma_desc_enable parameter. Check HW configuration.\n",
+                                val);
+                val = (hsotg->params.host_dma > 0 &&
+                        hsotg->hw_params.dma_desc_enable);
+                dev_dbg(hsotg->dev, "Setting dma_desc_enable to %d\n", val);
+        }
+
+        hsotg->params.dma_desc_enable = val;
+}
+
+static void dwc2_set_param_dma_desc_fs_enable(struct dwc2_hsotg *hsotg, int val)
+{
+        int valid = 1;
+
+        if (val > 0 && (hsotg->params.host_dma <= 0 ||
+                        !hsotg->hw_params.dma_desc_enable))
+                valid = 0;
+        if (val < 0)
+                valid = 0;
+
+        if (!valid) {
+                if (val >= 0)
+                        dev_err(hsotg->dev,
+                                "%d invalid for dma_desc_fs_enable parameter. Check HW configuration.\n",
+                                val);
+                val = (hsotg->params.host_dma > 0 &&
+                        hsotg->hw_params.dma_desc_enable);
+        }
+
+        hsotg->params.dma_desc_fs_enable = val;
+        dev_dbg(hsotg->dev, "Setting dma_desc_fs_enable to %d\n", val);
+}
+
+static void
+dwc2_set_param_host_support_fs_ls_low_power(struct dwc2_hsotg *hsotg,
+                                            int val)
+{
+        if (DWC2_OUT_OF_BOUNDS(val, 0, 1)) {
+                if (val >= 0) {
+                        dev_err(hsotg->dev,
+                                "Wrong value for host_support_fs_low_power\n");
+                        dev_err(hsotg->dev,
+                                "host_support_fs_low_power must be 0 or 1\n");
+                }
+                val = 0;
+                dev_dbg(hsotg->dev,
+                        "Setting host_support_fs_low_power to %d\n", val);
+        }
+
+        hsotg->params.host_support_fs_ls_low_power = val;
+}
+
+static void dwc2_set_param_enable_dynamic_fifo(struct dwc2_hsotg *hsotg,
+                                               int val)
+{
+        int valid = 1;
+
+        if (val > 0 && !hsotg->hw_params.enable_dynamic_fifo)
+                valid = 0;
+        if (val < 0)
+                valid = 0;
+
+        if (!valid) {
+                if (val >= 0)
+                        dev_err(hsotg->dev,
+                                "%d invalid for enable_dynamic_fifo parameter. Check HW configuration.\n",
+                                val);
+                val = hsotg->hw_params.enable_dynamic_fifo;
+                dev_dbg(hsotg->dev, "Setting enable_dynamic_fifo to %d\n", val);
+        }
+
+        hsotg->params.enable_dynamic_fifo = val;
+}
+
+static void dwc2_set_param_host_rx_fifo_size(struct dwc2_hsotg *hsotg, int val)
+{
+        int valid = 1;
+
+        if (val < 16 || val > hsotg->hw_params.rx_fifo_size)
+                valid = 0;
+
+        if (!valid) {
+                if (val >= 0)
+                        dev_err(hsotg->dev,
+                                "%d invalid for host_rx_fifo_size. Check HW configuration.\n",
+                                val);
+                val = hsotg->hw_params.rx_fifo_size;
+                dev_dbg(hsotg->dev, "Setting host_rx_fifo_size to %d\n", val);
+        }
+
+        hsotg->params.host_rx_fifo_size = val;
+}
+
+static void dwc2_set_param_host_nperio_tx_fifo_size(struct dwc2_hsotg *hsotg,
+                                                    int val)
+{
+        int valid = 1;
+
+        if (val < 16 || val > hsotg->hw_params.host_nperio_tx_fifo_size)
+                valid = 0;
+
+        if (!valid) {
+                if (val >= 0)
+                        dev_err(hsotg->dev,
+                                "%d invalid for host_nperio_tx_fifo_size. Check HW configuration.\n",
+                                val);
+                val = hsotg->hw_params.host_nperio_tx_fifo_size;
+                dev_dbg(hsotg->dev, "Setting host_nperio_tx_fifo_size to %d\n",
+                        val);
+        }
+
+        hsotg->params.host_nperio_tx_fifo_size = val;
+}
+
+static void dwc2_set_param_host_perio_tx_fifo_size(struct dwc2_hsotg *hsotg,
+                                                   int val)
+{
+        int valid = 1;
+
+        if (val < 16 || val > hsotg->hw_params.host_perio_tx_fifo_size)
+                valid = 0;
+
+        if (!valid) {
+                if (val >= 0)
+                        dev_err(hsotg->dev,
+                                "%d invalid for host_perio_tx_fifo_size. Check HW configuration.\n",
+                                val);
+                val = hsotg->hw_params.host_perio_tx_fifo_size;
+                dev_dbg(hsotg->dev, "Setting host_perio_tx_fifo_size to %d\n",
+                        val);
+        }
+
+        hsotg->params.host_perio_tx_fifo_size = val;
+}
+
+static void dwc2_set_param_max_transfer_size(struct dwc2_hsotg *hsotg, int val)
+{
+        int valid = 1;
+
+        if (val < 2047 || val > hsotg->hw_params.max_transfer_size)
+                valid = 0;
+
+        if (!valid) {
+                if (val >= 0)
+                        dev_err(hsotg->dev,
+                                "%d invalid for max_transfer_size. Check HW configuration.\n",
+                                val);
+                val = hsotg->hw_params.max_transfer_size;
+                dev_dbg(hsotg->dev, "Setting max_transfer_size to %d\n", val);
+        }
+
+        hsotg->params.max_transfer_size = val;
+}
+
+static void dwc2_set_param_max_packet_count(struct dwc2_hsotg *hsotg, int val)
+{
+        int valid = 1;
+
+        if (val < 15 || val > hsotg->hw_params.max_packet_count)
+                valid = 0;
+
+        if (!valid) {
+                if (val >= 0)
+                        dev_err(hsotg->dev,
+                                "%d invalid for max_packet_count. Check HW configuration.\n",
+                                val);
+                val = hsotg->hw_params.max_packet_count;
+                dev_dbg(hsotg->dev, "Setting max_packet_count to %d\n", val);
+        }
+
+        hsotg->params.max_packet_count = val;
+}
+
+static void dwc2_set_param_host_channels(struct dwc2_hsotg *hsotg, int val)
+{
+        int valid = 1;
+
+        if (val < 1 || val > hsotg->hw_params.host_channels)
+                valid = 0;
+
+        if (!valid) {
+                if (val >= 0)
+                        dev_err(hsotg->dev,
+                                "%d invalid for host_channels. Check HW configuration.\n",
+                                val);
+                val = hsotg->hw_params.host_channels;
+                dev_dbg(hsotg->dev, "Setting host_channels to %d\n", val);
+        }
+
+        hsotg->params.host_channels = val;
+}
+
+static void dwc2_set_param_phy_type(struct dwc2_hsotg *hsotg, int val)
+{
+        int valid = 0;
+        u32 hs_phy_type, fs_phy_type;
+
+        if (DWC2_OUT_OF_BOUNDS(val, DWC2_PHY_TYPE_PARAM_FS,
+                               DWC2_PHY_TYPE_PARAM_ULPI)) {
+                if (val >= 0) {
+                        dev_err(hsotg->dev, "Wrong value for phy_type\n");
+                        dev_err(hsotg->dev, "phy_type must be 0, 1 or 2\n");
+                }
+
+                valid = 0;
+        }
+
+        hs_phy_type = hsotg->hw_params.hs_phy_type;
+        fs_phy_type = hsotg->hw_params.fs_phy_type;
+        if (val == DWC2_PHY_TYPE_PARAM_UTMI &&
+            (hs_phy_type == GHWCFG2_HS_PHY_TYPE_UTMI ||
+             hs_phy_type == GHWCFG2_HS_PHY_TYPE_UTMI_ULPI))
+                valid = 1;
+        else if (val == DWC2_PHY_TYPE_PARAM_ULPI &&
+                 (hs_phy_type == GHWCFG2_HS_PHY_TYPE_ULPI ||
+                  hs_phy_type == GHWCFG2_HS_PHY_TYPE_UTMI_ULPI))
+                valid = 1;
+        else if (val == DWC2_PHY_TYPE_PARAM_FS &&
+                 fs_phy_type == GHWCFG2_FS_PHY_TYPE_DEDICATED)
+                valid = 1;
+
+        if (!valid) {
+                if (val >= 0)
+                        dev_err(hsotg->dev,
+                                "%d invalid for phy_type. Check HW configuration.\n",
+                                val);
+                val = DWC2_PHY_TYPE_PARAM_FS;
+                if (hs_phy_type != GHWCFG2_HS_PHY_TYPE_NOT_SUPPORTED) {
+                        if (hs_phy_type == GHWCFG2_HS_PHY_TYPE_UTMI ||
+                            hs_phy_type == GHWCFG2_HS_PHY_TYPE_UTMI_ULPI)
+                                val = DWC2_PHY_TYPE_PARAM_UTMI;
+                        else
+                                val = DWC2_PHY_TYPE_PARAM_ULPI;
+                }
+                dev_dbg(hsotg->dev, "Setting phy_type to %d\n", val);
+        }
+
+        hsotg->params.phy_type = val;
+}
+
+static int dwc2_get_param_phy_type(struct dwc2_hsotg *hsotg)
+{
+        return hsotg->params.phy_type;
+}
+
+static void dwc2_set_param_speed(struct dwc2_hsotg *hsotg, int val)
+{
+        int valid = 1;
+
+        if (DWC2_OUT_OF_BOUNDS(val, 0, 2)) {
+                if (val >= 0) {
+                        dev_err(hsotg->dev, "Wrong value for speed parameter\n");
+                        dev_err(hsotg->dev, "max_speed parameter must be 0, 1, or 2\n");
+                }
+                valid = 0;
+        }
+
+        if (dwc2_is_hs_iot(hsotg) &&
+            val == DWC2_SPEED_PARAM_LOW)
+                valid = 0;
+
+        if (val == DWC2_SPEED_PARAM_HIGH &&
+            dwc2_get_param_phy_type(hsotg) == DWC2_PHY_TYPE_PARAM_FS)
+                valid = 0;
+
+        if (!valid) {
+                if (val >= 0)
+                        dev_err(hsotg->dev,
+                                "%d invalid for speed parameter. Check HW configuration.\n",
+                                val);
+                val = dwc2_get_param_phy_type(hsotg) == DWC2_PHY_TYPE_PARAM_FS ?
+                                DWC2_SPEED_PARAM_FULL : DWC2_SPEED_PARAM_HIGH;
+                dev_dbg(hsotg->dev, "Setting speed to %d\n", val);
+        }
+
+        hsotg->params.speed = val;
+}
+
+static void dwc2_set_param_host_ls_low_power_phy_clk(struct dwc2_hsotg *hsotg,
+                                                     int val)
+{
+        int valid = 1;
+
+        if (DWC2_OUT_OF_BOUNDS(val, DWC2_HOST_LS_LOW_POWER_PHY_CLK_PARAM_48MHZ,
+                               DWC2_HOST_LS_LOW_POWER_PHY_CLK_PARAM_6MHZ)) {
+                if (val >= 0) {
+                        dev_err(hsotg->dev,
+                                "Wrong value for host_ls_low_power_phy_clk parameter\n");
+                        dev_err(hsotg->dev,
+                                "host_ls_low_power_phy_clk must be 0 or 1\n");
+                }
+                valid = 0;
+        }
+
+        if (val == DWC2_HOST_LS_LOW_POWER_PHY_CLK_PARAM_48MHZ &&
+            dwc2_get_param_phy_type(hsotg) == DWC2_PHY_TYPE_PARAM_FS)
+                valid = 0;
+
+        if (!valid) {
+                if (val >= 0)
+                        dev_err(hsotg->dev,
+                                "%d invalid for host_ls_low_power_phy_clk. Check HW configuration.\n",
+                                val);
+                val = dwc2_get_param_phy_type(hsotg) == DWC2_PHY_TYPE_PARAM_FS
+                        ? DWC2_HOST_LS_LOW_POWER_PHY_CLK_PARAM_6MHZ
+                        : DWC2_HOST_LS_LOW_POWER_PHY_CLK_PARAM_48MHZ;
+                dev_dbg(hsotg->dev, "Setting host_ls_low_power_phy_clk to %d\n",
+                        val);
+        }
+
+        hsotg->params.host_ls_low_power_phy_clk = val;
+}
+
+static void dwc2_set_param_phy_ulpi_ddr(struct dwc2_hsotg *hsotg, int val)
+{
+        if (DWC2_OUT_OF_BOUNDS(val, 0, 1)) {
+                if (val >= 0) {
+                        dev_err(hsotg->dev, "Wrong value for phy_ulpi_ddr\n");
+                        dev_err(hsotg->dev, "phy_upli_ddr must be 0 or 1\n");
+                }
+                val = 0;
+                dev_dbg(hsotg->dev, "Setting phy_upli_ddr to %d\n", val);
+        }
+
+        hsotg->params.phy_ulpi_ddr = val;
+}
+
+static void dwc2_set_param_phy_ulpi_ext_vbus(struct dwc2_hsotg *hsotg, int val)
+{
+        if (DWC2_OUT_OF_BOUNDS(val, 0, 1)) {
+                if (val >= 0) {
+                        dev_err(hsotg->dev,
+                                "Wrong value for phy_ulpi_ext_vbus\n");
+                        dev_err(hsotg->dev,
+                                "phy_ulpi_ext_vbus must be 0 or 1\n");
+                }
+                val = 0;
+                dev_dbg(hsotg->dev, "Setting phy_ulpi_ext_vbus to %d\n", val);
+        }
+
+        hsotg->params.phy_ulpi_ext_vbus = val;
+}
+
+static void dwc2_set_param_phy_utmi_width(struct dwc2_hsotg *hsotg, int val)
+{
+        int valid = 0;
+
+        switch (hsotg->hw_params.utmi_phy_data_width) {
+        case GHWCFG4_UTMI_PHY_DATA_WIDTH_8:
+                valid = (val == 8);
+                break;
+        case GHWCFG4_UTMI_PHY_DATA_WIDTH_16:
+                valid = (val == 16);
+                break;
+        case GHWCFG4_UTMI_PHY_DATA_WIDTH_8_OR_16:
+                valid = (val == 8 || val == 16);
+                break;
+        }
+
+        if (!valid) {
+                if (val >= 0) {
+                        dev_err(hsotg->dev,
+                                "%d invalid for phy_utmi_width. Check HW configuration.\n",
+                                val);
+                }
+                val = (hsotg->hw_params.utmi_phy_data_width ==
+                       GHWCFG4_UTMI_PHY_DATA_WIDTH_8) ? 8 : 16;
+                dev_dbg(hsotg->dev, "Setting phy_utmi_width to %d\n", val);
+        }
+
+        hsotg->params.phy_utmi_width = val;
+}
+
+static void dwc2_set_param_ulpi_fs_ls(struct dwc2_hsotg *hsotg, int val)
+{
+        if (DWC2_OUT_OF_BOUNDS(val, 0, 1)) {
+                if (val >= 0) {
+                        dev_err(hsotg->dev, "Wrong value for ulpi_fs_ls\n");
+                        dev_err(hsotg->dev, "ulpi_fs_ls must be 0 or 1\n");
+                }
+                val = 0;
+                dev_dbg(hsotg->dev, "Setting ulpi_fs_ls to %d\n", val);
+        }
+
+        hsotg->params.ulpi_fs_ls = val;
+}
+
+static void dwc2_set_param_ts_dline(struct dwc2_hsotg *hsotg, int val)
+{
+        if (DWC2_OUT_OF_BOUNDS(val, 0, 1)) {
+                if (val >= 0) {
+                        dev_err(hsotg->dev, "Wrong value for ts_dline\n");
+                        dev_err(hsotg->dev, "ts_dline must be 0 or 1\n");
+                }
+                val = 0;
+                dev_dbg(hsotg->dev, "Setting ts_dline to %d\n", val);
+        }
+
+        hsotg->params.ts_dline = val;
+}
+
+static void dwc2_set_param_i2c_enable(struct dwc2_hsotg *hsotg, int val)
+{
+        int valid = 1;
+
+        if (DWC2_OUT_OF_BOUNDS(val, 0, 1)) {
+                if (val >= 0) {
+                        dev_err(hsotg->dev, "Wrong value for i2c_enable\n");
+                        dev_err(hsotg->dev, "i2c_enable must be 0 or 1\n");
+                }
+
+                valid = 0;
+        }
+
+        if (val == 1 && !(hsotg->hw_params.i2c_enable))
+                valid = 0;
+
+        if (!valid) {
+                if (val >= 0)
+                        dev_err(hsotg->dev,
+                                "%d invalid for i2c_enable. Check HW configuration.\n",
+                                val);
+                val = hsotg->hw_params.i2c_enable;
+                dev_dbg(hsotg->dev, "Setting i2c_enable to %d\n", val);
+        }
+
+        hsotg->params.i2c_enable = val;
+}
+
+static void dwc2_set_param_en_multiple_tx_fifo(struct dwc2_hsotg *hsotg,
+                                               int val)
+{
+        int valid = 1;
+
+        if (DWC2_OUT_OF_BOUNDS(val, 0, 1)) {
+                if (val >= 0) {
+                        dev_err(hsotg->dev,
+                                "Wrong value for en_multiple_tx_fifo,\n");
+                        dev_err(hsotg->dev,
+                                "en_multiple_tx_fifo must be 0 or 1\n");
+                }
+                valid = 0;
+        }
+
+        if (val == 1 && !hsotg->hw_params.en_multiple_tx_fifo)
+                valid = 0;
+
+        if (!valid) {
+                if (val >= 0)
+                        dev_err(hsotg->dev,
+                                "%d invalid for parameter en_multiple_tx_fifo. Check HW configuration.\n",
+                                val);
+                val = hsotg->hw_params.en_multiple_tx_fifo;
+                dev_dbg(hsotg->dev, "Setting en_multiple_tx_fifo to %d\n", val);
+        }
+
+        hsotg->params.en_multiple_tx_fifo = val;
+}
+
+static void dwc2_set_param_reload_ctl(struct dwc2_hsotg *hsotg, int val)
+{
+        int valid = 1;
+
+        if (DWC2_OUT_OF_BOUNDS(val, 0, 1)) {
+                if (val >= 0) {
+                        dev_err(hsotg->dev,
+                                "'%d' invalid for parameter reload_ctl\n", val);
+                        dev_err(hsotg->dev, "reload_ctl must be 0 or 1\n");
+                }
+                valid = 0;
+        }
+
+        if (val == 1 && hsotg->hw_params.snpsid < DWC2_CORE_REV_2_92a)
+                valid = 0;
+
+        if (!valid) {
+                if (val >= 0)
+                        dev_err(hsotg->dev,
+                                "%d invalid for parameter reload_ctl. Check HW configuration.\n",
+                                val);
+                val = hsotg->hw_params.snpsid >= DWC2_CORE_REV_2_92a;
+                dev_dbg(hsotg->dev, "Setting reload_ctl to %d\n", val);
+        }
+
+        hsotg->params.reload_ctl = val;
+}
+
+static void dwc2_set_param_ahbcfg(struct dwc2_hsotg *hsotg, int val)
+{
+        if (val != -1)
+                hsotg->params.ahbcfg = val;
+        else
+                hsotg->params.ahbcfg = GAHBCFG_HBSTLEN_INCR4 <<
+                                                GAHBCFG_HBSTLEN_SHIFT;
+}
+
+static void dwc2_set_param_otg_ver(struct dwc2_hsotg *hsotg, int val)
+{
+        if (DWC2_OUT_OF_BOUNDS(val, 0, 1)) {
+                if (val >= 0) {
+                        dev_err(hsotg->dev,
+                                "'%d' invalid for parameter otg_ver\n", val);
+                        dev_err(hsotg->dev,
+                                "otg_ver must be 0 (for OTG 1.3 support) or 1 (for OTG 2.0 support)\n");
+                }
+                val = 0;
+                dev_dbg(hsotg->dev, "Setting otg_ver to %d\n", val);
+        }
+
+        hsotg->params.otg_ver = val;
+}
+
+static void dwc2_set_param_uframe_sched(struct dwc2_hsotg *hsotg, int val)
+{
+        if (DWC2_OUT_OF_BOUNDS(val, 0, 1)) {
+                if (val >= 0) {
+                        dev_err(hsotg->dev,
+                                "'%d' invalid for parameter uframe_sched\n",
+                                val);
+                        dev_err(hsotg->dev, "uframe_sched must be 0 or 1\n");
+                }
+                val = 1;
+                dev_dbg(hsotg->dev, "Setting uframe_sched to %d\n", val);
+        }
+
+        hsotg->params.uframe_sched = val;
+}
+
+static void dwc2_set_param_external_id_pin_ctl(struct dwc2_hsotg *hsotg,
+                                               int val)
+{
+        if (DWC2_OUT_OF_BOUNDS(val, 0, 1)) {
+                if (val >= 0) {
+                        dev_err(hsotg->dev,
+                                "'%d' invalid for parameter external_id_pin_ctl\n",
+                                val);
+                        dev_err(hsotg->dev, "external_id_pin_ctl must be 0 or 1\n");
+                }
+                val = 0;
+                dev_dbg(hsotg->dev, "Setting external_id_pin_ctl to %d\n", val);
+        }
+
+        hsotg->params.external_id_pin_ctl = val;
+}
+
+static void dwc2_set_param_hibernation(struct dwc2_hsotg *hsotg,
+                                       int val)
+{
+        if (DWC2_OUT_OF_BOUNDS(val, 0, 1)) {
+                if (val >= 0) {
+                        dev_err(hsotg->dev,
+                                "'%d' invalid for parameter hibernation\n",
+                                val);
+                        dev_err(hsotg->dev, "hibernation must be 0 or 1\n");
+                }
+                val = 0;
+                dev_dbg(hsotg->dev, "Setting hibernation to %d\n", val);
+        }
+
+        hsotg->params.hibernation = val;
+}
+
+static void dwc2_set_param_tx_fifo_sizes(struct dwc2_hsotg *hsotg)
+{
+        int i;
+        int num;
+        char *property = "g-tx-fifo-size";
+        struct dwc2_core_params *p = &hsotg->params;
+
+        memset(p->g_tx_fifo_size, 0, sizeof(p->g_tx_fifo_size));
+
+        /* Read tx fifo sizes */
+        num = device_property_read_u32_array(hsotg->dev, property, NULL, 0);
+
+        if (num > 0) {
+                device_property_read_u32_array(hsotg->dev, property,
+                                               &p->g_tx_fifo_size[1],
+                                               num);
+        } else {
+                u32 p_tx_fifo[] = DWC2_G_P_LEGACY_TX_FIFO_SIZE;
+
+                memcpy(&p->g_tx_fifo_size[1],
+                       p_tx_fifo,
+                       sizeof(p_tx_fifo));
+
+                num = ARRAY_SIZE(p_tx_fifo);
+        }
+
+        for (i = 0; i < num; i++) {
+                if ((i + 1) >= ARRAY_SIZE(p->g_tx_fifo_size))
+                        break;
+
+                dev_dbg(hsotg->dev, "Setting %s[%d] to %d\n",
+                        property, i + 1, p->g_tx_fifo_size[i + 1]);
+        }
+}
+
+static void dwc2_set_gadget_dma(struct dwc2_hsotg *hsotg)
+{
+        struct dwc2_hw_params *hw = &hsotg->hw_params;
+        struct dwc2_core_params *p = &hsotg->params;
+        bool dma_capable = !(hw->arch == GHWCFG2_SLAVE_ONLY_ARCH);
+
+        /* Buffer DMA */
+        dwc2_set_param_bool(hsotg, &p->g_dma,
+                            false, "gadget-dma",
+                            true, false,
+                            dma_capable);
+
+        /* DMA Descriptor */
+        dwc2_set_param_bool(hsotg, &p->g_dma_desc, false,
+                            "gadget-dma-desc",
+                            p->g_dma, false,
+                            !!hw->dma_desc_enable);
+}
+
+/**
+ * dwc2_set_parameters() - Set all core parameters.
+ *
+ * @hsotg: Programming view of the DWC_otg controller
+ * @params: The parameters to set
+ */
+static void dwc2_set_parameters(struct dwc2_hsotg *hsotg,
+                                const struct dwc2_core_params *params)
+{
+        struct dwc2_hw_params *hw = &hsotg->hw_params;
+        struct dwc2_core_params *p = &hsotg->params;
+        bool dma_capable = !(hw->arch == GHWCFG2_SLAVE_ONLY_ARCH);
+
+        dwc2_set_param_otg_cap(hsotg, params->otg_cap);
+        if ((hsotg->dr_mode == USB_DR_MODE_HOST) ||
+            (hsotg->dr_mode == USB_DR_MODE_OTG)) {
+                dev_dbg(hsotg->dev, "Setting HOST parameters\n");
+
+                dwc2_set_param_bool(hsotg, &p->host_dma,
+                                    false, "host-dma",
+                                    true, false,
+                                    dma_capable);
+        }
+        dwc2_set_param_dma_desc_enable(hsotg, params->dma_desc_enable);
+        dwc2_set_param_dma_desc_fs_enable(hsotg, params->dma_desc_fs_enable);
+
+        dwc2_set_param_host_support_fs_ls_low_power(hsotg,
+                        params->host_support_fs_ls_low_power);
+        dwc2_set_param_enable_dynamic_fifo(hsotg,
+                        params->enable_dynamic_fifo);
+        dwc2_set_param_host_rx_fifo_size(hsotg,
+                        params->host_rx_fifo_size);
+        dwc2_set_param_host_nperio_tx_fifo_size(hsotg,
+                        params->host_nperio_tx_fifo_size);
+        dwc2_set_param_host_perio_tx_fifo_size(hsotg,
+                        params->host_perio_tx_fifo_size);
+        dwc2_set_param_max_transfer_size(hsotg,
+                        params->max_transfer_size);
+        dwc2_set_param_max_packet_count(hsotg,
+                        params->max_packet_count);
+        dwc2_set_param_host_channels(hsotg, params->host_channels);
+        dwc2_set_param_phy_type(hsotg, params->phy_type);
+        dwc2_set_param_speed(hsotg, params->speed);
+        dwc2_set_param_host_ls_low_power_phy_clk(hsotg,
+                        params->host_ls_low_power_phy_clk);
+        dwc2_set_param_phy_ulpi_ddr(hsotg, params->phy_ulpi_ddr);
+        dwc2_set_param_phy_ulpi_ext_vbus(hsotg,
+                        params->phy_ulpi_ext_vbus);
+        dwc2_set_param_phy_utmi_width(hsotg, params->phy_utmi_width);
+        dwc2_set_param_ulpi_fs_ls(hsotg, params->ulpi_fs_ls);
+        dwc2_set_param_ts_dline(hsotg, params->ts_dline);
+        dwc2_set_param_i2c_enable(hsotg, params->i2c_enable);
+        dwc2_set_param_en_multiple_tx_fifo(hsotg,
+                        params->en_multiple_tx_fifo);
+        dwc2_set_param_reload_ctl(hsotg, params->reload_ctl);
+        dwc2_set_param_ahbcfg(hsotg, params->ahbcfg);
+        dwc2_set_param_otg_ver(hsotg, params->otg_ver);
+        dwc2_set_param_uframe_sched(hsotg, params->uframe_sched);
+        dwc2_set_param_external_id_pin_ctl(hsotg, params->external_id_pin_ctl);
+        dwc2_set_param_hibernation(hsotg, params->hibernation);
+
+        /*
+         * Set devicetree-only parameters. These parameters do not
+         * take any values from @params.
+         */
+        if ((hsotg->dr_mode == USB_DR_MODE_PERIPHERAL) ||
+            (hsotg->dr_mode == USB_DR_MODE_OTG)) {
+                dev_dbg(hsotg->dev, "Setting peripheral device properties\n");
+
+                dwc2_set_gadget_dma(hsotg);
+
+                /*
+                 * The values for g_rx_fifo_size (2048) and
+                 * g_np_tx_fifo_size (1024) come from the legacy s3c
+                 * gadget driver. These defaults have been hard-coded
+                 * for some time so many platforms depend on these
+                 * values. Leave them as defaults for now and only
+                 * auto-detect if the hardware does not support the
+                 * default.
+                 */
+                dwc2_set_param_u16(hsotg, &p->g_rx_fifo_size,
+                                   true, "g-rx-fifo-size", 2048,
+                                   hw->rx_fifo_size,
+                                   16, hw->rx_fifo_size);
+
+                dwc2_set_param_u16(hsotg, &p->g_np_tx_fifo_size,
+                                   true, "g-np-tx-fifo-size", 1024,
+                                   hw->dev_nperio_tx_fifo_size,
+                                   16, hw->dev_nperio_tx_fifo_size);
+
+                dwc2_set_param_tx_fifo_sizes(hsotg);
+        }
+}
+
+/*
+ * Gets host hardware parameters. Forces host mode if not currently in
+ * host mode. Should be called immediately after a core soft reset in
+ * order to get the reset values.
+ */
+static void dwc2_get_host_hwparams(struct dwc2_hsotg *hsotg)
+{
+        struct dwc2_hw_params *hw = &hsotg->hw_params;
+        u32 gnptxfsiz;
+        u32 hptxfsiz;
+        bool forced;
+
+        if (hsotg->dr_mode == USB_DR_MODE_PERIPHERAL)
+                return;
+
+        forced = dwc2_force_mode_if_needed(hsotg, true);
+
+        gnptxfsiz = dwc2_readl(hsotg->regs + GNPTXFSIZ);
+        hptxfsiz = dwc2_readl(hsotg->regs + HPTXFSIZ);
+        dev_dbg(hsotg->dev, "gnptxfsiz=%08x\n", gnptxfsiz);
+        dev_dbg(hsotg->dev, "hptxfsiz=%08x\n", hptxfsiz);
+
+        if (forced)
+                dwc2_clear_force_mode(hsotg);
+
+        hw->host_nperio_tx_fifo_size = (gnptxfsiz & FIFOSIZE_DEPTH_MASK) >>
+                                       FIFOSIZE_DEPTH_SHIFT;
+        hw->host_perio_tx_fifo_size = (hptxfsiz & FIFOSIZE_DEPTH_MASK) >>
+                                      FIFOSIZE_DEPTH_SHIFT;
+}
+
+/*
+ * Gets device hardware parameters. Forces device mode if not
+ * currently in device mode. Should be called immediately after a core
+ * soft reset in order to get the reset values.
+ */
+static void dwc2_get_dev_hwparams(struct dwc2_hsotg *hsotg)
+{
+        struct dwc2_hw_params *hw = &hsotg->hw_params;
+        bool forced;
+        u32 gnptxfsiz;
+
+        if (hsotg->dr_mode == USB_DR_MODE_HOST)
+                return;
+
+        forced = dwc2_force_mode_if_needed(hsotg, false);
+
+        gnptxfsiz = dwc2_readl(hsotg->regs + GNPTXFSIZ);
+        dev_dbg(hsotg->dev, "gnptxfsiz=%08x\n", gnptxfsiz);
+
+        if (forced)
+                dwc2_clear_force_mode(hsotg);
+
+        hw->dev_nperio_tx_fifo_size = (gnptxfsiz & FIFOSIZE_DEPTH_MASK) >>
+                                       FIFOSIZE_DEPTH_SHIFT;
+}
+
+/**
+ * During device initialization, read various hardware configuration
+ * registers and interpret the contents.
+ */
+int dwc2_get_hwparams(struct dwc2_hsotg *hsotg)
+{
+        struct dwc2_hw_params *hw = &hsotg->hw_params;
+        unsigned int width;
+        u32 hwcfg1, hwcfg2, hwcfg3, hwcfg4;
+        u32 grxfsiz;
+
+        /*
+         * Attempt to ensure this device is really a DWC_otg Controller.
+         * Read and verify the GSNPSID register contents. The value should be
+         * 0x45f42xxx or 0x45f43xxx, which corresponds to either "OT2" or "OT3",
+         * as in "OTG version 2.xx" or "OTG version 3.xx".
+         */
+        hw->snpsid = dwc2_readl(hsotg->regs + GSNPSID);
+        if ((hw->snpsid & 0xfffff000) != 0x4f542000 &&
+            (hw->snpsid & 0xfffff000) != 0x4f543000 &&
+            (hw->snpsid & 0xffff0000) != 0x55310000 &&
+            (hw->snpsid & 0xffff0000) != 0x55320000) {
+                dev_err(hsotg->dev, "Bad value for GSNPSID: 0x%08x\n",
+                        hw->snpsid);
+                return -ENODEV;
+        }
+
+        dev_dbg(hsotg->dev, "Core Release: %1x.%1x%1x%1x (snpsid=%x)\n",
+                hw->snpsid >> 12 & 0xf, hw->snpsid >> 8 & 0xf,
+                hw->snpsid >> 4 & 0xf, hw->snpsid & 0xf, hw->snpsid);
+
+        hwcfg1 = dwc2_readl(hsotg->regs + GHWCFG1);
+        hwcfg2 = dwc2_readl(hsotg->regs + GHWCFG2);
+        hwcfg3 = dwc2_readl(hsotg->regs + GHWCFG3);
+        hwcfg4 = dwc2_readl(hsotg->regs + GHWCFG4);
+        grxfsiz = dwc2_readl(hsotg->regs + GRXFSIZ);
+
+        dev_dbg(hsotg->dev, "hwcfg1=%08x\n", hwcfg1);
+        dev_dbg(hsotg->dev, "hwcfg2=%08x\n", hwcfg2);
+        dev_dbg(hsotg->dev, "hwcfg3=%08x\n", hwcfg3);
+        dev_dbg(hsotg->dev, "hwcfg4=%08x\n", hwcfg4);
+        dev_dbg(hsotg->dev, "grxfsiz=%08x\n", grxfsiz);
+
+        /*
+         * Host specific hardware parameters. Reading these parameters
+         * requires the controller to be in host mode. The mode will
+         * be forced, if necessary, to read these values.
+         */
+        dwc2_get_host_hwparams(hsotg);
+        dwc2_get_dev_hwparams(hsotg);
+
+        /* hwcfg1 */
+        hw->dev_ep_dirs = hwcfg1;
+
+        /* hwcfg2 */
+        hw->op_mode = (hwcfg2 & GHWCFG2_OP_MODE_MASK) >>
+                      GHWCFG2_OP_MODE_SHIFT;
+        hw->arch = (hwcfg2 & GHWCFG2_ARCHITECTURE_MASK) >>
+                   GHWCFG2_ARCHITECTURE_SHIFT;
+        hw->enable_dynamic_fifo = !!(hwcfg2 & GHWCFG2_DYNAMIC_FIFO);
+        hw->host_channels = 1 + ((hwcfg2 & GHWCFG2_NUM_HOST_CHAN_MASK) >>
+                                GHWCFG2_NUM_HOST_CHAN_SHIFT);
+        hw->hs_phy_type = (hwcfg2 & GHWCFG2_HS_PHY_TYPE_MASK) >>
+                          GHWCFG2_HS_PHY_TYPE_SHIFT;
+        hw->fs_phy_type = (hwcfg2 & GHWCFG2_FS_PHY_TYPE_MASK) >>
+                          GHWCFG2_FS_PHY_TYPE_SHIFT;
+        hw->num_dev_ep = (hwcfg2 & GHWCFG2_NUM_DEV_EP_MASK) >>
+                         GHWCFG2_NUM_DEV_EP_SHIFT;
+        hw->nperio_tx_q_depth =
+                (hwcfg2 & GHWCFG2_NONPERIO_TX_Q_DEPTH_MASK) >>
+                GHWCFG2_NONPERIO_TX_Q_DEPTH_SHIFT << 1;
+        hw->host_perio_tx_q_depth =
+                (hwcfg2 & GHWCFG2_HOST_PERIO_TX_Q_DEPTH_MASK) >>
+                GHWCFG2_HOST_PERIO_TX_Q_DEPTH_SHIFT << 1;
+        hw->dev_token_q_depth =
+                (hwcfg2 & GHWCFG2_DEV_TOKEN_Q_DEPTH_MASK) >>
+                GHWCFG2_DEV_TOKEN_Q_DEPTH_SHIFT;
+
+        /* hwcfg3 */
+        width = (hwcfg3 & GHWCFG3_XFER_SIZE_CNTR_WIDTH_MASK) >>
+                GHWCFG3_XFER_SIZE_CNTR_WIDTH_SHIFT;
+        hw->max_transfer_size = (1 << (width + 11)) - 1;
+        width = (hwcfg3 & GHWCFG3_PACKET_SIZE_CNTR_WIDTH_MASK) >>
+                GHWCFG3_PACKET_SIZE_CNTR_WIDTH_SHIFT;
+        hw->max_packet_count = (1 << (width + 4)) - 1;
+        hw->i2c_enable = !!(hwcfg3 & GHWCFG3_I2C);
+        hw->total_fifo_size = (hwcfg3 & GHWCFG3_DFIFO_DEPTH_MASK) >>
+                              GHWCFG3_DFIFO_DEPTH_SHIFT;
+
+        /* hwcfg4 */
+        hw->en_multiple_tx_fifo = !!(hwcfg4 & GHWCFG4_DED_FIFO_EN);
+        hw->num_dev_perio_in_ep = (hwcfg4 & GHWCFG4_NUM_DEV_PERIO_IN_EP_MASK) >>
+                                  GHWCFG4_NUM_DEV_PERIO_IN_EP_SHIFT;
+        hw->dma_desc_enable = !!(hwcfg4 & GHWCFG4_DESC_DMA);
+        hw->power_optimized = !!(hwcfg4 & GHWCFG4_POWER_OPTIMIZ);
+        hw->utmi_phy_data_width = (hwcfg4 & GHWCFG4_UTMI_PHY_DATA_WIDTH_MASK) >>
+                                  GHWCFG4_UTMI_PHY_DATA_WIDTH_SHIFT;
+
+        /* fifo sizes */
+        hw->rx_fifo_size = (grxfsiz & GRXFSIZ_DEPTH_MASK) >>
+                                GRXFSIZ_DEPTH_SHIFT;
+
+        dev_dbg(hsotg->dev, "Detected values from hardware:\n");
+        dev_dbg(hsotg->dev, "  op_mode=%d\n",
+                hw->op_mode);
+        dev_dbg(hsotg->dev, "  arch=%d\n",
+                hw->arch);
+        dev_dbg(hsotg->dev, "  dma_desc_enable=%d\n",
+                hw->dma_desc_enable);
+        dev_dbg(hsotg->dev, "  power_optimized=%d\n",
+                hw->power_optimized);
+        dev_dbg(hsotg->dev, "  i2c_enable=%d\n",
+                hw->i2c_enable);
+        dev_dbg(hsotg->dev, "  hs_phy_type=%d\n",
+                hw->hs_phy_type);
+        dev_dbg(hsotg->dev, "  fs_phy_type=%d\n",
+                hw->fs_phy_type);
+        dev_dbg(hsotg->dev, "  utmi_phy_data_width=%d\n",
+                hw->utmi_phy_data_width);
+        dev_dbg(hsotg->dev, "  num_dev_ep=%d\n",
+                hw->num_dev_ep);
+        dev_dbg(hsotg->dev, "  num_dev_perio_in_ep=%d\n",
+                hw->num_dev_perio_in_ep);
+        dev_dbg(hsotg->dev, "  host_channels=%d\n",
+                hw->host_channels);
+        dev_dbg(hsotg->dev, "  max_transfer_size=%d\n",
+                hw->max_transfer_size);
+        dev_dbg(hsotg->dev, "  max_packet_count=%d\n",
+                hw->max_packet_count);
+        dev_dbg(hsotg->dev, "  nperio_tx_q_depth=0x%0x\n",
+                hw->nperio_tx_q_depth);
+        dev_dbg(hsotg->dev, "  host_perio_tx_q_depth=0x%0x\n",
+                hw->host_perio_tx_q_depth);
+        dev_dbg(hsotg->dev, "  dev_token_q_depth=0x%0x\n",
+                hw->dev_token_q_depth);
+        dev_dbg(hsotg->dev, "  enable_dynamic_fifo=%d\n",
+                hw->enable_dynamic_fifo);
+        dev_dbg(hsotg->dev, "  en_multiple_tx_fifo=%d\n",
+                hw->en_multiple_tx_fifo);
+        dev_dbg(hsotg->dev, "  total_fifo_size=%d\n",
+                hw->total_fifo_size);
+        dev_dbg(hsotg->dev, "  rx_fifo_size=%d\n",
+                hw->rx_fifo_size);
+        dev_dbg(hsotg->dev, "  host_nperio_tx_fifo_size=%d\n",
+                hw->host_nperio_tx_fifo_size);
+        dev_dbg(hsotg->dev, "  host_perio_tx_fifo_size=%d\n",
+                hw->host_perio_tx_fifo_size);
+        dev_dbg(hsotg->dev, "\n");
+
+        return 0;
+}
+
+int dwc2_init_params(struct dwc2_hsotg *hsotg)
+{
+        const struct of_device_id *match;
+        struct dwc2_core_params params;
+
+        match = of_match_device(dwc2_of_match_table, hsotg->dev);
+        if (match && match->data)
+                params = *((struct dwc2_core_params *)match->data);
+        else
+                params = params_default;
+
+        if (dwc2_is_fs_iot(hsotg)) {
+                params.speed = DWC2_SPEED_PARAM_FULL;
+                params.phy_type = DWC2_PHY_TYPE_PARAM_FS;
+        }
+
+        dwc2_set_parameters(hsotg, &params);
+
+        return 0;
+}
diff --git a/drivers/usb/dwc2/pci.c b/drivers/usb/dwc2/pci.c
index ae419615a176..a23329e3d7cd 100644
--- a/drivers/usb/dwc2/pci.c
+++ b/drivers/usb/dwc2/pci.c
@@ -62,6 +62,20 @@ struct dwc2_pci_glue {
         struct platform_device *phy;
 };
 
+static int dwc2_pci_quirks(struct pci_dev *pdev, struct platform_device *dwc2)
+{
+        if (pdev->vendor == PCI_VENDOR_ID_SYNOPSYS &&
+            pdev->device == PCI_PRODUCT_ID_HAPS_HSOTG) {
+                struct property_entry properties[] = {
+                        { },
+                };
+
+                return platform_device_add_properties(dwc2, properties);
+        }
+
+        return 0;
+}
+
 static void dwc2_pci_remove(struct pci_dev *pci)
 {
         struct dwc2_pci_glue *glue = pci_get_drvdata(pci);
@@ -122,6 +136,10 @@ static int dwc2_pci_probe(struct pci_dev *pci,
                 return PTR_ERR(phy);
         }
 
+        ret = dwc2_pci_quirks(pci, dwc2);
+        if (ret)
+                goto err;
+
         ret = platform_device_add(dwc2);
         if (ret) {
                 dev_err(dev, "failed to register dwc2 device\n");
diff --git a/drivers/usb/dwc2/platform.c b/drivers/usb/dwc2/platform.c
index 8e1728b39a49..4fc8c603afb8 100644
--- a/drivers/usb/dwc2/platform.c
+++ b/drivers/usb/dwc2/platform.c
@@ -55,165 +55,6 @@
 
 static const char dwc2_driver_name[] = "dwc2";
 
-static const struct dwc2_core_params params_hi6220 = {
-        .otg_cap                        = 2,    /* No HNP/SRP capable */
-        .otg_ver                        = 0,    /* 1.3 */
-        .dma_enable                     = 1,
-        .dma_desc_enable                = 0,
-        .dma_desc_fs_enable             = 0,
-        .speed                          = 0,    /* High Speed */
-        .enable_dynamic_fifo            = 1,
-        .en_multiple_tx_fifo            = 1,
-        .host_rx_fifo_size              = 512,
-        .host_nperio_tx_fifo_size       = 512,
-        .host_perio_tx_fifo_size        = 512,
-        .max_transfer_size              = 65535,
-        .max_packet_count               = 511,
-        .host_channels                  = 16,
-        .phy_type                       = 1,    /* UTMI */
-        .phy_utmi_width                 = 8,
-        .phy_ulpi_ddr                   = 0,    /* Single */
-        .phy_ulpi_ext_vbus              = 0,
-        .i2c_enable                     = 0,
-        .ulpi_fs_ls                     = 0,
-        .host_support_fs_ls_low_power   = 0,
-        .host_ls_low_power_phy_clk      = 0,    /* 48 MHz */
-        .ts_dline                       = 0,
-        .reload_ctl                     = 0,
-        .ahbcfg                         = GAHBCFG_HBSTLEN_INCR16 <<
-                                          GAHBCFG_HBSTLEN_SHIFT,
-        .uframe_sched                   = 0,
-        .external_id_pin_ctl            = -1,
-        .hibernation                    = -1,
-};
-
-static const struct dwc2_core_params params_bcm2835 = {
-        .otg_cap                        = 0,    /* HNP/SRP capable */
-        .otg_ver                        = 0,    /* 1.3 */
-        .dma_enable                     = 1,
-        .dma_desc_enable                = 0,
-        .dma_desc_fs_enable             = 0,
-        .speed                          = 0,    /* High Speed */
-        .enable_dynamic_fifo            = 1,
-        .en_multiple_tx_fifo            = 1,
-        .host_rx_fifo_size              = 774,  /* 774 DWORDs */
-        .host_nperio_tx_fifo_size       = 256,  /* 256 DWORDs */
-        .host_perio_tx_fifo_size        = 512,  /* 512 DWORDs */
-        .max_transfer_size              = 65535,
-        .max_packet_count               = 511,
-        .host_channels                  = 8,
-        .phy_type                       = 1,    /* UTMI */
-        .phy_utmi_width                 = 8,    /* 8 bits */
-        .phy_ulpi_ddr                   = 0,    /* Single */
-        .phy_ulpi_ext_vbus              = 0,
-        .i2c_enable                     = 0,
-        .ulpi_fs_ls                     = 0,
-        .host_support_fs_ls_low_power   = 0,
-        .host_ls_low_power_phy_clk      = 0,    /* 48 MHz */
-        .ts_dline                       = 0,
-        .reload_ctl                     = 0,
-        .ahbcfg                         = 0x10,
-        .uframe_sched                   = 0,
-        .external_id_pin_ctl            = -1,
-        .hibernation                    = -1,
-};
-
-static const struct dwc2_core_params params_rk3066 = {
-        .otg_cap                        = 2,    /* non-HNP/non-SRP */
-        .otg_ver                        = -1,
-        .dma_enable                     = -1,
-        .dma_desc_enable                = 0,
-        .dma_desc_fs_enable             = 0,
-        .speed                          = -1,
-        .enable_dynamic_fifo            = 1,
-        .en_multiple_tx_fifo            = -1,
-        .host_rx_fifo_size              = 525,  /* 525 DWORDs */
-        .host_nperio_tx_fifo_size       = 128,  /* 128 DWORDs */
-        .host_perio_tx_fifo_size        = 256,  /* 256 DWORDs */
-        .max_transfer_size              = -1,
-        .max_packet_count               = -1,
-        .host_channels                  = -1,
-        .phy_type                       = -1,
-        .phy_utmi_width                 = -1,
-        .phy_ulpi_ddr                   = -1,
-        .phy_ulpi_ext_vbus              = -1,
-        .i2c_enable                     = -1,
-        .ulpi_fs_ls                     = -1,
-        .host_support_fs_ls_low_power   = -1,
-        .host_ls_low_power_phy_clk      = -1,
-        .ts_dline                       = -1,
-        .reload_ctl                     = -1,
-        .ahbcfg                         = GAHBCFG_HBSTLEN_INCR16 <<
-                                          GAHBCFG_HBSTLEN_SHIFT,
-        .uframe_sched                   = -1,
-        .external_id_pin_ctl            = -1,
-        .hibernation                    = -1,
-};
-
-static const struct dwc2_core_params params_ltq = {
-        .otg_cap                        = 2,    /* non-HNP/non-SRP */
-        .otg_ver                        = -1,
-        .dma_enable                     = -1,
-        .dma_desc_enable                = -1,
-        .dma_desc_fs_enable             = -1,
-        .speed                          = -1,
-        .enable_dynamic_fifo            = -1,
-        .en_multiple_tx_fifo            = -1,
-        .host_rx_fifo_size              = 288,  /* 288 DWORDs */
-        .host_nperio_tx_fifo_size       = 128,  /* 128 DWORDs */
-        .host_perio_tx_fifo_size        = 96,   /* 96 DWORDs */
-        .max_transfer_size              = 65535,
-        .max_packet_count               = 511,
-        .host_channels                  = -1,
-        .phy_type                       = -1,
-        .phy_utmi_width                 = -1,
-        .phy_ulpi_ddr                   = -1,
-        .phy_ulpi_ext_vbus              = -1,
-        .i2c_enable                     = -1,
-        .ulpi_fs_ls                     = -1,
-        .host_support_fs_ls_low_power   = -1,
-        .host_ls_low_power_phy_clk      = -1,
-        .ts_dline                       = -1,
-        .reload_ctl                     = -1,
-        .ahbcfg                         = GAHBCFG_HBSTLEN_INCR16 <<
-                                          GAHBCFG_HBSTLEN_SHIFT,
-        .uframe_sched                   = -1,
-        .external_id_pin_ctl            = -1,
-        .hibernation                    = -1,
-};
-
-static const struct dwc2_core_params params_amlogic = {
-        .otg_cap                        = DWC2_CAP_PARAM_NO_HNP_SRP_CAPABLE,
-        .otg_ver                        = -1,
-        .dma_enable                     = 1,
-        .dma_desc_enable                = 0,
-        .dma_desc_fs_enable             = 0,
-        .speed                          = DWC2_SPEED_PARAM_HIGH,
-        .enable_dynamic_fifo            = 1,
-        .en_multiple_tx_fifo            = -1,
-        .host_rx_fifo_size              = 512,
-        .host_nperio_tx_fifo_size       = 500,
-        .host_perio_tx_fifo_size        = 500,
-        .max_transfer_size              = -1,
-        .max_packet_count               = -1,
-        .host_channels                  = 16,
-        .phy_type                       = DWC2_PHY_TYPE_PARAM_UTMI,
-        .phy_utmi_width                 = -1,
-        .phy_ulpi_ddr                   = -1,
-        .phy_ulpi_ext_vbus              = -1,
-        .i2c_enable                     = -1,
-        .ulpi_fs_ls                     = -1,
-        .host_support_fs_ls_low_power   = -1,
-        .host_ls_low_power_phy_clk      = -1,
-        .ts_dline                       = -1,
-        .reload_ctl                     = 1,
-        .ahbcfg                         = GAHBCFG_HBSTLEN_INCR8 <<
-                                          GAHBCFG_HBSTLEN_SHIFT,
-        .uframe_sched                   = 0,
-        .external_id_pin_ctl            = -1,
-        .hibernation                    = -1,
-};
-
 /*
  * Check the dr_mode against the module configuration and hardware
  * capabilities.
@@ -510,20 +351,6 @@ static void dwc2_driver_shutdown(struct platform_device *dev)
         disable_irq(hsotg->irq);
 }
 
-static const struct of_device_id dwc2_of_match_table[] = {
-        { .compatible = "brcm,bcm2835-usb", .data = &params_bcm2835 },
-        { .compatible = "hisilicon,hi6220-usb", .data = &params_hi6220 },
-        { .compatible = "rockchip,rk3066-usb", .data = &params_rk3066 },
-        { .compatible = "lantiq,arx100-usb", .data = &params_ltq },
-        { .compatible = "lantiq,xrx200-usb", .data = &params_ltq },
-        { .compatible = "snps,dwc2", .data = NULL },
-        { .compatible = "samsung,s3c6400-hsotg", .data = NULL},
-        { .compatible = "amlogic,meson8b-usb", .data = &params_amlogic },
-        { .compatible = "amlogic,meson-gxbb-usb", .data = &params_amlogic },
-        {},
-};
-MODULE_DEVICE_TABLE(of, dwc2_of_match_table);
-
 /**
  * dwc2_driver_probe() - Called when the DWC_otg core is bound to the DWC_otg
  * driver
@@ -538,30 +365,10 @@ MODULE_DEVICE_TABLE(of, dwc2_of_match_table);
  */
 static int dwc2_driver_probe(struct platform_device *dev)
 {
-        const struct of_device_id *match;
-        const struct dwc2_core_params *params;
-        struct dwc2_core_params defparams;
         struct dwc2_hsotg *hsotg;
         struct resource *res;
         int retval;
 
-        match = of_match_device(dwc2_of_match_table, &dev->dev);
-        if (match && match->data) {
-                params = match->data;
-        } else {
-                /* Default all params to autodetect */
-                dwc2_set_all_params(&defparams, -1);
-                params = &defparams;
-
-                /*
-                 * Disable descriptor dma mode by default as the HW can support
-                 * it, but does not support it for SPLIT transactions.
-                 * Disable it for FS devices as well.
-                 */
-                defparams.dma_desc_enable = 0;
-                defparams.dma_desc_fs_enable = 0;
-        }
-
         hsotg = devm_kzalloc(&dev->dev, sizeof(*hsotg), GFP_KERNEL);
         if (!hsotg)
                 return -ENOMEM;
@@ -591,13 +398,6 @@ static int dwc2_driver_probe(struct platform_device *dev)
 
         spin_lock_init(&hsotg->lock);
 
-        hsotg->core_params = devm_kzalloc(&dev->dev,
-                                sizeof(*hsotg->core_params), GFP_KERNEL);
-        if (!hsotg->core_params)
-                return -ENOMEM;
-
-        dwc2_set_all_params(hsotg->core_params, -1);
-
         hsotg->irq = platform_get_irq(dev, 0);
         if (hsotg->irq < 0) {
                 dev_err(&dev->dev, "missing IRQ resource\n");
@@ -631,11 +431,12 @@ static int dwc2_driver_probe(struct platform_device *dev)
         if (retval)
                 goto error;
 
-        /* Validate parameter values */
-        dwc2_set_parameters(hsotg, params);
-
         dwc2_force_dr_mode(hsotg);
 
+        retval = dwc2_init_params(hsotg);
+        if (retval)
+                goto error;
+
         if (hsotg->dr_mode != USB_DR_MODE_HOST) {
                 retval = dwc2_gadget_init(hsotg, hsotg->irq);
                 if (retval)
diff --git a/drivers/usb/dwc3/Kconfig b/drivers/usb/dwc3/Kconfig
index b97cde76914d..c5aa235863e8 100644
--- a/drivers/usb/dwc3/Kconfig
+++ b/drivers/usb/dwc3/Kconfig
@@ -62,7 +62,7 @@ config USB_DWC3_OMAP
 
 config USB_DWC3_EXYNOS
         tristate "Samsung Exynos Platform"
-        depends on ARCH_EXYNOS && OF || COMPILE_TEST
+        depends on (ARCH_EXYNOS || COMPILE_TEST) && OF
         default USB_DWC3
         help
           Recent Exynos5 SoCs ship with one DesignWare Core USB3 IP inside,
@@ -70,7 +70,7 @@ config USB_DWC3_EXYNOS
 
 config USB_DWC3_PCI
         tristate "PCIe-based Platforms"
-        depends on PCI
+        depends on PCI && ACPI
         default USB_DWC3
         help
           If you're using the DesignWare Core IP with a PCIe, please say
@@ -98,7 +98,7 @@ config USB_DWC3_OF_SIMPLE
 
 config USB_DWC3_ST
         tristate "STMicroelectronics Platforms"
-        depends on ARCH_STI && OF
+        depends on (ARCH_STI || COMPILE_TEST) && OF
         default USB_DWC3
         help
           STMicroelectronics SoCs with one DesignWare Core USB3 IP
diff --git a/drivers/usb/dwc3/Makefile b/drivers/usb/dwc3/Makefile
index 22420e17d68b..ffca34029b21 100644
--- a/drivers/usb/dwc3/Makefile
+++ b/drivers/usb/dwc3/Makefile
@@ -3,7 +3,11 @@ CFLAGS_trace.o				:= -I$(src)
 
 obj-$(CONFIG_USB_DWC3)                  += dwc3.o
 
-dwc3-y                                  := core.o debug.o trace.o
+dwc3-y                                  := core.o
+
+ifneq ($(CONFIG_FTRACE),)
+        dwc3-y                          += trace.o
+endif
 
 ifneq ($(filter y,$(CONFIG_USB_DWC3_HOST) $(CONFIG_USB_DWC3_DUAL_ROLE)),)
         dwc3-y                          += host.o
diff --git a/drivers/usb/dwc3/core.c b/drivers/usb/dwc3/core.c
index fea446900cad..369bab16a824 100644
--- a/drivers/usb/dwc3/core.c
+++ b/drivers/usb/dwc3/core.c
@@ -169,33 +169,6 @@ static int dwc3_core_soft_reset(struct dwc3 *dwc)
         return -ETIMEDOUT;
 }
 
-/**
- * dwc3_soft_reset - Issue soft reset
- * @dwc: Pointer to our controller context structure
- */
-static int dwc3_soft_reset(struct dwc3 *dwc)
-{
-        unsigned long timeout;
-        u32 reg;
-
-        timeout = jiffies + msecs_to_jiffies(500);
-        dwc3_writel(dwc->regs, DWC3_DCTL, DWC3_DCTL_CSFTRST);
-        do {
-                reg = dwc3_readl(dwc->regs, DWC3_DCTL);
-                if (!(reg & DWC3_DCTL_CSFTRST))
-                        break;
-
-                if (time_after(jiffies, timeout)) {
-                        dev_err(dwc->dev, "Reset Timed Out\n");
-                        return -ETIMEDOUT;
-                }
-
-                cpu_relax();
-        } while (true);
-
-        return 0;
-}
-
 /*
  * dwc3_frame_length_adjustment - Adjusts frame length if required
  * @dwc3: Pointer to our controller context structure
@@ -229,7 +202,7 @@ static void dwc3_frame_length_adjustment(struct dwc3 *dwc)
 static void dwc3_free_one_event_buffer(struct dwc3 *dwc,
                 struct dwc3_event_buffer *evt)
 {
-        dma_free_coherent(dwc->dev, evt->length, evt->buf, evt->dma);
+        dma_free_coherent(dwc->sysdev, evt->length, evt->buf, evt->dma);
 }
 
 /**
@@ -251,7 +224,11 @@ static struct dwc3_event_buffer *dwc3_alloc_one_event_buffer(struct dwc3 *dwc,
 
         evt->dwc        = dwc;
         evt->length     = length;
-        evt->buf        = dma_alloc_coherent(dwc->dev, length,
+        evt->cache      = devm_kzalloc(dwc->dev, length, GFP_KERNEL);
+        if (!evt->cache)
+                return ERR_PTR(-ENOMEM);
+
+        evt->buf        = dma_alloc_coherent(dwc->sysdev, length,
                         &evt->dma, GFP_KERNEL);
         if (!evt->buf)
                 return ERR_PTR(-ENOMEM);
@@ -305,13 +282,7 @@ static int dwc3_event_buffers_setup(struct dwc3 *dwc)
         struct dwc3_event_buffer        *evt;
 
         evt = dwc->ev_buf;
-        dwc3_trace(trace_dwc3_core,
-                        "Event buf %p dma %08llx length %d\n",
-                        evt->buf, (unsigned long long) evt->dma,
-                        evt->length);
-
         evt->lpos = 0;
-
         dwc3_writel(dwc->regs, DWC3_GEVNTADRLO(0),
                         lower_32_bits(evt->dma));
         dwc3_writel(dwc->regs, DWC3_GEVNTADRHI(0),
@@ -370,11 +341,11 @@ static int dwc3_setup_scratch_buffers(struct dwc3 *dwc)
         if (!WARN_ON(dwc->scratchbuf))
                 return 0;
 
-        scratch_addr = dma_map_single(dwc->dev, dwc->scratchbuf,
+        scratch_addr = dma_map_single(dwc->sysdev, dwc->scratchbuf,
                         dwc->nr_scratch * DWC3_SCRATCHBUF_SIZE,
                         DMA_BIDIRECTIONAL);
-        if (dma_mapping_error(dwc->dev, scratch_addr)) {
-                dev_err(dwc->dev, "failed to map scratch buffer\n");
+        if (dma_mapping_error(dwc->sysdev, scratch_addr)) {
+                dev_err(dwc->sysdev, "failed to map scratch buffer\n");
                 ret = -EFAULT;
                 goto err0;
         }
@@ -398,7 +369,7 @@ static int dwc3_setup_scratch_buffers(struct dwc3 *dwc)
         return 0;
 
 err1:
-        dma_unmap_single(dwc->dev, dwc->scratch_addr, dwc->nr_scratch *
+        dma_unmap_single(dwc->sysdev, dwc->scratch_addr, dwc->nr_scratch *
                         DWC3_SCRATCHBUF_SIZE, DMA_BIDIRECTIONAL);
 
 err0:
@@ -417,7 +388,7 @@ static void dwc3_free_scratch_buffers(struct dwc3 *dwc)
         if (!WARN_ON(dwc->scratchbuf))
                 return;
 
-        dma_unmap_single(dwc->dev, dwc->scratch_addr, dwc->nr_scratch *
+        dma_unmap_single(dwc->sysdev, dwc->scratch_addr, dwc->nr_scratch *
                         DWC3_SCRATCHBUF_SIZE, DMA_BIDIRECTIONAL);
         kfree(dwc->scratchbuf);
 }
@@ -428,9 +399,6 @@ static void dwc3_core_num_eps(struct dwc3 *dwc)
 
         dwc->num_in_eps = DWC3_NUM_IN_EPS(parms);
         dwc->num_out_eps = DWC3_NUM_EPS(parms) - dwc->num_in_eps;
-
-        dwc3_trace(trace_dwc3_core, "found %d IN and %d OUT endpoints",
-                        dwc->num_in_eps, dwc->num_out_eps);
 }
 
 static void dwc3_cache_hwparams(struct dwc3 *dwc)
@@ -524,13 +492,6 @@ static int dwc3_phy_setup(struct dwc3 *dwc)
                 }
                 /* FALLTHROUGH */
         case DWC3_GHWPARAMS3_HSPHY_IFC_ULPI:
-                /* Making sure the interface and PHY are operational */
-                ret = dwc3_soft_reset(dwc);
-                if (ret)
-                        return ret;
-
-                udelay(1);
-
                 ret = dwc3_ulpi_init(dwc);
                 if (ret)
                         return ret;
@@ -594,19 +555,12 @@ static void dwc3_core_exit(struct dwc3 *dwc)
         phy_power_off(dwc->usb3_generic_phy);
 }
 
-/**
- * dwc3_core_init - Low-level initialization of DWC3 Core
- * @dwc: Pointer to our controller context structure
- *
- * Returns 0 on success otherwise negative errno.
- */
-static int dwc3_core_init(struct dwc3 *dwc)
+static bool dwc3_core_is_valid(struct dwc3 *dwc)
 {
-        u32                     hwparams4 = dwc->hwparams.hwparams4;
-        u32                     reg;
-        int                     ret;
+        u32 reg;
 
         reg = dwc3_readl(dwc->regs, DWC3_GSNPSID);
+
         /* This should read as U3 followed by revision number */
         if ((reg & DWC3_GSNPSID_MASK) == 0x55330000) {
                 /* Detected DWC_usb3 IP */
@@ -616,36 +570,16 @@ static int dwc3_core_init(struct dwc3 *dwc)
                 dwc->revision = dwc3_readl(dwc->regs, DWC3_VER_NUMBER);
                 dwc->revision |= DWC3_REVISION_IS_DWC31;
         } else {
-                dev_err(dwc->dev, "this is not a DesignWare USB3 DRD Core\n");
-                ret = -ENODEV;
-                goto err0;
+                return false;
         }
 
-        /*
-         * Write Linux Version Code to our GUID register so it's easy to figure
-         * out which kernel version a bug was found.
-         */
-        dwc3_writel(dwc->regs, DWC3_GUID, LINUX_VERSION_CODE);
-
-        /* Handle USB2.0-only core configuration */
-        if (DWC3_GHWPARAMS3_SSPHY_IFC(dwc->hwparams.hwparams3) ==
-                        DWC3_GHWPARAMS3_SSPHY_IFC_DIS) {
-                if (dwc->maximum_speed == USB_SPEED_SUPER)
-                        dwc->maximum_speed = USB_SPEED_HIGH;
-        }
-
-        /* issue device SoftReset too */
-        ret = dwc3_soft_reset(dwc);
-        if (ret)
-                goto err0;
-
-        ret = dwc3_core_soft_reset(dwc);
-        if (ret)
-                goto err0;
+        return true;
+}
 
-        ret = dwc3_phy_setup(dwc);
-        if (ret)
-                goto err0;
+static void dwc3_core_setup_global_control(struct dwc3 *dwc)
+{
+        u32 hwparams4 = dwc->hwparams.hwparams4;
+        u32 reg;
 
         reg = dwc3_readl(dwc->regs, DWC3_GCTL);
         reg &= ~DWC3_GCTL_SCALEDOWN_MASK;
@@ -683,13 +617,13 @@ static int dwc3_core_init(struct dwc3 *dwc)
                 reg |= DWC3_GCTL_GBLHIBERNATIONEN;
                 break;
         default:
-                dwc3_trace(trace_dwc3_core, "No power optimization available\n");
+                /* nothing */
+                break;
         }
 
         /* check if current dwc3 is on simulation board */
         if (dwc->hwparams.hwparams6 & DWC3_GHWPARAMS6_EN_FPGA) {
-                dwc3_trace(trace_dwc3_core,
-                                "running on FPGA platform\n");
+                dev_info(dwc->dev, "Running with FPGA optmizations\n");
                 dwc->is_fpga = true;
         }
 
@@ -714,7 +648,47 @@ static int dwc3_core_init(struct dwc3 *dwc)
                 reg |= DWC3_GCTL_U2RSTECN;
 
         dwc3_writel(dwc->regs, DWC3_GCTL, reg);
+}
+
+/**
+ * dwc3_core_init - Low-level initialization of DWC3 Core
+ * @dwc: Pointer to our controller context structure
+ *
+ * Returns 0 on success otherwise negative errno.
+ */
+static int dwc3_core_init(struct dwc3 *dwc)
+{
+        u32                     reg;
+        int                     ret;
+
+        if (!dwc3_core_is_valid(dwc)) {
+                dev_err(dwc->dev, "this is not a DesignWare USB3 DRD Core\n");
+                ret = -ENODEV;
+                goto err0;
+        }
+
+        /*
+         * Write Linux Version Code to our GUID register so it's easy to figure
+         * out which kernel version a bug was found.
+         */
+        dwc3_writel(dwc->regs, DWC3_GUID, LINUX_VERSION_CODE);
+
+        /* Handle USB2.0-only core configuration */
+        if (DWC3_GHWPARAMS3_SSPHY_IFC(dwc->hwparams.hwparams3) ==
+                        DWC3_GHWPARAMS3_SSPHY_IFC_DIS) {
+                if (dwc->maximum_speed == USB_SPEED_SUPER)
+                        dwc->maximum_speed = USB_SPEED_HIGH;
+        }
+
+        ret = dwc3_core_soft_reset(dwc);
+        if (ret)
+                goto err0;
 
+        ret = dwc3_phy_setup(dwc);
+        if (ret)
+                goto err0;
+
+        dwc3_core_setup_global_control(dwc);
         dwc3_core_num_eps(dwc);
 
         ret = dwc3_setup_scratch_buffers(dwc);
@@ -766,6 +740,16 @@ static int dwc3_core_init(struct dwc3 *dwc)
                 dwc3_writel(dwc->regs, DWC3_GUCTL2, reg);
         }
 
+        /*
+         * Enable hardware control of sending remote wakeup in HS when
+         * the device is in the L1 state.
+         */
+        if (dwc->revision >= DWC3_REVISION_290A) {
+                reg = dwc3_readl(dwc->regs, DWC3_GUCTL1);
+                reg |= DWC3_GUCTL1_DEV_L1_EXIT_BY_HW;
+                dwc3_writel(dwc->regs, DWC3_GUCTL1, reg);
+        }
+
         return 0;
 
 err4:
@@ -919,57 +903,13 @@ static void dwc3_core_exit_mode(struct dwc3 *dwc)
         }
 }
 
-#define DWC3_ALIGN_MASK         (16 - 1)
-
-static int dwc3_probe(struct platform_device *pdev)
+static void dwc3_get_properties(struct dwc3 *dwc)
 {
-        struct device           *dev = &pdev->dev;
-        struct resource         *res;
-        struct dwc3             *dwc;
+        struct device           *dev = dwc->dev;
         u8                      lpm_nyet_threshold;
         u8                      tx_de_emphasis;
         u8                      hird_threshold;
 
-        int                     ret;
-
-        void __iomem            *regs;
-        void                    *mem;
-
-        mem = devm_kzalloc(dev, sizeof(*dwc) + DWC3_ALIGN_MASK, GFP_KERNEL);
-        if (!mem)
-                return -ENOMEM;
-
-        dwc = PTR_ALIGN(mem, DWC3_ALIGN_MASK + 1);
-        dwc->mem = mem;
-        dwc->dev = dev;
-
-        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-        if (!res) {
-                dev_err(dev, "missing memory resource\n");
-                return -ENODEV;
-        }
-
-        dwc->xhci_resources[0].start = res->start;
-        dwc->xhci_resources[0].end = dwc->xhci_resources[0].start +
-                                        DWC3_XHCI_REGS_END;
-        dwc->xhci_resources[0].flags = res->flags;
-        dwc->xhci_resources[0].name = res->name;
-
-        res->start += DWC3_GLOBALS_REGS_START;
-
-        /*
-         * Request memory region but exclude xHCI regs,
-         * since it will be requested by the xhci-plat driver.
-         */
-        regs = devm_ioremap_resource(dev, res);
-        if (IS_ERR(regs)) {
-                ret = PTR_ERR(regs);
-                goto err0;
-        }
-
-        dwc->regs       = regs;
-        dwc->regs_size  = resource_size(res);
-
         /* default to highest possible threshold */
         lpm_nyet_threshold = 0xff;
 
@@ -986,6 +926,13 @@ static int dwc3_probe(struct platform_device *pdev)
         dwc->dr_mode = usb_get_dr_mode(dev);
         dwc->hsphy_mode = of_usb_get_phy_mode(dev->of_node);
 
+        dwc->sysdev_is_parent = device_property_read_bool(dev,
+                                "linux,sysdev_is_parent");
+        if (dwc->sysdev_is_parent)
+                dwc->sysdev = dwc->dev->parent;
+        else
+                dwc->sysdev = dwc->dev;
+
         dwc->has_lpm_erratum = device_property_read_bool(dev,
                                 "snps,has-lpm-erratum");
         device_property_read_u8(dev, "snps,lpm-nyet-threshold",
@@ -1041,6 +988,112 @@ static int dwc3_probe(struct platform_device *pdev)
         dwc->hird_threshold = hird_threshold
                 | (dwc->is_utmi_l1_suspend << 4);
 
+        dwc->imod_interval = 0;
+}
+
+/* check whether the core supports IMOD */
+bool dwc3_has_imod(struct dwc3 *dwc)
+{
+        return ((dwc3_is_usb3(dwc) &&
+                 dwc->revision >= DWC3_REVISION_300A) ||
+                (dwc3_is_usb31(dwc) &&
+                 dwc->revision >= DWC3_USB31_REVISION_120A));
+}
+
+static void dwc3_check_params(struct dwc3 *dwc)
+{
+        struct device *dev = dwc->dev;
+
+        /* Check for proper value of imod_interval */
+        if (dwc->imod_interval && !dwc3_has_imod(dwc)) {
+                dev_warn(dwc->dev, "Interrupt moderation not supported\n");
+                dwc->imod_interval = 0;
+        }
+
+        /*
+         * Workaround for STAR 9000961433 which affects only version
+         * 3.00a of the DWC_usb3 core. This prevents the controller
+         * interrupt from being masked while handling events. IMOD
+         * allows us to work around this issue. Enable it for the
+         * affected version.
+         */
+        if (!dwc->imod_interval &&
+            (dwc->revision == DWC3_REVISION_300A))
+                dwc->imod_interval = 1;
+
+        /* Check the maximum_speed parameter */
+        switch (dwc->maximum_speed) {
+        case USB_SPEED_LOW:
+        case USB_SPEED_FULL:
+        case USB_SPEED_HIGH:
+        case USB_SPEED_SUPER:
+        case USB_SPEED_SUPER_PLUS:
+                break;
+        default:
+                dev_err(dev, "invalid maximum_speed parameter %d\n",
+                        dwc->maximum_speed);
+                /* fall through */
+        case USB_SPEED_UNKNOWN:
+                /* default to superspeed */
+                dwc->maximum_speed = USB_SPEED_SUPER;
+
+                /*
+                 * default to superspeed plus if we are capable.
+                 */
+                if (dwc3_is_usb31(dwc) &&
+                    (DWC3_GHWPARAMS3_SSPHY_IFC(dwc->hwparams.hwparams3) ==
+                     DWC3_GHWPARAMS3_SSPHY_IFC_GEN2))
+                        dwc->maximum_speed = USB_SPEED_SUPER_PLUS;
+
+                break;
+        }
+}
+
+static int dwc3_probe(struct platform_device *pdev)
+{
+        struct device           *dev = &pdev->dev;
+        struct resource         *res;
+        struct dwc3             *dwc;
+
+        int                     ret;
+
+        void __iomem            *regs;
+
+        dwc = devm_kzalloc(dev, sizeof(*dwc), GFP_KERNEL);
+        if (!dwc)
+                return -ENOMEM;
+
+        dwc->dev = dev;
+
+        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+        if (!res) {
+                dev_err(dev, "missing memory resource\n");
+                return -ENODEV;
+        }
+
+        dwc->xhci_resources[0].start = res->start;
+        dwc->xhci_resources[0].end = dwc->xhci_resources[0].start +
+                                        DWC3_XHCI_REGS_END;
+        dwc->xhci_resources[0].flags = res->flags;
+        dwc->xhci_resources[0].name = res->name;
+
+        res->start += DWC3_GLOBALS_REGS_START;
+
+        /*
+         * Request memory region but exclude xHCI regs,
+         * since it will be requested by the xhci-plat driver.
+         */
+        regs = devm_ioremap_resource(dev, res);
+        if (IS_ERR(regs)) {
+                ret = PTR_ERR(regs);
+                goto err0;
+        }
+
+        dwc->regs       = regs;
+        dwc->regs_size  = resource_size(res);
+
+        dwc3_get_properties(dwc);
+
         platform_set_drvdata(pdev, dwc);
         dwc3_cache_hwparams(dwc);
 
@@ -1050,12 +1103,6 @@ static int dwc3_probe(struct platform_device *pdev)
 
         spin_lock_init(&dwc->lock);
 
-        if (!dev->dma_mask) {
-                dev->dma_mask = dev->parent->dma_mask;
-                dev->dma_parms = dev->parent->dma_parms;
-                dma_set_coherent_mask(dev, dev->parent->coherent_dma_mask);
-        }
-
         pm_runtime_set_active(dev);
         pm_runtime_use_autosuspend(dev);
         pm_runtime_set_autosuspend_delay(dev, DWC3_DEFAULT_AUTOSUSPEND_DELAY);
@@ -1087,32 +1134,7 @@ static int dwc3_probe(struct platform_device *pdev)
                 goto err4;
         }
 
-        /* Check the maximum_speed parameter */
-        switch (dwc->maximum_speed) {
-        case USB_SPEED_LOW:
-        case USB_SPEED_FULL:
-        case USB_SPEED_HIGH:
-        case USB_SPEED_SUPER:
-        case USB_SPEED_SUPER_PLUS:
-                break;
-        default:
-                dev_err(dev, "invalid maximum_speed parameter %d\n",
-                        dwc->maximum_speed);
-                /* fall through */
-        case USB_SPEED_UNKNOWN:
-                /* default to superspeed */
-                dwc->maximum_speed = USB_SPEED_SUPER;
-
-                /*
-                 * default to superspeed plus if we are capable.
-                 */
-                if (dwc3_is_usb31(dwc) &&
-                    (DWC3_GHWPARAMS3_SSPHY_IFC(dwc->hwparams.hwparams3) ==
-                     DWC3_GHWPARAMS3_SSPHY_IFC_GEN2))
-                        dwc->maximum_speed = USB_SPEED_SUPER_PLUS;
-
-                break;
-        }
+        dwc3_check_params(dwc);
 
         ret = dwc3_core_init_mode(dwc);
         if (ret)
diff --git a/drivers/usb/dwc3/core.h b/drivers/usb/dwc3/core.h
index 6b60e42626a2..de5a8570be04 100644
--- a/drivers/usb/dwc3/core.h
+++ b/drivers/usb/dwc3/core.h
@@ -26,6 +26,7 @@
 #include <linux/dma-mapping.h>
 #include <linux/mm.h>
 #include <linux/debugfs.h>
+#include <linux/wait.h>
 
 #include <linux/usb/ch9.h>
 #include <linux/usb/gadget.h>
@@ -37,6 +38,7 @@
 #define DWC3_MSG_MAX    500
 
 /* Global constants */
+#define DWC3_PULL_UP_TIMEOUT    500     /* ms */
 #define DWC3_ZLP_BUF_SIZE       1024    /* size of a superspeed bulk */
 #define DWC3_EP0_BOUNCE_SIZE    512
 #define DWC3_ENDPOINTS_NUM      32
@@ -65,6 +67,7 @@
 #define DWC3_DEVICE_EVENT_OVERFLOW              11
 
 #define DWC3_GEVNTCOUNT_MASK    0xfffc
+#define DWC3_GEVNTCOUNT_EHB     (1 << 31)
 #define DWC3_GSNPSID_MASK       0xffff0000
 #define DWC3_GSNPSREV_MASK      0xffff
 
@@ -147,6 +150,8 @@
 #define DWC3_DEPCMDPAR0         0x08
 #define DWC3_DEPCMD             0x0c
 
+#define DWC3_DEV_IMOD(n)        (0xca00 + (n * 0x4))
+
 /* OTG Registers */
 #define DWC3_OCFG               0xcc00
 #define DWC3_OCTL               0xcc04
@@ -198,6 +203,9 @@
 #define DWC3_GCTL_GBLHIBERNATIONEN      (1 << 1)
 #define DWC3_GCTL_DSBLCLKGTNG           (1 << 0)
 
+/* Global User Control 1 Register */
+#define DWC3_GUCTL1_DEV_L1_EXIT_BY_HW   (1 << 24)
+
 /* Global USB2 PHY Configuration Register */
 #define DWC3_GUSB2PHYCFG_PHYSOFTRST     (1 << 31)
 #define DWC3_GUSB2PHYCFG_U2_FREECLK_EXISTS      (1 << 30)
@@ -450,6 +458,8 @@
 #define DWC3_DEPCMD_SETTRANSFRESOURCE   (0x02 << 0)
 #define DWC3_DEPCMD_SETEPCONFIG         (0x01 << 0)
 
+#define DWC3_DEPCMD_CMD(x)              ((x) & 0xf)
+
 /* The EP number goes 0..31 so ep0 is always out and ep1 is always in */
 #define DWC3_DALEPENA_EP(n)             (1 << n)
 
@@ -458,6 +468,11 @@
 #define DWC3_DEPCMD_TYPE_BULK           2
 #define DWC3_DEPCMD_TYPE_INTR           3
 
+#define DWC3_DEV_IMOD_COUNT_SHIFT       16
+#define DWC3_DEV_IMOD_COUNT_MASK        (0xffff << 16)
+#define DWC3_DEV_IMOD_INTERVAL_SHIFT    0
+#define DWC3_DEV_IMOD_INTERVAL_MASK     (0xffff << 0)
+
 /* Structures */
 
 struct dwc3_trb;
@@ -465,6 +480,7 @@ struct dwc3_trb;
 /**
  * struct dwc3_event_buffer - Software event buffer representation
  * @buf: _THE_ buffer
+ * @cache: The buffer cache used in the threaded interrupt
  * @length: size of this buffer
  * @lpos: event offset
  * @count: cache of last read event count register
@@ -474,6 +490,7 @@ struct dwc3_trb;
  */
 struct dwc3_event_buffer {
         void                    *buf;
+        void                    *cache;
         unsigned                length;
         unsigned int            lpos;
         unsigned int            count;
@@ -499,6 +516,7 @@ struct dwc3_event_buffer {
  * @endpoint: usb endpoint
  * @pending_list: list of pending requests for this endpoint
  * @started_list: list of started requests on this endpoint
+ * @wait_end_transfer: wait_queue_head_t for waiting on End Transfer complete
  * @lock: spinlock for endpoint request queue traversal
  * @regs: pointer to first endpoint register
  * @trb_pool: array of transaction buffers
@@ -524,12 +542,13 @@ struct dwc3_ep {
         struct list_head        pending_list;
         struct list_head        started_list;
 
+        wait_queue_head_t       wait_end_transfer;
+
         spinlock_t              lock;
         void __iomem            *regs;
 
         struct dwc3_trb         *trb_pool;
         dma_addr_t              trb_pool_dma;
-        const struct usb_ss_ep_comp_descriptor *comp_desc;
         struct dwc3             *dwc;
 
         u32                     saved_state;
@@ -540,6 +559,8 @@ struct dwc3_ep {
 #define DWC3_EP_BUSY            (1 << 4)
 #define DWC3_EP_PENDING_REQUEST (1 << 5)
 #define DWC3_EP_MISSED_ISOC     (1 << 6)
+#define DWC3_EP_END_TRANSFER_PENDING    (1 << 7)
+#define DWC3_EP_TRANSFER_STARTED (1 << 8)
 
         /* This last one is specific to EP0 */
 #define DWC3_EP0_DIR_IN         (1 << 31)
@@ -703,7 +724,7 @@ struct dwc3_hwparams {
  * @dep: struct dwc3_ep owning this request
  * @sg: pointer to first incomplete sg
  * @num_pending_sgs: counter to pending sgs
- * @first_trb_index: index to first trb used by this request
+ * @remaining: amount of data remaining
  * @epnum: endpoint number to which this request refers
  * @trb: pointer to struct dwc3_trb
  * @trb_dma: DMA address of @trb
@@ -718,7 +739,7 @@ struct dwc3_request {
         struct scatterlist      *sg;
 
         unsigned                num_pending_sgs;
-        u8                      first_trb_index;
+        unsigned                remaining;
         u8                      epnum;
         struct dwc3_trb         *trb;
         dma_addr_t              trb_dma;
@@ -748,6 +769,7 @@ struct dwc3_scratchpad_array {
  * @ep0_usb_req: dummy req used while handling STD USB requests
  * @ep0_bounce_addr: dma address of ep0_bounce
  * @scratch_addr: dma address of scratchbuf
+ * @ep0_in_setup: one control transfer is completed and enter setup phase
  * @lock: for synchronizing
  * @dev: pointer to our struct device
  * @xhci: pointer to our xHCI child
@@ -784,7 +806,6 @@ struct dwc3_scratchpad_array {
  * @ep0state: state of endpoint zero
  * @link_state: link state
  * @speed: device speed (super, high, full, low)
- * @mem: points to start of memory which is used for this struct.
  * @hwparams: copy of hwparams registers
  * @root: debugfs root folder pointer
  * @regset: debugfs pointer to regdump file
@@ -798,6 +819,7 @@ struct dwc3_scratchpad_array {
  * @ep0_bounced: true when we used bounce buffer
  * @ep0_expect_in: true when we expect a DATA IN transfer
  * @has_hibernation: true when dwc3 was configured with Hibernation
+ * @sysdev_is_parent: true when dwc3 device has a parent driver
  * @has_lpm_erratum: true when core was configured with LPM Erratum. Note that
  *                      there's now way for software to detect this in runtime.
  * @is_utmi_l1_suspend: the core asserts output signal
@@ -833,6 +855,8 @@ struct dwc3_scratchpad_array {
  *      1       - -3.5dB de-emphasis
  *      2       - No de-emphasis
  *      3       - Reserved
+ * @imod_interval: set the interrupt moderation interval in 250ns
+ *                 increments or 0 to disable.
  */
 struct dwc3 {
         struct usb_ctrlrequest  *ctrl_req;
@@ -846,11 +870,13 @@ struct dwc3 {
         dma_addr_t              ep0_bounce_addr;
         dma_addr_t              scratch_addr;
         struct dwc3_request     ep0_usb_req;
+        struct completion       ep0_in_setup;
 
         /* device lock */
         spinlock_t              lock;
 
         struct device           *dev;
+        struct device           *sysdev;
 
         struct platform_device  *xhci;
         struct resource         xhci_resources[DWC3_XHCI_RESOURCES_NUM];
@@ -909,6 +935,7 @@ struct dwc3 {
 #define DWC3_REVISION_260A      0x5533260a
 #define DWC3_REVISION_270A      0x5533270a
 #define DWC3_REVISION_280A      0x5533280a
+#define DWC3_REVISION_290A      0x5533290a
 #define DWC3_REVISION_300A      0x5533300a
 #define DWC3_REVISION_310A      0x5533310a
 
@@ -918,6 +945,7 @@ struct dwc3 {
  */
 #define DWC3_REVISION_IS_DWC31          0x80000000
 #define DWC3_USB31_REVISION_110A        (0x3131302a | DWC3_REVISION_IS_DWC31)
+#define DWC3_USB31_REVISION_120A        (0x3132302a | DWC3_REVISION_IS_DWC31)
 
         enum dwc3_ep0_next      ep0_next_event;
         enum dwc3_ep0_state     ep0state;
@@ -934,8 +962,6 @@ struct dwc3 {
         u8                      num_out_eps;
         u8                      num_in_eps;
 
-        void                    *mem;
-
         struct dwc3_hwparams    hwparams;
         struct dentry           *root;
         struct debugfs_regset32 *regset;
@@ -952,6 +978,7 @@ struct dwc3 {
         unsigned                ep0_bounced:1;
         unsigned                ep0_expect_in:1;
         unsigned                has_hibernation:1;
+        unsigned                sysdev_is_parent:1;
         unsigned                has_lpm_erratum:1;
         unsigned                is_utmi_l1_suspend:1;
         unsigned                is_fpga:1;
@@ -978,6 +1005,8 @@ struct dwc3 {
 
         unsigned                tx_de_emphasis_quirk:1;
         unsigned                tx_de_emphasis:2;
+
+        u16                     imod_interval;
 };
 
 /* -------------------------------------------------------------------------- */
@@ -1039,12 +1068,16 @@ struct dwc3_event_depevt {
 /* Control-only Status */
 #define DEPEVT_STATUS_CONTROL_DATA      1
 #define DEPEVT_STATUS_CONTROL_STATUS    2
+#define DEPEVT_STATUS_CONTROL_PHASE(n)  ((n) & 3)
 
 /* In response to Start Transfer */
 #define DEPEVT_TRANSFER_NO_RESOURCE     1
 #define DEPEVT_TRANSFER_BUS_EXPIRY      2
 
         u32     parameters:16;
+
+/* For Command Complete Events */
+#define DEPEVT_PARAMETER_CMD(n) (((n) & (0xf << 8)) >> 8)
 } __packed;
 
 /**
@@ -1133,12 +1166,20 @@ struct dwc3_gadget_ep_cmd_params {
 void dwc3_set_mode(struct dwc3 *dwc, u32 mode);
 u32 dwc3_core_fifo_space(struct dwc3_ep *dep, u8 type);
 
+/* check whether we are on the DWC_usb3 core */
+static inline bool dwc3_is_usb3(struct dwc3 *dwc)
+{
+        return !(dwc->revision & DWC3_REVISION_IS_DWC31);
+}
+
 /* check whether we are on the DWC_usb31 core */
 static inline bool dwc3_is_usb31(struct dwc3 *dwc)
 {
         return !!(dwc->revision & DWC3_REVISION_IS_DWC31);
 }
 
+bool dwc3_has_imod(struct dwc3 *dwc);
+
 #if IS_ENABLED(CONFIG_USB_DWC3_HOST) || IS_ENABLED(CONFIG_USB_DWC3_DUAL_ROLE)
 int dwc3_host_init(struct dwc3 *dwc);
 void dwc3_host_exit(struct dwc3 *dwc);
diff --git a/drivers/usb/dwc3/debug.c b/drivers/usb/dwc3/debug.c
deleted file mode 100644
index 0be6885bc370..000000000000
--- a/drivers/usb/dwc3/debug.c
+++ /dev/null
@@ -1,32 +0,0 @@
-/**
- * debug.c - DesignWare USB3 DRD Controller Debug/Trace Support
- *
- * Copyright (C) 2014 Texas Instruments Incorporated - http://www.ti.com
- *
- * Author: Felipe Balbi <balbi@ti.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2  of
- * the License 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.
- */
-
-#include "debug.h"
-
-void dwc3_trace(void (*trace)(struct va_format *), const char *fmt, ...)
-{
-        struct va_format vaf;
-        va_list args;
-
-        va_start(args, fmt);
-        vaf.fmt = fmt;
-        vaf.va = &args;
-
-        trace(&vaf);
-
-        va_end(args);
-}
diff --git a/drivers/usb/dwc3/debug.h b/drivers/usb/dwc3/debug.h
index 33ab2a203c1b..eeed4ffd8131 100644
--- a/drivers/usb/dwc3/debug.h
+++ b/drivers/usb/dwc3/debug.h
@@ -124,6 +124,22 @@ dwc3_gadget_link_string(enum dwc3_link_state link_state)
         }
 }
 
+static inline const char *dwc3_ep0_state_string(enum dwc3_ep0_state state)
+{
+        switch (state) {
+        case EP0_UNCONNECTED:
+                return "Unconnected";
+        case EP0_SETUP_PHASE:
+                return "Setup Phase";
+        case EP0_DATA_PHASE:
+                return "Data Phase";
+        case EP0_STATUS_PHASE:
+                return "Status Phase";
+        default:
+                return "UNKNOWN";
+        }
+}
+
 /**
  * dwc3_gadget_event_string - returns event name
  * @event: the event code
@@ -184,10 +200,11 @@ dwc3_gadget_event_string(const struct dwc3_event_devt *event)
  * @event: then event code
  */
 static inline const char *
-dwc3_ep_event_string(const struct dwc3_event_depevt *event)
+dwc3_ep_event_string(const struct dwc3_event_depevt *event, u32 ep0state)
 {
         u8 epnum = event->endpoint_number;
         static char str[256];
+        size_t len;
         int status;
         int ret;
 
@@ -199,6 +216,10 @@ dwc3_ep_event_string(const struct dwc3_event_depevt *event)
         switch (event->endpoint_event) {
         case DWC3_DEPEVT_XFERCOMPLETE:
                 strcat(str, "Transfer Complete");
+                len = strlen(str);
+
+                if (epnum <= 1)
+                        sprintf(str + len, " [%s]", dwc3_ep0_state_string(ep0state));
                 break;
         case DWC3_DEPEVT_XFERINPROGRESS:
                 strcat(str, "Transfer In-Progress");
@@ -207,6 +228,19 @@ dwc3_ep_event_string(const struct dwc3_event_depevt *event)
                 strcat(str, "Transfer Not Ready");
                 status = event->status & DEPEVT_STATUS_TRANSFER_ACTIVE;
                 strcat(str, status ? " (Active)" : " (Not Active)");
+
+                /* Control Endpoints */
+                if (epnum <= 1) {
+                        int phase = DEPEVT_STATUS_CONTROL_PHASE(event->status);
+
+                        switch (phase) {
+                        case DEPEVT_STATUS_CONTROL_DATA:
+                                strcat(str, " [Data Phase]");
+                                break;
+                        case DEPEVT_STATUS_CONTROL_STATUS:
+                                strcat(str, " [Status Phase]");
+                        }
+                }
                 break;
         case DWC3_DEPEVT_RXTXFIFOEVT:
                 strcat(str, "FIFO");
@@ -270,14 +304,14 @@ static inline const char *dwc3_gadget_event_type_string(u8 event)
         }
 }
 
-static inline const char *dwc3_decode_event(u32 event)
+static inline const char *dwc3_decode_event(u32 event, u32 ep0state)
 {
         const union dwc3_event evt = (union dwc3_event) event;
 
         if (evt.type.is_devspec)
                 return dwc3_gadget_event_string(&evt.devt);
         else
-                return dwc3_ep_event_string(&evt.depevt);
+                return dwc3_ep_event_string(&evt.depevt, ep0state);
 }
 
 static inline const char *dwc3_ep_cmd_status_string(int status)
@@ -310,7 +344,6 @@ static inline const char *dwc3_gadget_generic_cmd_status_string(int status)
         }
 }
 
-void dwc3_trace(void (*trace)(struct va_format *), const char *fmt, ...);
 
 #ifdef CONFIG_DEBUG_FS
 extern void dwc3_debugfs_init(struct dwc3 *);
diff --git a/drivers/usb/dwc3/dwc3-exynos.c b/drivers/usb/dwc3/dwc3-exynos.c
index 2f1fb7e7aa54..e27899bb5706 100644
--- a/drivers/usb/dwc3/dwc3-exynos.c
+++ b/drivers/usb/dwc3/dwc3-exynos.c
@@ -20,7 +20,6 @@
 #include <linux/kernel.h>
 #include <linux/slab.h>
 #include <linux/platform_device.h>
-#include <linux/dma-mapping.h>
 #include <linux/clk.h>
 #include <linux/usb/otg.h>
 #include <linux/usb/usb_phy_generic.h>
@@ -117,15 +116,6 @@ static int dwc3_exynos_probe(struct platform_device *pdev)
         if (!exynos)
                 return -ENOMEM;
 
-        /*
-         * Right now device-tree probed devices don't get dma_mask set.
-         * Since shared usb code relies on it, set it here for now.
-         * Once we move to full device tree support this will vanish off.
-         */
-        ret = dma_coerce_mask_and_coherent(dev, DMA_BIT_MASK(32));
-        if (ret)
-                return ret;
-
         platform_set_drvdata(pdev, exynos);
 
         exynos->dev     = dev;
diff --git a/drivers/usb/dwc3/dwc3-pci.c b/drivers/usb/dwc3/dwc3-pci.c
index 6df0f5dad9a4..2b73339f286b 100644
--- a/drivers/usb/dwc3/dwc3-pci.c
+++ b/drivers/usb/dwc3/dwc3-pci.c
@@ -39,6 +39,27 @@
 #define PCI_DEVICE_ID_INTEL_APL                 0x5aaa
 #define PCI_DEVICE_ID_INTEL_KBP                 0xa2b0
 
+#define PCI_INTEL_BXT_DSM_UUID          "732b85d5-b7a7-4a1b-9ba0-4bbd00ffd511"
+#define PCI_INTEL_BXT_FUNC_PMU_PWR      4
+#define PCI_INTEL_BXT_STATE_D0          0
+#define PCI_INTEL_BXT_STATE_D3          3
+
+/**
+ * struct dwc3_pci - Driver private structure
+ * @dwc3: child dwc3 platform_device
+ * @pci: our link to PCI bus
+ * @uuid: _DSM UUID
+ * @has_dsm_for_pm: true for devices which need to run _DSM on runtime PM
+ */
+struct dwc3_pci {
+        struct platform_device *dwc3;
+        struct pci_dev *pci;
+
+        u8 uuid[16];
+
+        unsigned int has_dsm_for_pm:1;
+};
+
 static const struct acpi_gpio_params reset_gpios = { 0, 0, false };
 static const struct acpi_gpio_params cs_gpios = { 1, 0, false };
 
@@ -48,8 +69,21 @@ static const struct acpi_gpio_mapping acpi_dwc3_byt_gpios[] = {
         { },
 };
 
-static int dwc3_pci_quirks(struct pci_dev *pdev, struct platform_device *dwc3)
+static int dwc3_pci_quirks(struct dwc3_pci *dwc)
 {
+        struct platform_device          *dwc3 = dwc->dwc3;
+        struct pci_dev                  *pdev = dwc->pci;
+        int                             ret;
+
+        struct property_entry sysdev_property[] = {
+                PROPERTY_ENTRY_BOOL("linux,sysdev_is_parent"),
+                { },
+        };
+
+        ret = platform_device_add_properties(dwc3, sysdev_property);
+        if (ret)
+                return ret;
+
         if (pdev->vendor == PCI_VENDOR_ID_AMD &&
             pdev->device == PCI_DEVICE_ID_AMD_NL_USB) {
                 struct property_entry properties[] = {
@@ -89,6 +123,12 @@ static int dwc3_pci_quirks(struct pci_dev *pdev, struct platform_device *dwc3)
                 if (ret < 0)
                         return ret;
 
+                if (pdev->device == PCI_DEVICE_ID_INTEL_BXT ||
+                                pdev->device == PCI_DEVICE_ID_INTEL_BXT_M) {
+                        acpi_str_to_uuid(PCI_INTEL_BXT_DSM_UUID, dwc->uuid);
+                        dwc->has_dsm_for_pm = true;
+                }
+
                 if (pdev->device == PCI_DEVICE_ID_INTEL_BYT) {
                         struct gpio_desc *gpio;
 
@@ -139,8 +179,8 @@ static int dwc3_pci_quirks(struct pci_dev *pdev, struct platform_device *dwc3)
 static int dwc3_pci_probe(struct pci_dev *pci,
                 const struct pci_device_id *id)
 {
+        struct dwc3_pci         *dwc;
         struct resource         res[2];
-        struct platform_device  *dwc3;
         int                     ret;
         struct device           *dev = &pci->dev;
 
@@ -152,11 +192,13 @@ static int dwc3_pci_probe(struct pci_dev *pci,
 
         pci_set_master(pci);
 
-        dwc3 = platform_device_alloc("dwc3", PLATFORM_DEVID_AUTO);
-        if (!dwc3) {
-                dev_err(dev, "couldn't allocate dwc3 device\n");
+        dwc = devm_kzalloc(dev, sizeof(*dwc), GFP_KERNEL);
+        if (!dwc)
+                return -ENOMEM;
+
+        dwc->dwc3 = platform_device_alloc("dwc3", PLATFORM_DEVID_AUTO);
+        if (!dwc->dwc3)
                 return -ENOMEM;
-        }
 
         memset(res, 0x00, sizeof(struct resource) * ARRAY_SIZE(res));
 
@@ -169,20 +211,21 @@ static int dwc3_pci_probe(struct pci_dev *pci,
         res[1].name     = "dwc_usb3";
         res[1].flags    = IORESOURCE_IRQ;
 
-        ret = platform_device_add_resources(dwc3, res, ARRAY_SIZE(res));
+        ret = platform_device_add_resources(dwc->dwc3, res, ARRAY_SIZE(res));
         if (ret) {
                 dev_err(dev, "couldn't add resources to dwc3 device\n");
                 return ret;
         }
 
-        dwc3->dev.parent = dev;
-        ACPI_COMPANION_SET(&dwc3->dev, ACPI_COMPANION(dev));
+        dwc->pci = pci;
+        dwc->dwc3->dev.parent = dev;
+        ACPI_COMPANION_SET(&dwc->dwc3->dev, ACPI_COMPANION(dev));
 
-        ret = dwc3_pci_quirks(pci, dwc3);
+        ret = dwc3_pci_quirks(dwc);
         if (ret)
                 goto err;
 
-        ret = platform_device_add(dwc3);
+        ret = platform_device_add(dwc->dwc3);
         if (ret) {
                 dev_err(dev, "failed to register dwc3 device\n");
                 goto err;
@@ -190,21 +233,23 @@ static int dwc3_pci_probe(struct pci_dev *pci,
 
         device_init_wakeup(dev, true);
         device_set_run_wake(dev, true);
-        pci_set_drvdata(pci, dwc3);
+        pci_set_drvdata(pci, dwc);
         pm_runtime_put(dev);
 
         return 0;
 err:
-        platform_device_put(dwc3);
+        platform_device_put(dwc->dwc3);
         return ret;
 }
 
 static void dwc3_pci_remove(struct pci_dev *pci)
 {
+        struct dwc3_pci         *dwc = pci_get_drvdata(pci);
+
         device_init_wakeup(&pci->dev, false);
         pm_runtime_get(&pci->dev);
         acpi_dev_remove_driver_gpios(ACPI_COMPANION(&pci->dev));
-        platform_device_unregister(pci_get_drvdata(pci));
+        platform_device_unregister(dwc->dwc3);
 }
 
 static const struct pci_device_id dwc3_pci_id_table[] = {
@@ -234,40 +279,75 @@ static const struct pci_device_id dwc3_pci_id_table[] = {
 };
 MODULE_DEVICE_TABLE(pci, dwc3_pci_id_table);
 
+#if defined(CONFIG_PM) || defined(CONFIG_PM_SLEEP)
+static int dwc3_pci_dsm(struct dwc3_pci *dwc, int param)
+{
+        union acpi_object *obj;
+        union acpi_object tmp;
+        union acpi_object argv4 = ACPI_INIT_DSM_ARGV4(1, &tmp);
+
+        if (!dwc->has_dsm_for_pm)
+                return 0;
+
+        tmp.type = ACPI_TYPE_INTEGER;
+        tmp.integer.value = param;
+
+        obj = acpi_evaluate_dsm(ACPI_HANDLE(&dwc->pci->dev), dwc->uuid,
+                        1, PCI_INTEL_BXT_FUNC_PMU_PWR, &argv4);
+        if (!obj) {
+                dev_err(&dwc->pci->dev, "failed to evaluate _DSM\n");
+                return -EIO;
+        }
+
+        ACPI_FREE(obj);
+
+        return 0;
+}
+#endif /* CONFIG_PM || CONFIG_PM_SLEEP */
+
 #ifdef CONFIG_PM
 static int dwc3_pci_runtime_suspend(struct device *dev)
 {
+        struct dwc3_pci         *dwc = dev_get_drvdata(dev);
+
         if (device_run_wake(dev))
-                return 0;
+                return dwc3_pci_dsm(dwc, PCI_INTEL_BXT_STATE_D3);
 
         return -EBUSY;
 }
 
 static int dwc3_pci_runtime_resume(struct device *dev)
 {
-        struct platform_device *dwc3 = dev_get_drvdata(dev);
+        struct dwc3_pci         *dwc = dev_get_drvdata(dev);
+        struct platform_device  *dwc3 = dwc->dwc3;
+        int                     ret;
+
+        ret = dwc3_pci_dsm(dwc, PCI_INTEL_BXT_STATE_D0);
+        if (ret)
+                return ret;
 
         return pm_runtime_get(&dwc3->dev);
 }
 #endif /* CONFIG_PM */
 
 #ifdef CONFIG_PM_SLEEP
-static int dwc3_pci_pm_dummy(struct device *dev)
+static int dwc3_pci_suspend(struct device *dev)
 {
-        /*
-         * There's nothing to do here. No, seriously. Everything is either taken
-         * care either by PCI subsystem or dwc3/core.c, so we have nothing
-         * missing here.
-         *
-         * So you'd think we didn't need this at all, but PCI subsystem will
-         * bail out if we don't have a valid callback :-s
-         */
-        return 0;
+        struct dwc3_pci         *dwc = dev_get_drvdata(dev);
+
+        return dwc3_pci_dsm(dwc, PCI_INTEL_BXT_STATE_D3);
+}
+
+static int dwc3_pci_resume(struct device *dev)
+{
+        struct dwc3_pci         *dwc = dev_get_drvdata(dev);
+
+        return dwc3_pci_dsm(dwc, PCI_INTEL_BXT_STATE_D0);
 }
 #endif /* CONFIG_PM_SLEEP */
 
 static struct dev_pm_ops dwc3_pci_dev_pm_ops = {
-        SET_SYSTEM_SLEEP_PM_OPS(dwc3_pci_pm_dummy, dwc3_pci_pm_dummy)
+        SET_SYSTEM_SLEEP_PM_OPS(dwc3_pci_suspend, dwc3_pci_resume)
         SET_RUNTIME_PM_OPS(dwc3_pci_runtime_suspend, dwc3_pci_runtime_resume,
                 NULL)
 };
diff --git a/drivers/usb/dwc3/dwc3-st.c b/drivers/usb/dwc3/dwc3-st.c
index aaaf256f71dd..dfbf464eb88c 100644
--- a/drivers/usb/dwc3/dwc3-st.c
+++ b/drivers/usb/dwc3/dwc3-st.c
@@ -219,7 +219,6 @@ static int st_dwc3_probe(struct platform_device *pdev)
         if (IS_ERR(regmap))
                 return PTR_ERR(regmap);
 
-        dma_set_coherent_mask(dev, dev->coherent_dma_mask);
         dwc3_data->dev = dev;
         dwc3_data->regmap = regmap;
 
diff --git a/drivers/usb/dwc3/ep0.c b/drivers/usb/dwc3/ep0.c
index fe79d771dee4..4878d187c7d4 100644
--- a/drivers/usb/dwc3/ep0.c
+++ b/drivers/usb/dwc3/ep0.c
@@ -39,22 +39,6 @@ static void __dwc3_ep0_do_control_status(struct dwc3 *dwc, struct dwc3_ep *dep);
 static void __dwc3_ep0_do_control_data(struct dwc3 *dwc,
                 struct dwc3_ep *dep, struct dwc3_request *req);
 
-static const char *dwc3_ep0_state_string(enum dwc3_ep0_state state)
-{
-        switch (state) {
-        case EP0_UNCONNECTED:
-                return "Unconnected";
-        case EP0_SETUP_PHASE:
-                return "Setup Phase";
-        case EP0_DATA_PHASE:
-                return "Data Phase";
-        case EP0_STATUS_PHASE:
-                return "Status Phase";
-        default:
-                return "UNKNOWN";
-        }
-}
-
 static int dwc3_ep0_start_trans(struct dwc3 *dwc, u8 epnum, dma_addr_t buf_dma,
                 u32 len, u32 type, bool chain)
 {
@@ -65,10 +49,8 @@ static int dwc3_ep0_start_trans(struct dwc3 *dwc, u8 epnum, dma_addr_t buf_dma,
         int                             ret;
 
         dep = dwc->eps[epnum];
-        if (dep->flags & DWC3_EP_BUSY) {
-                dwc3_trace(trace_dwc3_ep0, "%s still busy", dep->name);
+        if (dep->flags & DWC3_EP_BUSY)
                 return 0;
-        }
 
         trb = &dwc->ep0_trb[dep->trb_enqueue];
 
@@ -99,11 +81,8 @@ static int dwc3_ep0_start_trans(struct dwc3 *dwc, u8 epnum, dma_addr_t buf_dma,
         trace_dwc3_prepare_trb(dep, trb);
 
         ret = dwc3_send_gadget_ep_cmd(dep, DWC3_DEPCMD_STARTTRANSFER, &params);
-        if (ret < 0) {
-                dwc3_trace(trace_dwc3_ep0, "%s STARTTRANSFER failed",
-                                dep->name);
+        if (ret < 0)
                 return ret;
-        }
 
         dep->flags |= DWC3_EP_BUSY;
         dep->resource_index = dwc3_gadget_ep_get_transfer_index(dep);
@@ -163,9 +142,6 @@ static int __dwc3_gadget_ep0_queue(struct dwc3_ep *dep,
 
                 if (dwc->ep0state == EP0_STATUS_PHASE)
                         __dwc3_ep0_do_control_status(dwc, dwc->eps[direction]);
-                else
-                        dwc3_trace(trace_dwc3_ep0,
-                                        "too early for delayed status");
 
                 return 0;
         }
@@ -229,9 +205,8 @@ int dwc3_gadget_ep0_queue(struct usb_ep *ep, struct usb_request *request,
 
         spin_lock_irqsave(&dwc->lock, flags);
         if (!dep->endpoint.desc) {
-                dwc3_trace(trace_dwc3_ep0,
-                                "trying to queue request %p to disabled %s",
-                                request, dep->name);
+                dev_err(dwc->dev, "%s: can't queue to disabled endpoint\n",
+                                dep->name);
                 ret = -ESHUTDOWN;
                 goto out;
         }
@@ -242,11 +217,6 @@ int dwc3_gadget_ep0_queue(struct usb_ep *ep, struct usb_request *request,
                 goto out;
         }
 
-        dwc3_trace(trace_dwc3_ep0,
-                        "queueing request %p to %s length %d state '%s'",
-                        request, dep->name, request->length,
-                        dwc3_ep0_state_string(dwc->ep0state));
-
         ret = __dwc3_gadget_ep0_queue(dep, req);
 
 out:
@@ -308,6 +278,8 @@ void dwc3_ep0_out_start(struct dwc3 *dwc)
 {
         int                             ret;
 
+        complete(&dwc->ep0_in_setup);
+
         ret = dwc3_ep0_start_trans(dwc, 0, dwc->ctrl_req_addr, 8,
                         DWC3_TRBCTL_CONTROL_SETUP, false);
         WARN_ON(ret < 0);
@@ -395,126 +367,198 @@ static int dwc3_ep0_handle_status(struct dwc3 *dwc,
         return __dwc3_gadget_ep0_queue(dep, &dwc->ep0_usb_req);
 }
 
-static int dwc3_ep0_handle_feature(struct dwc3 *dwc,
+static int dwc3_ep0_handle_u1(struct dwc3 *dwc, enum usb_device_state state,
+                int set)
+{
+        u32 reg;
+
+        if (state != USB_STATE_CONFIGURED)
+                return -EINVAL;
+        if ((dwc->speed != DWC3_DSTS_SUPERSPEED) &&
+                        (dwc->speed != DWC3_DSTS_SUPERSPEED_PLUS))
+                return -EINVAL;
+
+        reg = dwc3_readl(dwc->regs, DWC3_DCTL);
+        if (set)
+                reg |= DWC3_DCTL_INITU1ENA;
+        else
+                reg &= ~DWC3_DCTL_INITU1ENA;
+        dwc3_writel(dwc->regs, DWC3_DCTL, reg);
+
+        return 0;
+}
+
+static int dwc3_ep0_handle_u2(struct dwc3 *dwc, enum usb_device_state state,
+                int set)
+{
+        u32 reg;
+
+
+        if (state != USB_STATE_CONFIGURED)
+                return -EINVAL;
+        if ((dwc->speed != DWC3_DSTS_SUPERSPEED) &&
+                        (dwc->speed != DWC3_DSTS_SUPERSPEED_PLUS))
+                return -EINVAL;
+
+        reg = dwc3_readl(dwc->regs, DWC3_DCTL);
+        if (set)
+                reg |= DWC3_DCTL_INITU2ENA;
+        else
+                reg &= ~DWC3_DCTL_INITU2ENA;
+        dwc3_writel(dwc->regs, DWC3_DCTL, reg);
+
+        return 0;
+}
+
+static int dwc3_ep0_handle_test(struct dwc3 *dwc, enum usb_device_state state,
+                u32 wIndex, int set)
+{
+        if ((wIndex & 0xff) != 0)
+                return -EINVAL;
+        if (!set)
+                return -EINVAL;
+
+        switch (wIndex >> 8) {
+        case TEST_J:
+        case TEST_K:
+        case TEST_SE0_NAK:
+        case TEST_PACKET:
+        case TEST_FORCE_EN:
+                dwc->test_mode_nr = wIndex >> 8;
+                dwc->test_mode = true;
+                break;
+        default:
+                return -EINVAL;
+        }
+
+        return 0;
+}
+
+static int dwc3_ep0_handle_device(struct dwc3 *dwc,
                 struct usb_ctrlrequest *ctrl, int set)
 {
-        struct dwc3_ep          *dep;
-        u32                     recip;
+        enum usb_device_state   state;
         u32                     wValue;
         u32                     wIndex;
-        u32                     reg;
-        int                     ret;
-        enum usb_device_state   state;
+        int                     ret = 0;
 
         wValue = le16_to_cpu(ctrl->wValue);
         wIndex = le16_to_cpu(ctrl->wIndex);
-        recip = ctrl->bRequestType & USB_RECIP_MASK;
         state = dwc->gadget.state;
 
-        switch (recip) {
-        case USB_RECIP_DEVICE:
+        switch (wValue) {
+        case USB_DEVICE_REMOTE_WAKEUP:
+                break;
+        /*
+         * 9.4.1 says only only for SS, in AddressState only for
+         * default control pipe
+         */
+        case USB_DEVICE_U1_ENABLE:
+                ret = dwc3_ep0_handle_u1(dwc, state, set);
+                break;
+        case USB_DEVICE_U2_ENABLE:
+                ret = dwc3_ep0_handle_u2(dwc, state, set);
+                break;
+        case USB_DEVICE_LTM_ENABLE:
+                ret = -EINVAL;
+                break;
+        case USB_DEVICE_TEST_MODE:
+                ret = dwc3_ep0_handle_test(dwc, state, wIndex, set);
+                break;
+        default:
+                ret = -EINVAL;
+        }
 
-                switch (wValue) {
-                case USB_DEVICE_REMOTE_WAKEUP:
-                        break;
+        return ret;
+}
+
+static int dwc3_ep0_handle_intf(struct dwc3 *dwc,
+                struct usb_ctrlrequest *ctrl, int set)
+{
+        enum usb_device_state   state;
+        u32                     wValue;
+        u32                     wIndex;
+        int                     ret = 0;
+
+        wValue = le16_to_cpu(ctrl->wValue);
+        wIndex = le16_to_cpu(ctrl->wIndex);
+        state = dwc->gadget.state;
+
+        switch (wValue) {
+        case USB_INTRF_FUNC_SUSPEND:
                 /*
-                 * 9.4.1 says only only for SS, in AddressState only for
-                 * default control pipe
+                 * REVISIT: Ideally we would enable some low power mode here,
+                 * however it's unclear what we should be doing here.
+                 *
+                 * For now, we're not doing anything, just making sure we return
+                 * 0 so USB Command Verifier tests pass without any errors.
                  */
-                case USB_DEVICE_U1_ENABLE:
-                        if (state != USB_STATE_CONFIGURED)
-                                return -EINVAL;
-                        if ((dwc->speed != DWC3_DSTS_SUPERSPEED) &&
-                            (dwc->speed != DWC3_DSTS_SUPERSPEED_PLUS))
-                                return -EINVAL;
+                break;
+        default:
+                ret = -EINVAL;
+        }
 
-                        reg = dwc3_readl(dwc->regs, DWC3_DCTL);
-                        if (set)
-                                reg |= DWC3_DCTL_INITU1ENA;
-                        else
-                                reg &= ~DWC3_DCTL_INITU1ENA;
-                        dwc3_writel(dwc->regs, DWC3_DCTL, reg);
-                        break;
+        return ret;
+}
 
-                case USB_DEVICE_U2_ENABLE:
-                        if (state != USB_STATE_CONFIGURED)
-                                return -EINVAL;
-                        if ((dwc->speed != DWC3_DSTS_SUPERSPEED) &&
-                            (dwc->speed != DWC3_DSTS_SUPERSPEED_PLUS))
-                                return -EINVAL;
+static int dwc3_ep0_handle_endpoint(struct dwc3 *dwc,
+                struct usb_ctrlrequest *ctrl, int set)
+{
+        struct dwc3_ep          *dep;
+        enum usb_device_state   state;
+        u32                     wValue;
+        u32                     wIndex;
+        int                     ret;
 
-                        reg = dwc3_readl(dwc->regs, DWC3_DCTL);
-                        if (set)
-                                reg |= DWC3_DCTL_INITU2ENA;
-                        else
-                                reg &= ~DWC3_DCTL_INITU2ENA;
-                        dwc3_writel(dwc->regs, DWC3_DCTL, reg);
-                        break;
+        wValue = le16_to_cpu(ctrl->wValue);
+        wIndex = le16_to_cpu(ctrl->wIndex);
+        state = dwc->gadget.state;
 
-                case USB_DEVICE_LTM_ENABLE:
+        switch (wValue) {
+        case USB_ENDPOINT_HALT:
+                dep = dwc3_wIndex_to_dep(dwc, ctrl->wIndex);
+                if (!dep)
                         return -EINVAL;
 
-                case USB_DEVICE_TEST_MODE:
-                        if ((wIndex & 0xff) != 0)
-                                return -EINVAL;
-                        if (!set)
-                                return -EINVAL;
-
-                        switch (wIndex >> 8) {
-                        case TEST_J:
-                        case TEST_K:
-                        case TEST_SE0_NAK:
-                        case TEST_PACKET:
-                        case TEST_FORCE_EN:
-                                dwc->test_mode_nr = wIndex >> 8;
-                                dwc->test_mode = true;
-                                break;
-                        default:
-                                return -EINVAL;
-                        }
+                if (set == 0 && (dep->flags & DWC3_EP_WEDGE))
                         break;
-                default:
+
+                ret = __dwc3_gadget_ep_set_halt(dep, set, true);
+                if (ret)
                         return -EINVAL;
-                }
                 break;
+        default:
+                return -EINVAL;
+        }
 
+        return 0;
+}
+
+static int dwc3_ep0_handle_feature(struct dwc3 *dwc,
+                struct usb_ctrlrequest *ctrl, int set)
+{
+        u32                     recip;
+        int                     ret;
+        enum usb_device_state   state;
+
+        recip = ctrl->bRequestType & USB_RECIP_MASK;
+        state = dwc->gadget.state;
+
+        switch (recip) {
+        case USB_RECIP_DEVICE:
+                ret = dwc3_ep0_handle_device(dwc, ctrl, set);
+                break;
         case USB_RECIP_INTERFACE:
-                switch (wValue) {
-                case USB_INTRF_FUNC_SUSPEND:
-                        if (wIndex & USB_INTRF_FUNC_SUSPEND_LP)
-                                /* XXX enable Low power suspend */
-                                ;
-                        if (wIndex & USB_INTRF_FUNC_SUSPEND_RW)
-                                /* XXX enable remote wakeup */
-                                ;
-                        break;
-                default:
-                        return -EINVAL;
-                }
+                ret = dwc3_ep0_handle_intf(dwc, ctrl, set);
                 break;
-
         case USB_RECIP_ENDPOINT:
-                switch (wValue) {
-                case USB_ENDPOINT_HALT:
-                        dep = dwc3_wIndex_to_dep(dwc, ctrl->wIndex);
-                        if (!dep)
-                                return -EINVAL;
-                        if (set == 0 && (dep->flags & DWC3_EP_WEDGE))
-                                break;
-                        ret = __dwc3_gadget_ep_set_halt(dep, set, true);
-                        if (ret)
-                                return -EINVAL;
-                        break;
-                default:
-                        return -EINVAL;
-                }
+                ret = dwc3_ep0_handle_endpoint(dwc, ctrl, set);
                 break;
-
         default:
-                return -EINVAL;
+                ret = -EINVAL;
         }
 
-        return 0;
+        return ret;
 }
 
 static int dwc3_ep0_set_address(struct dwc3 *dwc, struct usb_ctrlrequest *ctrl)
@@ -525,13 +569,12 @@ static int dwc3_ep0_set_address(struct dwc3 *dwc, struct usb_ctrlrequest *ctrl)
 
         addr = le16_to_cpu(ctrl->wValue);
         if (addr > 127) {
-                dwc3_trace(trace_dwc3_ep0, "invalid device address %d", addr);
+                dev_err(dwc->dev, "invalid device address %d\n", addr);
                 return -EINVAL;
         }
 
         if (state == USB_STATE_CONFIGURED) {
-                dwc3_trace(trace_dwc3_ep0,
-                                "trying to set address when configured");
+                dev_err(dwc->dev, "can't SetAddress() from Configured State\n");
                 return -EINVAL;
         }
 
@@ -716,35 +759,27 @@ static int dwc3_ep0_std_request(struct dwc3 *dwc, struct usb_ctrlrequest *ctrl)
 
         switch (ctrl->bRequest) {
         case USB_REQ_GET_STATUS:
-                dwc3_trace(trace_dwc3_ep0, "USB_REQ_GET_STATUS");
                 ret = dwc3_ep0_handle_status(dwc, ctrl);
                 break;
         case USB_REQ_CLEAR_FEATURE:
-                dwc3_trace(trace_dwc3_ep0, "USB_REQ_CLEAR_FEATURE");
                 ret = dwc3_ep0_handle_feature(dwc, ctrl, 0);
                 break;
         case USB_REQ_SET_FEATURE:
-                dwc3_trace(trace_dwc3_ep0, "USB_REQ_SET_FEATURE");
                 ret = dwc3_ep0_handle_feature(dwc, ctrl, 1);
                 break;
         case USB_REQ_SET_ADDRESS:
-                dwc3_trace(trace_dwc3_ep0, "USB_REQ_SET_ADDRESS");
                 ret = dwc3_ep0_set_address(dwc, ctrl);
                 break;
         case USB_REQ_SET_CONFIGURATION:
-                dwc3_trace(trace_dwc3_ep0, "USB_REQ_SET_CONFIGURATION");
                 ret = dwc3_ep0_set_config(dwc, ctrl);
                 break;
         case USB_REQ_SET_SEL:
-                dwc3_trace(trace_dwc3_ep0, "USB_REQ_SET_SEL");
                 ret = dwc3_ep0_set_sel(dwc, ctrl);
                 break;
         case USB_REQ_SET_ISOCH_DELAY:
-                dwc3_trace(trace_dwc3_ep0, "USB_REQ_SET_ISOCH_DELAY");
                 ret = dwc3_ep0_set_isoch_delay(dwc, ctrl);
                 break;
         default:
-                dwc3_trace(trace_dwc3_ep0, "Forwarding to gadget driver");
                 ret = dwc3_ep0_delegate_req(dwc, ctrl);
                 break;
         }
@@ -820,9 +855,6 @@ static void dwc3_ep0_complete_data(struct dwc3 *dwc,
         status = DWC3_TRB_SIZE_TRBSTS(trb->size);
         if (status == DWC3_TRBSTS_SETUP_PENDING) {
                 dwc->setup_packet_pending = true;
-
-                dwc3_trace(trace_dwc3_ep0, "Setup Pending received");
-
                 if (r)
                         dwc3_gadget_giveback(ep0, r, -ECONNRESET);
 
@@ -912,7 +944,7 @@ static void dwc3_ep0_complete_status(struct dwc3 *dwc,
 
                 ret = dwc3_gadget_set_test_mode(dwc, dwc->test_mode_nr);
                 if (ret < 0) {
-                        dwc3_trace(trace_dwc3_ep0, "Invalid Test #%d",
+                        dev_err(dwc->dev, "invalid test #%d\n",
                                         dwc->test_mode_nr);
                         dwc3_ep0_stall_and_restart(dwc);
                         return;
@@ -920,10 +952,8 @@ static void dwc3_ep0_complete_status(struct dwc3 *dwc,
         }
 
         status = DWC3_TRB_SIZE_TRBSTS(trb->size);
-        if (status == DWC3_TRBSTS_SETUP_PENDING) {
+        if (status == DWC3_TRBSTS_SETUP_PENDING)
                 dwc->setup_packet_pending = true;
-                dwc3_trace(trace_dwc3_ep0, "Setup Pending received");
-        }
 
         dwc->ep0state = EP0_SETUP_PHASE;
         dwc3_ep0_out_start(dwc);
@@ -940,17 +970,14 @@ static void dwc3_ep0_xfer_complete(struct dwc3 *dwc,
 
         switch (dwc->ep0state) {
         case EP0_SETUP_PHASE:
-                dwc3_trace(trace_dwc3_ep0, "Setup Phase");
                 dwc3_ep0_inspect_setup(dwc, event);
                 break;
 
         case EP0_DATA_PHASE:
-                dwc3_trace(trace_dwc3_ep0, "Data Phase");
                 dwc3_ep0_complete_data(dwc, event);
                 break;
 
         case EP0_STATUS_PHASE:
-                dwc3_trace(trace_dwc3_ep0, "Status Phase");
                 dwc3_ep0_complete_status(dwc, event);
                 break;
         default:
@@ -974,12 +1001,10 @@ static void __dwc3_ep0_do_control_data(struct dwc3 *dwc,
                 u32     transfer_size = 0;
                 u32     maxpacket;
 
-                ret = usb_gadget_map_request(&dwc->gadget, &req->request,
-                                dep->number);
-                if (ret) {
-                        dwc3_trace(trace_dwc3_ep0, "failed to map request");
+                ret = usb_gadget_map_request_by_dev(dwc->sysdev,
+                                &req->request, dep->number);
+                if (ret)
                         return;
-                }
 
                 maxpacket = dep->endpoint.maxpacket;
 
@@ -1002,12 +1027,10 @@ static void __dwc3_ep0_do_control_data(struct dwc3 *dwc,
                                 dwc->ep0_bounce_addr, transfer_size,
                                 DWC3_TRBCTL_CONTROL_DATA, false);
         } else {
-                ret = usb_gadget_map_request(&dwc->gadget, &req->request,
-                                dep->number);
-                if (ret) {
-                        dwc3_trace(trace_dwc3_ep0, "failed to map request");
+                ret = usb_gadget_map_request_by_dev(dwc->sysdev,
+                                &req->request, dep->number);
+                if (ret)
                         return;
-                }
 
                 ret = dwc3_ep0_start_trans(dwc, dep->number, req->request.dma,
                                 req->request.length, DWC3_TRBCTL_CONTROL_DATA,
@@ -1065,8 +1088,6 @@ static void dwc3_ep0_xfernotready(struct dwc3 *dwc,
 {
         switch (event->status) {
         case DEPEVT_STATUS_CONTROL_DATA:
-                dwc3_trace(trace_dwc3_ep0, "Control Data");
-
                 /*
                  * We already have a DATA transfer in the controller's cache,
                  * if we receive a XferNotReady(DATA) we will ignore it, unless
@@ -1079,8 +1100,7 @@ static void dwc3_ep0_xfernotready(struct dwc3 *dwc,
                 if (dwc->ep0_expect_in != event->endpoint_number) {
                         struct dwc3_ep  *dep = dwc->eps[dwc->ep0_expect_in];
 
-                        dwc3_trace(trace_dwc3_ep0,
-                                        "Wrong direction for Data phase");
+                        dev_err(dwc->dev, "unexpected direction for Data Phase\n");
                         dwc3_ep0_end_control_data(dwc, dep);
                         dwc3_ep0_stall_and_restart(dwc);
                         return;
@@ -1092,13 +1112,10 @@ static void dwc3_ep0_xfernotready(struct dwc3 *dwc,
                 if (dwc->ep0_next_event != DWC3_EP0_NRDY_STATUS)
                         return;
 
-                dwc3_trace(trace_dwc3_ep0, "Control Status");
-
                 dwc->ep0state = EP0_STATUS_PHASE;
 
                 if (dwc->delayed_status) {
                         WARN_ON_ONCE(event->endpoint_number != 1);
-                        dwc3_trace(trace_dwc3_ep0, "Delayed Status");
                         return;
                 }
 
@@ -1109,10 +1126,6 @@ static void dwc3_ep0_xfernotready(struct dwc3 *dwc,
 void dwc3_ep0_interrupt(struct dwc3 *dwc,
                 const struct dwc3_event_depevt *event)
 {
-        dwc3_trace(trace_dwc3_ep0, "%s: state '%s'",
-                        dwc3_ep_event_string(event),
-                        dwc3_ep0_state_string(dwc->ep0state));
-
         switch (event->endpoint_event) {
         case DWC3_DEPEVT_XFERCOMPLETE:
                 dwc3_ep0_xfer_complete(dwc, event);
diff --git a/drivers/usb/dwc3/gadget.c b/drivers/usb/dwc3/gadget.c
index 1dfa56a5f1c5..678559525618 100644
--- a/drivers/usb/dwc3/gadget.c
+++ b/drivers/usb/dwc3/gadget.c
@@ -139,9 +139,6 @@ int dwc3_gadget_set_link_state(struct dwc3 *dwc, enum dwc3_link_state state)
                 udelay(5);
         }
 
-        dwc3_trace(trace_dwc3_gadget,
-                        "link state change request timed out");
-
         return -ETIMEDOUT;
 }
 
@@ -178,6 +175,7 @@ void dwc3_gadget_giveback(struct dwc3_ep *dep, struct dwc3_request *req,
         req->started = false;
         list_del(&req->list);
         req->trb = NULL;
+        req->remaining = 0;
 
         if (req->request.status == -EINPROGRESS)
                 req->request.status = status;
@@ -185,8 +183,8 @@ void dwc3_gadget_giveback(struct dwc3_ep *dep, struct dwc3_request *req,
         if (dwc->ep0_bounced && dep->number == 0)
                 dwc->ep0_bounced = false;
         else
-                usb_gadget_unmap_request(&dwc->gadget, &req->request,
-                                req->direction);
+                usb_gadget_unmap_request_by_dev(dwc->sysdev,
+                                &req->request, req->direction);
 
         trace_dwc3_gadget_giveback(req);
 
@@ -216,7 +214,7 @@ int dwc3_send_gadget_generic_command(struct dwc3 *dwc, unsigned cmd, u32 param)
                                 ret = -EINVAL;
                         break;
                 }
-        } while (timeout--);
+        } while (--timeout);
 
         if (!timeout) {
                 ret = -ETIMEDOUT;
@@ -233,6 +231,7 @@ static int __dwc3_gadget_wakeup(struct dwc3 *dwc);
 int dwc3_send_gadget_ep_cmd(struct dwc3_ep *dep, unsigned cmd,
                 struct dwc3_gadget_ep_cmd_params *params)
 {
+        const struct usb_endpoint_descriptor *desc = dep->endpoint.desc;
         struct dwc3             *dwc = dep->dwc;
         u32                     timeout = 500;
         u32                     reg;
@@ -258,7 +257,7 @@ int dwc3_send_gadget_ep_cmd(struct dwc3_ep *dep, unsigned cmd,
                 }
         }
 
-        if (cmd == DWC3_DEPCMD_STARTTRANSFER) {
+        if (DWC3_DEPCMD_CMD(cmd) == DWC3_DEPCMD_STARTTRANSFER) {
                 int             needs_wakeup;
 
                 needs_wakeup = (dwc->link_state == DWC3_LINK_STATE_U1 ||
@@ -276,7 +275,28 @@ int dwc3_send_gadget_ep_cmd(struct dwc3_ep *dep, unsigned cmd,
         dwc3_writel(dep->regs, DWC3_DEPCMDPAR1, params->param1);
         dwc3_writel(dep->regs, DWC3_DEPCMDPAR2, params->param2);
 
-        dwc3_writel(dep->regs, DWC3_DEPCMD, cmd | DWC3_DEPCMD_CMDACT);
+        /*
+         * Synopsys Databook 2.60a states in section 6.3.2.5.6 of that if we're
+         * not relying on XferNotReady, we can make use of a special "No
+         * Response Update Transfer" command where we should clear both CmdAct
+         * and CmdIOC bits.
+         *
+         * With this, we don't need to wait for command completion and can
+         * straight away issue further commands to the endpoint.
+         *
+         * NOTICE: We're making an assumption that control endpoints will never
+         * make use of Update Transfer command. This is a safe assumption
+         * because we can never have more than one request at a time with
+         * Control Endpoints. If anybody changes that assumption, this chunk
+         * needs to be updated accordingly.
+         */
+        if (DWC3_DEPCMD_CMD(cmd) == DWC3_DEPCMD_UPDATETRANSFER &&
+                        !usb_endpoint_xfer_isoc(desc))
+                cmd &= ~(DWC3_DEPCMD_CMDIOC | DWC3_DEPCMD_CMDACT);
+        else
+                cmd |= DWC3_DEPCMD_CMDACT;
+
+        dwc3_writel(dep->regs, DWC3_DEPCMD, cmd);
         do {
                 reg = dwc3_readl(dep->regs, DWC3_DEPCMD);
                 if (!(reg & DWC3_DEPCMD_CMDACT)) {
@@ -318,6 +338,20 @@ int dwc3_send_gadget_ep_cmd(struct dwc3_ep *dep, unsigned cmd,
 
         trace_dwc3_gadget_ep_cmd(dep, cmd, params, cmd_status);
 
+        if (ret == 0) {
+                switch (DWC3_DEPCMD_CMD(cmd)) {
+                case DWC3_DEPCMD_STARTTRANSFER:
+                        dep->flags |= DWC3_EP_TRANSFER_STARTED;
+                        break;
+                case DWC3_DEPCMD_ENDTRANSFER:
+                        dep->flags &= ~DWC3_EP_TRANSFER_STARTED;
+                        break;
+                default:
+                        /* nothing */
+                        break;
+                }
+        }
+
         if (unlikely(susphy)) {
                 reg = dwc3_readl(dwc->regs, DWC3_GUSB2PHYCFG(0));
                 reg |= DWC3_GUSB2PHYCFG_SUSPHY;
@@ -365,7 +399,7 @@ static int dwc3_alloc_trb_pool(struct dwc3_ep *dep)
         if (dep->trb_pool)
                 return 0;
 
-        dep->trb_pool = dma_alloc_coherent(dwc->dev,
+        dep->trb_pool = dma_alloc_coherent(dwc->sysdev,
                         sizeof(struct dwc3_trb) * DWC3_TRB_NUM,
                         &dep->trb_pool_dma, GFP_KERNEL);
         if (!dep->trb_pool) {
@@ -381,7 +415,7 @@ static void dwc3_free_trb_pool(struct dwc3_ep *dep)
 {
         struct dwc3             *dwc = dep->dwc;
 
-        dma_free_coherent(dwc->dev, sizeof(struct dwc3_trb) * DWC3_TRB_NUM,
+        dma_free_coherent(dwc->sysdev, sizeof(struct dwc3_trb) * DWC3_TRB_NUM,
                         dep->trb_pool, dep->trb_pool_dma);
 
         dep->trb_pool = NULL;
@@ -454,16 +488,19 @@ static int dwc3_gadget_start_config(struct dwc3 *dwc, struct dwc3_ep *dep)
 }
 
 static int dwc3_gadget_set_ep_config(struct dwc3 *dwc, struct dwc3_ep *dep,
-                const struct usb_endpoint_descriptor *desc,
-                const struct usb_ss_ep_comp_descriptor *comp_desc,
                 bool modify, bool restore)
 {
+        const struct usb_ss_ep_comp_descriptor *comp_desc;
+        const struct usb_endpoint_descriptor *desc;
         struct dwc3_gadget_ep_cmd_params params;
 
         if (dev_WARN_ONCE(dwc->dev, modify && restore,
                                         "Can't modify and restore\n"))
                 return -EINVAL;
 
+        comp_desc = dep->endpoint.comp_desc;
+        desc = dep->endpoint.desc;
+
         memset(&params, 0x00, sizeof(params));
 
         params.param0 = DWC3_DEPCFG_EP_TYPE(usb_endpoint_type(desc))
@@ -542,24 +579,21 @@ static int dwc3_gadget_set_xfer_resource(struct dwc3 *dwc, struct dwc3_ep *dep)
  * Caller should take care of locking
  */
 static int __dwc3_gadget_ep_enable(struct dwc3_ep *dep,
-                const struct usb_endpoint_descriptor *desc,
-                const struct usb_ss_ep_comp_descriptor *comp_desc,
                 bool modify, bool restore)
 {
+        const struct usb_endpoint_descriptor *desc = dep->endpoint.desc;
         struct dwc3             *dwc = dep->dwc;
+
         u32                     reg;
         int                     ret;
 
-        dwc3_trace(trace_dwc3_gadget, "Enabling %s", dep->name);
-
         if (!(dep->flags & DWC3_EP_ENABLED)) {
                 ret = dwc3_gadget_start_config(dwc, dep);
                 if (ret)
                         return ret;
         }
 
-        ret = dwc3_gadget_set_ep_config(dwc, dep, desc, comp_desc, modify,
-                        restore);
+        ret = dwc3_gadget_set_ep_config(dwc, dep, modify, restore);
         if (ret)
                 return ret;
 
@@ -567,17 +601,18 @@ static int __dwc3_gadget_ep_enable(struct dwc3_ep *dep,
                 struct dwc3_trb *trb_st_hw;
                 struct dwc3_trb *trb_link;
 
-                dep->endpoint.desc = desc;
-                dep->comp_desc = comp_desc;
                 dep->type = usb_endpoint_type(desc);
                 dep->flags |= DWC3_EP_ENABLED;
+                dep->flags &= ~DWC3_EP_END_TRANSFER_PENDING;
 
                 reg = dwc3_readl(dwc->regs, DWC3_DALEPENA);
                 reg |= DWC3_DALEPENA_EP(dep->number);
                 dwc3_writel(dwc->regs, DWC3_DALEPENA, reg);
 
+                init_waitqueue_head(&dep->wait_end_transfer);
+
                 if (usb_endpoint_xfer_control(desc))
-                        return 0;
+                        goto out;
 
                 /* Initialize the TRB ring */
                 dep->trb_dequeue = 0;
@@ -595,6 +630,39 @@ static int __dwc3_gadget_ep_enable(struct dwc3_ep *dep,
                 trb_link->ctrl |= DWC3_TRB_CTRL_HWO;
         }
 
+        /*
+         * Issue StartTransfer here with no-op TRB so we can always rely on No
+         * Response Update Transfer command.
+         */
+        if (usb_endpoint_xfer_bulk(desc)) {
+                struct dwc3_gadget_ep_cmd_params params;
+                struct dwc3_trb *trb;
+                dma_addr_t trb_dma;
+                u32 cmd;
+
+                memset(&params, 0, sizeof(params));
+                trb = &dep->trb_pool[0];
+                trb_dma = dwc3_trb_dma_offset(dep, trb);
+
+                params.param0 = upper_32_bits(trb_dma);
+                params.param1 = lower_32_bits(trb_dma);
+
+                cmd = DWC3_DEPCMD_STARTTRANSFER;
+
+                ret = dwc3_send_gadget_ep_cmd(dep, cmd, &params);
+                if (ret < 0)
+                        return ret;
+
+                dep->flags |= DWC3_EP_BUSY;
+
+                dep->resource_index = dwc3_gadget_ep_get_transfer_index(dep);
+                WARN_ON_ONCE(!dep->resource_index);
+        }
+
+
+out:
+        trace_dwc3_gadget_ep_enable(dep);
+
         return 0;
 }
 
@@ -632,7 +700,7 @@ static int __dwc3_gadget_ep_disable(struct dwc3_ep *dep)
         struct dwc3             *dwc = dep->dwc;
         u32                     reg;
 
-        dwc3_trace(trace_dwc3_gadget, "Disabling %s", dep->name);
+        trace_dwc3_gadget_ep_disable(dep);
 
         dwc3_remove_requests(dwc, dep);
 
@@ -645,10 +713,14 @@ static int __dwc3_gadget_ep_disable(struct dwc3_ep *dep)
         dwc3_writel(dwc->regs, DWC3_DALEPENA, reg);
 
         dep->stream_capable = false;
-        dep->endpoint.desc = NULL;
-        dep->comp_desc = NULL;
         dep->type = 0;
-        dep->flags = 0;
+        dep->flags &= DWC3_EP_END_TRANSFER_PENDING;
+
+        /* Clear out the ep descriptors for non-ep0 */
+        if (dep->number > 1) {
+                dep->endpoint.comp_desc = NULL;
+                dep->endpoint.desc = NULL;
+        }
 
         return 0;
 }
@@ -695,7 +767,7 @@ static int dwc3_gadget_ep_enable(struct usb_ep *ep,
                 return 0;
 
         spin_lock_irqsave(&dwc->lock, flags);
-        ret = __dwc3_gadget_ep_enable(dep, desc, ep->comp_desc, false, false);
+        ret = __dwc3_gadget_ep_enable(dep, false, false);
         spin_unlock_irqrestore(&dwc->lock, flags);
 
         return ret;
@@ -771,10 +843,9 @@ static void dwc3_prepare_one_trb(struct dwc3_ep *dep,
                 unsigned length, unsigned chain, unsigned node)
 {
         struct dwc3_trb         *trb;
-
-        dwc3_trace(trace_dwc3_gadget, "%s: req %p dma %08llx length %d%s",
-                        dep->name, req, (unsigned long long) dma,
-                        length, chain ? " chain" : "");
+        struct dwc3             *dwc = dep->dwc;
+        struct usb_gadget       *gadget = &dwc->gadget;
+        enum usb_device_speed   speed = gadget->speed;
 
         trb = &dep->trb_pool[dep->trb_enqueue];
 
@@ -782,7 +853,6 @@ static void dwc3_prepare_one_trb(struct dwc3_ep *dep,
                 dwc3_gadget_move_started_request(req);
                 req->trb = trb;
                 req->trb_dma = dwc3_trb_dma_offset(dep, trb);
-                req->first_trb_index = dep->trb_enqueue;
                 dep->queued_requests++;
         }
 
@@ -798,10 +868,16 @@ static void dwc3_prepare_one_trb(struct dwc3_ep *dep,
                 break;
 
         case USB_ENDPOINT_XFER_ISOC:
-                if (!node)
+                if (!node) {
                         trb->ctrl = DWC3_TRBCTL_ISOCHRONOUS_FIRST;
-                else
+
+                        if (speed == USB_SPEED_HIGH) {
+                                struct usb_ep *ep = &dep->endpoint;
+                                trb->size |= DWC3_TRB_SIZE_PCM1(ep->mult - 1);
+                        }
+                } else {
                         trb->ctrl = DWC3_TRBCTL_ISOCHRONOUS;
+                }
 
                 /* always enable Interrupt on Missed ISOC */
                 trb->ctrl |= DWC3_TRB_CTRL_ISP_IMI;
@@ -816,15 +892,21 @@ static void dwc3_prepare_one_trb(struct dwc3_ep *dep,
                  * This is only possible with faulty memory because we
                  * checked it already :)
                  */
-                BUG();
+                dev_WARN(dwc->dev, "Unknown endpoint type %d\n",
+                                usb_endpoint_type(dep->endpoint.desc));
         }
 
         /* always enable Continue on Short Packet */
-        trb->ctrl |= DWC3_TRB_CTRL_CSP;
+        if (usb_endpoint_dir_out(dep->endpoint.desc)) {
+                trb->ctrl |= DWC3_TRB_CTRL_CSP;
+
+                if (req->request.short_not_ok)
+                        trb->ctrl |= DWC3_TRB_CTRL_ISP_IMI;
+        }
 
         if ((!req->request.no_interrupt && !chain) ||
                         (dwc3_calc_trbs_left(dep) == 0))
-                trb->ctrl |= DWC3_TRB_CTRL_IOC | DWC3_TRB_CTRL_ISP_IMI;
+                trb->ctrl |= DWC3_TRB_CTRL_IOC;
 
         if (chain)
                 trb->ctrl |= DWC3_TRB_CTRL_CHN;
@@ -859,6 +941,7 @@ static struct dwc3_trb *dwc3_ep_prev_trb(struct dwc3_ep *dep, u8 index)
 static u32 dwc3_calc_trbs_left(struct dwc3_ep *dep)
 {
         struct dwc3_trb         *tmp;
+        struct dwc3             *dwc = dep->dwc;
         u8                      trbs_left;
 
         /*
@@ -870,7 +953,8 @@ static u32 dwc3_calc_trbs_left(struct dwc3_ep *dep)
          */
         if (dep->trb_enqueue == dep->trb_dequeue) {
                 tmp = dwc3_ep_prev_trb(dep, dep->trb_enqueue);
-                if (tmp->ctrl & DWC3_TRB_CTRL_HWO)
+                if (dev_WARN_ONCE(dwc->dev, tmp->ctrl & DWC3_TRB_CTRL_HWO,
+                                  "%s No TRBS left\n", dep->name))
                         return 0;
 
                 return DWC3_TRB_NUM - 1;
@@ -941,6 +1025,24 @@ static void dwc3_prepare_trbs(struct dwc3_ep *dep)
         if (!dwc3_calc_trbs_left(dep))
                 return;
 
+        /*
+         * We can get in a situation where there's a request in the started list
+         * but there weren't enough TRBs to fully kick it in the first time
+         * around, so it has been waiting for more TRBs to be freed up.
+         *
+         * In that case, we should check if we have a request with pending_sgs
+         * in the started list and prepare TRBs for that request first,
+         * otherwise we will prepare TRBs completely out of order and that will
+         * break things.
+         */
+        list_for_each_entry(req, &dep->started_list, list) {
+                if (req->num_pending_sgs > 0)
+                        dwc3_prepare_one_trb_sg(dep, req);
+
+                if (!dwc3_calc_trbs_left(dep))
+                        return;
+        }
+
         list_for_each_entry_safe(req, n, &dep->pending_list, list) {
                 if (req->num_pending_sgs > 0)
                         dwc3_prepare_one_trb_sg(dep, req);
@@ -956,7 +1058,6 @@ static int __dwc3_gadget_kick_transfer(struct dwc3_ep *dep, u16 cmd_param)
 {
         struct dwc3_gadget_ep_cmd_params params;
         struct dwc3_request             *req;
-        struct dwc3                     *dwc = dep->dwc;
         int                             starting;
         int                             ret;
         u32                             cmd;
@@ -989,9 +1090,10 @@ static int __dwc3_gadget_kick_transfer(struct dwc3_ep *dep, u16 cmd_param)
                  * here and stop, unmap, free and del each of the linked
                  * requests instead of what we do now.
                  */
-                usb_gadget_unmap_request(&dwc->gadget, &req->request,
-                                req->direction);
-                list_del(&req->list);
+                if (req->trb)
+                        memset(req->trb, 0, sizeof(struct dwc3_trb));
+                dep->queued_requests--;
+                dwc3_gadget_giveback(dep, req, ret);
                 return ret;
         }
 
@@ -1005,14 +1107,21 @@ static int __dwc3_gadget_kick_transfer(struct dwc3_ep *dep, u16 cmd_param)
         return 0;
 }
 
+static int __dwc3_gadget_get_frame(struct dwc3 *dwc)
+{
+        u32                     reg;
+
+        reg = dwc3_readl(dwc->regs, DWC3_DSTS);
+        return DWC3_DSTS_SOFFN(reg);
+}
+
 static void __dwc3_gadget_start_isoc(struct dwc3 *dwc,
                 struct dwc3_ep *dep, u32 cur_uf)
 {
         u32 uf;
 
         if (list_empty(&dep->pending_list)) {
-                dwc3_trace(trace_dwc3_gadget,
-                                "ISOC ep %s run out for requests",
+                dev_info(dwc->dev, "%s: ran out of requests\n",
                                 dep->name);
                 dep->flags |= DWC3_EP_PENDING_REQUEST;
                 return;
@@ -1041,16 +1150,15 @@ static int __dwc3_gadget_ep_queue(struct dwc3_ep *dep, struct dwc3_request *req)
         int                     ret;
 
         if (!dep->endpoint.desc) {
-                dwc3_trace(trace_dwc3_gadget,
-                                "trying to queue request %p to disabled %s",
-                                &req->request, dep->endpoint.name);
+                dev_err(dwc->dev, "%s: can't queue to disabled endpoint\n",
+                                dep->name);
                 return -ESHUTDOWN;
         }
 
         if (WARN(req->dep != dep, "request %p belongs to '%s'\n",
                                 &req->request, req->dep->name)) {
-                dwc3_trace(trace_dwc3_gadget, "request %p belongs to '%s'",
-                                &req->request, req->dep->name);
+                dev_err(dwc->dev, "%s: request %p belongs to '%s'\n",
+                                dep->name, &req->request, req->dep->name);
                 return -EINVAL;
         }
 
@@ -1063,8 +1171,8 @@ static int __dwc3_gadget_ep_queue(struct dwc3_ep *dep, struct dwc3_request *req)
 
         trace_dwc3_ep_queue(req);
 
-        ret = usb_gadget_map_request(&dwc->gadget, &req->request,
-                        dep->direction);
+        ret = usb_gadget_map_request_by_dev(dwc->sysdev, &req->request,
+                                            dep->direction);
         if (ret)
                 return ret;
 
@@ -1082,10 +1190,17 @@ static int __dwc3_gadget_ep_queue(struct dwc3_ep *dep, struct dwc3_request *req)
          * errors which will force us issue EndTransfer command.
          */
         if (usb_endpoint_xfer_isoc(dep->endpoint.desc)) {
-                if ((dep->flags & DWC3_EP_PENDING_REQUEST) &&
-                                list_empty(&dep->started_list)) {
-                        dwc3_stop_active_transfer(dwc, dep->number, true);
-                        dep->flags = DWC3_EP_ENABLED;
+                if ((dep->flags & DWC3_EP_PENDING_REQUEST)) {
+                        if (dep->flags & DWC3_EP_TRANSFER_STARTED) {
+                                dwc3_stop_active_transfer(dwc, dep->number, true);
+                                dep->flags = DWC3_EP_ENABLED;
+                        } else {
+                                u32 cur_uf;
+
+                                cur_uf = __dwc3_gadget_get_frame(dwc);
+                                __dwc3_gadget_start_isoc(dwc, dep, cur_uf);
+                                dep->flags &= ~DWC3_EP_PENDING_REQUEST;
+                        }
                 }
                 return 0;
         }
@@ -1094,10 +1209,6 @@ static int __dwc3_gadget_ep_queue(struct dwc3_ep *dep, struct dwc3_request *req)
                 return 0;
 
         ret = __dwc3_gadget_kick_transfer(dep, 0);
-        if (ret && ret != -EBUSY)
-                dwc3_trace(trace_dwc3_gadget,
-                                "%s: failed to kick transfers",
-                                dep->name);
         if (ret == -EBUSY)
                 ret = 0;
 
@@ -1116,7 +1227,6 @@ static int __dwc3_gadget_ep_queue_zlp(struct dwc3 *dwc, struct dwc3_ep *dep)
         struct usb_request              *request;
         struct usb_ep                   *ep = &dep->endpoint;
 
-        dwc3_trace(trace_dwc3_gadget, "queueing ZLP");
         request = dwc3_gadget_ep_alloc_request(ep, GFP_ATOMIC);
         if (!request)
                 return -ENOMEM;
@@ -1235,9 +1345,6 @@ int __dwc3_gadget_ep_set_halt(struct dwc3_ep *dep, int value, int protocol)
 
                 if (!protocol && ((dep->direction && transfer_in_flight) ||
                                 (!dep->direction && started))) {
-                        dwc3_trace(trace_dwc3_gadget,
-                                        "%s: pending request, cannot halt",
-                                        dep->name);
                         return -EAGAIN;
                 }
 
@@ -1331,10 +1438,8 @@ static const struct usb_ep_ops dwc3_gadget_ep_ops = {
 static int dwc3_gadget_get_frame(struct usb_gadget *g)
 {
         struct dwc3             *dwc = gadget_to_dwc(g);
-        u32                     reg;
 
-        reg = dwc3_readl(dwc->regs, DWC3_DSTS);
-        return DWC3_DSTS_SOFFN(reg);
+        return __dwc3_gadget_get_frame(dwc);
 }
 
 static int __dwc3_gadget_wakeup(struct dwc3 *dwc)
@@ -1357,10 +1462,8 @@ static int __dwc3_gadget_wakeup(struct dwc3 *dwc)
 
         speed = reg & DWC3_DSTS_CONNECTSPD;
         if ((speed == DWC3_DSTS_SUPERSPEED) ||
-            (speed == DWC3_DSTS_SUPERSPEED_PLUS)) {
-                dwc3_trace(trace_dwc3_gadget, "no wakeup on SuperSpeed");
+            (speed == DWC3_DSTS_SUPERSPEED_PLUS))
                 return 0;
-        }
 
         link_state = DWC3_DSTS_USBLNKST(reg);
 
@@ -1369,9 +1472,6 @@ static int __dwc3_gadget_wakeup(struct dwc3 *dwc)
         case DWC3_LINK_STATE_U3:        /* in HS, means SUSPEND */
                 break;
         default:
-                dwc3_trace(trace_dwc3_gadget,
-                                "can't wakeup from '%s'",
-                                dwc3_gadget_link_string(link_state));
                 return -EINVAL;
         }
 
@@ -1476,11 +1576,6 @@ static int dwc3_gadget_run_stop(struct dwc3 *dwc, int is_on, int suspend)
         if (!timeout)
                 return -ETIMEDOUT;
 
-        dwc3_trace(trace_dwc3_gadget, "gadget %s data soft-%s",
-                        dwc->gadget_driver
-                        ? dwc->gadget_driver->function : "no-function",
-                        is_on ? "connect" : "disconnect");
-
         return 0;
 }
 
@@ -1492,6 +1587,21 @@ static int dwc3_gadget_pullup(struct usb_gadget *g, int is_on)
 
         is_on = !!is_on;
 
+        /*
+         * Per databook, when we want to stop the gadget, if a control transfer
+         * is still in process, complete it and get the core into setup phase.
+         */
+        if (!is_on && dwc->ep0state != EP0_SETUP_PHASE) {
+                reinit_completion(&dwc->ep0_in_setup);
+
+                ret = wait_for_completion_timeout(&dwc->ep0_in_setup,
+                                msecs_to_jiffies(DWC3_PULL_UP_TIMEOUT));
+                if (ret == 0) {
+                        dev_err(dwc->dev, "timed out waiting for SETUP phase\n");
+                        return -ETIMEDOUT;
+                }
+        }
+
         spin_lock_irqsave(&dwc->lock, flags);
         ret = dwc3_gadget_run_stop(dwc, is_on, false);
         spin_unlock_irqrestore(&dwc->lock, flags);
@@ -1509,11 +1619,13 @@ static void dwc3_gadget_enable_irq(struct dwc3 *dwc)
                         DWC3_DEVTEN_CMDCMPLTEN |
                         DWC3_DEVTEN_ERRTICERREN |
                         DWC3_DEVTEN_WKUPEVTEN |
-                        DWC3_DEVTEN_ULSTCNGEN |
                         DWC3_DEVTEN_CONNECTDONEEN |
                         DWC3_DEVTEN_USBRSTEN |
                         DWC3_DEVTEN_DISCONNEVTEN);
 
+        if (dwc->revision < DWC3_REVISION_250A)
+                reg |= DWC3_DEVTEN_ULSTCNGEN;
+
         dwc3_writel(dwc->regs, DWC3_DEVTEN, reg);
 }
 
@@ -1573,6 +1685,17 @@ static int __dwc3_gadget_start(struct dwc3 *dwc)
         int                     ret = 0;
         u32                     reg;
 
+        /*
+         * Use IMOD if enabled via dwc->imod_interval. Otherwise, if
+         * the core supports IMOD, disable it.
+         */
+        if (dwc->imod_interval) {
+                dwc3_writel(dwc->regs, DWC3_DEV_IMOD(0), dwc->imod_interval);
+                dwc3_writel(dwc->regs, DWC3_GEVNTCOUNT(0), DWC3_GEVNTCOUNT_EHB);
+        } else if (dwc3_has_imod(dwc)) {
+                dwc3_writel(dwc->regs, DWC3_DEV_IMOD(0), 0);
+        }
+
         reg = dwc3_readl(dwc->regs, DWC3_DCFG);
         reg &= ~(DWC3_DCFG_SPEED_MASK);
 
@@ -1633,16 +1756,14 @@ static int __dwc3_gadget_start(struct dwc3 *dwc)
         dwc3_gadget_ep0_desc.wMaxPacketSize = cpu_to_le16(512);
 
         dep = dwc->eps[0];
-        ret = __dwc3_gadget_ep_enable(dep, &dwc3_gadget_ep0_desc, NULL, false,
-                        false);
+        ret = __dwc3_gadget_ep_enable(dep, false, false);
         if (ret) {
                 dev_err(dwc->dev, "failed to enable %s\n", dep->name);
                 goto err0;
         }
 
         dep = dwc->eps[1];
-        ret = __dwc3_gadget_ep_enable(dep, &dwc3_gadget_ep0_desc, NULL, false,
-                        false);
+        ret = __dwc3_gadget_ep_enable(dep, false, false);
         if (ret) {
                 dev_err(dwc->dev, "failed to enable %s\n", dep->name);
                 goto err1;
@@ -1708,9 +1829,6 @@ err0:
 
 static void __dwc3_gadget_stop(struct dwc3 *dwc)
 {
-        if (pm_runtime_suspended(dwc->dev))
-                return;
-
         dwc3_gadget_disable_irq(dwc);
         __dwc3_gadget_ep_disable(dwc->eps[0]);
         __dwc3_gadget_ep_disable(dwc->eps[1]);
@@ -1720,9 +1838,30 @@ static int dwc3_gadget_stop(struct usb_gadget *g)
 {
         struct dwc3             *dwc = gadget_to_dwc(g);
         unsigned long           flags;
+        int                     epnum;
 
         spin_lock_irqsave(&dwc->lock, flags);
+
+        if (pm_runtime_suspended(dwc->dev))
+                goto out;
+
         __dwc3_gadget_stop(dwc);
+
+        for (epnum = 2; epnum < DWC3_ENDPOINTS_NUM; epnum++) {
+                struct dwc3_ep  *dep = dwc->eps[epnum];
+
+                if (!dep)
+                        continue;
+
+                if (!(dep->flags & DWC3_EP_END_TRANSFER_PENDING))
+                        continue;
+
+                wait_event_lock_irq(dep->wait_end_transfer,
+                                    !(dep->flags & DWC3_EP_END_TRANSFER_PENDING),
+                                    dwc->lock);
+        }
+
+out:
         dwc->gadget_driver      = NULL;
         spin_unlock_irqrestore(&dwc->lock, flags);
 
@@ -1765,9 +1904,13 @@ static int dwc3_gadget_init_hw_endpoints(struct dwc3 *dwc,
                                 (epnum & 1) ? "in" : "out");
 
                 dep->endpoint.name = dep->name;
-                spin_lock_init(&dep->lock);
 
-                dwc3_trace(trace_dwc3_gadget, "initializing %s", dep->name);
+                if (!(dep->number > 1)) {
+                        dep->endpoint.desc = &dwc3_gadget_ep0_desc;
+                        dep->endpoint.comp_desc = NULL;
+                }
+
+                spin_lock_init(&dep->lock);
 
                 if (epnum == 0 || epnum == 1) {
                         usb_ep_set_maxpacket_limit(&dep->endpoint, 512);
@@ -1815,15 +1958,13 @@ static int dwc3_gadget_init_endpoints(struct dwc3 *dwc)
 
         ret = dwc3_gadget_init_hw_endpoints(dwc, dwc->num_out_eps, 0);
         if (ret < 0) {
-                dwc3_trace(trace_dwc3_gadget,
-                                "failed to allocate OUT endpoints");
+                dev_err(dwc->dev, "failed to initialize OUT endpoints\n");
                 return ret;
         }
 
         ret = dwc3_gadget_init_hw_endpoints(dwc, dwc->num_in_eps, 1);
         if (ret < 0) {
-                dwc3_trace(trace_dwc3_gadget,
-                                "failed to allocate IN endpoints");
+                dev_err(dwc->dev, "failed to initialize IN endpoints\n");
                 return ret;
         }
 
@@ -1892,15 +2033,12 @@ static int __dwc3_cleanup_done_trbs(struct dwc3 *dwc, struct dwc3_ep *dep,
                 return 1;
 
         count = trb->size & DWC3_TRB_SIZE_MASK;
-        req->request.actual += count;
+        req->remaining += count;
 
         if (dep->direction) {
                 if (count) {
                         trb_status = DWC3_TRB_SIZE_TRBSTS(trb->size);
                         if (trb_status == DWC3_TRBSTS_MISSED_ISOC) {
-                                dwc3_trace(trace_dwc3_gadget,
-                                                "%s: incomplete IN transfer",
-                                                dep->name);
                                 /*
                                  * If missed isoc occurred and there is
                                  * no request queued then issue END
@@ -1946,11 +2084,10 @@ static int dwc3_cleanup_done_reqs(struct dwc3 *dwc, struct dwc3_ep *dep,
         struct dwc3_request     *req, *n;
         struct dwc3_trb         *trb;
         bool                    ioc = false;
-        int                     ret;
+        int                     ret = 0;
 
         list_for_each_entry_safe(req, n, &dep->started_list, list) {
                 unsigned length;
-                unsigned actual;
                 int chain;
 
                 length = req->request.length;
@@ -1964,6 +2101,9 @@ static int dwc3_cleanup_done_reqs(struct dwc3 *dwc, struct dwc3_ep *dep,
                         for_each_sg(sg, s, pending, i) {
                                 trb = &dep->trb_pool[dep->trb_dequeue];
 
+                                if (trb->ctrl & DWC3_TRB_CTRL_HWO)
+                                        break;
+
                                 req->sg = sg_next(s);
                                 req->num_pending_sgs--;
 
@@ -1978,17 +2118,9 @@ static int dwc3_cleanup_done_reqs(struct dwc3 *dwc, struct dwc3_ep *dep,
                                         event, status, chain);
                 }
 
-                /*
-                 * We assume here we will always receive the entire data block
-                 * which we should receive. Meaning, if we program RX to
-                 * receive 4K but we receive only 2K, we assume that's all we
-                 * should receive and we simply bounce the request back to the
-                 * gadget driver for further processing.
-                 */
-                actual = length - req->request.actual;
-                req->request.actual = actual;
+                req->request.actual = length - req->remaining;
 
-                if (ret && chain && (actual < length) && req->num_pending_sgs)
+                if ((req->request.actual < length) && req->num_pending_sgs)
                         return __dwc3_gadget_kick_transfer(dep, 0);
 
                 dwc3_gadget_giveback(dep, req, status);
@@ -2096,10 +2228,12 @@ static void dwc3_endpoint_interrupt(struct dwc3 *dwc,
 {
         struct dwc3_ep          *dep;
         u8                      epnum = event->endpoint_number;
+        u8                      cmd;
 
         dep = dwc->eps[epnum];
 
-        if (!(dep->flags & DWC3_EP_ENABLED))
+        if (!(dep->flags & DWC3_EP_ENABLED) &&
+            !(dep->flags & DWC3_EP_END_TRANSFER_PENDING))
                 return;
 
         if (epnum == 0 || epnum == 1) {
@@ -2112,9 +2246,7 @@ static void dwc3_endpoint_interrupt(struct dwc3 *dwc,
                 dep->resource_index = 0;
 
                 if (usb_endpoint_xfer_isoc(dep->endpoint.desc)) {
-                        dwc3_trace(trace_dwc3_gadget,
-                                        "%s is an Isochronous endpoint",
-                                        dep->name);
+                        dev_err(dwc->dev, "XferComplete for Isochronous endpoint\n");
                         return;
                 }
 
@@ -2127,22 +2259,11 @@ static void dwc3_endpoint_interrupt(struct dwc3 *dwc,
                 if (usb_endpoint_xfer_isoc(dep->endpoint.desc)) {
                         dwc3_gadget_start_isoc(dwc, dep, event);
                 } else {
-                        int active;
                         int ret;
 
-                        active = event->status & DEPEVT_STATUS_TRANSFER_ACTIVE;
-
-                        dwc3_trace(trace_dwc3_gadget, "%s: reason %s",
-                                        dep->name, active ? "Transfer Active"
-                                        : "Transfer Not Active");
-
                         ret = __dwc3_gadget_kick_transfer(dep, 0);
                         if (!ret || ret == -EBUSY)
                                 return;
-
-                        dwc3_trace(trace_dwc3_gadget,
-                                        "%s: failed to kick transfers",
-                                        dep->name);
                 }
 
                 break;
@@ -2152,26 +2273,16 @@ static void dwc3_endpoint_interrupt(struct dwc3 *dwc,
                                         dep->name);
                         return;
                 }
+                break;
+        case DWC3_DEPEVT_EPCMDCMPLT:
+                cmd = DEPEVT_PARAMETER_CMD(event->parameters);
 
-                switch (event->status) {
-                case DEPEVT_STREAMEVT_FOUND:
-                        dwc3_trace(trace_dwc3_gadget,
-                                        "Stream %d found and started",
-                                        event->parameters);
-
-                        break;
-                case DEPEVT_STREAMEVT_NOTFOUND:
-                        /* FALLTHROUGH */
-                default:
-                        dwc3_trace(trace_dwc3_gadget,
-                                        "unable to find suitable stream");
+                if (cmd == DWC3_DEPCMD_ENDTRANSFER) {
+                        dep->flags &= ~DWC3_EP_END_TRANSFER_PENDING;
+                        wake_up(&dep->wait_end_transfer);
                 }
                 break;
         case DWC3_DEPEVT_RXTXFIFOEVT:
-                dwc3_trace(trace_dwc3_gadget, "%s FIFO Overrun", dep->name);
-                break;
-        case DWC3_DEPEVT_EPCMDCMPLT:
-                dwc3_trace(trace_dwc3_gadget, "Endpoint Command Complete");
                 break;
         }
 }
@@ -2224,7 +2335,8 @@ static void dwc3_stop_active_transfer(struct dwc3 *dwc, u32 epnum, bool force)
 
         dep = dwc->eps[epnum];
 
-        if (!dep->resource_index)
+        if ((dep->flags & DWC3_EP_END_TRANSFER_PENDING) ||
+            !dep->resource_index)
                 return;
 
         /*
@@ -2268,25 +2380,9 @@ static void dwc3_stop_active_transfer(struct dwc3 *dwc, u32 epnum, bool force)
         dep->resource_index = 0;
         dep->flags &= ~DWC3_EP_BUSY;
 
-        if (dwc3_is_usb31(dwc) || dwc->revision < DWC3_REVISION_310A)
+        if (dwc3_is_usb31(dwc) || dwc->revision < DWC3_REVISION_310A) {
+                dep->flags |= DWC3_EP_END_TRANSFER_PENDING;
                 udelay(100);
-}
-
-static void dwc3_stop_active_transfers(struct dwc3 *dwc)
-{
-        u32 epnum;
-
-        for (epnum = 2; epnum < DWC3_ENDPOINTS_NUM; epnum++) {
-                struct dwc3_ep *dep;
-
-                dep = dwc->eps[epnum];
-                if (!dep)
-                        continue;
-
-                if (!(dep->flags & DWC3_EP_ENABLED))
-                        continue;
-
-                dwc3_remove_requests(dwc, dep);
         }
 }
 
@@ -2375,8 +2471,6 @@ static void dwc3_gadget_reset_interrupt(struct dwc3 *dwc)
         reg &= ~DWC3_DCTL_TSTCTRL_MASK;
         dwc3_writel(dwc->regs, DWC3_DCTL, reg);
         dwc->test_mode = false;
-
-        dwc3_stop_active_transfers(dwc);
         dwc3_clear_stall_all_ep(dwc);
 
         /* Reset device address to zero */
@@ -2385,32 +2479,6 @@ static void dwc3_gadget_reset_interrupt(struct dwc3 *dwc)
         dwc3_writel(dwc->regs, DWC3_DCFG, reg);
 }
 
-static void dwc3_update_ram_clk_sel(struct dwc3 *dwc, u32 speed)
-{
-        u32 reg;
-        u32 usb30_clock = DWC3_GCTL_CLK_BUS;
-
-        /*
-         * We change the clock only at SS but I dunno why I would want to do
-         * this. Maybe it becomes part of the power saving plan.
-         */
-
-        if ((speed != DWC3_DSTS_SUPERSPEED) &&
-            (speed != DWC3_DSTS_SUPERSPEED_PLUS))
-                return;
-
-        /*
-         * RAMClkSel is reset to 0 after USB reset, so it must be reprogrammed
-         * each time on Connect Done.
-         */
-        if (!usb30_clock)
-                return;
-
-        reg = dwc3_readl(dwc->regs, DWC3_GCTL);
-        reg |= DWC3_GCTL_RAMCLKSEL(usb30_clock);
-        dwc3_writel(dwc->regs, DWC3_GCTL, reg);
-}
-
 static void dwc3_gadget_conndone_interrupt(struct dwc3 *dwc)
 {
         struct dwc3_ep          *dep;
@@ -2422,7 +2490,14 @@ static void dwc3_gadget_conndone_interrupt(struct dwc3 *dwc)
         speed = reg & DWC3_DSTS_CONNECTSPD;
         dwc->speed = speed;
 
-        dwc3_update_ram_clk_sel(dwc, speed);
+        /*
+         * RAMClkSel is reset to 0 after USB reset, so it must be reprogrammed
+         * each time on Connect Done.
+         *
+         * Currently we always use the reset value. If any platform
+         * wants to set this to a different value, we need to add a
+         * setting and update GCTL.RAMCLKSEL here.
+         */
 
         switch (speed) {
         case DWC3_DSTS_SUPERSPEED_PLUS:
@@ -2504,16 +2579,14 @@ static void dwc3_gadget_conndone_interrupt(struct dwc3 *dwc)
         }
 
         dep = dwc->eps[0];
-        ret = __dwc3_gadget_ep_enable(dep, &dwc3_gadget_ep0_desc, NULL, true,
-                        false);
+        ret = __dwc3_gadget_ep_enable(dep, true, false);
         if (ret) {
                 dev_err(dwc->dev, "failed to enable %s\n", dep->name);
                 return;
         }
 
         dep = dwc->eps[1];
-        ret = __dwc3_gadget_ep_enable(dep, &dwc3_gadget_ep0_desc, NULL, true,
-                        false);
+        ret = __dwc3_gadget_ep_enable(dep, true, false);
         if (ret) {
                 dev_err(dwc->dev, "failed to enable %s\n", dep->name);
                 return;
@@ -2570,8 +2643,6 @@ static void dwc3_gadget_linksts_change_interrupt(struct dwc3 *dwc,
                         (pwropt != DWC3_GHWPARAMS1_EN_PWROPT_HIB)) {
                 if ((dwc->link_state == DWC3_LINK_STATE_U3) &&
                                 (next == DWC3_LINK_STATE_RESUME)) {
-                        dwc3_trace(trace_dwc3_gadget,
-                                        "ignoring transition U3 -> Resume");
                         return;
                 }
         }
@@ -2705,11 +2776,7 @@ static void dwc3_gadget_interrupt(struct dwc3 *dwc,
                 break;
         case DWC3_DEVICE_EVENT_EOPF:
                 /* It changed to be suspend event for version 2.30a and above */
-                if (dwc->revision < DWC3_REVISION_230A) {
-                        dwc3_trace(trace_dwc3_gadget, "End of Periodic Frame");
-                } else {
-                        dwc3_trace(trace_dwc3_gadget, "U3/L1-L2 Suspend Event");
-
+                if (dwc->revision >= DWC3_REVISION_230A) {
                         /*
                          * Ignore suspend event until the gadget enters into
                          * USB_STATE_CONFIGURED state.
@@ -2720,16 +2787,9 @@ static void dwc3_gadget_interrupt(struct dwc3 *dwc,
                 }
                 break;
         case DWC3_DEVICE_EVENT_SOF:
-                dwc3_trace(trace_dwc3_gadget, "Start of Periodic Frame");
-                break;
         case DWC3_DEVICE_EVENT_ERRATIC_ERROR:
-                dwc3_trace(trace_dwc3_gadget, "Erratic Error");
-                break;
         case DWC3_DEVICE_EVENT_CMD_CMPL:
-                dwc3_trace(trace_dwc3_gadget, "Command Complete");
-                break;
         case DWC3_DEVICE_EVENT_OVERFLOW:
-                dwc3_trace(trace_dwc3_gadget, "Overflow");
                 break;
         default:
                 dev_WARN(dwc->dev, "UNKNOWN IRQ %d\n", event->type);
@@ -2739,7 +2799,7 @@ static void dwc3_gadget_interrupt(struct dwc3 *dwc,
 static void dwc3_process_event_entry(struct dwc3 *dwc,
                 const union dwc3_event *event)
 {
-        trace_dwc3_event(event->raw);
+        trace_dwc3_event(event->raw, dwc);
 
         /* Endpoint IRQ, handle it and return early */
         if (event->type.is_devspec == 0) {
@@ -2772,7 +2832,7 @@ static irqreturn_t dwc3_process_event_buf(struct dwc3_event_buffer *evt)
         while (left > 0) {
                 union dwc3_event event;
 
-                event.raw = *(u32 *) (evt->buf + evt->lpos);
+                event.raw = *(u32 *) (evt->cache + evt->lpos);
 
                 dwc3_process_event_entry(dwc, &event);
 
@@ -2785,10 +2845,8 @@ static irqreturn_t dwc3_process_event_buf(struct dwc3_event_buffer *evt)
                  * boundary so I worry about that once we try to handle
                  * that.
                  */
-                evt->lpos = (evt->lpos + 4) % DWC3_EVENT_BUFFERS_SIZE;
+                evt->lpos = (evt->lpos + 4) % evt->length;
                 left -= 4;
-
-                dwc3_writel(dwc->regs, DWC3_GEVNTCOUNT(0), 4);
         }
 
         evt->count = 0;
@@ -2800,6 +2858,11 @@ static irqreturn_t dwc3_process_event_buf(struct dwc3_event_buffer *evt)
         reg &= ~DWC3_GEVNTSIZ_INTMASK;
         dwc3_writel(dwc->regs, DWC3_GEVNTSIZ(0), reg);
 
+        if (dwc->imod_interval) {
+                dwc3_writel(dwc->regs, DWC3_GEVNTCOUNT(0), DWC3_GEVNTCOUNT_EHB);
+                dwc3_writel(dwc->regs, DWC3_DEV_IMOD(0), dwc->imod_interval);
+        }
+
         return ret;
 }
 
@@ -2820,6 +2883,7 @@ static irqreturn_t dwc3_thread_interrupt(int irq, void *_evt)
 static irqreturn_t dwc3_check_event_buf(struct dwc3_event_buffer *evt)
 {
         struct dwc3 *dwc = evt->dwc;
+        u32 amount;
         u32 count;
         u32 reg;
 
@@ -2843,6 +2907,14 @@ static irqreturn_t dwc3_check_event_buf(struct dwc3_event_buffer *evt)
         reg |= DWC3_GEVNTSIZ_INTMASK;
         dwc3_writel(dwc->regs, DWC3_GEVNTSIZ(0), reg);
 
+        amount = min(count, evt->length - evt->lpos);
+        memcpy(evt->cache + evt->lpos, evt->buf + evt->lpos, amount);
+
+        if (amount < count)
+                memcpy(evt->cache, evt->buf, count - amount);
+
+        dwc3_writel(dwc->regs, DWC3_GEVNTCOUNT(0), count);
+
         return IRQ_WAKE_THREAD;
 }
 
@@ -2853,6 +2925,39 @@ static irqreturn_t dwc3_interrupt(int irq, void *_evt)
         return dwc3_check_event_buf(evt);
 }
 
+static int dwc3_gadget_get_irq(struct dwc3 *dwc)
+{
+        struct platform_device *dwc3_pdev = to_platform_device(dwc->dev);
+        int irq;
+
+        irq = platform_get_irq_byname(dwc3_pdev, "peripheral");
+        if (irq > 0)
+                goto out;
+
+        if (irq == -EPROBE_DEFER)
+                goto out;
+
+        irq = platform_get_irq_byname(dwc3_pdev, "dwc_usb3");
+        if (irq > 0)
+                goto out;
+
+        if (irq == -EPROBE_DEFER)
+                goto out;
+
+        irq = platform_get_irq(dwc3_pdev, 0);
+        if (irq > 0)
+                goto out;
+
+        if (irq != -EPROBE_DEFER)
+                dev_err(dwc->dev, "missing peripheral IRQ\n");
+
+        if (!irq)
+                irq = -EINVAL;
+
+out:
+        return irq;
+}
+
 /**
  * dwc3_gadget_init - Initializes gadget related registers
  * @dwc: pointer to our controller context structure
@@ -2861,35 +2966,18 @@ static irqreturn_t dwc3_interrupt(int irq, void *_evt)
  */
 int dwc3_gadget_init(struct dwc3 *dwc)
 {
-        int ret, irq;
-        struct platform_device *dwc3_pdev = to_platform_device(dwc->dev);
+        int ret;
+        int irq;
 
-        irq = platform_get_irq_byname(dwc3_pdev, "peripheral");
-        if (irq == -EPROBE_DEFER)
-                return irq;
-
-        if (irq <= 0) {
-                irq = platform_get_irq_byname(dwc3_pdev, "dwc_usb3");
-                if (irq == -EPROBE_DEFER)
-                        return irq;
-
-                if (irq <= 0) {
-                        irq = platform_get_irq(dwc3_pdev, 0);
-                        if (irq <= 0) {
-                                if (irq != -EPROBE_DEFER) {
-                                        dev_err(dwc->dev,
-                                                "missing peripheral IRQ\n");
-                                }
-                                if (!irq)
-                                        irq = -EINVAL;
-                                return irq;
-                        }
-                }
+        irq = dwc3_gadget_get_irq(dwc);
+        if (irq < 0) {
+                ret = irq;
+                goto err0;
         }
 
         dwc->irq_gadget = irq;
 
-        dwc->ctrl_req = dma_alloc_coherent(dwc->dev, sizeof(*dwc->ctrl_req),
+        dwc->ctrl_req = dma_alloc_coherent(dwc->sysdev, sizeof(*dwc->ctrl_req),
                         &dwc->ctrl_req_addr, GFP_KERNEL);
         if (!dwc->ctrl_req) {
                 dev_err(dwc->dev, "failed to allocate ctrl request\n");
@@ -2897,8 +2985,9 @@ int dwc3_gadget_init(struct dwc3 *dwc)
                 goto err0;
         }
 
-        dwc->ep0_trb = dma_alloc_coherent(dwc->dev, sizeof(*dwc->ep0_trb) * 2,
-                        &dwc->ep0_trb_addr, GFP_KERNEL);
+        dwc->ep0_trb = dma_alloc_coherent(dwc->sysdev,
+                                          sizeof(*dwc->ep0_trb) * 2,
+                                          &dwc->ep0_trb_addr, GFP_KERNEL);
         if (!dwc->ep0_trb) {
                 dev_err(dwc->dev, "failed to allocate ep0 trb\n");
                 ret = -ENOMEM;
@@ -2911,7 +3000,7 @@ int dwc3_gadget_init(struct dwc3 *dwc)
                 goto err2;
         }
 
-        dwc->ep0_bounce = dma_alloc_coherent(dwc->dev,
+        dwc->ep0_bounce = dma_alloc_coherent(dwc->sysdev,
                         DWC3_EP0_BOUNCE_SIZE, &dwc->ep0_bounce_addr,
                         GFP_KERNEL);
         if (!dwc->ep0_bounce) {
@@ -2926,6 +3015,8 @@ int dwc3_gadget_init(struct dwc3 *dwc)
                 goto err4;
         }
 
+        init_completion(&dwc->ep0_in_setup);
+
         dwc->gadget.ops                 = &dwc3_gadget_ops;
         dwc->gadget.speed               = USB_SPEED_UNKNOWN;
         dwc->gadget.sg_supported        = true;
@@ -2949,8 +3040,7 @@ int dwc3_gadget_init(struct dwc3 *dwc)
          * composite.c that we are USB 2.0 + LPM ECN.
          */
         if (dwc->revision < DWC3_REVISION_220A)
-                dwc3_trace(trace_dwc3_gadget,
-                                "Changing max_speed on rev %08x",
+                dev_info(dwc->dev, "changing max_speed on rev %08x\n",
                                 dwc->revision);
 
         dwc->gadget.max_speed           = dwc->maximum_speed;
@@ -2983,18 +3073,18 @@ err5:
 
 err4:
         dwc3_gadget_free_endpoints(dwc);
-        dma_free_coherent(dwc->dev, DWC3_EP0_BOUNCE_SIZE,
+        dma_free_coherent(dwc->sysdev, DWC3_EP0_BOUNCE_SIZE,
                         dwc->ep0_bounce, dwc->ep0_bounce_addr);
 
 err3:
         kfree(dwc->setup_buf);
 
 err2:
-        dma_free_coherent(dwc->dev, sizeof(*dwc->ep0_trb) * 2,
+        dma_free_coherent(dwc->sysdev, sizeof(*dwc->ep0_trb) * 2,
                         dwc->ep0_trb, dwc->ep0_trb_addr);
 
 err1:
-        dma_free_coherent(dwc->dev, sizeof(*dwc->ctrl_req),
+        dma_free_coherent(dwc->sysdev, sizeof(*dwc->ctrl_req),
                         dwc->ctrl_req, dwc->ctrl_req_addr);
 
 err0:
@@ -3009,16 +3099,16 @@ void dwc3_gadget_exit(struct dwc3 *dwc)
 
         dwc3_gadget_free_endpoints(dwc);
 
-        dma_free_coherent(dwc->dev, DWC3_EP0_BOUNCE_SIZE,
+        dma_free_coherent(dwc->sysdev, DWC3_EP0_BOUNCE_SIZE,
                         dwc->ep0_bounce, dwc->ep0_bounce_addr);
 
         kfree(dwc->setup_buf);
         kfree(dwc->zlp_buf);
 
-        dma_free_coherent(dwc->dev, sizeof(*dwc->ep0_trb) * 2,
+        dma_free_coherent(dwc->sysdev, sizeof(*dwc->ep0_trb) * 2,
                         dwc->ep0_trb, dwc->ep0_trb_addr);
 
-        dma_free_coherent(dwc->dev, sizeof(*dwc->ctrl_req),
+        dma_free_coherent(dwc->sysdev, sizeof(*dwc->ctrl_req),
                         dwc->ctrl_req, dwc->ctrl_req_addr);
 }
 
diff --git a/drivers/usb/dwc3/gadget.h b/drivers/usb/dwc3/gadget.h
index e4a1d974a5ae..3129bcf74d7d 100644
--- a/drivers/usb/dwc3/gadget.h
+++ b/drivers/usb/dwc3/gadget.h
@@ -62,10 +62,7 @@ struct dwc3;
 
 static inline struct dwc3_request *next_request(struct list_head *list)
 {
-        if (list_empty(list))
-                return NULL;
-
-        return list_first_entry(list, struct dwc3_request, list);
+        return list_first_entry_or_null(list, struct dwc3_request, list);
 }
 
 static inline void dwc3_gadget_move_started_request(struct dwc3_request *req)
diff --git a/drivers/usb/dwc3/host.c b/drivers/usb/dwc3/host.c
index f6533c68fed1..487f0ff6ae25 100644
--- a/drivers/usb/dwc3/host.c
+++ b/drivers/usb/dwc3/host.c
@@ -19,6 +19,39 @@
 
 #include "core.h"
 
+static int dwc3_host_get_irq(struct dwc3 *dwc)
+{
+        struct platform_device  *dwc3_pdev = to_platform_device(dwc->dev);
+        int irq;
+
+        irq = platform_get_irq_byname(dwc3_pdev, "host");
+        if (irq > 0)
+                goto out;
+
+        if (irq == -EPROBE_DEFER)
+                goto out;
+
+        irq = platform_get_irq_byname(dwc3_pdev, "dwc_usb3");
+        if (irq > 0)
+                goto out;
+
+        if (irq == -EPROBE_DEFER)
+                goto out;
+
+        irq = platform_get_irq(dwc3_pdev, 0);
+        if (irq > 0)
+                goto out;
+
+        if (irq != -EPROBE_DEFER)
+                dev_err(dwc->dev, "missing host IRQ\n");
+
+        if (!irq)
+                irq = -EINVAL;
+
+out:
+        return irq;
+}
+
 int dwc3_host_init(struct dwc3 *dwc)
 {
         struct property_entry   props[2];
@@ -27,39 +60,18 @@ int dwc3_host_init(struct dwc3 *dwc)
         struct resource         *res;
         struct platform_device  *dwc3_pdev = to_platform_device(dwc->dev);
 
-        irq = platform_get_irq_byname(dwc3_pdev, "host");
-        if (irq == -EPROBE_DEFER)
+        irq = dwc3_host_get_irq(dwc);
+        if (irq < 0)
                 return irq;
 
-        if (irq <= 0) {
-                irq = platform_get_irq_byname(dwc3_pdev, "dwc_usb3");
-                if (irq == -EPROBE_DEFER)
-                        return irq;
-
-                if (irq <= 0) {
-                        irq = platform_get_irq(dwc3_pdev, 0);
-                        if (irq <= 0) {
-                                if (irq != -EPROBE_DEFER) {
-                                        dev_err(dwc->dev,
-                                                "missing host IRQ\n");
-                                }
-                                if (!irq)
-                                        irq = -EINVAL;
-                                return irq;
-                        } else {
-                                res = platform_get_resource(dwc3_pdev,
-                                                            IORESOURCE_IRQ, 0);
-                        }
-                } else {
-                        res = platform_get_resource_byname(dwc3_pdev,
-                                                           IORESOURCE_IRQ,
-                                                           "dwc_usb3");
-                }
-
-        } else {
+        res = platform_get_resource_byname(dwc3_pdev, IORESOURCE_IRQ, "host");
+        if (!res)
                 res = platform_get_resource_byname(dwc3_pdev, IORESOURCE_IRQ,
-                                                   "host");
-        }
+                                "dwc_usb3");
+        if (!res)
+                res = platform_get_resource(dwc3_pdev, IORESOURCE_IRQ, 0);
+        if (!res)
+                return -ENOMEM;
 
         dwc->xhci_resources[1].start = irq;
         dwc->xhci_resources[1].end = irq;
@@ -72,11 +84,7 @@ int dwc3_host_init(struct dwc3 *dwc)
                 return -ENOMEM;
         }
 
-        dma_set_coherent_mask(&xhci->dev, dwc->dev->coherent_dma_mask);
-
         xhci->dev.parent        = dwc->dev;
-        xhci->dev.dma_mask      = dwc->dev->dma_mask;
-        xhci->dev.dma_parms     = dwc->dev->dma_parms;
 
         dwc->xhci = xhci;
 
@@ -99,9 +107,9 @@ int dwc3_host_init(struct dwc3 *dwc)
         }
 
         phy_create_lookup(dwc->usb2_generic_phy, "usb2-phy",
-                          dev_name(&xhci->dev));
+                          dev_name(dwc->dev));
         phy_create_lookup(dwc->usb3_generic_phy, "usb3-phy",
-                          dev_name(&xhci->dev));
+                          dev_name(dwc->dev));
 
         ret = platform_device_add(xhci);
         if (ret) {
@@ -112,9 +120,9 @@ int dwc3_host_init(struct dwc3 *dwc)
         return 0;
 err2:
         phy_remove_lookup(dwc->usb2_generic_phy, "usb2-phy",
-                          dev_name(&xhci->dev));
+                          dev_name(dwc->dev));
         phy_remove_lookup(dwc->usb3_generic_phy, "usb3-phy",
-                          dev_name(&xhci->dev));
+                          dev_name(dwc->dev));
 err1:
         platform_device_put(xhci);
         return ret;
@@ -123,8 +131,8 @@ err1:
 void dwc3_host_exit(struct dwc3 *dwc)
 {
         phy_remove_lookup(dwc->usb2_generic_phy, "usb2-phy",
-                          dev_name(&dwc->xhci->dev));
+                          dev_name(dwc->dev));
         phy_remove_lookup(dwc->usb3_generic_phy, "usb3-phy",
-                          dev_name(&dwc->xhci->dev));
+                          dev_name(dwc->dev));
         platform_device_unregister(dwc->xhci);
 }
diff --git a/drivers/usb/dwc3/io.h b/drivers/usb/dwc3/io.h
index a06f9a8fecc7..c69b06696824 100644
--- a/drivers/usb/dwc3/io.h
+++ b/drivers/usb/dwc3/io.h
@@ -40,8 +40,7 @@ static inline u32 dwc3_readl(void __iomem *base, u32 offset)
          * documentation, so we revert it back to the proper addresses, the
          * same way they are described on SNPS documentation
          */
-        dwc3_trace(trace_dwc3_readl, "addr %p value %08x",
-                        base - DWC3_GLOBALS_REGS_START + offset, value);
+        trace_dwc3_readl(base - DWC3_GLOBALS_REGS_START, offset, value);
 
         return value;
 }
@@ -60,8 +59,7 @@ static inline void dwc3_writel(void __iomem *base, u32 offset, u32 value)
          * documentation, so we revert it back to the proper addresses, the
          * same way they are described on SNPS documentation
          */
-        dwc3_trace(trace_dwc3_writel, "addr %p value %08x",
-                        base - DWC3_GLOBALS_REGS_START + offset, value);
+        trace_dwc3_writel(base - DWC3_GLOBALS_REGS_START, offset, value);
 }
 
 #endif /* __DRIVERS_USB_DWC3_IO_H */
diff --git a/drivers/usb/dwc3/trace.h b/drivers/usb/dwc3/trace.h
index d24cefd191b5..2b124f94d858 100644
--- a/drivers/usb/dwc3/trace.h
+++ b/drivers/usb/dwc3/trace.h
@@ -37,47 +37,66 @@ DECLARE_EVENT_CLASS(dwc3_log_msg,
         TP_printk("%s", __get_str(msg))
 );
 
-DEFINE_EVENT(dwc3_log_msg, dwc3_readl,
+DEFINE_EVENT(dwc3_log_msg, dwc3_gadget,
         TP_PROTO(struct va_format *vaf),
         TP_ARGS(vaf)
 );
 
-DEFINE_EVENT(dwc3_log_msg, dwc3_writel,
+DEFINE_EVENT(dwc3_log_msg, dwc3_core,
         TP_PROTO(struct va_format *vaf),
         TP_ARGS(vaf)
 );
 
-DEFINE_EVENT(dwc3_log_msg, dwc3_gadget,
+DEFINE_EVENT(dwc3_log_msg, dwc3_ep0,
         TP_PROTO(struct va_format *vaf),
         TP_ARGS(vaf)
 );
 
-DEFINE_EVENT(dwc3_log_msg, dwc3_core,
-        TP_PROTO(struct va_format *vaf),
-        TP_ARGS(vaf)
+DECLARE_EVENT_CLASS(dwc3_log_io,
+        TP_PROTO(void *base, u32 offset, u32 value),
+        TP_ARGS(base, offset, value),
+        TP_STRUCT__entry(
+                __field(void *, base)
+                __field(u32, offset)
+                __field(u32, value)
+        ),
+        TP_fast_assign(
+                __entry->base = base;
+                __entry->offset = offset;
+                __entry->value = value;
+        ),
+        TP_printk("addr %p value %08x", __entry->base + __entry->offset,
+                        __entry->value)
 );
 
-DEFINE_EVENT(dwc3_log_msg, dwc3_ep0,
-        TP_PROTO(struct va_format *vaf),
-        TP_ARGS(vaf)
+DEFINE_EVENT(dwc3_log_io, dwc3_readl,
+        TP_PROTO(void *base, u32 offset, u32 value),
+        TP_ARGS(base, offset, value)
+);
+
+DEFINE_EVENT(dwc3_log_io, dwc3_writel,
+        TP_PROTO(void *base, u32 offset, u32 value),
+        TP_ARGS(base, offset, value)
 );
 
 DECLARE_EVENT_CLASS(dwc3_log_event,
-        TP_PROTO(u32 event),
-        TP_ARGS(event),
+        TP_PROTO(u32 event, struct dwc3 *dwc),
+        TP_ARGS(event, dwc),
         TP_STRUCT__entry(
                 __field(u32, event)
+                __field(u32, ep0state)
         ),
         TP_fast_assign(
                 __entry->event = event;
+                __entry->ep0state = dwc->ep0state;
         ),
         TP_printk("event (%08x): %s", __entry->event,
-                        dwc3_decode_event(__entry->event))
+                        dwc3_decode_event(__entry->event, __entry->ep0state))
 );
 
 DEFINE_EVENT(dwc3_log_event, dwc3_event,
-        TP_PROTO(u32 event),
-        TP_ARGS(event)
+        TP_PROTO(u32 event, struct dwc3 *dwc),
+        TP_ARGS(event, dwc)
 );
 
 DECLARE_EVENT_CLASS(dwc3_log_ctrl,
@@ -237,6 +256,7 @@ DECLARE_EVENT_CLASS(dwc3_log_trb,
                 __field(u32, bph)
                 __field(u32, size)
                 __field(u32, ctrl)
+                __field(u32, type)
         ),
         TP_fast_assign(
                 snprintf(__get_str(name), DWC3_MSG_MAX, "%s", dep->name);
@@ -247,11 +267,31 @@ DECLARE_EVENT_CLASS(dwc3_log_trb,
                 __entry->bph = trb->bph;
                 __entry->size = trb->size;
                 __entry->ctrl = trb->ctrl;
+                __entry->type = usb_endpoint_type(dep->endpoint.desc);
         ),
-        TP_printk("%s: %d/%d trb %p buf %08x%08x size %d ctrl %08x (%c%c%c%c:%c%c:%s)",
+        TP_printk("%s: %d/%d trb %p buf %08x%08x size %s%d ctrl %08x (%c%c%c%c:%c%c:%s)",
                 __get_str(name), __entry->queued, __entry->allocated,
                 __entry->trb, __entry->bph, __entry->bpl,
-                __entry->size, __entry->ctrl,
+                ({char *s;
+                int pcm = ((__entry->size >> 24) & 3) + 1;
+                switch (__entry->type) {
+                case USB_ENDPOINT_XFER_INT:
+                case USB_ENDPOINT_XFER_ISOC:
+                        switch (pcm) {
+                        case 1:
+                                s = "1x ";
+                                break;
+                        case 2:
+                                s = "2x ";
+                                break;
+                        case 3:
+                                s = "3x ";
+                                break;
+                        }
+                default:
+                        s = "";
+                } s; }),
+                DWC3_TRB_SIZE_LENGTH(__entry->size), __entry->ctrl,
                 __entry->ctrl & DWC3_TRB_CTRL_HWO ? 'H' : 'h',
                 __entry->ctrl & DWC3_TRB_CTRL_LST ? 'L' : 'l',
                 __entry->ctrl & DWC3_TRB_CTRL_CHN ? 'C' : 'c',
@@ -301,6 +341,57 @@ DEFINE_EVENT(dwc3_log_trb, dwc3_complete_trb,
         TP_ARGS(dep, trb)
 );
 
+DECLARE_EVENT_CLASS(dwc3_log_ep,
+        TP_PROTO(struct dwc3_ep *dep),
+        TP_ARGS(dep),
+        TP_STRUCT__entry(
+                __dynamic_array(char, name, DWC3_MSG_MAX)
+                __field(unsigned, maxpacket)
+                __field(unsigned, maxpacket_limit)
+                __field(unsigned, max_streams)
+                __field(unsigned, maxburst)
+                __field(unsigned, flags)
+                __field(unsigned, direction)
+                __field(u8, trb_enqueue)
+                __field(u8, trb_dequeue)
+        ),
+        TP_fast_assign(
+                snprintf(__get_str(name), DWC3_MSG_MAX, "%s", dep->name);
+                __entry->maxpacket = dep->endpoint.maxpacket;
+                __entry->maxpacket_limit = dep->endpoint.maxpacket_limit;
+                __entry->max_streams = dep->endpoint.max_streams;
+                __entry->maxburst = dep->endpoint.maxburst;
+                __entry->flags = dep->flags;
+                __entry->direction = dep->direction;
+                __entry->trb_enqueue = dep->trb_enqueue;
+                __entry->trb_dequeue = dep->trb_dequeue;
+        ),
+        TP_printk("%s: mps %d/%d streams %d burst %d ring %d/%d flags %c:%c%c%c%c%c:%c:%c",
+                __get_str(name), __entry->maxpacket,
+                __entry->maxpacket_limit, __entry->max_streams,
+                __entry->maxburst, __entry->trb_enqueue,
+                __entry->trb_dequeue,
+                __entry->flags & DWC3_EP_ENABLED ? 'E' : 'e',
+                __entry->flags & DWC3_EP_STALL ? 'S' : 's',
+                __entry->flags & DWC3_EP_WEDGE ? 'W' : 'w',
+                __entry->flags & DWC3_EP_BUSY ? 'B' : 'b',
+                __entry->flags & DWC3_EP_PENDING_REQUEST ? 'P' : 'p',
+                __entry->flags & DWC3_EP_MISSED_ISOC ? 'M' : 'm',
+                __entry->flags & DWC3_EP_END_TRANSFER_PENDING ? 'E' : 'e',
+                __entry->direction ? '<' : '>'
+        )
+);
+
+DEFINE_EVENT(dwc3_log_ep, dwc3_gadget_ep_enable,
+        TP_PROTO(struct dwc3_ep *dep),
+        TP_ARGS(dep)
+);
+
+DEFINE_EVENT(dwc3_log_ep, dwc3_gadget_ep_disable,
+        TP_PROTO(struct dwc3_ep *dep),
+        TP_ARGS(dep)
+);
+
 #endif /* __DWC3_TRACE_H */
 
 /* this part has to be here */
diff --git a/drivers/usb/gadget/composite.c b/drivers/usb/gadget/composite.c
index 32176f779861..41ab61f9b6e0 100644
--- a/drivers/usb/gadget/composite.c
+++ b/drivers/usb/gadget/composite.c
@@ -201,7 +201,12 @@ ep_found:
         _ep->desc = chosen_desc;
         _ep->comp_desc = NULL;
         _ep->maxburst = 0;
-        _ep->mult = 0;
+        _ep->mult = 1;
+
+        if (g->speed == USB_SPEED_HIGH && (usb_endpoint_xfer_isoc(_ep->desc) ||
+                                usb_endpoint_xfer_int(_ep->desc)))
+                _ep->mult = usb_endpoint_maxp_mult(_ep->desc);
+
         if (!want_comp_desc)
                 return 0;
 
@@ -218,7 +223,7 @@ ep_found:
                 switch (usb_endpoint_type(_ep->desc)) {
                 case USB_ENDPOINT_XFER_ISOC:
                         /* mult: bits 1:0 of bmAttributes */
-                        _ep->mult = comp_desc->bmAttributes & 0x3;
+                        _ep->mult = (comp_desc->bmAttributes & 0x3) + 1;
                 case USB_ENDPOINT_XFER_BULK:
                 case USB_ENDPOINT_XFER_INT:
                         _ep->maxburst = comp_desc->bMaxBurst + 1;
@@ -2382,18 +2387,8 @@ EXPORT_SYMBOL_GPL(usb_composite_setup_continue);
 
 static char *composite_default_mfr(struct usb_gadget *gadget)
 {
-        char *mfr;
-        int len;
-
-        len = snprintf(NULL, 0, "%s %s with %s", init_utsname()->sysname,
-                        init_utsname()->release, gadget->name);
-        len++;
-        mfr = kmalloc(len, GFP_KERNEL);
-        if (!mfr)
-                return NULL;
-        snprintf(mfr, len, "%s %s with %s", init_utsname()->sysname,
-                        init_utsname()->release, gadget->name);
-        return mfr;
+        return kasprintf(GFP_KERNEL, "%s %s with %s", init_utsname()->sysname,
+                         init_utsname()->release, gadget->name);
 }
 
 void usb_composite_overwrite_options(struct usb_composite_dev *cdev,
diff --git a/drivers/usb/gadget/function/f_fs.c b/drivers/usb/gadget/function/f_fs.c
index 17989b72cdae..0780d8311ec6 100644
--- a/drivers/usb/gadget/function/f_fs.c
+++ b/drivers/usb/gadget/function/f_fs.c
@@ -266,7 +266,7 @@ static void ffs_ep0_complete(struct usb_ep *ep, struct usb_request *req)
 {
         struct ffs_data *ffs = req->context;
 
-        complete_all(&ffs->ep0req_completion);
+        complete(&ffs->ep0req_completion);
 }
 
 static int __ffs_ep0_queue_wait(struct ffs_data *ffs, char *data, size_t len)
diff --git a/drivers/usb/gadget/function/f_hid.c b/drivers/usb/gadget/function/f_hid.c
index e2966f87c860..7abd70b2a588 100644
--- a/drivers/usb/gadget/function/f_hid.c
+++ b/drivers/usb/gadget/function/f_hid.c
@@ -98,6 +98,60 @@ static struct hid_descriptor hidg_desc = {
         /*.desc[0].wDescriptorLenght    = DYNAMIC */
 };
 
+/* Super-Speed Support */
+
+static struct usb_endpoint_descriptor hidg_ss_in_ep_desc = {
+        .bLength                = USB_DT_ENDPOINT_SIZE,
+        .bDescriptorType        = USB_DT_ENDPOINT,
+        .bEndpointAddress       = USB_DIR_IN,
+        .bmAttributes           = USB_ENDPOINT_XFER_INT,
+        /*.wMaxPacketSize       = DYNAMIC */
+        .bInterval              = 4, /* FIXME: Add this field in the
+                                      * HID gadget configuration?
+                                      * (struct hidg_func_descriptor)
+                                      */
+};
+
+static struct usb_ss_ep_comp_descriptor hidg_ss_in_comp_desc = {
+        .bLength                = sizeof(hidg_ss_in_comp_desc),
+        .bDescriptorType        = USB_DT_SS_ENDPOINT_COMP,
+
+        /* .bMaxBurst           = 0, */
+        /* .bmAttributes        = 0, */
+        /* .wBytesPerInterval   = DYNAMIC */
+};
+
+static struct usb_endpoint_descriptor hidg_ss_out_ep_desc = {
+        .bLength                = USB_DT_ENDPOINT_SIZE,
+        .bDescriptorType        = USB_DT_ENDPOINT,
+        .bEndpointAddress       = USB_DIR_OUT,
+        .bmAttributes           = USB_ENDPOINT_XFER_INT,
+        /*.wMaxPacketSize       = DYNAMIC */
+        .bInterval              = 4, /* FIXME: Add this field in the
+                                      * HID gadget configuration?
+                                      * (struct hidg_func_descriptor)
+                                      */
+};
+
+static struct usb_ss_ep_comp_descriptor hidg_ss_out_comp_desc = {
+        .bLength                = sizeof(hidg_ss_out_comp_desc),
+        .bDescriptorType        = USB_DT_SS_ENDPOINT_COMP,
+
+        /* .bMaxBurst           = 0, */
+        /* .bmAttributes        = 0, */
+        /* .wBytesPerInterval   = DYNAMIC */
+};
+
+static struct usb_descriptor_header *hidg_ss_descriptors[] = {
+        (struct usb_descriptor_header *)&hidg_interface_desc,
+        (struct usb_descriptor_header *)&hidg_desc,
+        (struct usb_descriptor_header *)&hidg_ss_in_ep_desc,
+        (struct usb_descriptor_header *)&hidg_ss_in_comp_desc,
+        (struct usb_descriptor_header *)&hidg_ss_out_ep_desc,
+        (struct usb_descriptor_header *)&hidg_ss_out_comp_desc,
+        NULL,
+};
+
 /* High-Speed Support */
 
 static struct usb_endpoint_descriptor hidg_hs_in_ep_desc = {
@@ -624,8 +678,14 @@ static int hidg_bind(struct usb_configuration *c, struct usb_function *f)
         /* set descriptor dynamic values */
         hidg_interface_desc.bInterfaceSubClass = hidg->bInterfaceSubClass;
         hidg_interface_desc.bInterfaceProtocol = hidg->bInterfaceProtocol;
+        hidg_ss_in_ep_desc.wMaxPacketSize = cpu_to_le16(hidg->report_length);
+        hidg_ss_in_comp_desc.wBytesPerInterval =
+                                cpu_to_le16(hidg->report_length);
         hidg_hs_in_ep_desc.wMaxPacketSize = cpu_to_le16(hidg->report_length);
         hidg_fs_in_ep_desc.wMaxPacketSize = cpu_to_le16(hidg->report_length);
+        hidg_ss_out_ep_desc.wMaxPacketSize = cpu_to_le16(hidg->report_length);
+        hidg_ss_out_comp_desc.wBytesPerInterval =
+                                cpu_to_le16(hidg->report_length);
         hidg_hs_out_ep_desc.wMaxPacketSize = cpu_to_le16(hidg->report_length);
         hidg_fs_out_ep_desc.wMaxPacketSize = cpu_to_le16(hidg->report_length);
         /*
@@ -641,8 +701,13 @@ static int hidg_bind(struct usb_configuration *c, struct usb_function *f)
         hidg_hs_out_ep_desc.bEndpointAddress =
                 hidg_fs_out_ep_desc.bEndpointAddress;
 
+        hidg_ss_in_ep_desc.bEndpointAddress =
+                hidg_fs_in_ep_desc.bEndpointAddress;
+        hidg_ss_out_ep_desc.bEndpointAddress =
+                hidg_fs_out_ep_desc.bEndpointAddress;
+
         status = usb_assign_descriptors(f, hidg_fs_descriptors,
-                        hidg_hs_descriptors, NULL, NULL);
+                        hidg_hs_descriptors, hidg_ss_descriptors, NULL);
         if (status)
                 goto fail;
 
diff --git a/drivers/usb/gadget/function/f_ncm.c b/drivers/usb/gadget/function/f_ncm.c
index 639603722709..e8008fa35e1e 100644
--- a/drivers/usb/gadget/function/f_ncm.c
+++ b/drivers/usb/gadget/function/f_ncm.c
@@ -998,7 +998,7 @@ static struct sk_buff *package_for_tx(struct f_ncm *ncm)
         /* Merge the skbs */
         swap(skb2, ncm->skb_tx_data);
         if (ncm->skb_tx_data) {
-                dev_kfree_skb_any(ncm->skb_tx_data);
+                dev_consume_skb_any(ncm->skb_tx_data);
                 ncm->skb_tx_data = NULL;
         }
 
@@ -1009,7 +1009,7 @@ static struct sk_buff *package_for_tx(struct f_ncm *ncm)
         /* Copy NTB across. */
         ntb_iter = (void *) skb_put(skb2, ncm->skb_tx_ndp->len);
         memcpy(ntb_iter, ncm->skb_tx_ndp->data, ncm->skb_tx_ndp->len);
-        dev_kfree_skb_any(ncm->skb_tx_ndp);
+        dev_consume_skb_any(ncm->skb_tx_ndp);
         ncm->skb_tx_ndp = NULL;
 
         /* Insert zero'd datagram. */
@@ -1078,6 +1078,7 @@ static struct sk_buff *ncm_wrap_ntb(struct gether *port,
                         if (!ncm->skb_tx_data)
                                 goto err;
 
+                        ncm->skb_tx_data->dev = ncm->netdev;
                         ntb_data = (void *) skb_put(ncm->skb_tx_data, ncb_len);
                         memset(ntb_data, 0, ncb_len);
                         /* dwSignature */
@@ -1096,6 +1097,8 @@ static struct sk_buff *ncm_wrap_ntb(struct gether *port,
                                                     GFP_ATOMIC);
                         if (!ncm->skb_tx_ndp)
                                 goto err;
+
+                        ncm->skb_tx_ndp->dev = ncm->netdev;
                         ntb_ndp = (void *) skb_put(ncm->skb_tx_ndp,
                                                     opts->ndp_size);
                         memset(ntb_ndp, 0, ncb_len);
@@ -1133,7 +1136,7 @@ static struct sk_buff *ncm_wrap_ntb(struct gether *port,
                 memset(ntb_data, 0, dgram_pad);
                 ntb_data = (void *) skb_put(ncm->skb_tx_data, skb->len);
                 memcpy(ntb_data, skb->data, skb->len);
-                dev_kfree_skb_any(skb);
+                dev_consume_skb_any(skb);
                 skb = NULL;
 
         } else if (ncm->skb_tx_data && ncm->timer_force_tx) {
@@ -1329,7 +1332,7 @@ static int ncm_unwrap_ntb(struct gether *port,
                 } while (ndp_len > 2 * (opts->dgram_item_len * 2));
         } while (ndp_index);
 
-        dev_kfree_skb_any(skb);
+        dev_consume_skb_any(skb);
 
         VDBG(port->func.config->cdev,
              "Parsed NTB with %d frames\n", dgram_counter);
diff --git a/drivers/usb/gadget/function/f_uac2.c b/drivers/usb/gadget/function/f_uac2.c
index cd214ec8a601..969cfe741380 100644
--- a/drivers/usb/gadget/function/f_uac2.c
+++ b/drivers/usb/gadget/function/f_uac2.c
@@ -1067,13 +1067,13 @@ afunc_bind(struct usb_configuration *cfg, struct usb_function *fn)
         agdev->out_ep = usb_ep_autoconfig(gadget, &fs_epout_desc);
         if (!agdev->out_ep) {
                 dev_err(dev, "%s:%d Error!\n", __func__, __LINE__);
-                goto err;
+                return ret;
         }
 
         agdev->in_ep = usb_ep_autoconfig(gadget, &fs_epin_desc);
         if (!agdev->in_ep) {
                 dev_err(dev, "%s:%d Error!\n", __func__, __LINE__);
-                goto err;
+                return ret;
         }
 
         uac2->p_prm.uac2 = uac2;
@@ -1091,7 +1091,7 @@ afunc_bind(struct usb_configuration *cfg, struct usb_function *fn)
         ret = usb_assign_descriptors(fn, fs_audio_desc, hs_audio_desc, NULL,
                                      NULL);
         if (ret)
-                goto err;
+                return ret;
 
         prm = &agdev->uac2.c_prm;
         prm->max_psize = hs_epout_desc.wMaxPacketSize;
@@ -1106,19 +1106,19 @@ afunc_bind(struct usb_configuration *cfg, struct usb_function *fn)
         prm->rbuf = kzalloc(prm->max_psize * USB_XFERS, GFP_KERNEL);
         if (!prm->rbuf) {
                 prm->max_psize = 0;
-                goto err_free_descs;
+                goto err;
         }
 
         ret = alsa_uac2_init(agdev);
         if (ret)
-                goto err_free_descs;
+                goto err;
         return 0;
 
-err_free_descs:
-        usb_free_all_descriptors(fn);
 err:
         kfree(agdev->uac2.p_prm.rbuf);
         kfree(agdev->uac2.c_prm.rbuf);
+err_free_descs:
+        usb_free_all_descriptors(fn);
         return -EINVAL;
 }
 
diff --git a/drivers/usb/gadget/function/rndis.c b/drivers/usb/gadget/function/rndis.c
index ab6ac1b74ac0..a3b5e468b116 100644
--- a/drivers/usb/gadget/function/rndis.c
+++ b/drivers/usb/gadget/function/rndis.c
@@ -80,8 +80,7 @@ static const struct file_operations rndis_proc_fops;
 #endif /* CONFIG_USB_GADGET_DEBUG_FILES */
 
 /* supported OIDs */
-static const u32 oid_supported_list[] =
-{
+static const u32 oid_supported_list[] = {
         /* the general stuff */
         RNDIS_OID_GEN_SUPPORTED_LIST,
         RNDIS_OID_GEN_HARDWARE_STATUS,
@@ -474,8 +473,7 @@ static int gen_ndis_query_resp(struct rndis_params *params, u32 OID, u8 *buf,
                 break;
 
         default:
-                pr_warning("%s: query unknown OID 0x%08X\n",
-                         __func__, OID);
+                pr_warn("%s: query unknown OID 0x%08X\n", __func__, OID);
         }
         if (retval < 0)
                 length = 0;
@@ -546,8 +544,8 @@ static int gen_ndis_set_resp(struct rndis_params *params, u32 OID,
                 break;
 
         default:
-                pr_warning("%s: set unknown OID 0x%08X, size %d\n",
-                         __func__, OID, buf_len);
+                pr_warn("%s: set unknown OID 0x%08X, size %d\n",
+                        __func__, OID, buf_len);
         }
 
         return retval;
@@ -854,7 +852,7 @@ int rndis_msg_parser(struct rndis_params *params, u8 *buf)
                  * In one case those messages seemed to relate to the host
                  * suspending itself.
                  */
-                pr_warning("%s: unknown RNDIS message 0x%08X len %d\n",
+                pr_warn("%s: unknown RNDIS message 0x%08X len %d\n",
                         __func__, MsgType, MsgLength);
                 print_hex_dump_bytes(__func__, DUMP_PREFIX_OFFSET,
                                      buf, MsgLength);
diff --git a/drivers/usb/gadget/function/rndis.h b/drivers/usb/gadget/function/rndis.h
index ef92eb66d8ad..21e0430ffb98 100644
--- a/drivers/usb/gadget/function/rndis.h
+++ b/drivers/usb/gadget/function/rndis.h
@@ -22,8 +22,7 @@
 #define RNDIS_MAXIMUM_FRAME_SIZE        1518
 #define RNDIS_MAX_TOTAL_SIZE            1558
 
-typedef struct rndis_init_msg_type
-{
+typedef struct rndis_init_msg_type {
         __le32  MessageType;
         __le32  MessageLength;
         __le32  RequestID;
@@ -32,8 +31,7 @@ typedef struct rndis_init_msg_type
         __le32  MaxTransferSize;
 } rndis_init_msg_type;
 
-typedef struct rndis_init_cmplt_type
-{
+typedef struct rndis_init_cmplt_type {
         __le32  MessageType;
         __le32  MessageLength;
         __le32  RequestID;
@@ -49,15 +47,13 @@ typedef struct rndis_init_cmplt_type
         __le32  AFListSize;
 } rndis_init_cmplt_type;
 
-typedef struct rndis_halt_msg_type
-{
+typedef struct rndis_halt_msg_type {
         __le32  MessageType;
         __le32  MessageLength;
         __le32  RequestID;
 } rndis_halt_msg_type;
 
-typedef struct rndis_query_msg_type
-{
+typedef struct rndis_query_msg_type {
         __le32  MessageType;
         __le32  MessageLength;
         __le32  RequestID;
@@ -67,8 +63,7 @@ typedef struct rndis_query_msg_type
         __le32  DeviceVcHandle;
 } rndis_query_msg_type;
 
-typedef struct rndis_query_cmplt_type
-{
+typedef struct rndis_query_cmplt_type {
         __le32  MessageType;
         __le32  MessageLength;
         __le32  RequestID;
@@ -77,8 +72,7 @@ typedef struct rndis_query_cmplt_type
         __le32  InformationBufferOffset;
 } rndis_query_cmplt_type;
 
-typedef struct rndis_set_msg_type
-{
+typedef struct rndis_set_msg_type {
         __le32  MessageType;
         __le32  MessageLength;
         __le32  RequestID;
@@ -88,31 +82,27 @@ typedef struct rndis_set_msg_type
         __le32  DeviceVcHandle;
 } rndis_set_msg_type;
 
-typedef struct rndis_set_cmplt_type
-{
+typedef struct rndis_set_cmplt_type {
         __le32  MessageType;
         __le32  MessageLength;
         __le32  RequestID;
         __le32  Status;
 } rndis_set_cmplt_type;
 
-typedef struct rndis_reset_msg_type
-{
+typedef struct rndis_reset_msg_type {
         __le32  MessageType;
         __le32  MessageLength;
         __le32  Reserved;
 } rndis_reset_msg_type;
 
-typedef struct rndis_reset_cmplt_type
-{
+typedef struct rndis_reset_cmplt_type {
         __le32  MessageType;
         __le32  MessageLength;
         __le32  Status;
         __le32  AddressingReset;
 } rndis_reset_cmplt_type;
 
-typedef struct rndis_indicate_status_msg_type
-{
+typedef struct rndis_indicate_status_msg_type {
         __le32  MessageType;
         __le32  MessageLength;
         __le32  Status;
@@ -120,23 +110,20 @@ typedef struct rndis_indicate_status_msg_type
         __le32  StatusBufferOffset;
 } rndis_indicate_status_msg_type;
 
-typedef struct rndis_keepalive_msg_type
-{
+typedef struct rndis_keepalive_msg_type {
         __le32  MessageType;
         __le32  MessageLength;
         __le32  RequestID;
 } rndis_keepalive_msg_type;
 
-typedef struct rndis_keepalive_cmplt_type
-{
+typedef struct rndis_keepalive_cmplt_type {
         __le32  MessageType;
         __le32  MessageLength;
         __le32  RequestID;
         __le32  Status;
 } rndis_keepalive_cmplt_type;
 
-struct rndis_packet_msg_type
-{
+struct rndis_packet_msg_type {
         __le32  MessageType;
         __le32  MessageLength;
         __le32  DataOffset;
@@ -150,8 +137,7 @@ struct rndis_packet_msg_type
         __le32  Reserved;
 } __attribute__ ((packed));
 
-struct rndis_config_parameter
-{
+struct rndis_config_parameter {
         __le32  ParameterNameOffset;
         __le32  ParameterNameLength;
         __le32  ParameterType;
@@ -160,23 +146,20 @@ struct rndis_config_parameter
 };
 
 /* implementation specific */
-enum rndis_state
-{
+enum rndis_state {
         RNDIS_UNINITIALIZED,
         RNDIS_INITIALIZED,
         RNDIS_DATA_INITIALIZED,
 };
 
-typedef struct rndis_resp_t
-{
+typedef struct rndis_resp_t {
         struct list_head        list;
         u8                      *buf;
         u32                     length;
         int                     send;
 } rndis_resp_t;
 
-typedef struct rndis_params
-{
+typedef struct rndis_params {
         int                     confignr;
         u8                      used;
         u16                     saved_filter;
diff --git a/drivers/usb/gadget/function/u_ether.c b/drivers/usb/gadget/function/u_ether.c
index 84a1709e0784..b4e5d6dfd549 100644
--- a/drivers/usb/gadget/function/u_ether.c
+++ b/drivers/usb/gadget/function/u_ether.c
@@ -215,7 +215,7 @@ rx_submit(struct eth_dev *dev, struct usb_request *req, gfp_t gfp_flags)
         if (dev->port_usb->is_fixed)
                 size = max_t(size_t, size, dev->port_usb->fixed_out_len);
 
-        skb = alloc_skb(size + NET_IP_ALIGN, gfp_flags);
+        skb = __netdev_alloc_skb(dev->net, size + NET_IP_ALIGN, gfp_flags);
         if (skb == NULL) {
                 DBG(dev, "no rx skb\n");
                 goto enomem;
@@ -446,16 +446,17 @@ static void tx_complete(struct usb_ep *ep, struct usb_request *req)
                 /* FALLTHROUGH */
         case -ECONNRESET:               /* unlink */
         case -ESHUTDOWN:                /* disconnect etc */
+                dev_kfree_skb_any(skb);
                 break;
         case 0:
                 dev->net->stats.tx_bytes += skb->len;
+                dev_consume_skb_any(skb);
         }
         dev->net->stats.tx_packets++;
 
         spin_lock(&dev->req_lock);
         list_add(&req->list, &dev->tx_reqs);
         spin_unlock(&dev->req_lock);
-        dev_kfree_skb_any(skb);
 
         atomic_dec(&dev->tx_qlen);
         if (netif_carrier_ok(dev->net))
diff --git a/drivers/usb/gadget/function/u_serial.c b/drivers/usb/gadget/function/u_serial.c
index e0cd1e4c8892..000677c991b0 100644
--- a/drivers/usb/gadget/function/u_serial.c
+++ b/drivers/usb/gadget/function/u_serial.c
@@ -622,8 +622,8 @@ static void gs_write_complete(struct usb_ep *ep, struct usb_request *req)
         switch (req->status) {
         default:
                 /* presumably a transient fault */
-                pr_warning("%s: unexpected %s status %d\n",
-                                __func__, ep->name, req->status);
+                pr_warn("%s: unexpected %s status %d\n",
+                        __func__, ep->name, req->status);
                 /* FALL THROUGH */
         case 0:
                 /* normal completion */
@@ -1256,7 +1256,8 @@ static void gserial_console_exit(void)
         struct gscons_info *info = &gscons_info;
 
         unregister_console(&gserial_cons);
-        kthread_stop(info->console_thread);
+        if (info->console_thread != NULL)
+                kthread_stop(info->console_thread);
         gs_buf_free(&info->con_buf);
 }
 
diff --git a/drivers/usb/gadget/function/uvc.h b/drivers/usb/gadget/function/uvc.h
index 7d3bb6272e06..11d70dead32b 100644
--- a/drivers/usb/gadget/function/uvc.h
+++ b/drivers/usb/gadget/function/uvc.h
@@ -26,14 +26,12 @@
 #define UVC_EVENT_DATA                  (V4L2_EVENT_PRIVATE_START + 5)
 #define UVC_EVENT_LAST                  (V4L2_EVENT_PRIVATE_START + 5)
 
-struct uvc_request_data
-{
+struct uvc_request_data {
         __s32 length;
         __u8 data[60];
 };
 
-struct uvc_event
-{
+struct uvc_event {
         union {
                 enum usb_device_speed speed;
                 struct usb_ctrlrequest req;
@@ -104,8 +102,7 @@ extern unsigned int uvc_gadget_trace_param;
  * Structures
  */
 
-struct uvc_video
-{
+struct uvc_video {
         struct usb_ep *ep;
 
         /* Frame parameters */
@@ -134,15 +131,13 @@ struct uvc_video
         unsigned int fid;
 };
 
-enum uvc_state
-{
+enum uvc_state {
         UVC_STATE_DISCONNECTED,
         UVC_STATE_CONNECTED,
         UVC_STATE_STREAMING,
 };
 
-struct uvc_device
-{
+struct uvc_device {
         struct video_device vdev;
         struct v4l2_device v4l2_dev;
         enum uvc_state state;
@@ -175,8 +170,7 @@ static inline struct uvc_device *to_uvc(struct usb_function *f)
         return container_of(f, struct uvc_device, func);
 }
 
-struct uvc_file_handle
-{
+struct uvc_file_handle {
         struct v4l2_fh vfh;
         struct uvc_video *device;
 };
diff --git a/drivers/usb/gadget/function/uvc_v4l2.c b/drivers/usb/gadget/function/uvc_v4l2.c
index f4ccbd56f4d2..3e22b45687d3 100644
--- a/drivers/usb/gadget/function/uvc_v4l2.c
+++ b/drivers/usb/gadget/function/uvc_v4l2.c
@@ -53,8 +53,7 @@ uvc_send_response(struct uvc_device *uvc, struct uvc_request_data *data)
  * V4L2 ioctls
  */
 
-struct uvc_format
-{
+struct uvc_format {
         u8 bpp;
         u32 fcc;
 };
diff --git a/drivers/usb/gadget/function/uvc_video.c b/drivers/usb/gadget/function/uvc_video.c
index 3d0d5d94a62f..0f01c04d7cbd 100644
--- a/drivers/usb/gadget/function/uvc_video.c
+++ b/drivers/usb/gadget/function/uvc_video.c
@@ -243,7 +243,7 @@ uvc_video_alloc_requests(struct uvc_video *video)
 
         req_size = video->ep->maxpacket
                  * max_t(unsigned int, video->ep->maxburst, 1)
-                 * (video->ep->mult + 1);
+                 * (video->ep->mult);
 
         for (i = 0; i < UVC_NUM_REQUESTS; ++i) {
                 video->req_buffer[i] = kmalloc(req_size, GFP_KERNEL);
diff --git a/drivers/usb/gadget/udc/at91_udc.h b/drivers/usb/gadget/udc/at91_udc.h
index 0a433e6b346b..9bbe72764f31 100644
--- a/drivers/usb/gadget/udc/at91_udc.h
+++ b/drivers/usb/gadget/udc/at91_udc.h
@@ -175,7 +175,7 @@ struct at91_request {
 #endif
 
 #define ERR(stuff...)           pr_err("udc: " stuff)
-#define WARNING(stuff...)       pr_warning("udc: " stuff)
+#define WARNING(stuff...)       pr_warn("udc: " stuff)
 #define INFO(stuff...)          pr_info("udc: " stuff)
 #define DBG(stuff...)           pr_debug("udc: " stuff)
 
diff --git a/drivers/usb/gadget/udc/atmel_usba_udc.c b/drivers/usb/gadget/udc/atmel_usba_udc.c
index 45bc997d0711..f3212db9bc37 100644
--- a/drivers/usb/gadget/udc/atmel_usba_udc.c
+++ b/drivers/usb/gadget/udc/atmel_usba_udc.c
@@ -529,7 +529,7 @@ usba_ep_enable(struct usb_ep *_ep, const struct usb_endpoint_descriptor *desc)
 
         DBG(DBG_GADGET, "%s: ep_enable: desc=%p\n", ep->ep.name, desc);
 
-        maxpacket = usb_endpoint_maxp(desc) & 0x7ff;
+        maxpacket = usb_endpoint_maxp(desc);
 
         if (((desc->bEndpointAddress & USB_ENDPOINT_NUMBER_MASK) != ep->index)
                         || ep->index == 0
@@ -573,7 +573,7 @@ usba_ep_enable(struct usb_ep *_ep, const struct usb_endpoint_descriptor *desc)
                  * Bits 11:12 specify number of _additional_
                  * transactions per microframe.
                  */
-                nr_trans = ((usb_endpoint_maxp(desc) >> 11) & 3) + 1;
+                nr_trans = usb_endpoint_maxp_mult(desc);
                 if (nr_trans > 3)
                         return -EINVAL;
 
@@ -1464,8 +1464,8 @@ restart:
                 pkt_len = USBA_BFEXT(BYTE_COUNT, usba_ep_readl(ep, STA));
                 DBG(DBG_HW, "Packet length: %u\n", pkt_len);
                 if (pkt_len != sizeof(crq)) {
-                        pr_warning("udc: Invalid packet length %u "
-                                "(expected %zu)\n", pkt_len, sizeof(crq));
+                        pr_warn("udc: Invalid packet length %u (expected %zu)\n",
+                                pkt_len, sizeof(crq));
                         set_protocol_stall(udc, ep);
                         return;
                 }
diff --git a/drivers/usb/gadget/udc/bdc/bdc_cmd.c b/drivers/usb/gadget/udc/bdc/bdc_cmd.c
index 4d5e9188beae..6e920f1dce02 100644
--- a/drivers/usb/gadget/udc/bdc/bdc_cmd.c
+++ b/drivers/usb/gadget/udc/bdc/bdc_cmd.c
@@ -182,7 +182,7 @@ int bdc_config_ep(struct bdc *bdc, struct bdc_ep *ep)
                                         usb_endpoint_xfer_int(desc)) {
                         param2 |= si;
 
-                        mbs = (usb_endpoint_maxp(desc) & 0x1800) >> 11;
+                        mbs = usb_endpoint_maxp_mult(desc);
                         param2 |= mbs << MB_SHIFT;
                 }
                 break;
diff --git a/drivers/usb/gadget/udc/bdc/bdc_ep.c b/drivers/usb/gadget/udc/bdc/bdc_ep.c
index ccaa74ab6c0e..ff1ef24d1777 100644
--- a/drivers/usb/gadget/udc/bdc/bdc_ep.c
+++ b/drivers/usb/gadget/udc/bdc/bdc_ep.c
@@ -446,7 +446,7 @@ static int setup_bd_list_xfr(struct bdc *bdc, struct bdc_req *req, int num_bds)
         bd_xfr->start_bdi = bd_list->eqp_bdi;
         bd = bdi_to_bd(ep, bd_list->eqp_bdi);
         req_len = req->usb_req.length;
-        maxp = usb_endpoint_maxp(ep->desc) & 0x7ff;
+        maxp = usb_endpoint_maxp(ep->desc);
         tfs = roundup(req->usb_req.length, maxp);
         tfs = tfs/maxp;
         dev_vdbg(bdc->dev, "%s ep:%s num_bds:%d tfs:%d r_len:%d bd:%p\n",
diff --git a/drivers/usb/gadget/udc/dummy_hcd.c b/drivers/usb/gadget/udc/dummy_hcd.c
index 77d07904f932..02b14e91ae6c 100644
--- a/drivers/usb/gadget/udc/dummy_hcd.c
+++ b/drivers/usb/gadget/udc/dummy_hcd.c
@@ -503,7 +503,7 @@ static int dummy_enable(struct usb_ep *_ep,
          * maximum packet size.
          * For SS devices the wMaxPacketSize is limited by 1024.
          */
-        max = usb_endpoint_maxp(desc) & 0x7ff;
+        max = usb_endpoint_maxp(desc);
 
         /* drivers must not request bad settings, since lower levels
          * (hardware or its drivers) may not check.  some endpoints
@@ -1483,8 +1483,7 @@ static int periodic_bytes(struct dummy *dum, struct dummy_ep *ep)
                 int     tmp;
 
                 /* high bandwidth mode */
-                tmp = usb_endpoint_maxp(ep->desc);
-                tmp = (tmp >> 11) & 0x03;
+                tmp = usb_endpoint_maxp_mult(ep->desc);
                 tmp *= 8 /* applies to entire frame */;
                 limit += limit * tmp;
         }
diff --git a/drivers/usb/gadget/udc/fsl_udc_core.c b/drivers/usb/gadget/udc/fsl_udc_core.c
index aab5221d6c2e..71094e479a96 100644
--- a/drivers/usb/gadget/udc/fsl_udc_core.c
+++ b/drivers/usb/gadget/udc/fsl_udc_core.c
@@ -585,8 +585,7 @@ static int fsl_ep_enable(struct usb_ep *_ep,
                 break;
         case USB_ENDPOINT_XFER_ISOC:
                 /* Calculate transactions needed for high bandwidth iso */
-                mult = (unsigned char)(1 + ((max >> 11) & 0x03));
-                max = max & 0x7ff;      /* bit 0~10 */
+                mult = usb_endpoint_maxp_mult(desc);
                 /* 3 transactions at most */
                 if (mult > 3)
                         goto en_done;
diff --git a/drivers/usb/gadget/udc/fsl_usb2_udc.h b/drivers/usb/gadget/udc/fsl_usb2_udc.h
index 84715625b2b3..e92b8408b6f6 100644
--- a/drivers/usb/gadget/udc/fsl_usb2_udc.h
+++ b/drivers/usb/gadget/udc/fsl_usb2_udc.h
@@ -554,7 +554,7 @@ static void dump_msg(const char *label, const u8 * buf, unsigned int length)
 #endif
 
 #define ERR(stuff...)           pr_err("udc: " stuff)
-#define WARNING(stuff...)               pr_warning("udc: " stuff)
+#define WARNING(stuff...)       pr_warn("udc: " stuff)
 #define INFO(stuff...)          pr_info("udc: " stuff)
 
 /*-------------------------------------------------------------------------*/
diff --git a/drivers/usb/gadget/udc/fusb300_udc.c b/drivers/usb/gadget/udc/fusb300_udc.c
index 948845c90e47..42ff308578df 100644
--- a/drivers/usb/gadget/udc/fusb300_udc.c
+++ b/drivers/usb/gadget/udc/fusb300_udc.c
@@ -218,7 +218,7 @@ static int config_ep(struct fusb300_ep *ep,
            (info.type == USB_ENDPOINT_XFER_ISOC)) {
                 info.interval = desc->bInterval;
                 if (info.type == USB_ENDPOINT_XFER_ISOC)
-                        info.bw_num = ((desc->wMaxPacketSize & 0x1800) >> 11);
+                        info.bw_num = usb_endpoint_maxp_mult(desc);
         }
 
         ep_fifo_setting(fusb300, info);
diff --git a/drivers/usb/gadget/udc/gr_udc.c b/drivers/usb/gadget/udc/gr_udc.c
index 39b7136d31d9..b16f8af34050 100644
--- a/drivers/usb/gadget/udc/gr_udc.c
+++ b/drivers/usb/gadget/udc/gr_udc.c
@@ -1539,7 +1539,7 @@ static int gr_ep_enable(struct usb_ep *_ep,
          * additional transactions.
          */
         max = 0x7ff & usb_endpoint_maxp(desc);
-        nt = 0x3 & (usb_endpoint_maxp(desc) >> 11);
+        nt = usb_endpoint_maxp_mult(desc) - 1;
         buffer_size = GR_BUFFER_SIZE(epctrl);
         if (nt && (mode == 0 || mode == 2)) {
                 dev_err(dev->dev,
diff --git a/drivers/usb/gadget/udc/m66592-udc.c b/drivers/usb/gadget/udc/m66592-udc.c
index 6e977dc22570..de3e03483659 100644
--- a/drivers/usb/gadget/udc/m66592-udc.c
+++ b/drivers/usb/gadget/udc/m66592-udc.c
@@ -637,7 +637,7 @@ static void init_controller(struct m66592 *m66592)
                         clock = M66592_XTAL48;
                         break;
                 default:
-                        pr_warning("m66592-udc: xtal configuration error\n");
+                        pr_warn("m66592-udc: xtal configuration error\n");
                         clock = 0;
                 }
 
@@ -649,7 +649,7 @@ static void init_controller(struct m66592 *m66592)
                         irq_sense = 0;
                         break;
                 default:
-                        pr_warning("m66592-udc: irq trigger config error\n");
+                        pr_warn("m66592-udc: irq trigger config error\n");
                         irq_sense = 0;
                 }
 
diff --git a/drivers/usb/gadget/udc/mv_u3d_core.c b/drivers/usb/gadget/udc/mv_u3d_core.c
index b9e19a591322..8d726bd767fd 100644
--- a/drivers/usb/gadget/udc/mv_u3d_core.c
+++ b/drivers/usb/gadget/udc/mv_u3d_core.c
@@ -462,6 +462,12 @@ static int mv_u3d_req_to_trb(struct mv_u3d_req *req)
                                         req->trb_head->trb_hw,
                                         trb_num * sizeof(*trb_hw),
                                         DMA_BIDIRECTIONAL);
+                if (dma_mapping_error(u3d->gadget.dev.parent,
+                                        req->trb_head->trb_dma)) {
+                        kfree(req->trb_head->trb_hw);
+                        kfree(req->trb_head);
+                        return -EFAULT;
+                }
 
                 req->chain = 1;
         }
@@ -487,30 +493,32 @@ mv_u3d_start_queue(struct mv_u3d_ep *ep)
         ret = usb_gadget_map_request(&u3d->gadget, &req->req,
                                         mv_u3d_ep_dir(ep));
         if (ret)
-                return ret;
+                goto break_processing;
 
         req->req.status = -EINPROGRESS;
         req->req.actual = 0;
         req->trb_count = 0;
 
-        /* build trbs and push them to device queue */
-        if (!mv_u3d_req_to_trb(req)) {
-                ret = mv_u3d_queue_trb(ep, req);
-                if (ret) {
-                        ep->processing = 0;
-                        return ret;
-                }
-        } else {
-                ep->processing = 0;
+        /* build trbs */
+        ret = mv_u3d_req_to_trb(req);
+        if (ret) {
                 dev_err(u3d->dev, "%s, mv_u3d_req_to_trb fail\n", __func__);
-                return -ENOMEM;
+                goto break_processing;
         }
 
+        /* and push them to device queue */
+        ret = mv_u3d_queue_trb(ep, req);
+        if (ret)
+                goto break_processing;
+
         /* irq handler advances the queue */
-        if (req)
-                list_add_tail(&req->queue, &ep->queue);
+        list_add_tail(&req->queue, &ep->queue);
 
         return 0;
+
+break_processing:
+        ep->processing = 0;
+        return ret;
 }
 
 static int mv_u3d_ep_enable(struct usb_ep *_ep,
diff --git a/drivers/usb/gadget/udc/mv_udc_core.c b/drivers/usb/gadget/udc/mv_udc_core.c
index ce73b3552269..d82a91bddbd9 100644
--- a/drivers/usb/gadget/udc/mv_udc_core.c
+++ b/drivers/usb/gadget/udc/mv_udc_core.c
@@ -494,8 +494,7 @@ static int mv_ep_enable(struct usb_ep *_ep,
                 break;
         case USB_ENDPOINT_XFER_ISOC:
                 /* Calculate transactions needed for high bandwidth iso */
-                mult = (unsigned char)(1 + ((max >> 11) & 0x03));
-                max = max & 0x7ff;      /* bit 0~10 */
+                mult = usb_endpoint_maxp_mult(desc);
                 /* 3 transactions at most */
                 if (mult > 3)
                         goto en_done;
diff --git a/drivers/usb/gadget/udc/net2272.c b/drivers/usb/gadget/udc/net2272.c
index 7c6113432093..078c91d546e0 100644
--- a/drivers/usb/gadget/udc/net2272.c
+++ b/drivers/usb/gadget/udc/net2272.c
@@ -202,10 +202,10 @@ net2272_enable(struct usb_ep *_ep, const struct usb_endpoint_descriptor *desc)
         if (!dev->driver || dev->gadget.speed == USB_SPEED_UNKNOWN)
                 return -ESHUTDOWN;
 
-        max = usb_endpoint_maxp(desc) & 0x1fff;
+        max = usb_endpoint_maxp(desc);
 
         spin_lock_irqsave(&dev->lock, flags);
-        _ep->maxpacket = max & 0x7fff;
+        _ep->maxpacket = max;
         ep->desc = desc;
 
         /* net2272_ep_reset() has already been called */
diff --git a/drivers/usb/gadget/udc/net2280.c b/drivers/usb/gadget/udc/net2280.c
index 61c938c36d88..85504419ab31 100644
--- a/drivers/usb/gadget/udc/net2280.c
+++ b/drivers/usb/gadget/udc/net2280.c
@@ -224,14 +224,14 @@ net2280_enable(struct usb_ep *_ep, const struct usb_endpoint_descriptor *desc)
         }
 
         /* sanity check ep-e/ep-f since their fifos are small */
-        max = usb_endpoint_maxp(desc) & 0x1fff;
+        max = usb_endpoint_maxp(desc);
         if (ep->num > 4 && max > 64 && (dev->quirks & PLX_LEGACY)) {
                 ret = -ERANGE;
                 goto print_err;
         }
 
         spin_lock_irqsave(&dev->lock, flags);
-        _ep->maxpacket = max & 0x7ff;
+        _ep->maxpacket = max;
         ep->desc = desc;
 
         /* ep_reset() has already been called */
@@ -1839,7 +1839,7 @@ static ssize_t queues_show(struct device *_dev, struct device_attribute *attr,
                                 ep->ep.name, t & USB_ENDPOINT_NUMBER_MASK,
                                 (t & USB_DIR_IN) ? "in" : "out",
                                 type_string(d->bmAttributes),
-                                usb_endpoint_maxp(d) & 0x1fff,
+                                usb_endpoint_maxp(d),
                                 ep->dma ? "dma" : "pio", ep->fifo_size
                                 );
                 } else /* ep0 should only have one transfer queued */
diff --git a/drivers/usb/gadget/udc/omap_udc.h b/drivers/usb/gadget/udc/omap_udc.h
index cfadeb5fc5de..26974196cf44 100644
--- a/drivers/usb/gadget/udc/omap_udc.h
+++ b/drivers/usb/gadget/udc/omap_udc.h
@@ -187,7 +187,7 @@ struct omap_udc {
 #endif
 
 #define ERR(stuff...)           pr_err("udc: " stuff)
-#define WARNING(stuff...)       pr_warning("udc: " stuff)
+#define WARNING(stuff...)       pr_warn("udc: " stuff)
 #define INFO(stuff...)          pr_info("udc: " stuff)
 #define DBG(stuff...)           pr_debug("udc: " stuff)
 
diff --git a/drivers/usb/gadget/udc/pxa25x_udc.h b/drivers/usb/gadget/udc/pxa25x_udc.h
index 4b8b72d7ab37..a458bec2536d 100644
--- a/drivers/usb/gadget/udc/pxa25x_udc.h
+++ b/drivers/usb/gadget/udc/pxa25x_udc.h
@@ -248,7 +248,7 @@ dump_state(struct pxa25x_udc *dev)
 #define DBG(lvl, stuff...) do{if ((lvl) <= UDC_DEBUG) DMSG(stuff);}while(0)
 
 #define ERR(stuff...)           pr_err("udc: " stuff)
-#define WARNING(stuff...)       pr_warning("udc: " stuff)
+#define WARNING(stuff...)       pr_warn("udc: " stuff)
 #define INFO(stuff...)          pr_info("udc: " stuff)
 
 
diff --git a/drivers/usb/gadget/udc/s3c2410_udc.c b/drivers/usb/gadget/udc/s3c2410_udc.c
index eb3571ee59e3..4643a01262b4 100644
--- a/drivers/usb/gadget/udc/s3c2410_udc.c
+++ b/drivers/usb/gadget/udc/s3c2410_udc.c
@@ -1047,10 +1047,10 @@ static int s3c2410_udc_ep_enable(struct usb_ep *_ep,
         if (!dev->driver || dev->gadget.speed == USB_SPEED_UNKNOWN)
                 return -ESHUTDOWN;
 
-        max = usb_endpoint_maxp(desc) & 0x1fff;
+        max = usb_endpoint_maxp(desc);
 
         local_irq_save(flags);
-        _ep->maxpacket = max & 0x7ff;
+        _ep->maxpacket = max;
         ep->ep.desc = desc;
         ep->halted = 0;
         ep->bEndpointAddress = desc->bEndpointAddress;
diff --git a/drivers/usb/host/Kconfig b/drivers/usb/host/Kconfig
index 0b80cee30da4..6361fc739306 100644
--- a/drivers/usb/host/Kconfig
+++ b/drivers/usb/host/Kconfig
@@ -479,9 +479,10 @@ config USB_OHCI_HCD_OMAP3
           OMAP3 and later chips.
 
 config USB_OHCI_HCD_DAVINCI
-        bool "OHCI support for TI DaVinci DA8xx"
+        tristate "OHCI support for TI DaVinci DA8xx"
         depends on ARCH_DAVINCI_DA8XX
-        depends on USB_OHCI_HCD=y
+        depends on USB_OHCI_HCD
+        select PHY_DA8XX_USB
         default y
         help
           Enables support for the DaVinci DA8xx integrated OHCI
diff --git a/drivers/usb/host/Makefile b/drivers/usb/host/Makefile
index 6ef785b0ea8f..2644537b7bcf 100644
--- a/drivers/usb/host/Makefile
+++ b/drivers/usb/host/Makefile
@@ -61,6 +61,7 @@ obj-$(CONFIG_USB_OHCI_HCD_AT91)	+= ohci-at91.o
 obj-$(CONFIG_USB_OHCI_HCD_S3C2410)      += ohci-s3c2410.o
 obj-$(CONFIG_USB_OHCI_HCD_LPC32XX)      += ohci-nxp.o
 obj-$(CONFIG_USB_OHCI_HCD_PXA27X)       += ohci-pxa27x.o
+obj-$(CONFIG_USB_OHCI_HCD_DAVINCI)      += ohci-da8xx.o
 
 obj-$(CONFIG_USB_UHCI_HCD)      += uhci-hcd.o
 obj-$(CONFIG_USB_FHCI_HCD)      += fhci.o
diff --git a/drivers/usb/host/ehci-fsl.c b/drivers/usb/host/ehci-fsl.c
index 9f5ffb629973..91701cc68082 100644
--- a/drivers/usb/host/ehci-fsl.c
+++ b/drivers/usb/host/ehci-fsl.c
@@ -286,6 +286,9 @@ static int ehci_fsl_usb_setup(struct ehci_hcd *ehci)
         if (pdata->has_fsl_erratum_a005275 == 1)
                 ehci->has_fsl_hs_errata = 1;
 
+        if (pdata->has_fsl_erratum_a005697 == 1)
+                ehci->has_fsl_susp_errata = 1;
+
         if ((pdata->operating_mode == FSL_USB2_DR_HOST) ||
                         (pdata->operating_mode == FSL_USB2_DR_OTG))
                 if (ehci_fsl_setup_phy(hcd, pdata->phy_mode, 0))
diff --git a/drivers/usb/host/ehci-hub.c b/drivers/usb/host/ehci-hub.c
index 74f62d68f013..df169c8e7225 100644
--- a/drivers/usb/host/ehci-hub.c
+++ b/drivers/usb/host/ehci-hub.c
@@ -310,6 +310,14 @@ static int ehci_bus_suspend (struct usb_hcd *hcd)
         }
         spin_unlock_irq(&ehci->lock);
 
+        if (changed && ehci_has_fsl_susp_errata(ehci))
+                /*
+                 * Wait for at least 10 millisecondes to ensure the controller
+                 * enter the suspend status before initiating a port resume
+                 * using the Force Port Resume bit (Not-EHCI compatible).
+                 */
+                usleep_range(10000, 20000);
+
         if ((changed && ehci->has_tdi_phy_lpm) || fs_idle_delay) {
                 /*
                  * Wait for HCD to enter low-power mode or for the bus
@@ -1200,6 +1208,12 @@ int ehci_hub_control(
                                         wIndex, (temp1 & HOSTPC_PHCD) ?
                                         "succeeded" : "failed");
                         }
+                        if (ehci_has_fsl_susp_errata(ehci)) {
+                                /* 10ms for HCD enter suspend */
+                                spin_unlock_irqrestore(&ehci->lock, flags);
+                                usleep_range(10000, 20000);
+                                spin_lock_irqsave(&ehci->lock, flags);
+                        }
                         set_bit(wIndex, &ehci->suspended_ports);
                         break;
                 case USB_PORT_FEAT_POWER:
diff --git a/drivers/usb/host/ehci-pci.c b/drivers/usb/host/ehci-pci.c
index 3b3649d88c5f..93326974ff4b 100644
--- a/drivers/usb/host/ehci-pci.c
+++ b/drivers/usb/host/ehci-pci.c
@@ -258,9 +258,8 @@ static int ehci_pci_setup(struct usb_hcd *hcd)
         /* These workarounds need to be applied after ehci_setup() */
         switch (pdev->vendor) {
         case PCI_VENDOR_ID_NEC:
-                ehci->need_io_watchdog = 0;
-                break;
         case PCI_VENDOR_ID_INTEL:
+        case PCI_VENDOR_ID_AMD:
                 ehci->need_io_watchdog = 0;
                 break;
         case PCI_VENDOR_ID_NVIDIA:
diff --git a/drivers/usb/host/ehci-q.c b/drivers/usb/host/ehci-q.c
index eca3710d8fc4..8f3f055c05fa 100644
--- a/drivers/usb/host/ehci-q.c
+++ b/drivers/usb/host/ehci-q.c
@@ -550,11 +550,6 @@ qh_completions (struct ehci_hcd *ehci, struct ehci_qh *qh)
 
 /*-------------------------------------------------------------------------*/
 
-// high bandwidth multiplier, as encoded in highspeed endpoint descriptors
-#define hb_mult(wMaxPacketSize) (1 + (((wMaxPacketSize) >> 11) & 0x03))
-// ... and packet size, for any kind of endpoint descriptor
-#define max_packet(wMaxPacketSize) ((wMaxPacketSize) & 0x07ff)
-
 /*
  * reverse of qh_urb_transaction:  free a list of TDs.
  * used for cleanup after errors, before HC sees an URB's TDs.
@@ -651,7 +646,7 @@ qh_urb_transaction (
                 token |= (1 /* "in" */ << 8);
         /* else it's already initted to "out" pid (0 << 8) */
 
-        maxpacket = max_packet(usb_maxpacket(urb->dev, urb->pipe, !is_input));
+        maxpacket = usb_maxpacket(urb->dev, urb->pipe, !is_input);
 
         /*
          * buffer gets wrapped in one or more qtds;
@@ -770,9 +765,11 @@ qh_make (
         gfp_t                   flags
 ) {
         struct ehci_qh          *qh = ehci_qh_alloc (ehci, flags);
+        struct usb_host_endpoint *ep;
         u32                     info1 = 0, info2 = 0;
         int                     is_input, type;
         int                     maxp = 0;
+        int                     mult;
         struct usb_tt           *tt = urb->dev->tt;
         struct ehci_qh_hw       *hw;
 
@@ -787,13 +784,15 @@ qh_make (
 
         is_input = usb_pipein (urb->pipe);
         type = usb_pipetype (urb->pipe);
-        maxp = usb_maxpacket (urb->dev, urb->pipe, !is_input);
+        ep = usb_pipe_endpoint (urb->dev, urb->pipe);
+        maxp = usb_endpoint_maxp (&ep->desc);
+        mult = usb_endpoint_maxp_mult (&ep->desc);
 
         /* 1024 byte maxpacket is a hardware ceiling.  High bandwidth
          * acts like up to 3KB, but is built from smaller packets.
          */
-        if (max_packet(maxp) > 1024) {
-                ehci_dbg(ehci, "bogus qh maxpacket %d\n", max_packet(maxp));
+        if (maxp > 1024) {
+                ehci_dbg(ehci, "bogus qh maxpacket %d\n", maxp);
                 goto done;
         }
 
@@ -809,8 +808,7 @@ qh_make (
                 unsigned        tmp;
 
                 qh->ps.usecs = NS_TO_US(usb_calc_bus_time(USB_SPEED_HIGH,
-                                is_input, 0,
-                                hb_mult(maxp) * max_packet(maxp)));
+                                is_input, 0, mult * maxp));
                 qh->ps.phase = NO_FRAME;
 
                 if (urb->dev->speed == USB_SPEED_HIGH) {
@@ -854,7 +852,7 @@ qh_make (
                         think_time = tt ? tt->think_time : 0;
                         qh->ps.tt_usecs = NS_TO_US(think_time +
                                         usb_calc_bus_time (urb->dev->speed,
-                                        is_input, 0, max_packet (maxp)));
+                                        is_input, 0, maxp));
                         if (urb->interval > ehci->periodic_size)
                                 urb->interval = ehci->periodic_size;
                         qh->ps.period = urb->interval;
@@ -925,11 +923,11 @@ qh_make (
                          * to help them do so.  So now people expect to use
                          * such nonconformant devices with Linux too; sigh.
                          */
-                        info1 |= max_packet(maxp) << 16;
+                        info1 |= maxp << 16;
                         info2 |= (EHCI_TUNE_MULT_HS << 30);
                 } else {                /* PIPE_INTERRUPT */
-                        info1 |= max_packet (maxp) << 16;
-                        info2 |= hb_mult (maxp) << 30;
+                        info1 |= maxp << 16;
+                        info2 |= mult << 30;
                 }
                 break;
         default:
@@ -1221,7 +1219,7 @@ static int submit_single_step_set_feature(
 
         token |= (1 /* "in" */ << 8);  /*This is IN stage*/
 
-        maxpacket = max_packet(usb_maxpacket(urb->dev, urb->pipe, 0));
+        maxpacket = usb_maxpacket(urb->dev, urb->pipe, 0);
 
         qtd_fill(ehci, qtd, buf, len, token, maxpacket);
 
diff --git a/drivers/usb/host/ehci-sched.c b/drivers/usb/host/ehci-sched.c
index 1dfe54f14737..980a6b3b2da2 100644
--- a/drivers/usb/host/ehci-sched.c
+++ b/drivers/usb/host/ehci-sched.c
@@ -1064,11 +1064,10 @@ iso_stream_init(
 
         /* knows about ITD vs SITD */
         if (dev->speed == USB_SPEED_HIGH) {
-                unsigned multi = hb_mult(maxp);
+                unsigned multi = usb_endpoint_maxp_mult(&urb->ep->desc);
 
                 stream->highspeed = 1;
 
-                maxp = max_packet(maxp);
                 buf1 |= maxp;
                 maxp *= multi;
 
diff --git a/drivers/usb/host/ehci-w90x900.c b/drivers/usb/host/ehci-w90x900.c
index e42a29e8e229..63b9d0c67963 100644
--- a/drivers/usb/host/ehci-w90x900.c
+++ b/drivers/usb/host/ehci-w90x900.c
@@ -33,8 +33,7 @@ static const char hcd_name[] = "ehci-w90x900 ";
 
 static struct hc_driver __read_mostly ehci_w90x900_hc_driver;
 
-static int usb_w90x900_probe(const struct hc_driver *driver,
-                      struct platform_device *pdev)
+static int ehci_w90x900_probe(struct platform_device *pdev)
 {
         struct usb_hcd *hcd;
         struct ehci_hcd *ehci;
@@ -42,7 +41,8 @@ static int usb_w90x900_probe(const struct hc_driver *driver,
         int retval = 0, irq;
         unsigned long val;
 
-        hcd = usb_create_hcd(driver, &pdev->dev, "w90x900 EHCI");
+        hcd = usb_create_hcd(&ehci_w90x900_hc_driver,
+                        &pdev->dev, "w90x900 EHCI");
         if (!hcd) {
                 retval = -ENOMEM;
                 goto err1;
@@ -63,9 +63,9 @@ static int usb_w90x900_probe(const struct hc_driver *driver,
                 HC_LENGTH(ehci, ehci_readl(ehci, &ehci->caps->hc_capbase));
 
         /* enable PHY 0,1,the regs only apply to w90p910
-        *  0xA4,0xA8 were offsets of PHY0 and PHY1 controller of
-        *  w90p910 IC relative to ehci->regs.
-        */
+         *  0xA4,0xA8 were offsets of PHY0 and PHY1 controller of
+         *  w90p910 IC relative to ehci->regs.
+         */
         val = __raw_readl(ehci->regs+PHY0_CTR);
         val |= ENPHY;
         __raw_writel(val, ehci->regs+PHY0_CTR);
@@ -92,26 +92,12 @@ err1:
         return retval;
 }
 
-static void usb_w90x900_remove(struct usb_hcd *hcd,
-                        struct platform_device *pdev)
-{
-        usb_remove_hcd(hcd);
-        usb_put_hcd(hcd);
-}
-
-static int ehci_w90x900_probe(struct platform_device *pdev)
-{
-        if (usb_disabled())
-                return -ENODEV;
-
-        return usb_w90x900_probe(&ehci_w90x900_hc_driver, pdev);
-}
-
 static int ehci_w90x900_remove(struct platform_device *pdev)
 {
         struct usb_hcd *hcd = platform_get_drvdata(pdev);
 
-        usb_w90x900_remove(hcd, pdev);
+        usb_remove_hcd(hcd);
+        usb_put_hcd(hcd);
 
         return 0;
 }
diff --git a/drivers/usb/host/ehci.h b/drivers/usb/host/ehci.h
index 3f3b74aeca97..a8e36170d8b8 100644
--- a/drivers/usb/host/ehci.h
+++ b/drivers/usb/host/ehci.h
@@ -219,6 +219,7 @@ struct ehci_hcd {			/* one per controller */
         unsigned                no_selective_suspend:1;
         unsigned                has_fsl_port_bug:1; /* FreeScale */
         unsigned                has_fsl_hs_errata:1;    /* Freescale HS quirk */
+        unsigned                has_fsl_susp_errata:1;  /* NXP SUSP quirk */
         unsigned                big_endian_mmio:1;
         unsigned                big_endian_desc:1;
         unsigned                big_endian_capbase:1;
@@ -710,6 +711,13 @@ ehci_port_speed(struct ehci_hcd *ehci, unsigned int portsc)
 #endif
 
 /*
+ * Some Freescale/NXP processors have an erratum (USB A-005697)
+ * in which we need to wait for 10ms for bus to enter suspend mode
+ * after setting SUSP bit.
+ */
+#define ehci_has_fsl_susp_errata(e)     ((e)->has_fsl_susp_errata)
+
+/*
  * While most USB host controllers implement their registers in
  * little-endian format, a minority (celleb companion chip) implement
  * them in big endian format.
diff --git a/drivers/usb/host/fsl-mph-dr-of.c b/drivers/usb/host/fsl-mph-dr-of.c
index f07ccb25bc24..e90ddb530765 100644
--- a/drivers/usb/host/fsl-mph-dr-of.c
+++ b/drivers/usb/host/fsl-mph-dr-of.c
@@ -226,6 +226,8 @@ static int fsl_usb2_mph_dr_of_probe(struct platform_device *ofdev)
                 of_property_read_bool(np, "fsl,usb-erratum-a007792");
         pdata->has_fsl_erratum_a005275 =
                 of_property_read_bool(np, "fsl,usb-erratum-a005275");
+        pdata->has_fsl_erratum_a005697 =
+                of_property_read_bool(np, "fsl,usb_erratum-a005697");
 
         /*
          * Determine whether phy_clk_valid needs to be checked
diff --git a/drivers/usb/host/isp1362-hcd.c b/drivers/usb/host/isp1362-hcd.c
index 6cf82ee460a6..0f2b4b358e1a 100644
--- a/drivers/usb/host/isp1362-hcd.c
+++ b/drivers/usb/host/isp1362-hcd.c
@@ -147,7 +147,7 @@ static inline struct isp1362_ep_queue *get_ptd_queue(struct isp1362_hcd *isp1362
         if (epq)
                 DBG(1, "%s: PTD $%04x is on %s queue\n", __func__, offset, epq->name);
         else
-                pr_warning("%s: invalid PTD $%04x\n", __func__, offset);
+                pr_warn("%s: invalid PTD $%04x\n", __func__, offset);
 
         return epq;
 }
@@ -157,8 +157,9 @@ static inline int get_ptd_offset(struct isp1362_ep_queue *epq, u8 index)
         int offset;
 
         if (index * epq->blk_size > epq->buf_size) {
-                pr_warning("%s: Bad %s index %d(%d)\n", __func__, epq->name, index,
-                     epq->buf_size / epq->blk_size);
+                pr_warn("%s: Bad %s index %d(%d)\n",
+                        __func__, epq->name, index,
+                        epq->buf_size / epq->blk_size);
                 return -EINVAL;
         }
         offset = epq->buf_start + index * epq->blk_size;
@@ -902,8 +903,8 @@ static void start_iso_transfers(struct isp1362_hcd *isp1362_hcd)
 
                         ptd_offset = next_ptd(epq, ep);
                         if (ptd_offset < 0) {
-                                pr_warning("%s: req %d No more %s PTD buffers available\n", __func__,
-                                     ep->num_req, epq->name);
+                                pr_warn("%s: req %d No more %s PTD buffers available\n",
+                                        __func__, ep->num_req, epq->name);
                                 break;
                         }
                 }
@@ -973,8 +974,8 @@ static void finish_transfers(struct isp1362_hcd *isp1362_hcd, unsigned long done
                         break;
         }
         if (done_map)
-                pr_warning("%s: done_map not clear: %08lx:%08lx\n", __func__, done_map,
-                     epq->skip_map);
+                pr_warn("%s: done_map not clear: %08lx:%08lx\n",
+                        __func__, done_map, epq->skip_map);
         atomic_dec(&epq->finishing);
 }
 
@@ -1433,7 +1434,7 @@ static int isp1362_urb_dequeue(struct usb_hcd *hcd, struct urb *urb, int status)
                 } else
                         DBG(1, "%s: urb %p active; wait4irq\n", __func__, urb);
         } else {
-                pr_warning("%s: No EP in URB %p\n", __func__, urb);
+                pr_warn("%s: No EP in URB %p\n", __func__, urb);
                 retval = -EINVAL;
         }
 done:
@@ -1748,10 +1749,10 @@ static int isp1362_bus_suspend(struct usb_hcd *hcd)
                 /* FALL THROUGH */
         case OHCI_USB_RESET:
                 status = -EBUSY;
-                pr_warning("%s: needs reinit!\n", __func__);
+                pr_warn("%s: needs reinit!\n", __func__);
                 goto done;
         case OHCI_USB_SUSPEND:
-                pr_warning("%s: already suspended?\n", __func__);
+                pr_warn("%s: already suspended?\n", __func__);
                 goto done;
         }
         DBG(0, "%s: suspend root hub\n", __func__);
@@ -1839,7 +1840,7 @@ static int isp1362_bus_resume(struct usb_hcd *hcd)
         isp1362_hcd->hc_control = isp1362_read_reg32(isp1362_hcd, HCCONTROL);
         pr_info("%s: HCCONTROL: %08x\n", __func__, isp1362_hcd->hc_control);
         if (hcd->state == HC_STATE_RESUMING) {
-                pr_warning("%s: duplicate resume\n", __func__);
+                pr_warn("%s: duplicate resume\n", __func__);
                 status = 0;
         } else
                 switch (isp1362_hcd->hc_control & OHCI_CTRL_HCFS) {
@@ -2474,8 +2475,8 @@ static int isp1362_chip_test(struct isp1362_hcd *isp1362_hcd)
                                             __func__, offset);
                                         break;
                                 }
-                                pr_warning("%s: memory check with offset %02x ok after second read\n",
-                                     __func__, offset);
+                                pr_warn("%s: memory check with offset %02x ok after second read\n",
+                                        __func__, offset);
                         }
                 }
                 kfree(ref);
diff --git a/drivers/usb/host/ohci-at91.c b/drivers/usb/host/ohci-at91.c
index b38a228134df..be9e63836881 100644
--- a/drivers/usb/host/ohci-at91.c
+++ b/drivers/usb/host/ohci-at91.c
@@ -14,8 +14,8 @@
 
 #include <linux/clk.h>
 #include <linux/dma-mapping.h>
+#include <linux/gpio/consumer.h>
 #include <linux/of_platform.h>
-#include <linux/of_gpio.h>
 #include <linux/platform_device.h>
 #include <linux/platform_data/atmel.h>
 #include <linux/io.h>
@@ -39,8 +39,8 @@
 
 #define AT91_MAX_USBH_PORTS     3
 struct at91_usbh_data {
-        int vbus_pin[AT91_MAX_USBH_PORTS];      /* port power-control pin */
-        int overcurrent_pin[AT91_MAX_USBH_PORTS];
+        struct gpio_desc *vbus_pin[AT91_MAX_USBH_PORTS];
+        struct gpio_desc *overcurrent_pin[AT91_MAX_USBH_PORTS];
         u8 ports;                               /* number of ports on root hub */
         u8 overcurrent_supported;
         u8 vbus_pin_active_low[AT91_MAX_USBH_PORTS];
@@ -68,8 +68,6 @@ static const struct ohci_driver_overrides ohci_at91_drv_overrides __initconst =
         .extra_priv_size = sizeof(struct ohci_at91_priv),
 };
 
-extern int usb_disabled(void);
-
 /*-------------------------------------------------------------------------*/
 
 static void at91_start_clock(struct ohci_at91_priv *ohci_at91)
@@ -268,11 +266,8 @@ static void ohci_at91_usb_set_power(struct at91_usbh_data *pdata, int port, int
         if (!valid_port(port))
                 return;
 
-        if (!gpio_is_valid(pdata->vbus_pin[port]))
-                return;
-
-        gpio_set_value(pdata->vbus_pin[port],
-                       pdata->vbus_pin_active_low[port] ^ enable);
+        gpiod_set_value(pdata->vbus_pin[port],
+                        pdata->vbus_pin_active_low[port] ^ enable);
 }
 
 static int ohci_at91_usb_get_power(struct at91_usbh_data *pdata, int port)
@@ -280,11 +275,8 @@ static int ohci_at91_usb_get_power(struct at91_usbh_data *pdata, int port)
         if (!valid_port(port))
                 return -EINVAL;
 
-        if (!gpio_is_valid(pdata->vbus_pin[port]))
-                return -EINVAL;
-
-        return gpio_get_value(pdata->vbus_pin[port]) ^
-                pdata->vbus_pin_active_low[port];
+        return gpiod_get_value(pdata->vbus_pin[port]) ^
+               pdata->vbus_pin_active_low[port];
 }
 
 /*
@@ -474,16 +466,13 @@ static irqreturn_t ohci_hcd_at91_overcurrent_irq(int irq, void *data)
 {
         struct platform_device *pdev = data;
         struct at91_usbh_data *pdata = dev_get_platdata(&pdev->dev);
-        int val, gpio, port;
+        int val, port;
 
         /* From the GPIO notifying the over-current situation, find
          * out the corresponding port */
         at91_for_each_port(port) {
-                if (gpio_is_valid(pdata->overcurrent_pin[port]) &&
-                                gpio_to_irq(pdata->overcurrent_pin[port]) == irq) {
-                        gpio = pdata->overcurrent_pin[port];
+                if (gpiod_to_irq(pdata->overcurrent_pin[port]) == irq)
                         break;
-                }
         }
 
         if (port == AT91_MAX_USBH_PORTS) {
@@ -491,7 +480,7 @@ static irqreturn_t ohci_hcd_at91_overcurrent_irq(int irq, void *data)
                 return IRQ_HANDLED;
         }
 
-        val = gpio_get_value(gpio);
+        val = gpiod_get_value(pdata->overcurrent_pin[port]);
 
         /* When notified of an over-current situation, disable power
            on the corresponding port, and mark this port in
@@ -522,9 +511,8 @@ static int ohci_hcd_at91_drv_probe(struct platform_device *pdev)
         struct device_node *np = pdev->dev.of_node;
         struct at91_usbh_data   *pdata;
         int                     i;
-        int                     gpio;
         int                     ret;
-        enum of_gpio_flags      flags;
+        int                     err;
         u32                     ports;
 
         /* Right now device-tree probed devices don't get dma_mask set.
@@ -545,38 +533,16 @@ static int ohci_hcd_at91_drv_probe(struct platform_device *pdev)
                 pdata->ports = ports;
 
         at91_for_each_port(i) {
-                /*
-                 * do not configure PIO if not in relation with
-                 * real USB port on board
-                 */
-                if (i >= pdata->ports) {
-                        pdata->vbus_pin[i] = -EINVAL;
-                        pdata->overcurrent_pin[i] = -EINVAL;
+                pdata->vbus_pin[i] = devm_gpiod_get_optional(&pdev->dev,
+                                                             "atmel,vbus-gpio",
+                                                             GPIOD_IN);
+                if (IS_ERR(pdata->vbus_pin[i])) {
+                        err = PTR_ERR(pdata->vbus_pin[i]);
+                        dev_err(&pdev->dev, "unable to claim gpio \"vbus\": %d\n", err);
                         continue;
                 }
 
-                gpio = of_get_named_gpio_flags(np, "atmel,vbus-gpio", i,
-                                               &flags);
-                pdata->vbus_pin[i] = gpio;
-                if (!gpio_is_valid(gpio))
-                        continue;
-                pdata->vbus_pin_active_low[i] = flags & OF_GPIO_ACTIVE_LOW;
-
-                ret = gpio_request(gpio, "ohci_vbus");
-                if (ret) {
-                        dev_err(&pdev->dev,
-                                "can't request vbus gpio %d\n", gpio);
-                        continue;
-                }
-                ret = gpio_direction_output(gpio,
-                                        !pdata->vbus_pin_active_low[i]);
-                if (ret) {
-                        dev_err(&pdev->dev,
-                                "can't put vbus gpio %d as output %d\n",
-                                gpio, !pdata->vbus_pin_active_low[i]);
-                        gpio_free(gpio);
-                        continue;
-                }
+                pdata->vbus_pin_active_low[i] = gpiod_get_value(pdata->vbus_pin[i]);
 
                 ohci_at91_usb_set_power(pdata, i, 1);
         }
@@ -586,37 +552,21 @@ static int ohci_hcd_at91_drv_probe(struct platform_device *pdev)
                         break;
 
                 pdata->overcurrent_pin[i] =
-                        of_get_named_gpio_flags(np, "atmel,oc-gpio", i, &flags);
-
-                if (!gpio_is_valid(pdata->overcurrent_pin[i]))
-                        continue;
-                gpio = pdata->overcurrent_pin[i];
-
-                ret = gpio_request(gpio, "ohci_overcurrent");
-                if (ret) {
-                        dev_err(&pdev->dev,
-                                "can't request overcurrent gpio %d\n",
-                                gpio);
+                        devm_gpiod_get_optional(&pdev->dev,
+                                                "atmel,oc-gpio", GPIOD_IN);
+                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);
                         continue;
                 }
 
-                ret = gpio_direction_input(gpio);
-                if (ret) {
-                        dev_err(&pdev->dev,
-                                "can't configure overcurrent gpio %d as input\n",
-                                gpio);
-                        gpio_free(gpio);
-                        continue;
-                }
-
-                ret = request_irq(gpio_to_irq(gpio),
-                                  ohci_hcd_at91_overcurrent_irq,
-                                  IRQF_SHARED, "ohci_overcurrent", pdev);
-                if (ret) {
-                        gpio_free(gpio);
-                        dev_err(&pdev->dev,
-                                "can't get gpio IRQ for overcurrent\n");
-                }
+                ret = devm_request_irq(&pdev->dev,
+                                       gpiod_to_irq(pdata->overcurrent_pin[i]),
+                                       ohci_hcd_at91_overcurrent_irq,
+                                       IRQF_SHARED,
+                                       "ohci_overcurrent", pdev);
+                if (ret)
+                        dev_info(&pdev->dev, "failed to request gpio \"overcurrent\" IRQ\n");
         }
 
         device_init_wakeup(&pdev->dev, 1);
@@ -629,19 +579,8 @@ static int ohci_hcd_at91_drv_remove(struct platform_device *pdev)
         int                     i;
 
         if (pdata) {
-                at91_for_each_port(i) {
-                        if (!gpio_is_valid(pdata->vbus_pin[i]))
-                                continue;
+                at91_for_each_port(i)
                         ohci_at91_usb_set_power(pdata, i, 0);
-                        gpio_free(pdata->vbus_pin[i]);
-                }
-
-                at91_for_each_port(i) {
-                        if (!gpio_is_valid(pdata->overcurrent_pin[i]))
-                                continue;
-                        free_irq(gpio_to_irq(pdata->overcurrent_pin[i]), pdev);
-                        gpio_free(pdata->overcurrent_pin[i]);
-                }
         }
 
         device_init_wakeup(&pdev->dev, 0);
diff --git a/drivers/usb/host/ohci-da8xx.c b/drivers/usb/host/ohci-da8xx.c
index e5c33bc98ea4..05da2cb59612 100644
--- a/drivers/usb/host/ohci-da8xx.c
+++ b/drivers/usb/host/ohci-da8xx.c
@@ -11,62 +11,192 @@
  * kind, whether express or implied.
  */
 
+#include <linux/clk.h>
+#include <linux/io.h>
 #include <linux/interrupt.h>
 #include <linux/jiffies.h>
+#include <linux/kernel.h>
+#include <linux/module.h>
 #include <linux/platform_device.h>
-#include <linux/clk.h>
-
-#include <mach/da8xx.h>
+#include <linux/phy/phy.h>
 #include <linux/platform_data/usb-davinci.h>
+#include <linux/regulator/consumer.h>
+#include <linux/usb.h>
+#include <linux/usb/hcd.h>
+#include <asm/unaligned.h>
 
-#ifndef CONFIG_ARCH_DAVINCI_DA8XX
-#error "This file is DA8xx bus glue.  Define CONFIG_ARCH_DAVINCI_DA8XX."
-#endif
+#include "ohci.h"
 
-#define CFGCHIP2        DA8XX_SYSCFG0_VIRT(DA8XX_CFGCHIP2_REG)
+#define DRIVER_DESC "DA8XX"
+#define DRV_NAME "ohci-da8xx"
 
-static struct clk *usb11_clk;
-static struct clk *usb20_clk;
+static struct hc_driver __read_mostly ohci_da8xx_hc_driver;
+
+static int (*orig_ohci_hub_control)(struct usb_hcd  *hcd, u16 typeReq,
+                        u16 wValue, u16 wIndex, char *buf, u16 wLength);
+static int (*orig_ohci_hub_status_data)(struct usb_hcd *hcd, char *buf);
+
+struct da8xx_ohci_hcd {
+        struct usb_hcd *hcd;
+        struct clk *usb11_clk;
+        struct phy *usb11_phy;
+        struct regulator *vbus_reg;
+        struct notifier_block nb;
+        unsigned int reg_enabled;
+};
+
+#define to_da8xx_ohci(hcd) (struct da8xx_ohci_hcd *)(hcd_to_ohci(hcd)->priv)
 
 /* Over-current indicator change bitmask */
 static volatile u16 ocic_mask;
 
-static void ohci_da8xx_clock(int on)
+static int ohci_da8xx_enable(struct usb_hcd *hcd)
 {
-        u32 cfgchip2;
-
-        cfgchip2 = __raw_readl(CFGCHIP2);
-        if (on) {
-                clk_enable(usb11_clk);
-
-                /*
-                 * If USB 1.1 reference clock is sourced from USB 2.0 PHY, we
-                 * need to enable the USB 2.0 module clocking, start its PHY,
-                 * and not allow it to stop the clock during USB 2.0 suspend.
-                 */
-                if (!(cfgchip2 & CFGCHIP2_USB1PHYCLKMUX)) {
-                        clk_enable(usb20_clk);
-
-                        cfgchip2 &= ~(CFGCHIP2_RESET | CFGCHIP2_PHYPWRDN);
-                        cfgchip2 |= CFGCHIP2_PHY_PLLON;
-                        __raw_writel(cfgchip2, CFGCHIP2);
-
-                        pr_info("Waiting for USB PHY clock good...\n");
-                        while (!(__raw_readl(CFGCHIP2) & CFGCHIP2_PHYCLKGD))
-                                cpu_relax();
-                }
+        struct da8xx_ohci_hcd *da8xx_ohci = to_da8xx_ohci(hcd);
+        int ret;
+
+        ret = clk_prepare_enable(da8xx_ohci->usb11_clk);
+        if (ret)
+                return ret;
+
+        ret = phy_init(da8xx_ohci->usb11_phy);
+        if (ret)
+                goto err_phy_init;
+
+        ret = phy_power_on(da8xx_ohci->usb11_phy);
+        if (ret)
+                goto err_phy_power_on;
+
+        return 0;
+
+err_phy_power_on:
+        phy_exit(da8xx_ohci->usb11_phy);
+err_phy_init:
+        clk_disable_unprepare(da8xx_ohci->usb11_clk);
+
+        return ret;
+}
+
+static void ohci_da8xx_disable(struct usb_hcd *hcd)
+{
+        struct da8xx_ohci_hcd *da8xx_ohci = to_da8xx_ohci(hcd);
+
+        phy_power_off(da8xx_ohci->usb11_phy);
+        phy_exit(da8xx_ohci->usb11_phy);
+        clk_disable_unprepare(da8xx_ohci->usb11_clk);
+}
 
-                /* Enable USB 1.1 PHY */
-                cfgchip2 |= CFGCHIP2_USB1SUSPENDM;
-        } else {
-                clk_disable(usb11_clk);
-                if (!(cfgchip2 & CFGCHIP2_USB1PHYCLKMUX))
-                        clk_disable(usb20_clk);
+static int ohci_da8xx_set_power(struct usb_hcd *hcd, int on)
+{
+        struct da8xx_ohci_hcd *da8xx_ohci = to_da8xx_ohci(hcd);
+        struct device *dev              = hcd->self.controller;
+        struct da8xx_ohci_root_hub *hub = dev_get_platdata(dev);
+        int ret;
+
+        if (hub && hub->set_power)
+                return hub->set_power(1, on);
+
+        if (!da8xx_ohci->vbus_reg)
+                return 0;
 
-                /* Disable USB 1.1 PHY */
-                cfgchip2 &= ~CFGCHIP2_USB1SUSPENDM;
+        if (on && !da8xx_ohci->reg_enabled) {
+                ret = regulator_enable(da8xx_ohci->vbus_reg);
+                if (ret) {
+                        dev_err(dev, "Failed to enable regulator: %d\n", ret);
+                        return ret;
+                }
+                da8xx_ohci->reg_enabled = 1;
+
+        } else if (!on && da8xx_ohci->reg_enabled) {
+                ret = regulator_disable(da8xx_ohci->vbus_reg);
+                if (ret) {
+                        dev_err(dev, "Failed  to disable regulator: %d\n", ret);
+                        return ret;
+                }
+                da8xx_ohci->reg_enabled = 0;
         }
-        __raw_writel(cfgchip2, CFGCHIP2);
+
+        return 0;
+}
+
+static int ohci_da8xx_get_power(struct usb_hcd *hcd)
+{
+        struct da8xx_ohci_hcd *da8xx_ohci = to_da8xx_ohci(hcd);
+        struct device *dev              = hcd->self.controller;
+        struct da8xx_ohci_root_hub *hub = dev_get_platdata(dev);
+
+        if (hub && hub->get_power)
+                return hub->get_power(1);
+
+        if (da8xx_ohci->vbus_reg)
+                return regulator_is_enabled(da8xx_ohci->vbus_reg);
+
+        return 1;
+}
+
+static int ohci_da8xx_get_oci(struct usb_hcd *hcd)
+{
+        struct da8xx_ohci_hcd *da8xx_ohci = to_da8xx_ohci(hcd);
+        struct device *dev              = hcd->self.controller;
+        struct da8xx_ohci_root_hub *hub = dev_get_platdata(dev);
+        unsigned int flags;
+        int ret;
+
+        if (hub && hub->get_oci)
+                return hub->get_oci(1);
+
+        if (!da8xx_ohci->vbus_reg)
+                return 0;
+
+        ret = regulator_get_error_flags(da8xx_ohci->vbus_reg, &flags);
+        if (ret)
+                return ret;
+
+        if (flags & REGULATOR_ERROR_OVER_CURRENT)
+                return 1;
+
+        return 0;
+}
+
+static int ohci_da8xx_has_set_power(struct usb_hcd *hcd)
+{
+        struct da8xx_ohci_hcd *da8xx_ohci = to_da8xx_ohci(hcd);
+        struct device *dev              = hcd->self.controller;
+        struct da8xx_ohci_root_hub *hub = dev_get_platdata(dev);
+
+        if (hub && hub->set_power)
+                return 1;
+
+        if (da8xx_ohci->vbus_reg)
+                return 1;
+
+        return 0;
+}
+
+static int ohci_da8xx_has_oci(struct usb_hcd *hcd)
+{
+        struct da8xx_ohci_hcd *da8xx_ohci = to_da8xx_ohci(hcd);
+        struct device *dev              = hcd->self.controller;
+        struct da8xx_ohci_root_hub *hub = dev_get_platdata(dev);
+
+        if (hub && hub->get_oci)
+                return 1;
+
+        if (da8xx_ohci->vbus_reg)
+                return 1;
+
+        return 0;
+}
+
+static int ohci_da8xx_has_potpgt(struct usb_hcd *hcd)
+{
+        struct device *dev              = hcd->self.controller;
+        struct da8xx_ohci_root_hub *hub = dev_get_platdata(dev);
+
+        if (hub && hub->potpgt)
+                return 1;
+
+        return 0;
 }
 
 /*
@@ -82,7 +212,51 @@ static void ohci_da8xx_ocic_handler(struct da8xx_ohci_root_hub *hub,
                 hub->set_power(port, 0);
 }
 
-static int ohci_da8xx_init(struct usb_hcd *hcd)
+static int ohci_da8xx_regulator_event(struct notifier_block *nb,
+                                unsigned long event, void *data)
+{
+        struct da8xx_ohci_hcd *da8xx_ohci =
+                                container_of(nb, struct da8xx_ohci_hcd, nb);
+
+        if (event & REGULATOR_EVENT_OVER_CURRENT) {
+                ocic_mask |= 1 << 1;
+                ohci_da8xx_set_power(da8xx_ohci->hcd, 0);
+        }
+
+        return 0;
+}
+
+static int ohci_da8xx_register_notify(struct usb_hcd *hcd)
+{
+        struct da8xx_ohci_hcd *da8xx_ohci = to_da8xx_ohci(hcd);
+        struct device *dev              = hcd->self.controller;
+        struct da8xx_ohci_root_hub *hub = dev_get_platdata(dev);
+        int ret = 0;
+
+        if (hub && hub->ocic_notify) {
+                ret = hub->ocic_notify(ohci_da8xx_ocic_handler);
+        } else if (da8xx_ohci->vbus_reg) {
+                da8xx_ohci->nb.notifier_call = ohci_da8xx_regulator_event;
+                ret = devm_regulator_register_notifier(da8xx_ohci->vbus_reg,
+                                                &da8xx_ohci->nb);
+        }
+
+        if (ret)
+                dev_err(dev, "Failed to register notifier: %d\n", ret);
+
+        return ret;
+}
+
+static void ohci_da8xx_unregister_notify(struct usb_hcd *hcd)
+{
+        struct device *dev              = hcd->self.controller;
+        struct da8xx_ohci_root_hub *hub = dev_get_platdata(dev);
+
+        if (hub && hub->ocic_notify)
+                hub->ocic_notify(NULL);
+}
+
+static int ohci_da8xx_reset(struct usb_hcd *hcd)
 {
         struct device *dev              = hcd->self.controller;
         struct da8xx_ohci_root_hub *hub = dev_get_platdata(dev);
@@ -92,7 +266,9 @@ static int ohci_da8xx_init(struct usb_hcd *hcd)
 
         dev_dbg(dev, "starting USB controller\n");
 
-        ohci_da8xx_clock(1);
+        result = ohci_da8xx_enable(hcd);
+        if (result < 0)
+                return result;
 
         /*
          * DA8xx only have 1 port connected to the pins but the HC root hub
@@ -100,9 +276,11 @@ static int ohci_da8xx_init(struct usb_hcd *hcd)
          */
         ohci->num_ports = 1;
 
-        result = ohci_init(ohci);
-        if (result < 0)
+        result = ohci_setup(hcd);
+        if (result < 0) {
+                ohci_da8xx_disable(hcd);
                 return result;
+        }
 
         /*
          * Since we're providing a board-specific root hub port power control
@@ -111,45 +289,29 @@ static int ohci_da8xx_init(struct usb_hcd *hcd)
          * the correct hub descriptor...
          */
         rh_a = ohci_readl(ohci, &ohci->regs->roothub.a);
-        if (hub->set_power) {
+        if (ohci_da8xx_has_set_power(hcd)) {
                 rh_a &= ~RH_A_NPS;
                 rh_a |=  RH_A_PSM;
         }
-        if (hub->get_oci) {
+        if (ohci_da8xx_has_oci(hcd)) {
                 rh_a &= ~RH_A_NOCP;
                 rh_a |=  RH_A_OCPM;
         }
-        rh_a &= ~RH_A_POTPGT;
-        rh_a |= hub->potpgt << 24;
+        if (ohci_da8xx_has_potpgt(hcd)) {
+                rh_a &= ~RH_A_POTPGT;
+                rh_a |= hub->potpgt << 24;
+        }
         ohci_writel(ohci, rh_a, &ohci->regs->roothub.a);
 
         return result;
 }
 
-static void ohci_da8xx_stop(struct usb_hcd *hcd)
-{
-        ohci_stop(hcd);
-        ohci_da8xx_clock(0);
-}
-
-static int ohci_da8xx_start(struct usb_hcd *hcd)
-{
-        struct ohci_hcd *ohci           = hcd_to_ohci(hcd);
-        int result;
-
-        result = ohci_run(ohci);
-        if (result < 0)
-                ohci_da8xx_stop(hcd);
-
-        return result;
-}
-
 /*
  * Update the status data from the hub with the over-current indicator change.
  */
 static int ohci_da8xx_hub_status_data(struct usb_hcd *hcd, char *buf)
 {
-        int length              = ohci_hub_status_data(hcd, buf);
+        int length              = orig_ohci_hub_status_data(hcd, buf);
 
         /* See if we have OCIC bit set on port 1 */
         if (ocic_mask & (1 << 1)) {
@@ -171,7 +333,6 @@ static int ohci_da8xx_hub_control(struct usb_hcd *hcd, u16 typeReq, u16 wValue,
                                   u16 wIndex, char *buf, u16 wLength)
 {
         struct device *dev              = hcd->self.controller;
-        struct da8xx_ohci_root_hub *hub = dev_get_platdata(dev);
         int temp;
 
         switch (typeReq) {
@@ -185,11 +346,11 @@ static int ohci_da8xx_hub_control(struct usb_hcd *hcd, u16 typeReq, u16 wValue,
                 temp = roothub_portstatus(hcd_to_ohci(hcd), wIndex - 1);
 
                 /* The port power status (PPS) bit defaults to 1 */
-                if (hub->get_power && hub->get_power(wIndex) == 0)
+                if (!ohci_da8xx_get_power(hcd))
                         temp &= ~RH_PS_PPS;
 
                 /* The port over-current indicator (POCI) bit is always 0 */
-                if (hub->get_oci && hub->get_oci(wIndex) > 0)
+                if (ohci_da8xx_get_oci(hcd) > 0)
                         temp |=  RH_PS_POCI;
 
                 /* The over-current indicator change (OCIC) bit is 0 too */
@@ -214,10 +375,7 @@ check_port:
                         dev_dbg(dev, "%sPortFeature(%u): %s\n",
                                 temp ? "Set" : "Clear", wIndex, "POWER");
 
-                        if (!hub->set_power)
-                                return -EPIPE;
-
-                        return hub->set_power(wIndex, temp) ? -EPIPE : 0;
+                        return ohci_da8xx_set_power(hcd, temp) ? -EPIPE : 0;
                 case USB_PORT_FEAT_C_OVER_CURRENT:
                         dev_dbg(dev, "%sPortFeature(%u): %s\n",
                                 temp ? "Set" : "Clear", wIndex,
@@ -231,86 +389,61 @@ check_port:
                 }
         }
 
-        return ohci_hub_control(hcd, typeReq, wValue, wIndex, buf, wLength);
+        return orig_ohci_hub_control(hcd, typeReq, wValue,
+                        wIndex, buf, wLength);
 }
 
-static const struct hc_driver ohci_da8xx_hc_driver = {
-        .description            = hcd_name,
-        .product_desc           = "DA8xx OHCI",
-        .hcd_priv_size          = sizeof(struct ohci_hcd),
-
-        /*
-         * generic hardware linkage
-         */
-        .irq                    = ohci_irq,
-        .flags                  = HCD_USB11 | HCD_MEMORY,
-
-        /*
-         * basic lifecycle operations
-         */
-        .reset                  = ohci_da8xx_init,
-        .start                  = ohci_da8xx_start,
-        .stop                   = ohci_da8xx_stop,
-        .shutdown               = ohci_shutdown,
-
-        /*
-         * managing i/o requests and associated device resources
-         */
-        .urb_enqueue            = ohci_urb_enqueue,
-        .urb_dequeue            = ohci_urb_dequeue,
-        .endpoint_disable       = ohci_endpoint_disable,
-
-        /*
-         * scheduling support
-         */
-        .get_frame_number       = ohci_get_frame,
-
-        /*
-         * root hub support
-         */
-        .hub_status_data        = ohci_da8xx_hub_status_data,
-        .hub_control            = ohci_da8xx_hub_control,
-
-#ifdef  CONFIG_PM
-        .bus_suspend            = ohci_bus_suspend,
-        .bus_resume             = ohci_bus_resume,
-#endif
-        .start_port_reset       = ohci_start_port_reset,
-};
-
 /*-------------------------------------------------------------------------*/
+#ifdef CONFIG_OF
+static const struct of_device_id da8xx_ohci_ids[] = {
+        { .compatible = "ti,da830-ohci" },
+        { }
+};
+MODULE_DEVICE_TABLE(of, da8xx_ohci_ids);
+#endif
 
-
-/**
- * usb_hcd_da8xx_probe - initialize DA8xx-based HCDs
- * Context: !in_interrupt()
- *
- * Allocates basic resources for this USB host controller, and
- * then invokes the start() method for the HCD associated with it
- * through the hotplug entry's driver_data.
- */
-static int usb_hcd_da8xx_probe(const struct hc_driver *driver,
-                               struct platform_device *pdev)
+static int ohci_da8xx_probe(struct platform_device *pdev)
 {
-        struct da8xx_ohci_root_hub *hub = dev_get_platdata(&pdev->dev);
+        struct da8xx_ohci_hcd *da8xx_ohci;
         struct usb_hcd  *hcd;
         struct resource *mem;
         int error, irq;
+        hcd = usb_create_hcd(&ohci_da8xx_hc_driver, &pdev->dev,
+                                dev_name(&pdev->dev));
+        if (!hcd)
+                return -ENOMEM;
 
-        if (hub == NULL)
-                return -ENODEV;
+        da8xx_ohci = to_da8xx_ohci(hcd);
+        da8xx_ohci->hcd = hcd;
 
-        usb11_clk = devm_clk_get(&pdev->dev, "usb11");
-        if (IS_ERR(usb11_clk))
-                return PTR_ERR(usb11_clk);
+        da8xx_ohci->usb11_clk = devm_clk_get(&pdev->dev, "usb11");
+        if (IS_ERR(da8xx_ohci->usb11_clk)) {
+                error = PTR_ERR(da8xx_ohci->usb11_clk);
+                if (error != -EPROBE_DEFER)
+                        dev_err(&pdev->dev, "Failed to get clock.\n");
+                goto err;
+        }
 
-        usb20_clk = devm_clk_get(&pdev->dev, "usb20");
-        if (IS_ERR(usb20_clk))
-                return PTR_ERR(usb20_clk);
+        da8xx_ohci->usb11_phy = devm_phy_get(&pdev->dev, "usb-phy");
+        if (IS_ERR(da8xx_ohci->usb11_phy)) {
+                error = PTR_ERR(da8xx_ohci->usb11_phy);
+                if (error != -EPROBE_DEFER)
+                        dev_err(&pdev->dev, "Failed to get phy.\n");
+                goto err;
+        }
 
-        hcd = usb_create_hcd(driver, &pdev->dev, dev_name(&pdev->dev));
-        if (!hcd)
-                return -ENOMEM;
+        da8xx_ohci->vbus_reg = devm_regulator_get_optional(&pdev->dev, "vbus");
+        if (IS_ERR(da8xx_ohci->vbus_reg)) {
+                error = PTR_ERR(da8xx_ohci->vbus_reg);
+                if (error == -ENODEV) {
+                        da8xx_ohci->vbus_reg = NULL;
+                } else if (error == -EPROBE_DEFER) {
+                        goto err;
+                } else {
+                        dev_err(&pdev->dev, "Failed to get regulator\n");
+                        goto err;
+                }
+        }
 
         mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
         hcd->regs = devm_ioremap_resource(&pdev->dev, mem);
@@ -321,60 +454,38 @@ static int usb_hcd_da8xx_probe(const struct hc_driver *driver,
         hcd->rsrc_start = mem->start;
         hcd->rsrc_len = resource_size(mem);
 
-        ohci_hcd_init(hcd_to_ohci(hcd));
-
         irq = platform_get_irq(pdev, 0);
         if (irq < 0) {
                 error = -ENODEV;
                 goto err;
         }
+
         error = usb_add_hcd(hcd, irq, 0);
         if (error)
                 goto err;
 
         device_wakeup_enable(hcd->self.controller);
 
-        if (hub->ocic_notify) {
-                error = hub->ocic_notify(ohci_da8xx_ocic_handler);
-                if (!error)
-                        return 0;
-        }
+        error = ohci_da8xx_register_notify(hcd);
+        if (error)
+                goto err_remove_hcd;
+
+        return 0;
 
+err_remove_hcd:
         usb_remove_hcd(hcd);
 err:
         usb_put_hcd(hcd);
         return error;
 }
 
-/**
- * usb_hcd_da8xx_remove - shutdown processing for DA8xx-based HCDs
- * @dev: USB Host Controller being removed
- * Context: !in_interrupt()
- *
- * Reverses the effect of usb_hcd_da8xx_probe(), first invoking
- * the HCD's stop() method.  It is always called from a thread
- * context, normally "rmmod", "apmd", or something similar.
- */
-static inline void
-usb_hcd_da8xx_remove(struct usb_hcd *hcd, struct platform_device *pdev)
+static int ohci_da8xx_remove(struct platform_device *pdev)
 {
-        struct da8xx_ohci_root_hub *hub = dev_get_platdata(&pdev->dev);
+        struct usb_hcd  *hcd = platform_get_drvdata(pdev);
 
-        hub->ocic_notify(NULL);
+        ohci_da8xx_unregister_notify(hcd);
         usb_remove_hcd(hcd);
         usb_put_hcd(hcd);
-}
-
-static int ohci_hcd_da8xx_drv_probe(struct platform_device *dev)
-{
-        return usb_hcd_da8xx_probe(&ohci_da8xx_hc_driver, dev);
-}
-
-static int ohci_hcd_da8xx_drv_remove(struct platform_device *dev)
-{
-        struct usb_hcd  *hcd = platform_get_drvdata(dev);
-
-        usb_hcd_da8xx_remove(hcd, dev);
 
         return 0;
 }
@@ -397,7 +508,7 @@ static int ohci_da8xx_suspend(struct platform_device *pdev,
         if (ret)
                 return ret;
 
-        ohci_da8xx_clock(0);
+        ohci_da8xx_disable(hcd);
         hcd->state = HC_STATE_SUSPENDED;
 
         return ret;
@@ -407,32 +518,77 @@ static int ohci_da8xx_resume(struct platform_device *dev)
 {
         struct usb_hcd  *hcd    = platform_get_drvdata(dev);
         struct ohci_hcd *ohci   = hcd_to_ohci(hcd);
+        int ret;
 
         if (time_before(jiffies, ohci->next_statechange))
                 msleep(5);
         ohci->next_statechange = jiffies;
 
-        ohci_da8xx_clock(1);
-        dev->dev.power.power_state = PMSG_ON;
-        usb_hcd_resume_root_hub(hcd);
+        ret = ohci_da8xx_enable(hcd);
+        if (ret)
+                return ret;
+
+        ohci_resume(hcd, false);
+
         return 0;
 }
 #endif
 
+static const struct ohci_driver_overrides da8xx_overrides __initconst = {
+        .reset           = ohci_da8xx_reset,
+        .extra_priv_size = sizeof(struct da8xx_ohci_hcd),
+};
+
 /*
  * Driver definition to register with platform structure.
  */
 static struct platform_driver ohci_hcd_da8xx_driver = {
-        .probe          = ohci_hcd_da8xx_drv_probe,
-        .remove         = ohci_hcd_da8xx_drv_remove,
+        .probe          = ohci_da8xx_probe,
+        .remove         = ohci_da8xx_remove,
         .shutdown       = usb_hcd_platform_shutdown,
 #ifdef  CONFIG_PM
         .suspend        = ohci_da8xx_suspend,
         .resume         = ohci_da8xx_resume,
 #endif
         .driver         = {
-                .name   = "ohci",
+                .name   = DRV_NAME,
+                .of_match_table = of_match_ptr(da8xx_ohci_ids),
         },
 };
 
-MODULE_ALIAS("platform:ohci");
+static int __init ohci_da8xx_init(void)
+{
+
+        if (usb_disabled())
+                return -ENODEV;
+
+        pr_info("%s: " DRIVER_DESC "\n", DRV_NAME);
+        ohci_init_driver(&ohci_da8xx_hc_driver, &da8xx_overrides);
+
+        /*
+         * The Davinci da8xx HW has some unusual quirks, which require
+         * da8xx-specific workarounds. We override certain hc_driver
+         * functions here to achieve that. We explicitly do not enhance
+         * ohci_driver_overrides to allow this more easily, since this
+         * is an unusual case, and we don't want to encourage others to
+         * override these functions by making it too easy.
+         */
+
+        orig_ohci_hub_control = ohci_da8xx_hc_driver.hub_control;
+        orig_ohci_hub_status_data = ohci_da8xx_hc_driver.hub_status_data;
+
+        ohci_da8xx_hc_driver.hub_status_data     = ohci_da8xx_hub_status_data;
+        ohci_da8xx_hc_driver.hub_control         = ohci_da8xx_hub_control;
+
+        return platform_driver_register(&ohci_hcd_da8xx_driver);
+}
+module_init(ohci_da8xx_init);
+
+static void __exit ohci_da8xx_exit(void)
+{
+        platform_driver_unregister(&ohci_hcd_da8xx_driver);
+}
+module_exit(ohci_da8xx_exit);
+MODULE_DESCRIPTION(DRIVER_DESC);
+MODULE_LICENSE("GPL");
+MODULE_ALIAS("platform:" DRV_NAME);
diff --git a/drivers/usb/host/ohci-hcd.c b/drivers/usb/host/ohci-hcd.c
index 86612ac3fda2..8685cf3e6292 100644
--- a/drivers/usb/host/ohci-hcd.c
+++ b/drivers/usb/host/ohci-hcd.c
@@ -1219,11 +1219,6 @@ MODULE_LICENSE ("GPL");
 #define SA1111_DRIVER           ohci_hcd_sa1111_driver
 #endif
 
-#ifdef CONFIG_USB_OHCI_HCD_DAVINCI
-#include "ohci-da8xx.c"
-#define DAVINCI_PLATFORM_DRIVER ohci_hcd_da8xx_driver
-#endif
-
 #ifdef CONFIG_USB_OHCI_HCD_PPC_OF
 #include "ohci-ppc-of.c"
 #define OF_PLATFORM_DRIVER      ohci_hcd_ppc_of_driver
@@ -1303,19 +1298,9 @@ static int __init ohci_hcd_mod_init(void)
                 goto error_tmio;
 #endif
 
-#ifdef DAVINCI_PLATFORM_DRIVER
-        retval = platform_driver_register(&DAVINCI_PLATFORM_DRIVER);
-        if (retval < 0)
-                goto error_davinci;
-#endif
-
         return retval;
 
         /* Error path */
-#ifdef DAVINCI_PLATFORM_DRIVER
-        platform_driver_unregister(&DAVINCI_PLATFORM_DRIVER);
- error_davinci:
-#endif
 #ifdef TMIO_OHCI_DRIVER
         platform_driver_unregister(&TMIO_OHCI_DRIVER);
  error_tmio:
@@ -1351,9 +1336,6 @@ module_init(ohci_hcd_mod_init);
 
 static void __exit ohci_hcd_mod_exit(void)
 {
-#ifdef DAVINCI_PLATFORM_DRIVER
-        platform_driver_unregister(&DAVINCI_PLATFORM_DRIVER);
-#endif
 #ifdef TMIO_OHCI_DRIVER
         platform_driver_unregister(&TMIO_OHCI_DRIVER);
 #endif
diff --git a/drivers/usb/host/ohci-mem.c b/drivers/usb/host/ohci-mem.c
index c9e315c6808a..ed8a762b8670 100644
--- a/drivers/usb/host/ohci-mem.c
+++ b/drivers/usb/host/ohci-mem.c
@@ -88,10 +88,9 @@ td_alloc (struct ohci_hcd *hc, gfp_t mem_flags)
         dma_addr_t      dma;
         struct td       *td;
 
-        td = dma_pool_alloc (hc->td_cache, mem_flags, &dma);
+        td = dma_pool_zalloc (hc->td_cache, mem_flags, &dma);
         if (td) {
                 /* in case hc fetches it, make it look dead */
-                memset (td, 0, sizeof *td);
                 td->hwNextTD = cpu_to_hc32 (hc, dma);
                 td->td_dma = dma;
                 /* hashed in td_fill */
@@ -122,9 +121,8 @@ ed_alloc (struct ohci_hcd *hc, gfp_t mem_flags)
         dma_addr_t      dma;
         struct ed       *ed;
 
-        ed = dma_pool_alloc (hc->ed_cache, mem_flags, &dma);
+        ed = dma_pool_zalloc (hc->ed_cache, mem_flags, &dma);
         if (ed) {
-                memset (ed, 0, sizeof (*ed));
                 INIT_LIST_HEAD (&ed->td_list);
                 ed->dma = dma;
         }
diff --git a/drivers/usb/host/ohci-nxp.c b/drivers/usb/host/ohci-nxp.c
index b7d4756232ae..6df8e2ed40fd 100644
--- a/drivers/usb/host/ohci-nxp.c
+++ b/drivers/usb/host/ohci-nxp.c
@@ -56,8 +56,6 @@ static struct hc_driver __read_mostly ohci_nxp_hc_driver;
 
 static struct i2c_client *isp1301_i2c_client;
 
-extern int usb_disabled(void);
-
 static struct clk *usb_host_clk;
 
 static void isp1301_configure_lpc32xx(void)
@@ -127,6 +125,7 @@ static inline void isp1301_vbus_off(void)
 static void ohci_nxp_start_hc(void)
 {
         unsigned long tmp = __raw_readl(USB_OTG_STAT_CONTROL) | HOST_EN;
+
         __raw_writel(tmp, USB_OTG_STAT_CONTROL);
         isp1301_vbus_on();
 }
@@ -134,6 +133,7 @@ static void ohci_nxp_start_hc(void)
 static void ohci_nxp_stop_hc(void)
 {
         unsigned long tmp;
+
         isp1301_vbus_off();
         tmp = __raw_readl(USB_OTG_STAT_CONTROL) & ~HOST_EN;
         __raw_writel(tmp, USB_OTG_STAT_CONTROL);
@@ -155,9 +155,8 @@ static int ohci_hcd_nxp_probe(struct platform_device *pdev)
         }
 
         isp1301_i2c_client = isp1301_get_client(isp1301_node);
-        if (!isp1301_i2c_client) {
+        if (!isp1301_i2c_client)
                 return -EPROBE_DEFER;
-        }
 
         ret = dma_coerce_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(32));
         if (ret)
diff --git a/drivers/usb/host/ohci-omap.c b/drivers/usb/host/ohci-omap.c
index 495c1454b9e8..b08e385399b9 100644
--- a/drivers/usb/host/ohci-omap.c
+++ b/drivers/usb/host/ohci-omap.c
@@ -68,9 +68,6 @@ static inline int tps65010_set_gpio_out_value(unsigned gpio, unsigned value)
 
 #endif
 
-extern int usb_disabled(void);
-extern int ocpi_enable(void);
-
 static struct clk *usb_host_ck;
 static struct clk *usb_dc_ck;
 
@@ -296,15 +293,14 @@ static int ohci_omap_reset(struct usb_hcd *hcd)
 /*-------------------------------------------------------------------------*/
 
 /**
- * usb_hcd_omap_probe - initialize OMAP-based HCDs
+ * ohci_hcd_omap_probe - initialize OMAP-based HCDs
  * Context: !in_interrupt()
  *
  * Allocates basic resources for this USB host controller, and
  * then invokes the start() method for the HCD associated with it
  * through the hotplug entry's driver_data.
  */
-static int usb_hcd_omap_probe (const struct hc_driver *driver,
-                          struct platform_device *pdev)
+static int ohci_hcd_omap_probe(struct platform_device *pdev)
 {
         int retval, irq;
         struct usb_hcd *hcd = 0;
@@ -336,7 +332,8 @@ static int usb_hcd_omap_probe (const struct hc_driver *driver,
         }
 
 
-        hcd = usb_create_hcd (driver, &pdev->dev, dev_name(&pdev->dev));
+        hcd = usb_create_hcd(&ohci_omap_hc_driver, &pdev->dev,
+                        dev_name(&pdev->dev));
         if (!hcd) {
                 retval = -ENOMEM;
                 goto err0;
@@ -384,17 +381,18 @@ err0:
 /* may be called with controller, bus, and devices active */
 
 /**
- * usb_hcd_omap_remove - shutdown processing for OMAP-based HCDs
+ * ohci_hcd_omap_remove - shutdown processing for OMAP-based HCDs
  * @dev: USB Host Controller being removed
  * Context: !in_interrupt()
  *
- * Reverses the effect of usb_hcd_omap_probe(), first invoking
+ * Reverses the effect of ohci_hcd_omap_probe(), first invoking
  * the HCD's stop() method.  It is always called from a thread
  * context, normally "rmmod", "apmd", or something similar.
  */
-static inline void
-usb_hcd_omap_remove (struct usb_hcd *hcd, struct platform_device *pdev)
+static int ohci_hcd_omap_remove(struct platform_device *pdev)
 {
+        struct usb_hcd  *hcd = platform_get_drvdata(pdev);
+
         dev_dbg(hcd->self.controller, "stopping USB Controller\n");
         usb_remove_hcd(hcd);
         omap_ohci_clock_power(0);
@@ -409,21 +407,6 @@ usb_hcd_omap_remove (struct usb_hcd *hcd, struct platform_device *pdev)
         usb_put_hcd(hcd);
         clk_put(usb_dc_ck);
         clk_put(usb_host_ck);
-}
-
-/*-------------------------------------------------------------------------*/
-
-static int ohci_hcd_omap_drv_probe(struct platform_device *dev)
-{
-        return usb_hcd_omap_probe(&ohci_omap_hc_driver, dev);
-}
-
-static int ohci_hcd_omap_drv_remove(struct platform_device *dev)
-{
-        struct usb_hcd          *hcd = platform_get_drvdata(dev);
-
-        usb_hcd_omap_remove(hcd, dev);
-
         return 0;
 }
 
@@ -472,8 +455,8 @@ static int ohci_omap_resume(struct platform_device *dev)
  * Driver definition to register with the OMAP bus
  */
 static struct platform_driver ohci_hcd_omap_driver = {
-        .probe          = ohci_hcd_omap_drv_probe,
-        .remove         = ohci_hcd_omap_drv_remove,
+        .probe          = ohci_hcd_omap_probe,
+        .remove         = ohci_hcd_omap_remove,
         .shutdown       = usb_hcd_platform_shutdown,
 #ifdef  CONFIG_PM
         .suspend        = ohci_omap_suspend,
diff --git a/drivers/usb/host/ohci-pxa27x.c b/drivers/usb/host/ohci-pxa27x.c
index a667cf2d5788..79efde8f21e0 100644
--- a/drivers/usb/host/ohci-pxa27x.c
+++ b/drivers/usb/host/ohci-pxa27x.c
@@ -404,7 +404,7 @@ static int ohci_pxa_of_init(struct platform_device *pdev)
 
 
 /**
- * usb_hcd_pxa27x_probe - initialize pxa27x-based HCDs
+ * ohci_hcd_pxa27x_probe - initialize pxa27x-based HCDs
  * Context: !in_interrupt()
  *
  * Allocates basic resources for this USB host controller, and
@@ -412,7 +412,7 @@ static int ohci_pxa_of_init(struct platform_device *pdev)
  * through the hotplug entry's driver_data.
  *
  */
-int usb_hcd_pxa27x_probe (const struct hc_driver *driver, struct platform_device *pdev)
+static int ohci_hcd_pxa27x_probe(struct platform_device *pdev)
 {
         int retval, irq;
         struct usb_hcd *hcd;
@@ -442,7 +442,7 @@ int usb_hcd_pxa27x_probe (const struct hc_driver *driver, struct platform_device
         if (IS_ERR(usb_clk))
                 return PTR_ERR(usb_clk);
 
-        hcd = usb_create_hcd (driver, &pdev->dev, "pxa27x");
+        hcd = usb_create_hcd(&ohci_pxa27x_hc_driver, &pdev->dev, "pxa27x");
         if (!hcd)
                 return -ENOMEM;
 
@@ -503,17 +503,18 @@ int usb_hcd_pxa27x_probe (const struct hc_driver *driver, struct platform_device
 /* may be called with controller, bus, and devices active */
 
 /**
- * usb_hcd_pxa27x_remove - shutdown processing for pxa27x-based HCDs
+ * ohci_hcd_pxa27x_remove - shutdown processing for pxa27x-based HCDs
  * @dev: USB Host Controller being removed
  * Context: !in_interrupt()
  *
- * Reverses the effect of usb_hcd_pxa27x_probe(), first invoking
+ * Reverses the effect of ohci_hcd_pxa27x_probe(), first invoking
  * the HCD's stop() method.  It is always called from a thread
  * context, normally "rmmod", "apmd", or something similar.
  *
  */
-void usb_hcd_pxa27x_remove (struct usb_hcd *hcd, struct platform_device *pdev)
+static int ohci_hcd_pxa27x_remove(struct platform_device *pdev)
 {
+        struct usb_hcd *hcd = platform_get_drvdata(pdev);
         struct pxa27x_ohci *pxa_ohci = to_pxa27x_ohci(hcd);
         unsigned int i;
 
@@ -524,28 +525,11 @@ void usb_hcd_pxa27x_remove (struct usb_hcd *hcd, struct platform_device *pdev)
                 pxa27x_ohci_set_vbus_power(pxa_ohci, i, false);
 
         usb_put_hcd(hcd);
+        return 0;
 }
 
 /*-------------------------------------------------------------------------*/
 
-static int ohci_hcd_pxa27x_drv_probe(struct platform_device *pdev)
-{
-        pr_debug ("In ohci_hcd_pxa27x_drv_probe");
-
-        if (usb_disabled())
-                return -ENODEV;
-
-        return usb_hcd_pxa27x_probe(&ohci_pxa27x_hc_driver, pdev);
-}
-
-static int ohci_hcd_pxa27x_drv_remove(struct platform_device *pdev)
-{
-        struct usb_hcd *hcd = platform_get_drvdata(pdev);
-
-        usb_hcd_pxa27x_remove(hcd, pdev);
-        return 0;
-}
-
 #ifdef CONFIG_PM
 static int ohci_hcd_pxa27x_drv_suspend(struct device *dev)
 {
@@ -598,8 +582,8 @@ static const struct dev_pm_ops ohci_hcd_pxa27x_pm_ops = {
 #endif
 
 static struct platform_driver ohci_hcd_pxa27x_driver = {
-        .probe          = ohci_hcd_pxa27x_drv_probe,
-        .remove         = ohci_hcd_pxa27x_drv_remove,
+        .probe          = ohci_hcd_pxa27x_probe,
+        .remove         = ohci_hcd_pxa27x_remove,
         .shutdown       = usb_hcd_platform_shutdown,
         .driver         = {
                 .name   = "pxa27x-ohci",
diff --git a/drivers/usb/host/ohci-s3c2410.c b/drivers/usb/host/ohci-s3c2410.c
index 7a1919ca543a..b006b93126f7 100644
--- a/drivers/usb/host/ohci-s3c2410.c
+++ b/drivers/usb/host/ohci-s3c2410.c
@@ -43,6 +43,8 @@ static const char hcd_name[] = "ohci-s3c2410";
 static struct clk *clk;
 static struct clk *usb_clk;
 
+static struct hc_driver __read_mostly ohci_s3c2410_hc_driver;
+
 /* forward definitions */
 
 static void s3c2410_hcd_oc(struct s3c2410_hcd_info *info, int port_oc);
@@ -321,26 +323,29 @@ static void s3c2410_hcd_oc(struct s3c2410_hcd_info *info, int port_oc)
 /* may be called with controller, bus, and devices active */
 
 /*
- * usb_hcd_s3c2410_remove - shutdown processing for HCD
+ * ohci_hcd_s3c2410_remove - shutdown processing for HCD
  * @dev: USB Host Controller being removed
  * Context: !in_interrupt()
  *
- * Reverses the effect of usb_hcd_3c2410_probe(), first invoking
+ * Reverses the effect of ohci_hcd_3c2410_probe(), first invoking
  * the HCD's stop() method.  It is always called from a thread
  * context, normally "rmmod", "apmd", or something similar.
  *
 */
 
-static void
-usb_hcd_s3c2410_remove(struct usb_hcd *hcd, struct platform_device *dev)
+static int
+ohci_hcd_s3c2410_remove(struct platform_device *dev)
 {
+        struct usb_hcd *hcd = platform_get_drvdata(dev);
+
         usb_remove_hcd(hcd);
         s3c2410_stop_hc(dev);
         usb_put_hcd(hcd);
+        return 0;
 }
 
 /**
- * usb_hcd_s3c2410_probe - initialize S3C2410-based HCDs
+ * ohci_hcd_s3c2410_probe - initialize S3C2410-based HCDs
  * Context: !in_interrupt()
  *
  * Allocates basic resources for this USB host controller, and
@@ -348,8 +353,7 @@ usb_hcd_s3c2410_remove(struct usb_hcd *hcd, struct platform_device *dev)
  * through the hotplug entry's driver_data.
  *
  */
-static int usb_hcd_s3c2410_probe(const struct hc_driver *driver,
-                                  struct platform_device *dev)
+static int ohci_hcd_s3c2410_probe(struct platform_device *dev)
 {
         struct usb_hcd *hcd = NULL;
         struct s3c2410_hcd_info *info = dev_get_platdata(&dev->dev);
@@ -358,7 +362,7 @@ static int usb_hcd_s3c2410_probe(const struct hc_driver *driver,
         s3c2410_usb_set_power(info, 1, 1);
         s3c2410_usb_set_power(info, 2, 1);
 
-        hcd = usb_create_hcd(driver, &dev->dev, "s3c24xx");
+        hcd = usb_create_hcd(&ohci_s3c2410_hc_driver, &dev->dev, "s3c24xx");
         if (hcd == NULL)
                 return -ENOMEM;
 
@@ -404,21 +408,6 @@ static int usb_hcd_s3c2410_probe(const struct hc_driver *driver,
 
 /*-------------------------------------------------------------------------*/
 
-static struct hc_driver __read_mostly ohci_s3c2410_hc_driver;
-
-static int ohci_hcd_s3c2410_drv_probe(struct platform_device *pdev)
-{
-        return usb_hcd_s3c2410_probe(&ohci_s3c2410_hc_driver, pdev);
-}
-
-static int ohci_hcd_s3c2410_drv_remove(struct platform_device *pdev)
-{
-        struct usb_hcd *hcd = platform_get_drvdata(pdev);
-
-        usb_hcd_s3c2410_remove(hcd, pdev);
-        return 0;
-}
-
 #ifdef CONFIG_PM
 static int ohci_hcd_s3c2410_drv_suspend(struct device *dev)
 {
@@ -457,13 +446,21 @@ static const struct dev_pm_ops ohci_hcd_s3c2410_pm_ops = {
         .resume         = ohci_hcd_s3c2410_drv_resume,
 };
 
+static const struct of_device_id ohci_hcd_s3c2410_dt_ids[] = {
+        { .compatible = "samsung,s3c2410-ohci" },
+        { /* sentinel */ }
+};
+
+MODULE_DEVICE_TABLE(of, ohci_hcd_s3c2410_dt_ids);
+
 static struct platform_driver ohci_hcd_s3c2410_driver = {
-        .probe          = ohci_hcd_s3c2410_drv_probe,
-        .remove         = ohci_hcd_s3c2410_drv_remove,
+        .probe          = ohci_hcd_s3c2410_probe,
+        .remove         = ohci_hcd_s3c2410_remove,
         .shutdown       = usb_hcd_platform_shutdown,
         .driver         = {
                 .name   = "s3c2410-ohci",
                 .pm     = &ohci_hcd_s3c2410_pm_ops,
+                .of_match_table = ohci_hcd_s3c2410_dt_ids,
         },
 };
 
diff --git a/drivers/usb/host/xhci-mem.c b/drivers/usb/host/xhci-mem.c
index 6afe32381209..321de2e0161b 100644
--- a/drivers/usb/host/xhci-mem.c
+++ b/drivers/usb/host/xhci-mem.c
@@ -1032,7 +1032,6 @@ int xhci_alloc_virt_device(struct xhci_hcd *xhci, int slot_id,
                 goto fail;
         dev->num_rings_cached = 0;
 
-        init_completion(&dev->cmd_completion);
         dev->udev = udev;
 
         /* Point to output device context in dcbaa. */
@@ -1370,7 +1369,7 @@ static u32 xhci_get_endpoint_max_burst(struct usb_device *udev,
         if (udev->speed == USB_SPEED_HIGH &&
             (usb_endpoint_xfer_isoc(&ep->desc) ||
              usb_endpoint_xfer_int(&ep->desc)))
-                return (usb_endpoint_maxp(&ep->desc) & 0x1800) >> 11;
+                return usb_endpoint_maxp_mult(&ep->desc) - 1;
 
         return 0;
 }
@@ -1415,10 +1414,10 @@ static u32 xhci_get_max_esit_payload(struct usb_device *udev,
         else if (udev->speed >= USB_SPEED_SUPER)
                 return le16_to_cpu(ep->ss_ep_comp.wBytesPerInterval);
 
-        max_packet = GET_MAX_PACKET(usb_endpoint_maxp(&ep->desc));
-        max_burst = (usb_endpoint_maxp(&ep->desc) & 0x1800) >> 11;
+        max_packet = usb_endpoint_maxp(&ep->desc);
+        max_burst = usb_endpoint_maxp_mult(&ep->desc);
         /* A 0 in max burst means 1 transfer per ESIT */
-        return max_packet * (max_burst + 1);
+        return max_packet * max_burst;
 }
 
 /* Set up an endpoint with one ring segment.  Do not allocate stream rings.
@@ -1461,7 +1460,7 @@ int xhci_endpoint_init(struct xhci_hcd *xhci,
         max_esit_payload = xhci_get_max_esit_payload(udev, ep);
         interval = xhci_get_endpoint_interval(udev, ep);
         mult = xhci_get_endpoint_mult(udev, ep);
-        max_packet = GET_MAX_PACKET(usb_endpoint_maxp(&ep->desc));
+        max_packet = usb_endpoint_maxp(&ep->desc);
         max_burst = xhci_get_endpoint_max_burst(udev, ep);
         avg_trb_len = max_esit_payload;
 
@@ -2384,7 +2383,7 @@ int xhci_mem_init(struct xhci_hcd *xhci, gfp_t flags)
          * "physically contiguous and 64-byte (cache line) aligned".
          */
         xhci->dcbaa = dma_alloc_coherent(dev, sizeof(*xhci->dcbaa), &dma,
-                        GFP_KERNEL);
+                        flags);
         if (!xhci->dcbaa)
                 goto fail;
         memset(xhci->dcbaa, 0, sizeof *(xhci->dcbaa));
@@ -2480,7 +2479,7 @@ int xhci_mem_init(struct xhci_hcd *xhci, gfp_t flags)
 
         xhci->erst.entries = dma_alloc_coherent(dev,
                         sizeof(struct xhci_erst_entry) * ERST_NUM_SEGS, &dma,
-                        GFP_KERNEL);
+                        flags);
         if (!xhci->erst.entries)
                 goto fail;
         xhci_dbg_trace(xhci, trace_xhci_dbg_init,
@@ -2536,7 +2535,6 @@ int xhci_mem_init(struct xhci_hcd *xhci, gfp_t flags)
          * something other than the default (~1ms minimum between interrupts).
          * See section 5.5.1.2.
          */
-        init_completion(&xhci->addr_dev);
         for (i = 0; i < MAX_HC_SLOTS; ++i)
                 xhci->devs[i] = NULL;
         for (i = 0; i < USB_MAXCHILDREN; ++i) {
diff --git a/drivers/usb/host/xhci-mtk-sch.c b/drivers/usb/host/xhci-mtk-sch.c
index 73f763c4f5f5..6e7ddf6cafae 100644
--- a/drivers/usb/host/xhci-mtk-sch.c
+++ b/drivers/usb/host/xhci-mtk-sch.c
@@ -337,7 +337,7 @@ int xhci_mtk_add_ep_quirk(struct usb_hcd *hcd, struct usb_device *udev,
 
         xhci_dbg(xhci, "%s() type:%d, speed:%d, mpkt:%d, dir:%d, ep:%p\n",
                 __func__, usb_endpoint_type(&ep->desc), udev->speed,
-                GET_MAX_PACKET(usb_endpoint_maxp(&ep->desc)),
+                usb_endpoint_maxp(&ep->desc),
                 usb_endpoint_dir_in(&ep->desc), ep);
 
         if (!need_bw_sch(ep, udev->speed, slot_ctx->tt_info & TT_SLOT)) {
@@ -403,7 +403,7 @@ void xhci_mtk_drop_ep_quirk(struct usb_hcd *hcd, struct usb_device *udev,
 
         xhci_dbg(xhci, "%s() type:%d, speed:%d, mpks:%d, dir:%d, ep:%p\n",
                 __func__, usb_endpoint_type(&ep->desc), udev->speed,
-                GET_MAX_PACKET(usb_endpoint_maxp(&ep->desc)),
+                usb_endpoint_maxp(&ep->desc),
                 usb_endpoint_dir_in(&ep->desc), ep);
 
         if (!need_bw_sch(ep, udev->speed, slot_ctx->tt_info & TT_SLOT))
diff --git a/drivers/usb/host/xhci-mtk.c b/drivers/usb/host/xhci-mtk.c
index 79959f17c38c..1094ebd2838f 100644
--- a/drivers/usb/host/xhci-mtk.c
+++ b/drivers/usb/host/xhci-mtk.c
@@ -94,6 +94,9 @@ static int xhci_mtk_host_enable(struct xhci_hcd_mtk *mtk)
         int ret;
         int i;
 
+        if (!mtk->has_ippc)
+                return 0;
+
         /* power on host ip */
         value = readl(&ippc->ip_pw_ctr1);
         value &= ~CTRL1_IP_HOST_PDN;
@@ -139,6 +142,9 @@ static int xhci_mtk_host_disable(struct xhci_hcd_mtk *mtk)
         int ret;
         int i;
 
+        if (!mtk->has_ippc)
+                return 0;
+
         /* power down all u3 ports */
         for (i = 0; i < mtk->num_u3_ports; i++) {
                 value = readl(&ippc->u3_ctrl_p[i]);
@@ -173,6 +179,9 @@ static int xhci_mtk_ssusb_config(struct xhci_hcd_mtk *mtk)
         struct mu3c_ippc_regs __iomem *ippc = mtk->ippc_regs;
         u32 value;
 
+        if (!mtk->has_ippc)
+                return 0;
+
         /* reset whole ip */
         value = readl(&ippc->ip_pw_ctr0);
         value |= CTRL0_IP_SW_RST;
@@ -475,6 +484,7 @@ static void xhci_mtk_quirks(struct device *dev, struct xhci_hcd *xhci)
 /* called during probe() after chip reset completes */
 static int xhci_mtk_setup(struct usb_hcd *hcd)
 {
+        struct xhci_hcd *xhci = hcd_to_xhci(hcd);
         struct xhci_hcd_mtk *mtk = hcd_to_mtk(hcd);
         int ret;
 
@@ -482,12 +492,21 @@ static int xhci_mtk_setup(struct usb_hcd *hcd)
                 ret = xhci_mtk_ssusb_config(mtk);
                 if (ret)
                         return ret;
+        }
+
+        ret = xhci_gen_setup(hcd, xhci_mtk_quirks);
+        if (ret)
+                return ret;
+
+        if (usb_hcd_is_primary_hcd(hcd)) {
+                mtk->num_u3_ports = xhci->num_usb3_ports;
+                mtk->num_u2_ports = xhci->num_usb2_ports;
                 ret = xhci_mtk_sch_init(mtk);
                 if (ret)
                         return ret;
         }
 
-        return xhci_gen_setup(hcd, xhci_mtk_quirks);
+        return ret;
 }
 
 static int xhci_mtk_probe(struct platform_device *pdev)
@@ -586,7 +605,7 @@ static int xhci_mtk_probe(struct platform_device *pdev)
         mtk->hcd = platform_get_drvdata(pdev);
         platform_set_drvdata(pdev, mtk);
 
-        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+        res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "mac");
         hcd->regs = devm_ioremap_resource(dev, res);
         if (IS_ERR(hcd->regs)) {
                 ret = PTR_ERR(hcd->regs);
@@ -595,11 +614,16 @@ static int xhci_mtk_probe(struct platform_device *pdev)
         hcd->rsrc_start = res->start;
         hcd->rsrc_len = resource_size(res);
 
-        res = platform_get_resource(pdev, IORESOURCE_MEM, 1);
-        mtk->ippc_regs = devm_ioremap_resource(dev, res);
-        if (IS_ERR(mtk->ippc_regs)) {
-                ret = PTR_ERR(mtk->ippc_regs);
-                goto put_usb2_hcd;
+        res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "ippc");
+        if (res) {      /* ippc register is optional */
+                mtk->ippc_regs = devm_ioremap_resource(dev, res);
+                if (IS_ERR(mtk->ippc_regs)) {
+                        ret = PTR_ERR(mtk->ippc_regs);
+                        goto put_usb2_hcd;
+                }
+                mtk->has_ippc = true;
+        } else {
+                mtk->has_ippc = false;
         }
 
         for (phy_num = 0; phy_num < mtk->num_phys; phy_num++) {
diff --git a/drivers/usb/host/xhci-mtk.h b/drivers/usb/host/xhci-mtk.h
index 7da677c79ea8..2845c49efe1b 100644
--- a/drivers/usb/host/xhci-mtk.h
+++ b/drivers/usb/host/xhci-mtk.h
@@ -118,6 +118,7 @@ struct xhci_hcd_mtk {
         struct usb_hcd *hcd;
         struct mu3h_sch_bw_info *sch_array;
         struct mu3c_ippc_regs __iomem *ippc_regs;
+        bool has_ippc;
         int num_u2_ports;
         int num_u3_ports;
         struct regulator *vusb33;
diff --git a/drivers/usb/host/xhci-plat.c b/drivers/usb/host/xhci-plat.c
index ed56bf9ed885..ddfab301e366 100644
--- a/drivers/usb/host/xhci-plat.c
+++ b/drivers/usb/host/xhci-plat.c
@@ -100,6 +100,12 @@ static const struct xhci_plat_priv xhci_plat_renesas_rcar_gen3 = {
         .plat_start = xhci_rcar_start,
 };
 
+static const struct xhci_plat_priv xhci_plat_renesas_rcar_r8a7796 = {
+        .firmware_name = XHCI_RCAR_FIRMWARE_NAME_V3,
+        .init_quirk = xhci_rcar_init_quirk,
+        .plat_start = xhci_rcar_start,
+};
+
 static const struct of_device_id usb_xhci_of_match[] = {
         {
                 .compatible = "generic-xhci",
@@ -124,6 +130,9 @@ static const struct of_device_id usb_xhci_of_match[] = {
                 .compatible = "renesas,xhci-r8a7795",
                 .data = &xhci_plat_renesas_rcar_gen3,
         }, {
+                .compatible = "renesas,xhci-r8a7796",
+                .data = &xhci_plat_renesas_rcar_r8a7796,
+        }, {
                 .compatible = "renesas,rcar-gen2-xhci",
                 .data = &xhci_plat_renesas_rcar_gen2,
         }, {
diff --git a/drivers/usb/host/xhci-rcar.c b/drivers/usb/host/xhci-rcar.c
index 0e4535e632ec..d28df386e780 100644
--- a/drivers/usb/host/xhci-rcar.c
+++ b/drivers/usb/host/xhci-rcar.c
@@ -19,6 +19,8 @@
 #include "xhci-rcar.h"
 
 /*
+* - The V3 firmware is for r8a7796 (with good performance).
+* - The V2 firmware can be used on both r8a7795 (es1.x) and r8a7796.
 * - The V2 firmware is possible to use on R-Car Gen2. However, the V2 causes
 *   performance degradation. So, this driver continues to use the V1 if R-Car
 *   Gen2.
@@ -26,6 +28,7 @@
 */
 MODULE_FIRMWARE(XHCI_RCAR_FIRMWARE_NAME_V1);
 MODULE_FIRMWARE(XHCI_RCAR_FIRMWARE_NAME_V2);
+MODULE_FIRMWARE(XHCI_RCAR_FIRMWARE_NAME_V3);
 
 /*** Register Offset ***/
 #define RCAR_USB3_INT_ENA       0x224   /* Interrupt Enable */
@@ -92,6 +95,7 @@ static int xhci_rcar_is_gen3(struct device *dev)
         struct device_node *node = dev->of_node;
 
         return of_device_is_compatible(node, "renesas,xhci-r8a7795") ||
+                of_device_is_compatible(node, "renesas,xhci-r8a7796") ||
                 of_device_is_compatible(node, "renesas,rcar-gen3-xhci");
 }
 
diff --git a/drivers/usb/host/xhci-rcar.h b/drivers/usb/host/xhci-rcar.h
index 2941a25cfe98..d2ffe20401cf 100644
--- a/drivers/usb/host/xhci-rcar.h
+++ b/drivers/usb/host/xhci-rcar.h
@@ -13,6 +13,7 @@
 
 #define XHCI_RCAR_FIRMWARE_NAME_V1      "r8a779x_usb3_v1.dlmem"
 #define XHCI_RCAR_FIRMWARE_NAME_V2      "r8a779x_usb3_v2.dlmem"
+#define XHCI_RCAR_FIRMWARE_NAME_V3      "r8a779x_usb3_v3.dlmem"
 
 #if IS_ENABLED(CONFIG_USB_XHCI_RCAR)
 void xhci_rcar_start(struct usb_hcd *hcd);
diff --git a/drivers/usb/host/xhci-ring.c b/drivers/usb/host/xhci-ring.c
index 797137e26549..bdf6b13d9b67 100644
--- a/drivers/usb/host/xhci-ring.c
+++ b/drivers/usb/host/xhci-ring.c
@@ -89,6 +89,11 @@ dma_addr_t xhci_trb_virt_to_dma(struct xhci_segment *seg,
         return seg->dma + (segment_offset * sizeof(*trb));
 }
 
+static bool trb_is_noop(union xhci_trb *trb)
+{
+        return TRB_TYPE_NOOP_LE32(trb->generic.field[3]);
+}
+
 static bool trb_is_link(union xhci_trb *trb)
 {
         return TRB_TYPE_LINK_LE32(trb->link.control);
@@ -110,6 +115,20 @@ static bool link_trb_toggles_cycle(union xhci_trb *trb)
         return le32_to_cpu(trb->link.control) & LINK_TOGGLE;
 }
 
+static bool last_td_in_urb(struct xhci_td *td)
+{
+        struct urb_priv *urb_priv = td->urb->hcpriv;
+
+        return urb_priv->td_cnt == urb_priv->length;
+}
+
+static void inc_td_cnt(struct urb *urb)
+{
+        struct urb_priv *urb_priv = urb->hcpriv;
+
+        urb_priv->td_cnt++;
+}
+
 /* Updates trb to point to the next TRB in the ring, and updates seg if the next
  * TRB is in a new segment.  This does not skip over link TRBs, and it does not
  * effect the ring dequeue or enqueue pointers.
@@ -303,7 +322,6 @@ static int xhci_abort_cmd_ring(struct xhci_hcd *xhci)
                                 "maybe the host is dead\n");
                 del_timer(&xhci->cmd_timer);
                 xhci->xhc_state |= XHCI_STATE_DYING;
-                xhci_quiesce(xhci);
                 xhci_halt(xhci);
                 return -ESHUTDOWN;
         }
@@ -473,9 +491,8 @@ void xhci_find_new_dequeue_state(struct xhci_hcd *xhci,
                 if (new_deq == cur_td->last_trb)
                         td_last_trb_found = true;
 
-                if (cycle_found &&
-                    TRB_TYPE_LINK_LE32(new_deq->generic.field[3]) &&
-                    new_deq->generic.field[3] & cpu_to_le32(LINK_TOGGLE))
+                if (cycle_found && trb_is_link(new_deq) &&
+                    link_trb_toggles_cycle(new_deq))
                         state->new_cycle_state ^= 0x1;
 
                 next_trb(xhci, ep_ring, &new_seg, &new_deq);
@@ -511,54 +528,32 @@ void xhci_find_new_dequeue_state(struct xhci_hcd *xhci,
  * of this TD.)  This is used to remove partially enqueued isoc TDs from a ring.
  */
 static void td_to_noop(struct xhci_hcd *xhci, struct xhci_ring *ep_ring,
-                struct xhci_td *cur_td, bool flip_cycle)
+                       struct xhci_td *td, bool flip_cycle)
 {
-        struct xhci_segment *cur_seg;
-        union xhci_trb *cur_trb;
-
-        for (cur_seg = cur_td->start_seg, cur_trb = cur_td->first_trb;
-                        true;
-                        next_trb(xhci, ep_ring, &cur_seg, &cur_trb)) {
-                if (TRB_TYPE_LINK_LE32(cur_trb->generic.field[3])) {
-                        /* Unchain any chained Link TRBs, but
-                         * leave the pointers intact.
-                         */
-                        cur_trb->generic.field[3] &= cpu_to_le32(~TRB_CHAIN);
-                        /* Flip the cycle bit (link TRBs can't be the first
-                         * or last TRB).
-                         */
-                        if (flip_cycle)
-                                cur_trb->generic.field[3] ^=
-                                        cpu_to_le32(TRB_CYCLE);
-                        xhci_dbg_trace(xhci, trace_xhci_dbg_cancel_urb,
-                                        "Cancel (unchain) link TRB");
-                        xhci_dbg_trace(xhci, trace_xhci_dbg_cancel_urb,
-                                        "Address = %p (0x%llx dma); "
-                                        "in seg %p (0x%llx dma)",
-                                        cur_trb,
-                                        (unsigned long long)xhci_trb_virt_to_dma(cur_seg, cur_trb),
-                                        cur_seg,
-                                        (unsigned long long)cur_seg->dma);
+        struct xhci_segment *seg        = td->start_seg;
+        union xhci_trb *trb             = td->first_trb;
+
+        while (1) {
+                if (trb_is_link(trb)) {
+                        /* unchain chained link TRBs */
+                        trb->link.control &= cpu_to_le32(~TRB_CHAIN);
                 } else {
-                        cur_trb->generic.field[0] = 0;
-                        cur_trb->generic.field[1] = 0;
-                        cur_trb->generic.field[2] = 0;
+                        trb->generic.field[0] = 0;
+                        trb->generic.field[1] = 0;
+                        trb->generic.field[2] = 0;
                         /* Preserve only the cycle bit of this TRB */
-                        cur_trb->generic.field[3] &= cpu_to_le32(TRB_CYCLE);
-                        /* Flip the cycle bit except on the first or last TRB */
-                        if (flip_cycle && cur_trb != cur_td->first_trb &&
-                                        cur_trb != cur_td->last_trb)
-                                cur_trb->generic.field[3] ^=
-                                        cpu_to_le32(TRB_CYCLE);
-                        cur_trb->generic.field[3] |= cpu_to_le32(
+                        trb->generic.field[3] &= cpu_to_le32(TRB_CYCLE);
+                        trb->generic.field[3] |= cpu_to_le32(
                                 TRB_TYPE(TRB_TR_NOOP));
-                        xhci_dbg_trace(xhci, trace_xhci_dbg_cancel_urb,
-                                        "TRB to noop at offset 0x%llx",
-                                        (unsigned long long)
-                                        xhci_trb_virt_to_dma(cur_seg, cur_trb));
                 }
-                if (cur_trb == cur_td->last_trb)
+                /* flip cycle if asked to */
+                if (flip_cycle && trb != td->first_trb && trb != td->last_trb)
+                        trb->generic.field[3] ^= cpu_to_le32(TRB_CYCLE);
+
+                if (trb == td->last_trb)
                         break;
+
+                next_trb(xhci, ep_ring, &seg, &trb);
         }
 }
 
@@ -574,39 +569,33 @@ static void xhci_stop_watchdog_timer_in_irq(struct xhci_hcd *xhci,
                 ep->stop_cmds_pending--;
 }
 
-/* Must be called with xhci->lock held in interrupt context */
+/*
+ * Must be called with xhci->lock held in interrupt context,
+ * releases and re-acquires xhci->lock
+ */
 static void xhci_giveback_urb_in_irq(struct xhci_hcd *xhci,
-                struct xhci_td *cur_td, int status)
+                                     struct xhci_td *cur_td, int status)
 {
-        struct usb_hcd *hcd;
-        struct urb      *urb;
-        struct urb_priv *urb_priv;
+        struct urb      *urb            = cur_td->urb;
+        struct urb_priv *urb_priv       = urb->hcpriv;
+        struct usb_hcd  *hcd            = bus_to_hcd(urb->dev->bus);
 
-        urb = cur_td->urb;
-        urb_priv = urb->hcpriv;
-        urb_priv->td_cnt++;
-        hcd = bus_to_hcd(urb->dev->bus);
-
-        /* Only giveback urb when this is the last td in urb */
-        if (urb_priv->td_cnt == urb_priv->length) {
-                if (usb_pipetype(urb->pipe) == PIPE_ISOCHRONOUS) {
-                        xhci_to_hcd(xhci)->self.bandwidth_isoc_reqs--;
-                        if (xhci_to_hcd(xhci)->self.bandwidth_isoc_reqs == 0) {
-                                if (xhci->quirks & XHCI_AMD_PLL_FIX)
-                                        usb_amd_quirk_pll_enable();
-                        }
+        if (usb_pipetype(urb->pipe) == PIPE_ISOCHRONOUS) {
+                xhci_to_hcd(xhci)->self.bandwidth_isoc_reqs--;
+                if (xhci_to_hcd(xhci)->self.bandwidth_isoc_reqs == 0) {
+                        if (xhci->quirks & XHCI_AMD_PLL_FIX)
+                                usb_amd_quirk_pll_enable();
                 }
-                usb_hcd_unlink_urb_from_ep(hcd, urb);
-
-                spin_unlock(&xhci->lock);
-                usb_hcd_giveback_urb(hcd, urb, status);
-                xhci_urb_free_priv(urb_priv);
-                spin_lock(&xhci->lock);
         }
+        xhci_urb_free_priv(urb_priv);
+        usb_hcd_unlink_urb_from_ep(hcd, urb);
+        spin_unlock(&xhci->lock);
+        usb_hcd_giveback_urb(hcd, urb, status);
+        spin_lock(&xhci->lock);
 }
 
-void xhci_unmap_td_bounce_buffer(struct xhci_hcd *xhci, struct xhci_ring *ring,
-                                 struct xhci_td *td)
+static void xhci_unmap_td_bounce_buffer(struct xhci_hcd *xhci,
+                struct xhci_ring *ring, struct xhci_td *td)
 {
         struct device *dev = xhci_to_hcd(xhci)->self.controller;
         struct xhci_segment *seg = td->bounce_seg;
@@ -752,7 +741,9 @@ remove_finished_td:
                 ep_ring = xhci_urb_to_transfer_ring(xhci, cur_td->urb);
                 if (ep_ring && cur_td->bounce_seg)
                         xhci_unmap_td_bounce_buffer(xhci, ep_ring, cur_td);
-                xhci_giveback_urb_in_irq(xhci, cur_td, 0);
+                inc_td_cnt(cur_td->urb);
+                if (last_td_in_urb(cur_td))
+                        xhci_giveback_urb_in_irq(xhci, cur_td, 0);
 
                 /* Stop processing the cancelled list if the watchdog timer is
                  * running.
@@ -777,7 +768,10 @@ static void xhci_kill_ring_urbs(struct xhci_hcd *xhci, struct xhci_ring *ring)
 
                 if (cur_td->bounce_seg)
                         xhci_unmap_td_bounce_buffer(xhci, ring, cur_td);
-                xhci_giveback_urb_in_irq(xhci, cur_td, -ESHUTDOWN);
+
+                inc_td_cnt(cur_td->urb);
+                if (last_td_in_urb(cur_td))
+                        xhci_giveback_urb_in_irq(xhci, cur_td, -ESHUTDOWN);
         }
 }
 
@@ -814,7 +808,10 @@ static void xhci_kill_endpoint_urbs(struct xhci_hcd *xhci,
                 cur_td = list_first_entry(&ep->cancelled_td_list,
                                 struct xhci_td, cancelled_td_list);
                 list_del_init(&cur_td->cancelled_td_list);
-                xhci_giveback_urb_in_irq(xhci, cur_td, -ESHUTDOWN);
+
+                inc_td_cnt(cur_td->urb);
+                if (last_td_in_urb(cur_td))
+                        xhci_giveback_urb_in_irq(xhci, cur_td, -ESHUTDOWN);
         }
 }
 
@@ -1003,8 +1000,7 @@ static void xhci_handle_cmd_set_deq(struct xhci_hcd *xhci, int slot_id,
                         break;
                 case COMP_CTX_STATE:
                         xhci_warn(xhci, "WARN Set TR Deq Ptr cmd failed due to incorrect slot or ep state.\n");
-                        ep_state = le32_to_cpu(ep_ctx->ep_info);
-                        ep_state &= EP_STATE_MASK;
+                        ep_state = GET_EP_CTX_STATE(ep_ctx);
                         slot_state = le32_to_cpu(slot_ctx->dev_state);
                         slot_state = GET_SLOT_STATE(slot_state);
                         xhci_dbg_trace(xhci, trace_xhci_dbg_cancel_urb,
@@ -1096,12 +1092,12 @@ static void xhci_handle_cmd_reset_ep(struct xhci_hcd *xhci, int slot_id,
 }
 
 static void xhci_handle_cmd_enable_slot(struct xhci_hcd *xhci, int slot_id,
-                u32 cmd_comp_code)
+                struct xhci_command *command, u32 cmd_comp_code)
 {
         if (cmd_comp_code == COMP_SUCCESS)
-                xhci->slot_id = slot_id;
+                command->slot_id = slot_id;
         else
-                xhci->slot_id = 0;
+                command->slot_id = 0;
 }
 
 static void xhci_handle_cmd_disable_slot(struct xhci_hcd *xhci, int slot_id)
@@ -1183,7 +1179,7 @@ static void xhci_handle_cmd_nec_get_fw(struct xhci_hcd *xhci,
                 struct xhci_event_cmd *event)
 {
         if (!(xhci->quirks & XHCI_NEC_HOST)) {
-                xhci->error_bitmask |= 1 << 6;
+                xhci_warn(xhci, "WARN NEC_GET_FW command on non-NEC host\n");
                 return;
         }
         xhci_dbg_trace(xhci, trace_xhci_dbg_quirks,
@@ -1325,14 +1321,13 @@ static void handle_cmd_completion(struct xhci_hcd *xhci,
         cmd_trb = xhci->cmd_ring->dequeue;
         cmd_dequeue_dma = xhci_trb_virt_to_dma(xhci->cmd_ring->deq_seg,
                         cmd_trb);
-        /* Is the command ring deq ptr out of sync with the deq seg ptr? */
-        if (cmd_dequeue_dma == 0) {
-                xhci->error_bitmask |= 1 << 4;
-                return;
-        }
-        /* Does the DMA address match our internal dequeue pointer address? */
-        if (cmd_dma != (u64) cmd_dequeue_dma) {
-                xhci->error_bitmask |= 1 << 5;
+        /*
+         * Check whether the completion event is for our internal kept
+         * command.
+         */
+        if (!cmd_dequeue_dma || cmd_dma != (u64)cmd_dequeue_dma) {
+                xhci_warn(xhci,
+                          "ERROR mismatched command completion event\n");
                 return;
         }
 
@@ -1371,7 +1366,7 @@ static void handle_cmd_completion(struct xhci_hcd *xhci,
         cmd_type = TRB_FIELD_TO_TYPE(le32_to_cpu(cmd_trb->generic.field[3]));
         switch (cmd_type) {
         case TRB_ENABLE_SLOT:
-                xhci_handle_cmd_enable_slot(xhci, slot_id, cmd_comp_code);
+                xhci_handle_cmd_enable_slot(xhci, slot_id, cmd, cmd_comp_code);
                 break;
         case TRB_DISABLE_SLOT:
                 xhci_handle_cmd_disable_slot(xhci, slot_id);
@@ -1418,7 +1413,7 @@ static void handle_cmd_completion(struct xhci_hcd *xhci,
                 break;
         default:
                 /* Skip over unknown commands on the event ring */
-                xhci->error_bitmask |= 1 << 6;
+                xhci_info(xhci, "INFO unknown command type %d\n", cmd_type);
                 break;
         }
 
@@ -1519,10 +1514,10 @@ static void handle_port_status(struct xhci_hcd *xhci,
         bool bogus_port_status = false;
 
         /* Port status change events always have a successful completion code */
-        if (GET_COMP_CODE(le32_to_cpu(event->generic.field[2])) != COMP_SUCCESS) {
-                xhci_warn(xhci, "WARN: xHC returned failed port status event\n");
-                xhci->error_bitmask |= 1 << 8;
-        }
+        if (GET_COMP_CODE(le32_to_cpu(event->generic.field[2])) != COMP_SUCCESS)
+                xhci_warn(xhci,
+                          "WARN: xHC returned failed port status event\n");
+
         port_id = GET_PORT_ID(le32_to_cpu(event->generic.field[0]));
         xhci_dbg(xhci, "Port Status Change Event for port %d\n", port_id);
 
@@ -1759,7 +1754,7 @@ struct xhci_segment *trb_in_td(struct xhci_hcd *xhci,
 static void xhci_cleanup_halted_endpoint(struct xhci_hcd *xhci,
                 unsigned int slot_id, unsigned int ep_index,
                 unsigned int stream_id,
-                struct xhci_td *td, union xhci_trb *event_trb)
+                struct xhci_td *td, union xhci_trb *ep_trb)
 {
         struct xhci_virt_ep *ep = &xhci->devs[slot_id]->eps[ep_index];
         struct xhci_command *command;
@@ -1798,8 +1793,7 @@ static int xhci_requires_manual_halt_cleanup(struct xhci_hcd *xhci,
                  * endpoint anyway.  Check if a babble halted the
                  * endpoint.
                  */
-                if ((ep_ctx->ep_info & cpu_to_le32(EP_STATE_MASK)) ==
-                    cpu_to_le32(EP_STATE_HALTED))
+                if (GET_EP_CTX_STATE(ep_ctx) == EP_STATE_HALTED)
                         return 1;
 
         return 0;
@@ -1824,7 +1818,7 @@ int xhci_is_vendor_info_code(struct xhci_hcd *xhci, unsigned int trb_comp_code)
  * Return 1 if the urb can be given back.
  */
 static int finish_td(struct xhci_hcd *xhci, struct xhci_td *td,
-        union xhci_trb *event_trb, struct xhci_transfer_event *event,
+        union xhci_trb *ep_trb, struct xhci_transfer_event *event,
         struct xhci_virt_ep *ep, int *status, bool skip)
 {
         struct xhci_virt_device *xdev;
@@ -1833,7 +1827,6 @@ static int finish_td(struct xhci_hcd *xhci, struct xhci_td *td,
         int ep_index;
         struct urb *urb = NULL;
         struct xhci_ep_ctx *ep_ctx;
-        int ret = 0;
         struct urb_priv *urb_priv;
         u32 trb_comp_code;
 
@@ -1866,7 +1859,7 @@ static int finish_td(struct xhci_hcd *xhci, struct xhci_td *td,
                  * The class driver clears the device side halt later.
                  */
                 xhci_cleanup_halted_endpoint(xhci, slot_id, ep_index,
-                                        ep_ring->stream_id, td, event_trb);
+                                        ep_ring->stream_id, td, ep_trb);
         } else {
                 /* Update ring dequeue pointer */
                 while (ep_ring->dequeue != td->last_trb)
@@ -1889,41 +1882,54 @@ td_cleanup:
          * unsigned).  Play it safe and say we didn't transfer anything.
          */
         if (urb->actual_length > urb->transfer_buffer_length) {
-                xhci_warn(xhci, "URB transfer length is wrong, xHC issue? req. len = %u, act. len = %u\n",
-                        urb->transfer_buffer_length,
-                        urb->actual_length);
+                xhci_warn(xhci, "URB req %u and actual %u transfer length mismatch\n",
+                          urb->transfer_buffer_length, urb->actual_length);
                 urb->actual_length = 0;
-                if (td->urb->transfer_flags & URB_SHORT_NOT_OK)
-                        *status = -EREMOTEIO;
-                else
-                        *status = 0;
+                *status = 0;
         }
         list_del_init(&td->td_list);
         /* Was this TD slated to be cancelled but completed anyway? */
         if (!list_empty(&td->cancelled_td_list))
                 list_del_init(&td->cancelled_td_list);
 
-        urb_priv->td_cnt++;
+        inc_td_cnt(urb);
         /* Giveback the urb when all the tds are completed */
-        if (urb_priv->td_cnt == urb_priv->length) {
-                ret = 1;
-                if (usb_pipetype(urb->pipe) == PIPE_ISOCHRONOUS) {
-                        xhci_to_hcd(xhci)->self.bandwidth_isoc_reqs--;
-                        if (xhci_to_hcd(xhci)->self.bandwidth_isoc_reqs == 0) {
-                                if (xhci->quirks & XHCI_AMD_PLL_FIX)
-                                        usb_amd_quirk_pll_enable();
-                        }
-                }
+        if (last_td_in_urb(td)) {
+                if ((urb->actual_length != urb->transfer_buffer_length &&
+                     (urb->transfer_flags & URB_SHORT_NOT_OK)) ||
+                    (*status != 0 && !usb_endpoint_xfer_isoc(&urb->ep->desc)))
+                        xhci_dbg(xhci, "Giveback URB %p, len = %d, expected = %d, status = %d\n",
+                                 urb, urb->actual_length,
+                                 urb->transfer_buffer_length, *status);
+
+                /* set isoc urb status to 0 just as EHCI, UHCI, and OHCI */
+                if (usb_pipetype(urb->pipe) == PIPE_ISOCHRONOUS)
+                        *status = 0;
+                xhci_giveback_urb_in_irq(xhci, td, *status);
         }
+        return 0;
+}
 
-        return ret;
+/* sum trb lengths from ring dequeue up to stop_trb, _excluding_ stop_trb */
+static int sum_trb_lengths(struct xhci_hcd *xhci, struct xhci_ring *ring,
+                           union xhci_trb *stop_trb)
+{
+        u32 sum;
+        union xhci_trb *trb = ring->dequeue;
+        struct xhci_segment *seg = ring->deq_seg;
+
+        for (sum = 0; trb != stop_trb; next_trb(xhci, ring, &seg, &trb)) {
+                if (!trb_is_noop(trb) && !trb_is_link(trb))
+                        sum += TRB_LEN(le32_to_cpu(trb->generic.field[2]));
+        }
+        return sum;
 }
 
 /*
  * Process control tds, update urb status and actual_length.
  */
 static int process_ctrl_td(struct xhci_hcd *xhci, struct xhci_td *td,
-        union xhci_trb *event_trb, struct xhci_transfer_event *event,
+        union xhci_trb *ep_trb, struct xhci_transfer_event *event,
         struct xhci_virt_ep *ep, int *status)
 {
         struct xhci_virt_device *xdev;
@@ -1932,6 +1938,8 @@ static int process_ctrl_td(struct xhci_hcd *xhci, struct xhci_td *td,
         int ep_index;
         struct xhci_ep_ctx *ep_ctx;
         u32 trb_comp_code;
+        u32 remaining, requested;
+        bool on_data_stage;
 
         slot_id = TRB_TO_SLOT_ID(le32_to_cpu(event->flags));
         xdev = xhci->devs[slot_id];
@@ -1939,195 +1947,161 @@ static int process_ctrl_td(struct xhci_hcd *xhci, struct xhci_td *td,
         ep_ring = xhci_dma_to_transfer_ring(ep, le64_to_cpu(event->buffer));
         ep_ctx = xhci_get_ep_ctx(xhci, xdev->out_ctx, ep_index);
         trb_comp_code = GET_COMP_CODE(le32_to_cpu(event->transfer_len));
+        requested = td->urb->transfer_buffer_length;
+        remaining = EVENT_TRB_LEN(le32_to_cpu(event->transfer_len));
+
+        /* not setup (dequeue), or status stage means we are at data stage */
+        on_data_stage = (ep_trb != ep_ring->dequeue && ep_trb != td->last_trb);
 
         switch (trb_comp_code) {
         case COMP_SUCCESS:
-                if (event_trb == ep_ring->dequeue) {
-                        xhci_warn(xhci, "WARN: Success on ctrl setup TRB "
-                                        "without IOC set??\n");
-                        *status = -ESHUTDOWN;
-                } else if (event_trb != td->last_trb) {
-                        xhci_warn(xhci, "WARN: Success on ctrl data TRB "
-                                        "without IOC set??\n");
+                if (ep_trb != td->last_trb) {
+                        xhci_warn(xhci, "WARN: Success on ctrl %s TRB without IOC set?\n",
+                                  on_data_stage ? "data" : "setup");
                         *status = -ESHUTDOWN;
-                } else {
-                        *status = 0;
+                        break;
                 }
+                *status = 0;
                 break;
         case COMP_SHORT_TX:
-                if (td->urb->transfer_flags & URB_SHORT_NOT_OK)
-                        *status = -EREMOTEIO;
-                else
-                        *status = 0;
+                *status = 0;
                 break;
         case COMP_STOP_SHORT:
-                if (event_trb == ep_ring->dequeue || event_trb == td->last_trb)
-                        xhci_warn(xhci, "WARN: Stopped Short Packet on ctrl setup or status TRB\n");
+                if (on_data_stage)
+                        td->urb->actual_length = remaining;
                 else
-                        td->urb->actual_length =
-                                EVENT_TRB_LEN(le32_to_cpu(event->transfer_len));
-
-                return finish_td(xhci, td, event_trb, event, ep, status, false);
+                        xhci_warn(xhci, "WARN: Stopped Short Packet on ctrl setup or status TRB\n");
+                goto finish_td;
         case COMP_STOP:
-                /* Did we stop at data stage? */
-                if (event_trb != ep_ring->dequeue && event_trb != td->last_trb)
-                        td->urb->actual_length =
-                                td->urb->transfer_buffer_length -
-                                EVENT_TRB_LEN(le32_to_cpu(event->transfer_len));
-                /* fall through */
+                if (on_data_stage)
+                        td->urb->actual_length = requested - remaining;
+                goto finish_td;
         case COMP_STOP_INVAL:
-                return finish_td(xhci, td, event_trb, event, ep, status, false);
+                goto finish_td;
         default:
                 if (!xhci_requires_manual_halt_cleanup(xhci,
-                                        ep_ctx, trb_comp_code))
+                                                       ep_ctx, trb_comp_code))
                         break;
-                xhci_dbg(xhci, "TRB error code %u, "
-                                "halted endpoint index = %u\n",
-                                trb_comp_code, ep_index);
+                xhci_dbg(xhci, "TRB error %u, halted endpoint index = %u\n",
+                         trb_comp_code, ep_index);
                 /* else fall through */
         case COMP_STALL:
                 /* Did we transfer part of the data (middle) phase? */
-                if (event_trb != ep_ring->dequeue &&
-                                event_trb != td->last_trb)
-                        td->urb->actual_length =
-                                td->urb->transfer_buffer_length -
-                                EVENT_TRB_LEN(le32_to_cpu(event->transfer_len));
+                if (on_data_stage)
+                        td->urb->actual_length = requested - remaining;
                 else if (!td->urb_length_set)
                         td->urb->actual_length = 0;
-
-                return finish_td(xhci, td, event_trb, event, ep, status, false);
+                goto finish_td;
         }
+
+        /* stopped at setup stage, no data transferred */
+        if (ep_trb == ep_ring->dequeue)
+                goto finish_td;
+
         /*
-         * Did we transfer any data, despite the errors that might have
-         * happened?  I.e. did we get past the setup stage?
+         * if on data stage then update the actual_length of the URB and flag it
+         * as set, so it won't be overwritten in the event for the last TRB.
          */
-        if (event_trb != ep_ring->dequeue) {
-                /* The event was for the status stage */
-                if (event_trb == td->last_trb) {
-                        if (td->urb_length_set) {
-                                /* Don't overwrite a previously set error code
-                                 */
-                                if ((*status == -EINPROGRESS || *status == 0) &&
-                                                (td->urb->transfer_flags
-                                                 & URB_SHORT_NOT_OK))
-                                        /* Did we already see a short data
-                                         * stage? */
-                                        *status = -EREMOTEIO;
-                        } else {
-                                td->urb->actual_length =
-                                        td->urb->transfer_buffer_length;
-                        }
-                } else {
-                        /*
-                         * Maybe the event was for the data stage? If so, update
-                         * already the actual_length of the URB and flag it as
-                         * set, so that it is not overwritten in the event for
-                         * the last TRB.
-                         */
-                        td->urb_length_set = true;
-                        td->urb->actual_length =
-                                td->urb->transfer_buffer_length -
-                                EVENT_TRB_LEN(le32_to_cpu(event->transfer_len));
-                        xhci_dbg(xhci, "Waiting for status "
-                                        "stage event\n");
-                        return 0;
-                }
+        if (on_data_stage) {
+                td->urb_length_set = true;
+                td->urb->actual_length = requested - remaining;
+                xhci_dbg(xhci, "Waiting for status stage event\n");
+                return 0;
         }
 
-        return finish_td(xhci, td, event_trb, event, ep, status, false);
+        /* at status stage */
+        if (!td->urb_length_set)
+                td->urb->actual_length = requested;
+
+finish_td:
+        return finish_td(xhci, td, ep_trb, event, ep, status, false);
 }
 
 /*
  * Process isochronous tds, update urb packet status and actual_length.
  */
 static int process_isoc_td(struct xhci_hcd *xhci, struct xhci_td *td,
-        union xhci_trb *event_trb, struct xhci_transfer_event *event,
+        union xhci_trb *ep_trb, struct xhci_transfer_event *event,
         struct xhci_virt_ep *ep, int *status)
 {
         struct xhci_ring *ep_ring;
         struct urb_priv *urb_priv;
         int idx;
-        int len = 0;
-        union xhci_trb *cur_trb;
-        struct xhci_segment *cur_seg;
         struct usb_iso_packet_descriptor *frame;
         u32 trb_comp_code;
-        bool skip_td = false;
+        bool sum_trbs_for_length = false;
+        u32 remaining, requested, ep_trb_len;
+        int short_framestatus;
 
         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));
         urb_priv = td->urb->hcpriv;
         idx = urb_priv->td_cnt;
         frame = &td->urb->iso_frame_desc[idx];
+        requested = frame->length;
+        remaining = EVENT_TRB_LEN(le32_to_cpu(event->transfer_len));
+        ep_trb_len = TRB_LEN(le32_to_cpu(ep_trb->generic.field[2]));
+        short_framestatus = td->urb->transfer_flags & URB_SHORT_NOT_OK ?
+                -EREMOTEIO : 0;
 
         /* handle completion code */
         switch (trb_comp_code) {
         case COMP_SUCCESS:
-                if (EVENT_TRB_LEN(le32_to_cpu(event->transfer_len)) == 0) {
-                        frame->status = 0;
+                if (remaining) {
+                        frame->status = short_framestatus;
+                        if (xhci->quirks & XHCI_TRUST_TX_LENGTH)
+                                sum_trbs_for_length = true;
                         break;
                 }
-                if ((xhci->quirks & XHCI_TRUST_TX_LENGTH))
-                        trb_comp_code = COMP_SHORT_TX;
-        /* fallthrough */
-        case COMP_STOP_SHORT:
+                frame->status = 0;
+                break;
         case COMP_SHORT_TX:
-                frame->status = td->urb->transfer_flags & URB_SHORT_NOT_OK ?
-                                -EREMOTEIO : 0;
+                frame->status = short_framestatus;
+                sum_trbs_for_length = true;
                 break;
         case COMP_BW_OVER:
                 frame->status = -ECOMM;
-                skip_td = true;
                 break;
         case COMP_BUFF_OVER:
         case COMP_BABBLE:
                 frame->status = -EOVERFLOW;
-                skip_td = true;
                 break;
         case COMP_DEV_ERR:
         case COMP_STALL:
                 frame->status = -EPROTO;
-                skip_td = true;
                 break;
         case COMP_TX_ERR:
                 frame->status = -EPROTO;
-                if (event_trb != td->last_trb)
+                if (ep_trb != td->last_trb)
                         return 0;
-                skip_td = true;
                 break;
         case COMP_STOP:
+                sum_trbs_for_length = true;
+                break;
+        case COMP_STOP_SHORT:
+                /* field normally containing residue now contains tranferred */
+                frame->status = short_framestatus;
+                requested = remaining;
+                break;
         case COMP_STOP_INVAL:
+                requested = 0;
+                remaining = 0;
                 break;
         default:
+                sum_trbs_for_length = true;
                 frame->status = -1;
                 break;
         }
 
-        if (trb_comp_code == COMP_SUCCESS || skip_td) {
-                frame->actual_length = frame->length;
-                td->urb->actual_length += frame->length;
-        } else if (trb_comp_code == COMP_STOP_SHORT) {
-                frame->actual_length =
-                        EVENT_TRB_LEN(le32_to_cpu(event->transfer_len));
-                td->urb->actual_length += frame->actual_length;
-        } else {
-                for (cur_trb = ep_ring->dequeue,
-                     cur_seg = ep_ring->deq_seg; cur_trb != event_trb;
-                     next_trb(xhci, ep_ring, &cur_seg, &cur_trb)) {
-                        if (!TRB_TYPE_NOOP_LE32(cur_trb->generic.field[3]) &&
-                            !TRB_TYPE_LINK_LE32(cur_trb->generic.field[3]))
-                                len += TRB_LEN(le32_to_cpu(cur_trb->generic.field[2]));
-                }
-                len += TRB_LEN(le32_to_cpu(cur_trb->generic.field[2])) -
-                        EVENT_TRB_LEN(le32_to_cpu(event->transfer_len));
+        if (sum_trbs_for_length)
+                frame->actual_length = sum_trb_lengths(xhci, ep_ring, ep_trb) +
+                        ep_trb_len - remaining;
+        else
+                frame->actual_length = requested;
 
-                if (trb_comp_code != COMP_STOP_INVAL) {
-                        frame->actual_length = len;
-                        td->urb->actual_length += len;
-                }
-        }
+        td->urb->actual_length += frame->actual_length;
 
-        return finish_td(xhci, td, event_trb, event, ep, status, false);
+        return finish_td(xhci, td, ep_trb, event, ep, status, false);
 }
 
 static int skip_isoc_td(struct xhci_hcd *xhci, struct xhci_td *td,
@@ -2162,119 +2136,62 @@ static int skip_isoc_td(struct xhci_hcd *xhci, struct xhci_td *td,
  * Process bulk and interrupt tds, update urb status and actual_length.
  */
 static int process_bulk_intr_td(struct xhci_hcd *xhci, struct xhci_td *td,
-        union xhci_trb *event_trb, struct xhci_transfer_event *event,
+        union xhci_trb *ep_trb, struct xhci_transfer_event *event,
         struct xhci_virt_ep *ep, int *status)
 {
         struct xhci_ring *ep_ring;
-        union xhci_trb *cur_trb;
-        struct xhci_segment *cur_seg;
         u32 trb_comp_code;
+        u32 remaining, requested, ep_trb_len;
 
         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));
+        ep_trb_len = TRB_LEN(le32_to_cpu(ep_trb->generic.field[2]));
+        requested = td->urb->transfer_buffer_length;
 
         switch (trb_comp_code) {
         case COMP_SUCCESS:
-                /* Double check that the HW transferred everything. */
-                if (event_trb != td->last_trb ||
-                    EVENT_TRB_LEN(le32_to_cpu(event->transfer_len)) != 0) {
-                        xhci_warn(xhci, "WARN Successful completion "
-                                        "on short TX\n");
-                        if (td->urb->transfer_flags & URB_SHORT_NOT_OK)
-                                *status = -EREMOTEIO;
-                        else
-                                *status = 0;
-                        if ((xhci->quirks & XHCI_TRUST_TX_LENGTH))
-                                trb_comp_code = COMP_SHORT_TX;
-                } else {
-                        *status = 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");
+                        xhci_dbg(xhci, "ep %#x - asked for %d bytes, %d bytes untransferred\n",
+                                 td->urb->ep->desc.bEndpointAddress,
+                                 requested, remaining);
                 }
+                *status = 0;
                 break;
-        case COMP_STOP_SHORT:
         case COMP_SHORT_TX:
-                if (td->urb->transfer_flags & URB_SHORT_NOT_OK)
-                        *status = -EREMOTEIO;
-                else
-                        *status = 0;
+                xhci_dbg(xhci, "ep %#x - asked for %d bytes, %d bytes untransferred\n",
+                         td->urb->ep->desc.bEndpointAddress,
+                         requested, remaining);
+                *status = 0;
+                break;
+        case COMP_STOP_SHORT:
+                td->urb->actual_length = remaining;
+                goto finish_td;
+        case COMP_STOP_INVAL:
+                /* stopped on ep trb with invalid length, exclude it */
+                ep_trb_len      = 0;
+                remaining       = 0;
                 break;
         default:
-                /* Others already handled above */
+                /* do nothing */
                 break;
         }
-        if (trb_comp_code == COMP_SHORT_TX)
-                xhci_dbg(xhci, "ep %#x - asked for %d bytes, "
-                                "%d bytes untransferred\n",
-                                td->urb->ep->desc.bEndpointAddress,
-                                td->urb->transfer_buffer_length,
-                                EVENT_TRB_LEN(le32_to_cpu(event->transfer_len)));
-        /* Stopped - short packet completion */
-        if (trb_comp_code == COMP_STOP_SHORT) {
-                td->urb->actual_length =
-                        EVENT_TRB_LEN(le32_to_cpu(event->transfer_len));
 
-                if (td->urb->transfer_buffer_length <
-                                td->urb->actual_length) {
-                        xhci_warn(xhci, "HC gave bad length of %d bytes txed\n",
-                                EVENT_TRB_LEN(le32_to_cpu(event->transfer_len)));
-                        td->urb->actual_length = 0;
-                         /* status will be set by usb core for canceled urbs */
-                }
-        /* Fast path - was this the last TRB in the TD for this URB? */
-        } else if (event_trb == td->last_trb) {
-                if (EVENT_TRB_LEN(le32_to_cpu(event->transfer_len)) != 0) {
-                        td->urb->actual_length =
-                                td->urb->transfer_buffer_length -
-                                EVENT_TRB_LEN(le32_to_cpu(event->transfer_len));
-                        if (td->urb->transfer_buffer_length <
-                                        td->urb->actual_length) {
-                                xhci_warn(xhci, "HC gave bad length "
-                                                "of %d bytes left\n",
-                                          EVENT_TRB_LEN(le32_to_cpu(event->transfer_len)));
-                                td->urb->actual_length = 0;
-                                if (td->urb->transfer_flags & URB_SHORT_NOT_OK)
-                                        *status = -EREMOTEIO;
-                                else
-                                        *status = 0;
-                        }
-                        /* Don't overwrite a previously set error code */
-                        if (*status == -EINPROGRESS) {
-                                if (td->urb->transfer_flags & URB_SHORT_NOT_OK)
-                                        *status = -EREMOTEIO;
-                                else
-                                        *status = 0;
-                        }
-                } else {
-                        td->urb->actual_length =
-                                td->urb->transfer_buffer_length;
-                        /* Ignore a short packet completion if the
-                         * untransferred length was zero.
-                         */
-                        if (*status == -EREMOTEIO)
-                                *status = 0;
-                }
-        } else {
-                /* Slow path - walk the list, starting from the dequeue
-                 * pointer, to get the actual length transferred.
-                 */
+        if (ep_trb == td->last_trb)
+                td->urb->actual_length = requested - remaining;
+        else
+                td->urb->actual_length =
+                        sum_trb_lengths(xhci, ep_ring, ep_trb) +
+                        ep_trb_len - remaining;
+finish_td:
+        if (remaining > requested) {
+                xhci_warn(xhci, "bad transfer trb length %d in event trb\n",
+                          remaining);
                 td->urb->actual_length = 0;
-                for (cur_trb = ep_ring->dequeue, cur_seg = ep_ring->deq_seg;
-                                cur_trb != event_trb;
-                                next_trb(xhci, ep_ring, &cur_seg, &cur_trb)) {
-                        if (!TRB_TYPE_NOOP_LE32(cur_trb->generic.field[3]) &&
-                            !TRB_TYPE_LINK_LE32(cur_trb->generic.field[3]))
-                                td->urb->actual_length +=
-                                        TRB_LEN(le32_to_cpu(cur_trb->generic.field[2]));
-                }
-                /* If the ring didn't stop on a Link or No-op TRB, add
-                 * in the actual bytes transferred from the Normal TRB
-                 */
-                if (trb_comp_code != COMP_STOP_INVAL)
-                        td->urb->actual_length +=
-                                TRB_LEN(le32_to_cpu(cur_trb->generic.field[2])) -
-                                EVENT_TRB_LEN(le32_to_cpu(event->transfer_len));
         }
-
-        return finish_td(xhci, td, event_trb, event, ep, status, false);
+        return finish_td(xhci, td, ep_trb, event, ep, status, false);
 }
 
 /*
@@ -2293,16 +2210,13 @@ static int handle_tx_event(struct xhci_hcd *xhci,
         unsigned int slot_id;
         int ep_index;
         struct xhci_td *td = NULL;
-        dma_addr_t event_dma;
-        struct xhci_segment *event_seg;
-        union xhci_trb *event_trb;
-        struct urb *urb = NULL;
+        dma_addr_t ep_trb_dma;
+        struct xhci_segment *ep_seg;
+        union xhci_trb *ep_trb;
         int status = -EINPROGRESS;
-        struct urb_priv *urb_priv;
         struct xhci_ep_ctx *ep_ctx;
         struct list_head *tmp;
         u32 trb_comp_code;
-        int ret = 0;
         int td_num = 0;
         bool handling_skipped_tds = false;
 
@@ -2328,9 +2242,7 @@ static int handle_tx_event(struct xhci_hcd *xhci,
         ep = &xdev->eps[ep_index];
         ep_ring = xhci_dma_to_transfer_ring(ep, le64_to_cpu(event->buffer));
         ep_ctx = xhci_get_ep_ctx(xhci, xdev->out_ctx, ep_index);
-        if (!ep_ring ||
-            (le32_to_cpu(ep_ctx->ep_info) & EP_STATE_MASK) ==
-            EP_STATE_DISABLED) {
+        if (!ep_ring ||  GET_EP_CTX_STATE(ep_ctx) == EP_STATE_DISABLED) {
                 xhci_err(xhci, "ERROR Transfer event for disabled endpoint "
                                 "or incorrect stream ring\n");
                 xhci_err(xhci, "@%016llx %08x %08x %08x %08x\n",
@@ -2352,7 +2264,7 @@ static int handle_tx_event(struct xhci_hcd *xhci,
                         td_num++;
         }
 
-        event_dma = le64_to_cpu(event->buffer);
+        ep_trb_dma = le64_to_cpu(event->buffer);
         trb_comp_code = GET_COMP_CODE(le32_to_cpu(event->transfer_len));
         /* Look for common error cases */
         switch (trb_comp_code) {
@@ -2480,7 +2392,6 @@ static int handle_tx_event(struct xhci_hcd *xhci,
                                 xhci_dbg(xhci, "td_list is empty while skip "
                                                 "flag set. Clear skip flag.\n");
                         }
-                        ret = 0;
                         goto cleanup;
                 }
 
@@ -2489,7 +2400,6 @@ static int handle_tx_event(struct xhci_hcd *xhci,
                         ep->skip = false;
                         xhci_dbg(xhci, "All tds on the ep_ring skipped. "
                                                 "Clear skip flag.\n");
-                        ret = 0;
                         goto cleanup;
                 }
 
@@ -2498,8 +2408,8 @@ static int handle_tx_event(struct xhci_hcd *xhci,
                         td_num--;
 
                 /* Is this a TRB in the currently executing TD? */
-                event_seg = trb_in_td(xhci, ep_ring->deq_seg, ep_ring->dequeue,
-                                td->last_trb, event_dma, false);
+                ep_seg = trb_in_td(xhci, ep_ring->deq_seg, ep_ring->dequeue,
+                                td->last_trb, ep_trb_dma, false);
 
                 /*
                  * Skip the Force Stopped Event. The event_trb(event_dma) of FSE
@@ -2509,13 +2419,12 @@ static int handle_tx_event(struct xhci_hcd *xhci,
                  * last TRB of the previous TD. The command completion handle
                  * will take care the rest.
                  */
-                if (!event_seg && (trb_comp_code == COMP_STOP ||
+                if (!ep_seg && (trb_comp_code == COMP_STOP ||
                                    trb_comp_code == COMP_STOP_INVAL)) {
-                        ret = 0;
                         goto cleanup;
                 }
 
-                if (!event_seg) {
+                if (!ep_seg) {
                         if (!ep->skip ||
                             !usb_endpoint_xfer_isoc(&td->urb->ep->desc)) {
                                 /* Some host controllers give a spurious
@@ -2525,7 +2434,6 @@ static int handle_tx_event(struct xhci_hcd *xhci,
                                 if ((xhci->quirks & XHCI_SPURIOUS_SUCCESS) &&
                                                 ep_ring->last_td_was_short) {
                                         ep_ring->last_td_was_short = false;
-                                        ret = 0;
                                         goto cleanup;
                                 }
                                 /* HC is busted, give up! */
@@ -2536,11 +2444,11 @@ static int handle_tx_event(struct xhci_hcd *xhci,
                                         trb_comp_code);
                                 trb_in_td(xhci, ep_ring->deq_seg,
                                           ep_ring->dequeue, td->last_trb,
-                                          event_dma, true);
+                                          ep_trb_dma, true);
                                 return -ESHUTDOWN;
                         }
 
-                        ret = skip_isoc_td(xhci, td, event, ep, &status);
+                        skip_isoc_td(xhci, td, event, ep, &status);
                         goto cleanup;
                 }
                 if (trb_comp_code == COMP_SHORT_TX)
@@ -2553,36 +2461,28 @@ static int handle_tx_event(struct xhci_hcd *xhci,
                         ep->skip = false;
                 }
 
-                event_trb = &event_seg->trbs[(event_dma - event_seg->dma) /
-                                                sizeof(*event_trb)];
+                ep_trb = &ep_seg->trbs[(ep_trb_dma - ep_seg->dma) /
+                                                sizeof(*ep_trb)];
                 /*
                  * No-op TRB should not trigger interrupts.
-                 * If event_trb is a no-op TRB, it means the
+                 * If ep_trb is a no-op TRB, it means the
                  * corresponding TD has been cancelled. Just ignore
                  * the TD.
                  */
-                if (TRB_TYPE_NOOP_LE32(event_trb->generic.field[3])) {
-                        xhci_dbg(xhci,
-                                 "event_trb is a no-op TRB. Skip it\n");
+                if (trb_is_noop(ep_trb)) {
+                        xhci_dbg(xhci, "ep_trb is a no-op TRB. Skip it\n");
                         goto cleanup;
                 }
 
-                /* Now update the urb's actual_length and give back to
-                 * the core
-                 */
+                /* update the urb's actual_length and give back to the core */
                 if (usb_endpoint_xfer_control(&td->urb->ep->desc))
-                        ret = process_ctrl_td(xhci, td, event_trb, event, ep,
-                                                 &status);
+                        process_ctrl_td(xhci, td, ep_trb, event, ep, &status);
                 else if (usb_endpoint_xfer_isoc(&td->urb->ep->desc))
-                        ret = process_isoc_td(xhci, td, event_trb, event, ep,
-                                                 &status);
+                        process_isoc_td(xhci, td, ep_trb, event, ep, &status);
                 else
-                        ret = process_bulk_intr_td(xhci, td, event_trb, event,
-                                                 ep, &status);
-
+                        process_bulk_intr_td(xhci, td, ep_trb, event, ep,
+                                             &status);
 cleanup:
-
-
                 handling_skipped_tds = ep->skip &&
                         trb_comp_code != COMP_MISSED_INT &&
                         trb_comp_code != COMP_PING_ERR;
@@ -2594,33 +2494,6 @@ cleanup:
                 if (!handling_skipped_tds)
                         inc_deq(xhci, xhci->event_ring);
 
-                if (ret) {
-                        urb = td->urb;
-                        urb_priv = urb->hcpriv;
-
-                        xhci_urb_free_priv(urb_priv);
-
-                        usb_hcd_unlink_urb_from_ep(bus_to_hcd(urb->dev->bus), urb);
-                        if ((urb->actual_length != urb->transfer_buffer_length &&
-                                                (urb->transfer_flags &
-                                                 URB_SHORT_NOT_OK)) ||
-                                        (status != 0 &&
-                                         !usb_endpoint_xfer_isoc(&urb->ep->desc)))
-                                xhci_dbg(xhci, "Giveback URB %p, len = %d, "
-                                                "expected = %d, status = %d\n",
-                                                urb, urb->actual_length,
-                                                urb->transfer_buffer_length,
-                                                status);
-                        spin_unlock(&xhci->lock);
-                        /* EHCI, UHCI, and OHCI always unconditionally set the
-                         * urb->status of an isochronous endpoint to 0.
-                         */
-                        if (usb_pipetype(urb->pipe) == PIPE_ISOCHRONOUS)
-                                status = 0;
-                        usb_hcd_giveback_urb(bus_to_hcd(urb->dev->bus), urb, status);
-                        spin_lock(&xhci->lock);
-                }
-
         /*
          * If ep->skip is set, it means there are missed tds on the
          * endpoint ring need to take care of.
@@ -2644,18 +2517,17 @@ static int xhci_handle_event(struct xhci_hcd *xhci)
         int update_ptrs = 1;
         int ret;
 
+        /* Event ring hasn't been allocated yet. */
         if (!xhci->event_ring || !xhci->event_ring->dequeue) {
-                xhci->error_bitmask |= 1 << 1;
-                return 0;
+                xhci_err(xhci, "ERROR event ring not ready\n");
+                return -ENOMEM;
         }
 
         event = xhci->event_ring->dequeue;
         /* Does the HC or OS own the TRB? */
         if ((le32_to_cpu(event->event_cmd.flags) & TRB_CYCLE) !=
-            xhci->event_ring->cycle_state) {
-                xhci->error_bitmask |= 1 << 2;
+            xhci->event_ring->cycle_state)
                 return 0;
-        }
 
         /*
          * Barrier between reading the TRB_CYCLE (valid) flag above and any
@@ -2663,7 +2535,7 @@ static int xhci_handle_event(struct xhci_hcd *xhci)
          */
         rmb();
         /* FIXME: Handle more event types. */
-        switch ((le32_to_cpu(event->event_cmd.flags) & TRB_TYPE_BITMASK)) {
+        switch (le32_to_cpu(event->event_cmd.flags) & TRB_TYPE_BITMASK) {
         case TRB_TYPE(TRB_COMPLETION):
                 handle_cmd_completion(xhci, &event->event_cmd);
                 break;
@@ -2673,9 +2545,7 @@ static int xhci_handle_event(struct xhci_hcd *xhci)
                 break;
         case TRB_TYPE(TRB_TRANSFER):
                 ret = handle_tx_event(xhci, &event->trans_event);
-                if (ret < 0)
-                        xhci->error_bitmask |= 1 << 9;
-                else
+                if (ret >= 0)
                         update_ptrs = 0;
                 break;
         case TRB_TYPE(TRB_DEV_NOTE):
@@ -2686,7 +2556,9 @@ static int xhci_handle_event(struct xhci_hcd *xhci)
                     TRB_TYPE(48))
                         handle_vendor_event(xhci, event);
                 else
-                        xhci->error_bitmask |= 1 << 3;
+                        xhci_warn(xhci, "ERROR unknown event type %d\n",
+                                  TRB_FIELD_TO_TYPE(
+                                  le32_to_cpu(event->event_cmd.flags)));
         }
         /* Any of the above functions may drop and re-acquire the lock, so check
          * to make sure a watchdog timer didn't mark the host as non-responsive.
@@ -2931,8 +2803,7 @@ static int prepare_transfer(struct xhci_hcd *xhci,
                 return -EINVAL;
         }
 
-        ret = prepare_ring(xhci, ep_ring,
-                           le32_to_cpu(ep_ctx->ep_info) & EP_STATE_MASK,
+        ret = prepare_ring(xhci, ep_ring, GET_EP_CTX_STATE(ep_ctx),
                            num_trbs, mem_flags);
         if (ret)
                 return ret;
@@ -3120,7 +2991,7 @@ static u32 xhci_td_remainder(struct xhci_hcd *xhci, int transferred,
         if (xhci->quirks & XHCI_MTK_HOST)
                 trb_buff_len = 0;
 
-        maxp = GET_MAX_PACKET(usb_endpoint_maxp(&urb->ep->desc));
+        maxp = usb_endpoint_maxp(&urb->ep->desc);
         total_packet_count = DIV_ROUND_UP(td_total_len, maxp);
 
         /* Queueing functions don't count the current TRB into transferred */
@@ -3136,7 +3007,7 @@ static int xhci_align_td(struct xhci_hcd *xhci, struct urb *urb, u32 enqd_len,
         unsigned int max_pkt;
         u32 new_buff_len;
 
-        max_pkt = GET_MAX_PACKET(usb_endpoint_maxp(&urb->ep->desc));
+        max_pkt = usb_endpoint_maxp(&urb->ep->desc);
         unalign = (enqd_len + *trb_buff_len) % max_pkt;
 
         /* we got lucky, last normal TRB data on segment is packet aligned */
@@ -3650,7 +3521,7 @@ static int xhci_queue_isoc_tx(struct xhci_hcd *xhci, gfp_t mem_flags,
                 addr = start_addr + urb->iso_frame_desc[i].offset;
                 td_len = urb->iso_frame_desc[i].length;
                 td_remain_len = td_len;
-                max_pkt = GET_MAX_PACKET(usb_endpoint_maxp(&urb->ep->desc));
+                max_pkt = usb_endpoint_maxp(&urb->ep->desc);
                 total_pkt_count = DIV_ROUND_UP(td_len, max_pkt);
 
                 /* A zero-length transfer still involves at least one packet. */
@@ -3828,7 +3699,7 @@ int xhci_queue_isoc_tx_prepare(struct xhci_hcd *xhci, gfp_t mem_flags,
         /* Check the ring to guarantee there is enough room for the whole urb.
          * Do not insert any td of the urb to the ring if the check failed.
          */
-        ret = prepare_ring(xhci, ep_ring, le32_to_cpu(ep_ctx->ep_info) & EP_STATE_MASK,
+        ret = prepare_ring(xhci, ep_ring, GET_EP_CTX_STATE(ep_ctx),
                            num_trbs, mem_flags);
         if (ret)
                 return ret;
@@ -3841,8 +3712,7 @@ int xhci_queue_isoc_tx_prepare(struct xhci_hcd *xhci, gfp_t mem_flags,
 
         /* Calculate the start frame and put it in urb->start_frame. */
         if (HCC_CFC(xhci->hcc_params) && !list_empty(&ep_ring->td_list)) {
-                if ((le32_to_cpu(ep_ctx->ep_info) & EP_STATE_MASK) ==
-                                EP_STATE_RUNNING) {
+                if (GET_EP_CTX_STATE(ep_ctx) == EP_STATE_RUNNING) {
                         urb->start_frame = xep->next_frame_id;
                         goto skip_start_over;
                 }
diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c
index 1a4ca02729c2..1cd56417cbec 100644
--- a/drivers/usb/host/xhci.c
+++ b/drivers/usb/host/xhci.c
@@ -113,12 +113,12 @@ int xhci_halt(struct xhci_hcd *xhci)
 
         ret = xhci_handshake(&xhci->op_regs->status,
                         STS_HALT, STS_HALT, XHCI_MAX_HALT_USEC);
-        if (!ret) {
-                xhci->xhc_state |= XHCI_STATE_HALTED;
-                xhci->cmd_ring_state = CMD_RING_STATE_STOPPED;
-        } else
-                xhci_warn(xhci, "Host not halted after %u microseconds.\n",
-                                XHCI_MAX_HALT_USEC);
+        if (ret) {
+                xhci_warn(xhci, "Host halt failed, %d\n", ret);
+                return ret;
+        }
+        xhci->xhc_state |= XHCI_STATE_HALTED;
+        xhci->cmd_ring_state = CMD_RING_STATE_STOPPED;
         return ret;
 }
 
@@ -167,6 +167,12 @@ int xhci_reset(struct xhci_hcd *xhci)
         int ret, i;
 
         state = readl(&xhci->op_regs->status);
+
+        if (state == ~(u32)0) {
+                xhci_warn(xhci, "Host not accessible, reset failed.\n");
+                return -ENODEV;
+        }
+
         if ((state & STS_HALT) == 0) {
                 xhci_warn(xhci, "Host controller not halted, aborting reset.\n");
                 return 0;
@@ -690,7 +696,6 @@ void xhci_stop(struct usb_hcd *hcd)
                 xhci->cmd_ring_state = CMD_RING_STATE_STOPPED;
                 xhci_halt(xhci);
                 xhci_reset(xhci);
-
                 spin_unlock_irq(&xhci->lock);
         }
 
@@ -1645,8 +1650,7 @@ int xhci_drop_endpoint(struct usb_hcd *hcd, struct usb_device *udev,
         /* If the HC already knows the endpoint is disabled,
          * or the HCD has noted it is disabled, ignore this request
          */
-        if (((ep_ctx->ep_info & cpu_to_le32(EP_STATE_MASK)) ==
-             cpu_to_le32(EP_STATE_DISABLED)) ||
+        if ((GET_EP_CTX_STATE(ep_ctx) == EP_STATE_DISABLED) ||
             le32_to_cpu(ctrl_ctx->drop_flags) &
             xhci_get_endpoint_flag(&ep->desc)) {
                 /* Do not warn when called after a usb_device_reset */
@@ -3209,7 +3213,7 @@ int xhci_alloc_streams(struct usb_hcd *hcd, struct usb_device *udev,
 
         for (i = 0; i < num_eps; i++) {
                 ep_index = xhci_get_endpoint_index(&eps[i]->desc);
-                max_packet = GET_MAX_PACKET(usb_endpoint_maxp(&eps[i]->desc));
+                max_packet = usb_endpoint_maxp(&eps[i]->desc);
                 vdev->eps[ep_index].stream_info = xhci_alloc_stream_info(xhci,
                                 num_stream_ctxs,
                                 num_streams,
@@ -3683,27 +3687,26 @@ int xhci_alloc_dev(struct usb_hcd *hcd, struct usb_device *udev)
         int ret, slot_id;
         struct xhci_command *command;
 
-        command = xhci_alloc_command(xhci, false, false, GFP_KERNEL);
+        command = xhci_alloc_command(xhci, false, true, GFP_KERNEL);
         if (!command)
                 return 0;
 
         /* xhci->slot_id and xhci->addr_dev are not thread-safe */
         mutex_lock(&xhci->mutex);
         spin_lock_irqsave(&xhci->lock, flags);
-        command->completion = &xhci->addr_dev;
         ret = xhci_queue_slot_control(xhci, command, TRB_ENABLE_SLOT, 0);
         if (ret) {
                 spin_unlock_irqrestore(&xhci->lock, flags);
                 mutex_unlock(&xhci->mutex);
                 xhci_dbg(xhci, "FIXME: allocate a command ring segment\n");
-                kfree(command);
+                xhci_free_command(xhci, command);
                 return 0;
         }
         xhci_ring_cmd_db(xhci);
         spin_unlock_irqrestore(&xhci->lock, flags);
 
         wait_for_completion(command->completion);
-        slot_id = xhci->slot_id;
+        slot_id = command->slot_id;
         mutex_unlock(&xhci->mutex);
 
         if (!slot_id || command->status != COMP_SUCCESS) {
@@ -3711,7 +3714,7 @@ int xhci_alloc_dev(struct usb_hcd *hcd, struct usb_device *udev)
                 xhci_err(xhci, "Max number of devices this xHCI host supports is %u.\n",
                                 HCS_MAX_SLOTS(
                                         readl(&xhci->cap_regs->hcs_params1)));
-                kfree(command);
+                xhci_free_command(xhci, command);
                 return 0;
         }
 
@@ -3747,7 +3750,7 @@ int xhci_alloc_dev(struct usb_hcd *hcd, struct usb_device *udev)
 #endif
 
 
-        kfree(command);
+        xhci_free_command(xhci, command);
         /* Is this a LS or FS device under a HS hub? */
         /* Hub or peripherial? */
         return 1;
@@ -3755,6 +3758,7 @@ int xhci_alloc_dev(struct usb_hcd *hcd, struct usb_device *udev)
 disable_slot:
         /* Disable slot, if we can do it without mem alloc */
         spin_lock_irqsave(&xhci->lock, flags);
+        kfree(command->completion);
         command->completion = NULL;
         command->status = 0;
         if (!xhci_queue_slot_control(xhci, command, TRB_DISABLE_SLOT,
@@ -3816,14 +3820,13 @@ static int xhci_setup_device(struct usb_hcd *hcd, struct usb_device *udev,
                 }
         }
 
-        command = xhci_alloc_command(xhci, false, false, GFP_KERNEL);
+        command = xhci_alloc_command(xhci, false, true, GFP_KERNEL);
         if (!command) {
                 ret = -ENOMEM;
                 goto out;
         }
 
         command->in_ctx = virt_dev->in_ctx;
-        command->completion = &xhci->addr_dev;
 
         slot_ctx = xhci_get_slot_ctx(xhci, virt_dev->in_ctx);
         ctrl_ctx = xhci_get_input_control_ctx(virt_dev->in_ctx);
@@ -3941,7 +3944,10 @@ static int xhci_setup_device(struct usb_hcd *hcd, struct usb_device *udev,
                        le32_to_cpu(slot_ctx->dev_state) & DEV_ADDR_MASK);
 out:
         mutex_unlock(&xhci->mutex);
-        kfree(command);
+        if (command) {
+                kfree(command->completion);
+                kfree(command);
+        }
         return ret;
 }
 
diff --git a/drivers/usb/host/xhci.h b/drivers/usb/host/xhci.h
index f945380035d0..8ccc11a974b8 100644
--- a/drivers/usb/host/xhci.h
+++ b/drivers/usb/host/xhci.h
@@ -709,6 +709,8 @@ struct xhci_ep_ctx {
 #define EP_STATE_HALTED         2
 #define EP_STATE_STOPPED        3
 #define EP_STATE_ERROR          4
+#define GET_EP_CTX_STATE(ctx)   (le32_to_cpu((ctx)->ep_info) & EP_STATE_MASK)
+
 /* Mult - Max number of burtst within an interval, in EP companion desc. */
 #define EP_MULT(p)              (((p) & 0x3) << 8)
 #define CTX_TO_EP_MULT(p)       (((p) >> 8) & 0x3)
@@ -747,11 +749,6 @@ struct xhci_ep_ctx {
 #define MAX_PACKET_MASK         (0xffff << 16)
 #define MAX_PACKET_DECODED(p)   (((p) >> 16) & 0xffff)
 
-/* Get max packet size from ep desc. Bit 10..0 specify the max packet size.
- * USB2.0 spec 9.6.6.
- */
-#define GET_MAX_PACKET(p)       ((p) & 0x7ff)
-
 /* tx_info bitmasks */
 #define EP_AVG_TRB_LENGTH(p)            ((p) & 0xffff)
 #define EP_MAX_ESIT_PAYLOAD_LO(p)       (((p) & 0xffff) << 16)
@@ -789,6 +786,7 @@ struct xhci_command {
         /* Input context for changing device state */
         struct xhci_container_ctx       *in_ctx;
         u32                             status;
+        int                             slot_id;
         /* If completion is null, no one is waiting on this command
          * and the structure can be freed after the command completes.
          */
@@ -997,7 +995,6 @@ struct xhci_virt_device {
         int                             num_rings_cached;
 #define XHCI_MAX_RINGS_CACHED   31
         struct xhci_virt_ep             eps[31];
-        struct completion               cmd_completion;
         u8                              fake_port;
         u8                              real_port;
         struct xhci_interval_bw_table   *bw_table;
@@ -1583,8 +1580,6 @@ struct xhci_hcd {
         /* slot enabling and address device helpers */
         /* these are not thread safe so use mutex */
         struct mutex mutex;
-        struct completion       addr_dev;
-        int slot_id;
         /* For USB 3.0 LPM enable/disable. */
         struct xhci_command             *lpm_command;
         /* Internal mirror of the HW's dcbaa */
@@ -1618,8 +1613,6 @@ struct xhci_hcd {
 #define XHCI_STATE_DYING        (1 << 0)
 #define XHCI_STATE_HALTED       (1 << 1)
 #define XHCI_STATE_REMOVING     (1 << 2)
-        /* Statistics */
-        int                     error_bitmask;
         unsigned int            quirks;
 #define XHCI_LINK_TRB_QUIRK     (1 << 0)
 #define XHCI_RESET_EP_QUIRK     (1 << 1)
diff --git a/drivers/usb/isp1760/isp1760-if.c b/drivers/usb/isp1760/isp1760-if.c
index 9535b2872183..79205b31e4a9 100644
--- a/drivers/usb/isp1760/isp1760-if.c
+++ b/drivers/usb/isp1760/isp1760-if.c
@@ -197,7 +197,7 @@ static int isp1760_plat_probe(struct platform_device *pdev)
 
         irq_res = platform_get_resource(pdev, IORESOURCE_IRQ, 0);
         if (!irq_res) {
-                pr_warning("isp1760: IRQ resource not available\n");
+                pr_warn("isp1760: IRQ resource not available\n");
                 return -ENODEV;
         }
         irqflags = irq_res->flags & IRQF_TRIGGER_MASK;
diff --git a/drivers/usb/misc/chaoskey.c b/drivers/usb/misc/chaoskey.c
index 6ddd08a32777..aa350dc9eb25 100644
--- a/drivers/usb/misc/chaoskey.c
+++ b/drivers/usb/misc/chaoskey.c
@@ -215,19 +215,7 @@ static int chaoskey_probe(struct usb_interface *interface,
 
         dev->hwrng.name = dev->name ? dev->name : chaoskey_driver.name;
         dev->hwrng.read = chaoskey_rng_read;
-
-        /* Set the 'quality' metric.  Quality is measured in units of
-         * 1/1024's of a bit ("mills"). This should be set to 1024,
-         * but there is a bug in the hwrng core which masks it with
-         * 1023.
-         *
-         * The patch that has been merged to the crypto development
-         * tree for that bug limits the value to 1024 at most, so by
-         * setting this to 1024 + 1023, we get 1023 before the fix is
-         * merged and 1024 afterwards. We'll patch this driver once
-         * both bits of code are in the same tree.
-         */
-        dev->hwrng.quality = 1024 + 1023;
+        dev->hwrng.quality = 1024;
 
         dev->hwrng_registered = (hwrng_register(&dev->hwrng) == 0);
         if (!dev->hwrng_registered)
diff --git a/drivers/usb/misc/rio500.c b/drivers/usb/misc/rio500.c
index 13731d512624..fc329c98a6e8 100644
--- a/drivers/usb/misc/rio500.c
+++ b/drivers/usb/misc/rio500.c
@@ -421,7 +421,7 @@ read_rio(struct file *file, char __user *buffer, size_t count, loff_t * ppos)
                 } else if (result != -EREMOTEIO) {
                         mutex_unlock(&(rio->lock));
                         dev_err(&rio->rio_dev->dev,
-                                "Read Whoops - result:%u partial:%u this_read:%u\n",
+                                "Read Whoops - result:%d partial:%u this_read:%u\n",
                                 result, partial, this_read);
                         return -EIO;
                 } else {
diff --git a/drivers/usb/misc/usbtest.c b/drivers/usb/misc/usbtest.c
index 5c8210dc6fd9..3525626bf086 100644
--- a/drivers/usb/misc/usbtest.c
+++ b/drivers/usb/misc/usbtest.c
@@ -1915,7 +1915,7 @@ static struct urb *iso_alloc_urb(
         if (bytes < 0 || !desc)
                 return NULL;
         maxp = 0x7ff & usb_endpoint_maxp(desc);
-        maxp *= 1 + (0x3 & (usb_endpoint_maxp(desc) >> 11));
+        maxp *= usb_endpoint_maxp_mult(desc);
         packets = DIV_ROUND_UP(bytes, maxp);
 
         urb = usb_alloc_urb(packets, GFP_KERNEL);
@@ -2001,8 +2001,8 @@ test_queue(struct usbtest_dev *dev, struct usbtest_param_32 *param,
                         "iso period %d %sframes, wMaxPacket %d, transactions: %d\n",
                         1 << (desc->bInterval - 1),
                         (udev->speed == USB_SPEED_HIGH) ? "micro" : "",
-                        usb_endpoint_maxp(desc) & 0x7ff,
-                        1 + (0x3 & (usb_endpoint_maxp(desc) >> 11)));
+                        usb_endpoint_maxp(desc),
+                        usb_endpoint_maxp_mult(desc));
 
                 dev_info(&dev->intf->dev,
                         "total %lu msec (%lu packets)\n",
diff --git a/drivers/usb/mtu3/Kconfig b/drivers/usb/mtu3/Kconfig
new file mode 100644
index 000000000000..25cd61947bee
--- /dev/null
+++ b/drivers/usb/mtu3/Kconfig
@@ -0,0 +1,54 @@
+# For MTK USB3.0 IP
+
+config USB_MTU3
+        tristate "MediaTek USB3 Dual Role controller"
+        depends on EXTCON && (USB || USB_GADGET) && HAS_DMA
+        depends on ARCH_MEDIATEK || COMPILE_TEST
+        select USB_XHCI_MTK if USB_SUPPORT && USB_XHCI_HCD
+        help
+          Say Y or M here if your system runs on MediaTek SoCs with
+          Dual Role SuperSpeed USB controller. You can select usb
+          mode as peripheral role or host role, or both.
+
+          If you don't know what this is, please say N.
+
+          Choose M here to compile this driver as a module, and it
+          will be called mtu3.ko.
+
+
+if USB_MTU3
+choice
+        bool "MTU3 Mode Selection"
+        default USB_MTU3_DUAL_ROLE if (USB && USB_GADGET)
+        default USB_MTU3_HOST if (USB && !USB_GADGET)
+        default USB_MTU3_GADGET if (!USB && USB_GADGET)
+
+config USB_MTU3_HOST
+        bool "Host only mode"
+        depends on USB=y || USB=USB_MTU3
+        help
+          Select this when you want to use MTU3 in host mode only,
+          thereby the gadget feature will be regressed.
+
+config USB_MTU3_GADGET
+        bool "Gadget only mode"
+        depends on USB_GADGET=y || USB_GADGET=USB_MTU3
+        help
+          Select this when you want to use MTU3 in gadget mode only,
+          thereby the host feature will be regressed.
+
+config USB_MTU3_DUAL_ROLE
+        bool "Dual Role mode"
+        depends on ((USB=y || USB=USB_MTU3) && (USB_GADGET=y || USB_GADGET=USB_MTU3))
+        help
+          This is the default mode of working of MTU3 controller where
+          both host and gadget features are enabled.
+
+endchoice
+
+config USB_MTU3_DEBUG
+        bool "Enable Debugging Messages"
+        help
+          Say Y here to enable debugging messages in the MTU3 Driver.
+
+endif
diff --git a/drivers/usb/mtu3/Makefile b/drivers/usb/mtu3/Makefile
new file mode 100644
index 000000000000..60e0fff7a847
--- /dev/null
+++ b/drivers/usb/mtu3/Makefile
@@ -0,0 +1,18 @@
+
+ccflags-$(CONFIG_USB_MTU3_DEBUG)        += -DDEBUG
+
+obj-$(CONFIG_USB_MTU3)  += mtu3.o
+
+mtu3-y  := mtu3_plat.o
+
+ifneq ($(filter y,$(CONFIG_USB_MTU3_HOST) $(CONFIG_USB_MTU3_DUAL_ROLE)),)
+        mtu3-y  += mtu3_host.o
+endif
+
+ifneq ($(filter y,$(CONFIG_USB_MTU3_GADGET) $(CONFIG_USB_MTU3_DUAL_ROLE)),)
+        mtu3-y  += mtu3_core.o mtu3_gadget_ep0.o mtu3_gadget.o mtu3_qmu.o
+endif
+
+ifneq ($(CONFIG_USB_MTU3_DUAL_ROLE),)
+        mtu3-y  += mtu3_dr.o
+endif
diff --git a/drivers/usb/mtu3/mtu3.h b/drivers/usb/mtu3/mtu3.h
new file mode 100644
index 000000000000..ba9df719f363
--- /dev/null
+++ b/drivers/usb/mtu3/mtu3.h
@@ -0,0 +1,417 @@
+/*
+ * mtu3.h - MediaTek USB3 DRD header
+ *
+ * Copyright (C) 2016 MediaTek Inc.
+ *
+ * Author: Chunfeng Yun <chunfeng.yun@mediatek.com>
+ *
+ * This software is licensed under the terms of the GNU General Public
+ * License version 2, as published by the Free Software Foundation, and
+ * may be copied, distributed, and modified under those terms.
+ *
+ * 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 __MTU3_H__
+#define __MTU3_H__
+
+#include <linux/device.h>
+#include <linux/dmapool.h>
+#include <linux/extcon.h>
+#include <linux/interrupt.h>
+#include <linux/list.h>
+#include <linux/phy/phy.h>
+#include <linux/regulator/consumer.h>
+#include <linux/usb.h>
+#include <linux/usb/ch9.h>
+#include <linux/usb/gadget.h>
+#include <linux/usb/otg.h>
+
+struct mtu3;
+struct mtu3_ep;
+struct mtu3_request;
+
+#include "mtu3_hw_regs.h"
+#include "mtu3_qmu.h"
+
+#define MU3D_EP_TXCR0(epnum)    (U3D_TX1CSR0 + (((epnum) - 1) * 0x10))
+#define MU3D_EP_TXCR1(epnum)    (U3D_TX1CSR1 + (((epnum) - 1) * 0x10))
+#define MU3D_EP_TXCR2(epnum)    (U3D_TX1CSR2 + (((epnum) - 1) * 0x10))
+
+#define MU3D_EP_RXCR0(epnum)    (U3D_RX1CSR0 + (((epnum) - 1) * 0x10))
+#define MU3D_EP_RXCR1(epnum)    (U3D_RX1CSR1 + (((epnum) - 1) * 0x10))
+#define MU3D_EP_RXCR2(epnum)    (U3D_RX1CSR2 + (((epnum) - 1) * 0x10))
+
+#define USB_QMU_RQCSR(epnum)    (U3D_RXQCSR1 + (((epnum) - 1) * 0x10))
+#define USB_QMU_RQSAR(epnum)    (U3D_RXQSAR1 + (((epnum) - 1) * 0x10))
+#define USB_QMU_RQCPR(epnum)    (U3D_RXQCPR1 + (((epnum) - 1) * 0x10))
+
+#define USB_QMU_TQCSR(epnum)    (U3D_TXQCSR1 + (((epnum) - 1) * 0x10))
+#define USB_QMU_TQSAR(epnum)    (U3D_TXQSAR1 + (((epnum) - 1) * 0x10))
+#define USB_QMU_TQCPR(epnum)    (U3D_TXQCPR1 + (((epnum) - 1) * 0x10))
+
+#define SSUSB_U3_CTRL(p)        (U3D_SSUSB_U3_CTRL_0P + ((p) * 0x08))
+#define SSUSB_U2_CTRL(p)        (U3D_SSUSB_U2_CTRL_0P + ((p) * 0x08))
+
+#define MTU3_DRIVER_NAME        "mtu3"
+#define DMA_ADDR_INVALID        (~(dma_addr_t)0)
+
+#define MTU3_EP_ENABLED         BIT(0)
+#define MTU3_EP_STALL           BIT(1)
+#define MTU3_EP_WEDGE           BIT(2)
+#define MTU3_EP_BUSY            BIT(3)
+
+#define MTU3_U3_IP_SLOT_DEFAULT 2
+#define MTU3_U2_IP_SLOT_DEFAULT 1
+
+/**
+ * Normally the device works on HS or SS, to simplify fifo management,
+ * devide fifo into some 512B parts, use bitmap to manage it; And
+ * 128 bits size of bitmap is large enough, that means it can manage
+ * up to 64KB fifo size.
+ * NOTE: MTU3_EP_FIFO_UNIT should be power of two
+ */
+#define MTU3_EP_FIFO_UNIT               (1 << 9)
+#define MTU3_FIFO_BIT_SIZE              128
+#define MTU3_U2_IP_EP0_FIFO_SIZE        64
+
+/**
+ * Maximum size of ep0 response buffer for ch9 requests,
+ * the SET_SEL request uses 6 so far, and GET_STATUS is 2
+ */
+#define EP0_RESPONSE_BUF  6
+
+/* device operated link and speed got from DEVICE_CONF register */
+enum mtu3_speed {
+        MTU3_SPEED_INACTIVE = 0,
+        MTU3_SPEED_FULL = 1,
+        MTU3_SPEED_HIGH = 3,
+        MTU3_SPEED_SUPER = 4,
+};
+
+/**
+ * @MU3D_EP0_STATE_SETUP: waits for SETUP or received a SETUP
+ *              without data stage.
+ * @MU3D_EP0_STATE_TX: IN data stage
+ * @MU3D_EP0_STATE_RX: OUT data stage
+ * @MU3D_EP0_STATE_TX_END: the last IN data is transferred, and
+ *              waits for its completion interrupt
+ * @MU3D_EP0_STATE_STALL: ep0 is in stall status, will be auto-cleared
+ *              after receives a SETUP.
+ */
+enum mtu3_g_ep0_state {
+        MU3D_EP0_STATE_SETUP = 1,
+        MU3D_EP0_STATE_TX,
+        MU3D_EP0_STATE_RX,
+        MU3D_EP0_STATE_TX_END,
+        MU3D_EP0_STATE_STALL,
+};
+
+/**
+ * @base: the base address of fifo
+ * @limit: the bitmap size in bits
+ * @bitmap: fifo bitmap in unit of @MTU3_EP_FIFO_UNIT
+ */
+struct mtu3_fifo_info {
+        u32 base;
+        u32 limit;
+        DECLARE_BITMAP(bitmap, MTU3_FIFO_BIT_SIZE);
+};
+
+/**
+ * General Purpose Descriptor (GPD):
+ *      The format of TX GPD is a little different from RX one.
+ *      And the size of GPD is 16 bytes.
+ *
+ * @flag:
+ *      bit0: Hardware Own (HWO)
+ *      bit1: Buffer Descriptor Present (BDP), always 0, BD is not supported
+ *      bit2: Bypass (BPS), 1: HW skips this GPD if HWO = 1
+ *      bit7: Interrupt On Completion (IOC)
+ * @chksum: This is used to validate the contents of this GPD;
+ *      If TXQ_CS_EN / RXQ_CS_EN bit is set, an interrupt is issued
+ *      when checksum validation fails;
+ *      Checksum value is calculated over the 16 bytes of the GPD by default;
+ * @data_buf_len (RX ONLY): This value indicates the length of
+ *      the assigned data buffer
+ * @next_gpd: Physical address of the next GPD
+ * @buffer: Physical address of the data buffer
+ * @buf_len:
+ *      (TX): This value indicates the length of the assigned data buffer
+ *      (RX): The total length of data received
+ * @ext_len: reserved
+ * @ext_flag:
+ *      bit5 (TX ONLY): Zero Length Packet (ZLP),
+ */
+struct qmu_gpd {
+        __u8 flag;
+        __u8 chksum;
+        __le16 data_buf_len;
+        __le32 next_gpd;
+        __le32 buffer;
+        __le16 buf_len;
+        __u8 ext_len;
+        __u8 ext_flag;
+} __packed;
+
+/**
+* dma: physical base address of GPD segment
+* start: virtual base address of GPD segment
+* end: the last GPD element
+* enqueue: the first empty GPD to use
+* dequeue: the first completed GPD serviced by ISR
+* NOTE: the size of GPD ring should be >= 2
+*/
+struct mtu3_gpd_ring {
+        dma_addr_t dma;
+        struct qmu_gpd *start;
+        struct qmu_gpd *end;
+        struct qmu_gpd *enqueue;
+        struct qmu_gpd *dequeue;
+};
+
+/**
+* @vbus: vbus 5V used by host mode
+* @edev: external connector used to detect vbus and iddig changes
+* @vbus_nb: notifier for vbus detection
+* @vbus_nb: notifier for iddig(idpin) detection
+* @extcon_reg_dwork: delay work for extcon notifier register, waiting for
+*               xHCI driver initialization, it's necessary for system bootup
+*               as device.
+* @is_u3_drd: whether port0 supports usb3.0 dual-role device or not
+* @id_*: used to maually switch between host and device modes by idpin
+* @manual_drd_enabled: it's true when supports dual-role device by debugfs
+*               to switch host/device modes depending on user input.
+*/
+struct otg_switch_mtk {
+        struct regulator *vbus;
+        struct extcon_dev *edev;
+        struct notifier_block vbus_nb;
+        struct notifier_block id_nb;
+        struct delayed_work extcon_reg_dwork;
+        bool is_u3_drd;
+        /* dual-role switch by debugfs */
+        struct pinctrl *id_pinctrl;
+        struct pinctrl_state *id_float;
+        struct pinctrl_state *id_ground;
+        bool manual_drd_enabled;
+};
+
+/**
+ * @mac_base: register base address of device MAC, exclude xHCI's
+ * @ippc_base: register base address of IP Power and Clock interface (IPPC)
+ * @vusb33: usb3.3V shared by device/host IP
+ * @sys_clk: system clock of mtu3, shared by device/host IP
+ * @dr_mode: works in which mode:
+ *              host only, device only or dual-role mode
+ * @u2_ports: number of usb2.0 host ports
+ * @u3_ports: number of usb3.0 host ports
+ * @dbgfs_root: only used when supports manual dual-role switch via debugfs
+ * @wakeup_en: it's true when supports remote wakeup in host mode
+ * @wk_deb_p0: port0's wakeup debounce clock
+ * @wk_deb_p1: it's optional, and depends on port1 is supported or not
+ */
+struct ssusb_mtk {
+        struct device *dev;
+        struct mtu3 *u3d;
+        void __iomem *mac_base;
+        void __iomem *ippc_base;
+        struct phy **phys;
+        int num_phys;
+        /* common power & clock */
+        struct regulator *vusb33;
+        struct clk *sys_clk;
+        /* otg */
+        struct otg_switch_mtk otg_switch;
+        enum usb_dr_mode dr_mode;
+        bool is_host;
+        int u2_ports;
+        int u3_ports;
+        struct dentry *dbgfs_root;
+        /* usb wakeup for host mode */
+        bool wakeup_en;
+        struct clk *wk_deb_p0;
+        struct clk *wk_deb_p1;
+        struct regmap *pericfg;
+};
+
+/**
+ * @fifo_size: it is (@slot + 1) * @fifo_seg_size
+ * @fifo_seg_size: it is roundup_pow_of_two(@maxp)
+ */
+struct mtu3_ep {
+        struct usb_ep ep;
+        char name[12];
+        struct mtu3 *mtu;
+        u8 epnum;
+        u8 type;
+        u8 is_in;
+        u16 maxp;
+        int slot;
+        u32 fifo_size;
+        u32 fifo_addr;
+        u32 fifo_seg_size;
+        struct mtu3_fifo_info *fifo;
+
+        struct list_head req_list;
+        struct mtu3_gpd_ring gpd_ring;
+        const struct usb_ss_ep_comp_descriptor *comp_desc;
+        const struct usb_endpoint_descriptor *desc;
+
+        int flags;
+        u8 wedged;
+        u8 busy;
+};
+
+struct mtu3_request {
+        struct usb_request request;
+        struct list_head list;
+        struct mtu3_ep *mep;
+        struct mtu3 *mtu;
+        struct qmu_gpd *gpd;
+        int epnum;
+};
+
+static inline struct ssusb_mtk *dev_to_ssusb(struct device *dev)
+{
+        return dev_get_drvdata(dev);
+}
+
+/**
+ * struct mtu3 - device driver instance data.
+ * @slot: MTU3_U2_IP_SLOT_DEFAULT for U2 IP only,
+ *              MTU3_U3_IP_SLOT_DEFAULT for U3 IP
+ * @may_wakeup: means device's remote wakeup is enabled
+ * @is_self_powered: is reported in device status and the config descriptor
+ * @ep0_req: dummy request used while handling standard USB requests
+ *              for GET_STATUS and SET_SEL
+ * @setup_buf: ep0 response buffer for GET_STATUS and SET_SEL requests
+ */
+struct mtu3 {
+        spinlock_t lock;
+        struct ssusb_mtk *ssusb;
+        struct device *dev;
+        void __iomem *mac_base;
+        void __iomem *ippc_base;
+        int irq;
+
+        struct mtu3_fifo_info tx_fifo;
+        struct mtu3_fifo_info rx_fifo;
+
+        struct mtu3_ep *ep_array;
+        struct mtu3_ep *in_eps;
+        struct mtu3_ep *out_eps;
+        struct mtu3_ep *ep0;
+        int num_eps;
+        int slot;
+        int active_ep;
+
+        struct dma_pool *qmu_gpd_pool;
+        enum mtu3_g_ep0_state ep0_state;
+        struct usb_gadget g;    /* the gadget */
+        struct usb_gadget_driver *gadget_driver;
+        struct mtu3_request ep0_req;
+        u8 setup_buf[EP0_RESPONSE_BUF];
+        u32 max_speed;
+
+        unsigned is_active:1;
+        unsigned may_wakeup:1;
+        unsigned is_self_powered:1;
+        unsigned test_mode:1;
+        unsigned softconnect:1;
+        unsigned u1_enable:1;
+        unsigned u2_enable:1;
+        unsigned is_u3_ip:1;
+
+        u8 address;
+        u8 test_mode_nr;
+        u32 hw_version;
+};
+
+static inline struct mtu3 *gadget_to_mtu3(struct usb_gadget *g)
+{
+        return container_of(g, struct mtu3, g);
+}
+
+static inline int is_first_entry(const struct list_head *list,
+        const struct list_head *head)
+{
+        return list_is_last(head, list);
+}
+
+static inline struct mtu3_request *to_mtu3_request(struct usb_request *req)
+{
+        return req ? container_of(req, struct mtu3_request, request) : NULL;
+}
+
+static inline struct mtu3_ep *to_mtu3_ep(struct usb_ep *ep)
+{
+        return ep ? container_of(ep, struct mtu3_ep, ep) : NULL;
+}
+
+static inline struct mtu3_request *next_request(struct mtu3_ep *mep)
+{
+        struct list_head *queue = &mep->req_list;
+
+        if (list_empty(queue))
+                return NULL;
+
+        return list_first_entry(queue, struct mtu3_request, list);
+}
+
+static inline void mtu3_writel(void __iomem *base, u32 offset, u32 data)
+{
+        writel(data, base + offset);
+}
+
+static inline u32 mtu3_readl(void __iomem *base, u32 offset)
+{
+        return readl(base + offset);
+}
+
+static inline void mtu3_setbits(void __iomem *base, u32 offset, u32 bits)
+{
+        void __iomem *addr = base + offset;
+        u32 tmp = readl(addr);
+
+        writel((tmp | (bits)), addr);
+}
+
+static inline void mtu3_clrbits(void __iomem *base, u32 offset, u32 bits)
+{
+        void __iomem *addr = base + offset;
+        u32 tmp = readl(addr);
+
+        writel((tmp & ~(bits)), addr);
+}
+
+int ssusb_check_clocks(struct ssusb_mtk *ssusb, u32 ex_clks);
+struct usb_request *mtu3_alloc_request(struct usb_ep *ep, gfp_t gfp_flags);
+void mtu3_free_request(struct usb_ep *ep, struct usb_request *req);
+void mtu3_req_complete(struct mtu3_ep *mep,
+                struct usb_request *req, int status);
+
+int mtu3_config_ep(struct mtu3 *mtu, struct mtu3_ep *mep,
+                int interval, int burst, int mult);
+void mtu3_deconfig_ep(struct mtu3 *mtu, struct mtu3_ep *mep);
+void mtu3_ep_stall_set(struct mtu3_ep *mep, bool set);
+void mtu3_ep0_setup(struct mtu3 *mtu);
+void mtu3_start(struct mtu3 *mtu);
+void mtu3_stop(struct mtu3 *mtu);
+void mtu3_dev_on_off(struct mtu3 *mtu, int is_on);
+
+int mtu3_gadget_setup(struct mtu3 *mtu);
+void mtu3_gadget_cleanup(struct mtu3 *mtu);
+void mtu3_gadget_reset(struct mtu3 *mtu);
+void mtu3_gadget_suspend(struct mtu3 *mtu);
+void mtu3_gadget_resume(struct mtu3 *mtu);
+void mtu3_gadget_disconnect(struct mtu3 *mtu);
+
+irqreturn_t mtu3_ep0_isr(struct mtu3 *mtu);
+extern const struct usb_ep_ops mtu3_ep0_ops;
+
+#endif
diff --git a/drivers/usb/mtu3/mtu3_core.c b/drivers/usb/mtu3/mtu3_core.c
new file mode 100644
index 000000000000..99c65b0788ff
--- /dev/null
+++ b/drivers/usb/mtu3/mtu3_core.c
@@ -0,0 +1,863 @@
+/*
+ * mtu3_core.c - hardware access layer and gadget init/exit of
+ *                     MediaTek usb3 Dual-Role Controller Driver
+ *
+ * Copyright (C) 2016 MediaTek Inc.
+ *
+ * Author: Chunfeng Yun <chunfeng.yun@mediatek.com>
+ *
+ * This software is licensed under the terms of the GNU General Public
+ * License version 2, as published by the Free Software Foundation, and
+ * may be copied, distributed, and modified under those terms.
+ *
+ * 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.
+ *
+ */
+
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/of_address.h>
+#include <linux/of_irq.h>
+#include <linux/platform_device.h>
+
+#include "mtu3.h"
+
+static int ep_fifo_alloc(struct mtu3_ep *mep, u32 seg_size)
+{
+        struct mtu3_fifo_info *fifo = mep->fifo;
+        u32 num_bits = DIV_ROUND_UP(seg_size, MTU3_EP_FIFO_UNIT);
+        u32 start_bit;
+
+        /* ensure that @mep->fifo_seg_size is power of two */
+        num_bits = roundup_pow_of_two(num_bits);
+        if (num_bits > fifo->limit)
+                return -EINVAL;
+
+        mep->fifo_seg_size = num_bits * MTU3_EP_FIFO_UNIT;
+        num_bits = num_bits * (mep->slot + 1);
+        start_bit = bitmap_find_next_zero_area(fifo->bitmap,
+                        fifo->limit, 0, num_bits, 0);
+        if (start_bit >= fifo->limit)
+                return -EOVERFLOW;
+
+        bitmap_set(fifo->bitmap, start_bit, num_bits);
+        mep->fifo_size = num_bits * MTU3_EP_FIFO_UNIT;
+        mep->fifo_addr = fifo->base + MTU3_EP_FIFO_UNIT * start_bit;
+
+        dev_dbg(mep->mtu->dev, "%s fifo:%#x/%#x, start_bit: %d\n",
+                __func__, mep->fifo_seg_size, mep->fifo_size, start_bit);
+
+        return mep->fifo_addr;
+}
+
+static void ep_fifo_free(struct mtu3_ep *mep)
+{
+        struct mtu3_fifo_info *fifo = mep->fifo;
+        u32 addr = mep->fifo_addr;
+        u32 bits = mep->fifo_size / MTU3_EP_FIFO_UNIT;
+        u32 start_bit;
+
+        if (unlikely(addr < fifo->base || bits > fifo->limit))
+                return;
+
+        start_bit = (addr - fifo->base) / MTU3_EP_FIFO_UNIT;
+        bitmap_clear(fifo->bitmap, start_bit, bits);
+        mep->fifo_size = 0;
+        mep->fifo_seg_size = 0;
+
+        dev_dbg(mep->mtu->dev, "%s size:%#x/%#x, start_bit: %d\n",
+                __func__, mep->fifo_seg_size, mep->fifo_size, start_bit);
+}
+
+/* enable/disable U3D SS function */
+static inline void mtu3_ss_func_set(struct mtu3 *mtu, bool enable)
+{
+        /* If usb3_en==0, LTSSM will go to SS.Disable state */
+        if (enable)
+                mtu3_setbits(mtu->mac_base, U3D_USB3_CONFIG, USB3_EN);
+        else
+                mtu3_clrbits(mtu->mac_base, U3D_USB3_CONFIG, USB3_EN);
+
+        dev_dbg(mtu->dev, "USB3_EN = %d\n", !!enable);
+}
+
+/* set/clear U3D HS device soft connect */
+static inline void mtu3_hs_softconn_set(struct mtu3 *mtu, bool enable)
+{
+        if (enable) {
+                mtu3_setbits(mtu->mac_base, U3D_POWER_MANAGEMENT,
+                        SOFT_CONN | SUSPENDM_ENABLE);
+        } else {
+                mtu3_clrbits(mtu->mac_base, U3D_POWER_MANAGEMENT,
+                        SOFT_CONN | SUSPENDM_ENABLE);
+        }
+        dev_dbg(mtu->dev, "SOFTCONN = %d\n", !!enable);
+}
+
+/* only port0 of U2/U3 supports device mode */
+static int mtu3_device_enable(struct mtu3 *mtu)
+{
+        void __iomem *ibase = mtu->ippc_base;
+        u32 check_clk = 0;
+
+        mtu3_clrbits(ibase, U3D_SSUSB_IP_PW_CTRL2, SSUSB_IP_DEV_PDN);
+
+        if (mtu->is_u3_ip) {
+                check_clk = SSUSB_U3_MAC_RST_B_STS;
+                mtu3_clrbits(ibase, SSUSB_U3_CTRL(0),
+                        (SSUSB_U3_PORT_DIS | SSUSB_U3_PORT_PDN |
+                        SSUSB_U3_PORT_HOST_SEL));
+        }
+        mtu3_clrbits(ibase, SSUSB_U2_CTRL(0),
+                (SSUSB_U2_PORT_DIS | SSUSB_U2_PORT_PDN |
+                SSUSB_U2_PORT_HOST_SEL));
+        mtu3_setbits(ibase, SSUSB_U2_CTRL(0), SSUSB_U2_PORT_OTG_SEL);
+
+        return ssusb_check_clocks(mtu->ssusb, check_clk);
+}
+
+static void mtu3_device_disable(struct mtu3 *mtu)
+{
+        void __iomem *ibase = mtu->ippc_base;
+
+        if (mtu->is_u3_ip)
+                mtu3_setbits(ibase, SSUSB_U3_CTRL(0),
+                        (SSUSB_U3_PORT_DIS | SSUSB_U3_PORT_PDN));
+
+        mtu3_setbits(ibase, SSUSB_U2_CTRL(0),
+                SSUSB_U2_PORT_DIS | SSUSB_U2_PORT_PDN);
+        mtu3_clrbits(ibase, SSUSB_U2_CTRL(0), SSUSB_U2_PORT_OTG_SEL);
+        mtu3_setbits(ibase, U3D_SSUSB_IP_PW_CTRL2, SSUSB_IP_DEV_PDN);
+}
+
+/* reset U3D's device module. */
+static void mtu3_device_reset(struct mtu3 *mtu)
+{
+        void __iomem *ibase = mtu->ippc_base;
+
+        mtu3_setbits(ibase, U3D_SSUSB_DEV_RST_CTRL, SSUSB_DEV_SW_RST);
+        udelay(1);
+        mtu3_clrbits(ibase, U3D_SSUSB_DEV_RST_CTRL, SSUSB_DEV_SW_RST);
+}
+
+/* disable all interrupts */
+static void mtu3_intr_disable(struct mtu3 *mtu)
+{
+        void __iomem *mbase = mtu->mac_base;
+
+        /* Disable level 1 interrupts */
+        mtu3_writel(mbase, U3D_LV1IECR, ~0x0);
+        /* Disable endpoint interrupts */
+        mtu3_writel(mbase, U3D_EPIECR, ~0x0);
+}
+
+static void mtu3_intr_status_clear(struct mtu3 *mtu)
+{
+        void __iomem *mbase = mtu->mac_base;
+
+        /* Clear EP0 and Tx/Rx EPn interrupts status */
+        mtu3_writel(mbase, U3D_EPISR, ~0x0);
+        /* Clear U2 USB common interrupts status */
+        mtu3_writel(mbase, U3D_COMMON_USB_INTR, ~0x0);
+        /* Clear U3 LTSSM interrupts status */
+        mtu3_writel(mbase, U3D_LTSSM_INTR, ~0x0);
+        /* Clear speed change interrupt status */
+        mtu3_writel(mbase, U3D_DEV_LINK_INTR, ~0x0);
+}
+
+/* enable system global interrupt */
+static void mtu3_intr_enable(struct mtu3 *mtu)
+{
+        void __iomem *mbase = mtu->mac_base;
+        u32 value;
+
+        /*Enable level 1 interrupts (BMU, QMU, MAC3, DMA, MAC2, EPCTL) */
+        value = BMU_INTR | QMU_INTR | MAC3_INTR | MAC2_INTR | EP_CTRL_INTR;
+        mtu3_writel(mbase, U3D_LV1IESR, value);
+
+        /* Enable U2 common USB interrupts */
+        value = SUSPEND_INTR | RESUME_INTR | RESET_INTR;
+        mtu3_writel(mbase, U3D_COMMON_USB_INTR_ENABLE, value);
+
+        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;
+                mtu3_writel(mbase, U3D_LTSSM_INTR_ENABLE, value);
+        }
+
+        /* Enable QMU interrupts. */
+        value = TXQ_CSERR_INT | TXQ_LENERR_INT | RXQ_CSERR_INT |
+                        RXQ_LENERR_INT | RXQ_ZLPERR_INT;
+        mtu3_writel(mbase, U3D_QIESR1, value);
+
+        /* Enable speed change interrupt */
+        mtu3_writel(mbase, U3D_DEV_LINK_INTR_ENABLE, SSUSB_DEV_SPEED_CHG_INTR);
+}
+
+/* set/clear the stall and toggle bits for non-ep0 */
+void mtu3_ep_stall_set(struct mtu3_ep *mep, bool set)
+{
+        struct mtu3 *mtu = mep->mtu;
+        void __iomem *mbase = mtu->mac_base;
+        u8 epnum = mep->epnum;
+        u32 csr;
+
+        if (mep->is_in) {       /* TX */
+                csr = mtu3_readl(mbase, MU3D_EP_TXCR0(epnum)) & TX_W1C_BITS;
+                if (set)
+                        csr |= TX_SENDSTALL;
+                else
+                        csr = (csr & (~TX_SENDSTALL)) | TX_SENTSTALL;
+                mtu3_writel(mbase, MU3D_EP_TXCR0(epnum), csr);
+        } else {        /* RX */
+                csr = mtu3_readl(mbase, MU3D_EP_RXCR0(epnum)) & RX_W1C_BITS;
+                if (set)
+                        csr |= RX_SENDSTALL;
+                else
+                        csr = (csr & (~RX_SENDSTALL)) | RX_SENTSTALL;
+                mtu3_writel(mbase, MU3D_EP_RXCR0(epnum), csr);
+        }
+
+        if (!set) {
+                mtu3_setbits(mbase, U3D_EP_RST, EP_RST(mep->is_in, epnum));
+                mtu3_clrbits(mbase, U3D_EP_RST, EP_RST(mep->is_in, epnum));
+                mep->flags &= ~MTU3_EP_STALL;
+        } else {
+                mep->flags |= MTU3_EP_STALL;
+        }
+
+        dev_dbg(mtu->dev, "%s: %s\n", mep->name,
+                set ? "SEND STALL" : "CLEAR STALL, with EP RESET");
+}
+
+void mtu3_dev_on_off(struct mtu3 *mtu, int is_on)
+{
+        if (mtu->is_u3_ip && (mtu->max_speed == USB_SPEED_SUPER))
+                mtu3_ss_func_set(mtu, is_on);
+        else
+                mtu3_hs_softconn_set(mtu, is_on);
+
+        dev_info(mtu->dev, "gadget (%s) pullup D%s\n",
+                usb_speed_string(mtu->max_speed), is_on ? "+" : "-");
+}
+
+void mtu3_start(struct mtu3 *mtu)
+{
+        void __iomem *mbase = mtu->mac_base;
+
+        dev_dbg(mtu->dev, "%s devctl 0x%x\n", __func__,
+                mtu3_readl(mbase, U3D_DEVICE_CONTROL));
+
+        mtu3_clrbits(mtu->ippc_base, U3D_SSUSB_IP_PW_CTRL2, SSUSB_IP_DEV_PDN);
+
+        /*
+         * When disable U2 port, USB2_CSR's register will be reset to
+         * default value after re-enable it again(HS is enabled by default).
+         * So if force mac to work as FS, disable HS function.
+         */
+        if (mtu->max_speed == USB_SPEED_FULL)
+                mtu3_clrbits(mbase, U3D_POWER_MANAGEMENT, HS_ENABLE);
+
+        /* Initialize the default interrupts */
+        mtu3_intr_enable(mtu);
+        mtu->is_active = 1;
+
+        if (mtu->softconnect)
+                mtu3_dev_on_off(mtu, 1);
+}
+
+void mtu3_stop(struct mtu3 *mtu)
+{
+        dev_dbg(mtu->dev, "%s\n", __func__);
+
+        mtu3_intr_disable(mtu);
+        mtu3_intr_status_clear(mtu);
+
+        if (mtu->softconnect)
+                mtu3_dev_on_off(mtu, 0);
+
+        mtu->is_active = 0;
+        mtu3_setbits(mtu->ippc_base, U3D_SSUSB_IP_PW_CTRL2, SSUSB_IP_DEV_PDN);
+}
+
+/* for non-ep0 */
+int mtu3_config_ep(struct mtu3 *mtu, struct mtu3_ep *mep,
+                        int interval, int burst, int mult)
+{
+        void __iomem *mbase = mtu->mac_base;
+        int epnum = mep->epnum;
+        u32 csr0, csr1, csr2;
+        int fifo_sgsz, fifo_addr;
+        int num_pkts;
+
+        fifo_addr = ep_fifo_alloc(mep, mep->maxp);
+        if (fifo_addr < 0) {
+                dev_err(mtu->dev, "alloc ep fifo failed(%d)\n", mep->maxp);
+                return -ENOMEM;
+        }
+        fifo_sgsz = ilog2(mep->fifo_seg_size);
+        dev_dbg(mtu->dev, "%s fifosz: %x(%x/%x)\n", __func__, fifo_sgsz,
+                mep->fifo_seg_size, mep->fifo_size);
+
+        if (mep->is_in) {
+                csr0 = TX_TXMAXPKTSZ(mep->maxp);
+                csr0 |= TX_DMAREQEN;
+
+                num_pkts = (burst + 1) * (mult + 1) - 1;
+                csr1 = TX_SS_BURST(burst) | TX_SLOT(mep->slot);
+                csr1 |= TX_MAX_PKT(num_pkts) | TX_MULT(mult);
+
+                csr2 = TX_FIFOADDR(fifo_addr >> 4);
+                csr2 |= TX_FIFOSEGSIZE(fifo_sgsz);
+
+                switch (mep->type) {
+                case USB_ENDPOINT_XFER_BULK:
+                        csr1 |= TX_TYPE(TYPE_BULK);
+                        break;
+                case USB_ENDPOINT_XFER_ISOC:
+                        csr1 |= TX_TYPE(TYPE_ISO);
+                        csr2 |= TX_BINTERVAL(interval);
+                        break;
+                case USB_ENDPOINT_XFER_INT:
+                        csr1 |= TX_TYPE(TYPE_INT);
+                        csr2 |= TX_BINTERVAL(interval);
+                        break;
+                }
+
+                /* Enable QMU Done interrupt */
+                mtu3_setbits(mbase, U3D_QIESR0, QMU_TX_DONE_INT(epnum));
+
+                mtu3_writel(mbase, MU3D_EP_TXCR0(epnum), csr0);
+                mtu3_writel(mbase, MU3D_EP_TXCR1(epnum), csr1);
+                mtu3_writel(mbase, MU3D_EP_TXCR2(epnum), csr2);
+
+                dev_dbg(mtu->dev, "U3D_TX%d CSR0:%#x, CSR1:%#x, CSR2:%#x\n",
+                        epnum, mtu3_readl(mbase, MU3D_EP_TXCR0(epnum)),
+                        mtu3_readl(mbase, MU3D_EP_TXCR1(epnum)),
+                        mtu3_readl(mbase, MU3D_EP_TXCR2(epnum)));
+        } else {
+                csr0 = RX_RXMAXPKTSZ(mep->maxp);
+                csr0 |= RX_DMAREQEN;
+
+                num_pkts = (burst + 1) * (mult + 1) - 1;
+                csr1 = RX_SS_BURST(burst) | RX_SLOT(mep->slot);
+                csr1 |= RX_MAX_PKT(num_pkts) | RX_MULT(mult);
+
+                csr2 = RX_FIFOADDR(fifo_addr >> 4);
+                csr2 |= RX_FIFOSEGSIZE(fifo_sgsz);
+
+                switch (mep->type) {
+                case USB_ENDPOINT_XFER_BULK:
+                        csr1 |= RX_TYPE(TYPE_BULK);
+                        break;
+                case USB_ENDPOINT_XFER_ISOC:
+                        csr1 |= RX_TYPE(TYPE_ISO);
+                        csr2 |= RX_BINTERVAL(interval);
+                        break;
+                case USB_ENDPOINT_XFER_INT:
+                        csr1 |= RX_TYPE(TYPE_INT);
+                        csr2 |= RX_BINTERVAL(interval);
+                        break;
+                }
+
+                /*Enable QMU Done interrupt */
+                mtu3_setbits(mbase, U3D_QIESR0, QMU_RX_DONE_INT(epnum));
+
+                mtu3_writel(mbase, MU3D_EP_RXCR0(epnum), csr0);
+                mtu3_writel(mbase, MU3D_EP_RXCR1(epnum), csr1);
+                mtu3_writel(mbase, MU3D_EP_RXCR2(epnum), csr2);
+
+                dev_dbg(mtu->dev, "U3D_RX%d CSR0:%#x, CSR1:%#x, CSR2:%#x\n",
+                        epnum, mtu3_readl(mbase, MU3D_EP_RXCR0(epnum)),
+                        mtu3_readl(mbase, MU3D_EP_RXCR1(epnum)),
+                        mtu3_readl(mbase, MU3D_EP_RXCR2(epnum)));
+        }
+
+        dev_dbg(mtu->dev, "csr0:%#x, csr1:%#x, csr2:%#x\n", csr0, csr1, csr2);
+        dev_dbg(mtu->dev, "%s: %s, fifo-addr:%#x, fifo-size:%#x(%#x/%#x)\n",
+                __func__, mep->name, mep->fifo_addr, mep->fifo_size,
+                fifo_sgsz, mep->fifo_seg_size);
+
+        return 0;
+}
+
+/* for non-ep0 */
+void mtu3_deconfig_ep(struct mtu3 *mtu, struct mtu3_ep *mep)
+{
+        void __iomem *mbase = mtu->mac_base;
+        int epnum = mep->epnum;
+
+        if (mep->is_in) {
+                mtu3_writel(mbase, MU3D_EP_TXCR0(epnum), 0);
+                mtu3_writel(mbase, MU3D_EP_TXCR1(epnum), 0);
+                mtu3_writel(mbase, MU3D_EP_TXCR2(epnum), 0);
+                mtu3_setbits(mbase, U3D_QIECR0, QMU_TX_DONE_INT(epnum));
+        } else {
+                mtu3_writel(mbase, MU3D_EP_RXCR0(epnum), 0);
+                mtu3_writel(mbase, MU3D_EP_RXCR1(epnum), 0);
+                mtu3_writel(mbase, MU3D_EP_RXCR2(epnum), 0);
+                mtu3_setbits(mbase, U3D_QIECR0, QMU_RX_DONE_INT(epnum));
+        }
+
+        ep_fifo_free(mep);
+
+        dev_dbg(mtu->dev, "%s: %s\n", __func__, mep->name);
+}
+
+/*
+ * Two scenarios:
+ * 1. when device IP supports SS, the fifo of EP0, TX EPs, RX EPs
+ *      are separated;
+ * 2. when supports only HS, the fifo is shared for all EPs, and
+ *      the capability registers of @EPNTXFFSZ or @EPNRXFFSZ indicate
+ *      the total fifo size of non-ep0, and ep0's is fixed to 64B,
+ *      so the total fifo size is 64B + @EPNTXFFSZ;
+ *      Due to the first 64B should be reserved for EP0, non-ep0's fifo
+ *      starts from offset 64 and are divided into two equal parts for
+ *      TX or RX EPs for simplification.
+ */
+static void get_ep_fifo_config(struct mtu3 *mtu)
+{
+        struct mtu3_fifo_info *tx_fifo;
+        struct mtu3_fifo_info *rx_fifo;
+        u32 fifosize;
+
+        if (mtu->is_u3_ip) {
+                fifosize = mtu3_readl(mtu->mac_base, U3D_CAP_EPNTXFFSZ);
+                tx_fifo = &mtu->tx_fifo;
+                tx_fifo->base = 0;
+                tx_fifo->limit = fifosize / MTU3_EP_FIFO_UNIT;
+                bitmap_zero(tx_fifo->bitmap, MTU3_FIFO_BIT_SIZE);
+
+                fifosize = mtu3_readl(mtu->mac_base, U3D_CAP_EPNRXFFSZ);
+                rx_fifo = &mtu->rx_fifo;
+                rx_fifo->base = 0;
+                rx_fifo->limit = fifosize / MTU3_EP_FIFO_UNIT;
+                bitmap_zero(rx_fifo->bitmap, MTU3_FIFO_BIT_SIZE);
+                mtu->slot = MTU3_U3_IP_SLOT_DEFAULT;
+        } else {
+                fifosize = mtu3_readl(mtu->mac_base, U3D_CAP_EPNTXFFSZ);
+                tx_fifo = &mtu->tx_fifo;
+                tx_fifo->base = MTU3_U2_IP_EP0_FIFO_SIZE;
+                tx_fifo->limit = (fifosize / MTU3_EP_FIFO_UNIT) >> 1;
+                bitmap_zero(tx_fifo->bitmap, MTU3_FIFO_BIT_SIZE);
+
+                rx_fifo = &mtu->rx_fifo;
+                rx_fifo->base =
+                        tx_fifo->base + tx_fifo->limit * MTU3_EP_FIFO_UNIT;
+                rx_fifo->limit = tx_fifo->limit;
+                bitmap_zero(rx_fifo->bitmap, MTU3_FIFO_BIT_SIZE);
+                mtu->slot = MTU3_U2_IP_SLOT_DEFAULT;
+        }
+
+        dev_dbg(mtu->dev, "%s, TX: base-%d, limit-%d; RX: base-%d, limit-%d\n",
+                __func__, tx_fifo->base, tx_fifo->limit,
+                rx_fifo->base, rx_fifo->limit);
+}
+
+void mtu3_ep0_setup(struct mtu3 *mtu)
+{
+        u32 maxpacket = mtu->g.ep0->maxpacket;
+        u32 csr;
+
+        dev_dbg(mtu->dev, "%s maxpacket: %d\n", __func__, maxpacket);
+
+        csr = mtu3_readl(mtu->mac_base, U3D_EP0CSR);
+        csr &= ~EP0_MAXPKTSZ_MSK;
+        csr |= EP0_MAXPKTSZ(maxpacket);
+        csr &= EP0_W1C_BITS;
+        mtu3_writel(mtu->mac_base, U3D_EP0CSR, csr);
+
+        /* Enable EP0 interrupt */
+        mtu3_writel(mtu->mac_base, U3D_EPIESR, EP0ISR);
+}
+
+static int mtu3_mem_alloc(struct mtu3 *mtu)
+{
+        void __iomem *mbase = mtu->mac_base;
+        struct mtu3_ep *ep_array;
+        int in_ep_num, out_ep_num;
+        u32 cap_epinfo;
+        int ret;
+        int i;
+
+        cap_epinfo = mtu3_readl(mbase, U3D_CAP_EPINFO);
+        in_ep_num = CAP_TX_EP_NUM(cap_epinfo);
+        out_ep_num = CAP_RX_EP_NUM(cap_epinfo);
+
+        dev_info(mtu->dev, "fifosz/epnum: Tx=%#x/%d, Rx=%#x/%d\n",
+                 mtu3_readl(mbase, U3D_CAP_EPNTXFFSZ), in_ep_num,
+                 mtu3_readl(mbase, U3D_CAP_EPNRXFFSZ), out_ep_num);
+
+        /* one for ep0, another is reserved */
+        mtu->num_eps = min(in_ep_num, out_ep_num) + 1;
+        ep_array = kcalloc(mtu->num_eps * 2, sizeof(*ep_array), GFP_KERNEL);
+        if (ep_array == NULL)
+                return -ENOMEM;
+
+        mtu->ep_array = ep_array;
+        mtu->in_eps = ep_array;
+        mtu->out_eps = &ep_array[mtu->num_eps];
+        /* ep0 uses in_eps[0], out_eps[0] is reserved */
+        mtu->ep0 = mtu->in_eps;
+        mtu->ep0->mtu = mtu;
+        mtu->ep0->epnum = 0;
+
+        for (i = 1; i < mtu->num_eps; i++) {
+                struct mtu3_ep *mep = mtu->in_eps + i;
+
+                mep->fifo = &mtu->tx_fifo;
+                mep = mtu->out_eps + i;
+                mep->fifo = &mtu->rx_fifo;
+        }
+
+        get_ep_fifo_config(mtu);
+
+        ret = mtu3_qmu_init(mtu);
+        if (ret)
+                kfree(mtu->ep_array);
+
+        return ret;
+}
+
+static void mtu3_mem_free(struct mtu3 *mtu)
+{
+        mtu3_qmu_exit(mtu);
+        kfree(mtu->ep_array);
+}
+
+static void mtu3_set_speed(struct mtu3 *mtu)
+{
+        void __iomem *mbase = mtu->mac_base;
+
+        if (!mtu->is_u3_ip && (mtu->max_speed > USB_SPEED_HIGH))
+                mtu->max_speed = USB_SPEED_HIGH;
+
+        if (mtu->max_speed == USB_SPEED_FULL) {
+                /* disable U3 SS function */
+                mtu3_clrbits(mbase, U3D_USB3_CONFIG, USB3_EN);
+                /* disable HS function */
+                mtu3_clrbits(mbase, U3D_POWER_MANAGEMENT, HS_ENABLE);
+        } else if (mtu->max_speed == USB_SPEED_HIGH) {
+                mtu3_clrbits(mbase, U3D_USB3_CONFIG, USB3_EN);
+                /* HS/FS detected by HW */
+                mtu3_setbits(mbase, U3D_POWER_MANAGEMENT, HS_ENABLE);
+        }
+
+        dev_info(mtu->dev, "max_speed: %s\n",
+                usb_speed_string(mtu->max_speed));
+}
+
+static void mtu3_regs_init(struct mtu3 *mtu)
+{
+
+        void __iomem *mbase = mtu->mac_base;
+
+        /* be sure interrupts are disabled before registration of ISR */
+        mtu3_intr_disable(mtu);
+        mtu3_intr_status_clear(mtu);
+
+        if (mtu->is_u3_ip) {
+                /* disable LGO_U1/U2 by default */
+                mtu3_clrbits(mbase, U3D_LINK_POWER_CONTROL,
+                                SW_U1_ACCEPT_ENABLE | SW_U2_ACCEPT_ENABLE |
+                                SW_U1_REQUEST_ENABLE | SW_U2_REQUEST_ENABLE);
+                /* device responses to u3_exit from host automatically */
+                mtu3_clrbits(mbase, U3D_LTSSM_CTRL, SOFT_U3_EXIT_EN);
+                /* automatically build U2 link when U3 detect fail */
+                mtu3_setbits(mbase, U3D_USB2_TEST_MODE, U2U3_AUTO_SWITCH);
+        }
+
+        mtu3_set_speed(mtu);
+
+        /* delay about 0.1us from detecting reset to send chirp-K */
+        mtu3_clrbits(mbase, U3D_LINK_RESET_INFO, WTCHRP_MSK);
+        /* U2/U3 detected by HW */
+        mtu3_writel(mbase, U3D_DEVICE_CONF, 0);
+        /* enable QMU 16B checksum */
+        mtu3_setbits(mbase, U3D_QCR0, QMU_CS16B_EN);
+        /* vbus detected by HW */
+        mtu3_clrbits(mbase, U3D_MISC_CTRL, VBUS_FRC_EN | VBUS_ON);
+}
+
+static irqreturn_t mtu3_link_isr(struct mtu3 *mtu)
+{
+        void __iomem *mbase = mtu->mac_base;
+        enum usb_device_speed udev_speed;
+        u32 maxpkt = 64;
+        u32 link;
+        u32 speed;
+
+        link = mtu3_readl(mbase, U3D_DEV_LINK_INTR);
+        link &= mtu3_readl(mbase, U3D_DEV_LINK_INTR_ENABLE);
+        mtu3_writel(mbase, U3D_DEV_LINK_INTR, link); /* W1C */
+        dev_dbg(mtu->dev, "=== LINK[%x] ===\n", link);
+
+        if (!(link & SSUSB_DEV_SPEED_CHG_INTR))
+                return IRQ_NONE;
+
+        speed = SSUSB_DEV_SPEED(mtu3_readl(mbase, U3D_DEVICE_CONF));
+
+        switch (speed) {
+        case MTU3_SPEED_FULL:
+                udev_speed = USB_SPEED_FULL;
+                /*BESLCK = 4 < BESLCK_U3 = 10 < BESLDCK = 15 */
+                mtu3_writel(mbase, U3D_USB20_LPM_PARAMETER, LPM_BESLDCK(0xf)
+                                | LPM_BESLCK(4) | LPM_BESLCK_U3(0xa));
+                mtu3_setbits(mbase, U3D_POWER_MANAGEMENT,
+                                LPM_BESL_STALL | LPM_BESLD_STALL);
+                break;
+        case MTU3_SPEED_HIGH:
+                udev_speed = USB_SPEED_HIGH;
+                /*BESLCK = 4 < BESLCK_U3 = 10 < BESLDCK = 15 */
+                mtu3_writel(mbase, U3D_USB20_LPM_PARAMETER, LPM_BESLDCK(0xf)
+                                | LPM_BESLCK(4) | LPM_BESLCK_U3(0xa));
+                mtu3_setbits(mbase, U3D_POWER_MANAGEMENT,
+                                LPM_BESL_STALL | LPM_BESLD_STALL);
+                break;
+        case MTU3_SPEED_SUPER:
+                udev_speed = USB_SPEED_SUPER;
+                maxpkt = 512;
+                break;
+        default:
+                udev_speed = USB_SPEED_UNKNOWN;
+                break;
+        }
+        dev_dbg(mtu->dev, "%s: %s\n", __func__, usb_speed_string(udev_speed));
+
+        mtu->g.speed = udev_speed;
+        mtu->g.ep0->maxpacket = maxpkt;
+        mtu->ep0_state = MU3D_EP0_STATE_SETUP;
+
+        if (udev_speed == USB_SPEED_UNKNOWN)
+                mtu3_gadget_disconnect(mtu);
+        else
+                mtu3_ep0_setup(mtu);
+
+        return IRQ_HANDLED;
+}
+
+static irqreturn_t mtu3_u3_ltssm_isr(struct mtu3 *mtu)
+{
+        void __iomem *mbase = mtu->mac_base;
+        u32 ltssm;
+
+        ltssm = mtu3_readl(mbase, U3D_LTSSM_INTR);
+        ltssm &= mtu3_readl(mbase, U3D_LTSSM_INTR_ENABLE);
+        mtu3_writel(mbase, U3D_LTSSM_INTR, ltssm); /* W1C */
+        dev_dbg(mtu->dev, "=== LTSSM[%x] ===\n", ltssm);
+
+        if (ltssm & (HOT_RST_INTR | WARM_RST_INTR))
+                mtu3_gadget_reset(mtu);
+
+        if (ltssm & VBUS_FALL_INTR)
+                mtu3_ss_func_set(mtu, false);
+
+        if (ltssm & VBUS_RISE_INTR)
+                mtu3_ss_func_set(mtu, true);
+
+        if (ltssm & EXIT_U3_INTR)
+                mtu3_gadget_resume(mtu);
+
+        if (ltssm & ENTER_U3_INTR)
+                mtu3_gadget_suspend(mtu);
+
+        return IRQ_HANDLED;
+}
+
+static irqreturn_t mtu3_u2_common_isr(struct mtu3 *mtu)
+{
+        void __iomem *mbase = mtu->mac_base;
+        u32 u2comm;
+
+        u2comm = mtu3_readl(mbase, U3D_COMMON_USB_INTR);
+        u2comm &= mtu3_readl(mbase, U3D_COMMON_USB_INTR_ENABLE);
+        mtu3_writel(mbase, U3D_COMMON_USB_INTR, u2comm); /* W1C */
+        dev_dbg(mtu->dev, "=== U2COMM[%x] ===\n", u2comm);
+
+        if (u2comm & SUSPEND_INTR)
+                mtu3_gadget_suspend(mtu);
+
+        if (u2comm & RESUME_INTR)
+                mtu3_gadget_resume(mtu);
+
+        if (u2comm & RESET_INTR)
+                mtu3_gadget_reset(mtu);
+
+        return IRQ_HANDLED;
+}
+
+static irqreturn_t mtu3_irq(int irq, void *data)
+{
+        struct mtu3 *mtu = (struct mtu3 *)data;
+        unsigned long flags;
+        u32 level1;
+
+        spin_lock_irqsave(&mtu->lock, flags);
+
+        /* U3D_LV1ISR is RU */
+        level1 = mtu3_readl(mtu->mac_base, U3D_LV1ISR);
+        level1 &= mtu3_readl(mtu->mac_base, U3D_LV1IER);
+
+        if (level1 & EP_CTRL_INTR)
+                mtu3_link_isr(mtu);
+
+        if (level1 & MAC2_INTR)
+                mtu3_u2_common_isr(mtu);
+
+        if (level1 & MAC3_INTR)
+                mtu3_u3_ltssm_isr(mtu);
+
+        if (level1 & BMU_INTR)
+                mtu3_ep0_isr(mtu);
+
+        if (level1 & QMU_INTR)
+                mtu3_qmu_isr(mtu);
+
+        spin_unlock_irqrestore(&mtu->lock, flags);
+
+        return IRQ_HANDLED;
+}
+
+static int mtu3_hw_init(struct mtu3 *mtu)
+{
+        u32 cap_dev;
+        int ret;
+
+        mtu->hw_version = mtu3_readl(mtu->ippc_base, U3D_SSUSB_HW_ID);
+
+        cap_dev = mtu3_readl(mtu->ippc_base, U3D_SSUSB_IP_DEV_CAP);
+        mtu->is_u3_ip = !!SSUSB_IP_DEV_U3_PORT_NUM(cap_dev);
+
+        dev_info(mtu->dev, "IP version 0x%x(%s IP)\n", mtu->hw_version,
+                mtu->is_u3_ip ? "U3" : "U2");
+
+        mtu3_device_reset(mtu);
+
+        ret = mtu3_device_enable(mtu);
+        if (ret) {
+                dev_err(mtu->dev, "device enable failed %d\n", ret);
+                return ret;
+        }
+
+        ret = mtu3_mem_alloc(mtu);
+        if (ret)
+                return -ENOMEM;
+
+        mtu3_regs_init(mtu);
+
+        return 0;
+}
+
+static void mtu3_hw_exit(struct mtu3 *mtu)
+{
+        mtu3_device_disable(mtu);
+        mtu3_mem_free(mtu);
+}
+
+/*-------------------------------------------------------------------------*/
+
+int ssusb_gadget_init(struct ssusb_mtk *ssusb)
+{
+        struct device *dev = ssusb->dev;
+        struct platform_device *pdev = to_platform_device(dev);
+        struct mtu3 *mtu = NULL;
+        struct resource *res;
+        int ret = -ENOMEM;
+
+        mtu = devm_kzalloc(dev, sizeof(struct mtu3), GFP_KERNEL);
+        if (mtu == NULL)
+                return -ENOMEM;
+
+        mtu->irq = platform_get_irq(pdev, 0);
+        if (mtu->irq <= 0) {
+                dev_err(dev, "fail to get irq number\n");
+                return -ENODEV;
+        }
+        dev_info(dev, "irq %d\n", mtu->irq);
+
+        res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "mac");
+        mtu->mac_base = devm_ioremap_resource(dev, res);
+        if (IS_ERR(mtu->mac_base)) {
+                dev_err(dev, "error mapping memory for dev mac\n");
+                return PTR_ERR(mtu->mac_base);
+        }
+
+        spin_lock_init(&mtu->lock);
+        mtu->dev = dev;
+        mtu->ippc_base = ssusb->ippc_base;
+        ssusb->mac_base = mtu->mac_base;
+        ssusb->u3d = mtu;
+        mtu->ssusb = ssusb;
+        mtu->max_speed = usb_get_maximum_speed(dev);
+
+        /* check the max_speed parameter */
+        switch (mtu->max_speed) {
+        case USB_SPEED_FULL:
+        case USB_SPEED_HIGH:
+        case USB_SPEED_SUPER:
+                break;
+        default:
+                dev_err(dev, "invalid max_speed: %s\n",
+                        usb_speed_string(mtu->max_speed));
+                /* fall through */
+        case USB_SPEED_UNKNOWN:
+                /* default as SS */
+                mtu->max_speed = USB_SPEED_SUPER;
+                break;
+        }
+
+        dev_dbg(dev, "mac_base=0x%p, ippc_base=0x%p\n",
+                mtu->mac_base, mtu->ippc_base);
+
+        ret = mtu3_hw_init(mtu);
+        if (ret) {
+                dev_err(dev, "mtu3 hw init failed:%d\n", ret);
+                return ret;
+        }
+
+        ret = devm_request_irq(dev, mtu->irq, mtu3_irq, 0, dev_name(dev), mtu);
+        if (ret) {
+                dev_err(dev, "request irq %d failed!\n", mtu->irq);
+                goto irq_err;
+        }
+
+        device_init_wakeup(dev, true);
+
+        ret = mtu3_gadget_setup(mtu);
+        if (ret) {
+                dev_err(dev, "mtu3 gadget init failed:%d\n", ret);
+                goto gadget_err;
+        }
+
+        /* init as host mode, power down device IP for power saving */
+        if (mtu->ssusb->dr_mode == USB_DR_MODE_OTG)
+                mtu3_stop(mtu);
+
+        dev_dbg(dev, " %s() done...\n", __func__);
+
+        return 0;
+
+gadget_err:
+        device_init_wakeup(dev, false);
+
+irq_err:
+        mtu3_hw_exit(mtu);
+        ssusb->u3d = NULL;
+        dev_err(dev, " %s() fail...\n", __func__);
+
+        return ret;
+}
+
+void ssusb_gadget_exit(struct ssusb_mtk *ssusb)
+{
+        struct mtu3 *mtu = ssusb->u3d;
+
+        mtu3_gadget_cleanup(mtu);
+        device_init_wakeup(ssusb->dev, false);
+        mtu3_hw_exit(mtu);
+}
diff --git a/drivers/usb/mtu3/mtu3_dr.c b/drivers/usb/mtu3/mtu3_dr.c
new file mode 100644
index 000000000000..1a8987e7c5b0
--- /dev/null
+++ b/drivers/usb/mtu3/mtu3_dr.c
@@ -0,0 +1,379 @@
+/*
+ * mtu3_dr.c - dual role switch and host glue layer
+ *
+ * Copyright (C) 2016 MediaTek Inc.
+ *
+ * Author: Chunfeng Yun <chunfeng.yun@mediatek.com>
+ *
+ * This software is licensed under the terms of the GNU General Public
+ * License version 2, as published by the Free Software Foundation, and
+ * may be copied, distributed, and modified under those terms.
+ *
+ * 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.
+ *
+ */
+
+#include <linux/debugfs.h>
+#include <linux/irq.h>
+#include <linux/kernel.h>
+#include <linux/of_device.h>
+#include <linux/pinctrl/consumer.h>
+#include <linux/seq_file.h>
+#include <linux/uaccess.h>
+
+#include "mtu3.h"
+#include "mtu3_dr.h"
+
+#define USB2_PORT 2
+#define USB3_PORT 3
+
+enum mtu3_vbus_id_state {
+        MTU3_ID_FLOAT = 1,
+        MTU3_ID_GROUND,
+        MTU3_VBUS_OFF,
+        MTU3_VBUS_VALID,
+};
+
+static void toggle_opstate(struct ssusb_mtk *ssusb)
+{
+        if (!ssusb->otg_switch.is_u3_drd) {
+                mtu3_setbits(ssusb->mac_base, U3D_DEVICE_CONTROL, DC_SESSION);
+                mtu3_setbits(ssusb->mac_base, U3D_POWER_MANAGEMENT, SOFT_CONN);
+        }
+}
+
+/* only port0 supports dual-role mode */
+static int ssusb_port0_switch(struct ssusb_mtk *ssusb,
+        int version, bool tohost)
+{
+        void __iomem *ibase = ssusb->ippc_base;
+        u32 value;
+
+        dev_dbg(ssusb->dev, "%s (switch u%d port0 to %s)\n", __func__,
+                version, tohost ? "host" : "device");
+
+        if (version == USB2_PORT) {
+                /* 1. power off and disable u2 port0 */
+                value = mtu3_readl(ibase, SSUSB_U2_CTRL(0));
+                value |= SSUSB_U2_PORT_PDN | SSUSB_U2_PORT_DIS;
+                mtu3_writel(ibase, SSUSB_U2_CTRL(0), value);
+
+                /* 2. power on, enable u2 port0 and select its mode */
+                value = mtu3_readl(ibase, SSUSB_U2_CTRL(0));
+                value &= ~(SSUSB_U2_PORT_PDN | SSUSB_U2_PORT_DIS);
+                value = tohost ? (value | SSUSB_U2_PORT_HOST_SEL) :
+                        (value & (~SSUSB_U2_PORT_HOST_SEL));
+                mtu3_writel(ibase, SSUSB_U2_CTRL(0), value);
+        } else {
+                /* 1. power off and disable u3 port0 */
+                value = mtu3_readl(ibase, SSUSB_U3_CTRL(0));
+                value |= SSUSB_U3_PORT_PDN | SSUSB_U3_PORT_DIS;
+                mtu3_writel(ibase, SSUSB_U3_CTRL(0), value);
+
+                /* 2. power on, enable u3 port0 and select its mode */
+                value = mtu3_readl(ibase, SSUSB_U3_CTRL(0));
+                value &= ~(SSUSB_U3_PORT_PDN | SSUSB_U3_PORT_DIS);
+                value = tohost ? (value | SSUSB_U3_PORT_HOST_SEL) :
+                        (value & (~SSUSB_U3_PORT_HOST_SEL));
+                mtu3_writel(ibase, SSUSB_U3_CTRL(0), value);
+        }
+
+        return 0;
+}
+
+static void switch_port_to_host(struct ssusb_mtk *ssusb)
+{
+        u32 check_clk = 0;
+
+        dev_dbg(ssusb->dev, "%s\n", __func__);
+
+        ssusb_port0_switch(ssusb, USB2_PORT, true);
+
+        if (ssusb->otg_switch.is_u3_drd) {
+                ssusb_port0_switch(ssusb, USB3_PORT, true);
+                check_clk = SSUSB_U3_MAC_RST_B_STS;
+        }
+
+        ssusb_check_clocks(ssusb, check_clk);
+
+        /* after all clocks are stable */
+        toggle_opstate(ssusb);
+}
+
+static void switch_port_to_device(struct ssusb_mtk *ssusb)
+{
+        u32 check_clk = 0;
+
+        dev_dbg(ssusb->dev, "%s\n", __func__);
+
+        ssusb_port0_switch(ssusb, USB2_PORT, false);
+
+        if (ssusb->otg_switch.is_u3_drd) {
+                ssusb_port0_switch(ssusb, USB3_PORT, false);
+                check_clk = SSUSB_U3_MAC_RST_B_STS;
+        }
+
+        ssusb_check_clocks(ssusb, check_clk);
+}
+
+int ssusb_set_vbus(struct otg_switch_mtk *otg_sx, int is_on)
+{
+        struct ssusb_mtk *ssusb =
+                container_of(otg_sx, struct ssusb_mtk, otg_switch);
+        struct regulator *vbus = otg_sx->vbus;
+        int ret;
+
+        /* vbus is optional */
+        if (!vbus)
+                return 0;
+
+        dev_dbg(ssusb->dev, "%s: turn %s\n", __func__, is_on ? "on" : "off");
+
+        if (is_on) {
+                ret = regulator_enable(vbus);
+                if (ret) {
+                        dev_err(ssusb->dev, "vbus regulator enable failed\n");
+                        return ret;
+                }
+        } else {
+                regulator_disable(vbus);
+        }
+
+        return 0;
+}
+
+/*
+ * switch to host: -> MTU3_VBUS_OFF --> MTU3_ID_GROUND
+ * switch to device: -> MTU3_ID_FLOAT --> MTU3_VBUS_VALID
+ */
+static void ssusb_set_mailbox(struct otg_switch_mtk *otg_sx,
+        enum mtu3_vbus_id_state status)
+{
+        struct ssusb_mtk *ssusb =
+                container_of(otg_sx, struct ssusb_mtk, otg_switch);
+        struct mtu3 *mtu = ssusb->u3d;
+
+        dev_dbg(ssusb->dev, "mailbox state(%d)\n", status);
+
+        switch (status) {
+        case MTU3_ID_GROUND:
+                switch_port_to_host(ssusb);
+                ssusb_set_vbus(otg_sx, 1);
+                ssusb->is_host = true;
+                break;
+        case MTU3_ID_FLOAT:
+                ssusb->is_host = false;
+                ssusb_set_vbus(otg_sx, 0);
+                switch_port_to_device(ssusb);
+                break;
+        case MTU3_VBUS_OFF:
+                mtu3_stop(mtu);
+                pm_relax(ssusb->dev);
+                break;
+        case MTU3_VBUS_VALID:
+                /* avoid suspend when works as device */
+                pm_stay_awake(ssusb->dev);
+                mtu3_start(mtu);
+                break;
+        default:
+                dev_err(ssusb->dev, "invalid state\n");
+        }
+}
+
+static int ssusb_id_notifier(struct notifier_block *nb,
+        unsigned long event, void *ptr)
+{
+        struct otg_switch_mtk *otg_sx =
+                container_of(nb, struct otg_switch_mtk, id_nb);
+
+        if (event)
+                ssusb_set_mailbox(otg_sx, MTU3_ID_GROUND);
+        else
+                ssusb_set_mailbox(otg_sx, MTU3_ID_FLOAT);
+
+        return NOTIFY_DONE;
+}
+
+static int ssusb_vbus_notifier(struct notifier_block *nb,
+        unsigned long event, void *ptr)
+{
+        struct otg_switch_mtk *otg_sx =
+                container_of(nb, struct otg_switch_mtk, vbus_nb);
+
+        if (event)
+                ssusb_set_mailbox(otg_sx, MTU3_VBUS_VALID);
+        else
+                ssusb_set_mailbox(otg_sx, MTU3_VBUS_OFF);
+
+        return NOTIFY_DONE;
+}
+
+static int ssusb_extcon_register(struct otg_switch_mtk *otg_sx)
+{
+        struct ssusb_mtk *ssusb =
+                container_of(otg_sx, struct ssusb_mtk, otg_switch);
+        struct extcon_dev *edev = otg_sx->edev;
+        int ret;
+
+        /* extcon is optional */
+        if (!edev)
+                return 0;
+
+        otg_sx->vbus_nb.notifier_call = ssusb_vbus_notifier;
+        ret = extcon_register_notifier(edev, EXTCON_USB,
+                                        &otg_sx->vbus_nb);
+        if (ret < 0)
+                dev_err(ssusb->dev, "failed to register notifier for USB\n");
+
+        otg_sx->id_nb.notifier_call = ssusb_id_notifier;
+        ret = extcon_register_notifier(edev, EXTCON_USB_HOST,
+                                        &otg_sx->id_nb);
+        if (ret < 0)
+                dev_err(ssusb->dev, "failed to register notifier for USB-HOST\n");
+
+        dev_dbg(ssusb->dev, "EXTCON_USB: %d, EXTCON_USB_HOST: %d\n",
+                extcon_get_cable_state_(edev, EXTCON_USB),
+                extcon_get_cable_state_(edev, EXTCON_USB_HOST));
+
+        /* default as host, switch to device mode if needed */
+        if (extcon_get_cable_state_(edev, EXTCON_USB_HOST) == false)
+                ssusb_set_mailbox(otg_sx, MTU3_ID_FLOAT);
+        if (extcon_get_cable_state_(edev, EXTCON_USB) == true)
+                ssusb_set_mailbox(otg_sx, MTU3_VBUS_VALID);
+
+        return 0;
+}
+
+static void extcon_register_dwork(struct work_struct *work)
+{
+        struct delayed_work *dwork = to_delayed_work(work);
+        struct otg_switch_mtk *otg_sx =
+            container_of(dwork, struct otg_switch_mtk, extcon_reg_dwork);
+
+        ssusb_extcon_register(otg_sx);
+}
+
+/*
+ * We provide an interface via debugfs to switch between host and device modes
+ * depending on user input.
+ * This is useful in special cases, such as uses TYPE-A receptacle but also
+ * wants to support dual-role mode.
+ * It generates cable state changes by pulling up/down IDPIN and
+ * notifies driver to switch mode by "extcon-usb-gpio".
+ * NOTE: when use MICRO receptacle, should not enable this interface.
+ */
+static void ssusb_mode_manual_switch(struct ssusb_mtk *ssusb, int to_host)
+{
+        struct otg_switch_mtk *otg_sx = &ssusb->otg_switch;
+
+        if (to_host)
+                pinctrl_select_state(otg_sx->id_pinctrl, otg_sx->id_ground);
+        else
+                pinctrl_select_state(otg_sx->id_pinctrl, otg_sx->id_float);
+}
+
+
+static int ssusb_mode_show(struct seq_file *sf, void *unused)
+{
+        struct ssusb_mtk *ssusb = sf->private;
+
+        seq_printf(sf, "current mode: %s(%s drd)\n(echo device/host)\n",
+                ssusb->is_host ? "host" : "device",
+                ssusb->otg_switch.manual_drd_enabled ? "manual" : "auto");
+
+        return 0;
+}
+
+static int ssusb_mode_open(struct inode *inode, struct file *file)
+{
+        return single_open(file, ssusb_mode_show, inode->i_private);
+}
+
+static ssize_t ssusb_mode_write(struct file *file,
+        const char __user *ubuf, size_t count, loff_t *ppos)
+{
+        struct seq_file *sf = file->private_data;
+        struct ssusb_mtk *ssusb = sf->private;
+        char buf[16];
+
+        if (copy_from_user(&buf, ubuf, min_t(size_t, sizeof(buf) - 1, count)))
+                return -EFAULT;
+
+        if (!strncmp(buf, "host", 4) && !ssusb->is_host) {
+                ssusb_mode_manual_switch(ssusb, 1);
+        } else if (!strncmp(buf, "device", 6) && ssusb->is_host) {
+                ssusb_mode_manual_switch(ssusb, 0);
+        } else {
+                dev_err(ssusb->dev, "wrong or duplicated setting\n");
+                return -EINVAL;
+        }
+
+        return count;
+}
+
+static const struct file_operations ssusb_mode_fops = {
+        .open = ssusb_mode_open,
+        .write = ssusb_mode_write,
+        .read = seq_read,
+        .llseek = seq_lseek,
+        .release = single_release,
+};
+
+static void ssusb_debugfs_init(struct ssusb_mtk *ssusb)
+{
+        struct dentry *root;
+        struct dentry *file;
+
+        root = debugfs_create_dir(dev_name(ssusb->dev), usb_debug_root);
+        if (IS_ERR_OR_NULL(root)) {
+                if (!root)
+                        dev_err(ssusb->dev, "create debugfs root failed\n");
+                return;
+        }
+        ssusb->dbgfs_root = root;
+
+        file = debugfs_create_file("mode", S_IRUGO | S_IWUSR, root,
+                        ssusb, &ssusb_mode_fops);
+        if (!file)
+                dev_dbg(ssusb->dev, "create debugfs mode failed\n");
+}
+
+static void ssusb_debugfs_exit(struct ssusb_mtk *ssusb)
+{
+        debugfs_remove_recursive(ssusb->dbgfs_root);
+}
+
+int ssusb_otg_switch_init(struct ssusb_mtk *ssusb)
+{
+        struct otg_switch_mtk *otg_sx = &ssusb->otg_switch;
+
+        INIT_DELAYED_WORK(&otg_sx->extcon_reg_dwork, extcon_register_dwork);
+
+        if (otg_sx->manual_drd_enabled)
+                ssusb_debugfs_init(ssusb);
+
+        /* It is enough to delay 1s for waiting for host initialization */
+        schedule_delayed_work(&otg_sx->extcon_reg_dwork, HZ);
+
+        return 0;
+}
+
+void ssusb_otg_switch_exit(struct ssusb_mtk *ssusb)
+{
+        struct otg_switch_mtk *otg_sx = &ssusb->otg_switch;
+
+        cancel_delayed_work(&otg_sx->extcon_reg_dwork);
+
+        if (otg_sx->edev) {
+                extcon_unregister_notifier(otg_sx->edev,
+                        EXTCON_USB, &otg_sx->vbus_nb);
+                extcon_unregister_notifier(otg_sx->edev,
+                        EXTCON_USB_HOST, &otg_sx->id_nb);
+        }
+
+        if (otg_sx->manual_drd_enabled)
+                ssusb_debugfs_exit(ssusb);
+}
diff --git a/drivers/usb/mtu3/mtu3_dr.h b/drivers/usb/mtu3/mtu3_dr.h
new file mode 100644
index 000000000000..9b228b5811b0
--- /dev/null
+++ b/drivers/usb/mtu3/mtu3_dr.h
@@ -0,0 +1,108 @@
+/*
+ * mtu3_dr.h - dual role switch and host glue layer header
+ *
+ * Copyright (C) 2016 MediaTek Inc.
+ *
+ * Author: Chunfeng Yun <chunfeng.yun@mediatek.com>
+ *
+ * This software is licensed under the terms of the GNU General Public
+ * License version 2, as published by the Free Software Foundation, and
+ * may be copied, distributed, and modified under those terms.
+ *
+ * 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 _MTU3_DR_H_
+#define _MTU3_DR_H_
+
+#if IS_ENABLED(CONFIG_USB_MTU3_HOST) || IS_ENABLED(CONFIG_USB_MTU3_DUAL_ROLE)
+
+int ssusb_host_init(struct ssusb_mtk *ssusb, struct device_node *parent_dn);
+void ssusb_host_exit(struct ssusb_mtk *ssusb);
+int ssusb_wakeup_of_property_parse(struct ssusb_mtk *ssusb,
+                                struct device_node *dn);
+int ssusb_host_enable(struct ssusb_mtk *ssusb);
+int ssusb_host_disable(struct ssusb_mtk *ssusb, bool suspend);
+int ssusb_wakeup_enable(struct ssusb_mtk *ssusb);
+void ssusb_wakeup_disable(struct ssusb_mtk *ssusb);
+
+#else
+
+static inline int ssusb_host_init(struct ssusb_mtk *ssusb,
+
+        struct device_node *parent_dn)
+{
+        return 0;
+}
+
+static inline void ssusb_host_exit(struct ssusb_mtk *ssusb)
+{}
+
+static inline int ssusb_wakeup_of_property_parse(
+        struct ssusb_mtk *ssusb, struct device_node *dn)
+{
+        return 0;
+}
+
+static inline int ssusb_host_enable(struct ssusb_mtk *ssusb)
+{
+        return 0;
+}
+
+static inline int ssusb_host_disable(struct ssusb_mtk *ssusb, bool suspend)
+{
+        return 0;
+}
+
+static inline int ssusb_wakeup_enable(struct ssusb_mtk *ssusb)
+{
+        return 0;
+}
+
+static inline void ssusb_wakeup_disable(struct ssusb_mtk *ssusb)
+{}
+
+#endif
+
+
+#if IS_ENABLED(CONFIG_USB_MTU3_GADGET) || IS_ENABLED(CONFIG_USB_MTU3_DUAL_ROLE)
+int ssusb_gadget_init(struct ssusb_mtk *ssusb);
+void ssusb_gadget_exit(struct ssusb_mtk *ssusb);
+#else
+static inline int ssusb_gadget_init(struct ssusb_mtk *ssusb)
+{
+        return 0;
+}
+
+static inline void ssusb_gadget_exit(struct ssusb_mtk *ssusb)
+{}
+#endif
+
+
+#if IS_ENABLED(CONFIG_USB_MTU3_DUAL_ROLE)
+int ssusb_otg_switch_init(struct ssusb_mtk *ssusb);
+void ssusb_otg_switch_exit(struct ssusb_mtk *ssusb);
+int ssusb_set_vbus(struct otg_switch_mtk *otg_sx, int is_on);
+
+#else
+
+static inline int ssusb_otg_switch_init(struct ssusb_mtk *ssusb)
+{
+        return 0;
+}
+
+static inline void ssusb_otg_switch_exit(struct ssusb_mtk *ssusb)
+{}
+
+static inline int ssusb_set_vbus(struct otg_switch_mtk *otg_sx, int is_on)
+{
+        return 0;
+}
+
+#endif
+
+#endif          /* _MTU3_DR_H_ */
diff --git a/drivers/usb/mtu3/mtu3_gadget.c b/drivers/usb/mtu3/mtu3_gadget.c
new file mode 100644
index 000000000000..9dd2441b4fa1
--- /dev/null
+++ b/drivers/usb/mtu3/mtu3_gadget.c
@@ -0,0 +1,730 @@
+/*
+ * mtu3_gadget.c - MediaTek usb3 DRD peripheral support
+ *
+ * Copyright (C) 2016 MediaTek Inc.
+ *
+ * Author: Chunfeng Yun <chunfeng.yun@mediatek.com>
+ *
+ * This software is licensed under the terms of the GNU General Public
+ * License version 2, as published by the Free Software Foundation, and
+ * may be copied, distributed, and modified under those terms.
+ *
+ * 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.
+ *
+ */
+
+#include "mtu3.h"
+
+void mtu3_req_complete(struct mtu3_ep *mep,
+                     struct usb_request *req, int status)
+__releases(mep->mtu->lock)
+__acquires(mep->mtu->lock)
+{
+        struct mtu3_request *mreq;
+        struct mtu3 *mtu;
+        int busy = mep->busy;
+
+        mreq = to_mtu3_request(req);
+        list_del(&mreq->list);
+        if (mreq->request.status == -EINPROGRESS)
+                mreq->request.status = status;
+
+        mtu = mreq->mtu;
+        mep->busy = 1;
+        spin_unlock(&mtu->lock);
+
+        /* ep0 makes use of PIO, needn't unmap it */
+        if (mep->epnum)
+                usb_gadget_unmap_request(&mtu->g, req, mep->is_in);
+
+        dev_dbg(mtu->dev, "%s complete req: %p, sts %d, %d/%d\n", mep->name,
+                req, req->status, mreq->request.actual, mreq->request.length);
+
+        usb_gadget_giveback_request(&mep->ep, &mreq->request);
+
+        spin_lock(&mtu->lock);
+        mep->busy = busy;
+}
+
+static void nuke(struct mtu3_ep *mep, const int status)
+{
+        struct mtu3_request *mreq = NULL;
+
+        mep->busy = 1;
+        if (list_empty(&mep->req_list))
+                return;
+
+        dev_dbg(mep->mtu->dev, "abort %s's req: sts %d\n", mep->name, status);
+
+        /* exclude EP0 */
+        if (mep->epnum)
+                mtu3_qmu_flush(mep);
+
+        while (!list_empty(&mep->req_list)) {
+                mreq = list_first_entry(&mep->req_list,
+                                        struct mtu3_request, list);
+                mtu3_req_complete(mep, &mreq->request, status);
+        }
+}
+
+static int mtu3_ep_enable(struct mtu3_ep *mep)
+{
+        const struct usb_endpoint_descriptor *desc;
+        const struct usb_ss_ep_comp_descriptor *comp_desc;
+        struct mtu3 *mtu = mep->mtu;
+        u32 interval = 0;
+        u32 mult = 0;
+        u32 burst = 0;
+        int max_packet;
+        int ret;
+
+        desc = mep->desc;
+        comp_desc = mep->comp_desc;
+        mep->type = usb_endpoint_type(desc);
+        max_packet = usb_endpoint_maxp(desc);
+        mep->maxp = max_packet & GENMASK(10, 0);
+
+        switch (mtu->g.speed) {
+        case USB_SPEED_SUPER:
+                if (usb_endpoint_xfer_int(desc) ||
+                                usb_endpoint_xfer_isoc(desc)) {
+                        interval = desc->bInterval;
+                        interval = clamp_val(interval, 1, 16) - 1;
+                        if (usb_endpoint_xfer_isoc(desc) && comp_desc)
+                                mult = comp_desc->bmAttributes;
+                }
+                if (comp_desc)
+                        burst = comp_desc->bMaxBurst;
+
+                break;
+        case USB_SPEED_HIGH:
+                if (usb_endpoint_xfer_isoc(desc) ||
+                                usb_endpoint_xfer_int(desc)) {
+                        interval = desc->bInterval;
+                        interval = clamp_val(interval, 1, 16) - 1;
+                        burst = (max_packet & GENMASK(12, 11)) >> 11;
+                }
+                break;
+        default:
+                break; /*others are ignored */
+        }
+
+        dev_dbg(mtu->dev, "%s maxp:%d, interval:%d, burst:%d, mult:%d\n",
+                __func__, mep->maxp, interval, burst, mult);
+
+        mep->ep.maxpacket = mep->maxp;
+        mep->ep.desc = desc;
+        mep->ep.comp_desc = comp_desc;
+
+        /* slot mainly affects bulk/isoc transfer, so ignore int */
+        mep->slot = usb_endpoint_xfer_int(desc) ? 0 : mtu->slot;
+
+        ret = mtu3_config_ep(mtu, mep, interval, burst, mult);
+        if (ret < 0)
+                return ret;
+
+        ret = mtu3_gpd_ring_alloc(mep);
+        if (ret < 0) {
+                mtu3_deconfig_ep(mtu, mep);
+                return ret;
+        }
+
+        mtu3_qmu_start(mep);
+
+        return 0;
+}
+
+static int mtu3_ep_disable(struct mtu3_ep *mep)
+{
+        struct mtu3 *mtu = mep->mtu;
+
+        mtu3_qmu_stop(mep);
+
+        /* abort all pending requests */
+        nuke(mep, -ESHUTDOWN);
+        mtu3_deconfig_ep(mtu, mep);
+        mtu3_gpd_ring_free(mep);
+
+        mep->desc = NULL;
+        mep->ep.desc = NULL;
+        mep->comp_desc = NULL;
+        mep->type = 0;
+        mep->flags = 0;
+
+        return 0;
+}
+
+static int mtu3_gadget_ep_enable(struct usb_ep *ep,
+                const struct usb_endpoint_descriptor *desc)
+{
+        struct mtu3_ep *mep;
+        struct mtu3 *mtu;
+        unsigned long flags;
+        int ret = -EINVAL;
+
+        if (!ep || !desc || desc->bDescriptorType != USB_DT_ENDPOINT) {
+                pr_debug("%s invalid parameters\n", __func__);
+                return -EINVAL;
+        }
+
+        if (!desc->wMaxPacketSize) {
+                pr_debug("%s missing wMaxPacketSize\n", __func__);
+                return -EINVAL;
+        }
+        mep = to_mtu3_ep(ep);
+        mtu = mep->mtu;
+
+        /* check ep number and direction against endpoint */
+        if (usb_endpoint_num(desc) != mep->epnum)
+                return -EINVAL;
+
+        if (!!usb_endpoint_dir_in(desc) ^ !!mep->is_in)
+                return -EINVAL;
+
+        dev_dbg(mtu->dev, "%s %s\n", __func__, ep->name);
+
+        if (mep->flags & MTU3_EP_ENABLED) {
+                dev_WARN_ONCE(mtu->dev, true, "%s is already enabled\n",
+                                mep->name);
+                return 0;
+        }
+
+        spin_lock_irqsave(&mtu->lock, flags);
+        mep->desc = desc;
+        mep->comp_desc = ep->comp_desc;
+
+        ret = mtu3_ep_enable(mep);
+        if (ret)
+                goto error;
+
+        mep->busy = 0;
+        mep->wedged = 0;
+        mep->flags |= MTU3_EP_ENABLED;
+        mtu->active_ep++;
+
+error:
+        spin_unlock_irqrestore(&mtu->lock, flags);
+
+        dev_dbg(mtu->dev, "%s active_ep=%d\n", __func__, mtu->active_ep);
+
+        return ret;
+}
+
+static int mtu3_gadget_ep_disable(struct usb_ep *ep)
+{
+        struct mtu3_ep *mep = to_mtu3_ep(ep);
+        struct mtu3 *mtu = mep->mtu;
+        unsigned long flags;
+
+        dev_dbg(mtu->dev, "%s %s\n", __func__, mep->name);
+
+        if (!(mep->flags & MTU3_EP_ENABLED)) {
+                dev_warn(mtu->dev, "%s is already disabled\n", mep->name);
+                return 0;
+        }
+
+        spin_lock_irqsave(&mtu->lock, flags);
+        mtu3_ep_disable(mep);
+        mep->flags &= ~MTU3_EP_ENABLED;
+        mtu->active_ep--;
+        spin_unlock_irqrestore(&(mtu->lock), flags);
+
+        dev_dbg(mtu->dev, "%s active_ep=%d, mtu3 is_active=%d\n",
+                __func__, mtu->active_ep, mtu->is_active);
+
+        return 0;
+}
+
+struct usb_request *mtu3_alloc_request(struct usb_ep *ep, gfp_t gfp_flags)
+{
+        struct mtu3_ep *mep = to_mtu3_ep(ep);
+        struct mtu3_request *mreq;
+
+        mreq = kzalloc(sizeof(*mreq), gfp_flags);
+        if (!mreq)
+                return NULL;
+
+        mreq->request.dma = DMA_ADDR_INVALID;
+        mreq->epnum = mep->epnum;
+        mreq->mep = mep;
+
+        return &mreq->request;
+}
+
+void mtu3_free_request(struct usb_ep *ep, struct usb_request *req)
+{
+        kfree(to_mtu3_request(req));
+}
+
+static int mtu3_gadget_queue(struct usb_ep *ep,
+                struct usb_request *req, gfp_t gfp_flags)
+{
+        struct mtu3_ep *mep;
+        struct mtu3_request *mreq;
+        struct mtu3 *mtu;
+        unsigned long flags;
+        int ret = 0;
+
+        if (!ep || !req)
+                return -EINVAL;
+
+        if (!req->buf)
+                return -ENODATA;
+
+        mep = to_mtu3_ep(ep);
+        mtu = mep->mtu;
+        mreq = to_mtu3_request(req);
+        mreq->mtu = mtu;
+
+        if (mreq->mep != mep)
+                return -EINVAL;
+
+        dev_dbg(mtu->dev, "%s %s EP%d(%s), req=%p, maxp=%d, len#%d\n",
+                __func__, mep->is_in ? "TX" : "RX", mreq->epnum, ep->name,
+                mreq, ep->maxpacket, mreq->request.length);
+
+        if (req->length > GPD_BUF_SIZE) {
+                dev_warn(mtu->dev,
+                        "req length > supported MAX:%d requested:%d\n",
+                        GPD_BUF_SIZE, req->length);
+                return -EOPNOTSUPP;
+        }
+
+        /* don't queue if the ep is down */
+        if (!mep->desc) {
+                dev_dbg(mtu->dev, "req=%p queued to %s while it's disabled\n",
+                        req, ep->name);
+                return -ESHUTDOWN;
+        }
+
+        mreq->request.actual = 0;
+        mreq->request.status = -EINPROGRESS;
+
+        ret = usb_gadget_map_request(&mtu->g, req, mep->is_in);
+        if (ret) {
+                dev_err(mtu->dev, "dma mapping failed\n");
+                return ret;
+        }
+
+        spin_lock_irqsave(&mtu->lock, flags);
+
+        if (mtu3_prepare_transfer(mep)) {
+                ret = -EAGAIN;
+                goto error;
+        }
+
+        list_add_tail(&mreq->list, &mep->req_list);
+        mtu3_insert_gpd(mep, mreq);
+        mtu3_qmu_resume(mep);
+
+error:
+        spin_unlock_irqrestore(&mtu->lock, flags);
+
+        return ret;
+}
+
+static int mtu3_gadget_dequeue(struct usb_ep *ep, struct usb_request *req)
+{
+        struct mtu3_ep *mep = to_mtu3_ep(ep);
+        struct mtu3_request *mreq = to_mtu3_request(req);
+        struct mtu3_request *r;
+        unsigned long flags;
+        int ret = 0;
+        struct mtu3 *mtu = mep->mtu;
+
+        if (!ep || !req || mreq->mep != mep)
+                return -EINVAL;
+
+        dev_dbg(mtu->dev, "%s : req=%p\n", __func__, req);
+
+        spin_lock_irqsave(&mtu->lock, flags);
+
+        list_for_each_entry(r, &mep->req_list, list) {
+                if (r == mreq)
+                        break;
+        }
+        if (r != mreq) {
+                dev_dbg(mtu->dev, "req=%p not queued to %s\n", req, ep->name);
+                ret = -EINVAL;
+                goto done;
+        }
+
+        mtu3_qmu_flush(mep);  /* REVISIT: set BPS ?? */
+        mtu3_req_complete(mep, req, -ECONNRESET);
+        mtu3_qmu_start(mep);
+
+done:
+        spin_unlock_irqrestore(&mtu->lock, flags);
+
+        return ret;
+}
+
+/*
+ * Set or clear the halt bit of an EP.
+ * A halted EP won't TX/RX any data but will queue requests.
+ */
+static int mtu3_gadget_ep_set_halt(struct usb_ep *ep, int value)
+{
+        struct mtu3_ep *mep = to_mtu3_ep(ep);
+        struct mtu3 *mtu = mep->mtu;
+        struct mtu3_request *mreq;
+        unsigned long flags;
+        int ret = 0;
+
+        if (!ep)
+                return -EINVAL;
+
+        dev_dbg(mtu->dev, "%s : %s...", __func__, ep->name);
+
+        spin_lock_irqsave(&mtu->lock, flags);
+
+        if (mep->type == USB_ENDPOINT_XFER_ISOC) {
+                ret = -EINVAL;
+                goto done;
+        }
+
+        mreq = next_request(mep);
+        if (value) {
+                /*
+                 * If there is not request for TX-EP, QMU will not transfer
+                 * data to TX-FIFO, so no need check whether TX-FIFO
+                 * holds bytes or not here
+                 */
+                if (mreq) {
+                        dev_dbg(mtu->dev, "req in progress, cannot halt %s\n",
+                                ep->name);
+                        ret = -EAGAIN;
+                        goto done;
+                }
+        } else {
+                mep->wedged = 0;
+        }
+
+        dev_dbg(mtu->dev, "%s %s stall\n", ep->name, value ? "set" : "clear");
+
+        mtu3_ep_stall_set(mep, value);
+
+done:
+        spin_unlock_irqrestore(&mtu->lock, flags);
+
+        return ret;
+}
+
+/* Sets the halt feature with the clear requests ignored */
+static int mtu3_gadget_ep_set_wedge(struct usb_ep *ep)
+{
+        struct mtu3_ep *mep = to_mtu3_ep(ep);
+
+        if (!ep)
+                return -EINVAL;
+
+        mep->wedged = 1;
+
+        return usb_ep_set_halt(ep);
+}
+
+static const struct usb_ep_ops mtu3_ep_ops = {
+        .enable = mtu3_gadget_ep_enable,
+        .disable = mtu3_gadget_ep_disable,
+        .alloc_request = mtu3_alloc_request,
+        .free_request = mtu3_free_request,
+        .queue = mtu3_gadget_queue,
+        .dequeue = mtu3_gadget_dequeue,
+        .set_halt = mtu3_gadget_ep_set_halt,
+        .set_wedge = mtu3_gadget_ep_set_wedge,
+};
+
+static int mtu3_gadget_get_frame(struct usb_gadget *gadget)
+{
+        struct mtu3 *mtu = gadget_to_mtu3(gadget);
+
+        return (int)mtu3_readl(mtu->mac_base, U3D_USB20_FRAME_NUM);
+}
+
+static int mtu3_gadget_wakeup(struct usb_gadget *gadget)
+{
+        struct mtu3 *mtu = gadget_to_mtu3(gadget);
+        unsigned long flags;
+
+        dev_dbg(mtu->dev, "%s\n", __func__);
+
+        /* remote wakeup feature is not enabled by host */
+        if (!mtu->may_wakeup)
+                return  -EOPNOTSUPP;
+
+        spin_lock_irqsave(&mtu->lock, flags);
+        if (mtu->g.speed == USB_SPEED_SUPER) {
+                mtu3_setbits(mtu->mac_base, U3D_LINK_POWER_CONTROL, UX_EXIT);
+        } else {
+                mtu3_setbits(mtu->mac_base, U3D_POWER_MANAGEMENT, RESUME);
+                spin_unlock_irqrestore(&mtu->lock, flags);
+                usleep_range(10000, 11000);
+                spin_lock_irqsave(&mtu->lock, flags);
+                mtu3_clrbits(mtu->mac_base, U3D_POWER_MANAGEMENT, RESUME);
+        }
+        spin_unlock_irqrestore(&mtu->lock, flags);
+        return 0;
+}
+
+static int mtu3_gadget_set_self_powered(struct usb_gadget *gadget,
+                int is_selfpowered)
+{
+        struct mtu3 *mtu = gadget_to_mtu3(gadget);
+
+        mtu->is_self_powered = !!is_selfpowered;
+        return 0;
+}
+
+static int mtu3_gadget_pullup(struct usb_gadget *gadget, int is_on)
+{
+        struct mtu3 *mtu = gadget_to_mtu3(gadget);
+        unsigned long flags;
+
+        dev_dbg(mtu->dev, "%s (%s) for %sactive device\n", __func__,
+                is_on ? "on" : "off", mtu->is_active ? "" : "in");
+
+        /* we'd rather not pullup unless the device is active. */
+        spin_lock_irqsave(&mtu->lock, flags);
+
+        is_on = !!is_on;
+        if (!mtu->is_active) {
+                /* save it for mtu3_start() to process the request */
+                mtu->softconnect = is_on;
+        } else if (is_on != mtu->softconnect) {
+                mtu->softconnect = is_on;
+                mtu3_dev_on_off(mtu, is_on);
+        }
+
+        spin_unlock_irqrestore(&mtu->lock, flags);
+
+        return 0;
+}
+
+static int mtu3_gadget_start(struct usb_gadget *gadget,
+                struct usb_gadget_driver *driver)
+{
+        struct mtu3 *mtu = gadget_to_mtu3(gadget);
+        unsigned long flags;
+
+        if (mtu->gadget_driver) {
+                dev_err(mtu->dev, "%s is already bound to %s\n",
+                        mtu->g.name, mtu->gadget_driver->driver.name);
+                return -EBUSY;
+        }
+
+        dev_dbg(mtu->dev, "bind driver %s\n", driver->function);
+
+        spin_lock_irqsave(&mtu->lock, flags);
+
+        mtu->softconnect = 0;
+        mtu->gadget_driver = driver;
+
+        if (mtu->ssusb->dr_mode == USB_DR_MODE_PERIPHERAL)
+                mtu3_start(mtu);
+
+        spin_unlock_irqrestore(&mtu->lock, flags);
+
+        return 0;
+}
+
+static void stop_activity(struct mtu3 *mtu)
+{
+        struct usb_gadget_driver *driver = mtu->gadget_driver;
+        int i;
+
+        /* don't disconnect if it's not connected */
+        if (mtu->g.speed == USB_SPEED_UNKNOWN)
+                driver = NULL;
+        else
+                mtu->g.speed = USB_SPEED_UNKNOWN;
+
+        /* deactivate the hardware */
+        if (mtu->softconnect) {
+                mtu->softconnect = 0;
+                mtu3_dev_on_off(mtu, 0);
+        }
+
+        /*
+         * killing any outstanding requests will quiesce the driver;
+         * then report disconnect
+         */
+        nuke(mtu->ep0, -ESHUTDOWN);
+        for (i = 1; i < mtu->num_eps; i++) {
+                nuke(mtu->in_eps + i, -ESHUTDOWN);
+                nuke(mtu->out_eps + i, -ESHUTDOWN);
+        }
+
+        if (driver) {
+                spin_unlock(&mtu->lock);
+                driver->disconnect(&mtu->g);
+                spin_lock(&mtu->lock);
+        }
+}
+
+static int mtu3_gadget_stop(struct usb_gadget *g)
+{
+        struct mtu3 *mtu = gadget_to_mtu3(g);
+        unsigned long flags;
+
+        dev_dbg(mtu->dev, "%s\n", __func__);
+
+        spin_lock_irqsave(&mtu->lock, flags);
+
+        stop_activity(mtu);
+        mtu->gadget_driver = NULL;
+
+        if (mtu->ssusb->dr_mode == USB_DR_MODE_PERIPHERAL)
+                mtu3_stop(mtu);
+
+        spin_unlock_irqrestore(&mtu->lock, flags);
+
+        return 0;
+}
+
+static const struct usb_gadget_ops mtu3_gadget_ops = {
+        .get_frame = mtu3_gadget_get_frame,
+        .wakeup = mtu3_gadget_wakeup,
+        .set_selfpowered = mtu3_gadget_set_self_powered,
+        .pullup = mtu3_gadget_pullup,
+        .udc_start = mtu3_gadget_start,
+        .udc_stop = mtu3_gadget_stop,
+};
+
+static void init_hw_ep(struct mtu3 *mtu, struct mtu3_ep *mep,
+                u32 epnum, u32 is_in)
+{
+        mep->epnum = epnum;
+        mep->mtu = mtu;
+        mep->is_in = is_in;
+
+        INIT_LIST_HEAD(&mep->req_list);
+
+        sprintf(mep->name, "ep%d%s", epnum,
+                !epnum ? "" : (is_in ? "in" : "out"));
+
+        mep->ep.name = mep->name;
+        INIT_LIST_HEAD(&mep->ep.ep_list);
+
+        /* initialize maxpacket as SS */
+        if (!epnum) {
+                usb_ep_set_maxpacket_limit(&mep->ep, 512);
+                mep->ep.caps.type_control = true;
+                mep->ep.ops = &mtu3_ep0_ops;
+                mtu->g.ep0 = &mep->ep;
+        } else {
+                usb_ep_set_maxpacket_limit(&mep->ep, 1024);
+                mep->ep.caps.type_iso = true;
+                mep->ep.caps.type_bulk = true;
+                mep->ep.caps.type_int = true;
+                mep->ep.ops = &mtu3_ep_ops;
+                list_add_tail(&mep->ep.ep_list, &mtu->g.ep_list);
+        }
+
+        dev_dbg(mtu->dev, "%s, name=%s, maxp=%d\n", __func__, mep->ep.name,
+                 mep->ep.maxpacket);
+
+        if (!epnum) {
+                mep->ep.caps.dir_in = true;
+                mep->ep.caps.dir_out = true;
+        } else if (is_in) {
+                mep->ep.caps.dir_in = true;
+        } else {
+                mep->ep.caps.dir_out = true;
+        }
+}
+
+static void mtu3_gadget_init_eps(struct mtu3 *mtu)
+{
+        u8 epnum;
+
+        /* initialize endpoint list just once */
+        INIT_LIST_HEAD(&(mtu->g.ep_list));
+
+        dev_dbg(mtu->dev, "%s num_eps(1 for a pair of tx&rx ep)=%d\n",
+                __func__, mtu->num_eps);
+
+        init_hw_ep(mtu, mtu->ep0, 0, 0);
+        for (epnum = 1; epnum < mtu->num_eps; epnum++) {
+                init_hw_ep(mtu, mtu->in_eps + epnum, epnum, 1);
+                init_hw_ep(mtu, mtu->out_eps + epnum, epnum, 0);
+        }
+}
+
+int mtu3_gadget_setup(struct mtu3 *mtu)
+{
+        int ret;
+
+        mtu->g.ops = &mtu3_gadget_ops;
+        mtu->g.max_speed = mtu->max_speed;
+        mtu->g.speed = USB_SPEED_UNKNOWN;
+        mtu->g.sg_supported = 0;
+        mtu->g.name = MTU3_DRIVER_NAME;
+        mtu->is_active = 0;
+
+        mtu3_gadget_init_eps(mtu);
+
+        ret = usb_add_gadget_udc(mtu->dev, &mtu->g);
+        if (ret) {
+                dev_err(mtu->dev, "failed to register udc\n");
+                return ret;
+        }
+
+        usb_gadget_set_state(&mtu->g, USB_STATE_NOTATTACHED);
+
+        return 0;
+}
+
+void mtu3_gadget_cleanup(struct mtu3 *mtu)
+{
+        usb_del_gadget_udc(&mtu->g);
+}
+
+void mtu3_gadget_resume(struct mtu3 *mtu)
+{
+        dev_dbg(mtu->dev, "gadget RESUME\n");
+        if (mtu->gadget_driver && mtu->gadget_driver->resume) {
+                spin_unlock(&mtu->lock);
+                mtu->gadget_driver->resume(&mtu->g);
+                spin_lock(&mtu->lock);
+        }
+}
+
+/* called when SOF packets stop for 3+ msec or enters U3 */
+void mtu3_gadget_suspend(struct mtu3 *mtu)
+{
+        dev_dbg(mtu->dev, "gadget SUSPEND\n");
+        if (mtu->gadget_driver && mtu->gadget_driver->suspend) {
+                spin_unlock(&mtu->lock);
+                mtu->gadget_driver->suspend(&mtu->g);
+                spin_lock(&mtu->lock);
+        }
+}
+
+/* called when VBUS drops below session threshold, and in other cases */
+void mtu3_gadget_disconnect(struct mtu3 *mtu)
+{
+        dev_dbg(mtu->dev, "gadget DISCONNECT\n");
+        if (mtu->gadget_driver && mtu->gadget_driver->disconnect) {
+                spin_unlock(&mtu->lock);
+                mtu->gadget_driver->disconnect(&mtu->g);
+                spin_lock(&mtu->lock);
+        }
+
+        usb_gadget_set_state(&mtu->g, USB_STATE_NOTATTACHED);
+}
+
+void mtu3_gadget_reset(struct mtu3 *mtu)
+{
+        dev_dbg(mtu->dev, "gadget RESET\n");
+
+        /* 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;
+}
diff --git a/drivers/usb/mtu3/mtu3_gadget_ep0.c b/drivers/usb/mtu3/mtu3_gadget_ep0.c
new file mode 100644
index 000000000000..2d7427b48775
--- /dev/null
+++ b/drivers/usb/mtu3/mtu3_gadget_ep0.c
@@ -0,0 +1,881 @@
+/*
+ * mtu3_gadget_ep0.c - MediaTek USB3 DRD peripheral driver ep0 handling
+ *
+ * Copyright (c) 2016 MediaTek Inc.
+ *
+ * Author:  Chunfeng.Yun <chunfeng.yun@mediatek.com>
+ *
+ * This software is licensed under the terms of the GNU General Public
+ * License version 2, as published by the Free Software Foundation, and
+ * may be copied, distributed, and modified under those terms.
+ *
+ * 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.
+ *
+ */
+
+#include "mtu3.h"
+
+/* ep0 is always mtu3->in_eps[0] */
+#define next_ep0_request(mtu)   next_request((mtu)->ep0)
+
+/* for high speed test mode; see USB 2.0 spec 7.1.20 */
+static const u8 mtu3_test_packet[53] = {
+        /* implicit SYNC then DATA0 to start */
+
+        /* JKJKJKJK x9 */
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        /* JJKKJJKK x8 */
+        0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
+        /* JJJJKKKK x8 */
+        0xee, 0xee, 0xee, 0xee, 0xee, 0xee, 0xee, 0xee,
+        /* JJJJJJJKKKKKKK x8 */
+        0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+        /* JJJJJJJK x8 */
+        0x7f, 0xbf, 0xdf, 0xef, 0xf7, 0xfb, 0xfd,
+        /* JKKKKKKK x10, JK */
+        0xfc, 0x7e, 0xbf, 0xdf, 0xef, 0xf7, 0xfb, 0xfd, 0x7e,
+        /* implicit CRC16 then EOP to end */
+};
+
+static char *decode_ep0_state(struct mtu3 *mtu)
+{
+        switch (mtu->ep0_state) {
+        case MU3D_EP0_STATE_SETUP:
+                return "SETUP";
+        case MU3D_EP0_STATE_TX:
+                return "IN";
+        case MU3D_EP0_STATE_RX:
+                return "OUT";
+        case MU3D_EP0_STATE_TX_END:
+                return "TX-END";
+        case MU3D_EP0_STATE_STALL:
+                return "STALL";
+        default:
+                return "??";
+        }
+}
+
+static void ep0_req_giveback(struct mtu3 *mtu, struct usb_request *req)
+{
+        mtu3_req_complete(mtu->ep0, req, 0);
+}
+
+static int
+forward_to_driver(struct mtu3 *mtu, const struct usb_ctrlrequest *setup)
+__releases(mtu->lock)
+__acquires(mtu->lock)
+{
+        int ret;
+
+        if (!mtu->gadget_driver)
+                return -EOPNOTSUPP;
+
+        spin_unlock(&mtu->lock);
+        ret = mtu->gadget_driver->setup(&mtu->g, setup);
+        spin_lock(&mtu->lock);
+
+        dev_dbg(mtu->dev, "%s ret %d\n", __func__, ret);
+        return ret;
+}
+
+static void ep0_write_fifo(struct mtu3_ep *mep, const u8 *src, u16 len)
+{
+        void __iomem *fifo = mep->mtu->mac_base + U3D_FIFO0;
+        u16 index = 0;
+
+        dev_dbg(mep->mtu->dev, "%s: ep%din, len=%d, buf=%p\n",
+                __func__, mep->epnum, len, src);
+
+        if (len >= 4) {
+                iowrite32_rep(fifo, src, len >> 2);
+                index = len & ~0x03;
+        }
+        if (len & 0x02) {
+                writew(*(u16 *)&src[index], fifo);
+                index += 2;
+        }
+        if (len & 0x01)
+                writeb(src[index], fifo);
+}
+
+static void ep0_read_fifo(struct mtu3_ep *mep, u8 *dst, u16 len)
+{
+        void __iomem *fifo = mep->mtu->mac_base + U3D_FIFO0;
+        u32 value;
+        u16 index = 0;
+
+        dev_dbg(mep->mtu->dev, "%s: ep%dout len=%d buf=%p\n",
+                 __func__, mep->epnum, len, dst);
+
+        if (len >= 4) {
+                ioread32_rep(fifo, dst, len >> 2);
+                index = len & ~0x03;
+        }
+        if (len & 0x3) {
+                value = readl(fifo);
+                memcpy(&dst[index], &value, len & 0x3);
+        }
+
+}
+
+static void ep0_load_test_packet(struct mtu3 *mtu)
+{
+        /*
+         * because the length of test packet is less than max packet of HS ep0,
+         * write it into fifo directly.
+         */
+        ep0_write_fifo(mtu->ep0, mtu3_test_packet, sizeof(mtu3_test_packet));
+}
+
+/*
+ * A. send STALL for setup transfer without data stage:
+ *              set SENDSTALL and SETUPPKTRDY at the same time;
+ * B. send STALL for other cases:
+ *              set SENDSTALL only.
+ */
+static void ep0_stall_set(struct mtu3_ep *mep0, bool set, u32 pktrdy)
+{
+        struct mtu3 *mtu = mep0->mtu;
+        void __iomem *mbase = mtu->mac_base;
+        u32 csr;
+
+        /* EP0_SENTSTALL is W1C */
+        csr = mtu3_readl(mbase, U3D_EP0CSR) & EP0_W1C_BITS;
+        if (set)
+                csr |= EP0_SENDSTALL | pktrdy;
+        else
+                csr = (csr & ~EP0_SENDSTALL) | EP0_SENTSTALL;
+        mtu3_writel(mtu->mac_base, U3D_EP0CSR, csr);
+
+        mtu->ep0_state = MU3D_EP0_STATE_SETUP;
+
+        dev_dbg(mtu->dev, "ep0: %s STALL, ep0_state: %s\n",
+                set ? "SEND" : "CLEAR", decode_ep0_state(mtu));
+}
+
+static int ep0_queue(struct mtu3_ep *mep0, struct mtu3_request *mreq);
+
+static void ep0_dummy_complete(struct usb_ep *ep, struct usb_request *req)
+{}
+
+static void ep0_set_sel_complete(struct usb_ep *ep, struct usb_request *req)
+{
+        struct mtu3_request *mreq;
+        struct mtu3 *mtu;
+        struct usb_set_sel_req sel;
+
+        memcpy(&sel, req->buf, sizeof(sel));
+
+        mreq = to_mtu3_request(req);
+        mtu = mreq->mtu;
+        dev_dbg(mtu->dev, "u1sel:%d, u1pel:%d, u2sel:%d, u2pel:%d\n",
+                sel.u1_sel, sel.u1_pel, sel.u2_sel, sel.u2_pel);
+}
+
+/* queue data stage to handle 6 byte SET_SEL request */
+static int ep0_set_sel(struct mtu3 *mtu, struct usb_ctrlrequest *setup)
+{
+        int ret;
+        u16 length = le16_to_cpu(setup->wLength);
+
+        if (unlikely(length != 6)) {
+                dev_err(mtu->dev, "%s wrong wLength:%d\n",
+                        __func__, length);
+                return -EINVAL;
+        }
+
+        mtu->ep0_req.mep = mtu->ep0;
+        mtu->ep0_req.request.length = 6;
+        mtu->ep0_req.request.buf = mtu->setup_buf;
+        mtu->ep0_req.request.complete = ep0_set_sel_complete;
+        ret = ep0_queue(mtu->ep0, &mtu->ep0_req);
+
+        return ret < 0 ? ret : 1;
+}
+
+static int
+ep0_get_status(struct mtu3 *mtu, const struct usb_ctrlrequest *setup)
+{
+        struct mtu3_ep *mep = NULL;
+        int handled = 1;
+        u8 result[2] = {0, 0};
+        u8 epnum = 0;
+        int is_in;
+
+        switch (setup->bRequestType & USB_RECIP_MASK) {
+        case USB_RECIP_DEVICE:
+                result[0] = mtu->is_self_powered << USB_DEVICE_SELF_POWERED;
+                result[0] |= mtu->may_wakeup << USB_DEVICE_REMOTE_WAKEUP;
+                /* superspeed only */
+                if (mtu->g.speed == USB_SPEED_SUPER) {
+                        result[0] |= mtu->u1_enable << USB_DEV_STAT_U1_ENABLED;
+                        result[0] |= mtu->u2_enable << USB_DEV_STAT_U2_ENABLED;
+                }
+
+                dev_dbg(mtu->dev, "%s result=%x, U1=%x, U2=%x\n", __func__,
+                        result[0], mtu->u1_enable, mtu->u2_enable);
+
+                break;
+        case USB_RECIP_INTERFACE:
+                break;
+        case USB_RECIP_ENDPOINT:
+                epnum = (u8) le16_to_cpu(setup->wIndex);
+                is_in = epnum & USB_DIR_IN;
+                epnum &= USB_ENDPOINT_NUMBER_MASK;
+
+                if (epnum >= mtu->num_eps) {
+                        handled = -EINVAL;
+                        break;
+                }
+                if (!epnum)
+                        break;
+
+                mep = (is_in ? mtu->in_eps : mtu->out_eps) + epnum;
+                if (!mep->desc) {
+                        handled = -EINVAL;
+                        break;
+                }
+                if (mep->flags & MTU3_EP_STALL)
+                        result[0] |= 1 << USB_ENDPOINT_HALT;
+
+                break;
+        default:
+                /* class, vendor, etc ... delegate */
+                handled = 0;
+                break;
+        }
+
+        if (handled > 0) {
+                int ret;
+
+                /* prepare a data stage for GET_STATUS */
+                dev_dbg(mtu->dev, "get_status=%x\n", *(u16 *)result);
+                memcpy(mtu->setup_buf, result, sizeof(result));
+                mtu->ep0_req.mep = mtu->ep0;
+                mtu->ep0_req.request.length = 2;
+                mtu->ep0_req.request.buf = &mtu->setup_buf;
+                mtu->ep0_req.request.complete = ep0_dummy_complete;
+                ret = ep0_queue(mtu->ep0, &mtu->ep0_req);
+                if (ret < 0)
+                        handled = ret;
+        }
+        return handled;
+}
+
+static int handle_test_mode(struct mtu3 *mtu, struct usb_ctrlrequest *setup)
+{
+        void __iomem *mbase = mtu->mac_base;
+        int handled = 1;
+
+        switch (le16_to_cpu(setup->wIndex) >> 8) {
+        case TEST_J:
+                dev_dbg(mtu->dev, "TEST_J\n");
+                mtu->test_mode_nr = TEST_J_MODE;
+                break;
+        case TEST_K:
+                dev_dbg(mtu->dev, "TEST_K\n");
+                mtu->test_mode_nr = TEST_K_MODE;
+                break;
+        case TEST_SE0_NAK:
+                dev_dbg(mtu->dev, "TEST_SE0_NAK\n");
+                mtu->test_mode_nr = TEST_SE0_NAK_MODE;
+                break;
+        case TEST_PACKET:
+                dev_dbg(mtu->dev, "TEST_PACKET\n");
+                mtu->test_mode_nr = TEST_PACKET_MODE;
+                break;
+        default:
+                handled = -EINVAL;
+                goto out;
+        }
+
+        mtu->test_mode = true;
+
+        /* no TX completion interrupt, and need restart platform after test */
+        if (mtu->test_mode_nr == TEST_PACKET_MODE)
+                ep0_load_test_packet(mtu);
+
+        mtu3_writel(mbase, U3D_USB2_TEST_MODE, mtu->test_mode_nr);
+
+        mtu->ep0_state = MU3D_EP0_STATE_SETUP;
+
+out:
+        return handled;
+}
+
+static int ep0_handle_feature_dev(struct mtu3 *mtu,
+                struct usb_ctrlrequest *setup, bool set)
+{
+        void __iomem *mbase = mtu->mac_base;
+        int handled = -EINVAL;
+        u32 lpc;
+
+        switch (le16_to_cpu(setup->wValue)) {
+        case USB_DEVICE_REMOTE_WAKEUP:
+                mtu->may_wakeup = !!set;
+                handled = 1;
+                break;
+        case USB_DEVICE_TEST_MODE:
+                if (!set || (mtu->g.speed != USB_SPEED_HIGH) ||
+                        (le16_to_cpu(setup->wIndex) & 0xff))
+                        break;
+
+                handled = handle_test_mode(mtu, setup);
+                break;
+        case USB_DEVICE_U1_ENABLE:
+                if (mtu->g.speed != USB_SPEED_SUPER ||
+                        mtu->g.state != USB_STATE_CONFIGURED)
+                        break;
+
+                lpc = mtu3_readl(mbase, U3D_LINK_POWER_CONTROL);
+                if (set)
+                        lpc |= SW_U1_ACCEPT_ENABLE;
+                else
+                        lpc &= ~SW_U1_ACCEPT_ENABLE;
+                mtu3_writel(mbase, U3D_LINK_POWER_CONTROL, lpc);
+
+                mtu->u1_enable = !!set;
+                handled = 1;
+                break;
+        case USB_DEVICE_U2_ENABLE:
+                if (mtu->g.speed != USB_SPEED_SUPER ||
+                        mtu->g.state != USB_STATE_CONFIGURED)
+                        break;
+
+                lpc = mtu3_readl(mbase, U3D_LINK_POWER_CONTROL);
+                if (set)
+                        lpc |= SW_U2_ACCEPT_ENABLE;
+                else
+                        lpc &= ~SW_U2_ACCEPT_ENABLE;
+                mtu3_writel(mbase, U3D_LINK_POWER_CONTROL, lpc);
+
+                mtu->u2_enable = !!set;
+                handled = 1;
+                break;
+        default:
+                handled = -EINVAL;
+                break;
+        }
+        return handled;
+}
+
+static int ep0_handle_feature(struct mtu3 *mtu,
+                struct usb_ctrlrequest *setup, bool set)
+{
+        struct mtu3_ep *mep;
+        int handled = -EINVAL;
+        int is_in;
+        u16 value;
+        u16 index;
+        u8 epnum;
+
+        value = le16_to_cpu(setup->wValue);
+        index = le16_to_cpu(setup->wIndex);
+
+        switch (setup->bRequestType & USB_RECIP_MASK) {
+        case USB_RECIP_DEVICE:
+                handled = ep0_handle_feature_dev(mtu, setup, set);
+                break;
+        case USB_RECIP_INTERFACE:
+                /* superspeed only */
+                if ((value == USB_INTRF_FUNC_SUSPEND)
+                        && (mtu->g.speed == USB_SPEED_SUPER)) {
+                        /*
+                         * forward the request because function drivers
+                         * should handle it
+                         */
+                        handled = 0;
+                }
+                break;
+        case USB_RECIP_ENDPOINT:
+                epnum = index & USB_ENDPOINT_NUMBER_MASK;
+                if (epnum == 0 || epnum >= mtu->num_eps ||
+                        value != USB_ENDPOINT_HALT)
+                        break;
+
+                is_in = index & USB_DIR_IN;
+                mep = (is_in ? mtu->in_eps : mtu->out_eps) + epnum;
+                if (!mep->desc)
+                        break;
+
+                handled = 1;
+                /* ignore request if endpoint is wedged */
+                if (mep->wedged)
+                        break;
+
+                mtu3_ep_stall_set(mep, set);
+                break;
+        default:
+                /* class, vendor, etc ... delegate */
+                handled = 0;
+                break;
+        }
+        return handled;
+}
+
+/*
+ * handle all control requests can be handled
+ * returns:
+ *      negative errno - error happened
+ *      zero - need delegate SETUP to gadget driver
+ *      positive - already handled
+ */
+static int handle_standard_request(struct mtu3 *mtu,
+                          struct usb_ctrlrequest *setup)
+{
+        void __iomem *mbase = mtu->mac_base;
+        enum usb_device_state state = mtu->g.state;
+        int handled = -EINVAL;
+        u32 dev_conf;
+        u16 value;
+
+        value = le16_to_cpu(setup->wValue);
+
+        /* the gadget driver handles everything except what we must handle */
+        switch (setup->bRequest) {
+        case USB_REQ_SET_ADDRESS:
+                /* change it after the status stage */
+                mtu->address = (u8) (value & 0x7f);
+                dev_dbg(mtu->dev, "set address to 0x%x\n", mtu->address);
+
+                dev_conf = mtu3_readl(mbase, U3D_DEVICE_CONF);
+                dev_conf &= ~DEV_ADDR_MSK;
+                dev_conf |= DEV_ADDR(mtu->address);
+                mtu3_writel(mbase, U3D_DEVICE_CONF, dev_conf);
+
+                if (mtu->address)
+                        usb_gadget_set_state(&mtu->g, USB_STATE_ADDRESS);
+                else
+                        usb_gadget_set_state(&mtu->g, USB_STATE_DEFAULT);
+
+                handled = 1;
+                break;
+        case USB_REQ_SET_CONFIGURATION:
+                if (state == USB_STATE_ADDRESS) {
+                        usb_gadget_set_state(&mtu->g,
+                                        USB_STATE_CONFIGURED);
+                } else if (state == USB_STATE_CONFIGURED) {
+                        /*
+                         * USB2 spec sec 9.4.7, if wValue is 0 then dev
+                         * is moved to addressed state
+                         */
+                        if (!value)
+                                usb_gadget_set_state(&mtu->g,
+                                                USB_STATE_ADDRESS);
+                }
+                handled = 0;
+                break;
+        case USB_REQ_CLEAR_FEATURE:
+                handled = ep0_handle_feature(mtu, setup, 0);
+                break;
+        case USB_REQ_SET_FEATURE:
+                handled = ep0_handle_feature(mtu, setup, 1);
+                break;
+        case USB_REQ_GET_STATUS:
+                handled = ep0_get_status(mtu, setup);
+                break;
+        case USB_REQ_SET_SEL:
+                handled = ep0_set_sel(mtu, setup);
+                break;
+        case USB_REQ_SET_ISOCH_DELAY:
+                handled = 1;
+                break;
+        default:
+                /* delegate SET_CONFIGURATION, etc */
+                handled = 0;
+        }
+
+        return handled;
+}
+
+/* receive an data packet (OUT) */
+static void ep0_rx_state(struct mtu3 *mtu)
+{
+        struct mtu3_request *mreq;
+        struct usb_request *req;
+        void __iomem *mbase = mtu->mac_base;
+        u32 maxp;
+        u32 csr;
+        u16 count = 0;
+
+        dev_dbg(mtu->dev, "%s\n", __func__);
+
+        csr = mtu3_readl(mbase, U3D_EP0CSR) & EP0_W1C_BITS;
+        mreq = next_ep0_request(mtu);
+        req = &mreq->request;
+
+        /* read packet and ack; or stall because of gadget driver bug */
+        if (req) {
+                void *buf = req->buf + req->actual;
+                unsigned int len = req->length - req->actual;
+
+                /* read the buffer */
+                count = mtu3_readl(mbase, U3D_RXCOUNT0);
+                if (count > len) {
+                        req->status = -EOVERFLOW;
+                        count = len;
+                }
+                ep0_read_fifo(mtu->ep0, buf, count);
+                req->actual += count;
+                csr |= EP0_RXPKTRDY;
+
+                maxp = mtu->g.ep0->maxpacket;
+                if (count < maxp || req->actual == req->length) {
+                        mtu->ep0_state = MU3D_EP0_STATE_SETUP;
+                        dev_dbg(mtu->dev, "ep0 state: %s\n",
+                                decode_ep0_state(mtu));
+
+                        csr |= EP0_DATAEND;
+                } else {
+                        req = NULL;
+                }
+        } else {
+                csr |= EP0_RXPKTRDY | EP0_SENDSTALL;
+                dev_dbg(mtu->dev, "%s: SENDSTALL\n", __func__);
+        }
+
+        mtu3_writel(mbase, U3D_EP0CSR, csr);
+
+        /* give back the request if have received all data */
+        if (req)
+                ep0_req_giveback(mtu, req);
+
+}
+
+/* transmitting to the host (IN) */
+static void ep0_tx_state(struct mtu3 *mtu)
+{
+        struct mtu3_request *mreq = next_ep0_request(mtu);
+        struct usb_request *req;
+        u32 csr;
+        u8 *src;
+        u8 count;
+        u32 maxp;
+
+        dev_dbg(mtu->dev, "%s\n", __func__);
+
+        if (!mreq)
+                return;
+
+        maxp = mtu->g.ep0->maxpacket;
+        req = &mreq->request;
+
+        /* load the data */
+        src = (u8 *)req->buf + req->actual;
+        count = min(maxp, req->length - req->actual);
+        if (count)
+                ep0_write_fifo(mtu->ep0, src, count);
+
+        dev_dbg(mtu->dev, "%s act=%d, len=%d, cnt=%d, maxp=%d zero=%d\n",
+                 __func__, req->actual, req->length, count, maxp, req->zero);
+
+        req->actual += count;
+
+        if ((count < maxp)
+                || ((req->actual == req->length) && !req->zero))
+                mtu->ep0_state = MU3D_EP0_STATE_TX_END;
+
+        /* send it out, triggering a "txpktrdy cleared" irq */
+        csr = mtu3_readl(mtu->mac_base, U3D_EP0CSR) & EP0_W1C_BITS;
+        mtu3_writel(mtu->mac_base, U3D_EP0CSR, csr | EP0_TXPKTRDY);
+
+        dev_dbg(mtu->dev, "%s ep0csr=0x%x\n", __func__,
+                mtu3_readl(mtu->mac_base, U3D_EP0CSR));
+}
+
+static void ep0_read_setup(struct mtu3 *mtu, struct usb_ctrlrequest *setup)
+{
+        struct mtu3_request *mreq;
+        u32 count;
+        u32 csr;
+
+        csr = mtu3_readl(mtu->mac_base, U3D_EP0CSR) & EP0_W1C_BITS;
+        count = mtu3_readl(mtu->mac_base, U3D_RXCOUNT0);
+
+        ep0_read_fifo(mtu->ep0, (u8 *)setup, count);
+
+        dev_dbg(mtu->dev, "SETUP req%02x.%02x v%04x i%04x l%04x\n",
+                 setup->bRequestType, setup->bRequest,
+                 le16_to_cpu(setup->wValue), le16_to_cpu(setup->wIndex),
+                 le16_to_cpu(setup->wLength));
+
+        /* clean up any leftover transfers */
+        mreq = next_ep0_request(mtu);
+        if (mreq)
+                ep0_req_giveback(mtu, &mreq->request);
+
+        if (le16_to_cpu(setup->wLength) == 0) {
+                ;       /* no data stage, nothing to do */
+        } else if (setup->bRequestType & USB_DIR_IN) {
+                mtu3_writel(mtu->mac_base, U3D_EP0CSR,
+                        csr | EP0_SETUPPKTRDY | EP0_DPHTX);
+                mtu->ep0_state = MU3D_EP0_STATE_TX;
+        } else {
+                mtu3_writel(mtu->mac_base, U3D_EP0CSR,
+                        (csr | EP0_SETUPPKTRDY) & (~EP0_DPHTX));
+                mtu->ep0_state = MU3D_EP0_STATE_RX;
+        }
+}
+
+static int ep0_handle_setup(struct mtu3 *mtu)
+__releases(mtu->lock)
+__acquires(mtu->lock)
+{
+        struct usb_ctrlrequest setup;
+        struct mtu3_request *mreq;
+        void __iomem *mbase = mtu->mac_base;
+        int handled = 0;
+
+        ep0_read_setup(mtu, &setup);
+
+        if ((setup.bRequestType & USB_TYPE_MASK) == USB_TYPE_STANDARD)
+                handled = handle_standard_request(mtu, &setup);
+
+        dev_dbg(mtu->dev, "handled %d, ep0_state: %s\n",
+                 handled, decode_ep0_state(mtu));
+
+        if (handled < 0)
+                goto stall;
+        else if (handled > 0)
+                goto finish;
+
+        handled = forward_to_driver(mtu, &setup);
+        if (handled < 0) {
+stall:
+                dev_dbg(mtu->dev, "%s stall (%d)\n", __func__, handled);
+
+                ep0_stall_set(mtu->ep0, true,
+                        le16_to_cpu(setup.wLength) ? 0 : EP0_SETUPPKTRDY);
+
+                return 0;
+        }
+
+finish:
+        if (mtu->test_mode) {
+                ;       /* nothing to do */
+        } else if (le16_to_cpu(setup.wLength) == 0) { /* no data stage */
+
+                mtu3_writel(mbase, U3D_EP0CSR,
+                        (mtu3_readl(mbase, U3D_EP0CSR) & EP0_W1C_BITS)
+                        | EP0_SETUPPKTRDY | EP0_DATAEND);
+
+                /* complete zlp request directly */
+                mreq = next_ep0_request(mtu);
+                if (mreq && !mreq->request.length)
+                        ep0_req_giveback(mtu, &mreq->request);
+        }
+
+        return 0;
+}
+
+irqreturn_t mtu3_ep0_isr(struct mtu3 *mtu)
+{
+        void __iomem *mbase = mtu->mac_base;
+        struct mtu3_request *mreq;
+        u32 int_status;
+        irqreturn_t ret = IRQ_NONE;
+        u32 csr;
+        u32 len;
+
+        int_status = mtu3_readl(mbase, U3D_EPISR);
+        int_status &= mtu3_readl(mbase, U3D_EPIER);
+        mtu3_writel(mbase, U3D_EPISR, int_status); /* W1C */
+
+        /* only handle ep0's */
+        if (!(int_status & EP0ISR))
+                return IRQ_NONE;
+
+        csr = mtu3_readl(mbase, U3D_EP0CSR);
+
+        dev_dbg(mtu->dev, "%s csr=0x%x\n", __func__, csr);
+
+        /* we sent a stall.. need to clear it now.. */
+        if (csr & EP0_SENTSTALL) {
+                ep0_stall_set(mtu->ep0, false, 0);
+                csr = mtu3_readl(mbase, U3D_EP0CSR);
+                ret = IRQ_HANDLED;
+        }
+        dev_dbg(mtu->dev, "ep0_state: %s\n", decode_ep0_state(mtu));
+
+        switch (mtu->ep0_state) {
+        case MU3D_EP0_STATE_TX:
+                /* irq on clearing txpktrdy */
+                if ((csr & EP0_FIFOFULL) == 0) {
+                        ep0_tx_state(mtu);
+                        ret = IRQ_HANDLED;
+                }
+                break;
+        case MU3D_EP0_STATE_RX:
+                /* irq on set rxpktrdy */
+                if (csr & EP0_RXPKTRDY) {
+                        ep0_rx_state(mtu);
+                        ret = IRQ_HANDLED;
+                }
+                break;
+        case MU3D_EP0_STATE_TX_END:
+                mtu3_writel(mbase, U3D_EP0CSR,
+                        (csr & EP0_W1C_BITS) | EP0_DATAEND);
+
+                mreq = next_ep0_request(mtu);
+                if (mreq)
+                        ep0_req_giveback(mtu, &mreq->request);
+
+                mtu->ep0_state = MU3D_EP0_STATE_SETUP;
+                ret = IRQ_HANDLED;
+                dev_dbg(mtu->dev, "ep0_state: %s\n", decode_ep0_state(mtu));
+                break;
+        case MU3D_EP0_STATE_SETUP:
+                if (!(csr & EP0_SETUPPKTRDY))
+                        break;
+
+                len = mtu3_readl(mbase, U3D_RXCOUNT0);
+                if (len != 8) {
+                        dev_err(mtu->dev, "SETUP packet len %d != 8 ?\n", len);
+                        break;
+                }
+
+                ep0_handle_setup(mtu);
+                ret = IRQ_HANDLED;
+                break;
+        default:
+                /* can't happen */
+                ep0_stall_set(mtu->ep0, true, 0);
+                WARN_ON(1);
+                break;
+        }
+
+        return ret;
+}
+
+
+static int mtu3_ep0_enable(struct usb_ep *ep,
+        const struct usb_endpoint_descriptor *desc)
+{
+        /* always enabled */
+        return -EINVAL;
+}
+
+static int mtu3_ep0_disable(struct usb_ep *ep)
+{
+        /* always enabled */
+        return -EINVAL;
+}
+
+static int ep0_queue(struct mtu3_ep *mep, struct mtu3_request *mreq)
+{
+        struct mtu3 *mtu = mep->mtu;
+
+        mreq->mtu = mtu;
+        mreq->request.actual = 0;
+        mreq->request.status = -EINPROGRESS;
+
+        dev_dbg(mtu->dev, "%s %s (ep0_state: %s), len#%d\n", __func__,
+                mep->name, decode_ep0_state(mtu), mreq->request.length);
+
+        if (!list_empty(&mep->req_list))
+                return -EBUSY;
+
+        switch (mtu->ep0_state) {
+        case MU3D_EP0_STATE_SETUP:
+        case MU3D_EP0_STATE_RX: /* control-OUT data */
+        case MU3D_EP0_STATE_TX: /* control-IN data */
+                break;
+        default:
+                dev_err(mtu->dev, "%s, error in ep0 state %s\n", __func__,
+                        decode_ep0_state(mtu));
+                return -EINVAL;
+        }
+
+        list_add_tail(&mreq->list, &mep->req_list);
+
+        /* sequence #1, IN ... start writing the data */
+        if (mtu->ep0_state == MU3D_EP0_STATE_TX)
+                ep0_tx_state(mtu);
+
+        return 0;
+}
+
+static int mtu3_ep0_queue(struct usb_ep *ep,
+        struct usb_request *req, gfp_t gfp)
+{
+        struct mtu3_ep *mep;
+        struct mtu3_request *mreq;
+        struct mtu3 *mtu;
+        unsigned long flags;
+        int ret = 0;
+
+        if (!ep || !req)
+                return -EINVAL;
+
+        mep = to_mtu3_ep(ep);
+        mtu = mep->mtu;
+        mreq = to_mtu3_request(req);
+
+        spin_lock_irqsave(&mtu->lock, flags);
+        ret = ep0_queue(mep, mreq);
+        spin_unlock_irqrestore(&mtu->lock, flags);
+        return ret;
+}
+
+static int mtu3_ep0_dequeue(struct usb_ep *ep, struct usb_request *req)
+{
+        /* we just won't support this */
+        return -EINVAL;
+}
+
+static int mtu3_ep0_halt(struct usb_ep *ep, int value)
+{
+        struct mtu3_ep *mep;
+        struct mtu3 *mtu;
+        unsigned long flags;
+        int ret = 0;
+
+        if (!ep || !value)
+                return -EINVAL;
+
+        mep = to_mtu3_ep(ep);
+        mtu = mep->mtu;
+
+        dev_dbg(mtu->dev, "%s\n", __func__);
+
+        spin_lock_irqsave(&mtu->lock, flags);
+
+        if (!list_empty(&mep->req_list)) {
+                ret = -EBUSY;
+                goto cleanup;
+        }
+
+        switch (mtu->ep0_state) {
+        /*
+         * stalls are usually issued after parsing SETUP packet, either
+         * directly in irq context from setup() or else later.
+         */
+        case MU3D_EP0_STATE_TX:
+        case MU3D_EP0_STATE_TX_END:
+        case MU3D_EP0_STATE_RX:
+        case MU3D_EP0_STATE_SETUP:
+                ep0_stall_set(mtu->ep0, true, 0);
+                break;
+        default:
+                dev_dbg(mtu->dev, "ep0 can't halt in state %s\n",
+                        decode_ep0_state(mtu));
+                ret = -EINVAL;
+        }
+
+cleanup:
+        spin_unlock_irqrestore(&mtu->lock, flags);
+        return ret;
+}
+
+const struct usb_ep_ops mtu3_ep0_ops = {
+        .enable = mtu3_ep0_enable,
+        .disable = mtu3_ep0_disable,
+        .alloc_request = mtu3_alloc_request,
+        .free_request = mtu3_free_request,
+        .queue = mtu3_ep0_queue,
+        .dequeue = mtu3_ep0_dequeue,
+        .set_halt = mtu3_ep0_halt,
+};
diff --git a/drivers/usb/mtu3/mtu3_host.c b/drivers/usb/mtu3/mtu3_host.c
new file mode 100644
index 000000000000..cd4d01087855
--- /dev/null
+++ b/drivers/usb/mtu3/mtu3_host.c
@@ -0,0 +1,294 @@
+/*
+ * mtu3_dr.c - dual role switch and host glue layer
+ *
+ * Copyright (C) 2016 MediaTek Inc.
+ *
+ * Author: Chunfeng Yun <chunfeng.yun@mediatek.com>
+ *
+ * This software is licensed under the terms of the GNU General Public
+ * License version 2, as published by the Free Software Foundation, and
+ * may be copied, distributed, and modified under those terms.
+ *
+ * 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.
+ *
+ */
+
+#include <linux/clk.h>
+#include <linux/iopoll.h>
+#include <linux/irq.h>
+#include <linux/kernel.h>
+#include <linux/mfd/syscon.h>
+#include <linux/of_device.h>
+#include <linux/regmap.h>
+
+#include "mtu3.h"
+#include "mtu3_dr.h"
+
+#define PERI_WK_CTRL1           0x404
+#define UWK_CTL1_IS_C(x)        (((x) & 0xf) << 26)
+#define UWK_CTL1_IS_E           BIT(25)
+#define UWK_CTL1_IDDIG_C(x)     (((x) & 0xf) << 11)  /* cycle debounce */
+#define UWK_CTL1_IDDIG_E        BIT(10) /* enable debounce */
+#define UWK_CTL1_IDDIG_P        BIT(9)  /* polarity */
+#define UWK_CTL1_IS_P           BIT(6)  /* polarity for ip sleep */
+
+/*
+ * ip-sleep wakeup mode:
+ * all clocks can be turn off, but power domain should be kept on
+ */
+static void ssusb_wakeup_ip_sleep_en(struct ssusb_mtk *ssusb)
+{
+        u32 tmp;
+        struct regmap *pericfg = ssusb->pericfg;
+
+        regmap_read(pericfg, PERI_WK_CTRL1, &tmp);
+        tmp &= ~UWK_CTL1_IS_P;
+        tmp &= ~(UWK_CTL1_IS_C(0xf));
+        tmp |= UWK_CTL1_IS_C(0x8);
+        regmap_write(pericfg, PERI_WK_CTRL1, tmp);
+        regmap_write(pericfg, PERI_WK_CTRL1, tmp | UWK_CTL1_IS_E);
+
+        regmap_read(pericfg, PERI_WK_CTRL1, &tmp);
+        dev_dbg(ssusb->dev, "%s(): WK_CTRL1[P6,E25,C26:29]=%#x\n",
+                __func__, tmp);
+}
+
+static void ssusb_wakeup_ip_sleep_dis(struct ssusb_mtk *ssusb)
+{
+        u32 tmp;
+
+        regmap_read(ssusb->pericfg, PERI_WK_CTRL1, &tmp);
+        tmp &= ~UWK_CTL1_IS_E;
+        regmap_write(ssusb->pericfg, PERI_WK_CTRL1, tmp);
+}
+
+int ssusb_wakeup_of_property_parse(struct ssusb_mtk *ssusb,
+                                struct device_node *dn)
+{
+        struct device *dev = ssusb->dev;
+
+        /*
+         * Wakeup function is optional, so it is not an error if this property
+         * does not exist, and in such case, no need to get relative
+         * properties anymore.
+         */
+        ssusb->wakeup_en = of_property_read_bool(dn, "mediatek,enable-wakeup");
+        if (!ssusb->wakeup_en)
+                return 0;
+
+        ssusb->wk_deb_p0 = devm_clk_get(dev, "wakeup_deb_p0");
+        if (IS_ERR(ssusb->wk_deb_p0)) {
+                dev_err(dev, "fail to get wakeup_deb_p0\n");
+                return PTR_ERR(ssusb->wk_deb_p0);
+        }
+
+        if (of_property_read_bool(dn, "wakeup_deb_p1")) {
+                ssusb->wk_deb_p1 = devm_clk_get(dev, "wakeup_deb_p1");
+                if (IS_ERR(ssusb->wk_deb_p1)) {
+                        dev_err(dev, "fail to get wakeup_deb_p1\n");
+                        return PTR_ERR(ssusb->wk_deb_p1);
+                }
+        }
+
+        ssusb->pericfg = syscon_regmap_lookup_by_phandle(dn,
+                                                "mediatek,syscon-wakeup");
+        if (IS_ERR(ssusb->pericfg)) {
+                dev_err(dev, "fail to get pericfg regs\n");
+                return PTR_ERR(ssusb->pericfg);
+        }
+
+        return 0;
+}
+
+static int ssusb_wakeup_clks_enable(struct ssusb_mtk *ssusb)
+{
+        int ret;
+
+        ret = clk_prepare_enable(ssusb->wk_deb_p0);
+        if (ret) {
+                dev_err(ssusb->dev, "failed to enable wk_deb_p0\n");
+                goto usb_p0_err;
+        }
+
+        ret = clk_prepare_enable(ssusb->wk_deb_p1);
+        if (ret) {
+                dev_err(ssusb->dev, "failed to enable wk_deb_p1\n");
+                goto usb_p1_err;
+        }
+
+        return 0;
+
+usb_p1_err:
+        clk_disable_unprepare(ssusb->wk_deb_p0);
+usb_p0_err:
+        return -EINVAL;
+}
+
+static void ssusb_wakeup_clks_disable(struct ssusb_mtk *ssusb)
+{
+        clk_disable_unprepare(ssusb->wk_deb_p1);
+        clk_disable_unprepare(ssusb->wk_deb_p0);
+}
+
+static void host_ports_num_get(struct ssusb_mtk *ssusb)
+{
+        u32 xhci_cap;
+
+        xhci_cap = mtu3_readl(ssusb->ippc_base, U3D_SSUSB_IP_XHCI_CAP);
+        ssusb->u2_ports = SSUSB_IP_XHCI_U2_PORT_NUM(xhci_cap);
+        ssusb->u3_ports = SSUSB_IP_XHCI_U3_PORT_NUM(xhci_cap);
+
+        dev_dbg(ssusb->dev, "host - u2_ports:%d, u3_ports:%d\n",
+                 ssusb->u2_ports, ssusb->u3_ports);
+}
+
+/* only configure ports will be used later */
+int ssusb_host_enable(struct ssusb_mtk *ssusb)
+{
+        void __iomem *ibase = ssusb->ippc_base;
+        int num_u3p = ssusb->u3_ports;
+        int num_u2p = ssusb->u2_ports;
+        u32 check_clk;
+        u32 value;
+        int i;
+
+        /* power on host ip */
+        mtu3_clrbits(ibase, U3D_SSUSB_IP_PW_CTRL1, SSUSB_IP_HOST_PDN);
+
+        /* power on and enable all u3 ports */
+        for (i = 0; i < num_u3p; i++) {
+                value = mtu3_readl(ibase, SSUSB_U3_CTRL(i));
+                value &= ~(SSUSB_U3_PORT_PDN | SSUSB_U3_PORT_DIS);
+                value |= SSUSB_U3_PORT_HOST_SEL;
+                mtu3_writel(ibase, SSUSB_U3_CTRL(i), value);
+        }
+
+        /* power on and enable all u2 ports */
+        for (i = 0; i < num_u2p; i++) {
+                value = mtu3_readl(ibase, SSUSB_U2_CTRL(i));
+                value &= ~(SSUSB_U2_PORT_PDN | SSUSB_U2_PORT_DIS);
+                value |= SSUSB_U2_PORT_HOST_SEL;
+                mtu3_writel(ibase, SSUSB_U2_CTRL(i), value);
+        }
+
+        check_clk = SSUSB_XHCI_RST_B_STS;
+        if (num_u3p)
+                check_clk = SSUSB_U3_MAC_RST_B_STS;
+
+        return ssusb_check_clocks(ssusb, check_clk);
+}
+
+int ssusb_host_disable(struct ssusb_mtk *ssusb, bool suspend)
+{
+        void __iomem *ibase = ssusb->ippc_base;
+        int num_u3p = ssusb->u3_ports;
+        int num_u2p = ssusb->u2_ports;
+        u32 value;
+        int ret;
+        int i;
+
+        /* power down and disable all u3 ports */
+        for (i = 0; i < num_u3p; i++) {
+                value = mtu3_readl(ibase, SSUSB_U3_CTRL(i));
+                value |= SSUSB_U3_PORT_PDN;
+                value |= suspend ? 0 : SSUSB_U3_PORT_DIS;
+                mtu3_writel(ibase, SSUSB_U3_CTRL(i), value);
+        }
+
+        /* power down and disable all u2 ports */
+        for (i = 0; i < num_u2p; i++) {
+                value = mtu3_readl(ibase, SSUSB_U2_CTRL(i));
+                value |= SSUSB_U2_PORT_PDN;
+                value |= suspend ? 0 : SSUSB_U2_PORT_DIS;
+                mtu3_writel(ibase, SSUSB_U2_CTRL(i), value);
+        }
+
+        /* power down host ip */
+        mtu3_setbits(ibase, U3D_SSUSB_IP_PW_CTRL1, SSUSB_IP_HOST_PDN);
+
+        if (!suspend)
+                return 0;
+
+        /* wait for host ip to sleep */
+        ret = readl_poll_timeout(ibase + U3D_SSUSB_IP_PW_STS1, value,
+                          (value & SSUSB_IP_SLEEP_STS), 100, 100000);
+        if (ret)
+                dev_err(ssusb->dev, "ip sleep failed!!!\n");
+
+        return ret;
+}
+
+static void ssusb_host_setup(struct ssusb_mtk *ssusb)
+{
+        host_ports_num_get(ssusb);
+
+        /*
+         * power on host and power on/enable all ports
+         * if support OTG, gadget driver will switch port0 to device mode
+         */
+        ssusb_host_enable(ssusb);
+
+        /* if port0 supports dual-role, works as host mode by default */
+        ssusb_set_vbus(&ssusb->otg_switch, 1);
+}
+
+static void ssusb_host_cleanup(struct ssusb_mtk *ssusb)
+{
+        if (ssusb->is_host)
+                ssusb_set_vbus(&ssusb->otg_switch, 0);
+
+        ssusb_host_disable(ssusb, false);
+}
+
+/*
+ * If host supports multiple ports, the VBUSes(5V) of ports except port0
+ * which supports OTG are better to be enabled by default in DTS.
+ * Because the host driver will keep link with devices attached when system
+ * enters suspend mode, so no need to control VBUSes after initialization.
+ */
+int ssusb_host_init(struct ssusb_mtk *ssusb, struct device_node *parent_dn)
+{
+        struct device *parent_dev = ssusb->dev;
+        int ret;
+
+        ssusb_host_setup(ssusb);
+
+        ret = of_platform_populate(parent_dn, NULL, NULL, parent_dev);
+        if (ret) {
+                dev_dbg(parent_dev, "failed to create child devices at %s\n",
+                                parent_dn->full_name);
+                return ret;
+        }
+
+        dev_info(parent_dev, "xHCI platform device register success...\n");
+
+        return 0;
+}
+
+void ssusb_host_exit(struct ssusb_mtk *ssusb)
+{
+        of_platform_depopulate(ssusb->dev);
+        ssusb_host_cleanup(ssusb);
+}
+
+int ssusb_wakeup_enable(struct ssusb_mtk *ssusb)
+{
+        int ret = 0;
+
+        if (ssusb->wakeup_en) {
+                ret = ssusb_wakeup_clks_enable(ssusb);
+                ssusb_wakeup_ip_sleep_en(ssusb);
+        }
+        return ret;
+}
+
+void ssusb_wakeup_disable(struct ssusb_mtk *ssusb)
+{
+        if (ssusb->wakeup_en) {
+                ssusb_wakeup_ip_sleep_dis(ssusb);
+                ssusb_wakeup_clks_disable(ssusb);
+        }
+}
diff --git a/drivers/usb/mtu3/mtu3_hw_regs.h b/drivers/usb/mtu3/mtu3_hw_regs.h
new file mode 100644
index 000000000000..212367295276
--- /dev/null
+++ b/drivers/usb/mtu3/mtu3_hw_regs.h
@@ -0,0 +1,473 @@
+/*
+ * mtu3_hw_regs.h - MediaTek USB3 DRD register and field definitions
+ *
+ * Copyright (C) 2016 MediaTek Inc.
+ *
+ * Author: Chunfeng Yun <chunfeng.yun@mediatek.com>
+ *
+ * This software is licensed under the terms of the GNU General Public
+ * License version 2, as published by the Free Software Foundation, and
+ * may be copied, distributed, and modified under those terms.
+ *
+ * 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 _SSUSB_HW_REGS_H_
+#define _SSUSB_HW_REGS_H_
+
+/* segment offset of MAC register */
+#define SSUSB_DEV_BASE          0x0000
+#define SSUSB_EPCTL_CSR_BASE    0x0800
+#define SSUSB_USB3_MAC_CSR_BASE 0x1400
+#define SSUSB_USB3_SYS_CSR_BASE 0x1400
+#define SSUSB_USB2_CSR_BASE     0x2400
+
+/* IPPC register in Infra */
+#define SSUSB_SIFSLV_IPPC_BASE  0x0000
+
+/* --------------- SSUSB_DEV REGISTER DEFINITION --------------- */
+
+#define U3D_LV1ISR              (SSUSB_DEV_BASE + 0x0000)
+#define U3D_LV1IER              (SSUSB_DEV_BASE + 0x0004)
+#define U3D_LV1IESR             (SSUSB_DEV_BASE + 0x0008)
+#define U3D_LV1IECR             (SSUSB_DEV_BASE + 0x000C)
+
+#define U3D_EPISR               (SSUSB_DEV_BASE + 0x0080)
+#define U3D_EPIER               (SSUSB_DEV_BASE + 0x0084)
+#define U3D_EPIESR              (SSUSB_DEV_BASE + 0x0088)
+#define U3D_EPIECR              (SSUSB_DEV_BASE + 0x008C)
+
+#define U3D_EP0CSR              (SSUSB_DEV_BASE + 0x0100)
+#define U3D_RXCOUNT0            (SSUSB_DEV_BASE + 0x0108)
+#define U3D_RESERVED            (SSUSB_DEV_BASE + 0x010C)
+#define U3D_TX1CSR0             (SSUSB_DEV_BASE + 0x0110)
+#define U3D_TX1CSR1             (SSUSB_DEV_BASE + 0x0114)
+#define U3D_TX1CSR2             (SSUSB_DEV_BASE + 0x0118)
+
+#define U3D_RX1CSR0             (SSUSB_DEV_BASE + 0x0210)
+#define U3D_RX1CSR1             (SSUSB_DEV_BASE + 0x0214)
+#define U3D_RX1CSR2             (SSUSB_DEV_BASE + 0x0218)
+
+#define U3D_FIFO0               (SSUSB_DEV_BASE + 0x0300)
+
+#define U3D_QCR0                (SSUSB_DEV_BASE + 0x0400)
+#define U3D_QCR1                (SSUSB_DEV_BASE + 0x0404)
+#define U3D_QCR2                (SSUSB_DEV_BASE + 0x0408)
+#define U3D_QCR3                (SSUSB_DEV_BASE + 0x040C)
+
+#define U3D_TXQCSR1             (SSUSB_DEV_BASE + 0x0510)
+#define U3D_TXQSAR1             (SSUSB_DEV_BASE + 0x0514)
+#define U3D_TXQCPR1             (SSUSB_DEV_BASE + 0x0518)
+
+#define U3D_RXQCSR1             (SSUSB_DEV_BASE + 0x0610)
+#define U3D_RXQSAR1             (SSUSB_DEV_BASE + 0x0614)
+#define U3D_RXQCPR1             (SSUSB_DEV_BASE + 0x0618)
+#define U3D_RXQLDPR1            (SSUSB_DEV_BASE + 0x061C)
+
+#define U3D_QISAR0              (SSUSB_DEV_BASE + 0x0700)
+#define U3D_QIER0               (SSUSB_DEV_BASE + 0x0704)
+#define U3D_QIESR0              (SSUSB_DEV_BASE + 0x0708)
+#define U3D_QIECR0              (SSUSB_DEV_BASE + 0x070C)
+#define U3D_QISAR1              (SSUSB_DEV_BASE + 0x0710)
+#define U3D_QIER1               (SSUSB_DEV_BASE + 0x0714)
+#define U3D_QIESR1              (SSUSB_DEV_BASE + 0x0718)
+#define U3D_QIECR1              (SSUSB_DEV_BASE + 0x071C)
+
+#define U3D_TQERRIR0            (SSUSB_DEV_BASE + 0x0780)
+#define U3D_TQERRIER0           (SSUSB_DEV_BASE + 0x0784)
+#define U3D_TQERRIESR0          (SSUSB_DEV_BASE + 0x0788)
+#define U3D_TQERRIECR0          (SSUSB_DEV_BASE + 0x078C)
+#define U3D_RQERRIR0            (SSUSB_DEV_BASE + 0x07C0)
+#define U3D_RQERRIER0           (SSUSB_DEV_BASE + 0x07C4)
+#define U3D_RQERRIESR0          (SSUSB_DEV_BASE + 0x07C8)
+#define U3D_RQERRIECR0          (SSUSB_DEV_BASE + 0x07CC)
+#define U3D_RQERRIR1            (SSUSB_DEV_BASE + 0x07D0)
+#define U3D_RQERRIER1           (SSUSB_DEV_BASE + 0x07D4)
+#define U3D_RQERRIESR1          (SSUSB_DEV_BASE + 0x07D8)
+#define U3D_RQERRIECR1          (SSUSB_DEV_BASE + 0x07DC)
+
+#define U3D_CAP_EP0FFSZ         (SSUSB_DEV_BASE + 0x0C04)
+#define U3D_CAP_EPNTXFFSZ       (SSUSB_DEV_BASE + 0x0C08)
+#define U3D_CAP_EPNRXFFSZ       (SSUSB_DEV_BASE + 0x0C0C)
+#define U3D_CAP_EPINFO          (SSUSB_DEV_BASE + 0x0C10)
+#define U3D_MISC_CTRL           (SSUSB_DEV_BASE + 0x0C84)
+
+/*---------------- SSUSB_DEV FIELD DEFINITION ---------------*/
+
+/* U3D_LV1ISR */
+#define EP_CTRL_INTR            BIT(5)
+#define MAC2_INTR               BIT(4)
+#define DMA_INTR                BIT(3)
+#define MAC3_INTR               BIT(2)
+#define QMU_INTR                BIT(1)
+#define BMU_INTR                BIT(0)
+
+/* U3D_LV1IECR */
+#define LV1IECR_MSK             GENMASK(31, 0)
+
+/* U3D_EPISR */
+#define EPRISR(x)               (BIT(16) << (x))
+#define EPTISR(x)               (BIT(0) << (x))
+#define EP0ISR                  BIT(0)
+
+/* U3D_EP0CSR */
+#define EP0_SENDSTALL           BIT(25)
+#define EP0_FIFOFULL            BIT(23)
+#define EP0_SENTSTALL           BIT(22)
+#define EP0_DPHTX               BIT(20)
+#define EP0_DATAEND             BIT(19)
+#define EP0_TXPKTRDY            BIT(18)
+#define EP0_SETUPPKTRDY         BIT(17)
+#define EP0_RXPKTRDY            BIT(16)
+#define EP0_MAXPKTSZ_MSK        GENMASK(9, 0)
+#define EP0_MAXPKTSZ(x)         ((x) & EP0_MAXPKTSZ_MSK)
+#define EP0_W1C_BITS    (~(EP0_RXPKTRDY | EP0_SETUPPKTRDY | EP0_SENTSTALL))
+
+/* U3D_TX1CSR0 */
+#define TX_DMAREQEN             BIT(29)
+#define TX_FIFOFULL             BIT(25)
+#define TX_FIFOEMPTY            BIT(24)
+#define TX_SENTSTALL            BIT(22)
+#define TX_SENDSTALL            BIT(21)
+#define TX_TXPKTRDY             BIT(16)
+#define TX_TXMAXPKTSZ_MSK       GENMASK(10, 0)
+#define TX_TXMAXPKTSZ(x)        ((x) & TX_TXMAXPKTSZ_MSK)
+#define TX_W1C_BITS             (~(TX_SENTSTALL))
+
+/* U3D_TX1CSR1 */
+#define TX_MULT(x)              (((x) & 0x3) << 22)
+#define TX_MAX_PKT(x)           (((x) & 0x3f) << 16)
+#define TX_SLOT(x)              (((x) & 0x3f) << 8)
+#define TX_TYPE(x)              (((x) & 0x3) << 4)
+#define TX_SS_BURST(x)          (((x) & 0xf) << 0)
+
+/* for TX_TYPE & RX_TYPE */
+#define TYPE_BULK               (0x0)
+#define TYPE_INT                (0x1)
+#define TYPE_ISO                (0x2)
+#define TYPE_MASK               (0x3)
+
+/* U3D_TX1CSR2 */
+#define TX_BINTERVAL(x)         (((x) & 0xff) << 24)
+#define TX_FIFOSEGSIZE(x)       (((x) & 0xf) << 16)
+#define TX_FIFOADDR(x)          (((x) & 0x1fff) << 0)
+
+/* U3D_RX1CSR0 */
+#define RX_DMAREQEN             BIT(29)
+#define RX_SENTSTALL            BIT(22)
+#define RX_SENDSTALL            BIT(21)
+#define RX_RXPKTRDY             BIT(16)
+#define RX_RXMAXPKTSZ_MSK       GENMASK(10, 0)
+#define RX_RXMAXPKTSZ(x)        ((x) & RX_RXMAXPKTSZ_MSK)
+#define RX_W1C_BITS             (~(RX_SENTSTALL | RX_RXPKTRDY))
+
+/* U3D_RX1CSR1 */
+#define RX_MULT(x)              (((x) & 0x3) << 22)
+#define RX_MAX_PKT(x)           (((x) & 0x3f) << 16)
+#define RX_SLOT(x)              (((x) & 0x3f) << 8)
+#define RX_TYPE(x)              (((x) & 0x3) << 4)
+#define RX_SS_BURST(x)          (((x) & 0xf) << 0)
+
+/* U3D_RX1CSR2 */
+#define RX_BINTERVAL(x)         (((x) & 0xff) << 24)
+#define RX_FIFOSEGSIZE(x)       (((x) & 0xf) << 16)
+#define RX_FIFOADDR(x)          (((x) & 0x1fff) << 0)
+
+/* U3D_QCR0 */
+#define QMU_RX_CS_EN(x)         (BIT(16) << (x))
+#define QMU_TX_CS_EN(x)         (BIT(0) << (x))
+#define QMU_CS16B_EN            BIT(0)
+
+/* U3D_QCR1 */
+#define QMU_TX_ZLP(x)           (BIT(0) << (x))
+
+/* U3D_QCR3 */
+#define QMU_RX_COZ(x)           (BIT(16) << (x))
+#define QMU_RX_ZLP(x)           (BIT(0) << (x))
+
+/* U3D_TXQCSR1 */
+/* U3D_RXQCSR1 */
+#define QMU_Q_ACTIVE            BIT(15)
+#define QMU_Q_STOP              BIT(2)
+#define QMU_Q_RESUME            BIT(1)
+#define QMU_Q_START             BIT(0)
+
+/* U3D_QISAR0, U3D_QIER0, U3D_QIESR0, U3D_QIECR0 */
+#define QMU_RX_DONE_INT(x)      (BIT(16) << (x))
+#define QMU_TX_DONE_INT(x)      (BIT(0) << (x))
+
+/* U3D_QISAR1, U3D_QIER1, U3D_QIESR1, U3D_QIECR1 */
+#define RXQ_ZLPERR_INT          BIT(20)
+#define RXQ_LENERR_INT          BIT(18)
+#define RXQ_CSERR_INT           BIT(17)
+#define RXQ_EMPTY_INT           BIT(16)
+#define TXQ_LENERR_INT          BIT(2)
+#define TXQ_CSERR_INT           BIT(1)
+#define TXQ_EMPTY_INT           BIT(0)
+
+/* U3D_TQERRIR0, U3D_TQERRIER0, U3D_TQERRIESR0, U3D_TQERRIECR0 */
+#define QMU_TX_LEN_ERR(x)       (BIT(16) << (x))
+#define QMU_TX_CS_ERR(x)        (BIT(0) << (x))
+
+/* U3D_RQERRIR0, U3D_RQERRIER0, U3D_RQERRIESR0, U3D_RQERRIECR0 */
+#define QMU_RX_LEN_ERR(x)       (BIT(16) << (x))
+#define QMU_RX_CS_ERR(x)        (BIT(0) << (x))
+
+/* U3D_RQERRIR1, U3D_RQERRIER1, U3D_RQERRIESR1, U3D_RQERRIECR1 */
+#define QMU_RX_ZLP_ERR(n)       (BIT(16) << (n))
+
+/* U3D_CAP_EPINFO */
+#define CAP_RX_EP_NUM(x)        (((x) >> 8) & 0x1f)
+#define CAP_TX_EP_NUM(x)        ((x) & 0x1f)
+
+/* U3D_MISC_CTRL */
+#define VBUS_ON                 BIT(1)
+#define VBUS_FRC_EN             BIT(0)
+
+
+/*---------------- SSUSB_EPCTL_CSR REGISTER DEFINITION ----------------*/
+
+#define U3D_DEVICE_CONF                 (SSUSB_EPCTL_CSR_BASE + 0x0000)
+#define U3D_EP_RST                      (SSUSB_EPCTL_CSR_BASE + 0x0004)
+
+#define U3D_DEV_LINK_INTR_ENABLE        (SSUSB_EPCTL_CSR_BASE + 0x0050)
+#define U3D_DEV_LINK_INTR               (SSUSB_EPCTL_CSR_BASE + 0x0054)
+
+/*---------------- SSUSB_EPCTL_CSR FIELD DEFINITION ----------------*/
+
+/* U3D_DEVICE_CONF */
+#define DEV_ADDR_MSK            GENMASK(30, 24)
+#define DEV_ADDR(x)             ((0x7f & (x)) << 24)
+#define HW_USB2_3_SEL           BIT(18)
+#define SW_USB2_3_SEL_EN        BIT(17)
+#define SW_USB2_3_SEL           BIT(16)
+#define SSUSB_DEV_SPEED(x)      ((x) & 0x7)
+
+/* U3D_EP_RST */
+#define EP1_IN_RST              BIT(17)
+#define EP1_OUT_RST             BIT(1)
+#define EP_RST(is_in, epnum)    (((is_in) ? BIT(16) : BIT(0)) << (epnum))
+#define EP0_RST                 BIT(0)
+
+/* U3D_DEV_LINK_INTR_ENABLE */
+/* U3D_DEV_LINK_INTR */
+#define SSUSB_DEV_SPEED_CHG_INTR        BIT(0)
+
+
+/*---------------- SSUSB_USB3_MAC_CSR REGISTER DEFINITION ----------------*/
+
+#define U3D_LTSSM_CTRL          (SSUSB_USB3_MAC_CSR_BASE + 0x0010)
+#define U3D_USB3_CONFIG         (SSUSB_USB3_MAC_CSR_BASE + 0x001C)
+
+#define U3D_LTSSM_INTR_ENABLE   (SSUSB_USB3_MAC_CSR_BASE + 0x013C)
+#define U3D_LTSSM_INTR          (SSUSB_USB3_MAC_CSR_BASE + 0x0140)
+
+/*---------------- SSUSB_USB3_MAC_CSR FIELD DEFINITION ----------------*/
+
+/* U3D_LTSSM_CTRL */
+#define FORCE_POLLING_FAIL      BIT(4)
+#define FORCE_RXDETECT_FAIL     BIT(3)
+#define SOFT_U3_EXIT_EN         BIT(2)
+#define COMPLIANCE_EN           BIT(1)
+#define U1_GO_U2_EN             BIT(0)
+
+/* U3D_USB3_CONFIG */
+#define USB3_EN                 BIT(0)
+
+/* U3D_LTSSM_INTR_ENABLE */
+/* U3D_LTSSM_INTR */
+#define U3_RESUME_INTR          BIT(18)
+#define U3_LFPS_TMOUT_INTR      BIT(17)
+#define VBUS_FALL_INTR          BIT(16)
+#define VBUS_RISE_INTR          BIT(15)
+#define RXDET_SUCCESS_INTR      BIT(14)
+#define EXIT_U3_INTR            BIT(13)
+#define EXIT_U2_INTR            BIT(12)
+#define EXIT_U1_INTR            BIT(11)
+#define ENTER_U3_INTR           BIT(10)
+#define ENTER_U2_INTR           BIT(9)
+#define ENTER_U1_INTR           BIT(8)
+#define ENTER_U0_INTR           BIT(7)
+#define RECOVERY_INTR           BIT(6)
+#define WARM_RST_INTR           BIT(5)
+#define HOT_RST_INTR            BIT(4)
+#define LOOPBACK_INTR           BIT(3)
+#define COMPLIANCE_INTR         BIT(2)
+#define SS_DISABLE_INTR         BIT(1)
+#define SS_INACTIVE_INTR        BIT(0)
+
+/*---------------- SSUSB_USB3_SYS_CSR REGISTER DEFINITION ----------------*/
+
+#define U3D_LINK_UX_INACT_TIMER (SSUSB_USB3_SYS_CSR_BASE + 0x020C)
+#define U3D_LINK_POWER_CONTROL  (SSUSB_USB3_SYS_CSR_BASE + 0x0210)
+#define U3D_LINK_ERR_COUNT      (SSUSB_USB3_SYS_CSR_BASE + 0x0214)
+
+/*---------------- SSUSB_USB3_SYS_CSR FIELD DEFINITION ----------------*/
+
+/* U3D_LINK_UX_INACT_TIMER */
+#define DEV_U2_INACT_TIMEOUT_MSK        GENMASK(23, 16)
+#define DEV_U2_INACT_TIMEOUT_VALUE(x)   (((x) & 0xff) << 16)
+#define U2_INACT_TIMEOUT_MSK            GENMASK(15, 8)
+#define U1_INACT_TIMEOUT_MSK            GENMASK(7, 0)
+#define U1_INACT_TIMEOUT_VALUE(x)       ((x) & 0xff)
+
+/* U3D_LINK_POWER_CONTROL */
+#define SW_U2_ACCEPT_ENABLE     BIT(9)
+#define SW_U1_ACCEPT_ENABLE     BIT(8)
+#define UX_EXIT                 BIT(5)
+#define LGO_U3                  BIT(4)
+#define LGO_U2                  BIT(3)
+#define LGO_U1                  BIT(2)
+#define SW_U2_REQUEST_ENABLE    BIT(1)
+#define SW_U1_REQUEST_ENABLE    BIT(0)
+
+/* U3D_LINK_ERR_COUNT */
+#define CLR_LINK_ERR_CNT        BIT(16)
+#define LINK_ERROR_COUNT        GENMASK(15, 0)
+
+/*---------------- SSUSB_USB2_CSR REGISTER DEFINITION ----------------*/
+
+#define U3D_POWER_MANAGEMENT            (SSUSB_USB2_CSR_BASE + 0x0004)
+#define U3D_DEVICE_CONTROL              (SSUSB_USB2_CSR_BASE + 0x000C)
+#define U3D_USB2_TEST_MODE              (SSUSB_USB2_CSR_BASE + 0x0014)
+#define U3D_COMMON_USB_INTR_ENABLE      (SSUSB_USB2_CSR_BASE + 0x0018)
+#define U3D_COMMON_USB_INTR             (SSUSB_USB2_CSR_BASE + 0x001C)
+#define U3D_LINK_RESET_INFO             (SSUSB_USB2_CSR_BASE + 0x0024)
+#define U3D_USB20_FRAME_NUM             (SSUSB_USB2_CSR_BASE + 0x003C)
+#define U3D_USB20_LPM_PARAMETER         (SSUSB_USB2_CSR_BASE + 0x0044)
+#define U3D_USB20_MISC_CONTROL          (SSUSB_USB2_CSR_BASE + 0x004C)
+
+/*---------------- SSUSB_USB2_CSR FIELD DEFINITION ----------------*/
+
+/* U3D_POWER_MANAGEMENT */
+#define LPM_BESL_STALL          BIT(14)
+#define LPM_BESLD_STALL         BIT(13)
+#define LPM_RWP                 BIT(11)
+#define LPM_HRWE                BIT(10)
+#define LPM_MODE(x)             (((x) & 0x3) << 8)
+#define ISO_UPDATE              BIT(7)
+#define SOFT_CONN               BIT(6)
+#define HS_ENABLE               BIT(5)
+#define RESUME                  BIT(2)
+#define SUSPENDM_ENABLE         BIT(0)
+
+/* U3D_DEVICE_CONTROL */
+#define DC_HOSTREQ              BIT(1)
+#define DC_SESSION              BIT(0)
+
+/* U3D_USB2_TEST_MODE */
+#define U2U3_AUTO_SWITCH        BIT(10)
+#define LPM_FORCE_STALL         BIT(8)
+#define FIFO_ACCESS             BIT(6)
+#define FORCE_FS                BIT(5)
+#define FORCE_HS                BIT(4)
+#define TEST_PACKET_MODE        BIT(3)
+#define TEST_K_MODE             BIT(2)
+#define TEST_J_MODE             BIT(1)
+#define TEST_SE0_NAK_MODE       BIT(0)
+
+/* U3D_COMMON_USB_INTR_ENABLE */
+/* U3D_COMMON_USB_INTR */
+#define LPM_RESUME_INTR         BIT(9)
+#define LPM_INTR                BIT(8)
+#define DISCONN_INTR            BIT(5)
+#define CONN_INTR               BIT(4)
+#define SOF_INTR                BIT(3)
+#define RESET_INTR              BIT(2)
+#define RESUME_INTR             BIT(1)
+#define SUSPEND_INTR            BIT(0)
+
+/* U3D_LINK_RESET_INFO */
+#define WTCHRP_MSK              GENMASK(19, 16)
+
+/* U3D_USB20_LPM_PARAMETER */
+#define LPM_BESLCK_U3(x)        (((x) & 0xf) << 12)
+#define LPM_BESLCK(x)           (((x) & 0xf) << 8)
+#define LPM_BESLDCK(x)          (((x) & 0xf) << 4)
+#define LPM_BESL                GENMASK(3, 0)
+
+/* U3D_USB20_MISC_CONTROL */
+#define LPM_U3_ACK_EN           BIT(0)
+
+/*---------------- SSUSB_SIFSLV_IPPC REGISTER DEFINITION ----------------*/
+
+#define U3D_SSUSB_IP_PW_CTRL0   (SSUSB_SIFSLV_IPPC_BASE + 0x0000)
+#define U3D_SSUSB_IP_PW_CTRL1   (SSUSB_SIFSLV_IPPC_BASE + 0x0004)
+#define U3D_SSUSB_IP_PW_CTRL2   (SSUSB_SIFSLV_IPPC_BASE + 0x0008)
+#define U3D_SSUSB_IP_PW_CTRL3   (SSUSB_SIFSLV_IPPC_BASE + 0x000C)
+#define U3D_SSUSB_IP_PW_STS1    (SSUSB_SIFSLV_IPPC_BASE + 0x0010)
+#define U3D_SSUSB_IP_PW_STS2    (SSUSB_SIFSLV_IPPC_BASE + 0x0014)
+#define U3D_SSUSB_OTG_STS       (SSUSB_SIFSLV_IPPC_BASE + 0x0018)
+#define U3D_SSUSB_OTG_STS_CLR   (SSUSB_SIFSLV_IPPC_BASE + 0x001C)
+#define U3D_SSUSB_IP_XHCI_CAP   (SSUSB_SIFSLV_IPPC_BASE + 0x0024)
+#define U3D_SSUSB_IP_DEV_CAP    (SSUSB_SIFSLV_IPPC_BASE + 0x0028)
+#define U3D_SSUSB_OTG_INT_EN    (SSUSB_SIFSLV_IPPC_BASE + 0x002C)
+#define U3D_SSUSB_U3_CTRL_0P    (SSUSB_SIFSLV_IPPC_BASE + 0x0030)
+#define U3D_SSUSB_U2_CTRL_0P    (SSUSB_SIFSLV_IPPC_BASE + 0x0050)
+#define U3D_SSUSB_REF_CK_CTRL   (SSUSB_SIFSLV_IPPC_BASE + 0x008C)
+#define U3D_SSUSB_DEV_RST_CTRL  (SSUSB_SIFSLV_IPPC_BASE + 0x0098)
+#define U3D_SSUSB_HW_ID         (SSUSB_SIFSLV_IPPC_BASE + 0x00A0)
+#define U3D_SSUSB_HW_SUB_ID     (SSUSB_SIFSLV_IPPC_BASE + 0x00A4)
+#define U3D_SSUSB_IP_SPARE0     (SSUSB_SIFSLV_IPPC_BASE + 0x00C8)
+
+/*---------------- SSUSB_SIFSLV_IPPC FIELD DEFINITION ----------------*/
+
+/* U3D_SSUSB_IP_PW_CTRL0 */
+#define SSUSB_IP_SW_RST                 BIT(0)
+
+/* U3D_SSUSB_IP_PW_CTRL1 */
+#define SSUSB_IP_HOST_PDN               BIT(0)
+
+/* U3D_SSUSB_IP_PW_CTRL2 */
+#define SSUSB_IP_DEV_PDN                BIT(0)
+
+/* U3D_SSUSB_IP_PW_CTRL3 */
+#define SSUSB_IP_PCIE_PDN               BIT(0)
+
+/* U3D_SSUSB_IP_PW_STS1 */
+#define SSUSB_IP_SLEEP_STS              BIT(30)
+#define SSUSB_U3_MAC_RST_B_STS          BIT(16)
+#define SSUSB_XHCI_RST_B_STS            BIT(11)
+#define SSUSB_SYS125_RST_B_STS          BIT(10)
+#define SSUSB_REF_RST_B_STS             BIT(8)
+#define SSUSB_SYSPLL_STABLE             BIT(0)
+
+/* U3D_SSUSB_IP_PW_STS2 */
+#define SSUSB_U2_MAC_SYS_RST_B_STS      BIT(0)
+
+/* U3D_SSUSB_OTG_STS */
+#define SSUSB_VBUS_VALID                BIT(9)
+
+/* U3D_SSUSB_OTG_STS_CLR */
+#define SSUSB_VBUS_INTR_CLR             BIT(6)
+
+/* U3D_SSUSB_IP_XHCI_CAP */
+#define SSUSB_IP_XHCI_U2_PORT_NUM(x)    (((x) >> 8) & 0xff)
+#define SSUSB_IP_XHCI_U3_PORT_NUM(x)    ((x) & 0xff)
+
+/* U3D_SSUSB_IP_DEV_CAP */
+#define SSUSB_IP_DEV_U3_PORT_NUM(x)     ((x) & 0xff)
+
+/* U3D_SSUSB_OTG_INT_EN */
+#define SSUSB_VBUS_CHG_INT_A_EN         BIT(7)
+#define SSUSB_VBUS_CHG_INT_B_EN         BIT(6)
+
+/* U3D_SSUSB_U3_CTRL_0P */
+#define SSUSB_U3_PORT_HOST_SEL          BIT(2)
+#define SSUSB_U3_PORT_PDN               BIT(1)
+#define SSUSB_U3_PORT_DIS               BIT(0)
+
+/* U3D_SSUSB_U2_CTRL_0P */
+#define SSUSB_U2_PORT_OTG_SEL           BIT(7)
+#define SSUSB_U2_PORT_HOST_SEL          BIT(2)
+#define SSUSB_U2_PORT_PDN               BIT(1)
+#define SSUSB_U2_PORT_DIS               BIT(0)
+
+/* U3D_SSUSB_DEV_RST_CTRL */
+#define SSUSB_DEV_SW_RST                BIT(0)
+
+#endif  /* _SSUSB_HW_REGS_H_ */
diff --git a/drivers/usb/mtu3/mtu3_plat.c b/drivers/usb/mtu3/mtu3_plat.c
new file mode 100644
index 000000000000..783367805c99
--- /dev/null
+++ b/drivers/usb/mtu3/mtu3_plat.c
@@ -0,0 +1,484 @@
+/*
+ * Copyright (C) 2016 MediaTek Inc.
+ *
+ * Author: Chunfeng Yun <chunfeng.yun@mediatek.com>
+ *
+ * This software is licensed under the terms of the GNU General Public
+ * License version 2, as published by the Free Software Foundation, and
+ * may be copied, distributed, and modified under those terms.
+ *
+ * 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.
+ *
+ */
+
+#include <linux/clk.h>
+#include <linux/dma-mapping.h>
+#include <linux/iopoll.h>
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/of_address.h>
+#include <linux/of_irq.h>
+#include <linux/pinctrl/consumer.h>
+#include <linux/platform_device.h>
+
+#include "mtu3.h"
+#include "mtu3_dr.h"
+
+/* u2-port0 should be powered on and enabled; */
+int ssusb_check_clocks(struct ssusb_mtk *ssusb, u32 ex_clks)
+{
+        void __iomem *ibase = ssusb->ippc_base;
+        u32 value, check_val;
+        int ret;
+
+        check_val = ex_clks | SSUSB_SYS125_RST_B_STS | SSUSB_SYSPLL_STABLE |
+                        SSUSB_REF_RST_B_STS;
+
+        ret = readl_poll_timeout(ibase + U3D_SSUSB_IP_PW_STS1, value,
+                        (check_val == (value & check_val)), 100, 20000);
+        if (ret) {
+                dev_err(ssusb->dev, "clks of sts1 are not stable!\n");
+                return ret;
+        }
+
+        ret = readl_poll_timeout(ibase + U3D_SSUSB_IP_PW_STS2, value,
+                        (value & SSUSB_U2_MAC_SYS_RST_B_STS), 100, 10000);
+        if (ret) {
+                dev_err(ssusb->dev, "mac2 clock is not stable\n");
+                return ret;
+        }
+
+        return 0;
+}
+
+static int ssusb_phy_init(struct ssusb_mtk *ssusb)
+{
+        int i;
+        int ret;
+
+        for (i = 0; i < ssusb->num_phys; i++) {
+                ret = phy_init(ssusb->phys[i]);
+                if (ret)
+                        goto exit_phy;
+        }
+        return 0;
+
+exit_phy:
+        for (; i > 0; i--)
+                phy_exit(ssusb->phys[i - 1]);
+
+        return ret;
+}
+
+static int ssusb_phy_exit(struct ssusb_mtk *ssusb)
+{
+        int i;
+
+        for (i = 0; i < ssusb->num_phys; i++)
+                phy_exit(ssusb->phys[i]);
+
+        return 0;
+}
+
+static int ssusb_phy_power_on(struct ssusb_mtk *ssusb)
+{
+        int i;
+        int ret;
+
+        for (i = 0; i < ssusb->num_phys; i++) {
+                ret = phy_power_on(ssusb->phys[i]);
+                if (ret)
+                        goto power_off_phy;
+        }
+        return 0;
+
+power_off_phy:
+        for (; i > 0; i--)
+                phy_power_off(ssusb->phys[i - 1]);
+
+        return ret;
+}
+
+static void ssusb_phy_power_off(struct ssusb_mtk *ssusb)
+{
+        unsigned int i;
+
+        for (i = 0; i < ssusb->num_phys; i++)
+                phy_power_off(ssusb->phys[i]);
+}
+
+static int ssusb_rscs_init(struct ssusb_mtk *ssusb)
+{
+        int ret = 0;
+
+        ret = regulator_enable(ssusb->vusb33);
+        if (ret) {
+                dev_err(ssusb->dev, "failed to enable vusb33\n");
+                goto vusb33_err;
+        }
+
+        ret = clk_prepare_enable(ssusb->sys_clk);
+        if (ret) {
+                dev_err(ssusb->dev, "failed to enable sys_clk\n");
+                goto clk_err;
+        }
+
+        ret = ssusb_phy_init(ssusb);
+        if (ret) {
+                dev_err(ssusb->dev, "failed to init phy\n");
+                goto phy_init_err;
+        }
+
+        ret = ssusb_phy_power_on(ssusb);
+        if (ret) {
+                dev_err(ssusb->dev, "failed to power on phy\n");
+                goto phy_err;
+        }
+
+        return 0;
+
+phy_err:
+        ssusb_phy_exit(ssusb);
+phy_init_err:
+        clk_disable_unprepare(ssusb->sys_clk);
+clk_err:
+        regulator_disable(ssusb->vusb33);
+vusb33_err:
+
+        return ret;
+}
+
+static void ssusb_rscs_exit(struct ssusb_mtk *ssusb)
+{
+        clk_disable_unprepare(ssusb->sys_clk);
+        regulator_disable(ssusb->vusb33);
+        ssusb_phy_power_off(ssusb);
+        ssusb_phy_exit(ssusb);
+}
+
+static void ssusb_ip_sw_reset(struct ssusb_mtk *ssusb)
+{
+        /* reset whole ip (xhci & u3d) */
+        mtu3_setbits(ssusb->ippc_base, U3D_SSUSB_IP_PW_CTRL0, SSUSB_IP_SW_RST);
+        udelay(1);
+        mtu3_clrbits(ssusb->ippc_base, U3D_SSUSB_IP_PW_CTRL0, SSUSB_IP_SW_RST);
+}
+
+static int get_iddig_pinctrl(struct ssusb_mtk *ssusb)
+{
+        struct otg_switch_mtk *otg_sx = &ssusb->otg_switch;
+
+        otg_sx->id_pinctrl = devm_pinctrl_get(ssusb->dev);
+        if (IS_ERR(otg_sx->id_pinctrl)) {
+                dev_err(ssusb->dev, "Cannot find id pinctrl!\n");
+                return PTR_ERR(otg_sx->id_pinctrl);
+        }
+
+        otg_sx->id_float =
+                pinctrl_lookup_state(otg_sx->id_pinctrl, "id_float");
+        if (IS_ERR(otg_sx->id_float)) {
+                dev_err(ssusb->dev, "Cannot find pinctrl id_float!\n");
+                return PTR_ERR(otg_sx->id_float);
+        }
+
+        otg_sx->id_ground =
+                pinctrl_lookup_state(otg_sx->id_pinctrl, "id_ground");
+        if (IS_ERR(otg_sx->id_ground)) {
+                dev_err(ssusb->dev, "Cannot find pinctrl id_ground!\n");
+                return PTR_ERR(otg_sx->id_ground);
+        }
+
+        return 0;
+}
+
+static int get_ssusb_rscs(struct platform_device *pdev, struct ssusb_mtk *ssusb)
+{
+        struct device_node *node = pdev->dev.of_node;
+        struct otg_switch_mtk *otg_sx = &ssusb->otg_switch;
+        struct device *dev = &pdev->dev;
+        struct regulator *vbus;
+        struct resource *res;
+        int i;
+        int ret;
+
+        ssusb->num_phys = of_count_phandle_with_args(node,
+                        "phys", "#phy-cells");
+        if (ssusb->num_phys > 0) {
+                ssusb->phys = devm_kcalloc(dev, ssusb->num_phys,
+                                        sizeof(*ssusb->phys), GFP_KERNEL);
+                if (!ssusb->phys)
+                        return -ENOMEM;
+        } else {
+                ssusb->num_phys = 0;
+        }
+
+        for (i = 0; i < ssusb->num_phys; i++) {
+                ssusb->phys[i] = devm_of_phy_get_by_index(dev, node, i);
+                if (IS_ERR(ssusb->phys[i])) {
+                        dev_err(dev, "failed to get phy-%d\n", i);
+                        return PTR_ERR(ssusb->phys[i]);
+                }
+        }
+
+        res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "ippc");
+        ssusb->ippc_base = devm_ioremap_resource(dev, res);
+        if (IS_ERR(ssusb->ippc_base)) {
+                dev_err(dev, "failed to map memory for ippc\n");
+                return PTR_ERR(ssusb->ippc_base);
+        }
+
+        ssusb->vusb33 = devm_regulator_get(&pdev->dev, "vusb33");
+        if (IS_ERR(ssusb->vusb33)) {
+                dev_err(dev, "failed to get vusb33\n");
+                return PTR_ERR(ssusb->vusb33);
+        }
+
+        ssusb->sys_clk = devm_clk_get(dev, "sys_ck");
+        if (IS_ERR(ssusb->sys_clk)) {
+                dev_err(dev, "failed to get sys clock\n");
+                return PTR_ERR(ssusb->sys_clk);
+        }
+
+        ssusb->dr_mode = usb_get_dr_mode(dev);
+        if (ssusb->dr_mode == USB_DR_MODE_UNKNOWN) {
+                dev_err(dev, "dr_mode is error\n");
+                return -EINVAL;
+        }
+
+        if (ssusb->dr_mode == USB_DR_MODE_PERIPHERAL)
+                return 0;
+
+        /* if host role is supported */
+        ret = ssusb_wakeup_of_property_parse(ssusb, node);
+        if (ret)
+                return ret;
+
+        if (ssusb->dr_mode != USB_DR_MODE_OTG)
+                return 0;
+
+        /* if dual-role mode is supported */
+        vbus = devm_regulator_get(&pdev->dev, "vbus");
+        if (IS_ERR(vbus)) {
+                dev_err(dev, "failed to get vbus\n");
+                return PTR_ERR(vbus);
+        }
+        otg_sx->vbus = vbus;
+
+        otg_sx->is_u3_drd = of_property_read_bool(node, "mediatek,usb3-drd");
+        otg_sx->manual_drd_enabled =
+                of_property_read_bool(node, "enable-manual-drd");
+
+        if (of_property_read_bool(node, "extcon")) {
+                otg_sx->edev = extcon_get_edev_by_phandle(ssusb->dev, 0);
+                if (IS_ERR(otg_sx->edev)) {
+                        dev_err(ssusb->dev, "couldn't get extcon device\n");
+                        return -EPROBE_DEFER;
+                }
+                if (otg_sx->manual_drd_enabled) {
+                        ret = get_iddig_pinctrl(ssusb);
+                        if (ret)
+                                return ret;
+                }
+        }
+
+        dev_info(dev, "dr_mode: %d, is_u3_dr: %d\n",
+                ssusb->dr_mode, otg_sx->is_u3_drd);
+
+        return 0;
+}
+
+static int mtu3_probe(struct platform_device *pdev)
+{
+        struct device_node *node = pdev->dev.of_node;
+        struct device *dev = &pdev->dev;
+        struct ssusb_mtk *ssusb;
+        int ret = -ENOMEM;
+
+        /* all elements are set to ZERO as default value */
+        ssusb = devm_kzalloc(dev, sizeof(*ssusb), GFP_KERNEL);
+        if (!ssusb)
+                return -ENOMEM;
+
+        ret = dma_set_mask_and_coherent(dev, DMA_BIT_MASK(32));
+        if (ret) {
+                dev_err(dev, "No suitable DMA config available\n");
+                return -ENOTSUPP;
+        }
+
+        platform_set_drvdata(pdev, ssusb);
+        ssusb->dev = dev;
+
+        ret = get_ssusb_rscs(pdev, ssusb);
+        if (ret)
+                return ret;
+
+        /* enable power domain */
+        pm_runtime_enable(dev);
+        pm_runtime_get_sync(dev);
+        device_enable_async_suspend(dev);
+
+        ret = ssusb_rscs_init(ssusb);
+        if (ret)
+                goto comm_init_err;
+
+        ssusb_ip_sw_reset(ssusb);
+
+        if (IS_ENABLED(CONFIG_USB_MTU3_HOST))
+                ssusb->dr_mode = USB_DR_MODE_HOST;
+        else if (IS_ENABLED(CONFIG_USB_MTU3_GADGET))
+                ssusb->dr_mode = USB_DR_MODE_PERIPHERAL;
+
+        /* default as host */
+        ssusb->is_host = !(ssusb->dr_mode == USB_DR_MODE_PERIPHERAL);
+
+        switch (ssusb->dr_mode) {
+        case USB_DR_MODE_PERIPHERAL:
+                ret = ssusb_gadget_init(ssusb);
+                if (ret) {
+                        dev_err(dev, "failed to initialize gadget\n");
+                        goto comm_exit;
+                }
+                break;
+        case USB_DR_MODE_HOST:
+                ret = ssusb_host_init(ssusb, node);
+                if (ret) {
+                        dev_err(dev, "failed to initialize host\n");
+                        goto comm_exit;
+                }
+                break;
+        case USB_DR_MODE_OTG:
+                ret = ssusb_gadget_init(ssusb);
+                if (ret) {
+                        dev_err(dev, "failed to initialize gadget\n");
+                        goto comm_exit;
+                }
+
+                ret = ssusb_host_init(ssusb, node);
+                if (ret) {
+                        dev_err(dev, "failed to initialize host\n");
+                        goto gadget_exit;
+                }
+
+                ssusb_otg_switch_init(ssusb);
+                break;
+        default:
+                dev_err(dev, "unsupported mode: %d\n", ssusb->dr_mode);
+                ret = -EINVAL;
+                goto comm_exit;
+        }
+
+        return 0;
+
+gadget_exit:
+        ssusb_gadget_exit(ssusb);
+comm_exit:
+        ssusb_rscs_exit(ssusb);
+comm_init_err:
+        pm_runtime_put_sync(dev);
+        pm_runtime_disable(dev);
+
+        return ret;
+}
+
+static int mtu3_remove(struct platform_device *pdev)
+{
+        struct ssusb_mtk *ssusb = platform_get_drvdata(pdev);
+
+        switch (ssusb->dr_mode) {
+        case USB_DR_MODE_PERIPHERAL:
+                ssusb_gadget_exit(ssusb);
+                break;
+        case USB_DR_MODE_HOST:
+                ssusb_host_exit(ssusb);
+                break;
+        case USB_DR_MODE_OTG:
+                ssusb_otg_switch_exit(ssusb);
+                ssusb_gadget_exit(ssusb);
+                ssusb_host_exit(ssusb);
+                break;
+        default:
+                return -EINVAL;
+        }
+
+        ssusb_rscs_exit(ssusb);
+        pm_runtime_put_sync(&pdev->dev);
+        pm_runtime_disable(&pdev->dev);
+
+        return 0;
+}
+
+/*
+ * when support dual-role mode, we reject suspend when
+ * it works as device mode;
+ */
+static int __maybe_unused mtu3_suspend(struct device *dev)
+{
+        struct platform_device *pdev = to_platform_device(dev);
+        struct ssusb_mtk *ssusb = platform_get_drvdata(pdev);
+
+        dev_dbg(dev, "%s\n", __func__);
+
+        /* REVISIT: disconnect it for only device mode? */
+        if (!ssusb->is_host)
+                return 0;
+
+        ssusb_host_disable(ssusb, true);
+        ssusb_phy_power_off(ssusb);
+        clk_disable_unprepare(ssusb->sys_clk);
+        ssusb_wakeup_enable(ssusb);
+
+        return 0;
+}
+
+static int __maybe_unused mtu3_resume(struct device *dev)
+{
+        struct platform_device *pdev = to_platform_device(dev);
+        struct ssusb_mtk *ssusb = platform_get_drvdata(pdev);
+
+        dev_dbg(dev, "%s\n", __func__);
+
+        if (!ssusb->is_host)
+                return 0;
+
+        ssusb_wakeup_disable(ssusb);
+        clk_prepare_enable(ssusb->sys_clk);
+        ssusb_phy_power_on(ssusb);
+        ssusb_host_enable(ssusb);
+
+        return 0;
+}
+
+static const struct dev_pm_ops mtu3_pm_ops = {
+        SET_SYSTEM_SLEEP_PM_OPS(mtu3_suspend, mtu3_resume)
+};
+
+#define DEV_PM_OPS (IS_ENABLED(CONFIG_PM) ? &mtu3_pm_ops : NULL)
+
+#ifdef CONFIG_OF
+
+static const struct of_device_id mtu3_of_match[] = {
+        {.compatible = "mediatek,mt8173-mtu3",},
+        {},
+};
+
+MODULE_DEVICE_TABLE(of, mtu3_of_match);
+
+#endif
+
+static struct platform_driver mtu3_driver = {
+        .probe = mtu3_probe,
+        .remove = mtu3_remove,
+        .driver = {
+                .name = MTU3_DRIVER_NAME,
+                .pm = DEV_PM_OPS,
+                .of_match_table = of_match_ptr(mtu3_of_match),
+        },
+};
+module_platform_driver(mtu3_driver);
+
+MODULE_AUTHOR("Chunfeng Yun <chunfeng.yun@mediatek.com>");
+MODULE_LICENSE("GPL v2");
+MODULE_DESCRIPTION("MediaTek USB3 DRD Controller Driver");
diff --git a/drivers/usb/mtu3/mtu3_qmu.c b/drivers/usb/mtu3/mtu3_qmu.c
new file mode 100644
index 000000000000..7d9ba8a52368
--- /dev/null
+++ b/drivers/usb/mtu3/mtu3_qmu.c
@@ -0,0 +1,573 @@
+/*
+ * mtu3_qmu.c - Queue Management Unit driver for device controller
+ *
+ * Copyright (C) 2016 MediaTek Inc.
+ *
+ * Author: Chunfeng Yun <chunfeng.yun@mediatek.com>
+ *
+ * This software is licensed under the terms of the GNU General Public
+ * License version 2, as published by the Free Software Foundation, and
+ * may be copied, distributed, and modified under those terms.
+ *
+ * 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.
+ *
+ */
+
+/*
+ * Queue Management Unit (QMU) is designed to unload SW effort
+ * to serve DMA interrupts.
+ * By preparing General Purpose Descriptor (GPD) and Buffer Descriptor (BD),
+ * SW links data buffers and triggers QMU to send / receive data to
+ * host / from device at a time.
+ * And now only GPD is supported.
+ *
+ * For more detailed information, please refer to QMU Programming Guide
+ */
+
+#include <linux/dmapool.h>
+#include <linux/iopoll.h>
+
+#include "mtu3.h"
+
+#define QMU_CHECKSUM_LEN        16
+
+#define GPD_FLAGS_HWO   BIT(0)
+#define GPD_FLAGS_BDP   BIT(1)
+#define GPD_FLAGS_BPS   BIT(2)
+#define GPD_FLAGS_IOC   BIT(7)
+
+#define GPD_EXT_FLAG_ZLP        BIT(5)
+
+
+static struct qmu_gpd *gpd_dma_to_virt(struct mtu3_gpd_ring *ring,
+                dma_addr_t dma_addr)
+{
+        dma_addr_t dma_base = ring->dma;
+        struct qmu_gpd *gpd_head = ring->start;
+        u32 offset = (dma_addr - dma_base) / sizeof(*gpd_head);
+
+        if (offset >= MAX_GPD_NUM)
+                return NULL;
+
+        return gpd_head + offset;
+}
+
+static dma_addr_t gpd_virt_to_dma(struct mtu3_gpd_ring *ring,
+                struct qmu_gpd *gpd)
+{
+        dma_addr_t dma_base = ring->dma;
+        struct qmu_gpd *gpd_head = ring->start;
+        u32 offset;
+
+        offset = gpd - gpd_head;
+        if (offset >= MAX_GPD_NUM)
+                return 0;
+
+        return dma_base + (offset * sizeof(*gpd));
+}
+
+static void gpd_ring_init(struct mtu3_gpd_ring *ring, struct qmu_gpd *gpd)
+{
+        ring->start = gpd;
+        ring->enqueue = gpd;
+        ring->dequeue = gpd;
+        ring->end = gpd + MAX_GPD_NUM - 1;
+}
+
+static void reset_gpd_list(struct mtu3_ep *mep)
+{
+        struct mtu3_gpd_ring *ring = &mep->gpd_ring;
+        struct qmu_gpd *gpd = ring->start;
+
+        if (gpd) {
+                gpd->flag &= ~GPD_FLAGS_HWO;
+                gpd_ring_init(ring, gpd);
+        }
+}
+
+int mtu3_gpd_ring_alloc(struct mtu3_ep *mep)
+{
+        struct qmu_gpd *gpd;
+        struct mtu3_gpd_ring *ring = &mep->gpd_ring;
+
+        /* software own all gpds as default */
+        gpd = dma_pool_zalloc(mep->mtu->qmu_gpd_pool, GFP_ATOMIC, &ring->dma);
+        if (gpd == NULL)
+                return -ENOMEM;
+
+        gpd_ring_init(ring, gpd);
+
+        return 0;
+}
+
+void mtu3_gpd_ring_free(struct mtu3_ep *mep)
+{
+        struct mtu3_gpd_ring *ring = &mep->gpd_ring;
+
+        dma_pool_free(mep->mtu->qmu_gpd_pool,
+                        ring->start, ring->dma);
+        memset(ring, 0, sizeof(*ring));
+}
+
+/*
+ * calculate check sum of a gpd or bd
+ * add "noinline" and "mb" to prevent wrong calculation
+ */
+static noinline u8 qmu_calc_checksum(u8 *data)
+{
+        u8 chksum = 0;
+        int i;
+
+        data[1] = 0x0;  /* set checksum to 0 */
+
+        mb();   /* ensure the gpd/bd is really up-to-date */
+        for (i = 0; i < QMU_CHECKSUM_LEN; i++)
+                chksum += data[i];
+
+        /* Default: HWO=1, @flag[bit0] */
+        chksum += 1;
+
+        return 0xFF - chksum;
+}
+
+void mtu3_qmu_resume(struct mtu3_ep *mep)
+{
+        struct mtu3 *mtu = mep->mtu;
+        void __iomem *mbase = mtu->mac_base;
+        int epnum = mep->epnum;
+        u32 offset;
+
+        offset = mep->is_in ? USB_QMU_TQCSR(epnum) : USB_QMU_RQCSR(epnum);
+
+        mtu3_writel(mbase, offset, QMU_Q_RESUME);
+        if (!(mtu3_readl(mbase, offset) & QMU_Q_ACTIVE))
+                mtu3_writel(mbase, offset, QMU_Q_RESUME);
+}
+
+static struct qmu_gpd *advance_enq_gpd(struct mtu3_gpd_ring *ring)
+{
+        if (ring->enqueue < ring->end)
+                ring->enqueue++;
+        else
+                ring->enqueue = ring->start;
+
+        return ring->enqueue;
+}
+
+static struct qmu_gpd *advance_deq_gpd(struct mtu3_gpd_ring *ring)
+{
+        if (ring->dequeue < ring->end)
+                ring->dequeue++;
+        else
+                ring->dequeue = ring->start;
+
+        return ring->dequeue;
+}
+
+/* check if a ring is emtpy */
+static int gpd_ring_empty(struct mtu3_gpd_ring *ring)
+{
+        struct qmu_gpd *enq = ring->enqueue;
+        struct qmu_gpd *next;
+
+        if (ring->enqueue < ring->end)
+                next = enq + 1;
+        else
+                next = ring->start;
+
+        /* one gpd is reserved to simplify gpd preparation */
+        return next == ring->dequeue;
+}
+
+int mtu3_prepare_transfer(struct mtu3_ep *mep)
+{
+        return gpd_ring_empty(&mep->gpd_ring);
+}
+
+static int mtu3_prepare_tx_gpd(struct mtu3_ep *mep, struct mtu3_request *mreq)
+{
+        struct qmu_gpd *enq;
+        struct mtu3_gpd_ring *ring = &mep->gpd_ring;
+        struct qmu_gpd *gpd = ring->enqueue;
+        struct usb_request *req = &mreq->request;
+
+        /* set all fields to zero as default value */
+        memset(gpd, 0, sizeof(*gpd));
+
+        gpd->buffer = cpu_to_le32((u32)req->dma);
+        gpd->buf_len = cpu_to_le16(req->length);
+        gpd->flag |= GPD_FLAGS_IOC;
+
+        /* get the next GPD */
+        enq = advance_enq_gpd(ring);
+        dev_dbg(mep->mtu->dev, "TX-EP%d queue gpd=%p, enq=%p\n",
+                mep->epnum, gpd, enq);
+
+        enq->flag &= ~GPD_FLAGS_HWO;
+        gpd->next_gpd = cpu_to_le32((u32)gpd_virt_to_dma(ring, enq));
+
+        if (req->zero)
+                gpd->ext_flag |= GPD_EXT_FLAG_ZLP;
+
+        gpd->chksum = qmu_calc_checksum((u8 *)gpd);
+        gpd->flag |= GPD_FLAGS_HWO;
+
+        mreq->gpd = gpd;
+
+        return 0;
+}
+
+static int mtu3_prepare_rx_gpd(struct mtu3_ep *mep, struct mtu3_request *mreq)
+{
+        struct qmu_gpd *enq;
+        struct mtu3_gpd_ring *ring = &mep->gpd_ring;
+        struct qmu_gpd *gpd = ring->enqueue;
+        struct usb_request *req = &mreq->request;
+
+        /* set all fields to zero as default value */
+        memset(gpd, 0, sizeof(*gpd));
+
+        gpd->buffer = cpu_to_le32((u32)req->dma);
+        gpd->data_buf_len = cpu_to_le16(req->length);
+        gpd->flag |= GPD_FLAGS_IOC;
+
+        /* get the next GPD */
+        enq = advance_enq_gpd(ring);
+        dev_dbg(mep->mtu->dev, "RX-EP%d queue gpd=%p, enq=%p\n",
+                mep->epnum, gpd, enq);
+
+        enq->flag &= ~GPD_FLAGS_HWO;
+        gpd->next_gpd = cpu_to_le32((u32)gpd_virt_to_dma(ring, enq));
+        gpd->chksum = qmu_calc_checksum((u8 *)gpd);
+        gpd->flag |= GPD_FLAGS_HWO;
+
+        mreq->gpd = gpd;
+
+        return 0;
+}
+
+void mtu3_insert_gpd(struct mtu3_ep *mep, struct mtu3_request *mreq)
+{
+
+        if (mep->is_in)
+                mtu3_prepare_tx_gpd(mep, mreq);
+        else
+                mtu3_prepare_rx_gpd(mep, mreq);
+}
+
+int mtu3_qmu_start(struct mtu3_ep *mep)
+{
+        struct mtu3 *mtu = mep->mtu;
+        void __iomem *mbase = mtu->mac_base;
+        struct mtu3_gpd_ring *ring = &mep->gpd_ring;
+        u8 epnum = mep->epnum;
+
+        if (mep->is_in) {
+                /* set QMU start address */
+                mtu3_writel(mbase, USB_QMU_TQSAR(mep->epnum), ring->dma);
+                mtu3_setbits(mbase, MU3D_EP_TXCR0(mep->epnum), TX_DMAREQEN);
+                mtu3_setbits(mbase, U3D_QCR0, QMU_TX_CS_EN(epnum));
+                /* send zero length packet according to ZLP flag in GPD */
+                mtu3_setbits(mbase, U3D_QCR1, QMU_TX_ZLP(epnum));
+                mtu3_writel(mbase, U3D_TQERRIESR0,
+                                QMU_TX_LEN_ERR(epnum) | QMU_TX_CS_ERR(epnum));
+
+                if (mtu3_readl(mbase, USB_QMU_TQCSR(epnum)) & QMU_Q_ACTIVE) {
+                        dev_warn(mtu->dev, "Tx %d Active Now!\n", epnum);
+                        return 0;
+                }
+                mtu3_writel(mbase, USB_QMU_TQCSR(epnum), QMU_Q_START);
+
+        } else {
+                mtu3_writel(mbase, USB_QMU_RQSAR(mep->epnum), ring->dma);
+                mtu3_setbits(mbase, MU3D_EP_RXCR0(mep->epnum), RX_DMAREQEN);
+                mtu3_setbits(mbase, U3D_QCR0, QMU_RX_CS_EN(epnum));
+                /* don't expect ZLP */
+                mtu3_clrbits(mbase, U3D_QCR3, QMU_RX_ZLP(epnum));
+                /* move to next GPD when receive ZLP */
+                mtu3_setbits(mbase, U3D_QCR3, QMU_RX_COZ(epnum));
+                mtu3_writel(mbase, U3D_RQERRIESR0,
+                                QMU_RX_LEN_ERR(epnum) | QMU_RX_CS_ERR(epnum));
+                mtu3_writel(mbase, U3D_RQERRIESR1, QMU_RX_ZLP_ERR(epnum));
+
+                if (mtu3_readl(mbase, USB_QMU_RQCSR(epnum)) & QMU_Q_ACTIVE) {
+                        dev_warn(mtu->dev, "Rx %d Active Now!\n", epnum);
+                        return 0;
+                }
+                mtu3_writel(mbase, USB_QMU_RQCSR(epnum), QMU_Q_START);
+        }
+
+        return 0;
+}
+
+/* may called in atomic context */
+void mtu3_qmu_stop(struct mtu3_ep *mep)
+{
+        struct mtu3 *mtu = mep->mtu;
+        void __iomem *mbase = mtu->mac_base;
+        int epnum = mep->epnum;
+        u32 value = 0;
+        u32 qcsr;
+        int ret;
+
+        qcsr = mep->is_in ? USB_QMU_TQCSR(epnum) : USB_QMU_RQCSR(epnum);
+
+        if (!(mtu3_readl(mbase, qcsr) & QMU_Q_ACTIVE)) {
+                dev_dbg(mtu->dev, "%s's qmu is inactive now!\n", mep->name);
+                return;
+        }
+        mtu3_writel(mbase, qcsr, QMU_Q_STOP);
+
+        ret = readl_poll_timeout_atomic(mbase + qcsr, value,
+                        !(value & QMU_Q_ACTIVE), 1, 1000);
+        if (ret) {
+                dev_err(mtu->dev, "stop %s's qmu failed\n", mep->name);
+                return;
+        }
+
+        dev_dbg(mtu->dev, "%s's qmu stop now!\n", mep->name);
+}
+
+void mtu3_qmu_flush(struct mtu3_ep *mep)
+{
+
+        dev_dbg(mep->mtu->dev, "%s flush QMU %s\n", __func__,
+                ((mep->is_in) ? "TX" : "RX"));
+
+        /*Stop QMU */
+        mtu3_qmu_stop(mep);
+        reset_gpd_list(mep);
+}
+
+/*
+ * QMU can't transfer zero length packet directly (a hardware limit
+ * on old SoCs), so when needs to send ZLP, we intentionally trigger
+ * a length error interrupt, and in the ISR sends a ZLP by BMU.
+ */
+static void qmu_tx_zlp_error_handler(struct mtu3 *mtu, u8 epnum)
+{
+        struct mtu3_ep *mep = mtu->in_eps + epnum;
+        struct mtu3_gpd_ring *ring = &mep->gpd_ring;
+        void __iomem *mbase = mtu->mac_base;
+        struct qmu_gpd *gpd_current = NULL;
+        dma_addr_t gpd_dma = mtu3_readl(mbase, USB_QMU_TQCPR(epnum));
+        struct usb_request *req = NULL;
+        struct mtu3_request *mreq;
+        u32 txcsr = 0;
+        int ret;
+
+        mreq = next_request(mep);
+        if (mreq && mreq->request.length == 0)
+                req = &mreq->request;
+        else
+                return;
+
+        gpd_current = gpd_dma_to_virt(ring, gpd_dma);
+
+        if (le16_to_cpu(gpd_current->buf_len) != 0) {
+                dev_err(mtu->dev, "TX EP%d buffer length error(!=0)\n", epnum);
+                return;
+        }
+
+        dev_dbg(mtu->dev, "%s send ZLP for req=%p\n", __func__, mreq);
+
+        mtu3_clrbits(mbase, MU3D_EP_TXCR0(mep->epnum), TX_DMAREQEN);
+
+        ret = readl_poll_timeout_atomic(mbase + MU3D_EP_TXCR0(mep->epnum),
+                        txcsr, !(txcsr & TX_FIFOFULL), 1, 1000);
+        if (ret) {
+                dev_err(mtu->dev, "%s wait for fifo empty fail\n", __func__);
+                return;
+        }
+        mtu3_setbits(mbase, MU3D_EP_TXCR0(mep->epnum), TX_TXPKTRDY);
+
+        /* by pass the current GDP */
+        gpd_current->flag |= GPD_FLAGS_BPS;
+        gpd_current->chksum = qmu_calc_checksum((u8 *)gpd_current);
+        gpd_current->flag |= GPD_FLAGS_HWO;
+
+        /*enable DMAREQEN, switch back to QMU mode */
+        mtu3_setbits(mbase, MU3D_EP_TXCR0(mep->epnum), TX_DMAREQEN);
+        mtu3_qmu_resume(mep);
+}
+
+/*
+ * NOTE: request list maybe is already empty as following case:
+ * queue_tx --> qmu_interrupt(clear interrupt pending, schedule tasklet)-->
+ * queue_tx --> process_tasklet(meanwhile, the second one is transferred,
+ * tasklet process both of them)-->qmu_interrupt for second one.
+ * To avoid upper case, put qmu_done_tx in ISR directly to process it.
+ */
+static void qmu_done_tx(struct mtu3 *mtu, u8 epnum)
+{
+        struct mtu3_ep *mep = mtu->in_eps + epnum;
+        struct mtu3_gpd_ring *ring = &mep->gpd_ring;
+        void __iomem *mbase = mtu->mac_base;
+        struct qmu_gpd *gpd = ring->dequeue;
+        struct qmu_gpd *gpd_current = NULL;
+        dma_addr_t gpd_dma = mtu3_readl(mbase, USB_QMU_TQCPR(epnum));
+        struct usb_request *request = NULL;
+        struct mtu3_request *mreq;
+
+        /*transfer phy address got from QMU register to virtual address */
+        gpd_current = gpd_dma_to_virt(ring, gpd_dma);
+
+        dev_dbg(mtu->dev, "%s EP%d, last=%p, current=%p, enq=%p\n",
+                __func__, epnum, gpd, gpd_current, ring->enqueue);
+
+        while (gpd != gpd_current && !(gpd->flag & GPD_FLAGS_HWO)) {
+
+                mreq = next_request(mep);
+
+                if (mreq == NULL || mreq->gpd != gpd) {
+                        dev_err(mtu->dev, "no correct TX req is found\n");
+                        break;
+                }
+
+                request = &mreq->request;
+                request->actual = le16_to_cpu(gpd->buf_len);
+                mtu3_req_complete(mep, request, 0);
+
+                gpd = advance_deq_gpd(ring);
+        }
+
+        dev_dbg(mtu->dev, "%s EP%d, deq=%p, enq=%p, complete\n",
+                __func__, epnum, ring->dequeue, ring->enqueue);
+
+}
+
+static void qmu_done_rx(struct mtu3 *mtu, u8 epnum)
+{
+        struct mtu3_ep *mep = mtu->out_eps + epnum;
+        struct mtu3_gpd_ring *ring = &mep->gpd_ring;
+        void __iomem *mbase = mtu->mac_base;
+        struct qmu_gpd *gpd = ring->dequeue;
+        struct qmu_gpd *gpd_current = NULL;
+        dma_addr_t gpd_dma = mtu3_readl(mbase, USB_QMU_RQCPR(epnum));
+        struct usb_request *req = NULL;
+        struct mtu3_request *mreq;
+
+        gpd_current = gpd_dma_to_virt(ring, gpd_dma);
+
+        dev_dbg(mtu->dev, "%s EP%d, last=%p, current=%p, enq=%p\n",
+                __func__, epnum, gpd, gpd_current, ring->enqueue);
+
+        while (gpd != gpd_current && !(gpd->flag & GPD_FLAGS_HWO)) {
+
+                mreq = next_request(mep);
+
+                if (mreq == NULL || mreq->gpd != gpd) {
+                        dev_err(mtu->dev, "no correct RX req is found\n");
+                        break;
+                }
+                req = &mreq->request;
+
+                req->actual = le16_to_cpu(gpd->buf_len);
+                mtu3_req_complete(mep, req, 0);
+
+                gpd = advance_deq_gpd(ring);
+        }
+
+        dev_dbg(mtu->dev, "%s EP%d, deq=%p, enq=%p, complete\n",
+                __func__, epnum, ring->dequeue, ring->enqueue);
+}
+
+static void qmu_done_isr(struct mtu3 *mtu, u32 done_status)
+{
+        int i;
+
+        for (i = 1; i < mtu->num_eps; i++) {
+                if (done_status & QMU_RX_DONE_INT(i))
+                        qmu_done_rx(mtu, i);
+                if (done_status & QMU_TX_DONE_INT(i))
+                        qmu_done_tx(mtu, i);
+        }
+}
+
+static void qmu_exception_isr(struct mtu3 *mtu, u32 qmu_status)
+{
+        void __iomem *mbase = mtu->mac_base;
+        u32 errval;
+        int i;
+
+        if ((qmu_status & RXQ_CSERR_INT) || (qmu_status & RXQ_LENERR_INT)) {
+                errval = mtu3_readl(mbase, U3D_RQERRIR0);
+                for (i = 1; i < mtu->num_eps; i++) {
+                        if (errval & QMU_RX_CS_ERR(i))
+                                dev_err(mtu->dev, "Rx %d CS error!\n", i);
+
+                        if (errval & QMU_RX_LEN_ERR(i))
+                                dev_err(mtu->dev, "RX %d Length error\n", i);
+                }
+                mtu3_writel(mbase, U3D_RQERRIR0, errval);
+        }
+
+        if (qmu_status & RXQ_ZLPERR_INT) {
+                errval = mtu3_readl(mbase, U3D_RQERRIR1);
+                for (i = 1; i < mtu->num_eps; i++) {
+                        if (errval & QMU_RX_ZLP_ERR(i))
+                                dev_dbg(mtu->dev, "RX EP%d Recv ZLP\n", i);
+                }
+                mtu3_writel(mbase, U3D_RQERRIR1, errval);
+        }
+
+        if ((qmu_status & TXQ_CSERR_INT) || (qmu_status & TXQ_LENERR_INT)) {
+                errval = mtu3_readl(mbase, U3D_TQERRIR0);
+                for (i = 1; i < mtu->num_eps; i++) {
+                        if (errval & QMU_TX_CS_ERR(i))
+                                dev_err(mtu->dev, "Tx %d checksum error!\n", i);
+
+                        if (errval & QMU_TX_LEN_ERR(i))
+                                qmu_tx_zlp_error_handler(mtu, i);
+                }
+                mtu3_writel(mbase, U3D_TQERRIR0, errval);
+        }
+}
+
+irqreturn_t mtu3_qmu_isr(struct mtu3 *mtu)
+{
+        void __iomem *mbase = mtu->mac_base;
+        u32 qmu_status;
+        u32 qmu_done_status;
+
+        /* U3D_QISAR1 is read update */
+        qmu_status = mtu3_readl(mbase, U3D_QISAR1);
+        qmu_status &= mtu3_readl(mbase, U3D_QIER1);
+
+        qmu_done_status = mtu3_readl(mbase, U3D_QISAR0);
+        qmu_done_status &= mtu3_readl(mbase, U3D_QIER0);
+        mtu3_writel(mbase, U3D_QISAR0, qmu_done_status); /* W1C */
+        dev_dbg(mtu->dev, "=== QMUdone[tx=%x, rx=%x] QMUexp[%x] ===\n",
+                (qmu_done_status & 0xFFFF), qmu_done_status >> 16,
+                qmu_status);
+
+        if (qmu_done_status)
+                qmu_done_isr(mtu, qmu_done_status);
+
+        if (qmu_status)
+                qmu_exception_isr(mtu, qmu_status);
+
+        return IRQ_HANDLED;
+}
+
+int mtu3_qmu_init(struct mtu3 *mtu)
+{
+
+        compiletime_assert(QMU_GPD_SIZE == 16, "QMU_GPD size SHOULD be 16B");
+
+        mtu->qmu_gpd_pool = dma_pool_create("QMU_GPD", mtu->dev,
+                        QMU_GPD_RING_SIZE, QMU_GPD_SIZE, 0);
+
+        if (!mtu->qmu_gpd_pool)
+                return -ENOMEM;
+
+        return 0;
+}
+
+void mtu3_qmu_exit(struct mtu3 *mtu)
+{
+        dma_pool_destroy(mtu->qmu_gpd_pool);
+}
diff --git a/drivers/usb/mtu3/mtu3_qmu.h b/drivers/usb/mtu3/mtu3_qmu.h
new file mode 100644
index 000000000000..4dafa16bf120
--- /dev/null
+++ b/drivers/usb/mtu3/mtu3_qmu.h
@@ -0,0 +1,43 @@
+/*
+ * mtu3_qmu.h - Queue Management Unit driver header
+ *
+ * Copyright (C) 2016 MediaTek Inc.
+ *
+ * Author: Chunfeng Yun <chunfeng.yun@mediatek.com>
+ *
+ * This software is licensed under the terms of the GNU General Public
+ * License version 2, as published by the Free Software Foundation, and
+ * may be copied, distributed, and modified under those terms.
+ *
+ * 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 __MTK_QMU_H__
+#define __MTK_QMU_H__
+
+#define MAX_GPD_NUM             64
+#define QMU_GPD_SIZE            (sizeof(struct qmu_gpd))
+#define QMU_GPD_RING_SIZE       (MAX_GPD_NUM * QMU_GPD_SIZE)
+
+#define GPD_BUF_SIZE            65532
+
+void mtu3_qmu_stop(struct mtu3_ep *mep);
+int mtu3_qmu_start(struct mtu3_ep *mep);
+void mtu3_qmu_resume(struct mtu3_ep *mep);
+void mtu3_qmu_flush(struct mtu3_ep *mep);
+
+void mtu3_insert_gpd(struct mtu3_ep *mep, struct mtu3_request *mreq);
+int mtu3_prepare_transfer(struct mtu3_ep *mep);
+
+int mtu3_gpd_ring_alloc(struct mtu3_ep *mep);
+void mtu3_gpd_ring_free(struct mtu3_ep *mep);
+
+irqreturn_t mtu3_qmu_isr(struct mtu3 *mtu);
+int mtu3_qmu_init(struct mtu3 *mtu);
+void mtu3_qmu_exit(struct mtu3 *mtu);
+
+#endif
diff --git a/drivers/usb/musb/da8xx.c b/drivers/usb/musb/da8xx.c
index 2440f88e07a3..e89708d839e5 100644
--- a/drivers/usb/musb/da8xx.c
+++ b/drivers/usb/musb/da8xx.c
@@ -6,6 +6,9 @@
  * Based on the DaVinci "glue layer" code.
  * Copyright (C) 2005-2006 by Texas Instruments
  *
+ * DT support
+ * Copyright (c) 2016 Petr Kulhavy <petr@barix.com>
+ *
  * This file is part of the Inventra Controller Driver for Linux.
  *
  * The Inventra Controller Driver for Linux is free software; you
@@ -340,6 +343,13 @@ static int da8xx_musb_set_mode(struct musb *musb, u8 musb_mode)
         struct da8xx_glue *glue = dev_get_drvdata(musb->controller->parent);
         enum phy_mode phy_mode;
 
+        /*
+         * The PHY has some issues when it is forced in device or host mode.
+         * Unless the user request another mode, configure the PHY in OTG mode.
+         */
+        if (!musb->is_initialized)
+                return phy_set_mode(glue->phy, PHY_MODE_USB_OTG);
+
         switch (musb_mode) {
         case MUSB_HOST:         /* Force VBUS valid, ID = 0 */
                 phy_mode = PHY_MODE_USB_HOST;
@@ -366,6 +376,12 @@ static int da8xx_musb_init(struct musb *musb)
 
         musb->mregs += DA8XX_MENTOR_CORE_OFFSET;
 
+        ret = clk_prepare_enable(glue->clk);
+        if (ret) {
+                dev_err(glue->dev, "failed to enable clock\n");
+                return ret;
+        }
+
         /* Returns zero if e.g. not clocked */
         rev = musb_readl(reg_base, DA8XX_USB_REVISION_REG);
         if (!rev)
@@ -377,12 +393,6 @@ static int da8xx_musb_init(struct musb *musb)
                 goto fail;
         }
 
-        ret = clk_prepare_enable(glue->clk);
-        if (ret) {
-                dev_err(glue->dev, "failed to enable clock\n");
-                goto fail;
-        }
-
         setup_timer(&otg_workaround, otg_timer, (unsigned long)musb);
 
         /* Reset the controller */
@@ -392,7 +402,7 @@ static int da8xx_musb_init(struct musb *musb)
         ret = phy_init(glue->phy);
         if (ret) {
                 dev_err(glue->dev, "Failed to init phy.\n");
-                goto err_phy_init;
+                goto fail;
         }
 
         ret = phy_power_on(glue->phy);
@@ -412,9 +422,8 @@ static int da8xx_musb_init(struct musb *musb)
 
 err_phy_power_on:
         phy_exit(glue->phy);
-err_phy_init:
-        clk_disable_unprepare(glue->clk);
 fail:
+        clk_disable_unprepare(glue->clk);
         return ret;
 }
 
@@ -433,6 +442,21 @@ static int da8xx_musb_exit(struct musb *musb)
         return 0;
 }
 
+static inline u8 get_vbus_power(struct device *dev)
+{
+        struct regulator *vbus_supply;
+        int current_uA;
+
+        vbus_supply = regulator_get_optional(dev, "vbus");
+        if (IS_ERR(vbus_supply))
+                return 255;
+        current_uA = regulator_get_current_limit(vbus_supply);
+        regulator_put(vbus_supply);
+        if (current_uA <= 0 || current_uA > 510000)
+                return 255;
+        return current_uA / 1000 / 2;
+}
+
 static const struct musb_platform_ops da8xx_ops = {
         .quirks         = MUSB_DMA_CPPI | MUSB_INDEXED_EP,
         .init           = da8xx_musb_init,
@@ -458,6 +482,12 @@ static const struct platform_device_info da8xx_dev_info = {
         .dma_mask       = DMA_BIT_MASK(32),
 };
 
+static const struct musb_hdrc_config da8xx_config = {
+        .ram_bits = 10,
+        .num_eps = 5,
+        .multipoint = 1,
+};
+
 static int da8xx_probe(struct platform_device *pdev)
 {
         struct resource musb_resources[2];
@@ -465,6 +495,7 @@ static int da8xx_probe(struct platform_device *pdev)
         struct da8xx_glue               *glue;
         struct platform_device_info     pinfo;
         struct clk                      *clk;
+        struct device_node              *np = pdev->dev.of_node;
         int                             ret;
 
         glue = devm_kzalloc(&pdev->dev, sizeof(*glue), GFP_KERNEL);
@@ -487,6 +518,16 @@ static int da8xx_probe(struct platform_device *pdev)
         glue->dev                       = &pdev->dev;
         glue->clk                       = clk;
 
+        if (IS_ENABLED(CONFIG_OF) && np) {
+                pdata = devm_kzalloc(&pdev->dev, sizeof(*pdata), GFP_KERNEL);
+                if (!pdata)
+                        return -ENOMEM;
+
+                pdata->config   = &da8xx_config;
+                pdata->mode     = musb_get_mode(&pdev->dev);
+                pdata->power    = get_vbus_power(&pdev->dev);
+        }
+
         pdata->platform_ops             = &da8xx_ops;
 
         glue->usb_phy = usb_phy_generic_register();
@@ -537,11 +578,22 @@ static int da8xx_remove(struct platform_device *pdev)
         return 0;
 }
 
+#ifdef CONFIG_OF
+static const struct of_device_id da8xx_id_table[] = {
+        {
+                .compatible = "ti,da830-musb",
+        },
+        {},
+};
+MODULE_DEVICE_TABLE(of, da8xx_id_table);
+#endif
+
 static struct platform_driver da8xx_driver = {
         .probe          = da8xx_probe,
         .remove         = da8xx_remove,
         .driver         = {
                 .name   = "musb-da8xx",
+                .of_match_table = of_match_ptr(da8xx_id_table),
         },
 };
 
diff --git a/drivers/usb/musb/musb_core.c b/drivers/usb/musb/musb_core.c
index c3e172e15ec3..9e226468a13e 100644
--- a/drivers/usb/musb/musb_core.c
+++ b/drivers/usb/musb/musb_core.c
@@ -100,6 +100,7 @@
 #include <linux/io.h>
 #include <linux/dma-mapping.h>
 #include <linux/usb.h>
+#include <linux/usb/of.h>
 
 #include "musb_core.h"
 #include "musb_trace.h"
@@ -130,6 +131,24 @@ static inline struct musb *dev_to_musb(struct device *dev)
         return dev_get_drvdata(dev);
 }
 
+enum musb_mode musb_get_mode(struct device *dev)
+{
+        enum usb_dr_mode mode;
+
+        mode = usb_get_dr_mode(dev);
+        switch (mode) {
+        case USB_DR_MODE_HOST:
+                return MUSB_HOST;
+        case USB_DR_MODE_PERIPHERAL:
+                return MUSB_PERIPHERAL;
+        case USB_DR_MODE_OTG:
+        case USB_DR_MODE_UNKNOWN:
+        default:
+                return MUSB_OTG;
+        }
+}
+EXPORT_SYMBOL_GPL(musb_get_mode);
+
 /*-------------------------------------------------------------------------*/
 
 #ifndef CONFIG_BLACKFIN
@@ -569,10 +588,7 @@ static irqreturn_t musb_stage0_irq(struct musb *musb, u8 int_usb,
                 if (devctl & MUSB_DEVCTL_HM) {
                         switch (musb->xceiv->otg->state) {
                         case OTG_STATE_A_SUSPEND:
-                                /* remote wakeup?  later, GetPortStatus
-                                 * will stop RESUME signaling
-                                 */
-
+                                /* remote wakeup? */
                                 musb->port1_status |=
                                                 (USB_PORT_STAT_C_SUSPEND << 16)
                                                 | MUSB_PORT_STAT_RESUME;
@@ -2414,8 +2430,9 @@ fail2:
         musb_platform_exit(musb);
 
 fail1:
-        dev_err(musb->controller,
-                "musb_init_controller failed with status %d\n", status);
+        if (status != -EPROBE_DEFER)
+                dev_err(musb->controller,
+                        "%s failed with status %d\n", __func__, status);
 
         musb_free(musb);
 
diff --git a/drivers/usb/musb/musb_core.h b/drivers/usb/musb/musb_core.h
index 91817d77d59c..a611e2f67bdc 100644
--- a/drivers/usb/musb/musb_core.h
+++ b/drivers/usb/musb/musb_core.h
@@ -626,4 +626,10 @@ static inline void musb_platform_post_root_reset_end(struct musb *musb)
                 musb->ops->post_root_reset_end(musb);
 }
 
+/*
+ * gets the "dr_mode" property from DT and converts it into musb_mode
+ * if the property is not found or not recognized returns MUSB_OTG
+ */
+extern enum musb_mode musb_get_mode(struct device *dev);
+
 #endif  /* __MUSB_CORE_H__ */
diff --git a/drivers/usb/musb/musb_gadget.c b/drivers/usb/musb/musb_gadget.c
index a55173c9e564..1acc4864f9f6 100644
--- a/drivers/usb/musb/musb_gadget.c
+++ b/drivers/usb/musb/musb_gadget.c
@@ -974,8 +974,8 @@ static int musb_gadget_enable(struct usb_ep *ep,
                 goto fail;
 
         /* REVISIT this rules out high bandwidth periodic transfers */
-        tmp = usb_endpoint_maxp(desc);
-        if (tmp & ~0x07ff) {
+        tmp = usb_endpoint_maxp_mult(desc) - 1;
+        if (tmp) {
                 int ok;
 
                 if (usb_endpoint_dir_in(desc))
@@ -987,12 +987,12 @@ static int musb_gadget_enable(struct usb_ep *ep,
                         musb_dbg(musb, "no support for high bandwidth ISO");
                         goto fail;
                 }
-                musb_ep->hb_mult = (tmp >> 11) & 3;
+                musb_ep->hb_mult = tmp;
         } else {
                 musb_ep->hb_mult = 0;
         }
 
-        musb_ep->packet_sz = tmp & 0x7ff;
+        musb_ep->packet_sz = usb_endpoint_maxp(desc);
         tmp = musb_ep->packet_sz * (musb_ep->hb_mult + 1);
 
         /* enable the interrupts for the endpoint, set the endpoint
diff --git a/drivers/usb/musb/musb_host.c b/drivers/usb/musb/musb_host.c
index 53bc4ceefe89..f6cdbad00dac 100644
--- a/drivers/usb/musb/musb_host.c
+++ b/drivers/usb/musb/musb_host.c
@@ -2237,7 +2237,7 @@ static int musb_urb_enqueue(
          * Some musb cores don't support high bandwidth ISO transfers; and
          * we don't (yet!) support high bandwidth interrupt transfers.
          */
-        qh->hb_mult = 1 + ((qh->maxpacket >> 11) & 0x03);
+        qh->hb_mult = usb_endpoint_maxp_mult(epd);
         if (qh->hb_mult > 1) {
                 int ok = (qh->type == USB_ENDPOINT_XFER_ISOC);
 
diff --git a/drivers/usb/musb/musb_virthub.c b/drivers/usb/musb/musb_virthub.c
index 61b5f1c3c5bc..0b4595439d51 100644
--- a/drivers/usb/musb/musb_virthub.c
+++ b/drivers/usb/musb/musb_virthub.c
@@ -132,7 +132,6 @@ void musb_port_suspend(struct musb *musb, bool do_suspend)
 
                 musb_dbg(musb, "Root port resuming, power %02x", power);
 
-                /* later, GetPortStatus will stop RESUME signaling */
                 musb->port1_status |= MUSB_PORT_STAT_RESUME;
                 schedule_delayed_work(&musb->finish_resume_work,
                                       msecs_to_jiffies(USB_RESUME_TIMEOUT));
diff --git a/drivers/usb/musb/omap2430.c b/drivers/usb/musb/omap2430.c
index e8be8e39ab8f..8b73214a9ea3 100644
--- a/drivers/usb/musb/omap2430.c
+++ b/drivers/usb/musb/omap2430.c
@@ -277,12 +277,12 @@ static int omap2430_musb_init(struct musb *musb)
                 if (status == -ENXIO)
                         return status;
 
-                pr_err("HS USB OTG: no transceiver configured\n");
+                dev_dbg(dev, "HS USB OTG: no transceiver configured\n");
                 return -EPROBE_DEFER;
         }
 
         if (IS_ERR(musb->phy)) {
-                pr_err("HS USB OTG: no PHY configured\n");
+                dev_err(dev, "HS USB OTG: no PHY configured\n");
                 return PTR_ERR(musb->phy);
         }
         musb->isr = omap2430_musb_interrupt;
@@ -301,7 +301,7 @@ static int omap2430_musb_init(struct musb *musb)
 
         musb_writel(musb->mregs, OTG_INTERFSEL, l);
 
-        pr_debug("HS USB OTG: revision 0x%x, sysconfig 0x%02x, "
+        dev_dbg(dev, "HS USB OTG: revision 0x%x, sysconfig 0x%02x, "
                         "sysstatus 0x%x, intrfsel 0x%x, simenable  0x%x\n",
                         musb_readl(musb->mregs, OTG_REVISION),
                         musb_readl(musb->mregs, OTG_SYSCONFIG),
diff --git a/drivers/usb/musb/sunxi.c b/drivers/usb/musb/sunxi.c
index 1408245be18e..d0be0eadd0d9 100644
--- a/drivers/usb/musb/sunxi.c
+++ b/drivers/usb/musb/sunxi.c
@@ -186,16 +186,6 @@ static irqreturn_t sunxi_musb_interrupt(int irq, void *__hci)
         if (musb->int_usb)
                 writeb(musb->int_usb, musb->mregs + SUNXI_MUSB_INTRUSB);
 
-        /*
-         * sunxi musb often signals babble on low / full speed device
-         * disconnect, without ever raising MUSB_INTR_DISCONNECT, since
-         * normally babble never happens treat it as disconnect.
-         */
-        if ((musb->int_usb & MUSB_INTR_BABBLE) && is_host_active(musb)) {
-                musb->int_usb &= ~MUSB_INTR_BABBLE;
-                musb->int_usb |= MUSB_INTR_DISCONNECT;
-        }
-
         if ((musb->int_usb & MUSB_INTR_RESET) && !is_host_active(musb)) {
                 /* ep0 FADDR must be 0 when (re)entering peripheral mode */
                 musb_ep_select(musb->mregs, 0);
@@ -390,6 +380,20 @@ static int sunxi_musb_set_mode(struct musb *musb, u8 mode)
         return 0;
 }
 
+static int sunxi_musb_recover(struct musb *musb)
+{
+        struct sunxi_glue *glue = dev_get_drvdata(musb->controller->parent);
+
+        /*
+         * Schedule a phy_set_mode with the current glue->phy_mode value,
+         * this will force end the current session.
+         */
+        set_bit(SUNXI_MUSB_FL_PHY_MODE_PEND, &glue->flags);
+        schedule_work(&glue->work);
+
+        return 0;
+}
+
 /*
  * sunxi musb register layout
  * 0x00 - 0x17  fifo regs, 1 long per fifo
@@ -618,6 +622,7 @@ static const struct musb_platform_ops sunxi_musb_ops = {
         .dma_init       = sunxi_musb_dma_controller_create,
         .dma_exit       = sunxi_musb_dma_controller_destroy,
         .set_mode       = sunxi_musb_set_mode,
+        .recover        = sunxi_musb_recover,
         .set_vbus       = sunxi_musb_set_vbus,
         .pre_root_reset_end = sunxi_musb_pre_root_reset_end,
         .post_root_reset_end = sunxi_musb_post_root_reset_end,
diff --git a/drivers/usb/phy/Kconfig b/drivers/usb/phy/Kconfig
index b9c409a18faa..61cef7511a50 100644
--- a/drivers/usb/phy/Kconfig
+++ b/drivers/usb/phy/Kconfig
@@ -84,6 +84,7 @@ config SAMSUNG_USBPHY
 config TWL6030_USB
         tristate "TWL6030 USB Transceiver Driver"
         depends on TWL4030_CORE && OMAP_USB2 && USB_MUSB_OMAP2PLUS
+        depends on OF
         help
           Enable this to support the USB OTG transceiver on TWL6030
           family chips. This TWL6030 transceiver has the VBUS and ID GND
diff --git a/drivers/usb/phy/phy-am335x-control.c b/drivers/usb/phy/phy-am335x-control.c
index 42a1afe36a90..5f5f19813fde 100644
--- a/drivers/usb/phy/phy-am335x-control.c
+++ b/drivers/usb/phy/phy-am335x-control.c
@@ -134,10 +134,12 @@ struct phy_control *am335x_get_phy_control(struct device *dev)
                 return NULL;
 
         dev = bus_find_device(&platform_bus_type, NULL, node, match);
+        of_node_put(node);
         if (!dev)
                 return NULL;
 
         ctrl_usb = dev_get_drvdata(dev);
+        put_device(dev);
         if (!ctrl_usb)
                 return NULL;
         return &ctrl_usb->phy_ctrl;
diff --git a/drivers/usb/phy/phy-generic.c b/drivers/usb/phy/phy-generic.c
index 8311ba2968cd..89d6e7a5fdb7 100644
--- a/drivers/usb/phy/phy-generic.c
+++ b/drivers/usb/phy/phy-generic.c
@@ -59,6 +59,15 @@ EXPORT_SYMBOL_GPL(usb_phy_generic_unregister);
 
 static int nop_set_suspend(struct usb_phy *x, int suspend)
 {
+        struct usb_phy_generic *nop = dev_get_drvdata(x->dev);
+
+        if (!IS_ERR(nop->clk)) {
+                if (suspend)
+                        clk_disable_unprepare(nop->clk);
+                else
+                        clk_prepare_enable(nop->clk);
+        }
+
         return 0;
 }
 
diff --git a/drivers/usb/phy/phy-isp1301-omap.c b/drivers/usb/phy/phy-isp1301-omap.c
index 8d111ec653e4..042c5a8fd423 100644
--- a/drivers/usb/phy/phy-isp1301-omap.c
+++ b/drivers/usb/phy/phy-isp1301-omap.c
@@ -94,7 +94,7 @@ struct isp1301 {
 
 #if defined(CONFIG_MACH_OMAP_H2) || defined(CONFIG_MACH_OMAP_H3)
 
-#if     defined(CONFIG_TPS65010) || (defined(CONFIG_TPS65010_MODULE) && defined(MODULE))
+#if IS_REACHABLE(CONFIG_TPS65010)
 
 #include <linux/i2c/tps65010.h>
 
diff --git a/drivers/usb/phy/phy-twl6030-usb.c b/drivers/usb/phy/phy-twl6030-usb.c
index a72e8d670adc..628b600b02b1 100644
--- a/drivers/usb/phy/phy-twl6030-usb.c
+++ b/drivers/usb/phy/phy-twl6030-usb.c
@@ -108,7 +108,6 @@ struct twl6030_usb {
         enum musb_vbus_id_status linkstat;
         u8                      asleep;
         bool                    vbus_enable;
-        const char              *regulator;
 };
 
 #define comparator_to_twl(x) container_of((x), struct twl6030_usb, comparator)
@@ -166,7 +165,7 @@ static int twl6030_usb_ldo_init(struct twl6030_usb *twl)
         /* Program MISC2 register and set bit VUSB_IN_VBAT */
         twl6030_writeb(twl, TWL6030_MODULE_ID0, 0x10, TWL6030_MISC2);
 
-        twl->usb3v3 = regulator_get(twl->dev, twl->regulator);
+        twl->usb3v3 = regulator_get(twl->dev, "usb");
         if (IS_ERR(twl->usb3v3))
                 return -ENODEV;
 
@@ -341,7 +340,11 @@ static int twl6030_usb_probe(struct platform_device *pdev)
         int                     status, err;
         struct device_node      *np = pdev->dev.of_node;
         struct device           *dev = &pdev->dev;
-        struct twl4030_usb_data *pdata = dev_get_platdata(dev);
+
+        if (!np) {
+                dev_err(dev, "no DT info\n");
+                return -EINVAL;
+        }
 
         twl = devm_kzalloc(dev, sizeof(*twl), GFP_KERNEL);
         if (!twl)
@@ -361,18 +364,6 @@ static int twl6030_usb_probe(struct platform_device *pdev)
                 return -EPROBE_DEFER;
         }
 
-        if (np) {
-                twl->regulator = "usb";
-        } else if (pdata) {
-                if (pdata->features & TWL6032_SUBCLASS)
-                        twl->regulator = "ldousb";
-                else
-                        twl->regulator = "vusb";
-        } else {
-                dev_err(&pdev->dev, "twl6030 initialized without pdata\n");
-                return -EINVAL;
-        }
-
         /* init spinlock for workqueue */
         spin_lock_init(&twl->lock);
 
@@ -436,13 +427,11 @@ static int twl6030_usb_remove(struct platform_device *pdev)
         return 0;
 }
 
-#ifdef CONFIG_OF
 static const struct of_device_id twl6030_usb_id_table[] = {
         { .compatible = "ti,twl6030-usb" },
         {}
 };
 MODULE_DEVICE_TABLE(of, twl6030_usb_id_table);
-#endif
 
 static struct platform_driver twl6030_usb_driver = {
         .probe          = twl6030_usb_probe,
diff --git a/drivers/usb/renesas_usbhs/fifo.c b/drivers/usb/renesas_usbhs/fifo.c
index 857e78337324..d1af831f43eb 100644
--- a/drivers/usb/renesas_usbhs/fifo.c
+++ b/drivers/usb/renesas_usbhs/fifo.c
@@ -100,10 +100,7 @@ static void __usbhsf_pkt_del(struct usbhs_pkt *pkt)
 
 static struct usbhs_pkt *__usbhsf_pkt_get(struct usbhs_pipe *pipe)
 {
-        if (list_empty(&pipe->list))
-                return NULL;
-
-        return list_first_entry(&pipe->list, struct usbhs_pkt, node);
+        return list_first_entry_or_null(&pipe->list, struct usbhs_pkt, node);
 }
 
 static void usbhsf_fifo_clear(struct usbhs_pipe *pipe,
diff --git a/drivers/usb/serial/Kconfig b/drivers/usb/serial/Kconfig
index 56ecb8b5115d..d9bc8dafe000 100644
--- a/drivers/usb/serial/Kconfig
+++ b/drivers/usb/serial/Kconfig
@@ -255,6 +255,16 @@ config USB_SERIAL_F81232
           To compile this driver as a module, choose M here: the
           module will be called f81232.
 
+config USB_SERIAL_F8153X
+        tristate "USB Fintek F81532/534 Multi-Ports Serial Driver"
+        help
+          Say Y here if you want to use the Fintek F81532/534 Multi-Ports
+          USB to serial adapter.
+
+          To compile this driver as a module, choose M here: the
+          module will be called f81534.
+
+
 config USB_SERIAL_GARMIN
        tristate "USB Garmin GPS driver"
        help
diff --git a/drivers/usb/serial/Makefile b/drivers/usb/serial/Makefile
index 349d9df0895f..9e43b7b002eb 100644
--- a/drivers/usb/serial/Makefile
+++ b/drivers/usb/serial/Makefile
@@ -23,6 +23,7 @@ obj-$(CONFIG_USB_SERIAL_EDGEPORT)		+= io_edgeport.o
 obj-$(CONFIG_USB_SERIAL_EDGEPORT_TI)            += io_ti.o
 obj-$(CONFIG_USB_SERIAL_EMPEG)                  += empeg.o
 obj-$(CONFIG_USB_SERIAL_F81232)                 += f81232.o
+obj-$(CONFIG_USB_SERIAL_F8153X)                 += f81534.o
 obj-$(CONFIG_USB_SERIAL_FTDI_SIO)               += ftdi_sio.o
 obj-$(CONFIG_USB_SERIAL_GARMIN)                 += garmin_gps.o
 obj-$(CONFIG_USB_SERIAL_IPAQ)                   += ipaq.o
diff --git a/drivers/usb/serial/ch341.c b/drivers/usb/serial/ch341.c
index f139488d0816..2597b83a8ae2 100644
--- a/drivers/usb/serial/ch341.c
+++ b/drivers/usb/serial/ch341.c
@@ -61,13 +61,26 @@
  * the Net/FreeBSD uchcom.c driver by Takanori Watanabe.  Domo arigato.
  */
 
+#define CH341_REQ_READ_VERSION 0x5F
 #define CH341_REQ_WRITE_REG    0x9A
 #define CH341_REQ_READ_REG     0x95
-#define CH341_REG_BREAK1       0x05
-#define CH341_REG_BREAK2       0x18
-#define CH341_NBREAK_BITS_REG1 0x01
-#define CH341_NBREAK_BITS_REG2 0x40
-
+#define CH341_REQ_SERIAL_INIT  0xA1
+#define CH341_REQ_MODEM_CTRL   0xA4
+
+#define CH341_REG_BREAK        0x05
+#define CH341_REG_LCR          0x18
+#define CH341_NBREAK_BITS      0x01
+
+#define CH341_LCR_ENABLE_RX    0x80
+#define CH341_LCR_ENABLE_TX    0x40
+#define CH341_LCR_MARK_SPACE   0x20
+#define CH341_LCR_PAR_EVEN     0x10
+#define CH341_LCR_ENABLE_PAR   0x08
+#define CH341_LCR_STOP_BITS_2  0x04
+#define CH341_LCR_CS8          0x03
+#define CH341_LCR_CS7          0x02
+#define CH341_LCR_CS6          0x01
+#define CH341_LCR_CS5          0x00
 
 static const struct usb_device_id id_table[] = {
         { USB_DEVICE(0x4348, 0x5523) },
@@ -119,10 +132,10 @@ static int ch341_control_in(struct usb_device *dev,
         return r;
 }
 
-static int ch341_set_baudrate(struct usb_device *dev,
-                              struct ch341_private *priv)
+static int ch341_init_set_baudrate(struct usb_device *dev,
+                                   struct ch341_private *priv, unsigned ctrl)
 {
-        short a, b;
+        short a;
         int r;
         unsigned long factor;
         short divisor;
@@ -142,18 +155,17 @@ static int ch341_set_baudrate(struct usb_device *dev,
 
         factor = 0x10000 - factor;
         a = (factor & 0xff00) | divisor;
-        b = factor & 0xff;
 
-        r = ch341_control_out(dev, 0x9a, 0x1312, a);
-        if (!r)
-                r = ch341_control_out(dev, 0x9a, 0x0f2c, b);
+        /* 0x9c is "enable SFR_UART Control register and timer" */
+        r = ch341_control_out(dev, CH341_REQ_SERIAL_INIT,
+                              0x9c | (ctrl << 8), a | 0x80);
 
         return r;
 }
 
 static int ch341_set_handshake(struct usb_device *dev, u8 control)
 {
-        return ch341_control_out(dev, 0xa4, ~control, 0);
+        return ch341_control_out(dev, CH341_REQ_MODEM_CTRL, ~control, 0);
 }
 
 static int ch341_get_status(struct usb_device *dev, struct ch341_private *priv)
@@ -167,7 +179,7 @@ static int ch341_get_status(struct usb_device *dev, struct ch341_private *priv)
         if (!buffer)
                 return -ENOMEM;
 
-        r = ch341_control_in(dev, 0x95, 0x0706, 0, buffer, size);
+        r = ch341_control_in(dev, CH341_REQ_READ_REG, 0x0706, 0, buffer, size);
         if (r < 0)
                 goto out;
 
@@ -197,24 +209,21 @@ static int ch341_configure(struct usb_device *dev, struct ch341_private *priv)
                 return -ENOMEM;
 
         /* expect two bytes 0x27 0x00 */
-        r = ch341_control_in(dev, 0x5f, 0, 0, buffer, size);
+        r = ch341_control_in(dev, CH341_REQ_READ_VERSION, 0, 0, buffer, size);
         if (r < 0)
                 goto out;
+        dev_dbg(&dev->dev, "Chip version: 0x%02x\n", buffer[0]);
 
-        r = ch341_control_out(dev, 0xa1, 0, 0);
-        if (r < 0)
-                goto out;
-
-        r = ch341_set_baudrate(dev, priv);
+        r = ch341_control_out(dev, CH341_REQ_SERIAL_INIT, 0, 0);
         if (r < 0)
                 goto out;
 
         /* expect two bytes 0x56 0x00 */
-        r = ch341_control_in(dev, 0x95, 0x2518, 0, buffer, size);
+        r = ch341_control_in(dev, CH341_REQ_READ_REG, 0x2518, 0, buffer, size);
         if (r < 0)
                 goto out;
 
-        r = ch341_control_out(dev, 0x9a, 0x2518, 0x0050);
+        r = ch341_control_out(dev, CH341_REQ_WRITE_REG, 0x2518, 0x0050);
         if (r < 0)
                 goto out;
 
@@ -223,11 +232,7 @@ static int ch341_configure(struct usb_device *dev, struct ch341_private *priv)
         if (r < 0)
                 goto out;
 
-        r = ch341_control_out(dev, 0xa1, 0x501f, 0xd90a);
-        if (r < 0)
-                goto out;
-
-        r = ch341_set_baudrate(dev, priv);
+        r = ch341_init_set_baudrate(dev, priv, 0);
         if (r < 0)
                 goto out;
 
@@ -342,16 +347,53 @@ static void ch341_set_termios(struct tty_struct *tty,
         struct ch341_private *priv = usb_get_serial_port_data(port);
         unsigned baud_rate;
         unsigned long flags;
+        unsigned char ctrl;
+        int r;
+
+        /* redundant changes may cause the chip to lose bytes */
+        if (old_termios && !tty_termios_hw_change(&tty->termios, old_termios))
+                return;
 
         baud_rate = tty_get_baud_rate(tty);
 
         priv->baud_rate = baud_rate;
+        ctrl = CH341_LCR_ENABLE_RX | CH341_LCR_ENABLE_TX;
+
+        switch (C_CSIZE(tty)) {
+        case CS5:
+                ctrl |= CH341_LCR_CS5;
+                break;
+        case CS6:
+                ctrl |= CH341_LCR_CS6;
+                break;
+        case CS7:
+                ctrl |= CH341_LCR_CS7;
+                break;
+        case CS8:
+                ctrl |= CH341_LCR_CS8;
+                break;
+        }
+
+        if (C_PARENB(tty)) {
+                ctrl |= CH341_LCR_ENABLE_PAR;
+                if (C_PARODD(tty) == 0)
+                        ctrl |= CH341_LCR_PAR_EVEN;
+                if (C_CMSPAR(tty))
+                        ctrl |= CH341_LCR_MARK_SPACE;
+        }
+
+        if (C_CSTOPB(tty))
+                ctrl |= CH341_LCR_STOP_BITS_2;
 
         if (baud_rate) {
                 spin_lock_irqsave(&priv->lock, flags);
                 priv->line_control |= (CH341_BIT_DTR | CH341_BIT_RTS);
                 spin_unlock_irqrestore(&priv->lock, flags);
-                ch341_set_baudrate(port->serial->dev, priv);
+                r = ch341_init_set_baudrate(port->serial->dev, priv, ctrl);
+                if (r < 0 && old_termios) {
+                        priv->baud_rate = tty_termios_baud_rate(old_termios);
+                        tty_termios_copy_hw(&tty->termios, old_termios);
+                }
         } else {
                 spin_lock_irqsave(&priv->lock, flags);
                 priv->line_control &= ~(CH341_BIT_DTR | CH341_BIT_RTS);
@@ -360,17 +402,12 @@ static void ch341_set_termios(struct tty_struct *tty,
 
         ch341_set_handshake(port->serial->dev, priv->line_control);
 
-        /* Unimplemented:
-         * (cflag & CSIZE) : data bits [5, 8]
-         * (cflag & PARENB) : parity {NONE, EVEN, ODD}
-         * (cflag & CSTOPB) : stop bits [1, 2]
-         */
 }
 
 static void ch341_break_ctl(struct tty_struct *tty, int break_state)
 {
         const uint16_t ch341_break_reg =
-                        ((uint16_t) CH341_REG_BREAK2 << 8) | CH341_REG_BREAK1;
+                        ((uint16_t) CH341_REG_LCR << 8) | CH341_REG_BREAK;
         struct usb_serial_port *port = tty->driver_data;
         int r;
         uint16_t reg_contents;
@@ -391,12 +428,12 @@ static void ch341_break_ctl(struct tty_struct *tty, int break_state)
                 __func__, break_reg[0], break_reg[1]);
         if (break_state != 0) {
                 dev_dbg(&port->dev, "%s - Enter break state requested\n", __func__);
-                break_reg[0] &= ~CH341_NBREAK_BITS_REG1;
-                break_reg[1] &= ~CH341_NBREAK_BITS_REG2;
+                break_reg[0] &= ~CH341_NBREAK_BITS;
+                break_reg[1] &= ~CH341_LCR_ENABLE_TX;
         } else {
                 dev_dbg(&port->dev, "%s - Leave break state requested\n", __func__);
-                break_reg[0] |= CH341_NBREAK_BITS_REG1;
-                break_reg[1] |= CH341_NBREAK_BITS_REG2;
+                break_reg[0] |= CH341_NBREAK_BITS;
+                break_reg[1] |= CH341_LCR_ENABLE_TX;
         }
         dev_dbg(&port->dev, "%s - New ch341 break register contents - reg1: %x, reg2: %x\n",
                 __func__, break_reg[0], break_reg[1]);
diff --git a/drivers/usb/serial/cp210x.c b/drivers/usb/serial/cp210x.c
index 243ac5ebe46a..fff718352e0c 100644
--- a/drivers/usb/serial/cp210x.c
+++ b/drivers/usb/serial/cp210x.c
@@ -23,6 +23,9 @@
 #include <linux/usb.h>
 #include <linux/uaccess.h>
 #include <linux/usb/serial.h>
+#include <linux/gpio/driver.h>
+#include <linux/bitops.h>
+#include <linux/mutex.h>
 
 #define DRIVER_DESC "Silicon Labs CP210x RS232 serial adaptor driver"
 
@@ -33,7 +36,7 @@ static int cp210x_open(struct tty_struct *tty, struct usb_serial_port *);
 static void cp210x_close(struct usb_serial_port *);
 static void cp210x_get_termios(struct tty_struct *, struct usb_serial_port *);
 static void cp210x_get_termios_port(struct usb_serial_port *port,
-        unsigned int *cflagp, unsigned int *baudp);
+        tcflag_t *cflagp, unsigned int *baudp);
 static void cp210x_change_speed(struct tty_struct *, struct usb_serial_port *,
                                                         struct ktermios *);
 static void cp210x_set_termios(struct tty_struct *, struct usb_serial_port *,
@@ -44,6 +47,9 @@ static int cp210x_tiocmset(struct tty_struct *, unsigned int, unsigned int);
 static int cp210x_tiocmset_port(struct usb_serial_port *port,
                 unsigned int, unsigned int);
 static void cp210x_break_ctl(struct tty_struct *, int);
+static int cp210x_attach(struct usb_serial *);
+static void cp210x_disconnect(struct usb_serial *);
+static void cp210x_release(struct usb_serial *);
 static int cp210x_port_probe(struct usb_serial_port *);
 static int cp210x_port_remove(struct usb_serial_port *);
 static void cp210x_dtr_rts(struct usb_serial_port *p, int on);
@@ -209,6 +215,16 @@ static const struct usb_device_id id_table[] = {
 
 MODULE_DEVICE_TABLE(usb, id_table);
 
+struct cp210x_serial_private {
+#ifdef CONFIG_GPIOLIB
+        struct gpio_chip        gc;
+        u8                      config;
+        u8                      gpio_mode;
+        bool                    gpio_registered;
+#endif
+        u8                      partnum;
+};
+
 struct cp210x_port_private {
         __u8                    bInterfaceNumber;
         bool                    has_swapped_line_ctl;
@@ -230,6 +246,9 @@ static struct usb_serial_driver cp210x_device = {
         .tx_empty               = cp210x_tx_empty,
         .tiocmget               = cp210x_tiocmget,
         .tiocmset               = cp210x_tiocmset,
+        .attach                 = cp210x_attach,
+        .disconnect             = cp210x_disconnect,
+        .release                = cp210x_release,
         .port_probe             = cp210x_port_probe,
         .port_remove            = cp210x_port_remove,
         .dtr_rts                = cp210x_dtr_rts
@@ -272,6 +291,7 @@ static struct usb_serial_driver * const serial_drivers[] = {
 #define CP210X_SET_CHARS        0x19
 #define CP210X_GET_BAUDRATE     0x1D
 #define CP210X_SET_BAUDRATE     0x1E
+#define CP210X_VENDOR_SPECIFIC  0xFF
 
 /* CP210X_IFC_ENABLE */
 #define UART_ENABLE             0x0001
@@ -314,6 +334,21 @@ static struct usb_serial_driver * const serial_drivers[] = {
 #define CONTROL_WRITE_DTR       0x0100
 #define CONTROL_WRITE_RTS       0x0200
 
+/* CP210X_VENDOR_SPECIFIC values */
+#define CP210X_READ_LATCH       0x00C2
+#define CP210X_GET_PARTNUM      0x370B
+#define CP210X_GET_PORTCONFIG   0x370C
+#define CP210X_GET_DEVICEMODE   0x3711
+#define CP210X_WRITE_LATCH      0x37E1
+
+/* Part number definitions */
+#define CP210X_PARTNUM_CP2101   0x01
+#define CP210X_PARTNUM_CP2102   0x02
+#define CP210X_PARTNUM_CP2103   0x03
+#define CP210X_PARTNUM_CP2104   0x04
+#define CP210X_PARTNUM_CP2105   0x05
+#define CP210X_PARTNUM_CP2108   0x08
+
 /* CP210X_GET_COMM_STATUS returns these 0x13 bytes */
 struct cp210x_comm_status {
         __le32   ulErrors;
@@ -369,6 +404,60 @@ struct cp210x_flow_ctl {
 #define CP210X_SERIAL_RTS_ACTIVE        1
 #define CP210X_SERIAL_RTS_FLOW_CTL      2
 
+/* CP210X_VENDOR_SPECIFIC, CP210X_GET_DEVICEMODE call reads these 0x2 bytes. */
+struct cp210x_pin_mode {
+        u8      eci;
+        u8      sci;
+} __packed;
+
+#define CP210X_PIN_MODE_MODEM           0
+#define CP210X_PIN_MODE_GPIO            BIT(0)
+
+/*
+ * CP210X_VENDOR_SPECIFIC, CP210X_GET_PORTCONFIG call reads these 0xf bytes.
+ * Structure needs padding due to unused/unspecified bytes.
+ */
+struct cp210x_config {
+        __le16  gpio_mode;
+        u8      __pad0[2];
+        __le16  reset_state;
+        u8      __pad1[4];
+        __le16  suspend_state;
+        u8      sci_cfg;
+        u8      eci_cfg;
+        u8      device_cfg;
+} __packed;
+
+/* GPIO modes */
+#define CP210X_SCI_GPIO_MODE_OFFSET     9
+#define CP210X_SCI_GPIO_MODE_MASK       GENMASK(11, 9)
+
+#define CP210X_ECI_GPIO_MODE_OFFSET     2
+#define CP210X_ECI_GPIO_MODE_MASK       GENMASK(3, 2)
+
+/* CP2105 port configuration values */
+#define CP2105_GPIO0_TXLED_MODE         BIT(0)
+#define CP2105_GPIO1_RXLED_MODE         BIT(1)
+#define CP2105_GPIO1_RS485_MODE         BIT(2)
+
+/* CP210X_VENDOR_SPECIFIC, CP210X_WRITE_LATCH call writes these 0x2 bytes. */
+struct cp210x_gpio_write {
+        u8      mask;
+        u8      state;
+} __packed;
+
+/*
+ * Helper to get interface number when we only have struct usb_serial.
+ */
+static u8 cp210x_interface_num(struct usb_serial *serial)
+{
+        struct usb_host_interface *cur_altsetting;
+
+        cur_altsetting = serial->interface->cur_altsetting;
+
+        return cur_altsetting->desc.bInterfaceNumber;
+}
+
 /*
  * Reads a variable-sized block of CP210X_ registers, identified by req.
  * Returns data into buf in native USB byte order.
@@ -402,7 +491,7 @@ static int cp210x_read_reg_block(struct usb_serial_port *port, u8 req,
                 dev_err(&port->dev, "failed get req 0x%x size %d status: %d\n",
                                 req, bufsize, result);
                 if (result >= 0)
-                        result = -EPROTO;
+                        result = -EIO;
 
                 /*
                  * FIXME Some callers don't bother to check for error,
@@ -465,6 +554,40 @@ static int cp210x_read_u8_reg(struct usb_serial_port *port, u8 req, u8 *val)
 }
 
 /*
+ * Reads a variable-sized vendor block of CP210X_ registers, identified by val.
+ * Returns data into buf in native USB byte order.
+ */
+static int cp210x_read_vendor_block(struct usb_serial *serial, u8 type, u16 val,
+                                    void *buf, int bufsize)
+{
+        void *dmabuf;
+        int result;
+
+        dmabuf = kmalloc(bufsize, GFP_KERNEL);
+        if (!dmabuf)
+                return -ENOMEM;
+
+        result = usb_control_msg(serial->dev, usb_rcvctrlpipe(serial->dev, 0),
+                                 CP210X_VENDOR_SPECIFIC, type, val,
+                                 cp210x_interface_num(serial), dmabuf, bufsize,
+                                 USB_CTRL_GET_TIMEOUT);
+        if (result == bufsize) {
+                memcpy(buf, dmabuf, bufsize);
+                result = 0;
+        } else {
+                dev_err(&serial->interface->dev,
+                        "failed to get vendor val 0x%04x size %d: %d\n", val,
+                        bufsize, result);
+                if (result >= 0)
+                        result = -EIO;
+        }
+
+        kfree(dmabuf);
+
+        return result;
+}
+
+/*
  * Writes any 16-bit CP210X_ register (req) whose value is passed
  * entirely in the wValue field of the USB request.
  */
@@ -515,7 +638,7 @@ static int cp210x_write_reg_block(struct usb_serial_port *port, u8 req,
                 dev_err(&port->dev, "failed set req 0x%x size %d status: %d\n",
                                 req, bufsize, result);
                 if (result >= 0)
-                        result = -EPROTO;
+                        result = -EIO;
         }
 
         return result;
@@ -533,6 +656,42 @@ static int cp210x_write_u32_reg(struct usb_serial_port *port, u8 req, u32 val)
         return cp210x_write_reg_block(port, req, &le32_val, sizeof(le32_val));
 }
 
+#ifdef CONFIG_GPIOLIB
+/*
+ * Writes a variable-sized vendor block of CP210X_ registers, identified by val.
+ * Data in buf must be in native USB byte order.
+ */
+static int cp210x_write_vendor_block(struct usb_serial *serial, u8 type,
+                                     u16 val, void *buf, int bufsize)
+{
+        void *dmabuf;
+        int result;
+
+        dmabuf = kmemdup(buf, bufsize, GFP_KERNEL);
+        if (!dmabuf)
+                return -ENOMEM;
+
+        result = usb_control_msg(serial->dev, usb_sndctrlpipe(serial->dev, 0),
+                                 CP210X_VENDOR_SPECIFIC, type, val,
+                                 cp210x_interface_num(serial), dmabuf, bufsize,
+                                 USB_CTRL_SET_TIMEOUT);
+
+        kfree(dmabuf);
+
+        if (result == bufsize) {
+                result = 0;
+        } else {
+                dev_err(&serial->interface->dev,
+                        "failed to set vendor val 0x%04x size %d: %d\n", val,
+                        bufsize, result);
+                if (result >= 0)
+                        result = -EIO;
+        }
+
+        return result;
+}
+#endif
+
 /*
  * Detect CP2108 GET_LINE_CTL bug and activate workaround.
  * Write a known good value 0x800, read it back.
@@ -683,7 +842,7 @@ static int cp210x_get_tx_queue_byte_count(struct usb_serial_port *port,
         } else {
                 dev_err(&port->dev, "failed to get comm status: %d\n", result);
                 if (result >= 0)
-                        result = -EPROTO;
+                        result = -EIO;
         }
 
         kfree(sts);
@@ -719,7 +878,7 @@ static void cp210x_get_termios(struct tty_struct *tty,
                         &tty->termios.c_cflag, &baud);
                 tty_encode_baud_rate(tty, baud, baud);
         } else {
-                unsigned int cflag;
+                tcflag_t cflag;
                 cflag = 0;
                 cp210x_get_termios_port(port, &cflag, &baud);
         }
@@ -730,10 +889,10 @@ static void cp210x_get_termios(struct tty_struct *tty,
  * This is the heart of cp210x_get_termios which always uses a &usb_serial_port.
  */
 static void cp210x_get_termios_port(struct usb_serial_port *port,
-        unsigned int *cflagp, unsigned int *baudp)
+        tcflag_t *cflagp, unsigned int *baudp)
 {
         struct device *dev = &port->dev;
-        unsigned int cflag;
+        tcflag_t cflag;
         struct cp210x_flow_ctl flow_ctl;
         u32 baud;
         u16 bits;
@@ -930,16 +1089,9 @@ static void cp210x_set_termios(struct tty_struct *tty,
                         dev_dbg(dev, "%s - data bits = 7\n", __func__);
                         break;
                 case CS8:
-                        bits |= BITS_DATA_8;
-                        dev_dbg(dev, "%s - data bits = 8\n", __func__);
-                        break;
-                /*case CS9:
-                        bits |= BITS_DATA_9;
-                        dev_dbg(dev, "%s - data bits = 9\n", __func__);
-                        break;*/
                 default:
-                        dev_dbg(dev, "cp210x driver does not support the number of bits requested, using 8 bit mode\n");
                         bits |= BITS_DATA_8;
+                        dev_dbg(dev, "%s - data bits = 8\n", __func__);
                         break;
                 }
                 if (cp210x_write_u16_reg(port, CP210X_SET_LINE_CTL, bits))
@@ -1108,10 +1260,188 @@ static void cp210x_break_ctl(struct tty_struct *tty, int break_state)
         cp210x_write_u16_reg(port, CP210X_SET_BREAK, state);
 }
 
+#ifdef CONFIG_GPIOLIB
+static int cp210x_gpio_request(struct gpio_chip *gc, unsigned int offset)
+{
+        struct usb_serial *serial = gpiochip_get_data(gc);
+        struct cp210x_serial_private *priv = usb_get_serial_data(serial);
+
+        switch (offset) {
+        case 0:
+                if (priv->config & CP2105_GPIO0_TXLED_MODE)
+                        return -ENODEV;
+                break;
+        case 1:
+                if (priv->config & (CP2105_GPIO1_RXLED_MODE |
+                                    CP2105_GPIO1_RS485_MODE))
+                        return -ENODEV;
+                break;
+        }
+
+        return 0;
+}
+
+static int cp210x_gpio_get(struct gpio_chip *gc, unsigned int gpio)
+{
+        struct usb_serial *serial = gpiochip_get_data(gc);
+        int result;
+        u8 buf;
+
+        result = cp210x_read_vendor_block(serial, REQTYPE_INTERFACE_TO_HOST,
+                                          CP210X_READ_LATCH, &buf, sizeof(buf));
+        if (result < 0)
+                return result;
+
+        return !!(buf & BIT(gpio));
+}
+
+static void cp210x_gpio_set(struct gpio_chip *gc, unsigned int gpio, int value)
+{
+        struct usb_serial *serial = gpiochip_get_data(gc);
+        struct cp210x_gpio_write buf;
+
+        if (value == 1)
+                buf.state = BIT(gpio);
+        else
+                buf.state = 0;
+
+        buf.mask = BIT(gpio);
+
+        cp210x_write_vendor_block(serial, REQTYPE_HOST_TO_INTERFACE,
+                                  CP210X_WRITE_LATCH, &buf, sizeof(buf));
+}
+
+static int cp210x_gpio_direction_get(struct gpio_chip *gc, unsigned int gpio)
+{
+        /* Hardware does not support an input mode */
+        return 0;
+}
+
+static int cp210x_gpio_direction_input(struct gpio_chip *gc, unsigned int gpio)
+{
+        /* Hardware does not support an input mode */
+        return -ENOTSUPP;
+}
+
+static int cp210x_gpio_direction_output(struct gpio_chip *gc, unsigned int gpio,
+                                        int value)
+{
+        return 0;
+}
+
+static int cp210x_gpio_set_single_ended(struct gpio_chip *gc, unsigned int gpio,
+                                        enum single_ended_mode mode)
+{
+        struct usb_serial *serial = gpiochip_get_data(gc);
+        struct cp210x_serial_private *priv = usb_get_serial_data(serial);
+
+        /* Succeed only if in correct mode (this can't be set at runtime) */
+        if ((mode == LINE_MODE_PUSH_PULL) && (priv->gpio_mode & BIT(gpio)))
+                return 0;
+
+        if ((mode == LINE_MODE_OPEN_DRAIN) && !(priv->gpio_mode & BIT(gpio)))
+                return 0;
+
+        return -ENOTSUPP;
+}
+
+/*
+ * This function is for configuring GPIO using shared pins, where other signals
+ * are made unavailable by configuring the use of GPIO. This is believed to be
+ * only applicable to the cp2105 at this point, the other devices supported by
+ * this driver that provide GPIO do so in a way that does not impact other
+ * signals and are thus expected to have very different initialisation.
+ */
+static int cp2105_shared_gpio_init(struct usb_serial *serial)
+{
+        struct cp210x_serial_private *priv = usb_get_serial_data(serial);
+        struct cp210x_pin_mode mode;
+        struct cp210x_config config;
+        u8 intf_num = cp210x_interface_num(serial);
+        int result;
+
+        result = cp210x_read_vendor_block(serial, REQTYPE_DEVICE_TO_HOST,
+                                          CP210X_GET_DEVICEMODE, &mode,
+                                          sizeof(mode));
+        if (result < 0)
+                return result;
+
+        result = cp210x_read_vendor_block(serial, REQTYPE_DEVICE_TO_HOST,
+                                          CP210X_GET_PORTCONFIG, &config,
+                                          sizeof(config));
+        if (result < 0)
+                return result;
+
+        /*  2 banks of GPIO - One for the pins taken from each serial port */
+        if (intf_num == 0) {
+                if (mode.eci == CP210X_PIN_MODE_MODEM)
+                        return 0;
+
+                priv->config = config.eci_cfg;
+                priv->gpio_mode = (u8)((le16_to_cpu(config.gpio_mode) &
+                                                CP210X_ECI_GPIO_MODE_MASK) >>
+                                                CP210X_ECI_GPIO_MODE_OFFSET);
+                priv->gc.ngpio = 2;
+        } else if (intf_num == 1) {
+                if (mode.sci == CP210X_PIN_MODE_MODEM)
+                        return 0;
+
+                priv->config = config.sci_cfg;
+                priv->gpio_mode = (u8)((le16_to_cpu(config.gpio_mode) &
+                                                CP210X_SCI_GPIO_MODE_MASK) >>
+                                                CP210X_SCI_GPIO_MODE_OFFSET);
+                priv->gc.ngpio = 3;
+        } else {
+                return -ENODEV;
+        }
+
+        priv->gc.label = "cp210x";
+        priv->gc.request = cp210x_gpio_request;
+        priv->gc.get_direction = cp210x_gpio_direction_get;
+        priv->gc.direction_input = cp210x_gpio_direction_input;
+        priv->gc.direction_output = cp210x_gpio_direction_output;
+        priv->gc.get = cp210x_gpio_get;
+        priv->gc.set = cp210x_gpio_set;
+        priv->gc.set_single_ended = cp210x_gpio_set_single_ended;
+        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, serial);
+        if (!result)
+                priv->gpio_registered = true;
+
+        return result;
+}
+
+static void cp210x_gpio_remove(struct usb_serial *serial)
+{
+        struct cp210x_serial_private *priv = usb_get_serial_data(serial);
+
+        if (priv->gpio_registered) {
+                gpiochip_remove(&priv->gc);
+                priv->gpio_registered = false;
+        }
+}
+
+#else
+
+static int cp2105_shared_gpio_init(struct usb_serial *serial)
+{
+        return 0;
+}
+
+static void cp210x_gpio_remove(struct usb_serial *serial)
+{
+        /* Nothing to do */
+}
+
+#endif
+
 static int cp210x_port_probe(struct usb_serial_port *port)
 {
         struct usb_serial *serial = port->serial;
-        struct usb_host_interface *cur_altsetting;
         struct cp210x_port_private *port_priv;
         int ret;
 
@@ -1119,8 +1449,7 @@ static int cp210x_port_probe(struct usb_serial_port *port)
         if (!port_priv)
                 return -ENOMEM;
 
-        cur_altsetting = serial->interface->cur_altsetting;
-        port_priv->bInterfaceNumber = cur_altsetting->desc.bInterfaceNumber;
+        port_priv->bInterfaceNumber = cp210x_interface_num(serial);
 
         usb_set_serial_port_data(port, port_priv);
 
@@ -1143,6 +1472,52 @@ static int cp210x_port_remove(struct usb_serial_port *port)
         return 0;
 }
 
+static int cp210x_attach(struct usb_serial *serial)
+{
+        int result;
+        struct cp210x_serial_private *priv;
+
+        priv = kzalloc(sizeof(*priv), GFP_KERNEL);
+        if (!priv)
+                return -ENOMEM;
+
+        result = cp210x_read_vendor_block(serial, REQTYPE_DEVICE_TO_HOST,
+                                          CP210X_GET_PARTNUM, &priv->partnum,
+                                          sizeof(priv->partnum));
+        if (result < 0)
+                goto err_free_priv;
+
+        usb_set_serial_data(serial, priv);
+
+        if (priv->partnum == CP210X_PARTNUM_CP2105) {
+                result = cp2105_shared_gpio_init(serial);
+                if (result < 0) {
+                        dev_err(&serial->interface->dev,
+                                "GPIO initialisation failed, continuing without GPIO support\n");
+                }
+        }
+
+        return 0;
+err_free_priv:
+        kfree(priv);
+
+        return result;
+}
+
+static void cp210x_disconnect(struct usb_serial *serial)
+{
+        cp210x_gpio_remove(serial);
+}
+
+static void cp210x_release(struct usb_serial *serial)
+{
+        struct cp210x_serial_private *priv = usb_get_serial_data(serial);
+
+        cp210x_gpio_remove(serial);
+
+        kfree(priv);
+}
+
 module_usb_serial_driver(serial_drivers, id_table);
 
 MODULE_DESCRIPTION(DRIVER_DESC);
diff --git a/drivers/usb/serial/f81534.c b/drivers/usb/serial/f81534.c
new file mode 100644
index 000000000000..8282a6a18fee
--- /dev/null
+++ b/drivers/usb/serial/f81534.c
@@ -0,0 +1,1409 @@
+/*
+ * F81532/F81534 USB to Serial Ports Bridge
+ *
+ * F81532 => 2 Serial Ports
+ * F81534 => 4 Serial Ports
+ *
+ * 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; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * Copyright (C) 2016 Feature Integration Technology Inc., (Fintek)
+ * Copyright (C) 2016 Tom Tsai (Tom_Tsai@fintek.com.tw)
+ * Copyright (C) 2016 Peter Hong (Peter_Hong@fintek.com.tw)
+ *
+ * The F81532/F81534 had 1 control endpoint for setting, 1 endpoint bulk-out
+ * for all serial port TX and 1 endpoint bulk-in for all serial port read in
+ * (Read Data/MSR/LSR).
+ *
+ * Write URB is fixed with 512bytes, per serial port used 128Bytes.
+ * It can be described by f81534_prepare_write_buffer()
+ *
+ * Read URB is 512Bytes max, per serial port used 128Bytes.
+ * It can be described by f81534_process_read_urb() and maybe received with
+ * 128x1,2,3,4 bytes.
+ *
+ */
+#include <linux/slab.h>
+#include <linux/tty.h>
+#include <linux/tty_flip.h>
+#include <linux/usb.h>
+#include <linux/usb/serial.h>
+#include <linux/serial_reg.h>
+#include <linux/module.h>
+#include <linux/uaccess.h>
+
+/* Serial Port register Address */
+#define F81534_UART_BASE_ADDRESS        0x1200
+#define F81534_UART_OFFSET              0x10
+#define F81534_DIVISOR_LSB_REG          (0x00 + F81534_UART_BASE_ADDRESS)
+#define F81534_DIVISOR_MSB_REG          (0x01 + F81534_UART_BASE_ADDRESS)
+#define F81534_FIFO_CONTROL_REG         (0x02 + F81534_UART_BASE_ADDRESS)
+#define F81534_LINE_CONTROL_REG         (0x03 + F81534_UART_BASE_ADDRESS)
+#define F81534_MODEM_CONTROL_REG        (0x04 + F81534_UART_BASE_ADDRESS)
+#define F81534_MODEM_STATUS_REG         (0x06 + F81534_UART_BASE_ADDRESS)
+#define F81534_CONFIG1_REG              (0x09 + F81534_UART_BASE_ADDRESS)
+
+#define F81534_DEF_CONF_ADDRESS_START   0x3000
+#define F81534_DEF_CONF_SIZE            8
+
+#define F81534_CUSTOM_ADDRESS_START     0x2f00
+#define F81534_CUSTOM_DATA_SIZE         0x10
+#define F81534_CUSTOM_NO_CUSTOM_DATA    0xff
+#define F81534_CUSTOM_VALID_TOKEN       0xf0
+#define F81534_CONF_OFFSET              1
+
+#define F81534_MAX_DATA_BLOCK           64
+#define F81534_MAX_BUS_RETRY            20
+
+/* Default URB timeout for USB operations */
+#define F81534_USB_MAX_RETRY            10
+#define F81534_USB_TIMEOUT              1000
+#define F81534_SET_GET_REGISTER         0xA0
+
+#define F81534_NUM_PORT                 4
+#define F81534_UNUSED_PORT              0xff
+#define F81534_WRITE_BUFFER_SIZE        512
+
+#define DRIVER_DESC                     "Fintek F81532/F81534"
+#define FINTEK_VENDOR_ID_1              0x1934
+#define FINTEK_VENDOR_ID_2              0x2C42
+#define FINTEK_DEVICE_ID                0x1202
+#define F81534_MAX_TX_SIZE              124
+#define F81534_MAX_RX_SIZE              124
+#define F81534_RECEIVE_BLOCK_SIZE       128
+#define F81534_MAX_RECEIVE_BLOCK_SIZE   512
+
+#define F81534_TOKEN_RECEIVE            0x01
+#define F81534_TOKEN_WRITE              0x02
+#define F81534_TOKEN_TX_EMPTY           0x03
+#define F81534_TOKEN_MSR_CHANGE         0x04
+
+/*
+ * We used interal SPI bus to access FLASH section. We must wait the SPI bus to
+ * idle if we performed any command.
+ *
+ * SPI Bus status register: F81534_BUS_REG_STATUS
+ *      Bit 0/1 : BUSY
+ *      Bit 2   : IDLE
+ */
+#define F81534_BUS_BUSY                 (BIT(0) | BIT(1))
+#define F81534_BUS_IDLE                 BIT(2)
+#define F81534_BUS_READ_DATA            0x1004
+#define F81534_BUS_REG_STATUS           0x1003
+#define F81534_BUS_REG_START            0x1002
+#define F81534_BUS_REG_END              0x1001
+
+#define F81534_CMD_READ                 0x03
+
+#define F81534_DEFAULT_BAUD_RATE        9600
+#define F81534_MAX_BAUDRATE             115200
+
+#define F81534_PORT_CONF_DISABLE_PORT   BIT(3)
+#define F81534_PORT_CONF_NOT_EXIST_PORT BIT(7)
+#define F81534_PORT_UNAVAILABLE         \
+        (F81534_PORT_CONF_DISABLE_PORT | F81534_PORT_CONF_NOT_EXIST_PORT)
+
+#define F81534_1X_RXTRIGGER             0xc3
+#define F81534_8X_RXTRIGGER             0xcf
+
+static const struct usb_device_id f81534_id_table[] = {
+        { USB_DEVICE(FINTEK_VENDOR_ID_1, FINTEK_DEVICE_ID) },
+        { USB_DEVICE(FINTEK_VENDOR_ID_2, FINTEK_DEVICE_ID) },
+        {}                      /* Terminating entry */
+};
+
+#define F81534_TX_EMPTY_BIT             0
+
+struct f81534_serial_private {
+        u8 conf_data[F81534_DEF_CONF_SIZE];
+        int tty_idx[F81534_NUM_PORT];
+        u8 setting_idx;
+        int opened_port;
+        struct mutex urb_mutex;
+};
+
+struct f81534_port_private {
+        struct mutex mcr_mutex;
+        unsigned long tx_empty;
+        spinlock_t msr_lock;
+        u8 shadow_mcr;
+        u8 shadow_msr;
+        u8 phy_num;
+};
+
+static int f81534_logic_to_phy_port(struct usb_serial *serial,
+                                        struct usb_serial_port *port)
+{
+        struct f81534_serial_private *serial_priv =
+                        usb_get_serial_data(port->serial);
+        int count = 0;
+        int i;
+
+        for (i = 0; i < F81534_NUM_PORT; ++i) {
+                if (serial_priv->conf_data[i] & F81534_PORT_UNAVAILABLE)
+                        continue;
+
+                if (port->port_number == count)
+                        return i;
+
+                ++count;
+        }
+
+        return -ENODEV;
+}
+
+static int f81534_set_register(struct usb_serial *serial, u16 reg, u8 data)
+{
+        struct usb_interface *interface = serial->interface;
+        struct usb_device *dev = serial->dev;
+        size_t count = F81534_USB_MAX_RETRY;
+        int status;
+        u8 *tmp;
+
+        tmp = kmalloc(sizeof(u8), GFP_KERNEL);
+        if (!tmp)
+                return -ENOMEM;
+
+        *tmp = data;
+
+        /*
+         * Our device maybe not reply when heavily loading, We'll retry for
+         * F81534_USB_MAX_RETRY times.
+         */
+        while (count--) {
+                status = usb_control_msg(dev, usb_sndctrlpipe(dev, 0),
+                                         F81534_SET_GET_REGISTER,
+                                         USB_TYPE_VENDOR | USB_DIR_OUT,
+                                         reg, 0, tmp, sizeof(u8),
+                                         F81534_USB_TIMEOUT);
+                if (status > 0) {
+                        status = 0;
+                        break;
+                } else if (status == 0) {
+                        status = -EIO;
+                }
+        }
+
+        if (status < 0) {
+                dev_err(&interface->dev, "%s: reg: %x data: %x failed: %d\n",
+                                __func__, reg, data, status);
+        }
+
+        kfree(tmp);
+        return status;
+}
+
+static int f81534_get_register(struct usb_serial *serial, u16 reg, u8 *data)
+{
+        struct usb_interface *interface = serial->interface;
+        struct usb_device *dev = serial->dev;
+        size_t count = F81534_USB_MAX_RETRY;
+        int status;
+        u8 *tmp;
+
+        tmp = kmalloc(sizeof(u8), GFP_KERNEL);
+        if (!tmp)
+                return -ENOMEM;
+
+        /*
+         * Our device maybe not reply when heavily loading, We'll retry for
+         * F81534_USB_MAX_RETRY times.
+         */
+        while (count--) {
+                status = usb_control_msg(dev, usb_rcvctrlpipe(dev, 0),
+                                         F81534_SET_GET_REGISTER,
+                                         USB_TYPE_VENDOR | USB_DIR_IN,
+                                         reg, 0, tmp, sizeof(u8),
+                                         F81534_USB_TIMEOUT);
+                if (status > 0) {
+                        status = 0;
+                        break;
+                } else if (status == 0) {
+                        status = -EIO;
+                }
+        }
+
+        if (status < 0) {
+                dev_err(&interface->dev, "%s: reg: %x failed: %d\n", __func__,
+                                reg, status);
+                goto end;
+        }
+
+        *data = *tmp;
+
+end:
+        kfree(tmp);
+        return status;
+}
+
+static int f81534_set_port_register(struct usb_serial_port *port, u16 reg,
+                                        u8 data)
+{
+        struct f81534_port_private *port_priv = usb_get_serial_port_data(port);
+
+        return f81534_set_register(port->serial,
+                        reg + port_priv->phy_num * F81534_UART_OFFSET, data);
+}
+
+static int f81534_get_port_register(struct usb_serial_port *port, u16 reg,
+                                        u8 *data)
+{
+        struct f81534_port_private *port_priv = usb_get_serial_port_data(port);
+
+        return f81534_get_register(port->serial,
+                        reg + port_priv->phy_num * F81534_UART_OFFSET, data);
+}
+
+/*
+ * If we try to access the internal flash via SPI bus, we should check the bus
+ * status for every command. e.g., F81534_BUS_REG_START/F81534_BUS_REG_END
+ */
+static int f81534_wait_for_spi_idle(struct usb_serial *serial)
+{
+        size_t count = F81534_MAX_BUS_RETRY;
+        u8 tmp;
+        int status;
+
+        do {
+                status = f81534_get_register(serial, F81534_BUS_REG_STATUS,
+                                                &tmp);
+                if (status)
+                        return status;
+
+                if (tmp & F81534_BUS_BUSY)
+                        continue;
+
+                if (tmp & F81534_BUS_IDLE)
+                        break;
+
+        } while (--count);
+
+        if (!count) {
+                dev_err(&serial->interface->dev,
+                                "%s: timed out waiting for idle SPI bus\n",
+                                __func__);
+                return -EIO;
+        }
+
+        return f81534_set_register(serial, F81534_BUS_REG_STATUS,
+                                tmp & ~F81534_BUS_IDLE);
+}
+
+static int f81534_get_spi_register(struct usb_serial *serial, u16 reg,
+                                        u8 *data)
+{
+        int status;
+
+        status = f81534_get_register(serial, reg, data);
+        if (status)
+                return status;
+
+        return f81534_wait_for_spi_idle(serial);
+}
+
+static int f81534_set_spi_register(struct usb_serial *serial, u16 reg, u8 data)
+{
+        int status;
+
+        status = f81534_set_register(serial, reg, data);
+        if (status)
+                return status;
+
+        return f81534_wait_for_spi_idle(serial);
+}
+
+static int f81534_read_flash(struct usb_serial *serial, u32 address,
+                                size_t size, u8 *buf)
+{
+        u8 tmp_buf[F81534_MAX_DATA_BLOCK];
+        size_t block = 0;
+        size_t read_size;
+        size_t count;
+        int status;
+        int offset;
+        u16 reg_tmp;
+
+        status = f81534_set_spi_register(serial, F81534_BUS_REG_START,
+                                        F81534_CMD_READ);
+        if (status)
+                return status;
+
+        status = f81534_set_spi_register(serial, F81534_BUS_REG_START,
+                                        (address >> 16) & 0xff);
+        if (status)
+                return status;
+
+        status = f81534_set_spi_register(serial, F81534_BUS_REG_START,
+                                        (address >> 8) & 0xff);
+        if (status)
+                return status;
+
+        status = f81534_set_spi_register(serial, F81534_BUS_REG_START,
+                                        (address >> 0) & 0xff);
+        if (status)
+                return status;
+
+        /* Continuous read mode */
+        do {
+                read_size = min_t(size_t, F81534_MAX_DATA_BLOCK, size);
+
+                for (count = 0; count < read_size; ++count) {
+                        /* To write F81534_BUS_REG_END when final byte */
+                        if (size <= F81534_MAX_DATA_BLOCK &&
+                                        read_size == count + 1)
+                                reg_tmp = F81534_BUS_REG_END;
+                        else
+                                reg_tmp = F81534_BUS_REG_START;
+
+                        /*
+                         * Dummy code, force IC to generate a read pulse, the
+                         * set of value 0xf1 is dont care (any value is ok)
+                         */
+                        status = f81534_set_spi_register(serial, reg_tmp,
+                                        0xf1);
+                        if (status)
+                                return status;
+
+                        status = f81534_get_spi_register(serial,
+                                                F81534_BUS_READ_DATA,
+                                                &tmp_buf[count]);
+                        if (status)
+                                return status;
+
+                        offset = count + block * F81534_MAX_DATA_BLOCK;
+                        buf[offset] = tmp_buf[count];
+                }
+
+                size -= read_size;
+                ++block;
+        } while (size);
+
+        return 0;
+}
+
+static void f81534_prepare_write_buffer(struct usb_serial_port *port, u8 *buf)
+{
+        struct f81534_port_private *port_priv = usb_get_serial_port_data(port);
+        int phy_num = port_priv->phy_num;
+        u8 tx_len;
+        int i;
+
+        /*
+         * The block layout is fixed with 4x128 Bytes, per 128 Bytes a port.
+         * index 0: port phy idx (e.g., 0,1,2,3)
+         * index 1: only F81534_TOKEN_WRITE
+         * index 2: serial TX out length
+         * index 3: fix to 0
+         * index 4~127: serial out data block
+         */
+        for (i = 0; i < F81534_NUM_PORT; ++i) {
+                buf[i * F81534_RECEIVE_BLOCK_SIZE] = i;
+                buf[i * F81534_RECEIVE_BLOCK_SIZE + 1] = F81534_TOKEN_WRITE;
+                buf[i * F81534_RECEIVE_BLOCK_SIZE + 2] = 0;
+                buf[i * F81534_RECEIVE_BLOCK_SIZE + 3] = 0;
+        }
+
+        tx_len = kfifo_out_locked(&port->write_fifo,
+                                &buf[phy_num * F81534_RECEIVE_BLOCK_SIZE + 4],
+                                F81534_MAX_TX_SIZE, &port->lock);
+
+        buf[phy_num * F81534_RECEIVE_BLOCK_SIZE + 2] = tx_len;
+}
+
+static int f81534_submit_writer(struct usb_serial_port *port, gfp_t mem_flags)
+{
+        struct f81534_port_private *port_priv = usb_get_serial_port_data(port);
+        struct urb *urb;
+        unsigned long flags;
+        int result;
+
+        /* Check is any data in write_fifo */
+        spin_lock_irqsave(&port->lock, flags);
+
+        if (kfifo_is_empty(&port->write_fifo)) {
+                spin_unlock_irqrestore(&port->lock, flags);
+                return 0;
+        }
+
+        spin_unlock_irqrestore(&port->lock, flags);
+
+        /* Check H/W is TXEMPTY */
+        if (!test_and_clear_bit(F81534_TX_EMPTY_BIT, &port_priv->tx_empty))
+                return 0;
+
+        urb = port->write_urbs[0];
+        f81534_prepare_write_buffer(port, port->bulk_out_buffers[0]);
+        urb->transfer_buffer_length = F81534_WRITE_BUFFER_SIZE;
+
+        result = usb_submit_urb(urb, mem_flags);
+        if (result) {
+                set_bit(F81534_TX_EMPTY_BIT, &port_priv->tx_empty);
+                dev_err(&port->dev, "%s: submit failed: %d\n", __func__,
+                                result);
+                return result;
+        }
+
+        usb_serial_port_softint(port);
+        return 0;
+}
+
+static u32 f81534_calc_baud_divisor(u32 baudrate, u32 clockrate)
+{
+        if (!baudrate)
+                return 0;
+
+        /* Round to nearest divisor */
+        return DIV_ROUND_CLOSEST(clockrate, baudrate);
+}
+
+static int f81534_set_port_config(struct usb_serial_port *port, u32 baudrate,
+                                        u8 lcr)
+{
+        u32 divisor;
+        int status;
+        u8 value;
+
+        if (baudrate <= 1200)
+                value = F81534_1X_RXTRIGGER;    /* 128 FIFO & TL: 1x */
+        else
+                value = F81534_8X_RXTRIGGER;    /* 128 FIFO & TL: 8x */
+
+        status = f81534_set_port_register(port, F81534_CONFIG1_REG, value);
+        if (status) {
+                dev_err(&port->dev, "%s: CONFIG1 setting failed\n", __func__);
+                return status;
+        }
+
+        if (baudrate <= 1200)
+                value = UART_FCR_TRIGGER_1 | UART_FCR_ENABLE_FIFO; /* TL: 1 */
+        else
+                value = UART_FCR_R_TRIG_11 | UART_FCR_ENABLE_FIFO; /* TL: 14 */
+
+        status = f81534_set_port_register(port, F81534_FIFO_CONTROL_REG,
+                                                value);
+        if (status) {
+                dev_err(&port->dev, "%s: FCR setting failed\n", __func__);
+                return status;
+        }
+
+        divisor = f81534_calc_baud_divisor(baudrate, F81534_MAX_BAUDRATE);
+        value = UART_LCR_DLAB;
+        status = f81534_set_port_register(port, F81534_LINE_CONTROL_REG,
+                                                value);
+        if (status) {
+                dev_err(&port->dev, "%s: set LCR failed\n", __func__);
+                return status;
+        }
+
+        value = divisor & 0xff;
+        status = f81534_set_port_register(port, F81534_DIVISOR_LSB_REG, value);
+        if (status) {
+                dev_err(&port->dev, "%s: set DLAB LSB failed\n", __func__);
+                return status;
+        }
+
+        value = (divisor >> 8) & 0xff;
+        status = f81534_set_port_register(port, F81534_DIVISOR_MSB_REG, value);
+        if (status) {
+                dev_err(&port->dev, "%s: set DLAB MSB failed\n", __func__);
+                return status;
+        }
+
+        status = f81534_set_port_register(port, F81534_LINE_CONTROL_REG, lcr);
+        if (status) {
+                dev_err(&port->dev, "%s: set LCR failed\n", __func__);
+                return status;
+        }
+
+        return 0;
+}
+
+static int f81534_update_mctrl(struct usb_serial_port *port, unsigned int set,
+                                unsigned int clear)
+{
+        struct f81534_port_private *port_priv = usb_get_serial_port_data(port);
+        int status;
+        u8 tmp;
+
+        if (((set | clear) & (TIOCM_DTR | TIOCM_RTS)) == 0)
+                return 0;       /* no change */
+
+        mutex_lock(&port_priv->mcr_mutex);
+
+        /* 'Set' takes precedence over 'Clear' */
+        clear &= ~set;
+
+        /* Always enable UART_MCR_OUT2 */
+        tmp = UART_MCR_OUT2 | port_priv->shadow_mcr;
+
+        if (clear & TIOCM_DTR)
+                tmp &= ~UART_MCR_DTR;
+
+        if (clear & TIOCM_RTS)
+                tmp &= ~UART_MCR_RTS;
+
+        if (set & TIOCM_DTR)
+                tmp |= UART_MCR_DTR;
+
+        if (set & TIOCM_RTS)
+                tmp |= UART_MCR_RTS;
+
+        status = f81534_set_port_register(port, F81534_MODEM_CONTROL_REG, tmp);
+        if (status < 0) {
+                dev_err(&port->dev, "%s: MCR write failed\n", __func__);
+                mutex_unlock(&port_priv->mcr_mutex);
+                return status;
+        }
+
+        port_priv->shadow_mcr = tmp;
+        mutex_unlock(&port_priv->mcr_mutex);
+        return 0;
+}
+
+/*
+ * This function will search the data area with token F81534_CUSTOM_VALID_TOKEN
+ * for latest configuration index. If nothing found
+ * (*index = F81534_CUSTOM_NO_CUSTOM_DATA), We'll load default configure in
+ * F81534_DEF_CONF_ADDRESS_START section.
+ *
+ * Due to we only use block0 to save data, so *index should be 0 or
+ * F81534_CUSTOM_NO_CUSTOM_DATA.
+ */
+static int f81534_find_config_idx(struct usb_serial *serial, u8 *index)
+{
+        u8 tmp;
+        int status;
+
+        status = f81534_read_flash(serial, F81534_CUSTOM_ADDRESS_START, 1,
+                                        &tmp);
+        if (status) {
+                dev_err(&serial->interface->dev, "%s: read failed: %d\n",
+                                __func__, status);
+                return status;
+        }
+
+        /* We'll use the custom data when the data is valid. */
+        if (tmp == F81534_CUSTOM_VALID_TOKEN)
+                *index = 0;
+        else
+                *index = F81534_CUSTOM_NO_CUSTOM_DATA;
+
+        return 0;
+}
+
+/*
+ * We had 2 generation of F81532/534 IC. All has an internal storage.
+ *
+ * 1st is pure USB-to-TTL RS232 IC and designed for 4 ports only, no any
+ * internal data will used. All mode and gpio control should manually set
+ * by AP or Driver and all storage space value are 0xff. The
+ * f81534_calc_num_ports() will run to final we marked as "oldest version"
+ * for this IC.
+ *
+ * 2rd is designed to more generic to use any transceiver and this is our
+ * mass production type. We'll save data in F81534_CUSTOM_ADDRESS_START
+ * (0x2f00) with 9bytes. The 1st byte is a indicater. If the token is
+ * F81534_CUSTOM_VALID_TOKEN(0xf0), the IC is 2nd gen type, the following
+ * 4bytes save port mode (0:RS232/1:RS485 Invert/2:RS485), and the last
+ * 4bytes save GPIO state(value from 0~7 to represent 3 GPIO output pin).
+ * The f81534_calc_num_ports() will run to "new style" with checking
+ * F81534_PORT_UNAVAILABLE section.
+ */
+static int f81534_calc_num_ports(struct usb_serial *serial)
+{
+        u8 setting[F81534_CUSTOM_DATA_SIZE];
+        u8 setting_idx;
+        u8 num_port = 0;
+        int status;
+        size_t i;
+
+        /* Check had custom setting */
+        status = f81534_find_config_idx(serial, &setting_idx);
+        if (status) {
+                dev_err(&serial->interface->dev, "%s: find idx failed: %d\n",
+                                __func__, status);
+                return 0;
+        }
+
+        /*
+         * We'll read custom data only when data available, otherwise we'll
+         * read default value instead.
+         */
+        if (setting_idx != F81534_CUSTOM_NO_CUSTOM_DATA) {
+                status = f81534_read_flash(serial,
+                                                F81534_CUSTOM_ADDRESS_START +
+                                                F81534_CONF_OFFSET,
+                                                sizeof(setting), setting);
+                if (status) {
+                        dev_err(&serial->interface->dev,
+                                        "%s: get custom data failed: %d\n",
+                                        __func__, status);
+                        return 0;
+                }
+
+                dev_dbg(&serial->interface->dev,
+                                "%s: read config from block: %d\n", __func__,
+                                setting_idx);
+        } else {
+                /* Read default board setting */
+                status = f81534_read_flash(serial,
+                                F81534_DEF_CONF_ADDRESS_START, F81534_NUM_PORT,
+                                setting);
+
+                if (status) {
+                        dev_err(&serial->interface->dev,
+                                        "%s: read failed: %d\n", __func__,
+                                        status);
+                        return 0;
+                }
+
+                dev_dbg(&serial->interface->dev, "%s: read default config\n",
+                                __func__);
+        }
+
+        /* New style, find all possible ports */
+        for (i = 0; i < F81534_NUM_PORT; ++i) {
+                if (setting[i] & F81534_PORT_UNAVAILABLE)
+                        continue;
+
+                ++num_port;
+        }
+
+        if (num_port)
+                return num_port;
+
+        dev_warn(&serial->interface->dev, "%s: Read Failed. default 4 ports\n",
+                        __func__);
+        return 4;               /* Nothing found, oldest version IC */
+}
+
+static void f81534_set_termios(struct tty_struct *tty,
+                                struct usb_serial_port *port,
+                                struct ktermios *old_termios)
+{
+        u8 new_lcr = 0;
+        int status;
+        u32 baud;
+
+        if (C_BAUD(tty) == B0)
+                f81534_update_mctrl(port, 0, TIOCM_DTR | TIOCM_RTS);
+        else if (old_termios && (old_termios->c_cflag & CBAUD) == B0)
+                f81534_update_mctrl(port, TIOCM_DTR | TIOCM_RTS, 0);
+
+        if (C_PARENB(tty)) {
+                new_lcr |= UART_LCR_PARITY;
+
+                if (!C_PARODD(tty))
+                        new_lcr |= UART_LCR_EPAR;
+
+                if (C_CMSPAR(tty))
+                        new_lcr |= UART_LCR_SPAR;
+        }
+
+        if (C_CSTOPB(tty))
+                new_lcr |= UART_LCR_STOP;
+
+        switch (C_CSIZE(tty)) {
+        case CS5:
+                new_lcr |= UART_LCR_WLEN5;
+                break;
+        case CS6:
+                new_lcr |= UART_LCR_WLEN6;
+                break;
+        case CS7:
+                new_lcr |= UART_LCR_WLEN7;
+                break;
+        default:
+        case CS8:
+                new_lcr |= UART_LCR_WLEN8;
+                break;
+        }
+
+        baud = tty_get_baud_rate(tty);
+        if (!baud)
+                return;
+
+        if (baud > F81534_MAX_BAUDRATE) {
+                if (old_termios)
+                        baud = tty_termios_baud_rate(old_termios);
+                else
+                        baud = F81534_DEFAULT_BAUD_RATE;
+
+                tty_encode_baud_rate(tty, baud, baud);
+        }
+
+        dev_dbg(&port->dev, "%s: baud: %d\n", __func__, baud);
+
+        status = f81534_set_port_config(port, baud, new_lcr);
+        if (status < 0) {
+                dev_err(&port->dev, "%s: set port config failed: %d\n",
+                                __func__, status);
+        }
+}
+
+static int f81534_submit_read_urb(struct usb_serial *serial, gfp_t flags)
+{
+        return usb_serial_generic_submit_read_urbs(serial->port[0], flags);
+}
+
+static void f81534_msr_changed(struct usb_serial_port *port, u8 msr)
+{
+        struct f81534_port_private *port_priv = usb_get_serial_port_data(port);
+        struct tty_struct *tty;
+        unsigned long flags;
+        u8 old_msr;
+
+        if (!(msr & UART_MSR_ANY_DELTA))
+                return;
+
+        spin_lock_irqsave(&port_priv->msr_lock, flags);
+        old_msr = port_priv->shadow_msr;
+        port_priv->shadow_msr = msr;
+        spin_unlock_irqrestore(&port_priv->msr_lock, flags);
+
+        dev_dbg(&port->dev, "%s: MSR from %02x to %02x\n", __func__, old_msr,
+                        msr);
+
+        /* Update input line counters */
+        if (msr & UART_MSR_DCTS)
+                port->icount.cts++;
+        if (msr & UART_MSR_DDSR)
+                port->icount.dsr++;
+        if (msr & UART_MSR_DDCD)
+                port->icount.dcd++;
+        if (msr & UART_MSR_TERI)
+                port->icount.rng++;
+
+        wake_up_interruptible(&port->port.delta_msr_wait);
+
+        if (!(msr & UART_MSR_DDCD))
+                return;
+
+        dev_dbg(&port->dev, "%s: DCD Changed: phy_num: %d from %x to %x\n",
+                        __func__, port_priv->phy_num, old_msr, msr);
+
+        tty = tty_port_tty_get(&port->port);
+        if (!tty)
+                return;
+
+        usb_serial_handle_dcd_change(port, tty, msr & UART_MSR_DCD);
+        tty_kref_put(tty);
+}
+
+static int f81534_read_msr(struct usb_serial_port *port)
+{
+        struct f81534_port_private *port_priv = usb_get_serial_port_data(port);
+        unsigned long flags;
+        int status;
+        u8 msr;
+
+        /* Get MSR initial value */
+        status = f81534_get_port_register(port, F81534_MODEM_STATUS_REG, &msr);
+        if (status)
+                return status;
+
+        /* Force update current state */
+        spin_lock_irqsave(&port_priv->msr_lock, flags);
+        port_priv->shadow_msr = msr;
+        spin_unlock_irqrestore(&port_priv->msr_lock, flags);
+
+        return 0;
+}
+
+static int f81534_open(struct tty_struct *tty, struct usb_serial_port *port)
+{
+        struct f81534_serial_private *serial_priv =
+                        usb_get_serial_data(port->serial);
+        struct f81534_port_private *port_priv = usb_get_serial_port_data(port);
+        int status;
+
+        status = f81534_set_port_register(port,
+                                F81534_FIFO_CONTROL_REG, UART_FCR_ENABLE_FIFO |
+                                UART_FCR_CLEAR_RCVR | UART_FCR_CLEAR_XMIT);
+        if (status) {
+                dev_err(&port->dev, "%s: Clear FIFO failed: %d\n", __func__,
+                                status);
+                return status;
+        }
+
+        if (tty)
+                f81534_set_termios(tty, port, NULL);
+
+        status = f81534_read_msr(port);
+        if (status)
+                return status;
+
+        mutex_lock(&serial_priv->urb_mutex);
+
+        /* Submit Read URBs for first port opened */
+        if (!serial_priv->opened_port) {
+                status = f81534_submit_read_urb(port->serial, GFP_KERNEL);
+                if (status)
+                        goto exit;
+        }
+
+        serial_priv->opened_port++;
+
+exit:
+        mutex_unlock(&serial_priv->urb_mutex);
+
+        set_bit(F81534_TX_EMPTY_BIT, &port_priv->tx_empty);
+        return status;
+}
+
+static void f81534_close(struct usb_serial_port *port)
+{
+        struct f81534_serial_private *serial_priv =
+                        usb_get_serial_data(port->serial);
+        struct usb_serial_port *port0 = port->serial->port[0];
+        unsigned long flags;
+        size_t i;
+
+        usb_kill_urb(port->write_urbs[0]);
+
+        spin_lock_irqsave(&port->lock, flags);
+        kfifo_reset_out(&port->write_fifo);
+        spin_unlock_irqrestore(&port->lock, flags);
+
+        /* Kill Read URBs when final port closed */
+        mutex_lock(&serial_priv->urb_mutex);
+        serial_priv->opened_port--;
+
+        if (!serial_priv->opened_port) {
+                for (i = 0; i < ARRAY_SIZE(port0->read_urbs); ++i)
+                        usb_kill_urb(port0->read_urbs[i]);
+        }
+
+        mutex_unlock(&serial_priv->urb_mutex);
+}
+
+static int f81534_get_serial_info(struct usb_serial_port *port,
+                                  struct serial_struct __user *retinfo)
+{
+        struct f81534_port_private *port_priv;
+        struct serial_struct tmp;
+
+        port_priv = usb_get_serial_port_data(port);
+
+        memset(&tmp, 0, sizeof(tmp));
+
+        tmp.type = PORT_16550A;
+        tmp.port = port->port_number;
+        tmp.line = port->minor;
+        tmp.baud_base = F81534_MAX_BAUDRATE;
+
+        if (copy_to_user(retinfo, &tmp, sizeof(*retinfo)))
+                return -EFAULT;
+
+        return 0;
+}
+
+static int f81534_ioctl(struct tty_struct *tty, unsigned int cmd,
+                        unsigned long arg)
+{
+        struct usb_serial_port *port = tty->driver_data;
+        struct serial_struct __user *buf = (struct serial_struct __user *)arg;
+
+        switch (cmd) {
+        case TIOCGSERIAL:
+                return f81534_get_serial_info(port, buf);
+        default:
+                break;
+        }
+
+        return -ENOIOCTLCMD;
+}
+
+static void f81534_process_per_serial_block(struct usb_serial_port *port,
+                u8 *data)
+{
+        struct f81534_port_private *port_priv = usb_get_serial_port_data(port);
+        int phy_num = data[0];
+        size_t read_size = 0;
+        size_t i;
+        char tty_flag;
+        int status;
+        u8 lsr;
+
+        /*
+         * The block layout is 128 Bytes
+         * index 0: port phy idx (e.g., 0,1,2,3),
+         * index 1: It's could be
+         *                      F81534_TOKEN_RECEIVE
+         *                      F81534_TOKEN_TX_EMPTY
+         *                      F81534_TOKEN_MSR_CHANGE
+         * index 2: serial in size (data+lsr, must be even)
+         *                      meaningful for F81534_TOKEN_RECEIVE only
+         * index 3: current MSR with this device
+         * index 4~127: serial in data block (data+lsr, must be even)
+         */
+        switch (data[1]) {
+        case F81534_TOKEN_TX_EMPTY:
+                set_bit(F81534_TX_EMPTY_BIT, &port_priv->tx_empty);
+
+                /* Try to submit writer */
+                status = f81534_submit_writer(port, GFP_ATOMIC);
+                if (status)
+                        dev_err(&port->dev, "%s: submit failed\n", __func__);
+                return;
+
+        case F81534_TOKEN_MSR_CHANGE:
+                f81534_msr_changed(port, data[3]);
+                return;
+
+        case F81534_TOKEN_RECEIVE:
+                read_size = data[2];
+                if (read_size > F81534_MAX_RX_SIZE) {
+                        dev_err(&port->dev,
+                                "%s: phy: %d read_size: %zu larger than: %d\n",
+                                __func__, phy_num, read_size,
+                                F81534_MAX_RX_SIZE);
+                        return;
+                }
+
+                break;
+
+        default:
+                dev_warn(&port->dev, "%s: unknown token: %02x\n", __func__,
+                                data[1]);
+                return;
+        }
+
+        for (i = 4; i < 4 + read_size; i += 2) {
+                tty_flag = TTY_NORMAL;
+                lsr = data[i + 1];
+
+                if (lsr & UART_LSR_BRK_ERROR_BITS) {
+                        if (lsr & UART_LSR_BI) {
+                                tty_flag = TTY_BREAK;
+                                port->icount.brk++;
+                                usb_serial_handle_break(port);
+                        } else if (lsr & UART_LSR_PE) {
+                                tty_flag = TTY_PARITY;
+                                port->icount.parity++;
+                        } else if (lsr & UART_LSR_FE) {
+                                tty_flag = TTY_FRAME;
+                                port->icount.frame++;
+                        }
+
+                        if (lsr & UART_LSR_OE) {
+                                port->icount.overrun++;
+                                tty_insert_flip_char(&port->port, 0,
+                                                TTY_OVERRUN);
+                        }
+                }
+
+                if (port->port.console && port->sysrq) {
+                        if (usb_serial_handle_sysrq_char(port, data[i]))
+                                continue;
+                }
+
+                tty_insert_flip_char(&port->port, data[i], tty_flag);
+        }
+
+        tty_flip_buffer_push(&port->port);
+}
+
+static void f81534_process_read_urb(struct urb *urb)
+{
+        struct f81534_serial_private *serial_priv;
+        struct usb_serial_port *port;
+        struct usb_serial *serial;
+        u8 *buf;
+        int phy_port_num;
+        int tty_port_num;
+        size_t i;
+
+        if (!urb->actual_length ||
+                        urb->actual_length % F81534_RECEIVE_BLOCK_SIZE) {
+                return;
+        }
+
+        port = urb->context;
+        serial = port->serial;
+        buf = urb->transfer_buffer;
+        serial_priv = usb_get_serial_data(serial);
+
+        for (i = 0; i < urb->actual_length; i += F81534_RECEIVE_BLOCK_SIZE) {
+                phy_port_num = buf[i];
+                if (phy_port_num >= F81534_NUM_PORT) {
+                        dev_err(&port->dev,
+                                "%s: phy_port_num: %d larger than: %d\n",
+                                __func__, phy_port_num, F81534_NUM_PORT);
+                        continue;
+                }
+
+                tty_port_num = serial_priv->tty_idx[phy_port_num];
+                port = serial->port[tty_port_num];
+
+                if (tty_port_initialized(&port->port))
+                        f81534_process_per_serial_block(port, &buf[i]);
+        }
+}
+
+static void f81534_write_usb_callback(struct urb *urb)
+{
+        struct usb_serial_port *port = urb->context;
+
+        switch (urb->status) {
+        case 0:
+                break;
+        case -ENOENT:
+        case -ECONNRESET:
+        case -ESHUTDOWN:
+                dev_dbg(&port->dev, "%s - urb stopped: %d\n",
+                                __func__, urb->status);
+                return;
+        case -EPIPE:
+                dev_err(&port->dev, "%s - urb stopped: %d\n",
+                                __func__, urb->status);
+                return;
+        default:
+                dev_dbg(&port->dev, "%s - nonzero urb status: %d\n",
+                                __func__, urb->status);
+                break;
+        }
+}
+
+static int f81534_setup_ports(struct usb_serial *serial)
+{
+        struct usb_serial_port *port;
+        u8 port0_out_address;
+        int buffer_size;
+        size_t i;
+
+        /*
+         * In our system architecture, we had 2 or 4 serial ports,
+         * but only get 1 set of bulk in/out endpoints.
+         *
+         * The usb-serial subsystem will generate port 0 data,
+         * but port 1/2/3 will not. It's will generate write URB and buffer
+         * by following code and use the port0 read URB for read operation.
+         */
+        for (i = 1; i < serial->num_ports; ++i) {
+                port0_out_address = serial->port[0]->bulk_out_endpointAddress;
+                buffer_size = serial->port[0]->bulk_out_size;
+                port = serial->port[i];
+
+                if (kfifo_alloc(&port->write_fifo, PAGE_SIZE, GFP_KERNEL))
+                        return -ENOMEM;
+
+                port->bulk_out_size = buffer_size;
+                port->bulk_out_endpointAddress = port0_out_address;
+
+                port->write_urbs[0] = usb_alloc_urb(0, GFP_KERNEL);
+                if (!port->write_urbs[0])
+                        return -ENOMEM;
+
+                port->bulk_out_buffers[0] = kzalloc(buffer_size, GFP_KERNEL);
+                if (!port->bulk_out_buffers[0])
+                        return -ENOMEM;
+
+                usb_fill_bulk_urb(port->write_urbs[0], serial->dev,
+                                usb_sndbulkpipe(serial->dev,
+                                        port0_out_address),
+                                port->bulk_out_buffers[0], buffer_size,
+                                serial->type->write_bulk_callback, port);
+
+                port->write_urb = port->write_urbs[0];
+                port->bulk_out_buffer = port->bulk_out_buffers[0];
+        }
+
+        return 0;
+}
+
+static int f81534_probe(struct usb_serial *serial,
+                                        const struct usb_device_id *id)
+{
+        struct usb_endpoint_descriptor *endpoint;
+        struct usb_host_interface *iface_desc;
+        struct device *dev;
+        int num_bulk_in = 0;
+        int num_bulk_out = 0;
+        int size_bulk_in = 0;
+        int size_bulk_out = 0;
+        int i;
+
+        dev = &serial->interface->dev;
+        iface_desc = serial->interface->cur_altsetting;
+
+        for (i = 0; i < iface_desc->desc.bNumEndpoints; ++i) {
+                endpoint = &iface_desc->endpoint[i].desc;
+
+                if (usb_endpoint_is_bulk_in(endpoint)) {
+                        ++num_bulk_in;
+                        size_bulk_in = usb_endpoint_maxp(endpoint);
+                }
+
+                if (usb_endpoint_is_bulk_out(endpoint)) {
+                        ++num_bulk_out;
+                        size_bulk_out = usb_endpoint_maxp(endpoint);
+                }
+        }
+
+        if (num_bulk_in != 1 || num_bulk_out != 1) {
+                dev_err(dev, "expected endpoints not found\n");
+                return -ENODEV;
+        }
+
+        if (size_bulk_out != F81534_WRITE_BUFFER_SIZE ||
+                        size_bulk_in != F81534_MAX_RECEIVE_BLOCK_SIZE) {
+                dev_err(dev, "unsupported endpoint max packet size\n");
+                return -ENODEV;
+        }
+
+        return 0;
+}
+
+static int f81534_attach(struct usb_serial *serial)
+{
+        struct f81534_serial_private *serial_priv;
+        int index = 0;
+        int status;
+        int i;
+
+        serial_priv = devm_kzalloc(&serial->interface->dev,
+                                        sizeof(*serial_priv), GFP_KERNEL);
+        if (!serial_priv)
+                return -ENOMEM;
+
+        usb_set_serial_data(serial, serial_priv);
+
+        mutex_init(&serial_priv->urb_mutex);
+
+        status = f81534_setup_ports(serial);
+        if (status)
+                return status;
+
+        /* Check had custom setting */
+        status = f81534_find_config_idx(serial, &serial_priv->setting_idx);
+        if (status) {
+                dev_err(&serial->interface->dev, "%s: find idx failed: %d\n",
+                                __func__, status);
+                return status;
+        }
+
+        /*
+         * We'll read custom data only when data available, otherwise we'll
+         * read default value instead.
+         */
+        if (serial_priv->setting_idx == F81534_CUSTOM_NO_CUSTOM_DATA) {
+                /*
+                 * The default configuration layout:
+                 *      byte 0/1/2/3: uart setting
+                 */
+                status = f81534_read_flash(serial,
+                                        F81534_DEF_CONF_ADDRESS_START,
+                                        F81534_DEF_CONF_SIZE,
+                                        serial_priv->conf_data);
+                if (status) {
+                        dev_err(&serial->interface->dev,
+                                        "%s: read reserve data failed: %d\n",
+                                        __func__, status);
+                        return status;
+                }
+        } else {
+                /* Only read 8 bytes for mode & GPIO */
+                status = f81534_read_flash(serial,
+                                                F81534_CUSTOM_ADDRESS_START +
+                                                F81534_CONF_OFFSET,
+                                                sizeof(serial_priv->conf_data),
+                                                serial_priv->conf_data);
+                if (status) {
+                        dev_err(&serial->interface->dev,
+                                        "%s: idx: %d get data failed: %d\n",
+                                        __func__, serial_priv->setting_idx,
+                                        status);
+                        return status;
+                }
+        }
+
+        /* Assign phy-to-logic mapping */
+        for (i = 0; i < F81534_NUM_PORT; ++i) {
+                if (serial_priv->conf_data[i] & F81534_PORT_UNAVAILABLE)
+                        continue;
+
+                serial_priv->tty_idx[i] = index++;
+                dev_dbg(&serial->interface->dev,
+                                "%s: phy_num: %d, tty_idx: %d\n", __func__, i,
+                                serial_priv->tty_idx[i]);
+        }
+
+        return 0;
+}
+
+static int f81534_port_probe(struct usb_serial_port *port)
+{
+        struct f81534_port_private *port_priv;
+
+        port_priv = devm_kzalloc(&port->dev, sizeof(*port_priv), GFP_KERNEL);
+        if (!port_priv)
+                return -ENOMEM;
+
+        spin_lock_init(&port_priv->msr_lock);
+        mutex_init(&port_priv->mcr_mutex);
+
+        /* Assign logic-to-phy mapping */
+        port_priv->phy_num = f81534_logic_to_phy_port(port->serial, port);
+        if (port_priv->phy_num < 0 || port_priv->phy_num >= F81534_NUM_PORT)
+                return -ENODEV;
+
+        usb_set_serial_port_data(port, port_priv);
+        dev_dbg(&port->dev, "%s: port_number: %d, phy_num: %d\n", __func__,
+                        port->port_number, port_priv->phy_num);
+
+        return 0;
+}
+
+static int f81534_tiocmget(struct tty_struct *tty)
+{
+        struct usb_serial_port *port = tty->driver_data;
+        struct f81534_port_private *port_priv = usb_get_serial_port_data(port);
+        int status;
+        int r;
+        u8 msr;
+        u8 mcr;
+
+        /* Read current MSR from device */
+        status = f81534_get_port_register(port, F81534_MODEM_STATUS_REG, &msr);
+        if (status)
+                return status;
+
+        mutex_lock(&port_priv->mcr_mutex);
+        mcr = port_priv->shadow_mcr;
+        mutex_unlock(&port_priv->mcr_mutex);
+
+        r = (mcr & UART_MCR_DTR ? TIOCM_DTR : 0) |
+            (mcr & UART_MCR_RTS ? TIOCM_RTS : 0) |
+            (msr & UART_MSR_CTS ? TIOCM_CTS : 0) |
+            (msr & UART_MSR_DCD ? TIOCM_CAR : 0) |
+            (msr & UART_MSR_RI ? TIOCM_RI : 0) |
+            (msr & UART_MSR_DSR ? TIOCM_DSR : 0);
+
+        return r;
+}
+
+static int f81534_tiocmset(struct tty_struct *tty, unsigned int set,
+                                unsigned int clear)
+{
+        struct usb_serial_port *port = tty->driver_data;
+
+        return f81534_update_mctrl(port, set, clear);
+}
+
+static void f81534_dtr_rts(struct usb_serial_port *port, int on)
+{
+        if (on)
+                f81534_update_mctrl(port, TIOCM_DTR | TIOCM_RTS, 0);
+        else
+                f81534_update_mctrl(port, 0, TIOCM_DTR | TIOCM_RTS);
+}
+
+static int f81534_write(struct tty_struct *tty, struct usb_serial_port *port,
+                        const u8 *buf, int count)
+{
+        int bytes_out, status;
+
+        if (!count)
+                return 0;
+
+        bytes_out = kfifo_in_locked(&port->write_fifo, buf, count,
+                                        &port->lock);
+
+        status = f81534_submit_writer(port, GFP_ATOMIC);
+        if (status) {
+                dev_err(&port->dev, "%s: submit failed\n", __func__);
+                return status;
+        }
+
+        return bytes_out;
+}
+
+static bool f81534_tx_empty(struct usb_serial_port *port)
+{
+        struct f81534_port_private *port_priv = usb_get_serial_port_data(port);
+
+        return test_bit(F81534_TX_EMPTY_BIT, &port_priv->tx_empty);
+}
+
+static int f81534_resume(struct usb_serial *serial)
+{
+        struct f81534_serial_private *serial_priv =
+                        usb_get_serial_data(serial);
+        struct usb_serial_port *port;
+        int error = 0;
+        int status;
+        size_t i;
+
+        /*
+         * We'll register port 0 bulkin when port had opened, It'll take all
+         * port received data, MSR register change and TX_EMPTY information.
+         */
+        mutex_lock(&serial_priv->urb_mutex);
+
+        if (serial_priv->opened_port) {
+                status = f81534_submit_read_urb(serial, GFP_NOIO);
+                if (status) {
+                        mutex_unlock(&serial_priv->urb_mutex);
+                        return status;
+                }
+        }
+
+        mutex_unlock(&serial_priv->urb_mutex);
+
+        for (i = 0; i < serial->num_ports; i++) {
+                port = serial->port[i];
+                if (!tty_port_initialized(&port->port))
+                        continue;
+
+                status = f81534_submit_writer(port, GFP_NOIO);
+                if (status) {
+                        dev_err(&port->dev, "%s: submit failed\n", __func__);
+                        ++error;
+                }
+        }
+
+        if (error)
+                return -EIO;
+
+        return 0;
+}
+
+static struct usb_serial_driver f81534_device = {
+        .driver = {
+                   .owner = THIS_MODULE,
+                   .name = "f81534",
+        },
+        .description =          DRIVER_DESC,
+        .id_table =             f81534_id_table,
+        .open =                 f81534_open,
+        .close =                f81534_close,
+        .write =                f81534_write,
+        .tx_empty =             f81534_tx_empty,
+        .calc_num_ports =       f81534_calc_num_ports,
+        .probe =                f81534_probe,
+        .attach =               f81534_attach,
+        .port_probe =           f81534_port_probe,
+        .dtr_rts =              f81534_dtr_rts,
+        .process_read_urb =     f81534_process_read_urb,
+        .ioctl =                f81534_ioctl,
+        .tiocmget =             f81534_tiocmget,
+        .tiocmset =             f81534_tiocmset,
+        .write_bulk_callback =  f81534_write_usb_callback,
+        .set_termios =          f81534_set_termios,
+        .resume =               f81534_resume,
+};
+
+static struct usb_serial_driver *const serial_drivers[] = {
+        &f81534_device, NULL
+};
+
+module_usb_serial_driver(serial_drivers, f81534_id_table);
+
+MODULE_DEVICE_TABLE(usb, f81534_id_table);
+MODULE_DESCRIPTION(DRIVER_DESC);
+MODULE_AUTHOR("Peter Hong <Peter_Hong@fintek.com.tw>");
+MODULE_AUTHOR("Tom Tsai <Tom_Tsai@fintek.com.tw>");
+MODULE_LICENSE("GPL");
diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c
index 6e9fc8bcc285..23d14b98ae2a 100644
--- a/drivers/usb/serial/ftdi_sio.c
+++ b/drivers/usb/serial/ftdi_sio.c
@@ -1455,8 +1455,6 @@ static int get_serial_info(struct usb_serial_port *port,
         struct ftdi_private *priv = usb_get_serial_port_data(port);
         struct serial_struct tmp;
 
-        if (!retinfo)
-                return -EFAULT;
         memset(&tmp, 0, sizeof(tmp));
         tmp.flags = priv->flags;
         tmp.baud_base = priv->baud_base;
@@ -1538,9 +1536,6 @@ static int get_lsr_info(struct usb_serial_port *port,
         struct ftdi_private *priv = usb_get_serial_port_data(port);
         unsigned int result = 0;
 
-        if (!retinfo)
-                return -EFAULT;
-
         if (priv->transmit_empty)
                 result = TIOCSER_TEMT;
 
diff --git a/drivers/usb/serial/io_edgeport.c b/drivers/usb/serial/io_edgeport.c
index 11c05ce2f35f..dcc0c58aaad5 100644
--- a/drivers/usb/serial/io_edgeport.c
+++ b/drivers/usb/serial/io_edgeport.c
@@ -1554,9 +1554,6 @@ static int get_serial_info(struct edgeport_port *edge_port,
 {
         struct serial_struct tmp;
 
-        if (!retinfo)
-                return -EFAULT;
-
         memset(&tmp, 0, sizeof(tmp));
 
         tmp.type                = PORT_16550A;
diff --git a/drivers/usb/serial/io_ti.c b/drivers/usb/serial/io_ti.c
index fce82fd79f77..c339163698eb 100644
--- a/drivers/usb/serial/io_ti.c
+++ b/drivers/usb/serial/io_ti.c
@@ -2459,9 +2459,6 @@ static int get_serial_info(struct edgeport_port *edge_port,
         struct serial_struct tmp;
         unsigned cwait;
 
-        if (!retinfo)
-                return -EFAULT;
-
         cwait = edge_port->port->port.closing_wait;
         if (cwait != ASYNC_CLOSING_WAIT_NONE)
                 cwait = jiffies_to_msecs(cwait) / 10;
diff --git a/drivers/usb/serial/kl5kusb105.c b/drivers/usb/serial/kl5kusb105.c
index fc5d3a791e08..0ee190fc1bf8 100644
--- a/drivers/usb/serial/kl5kusb105.c
+++ b/drivers/usb/serial/kl5kusb105.c
@@ -296,7 +296,7 @@ static int  klsi_105_open(struct tty_struct *tty, struct usb_serial_port *port)
         rc = usb_serial_generic_open(tty, port);
         if (rc) {
                 retval = rc;
-                goto exit;
+                goto err_free_cfg;
         }
 
         rc = usb_control_msg(port->serial->dev,
@@ -311,21 +311,38 @@ static int  klsi_105_open(struct tty_struct *tty, struct usb_serial_port *port)
         if (rc < 0) {
                 dev_err(&port->dev, "Enabling read failed (error = %d)\n", rc);
                 retval = rc;
+                goto err_generic_close;
         } else
                 dev_dbg(&port->dev, "%s - enabled reading\n", __func__);
 
         rc = klsi_105_get_line_state(port, &line_state);
-        if (rc >= 0) {
-                spin_lock_irqsave(&priv->lock, flags);
-                priv->line_state = line_state;
-                spin_unlock_irqrestore(&priv->lock, flags);
-                dev_dbg(&port->dev, "%s - read line state 0x%lx\n", __func__, line_state);
-                retval = 0;
-        } else
+        if (rc < 0) {
                 retval = rc;
+                goto err_disable_read;
+        }
+
+        spin_lock_irqsave(&priv->lock, flags);
+        priv->line_state = line_state;
+        spin_unlock_irqrestore(&priv->lock, flags);
+        dev_dbg(&port->dev, "%s - read line state 0x%lx\n", __func__,
+                        line_state);
+
+        return 0;
 
-exit:
+err_disable_read:
+        usb_control_msg(port->serial->dev,
+                             usb_sndctrlpipe(port->serial->dev, 0),
+                             KL5KUSB105A_SIO_CONFIGURE,
+                             USB_TYPE_VENDOR | USB_DIR_OUT,
+                             KL5KUSB105A_SIO_CONFIGURE_READ_OFF,
+                             0, /* index */
+                             NULL, 0,
+                             KLSI_TIMEOUT);
+err_generic_close:
+        usb_serial_generic_close(port);
+err_free_cfg:
         kfree(cfg);
+
         return retval;
 }
 
diff --git a/drivers/usb/serial/mos7720.c b/drivers/usb/serial/mos7720.c
index de9992b492b0..d52caa03679c 100644
--- a/drivers/usb/serial/mos7720.c
+++ b/drivers/usb/serial/mos7720.c
@@ -1861,9 +1861,6 @@ static int get_serial_info(struct moschip_port *mos7720_port,
 {
         struct serial_struct tmp;
 
-        if (!retinfo)
-                return -EFAULT;
-
         memset(&tmp, 0, sizeof(tmp));
 
         tmp.type                = PORT_16550A;
diff --git a/drivers/usb/serial/mos7840.c b/drivers/usb/serial/mos7840.c
index 57426d703a09..9a220b8e810f 100644
--- a/drivers/usb/serial/mos7840.c
+++ b/drivers/usb/serial/mos7840.c
@@ -1956,9 +1956,6 @@ static int mos7840_get_serial_info(struct moschip_port *mos7840_port,
         if (mos7840_port == NULL)
                 return -1;
 
-        if (!retinfo)
-                return -EFAULT;
-
         memset(&tmp, 0, sizeof(tmp));
 
         tmp.type = PORT_16550A;
diff --git a/drivers/usb/serial/opticon.c b/drivers/usb/serial/opticon.c
index 4b7bfb394a32..5ded6f524d59 100644
--- a/drivers/usb/serial/opticon.c
+++ b/drivers/usb/serial/opticon.c
@@ -336,9 +336,6 @@ static int get_serial_info(struct usb_serial_port *port,
 {
         struct serial_struct tmp;
 
-        if (!serial)
-                return -EFAULT;
-
         memset(&tmp, 0x00, sizeof(tmp));
 
         /* fake emulate a 16550 uart to make userspace code happy */
diff --git a/drivers/usb/serial/option.c b/drivers/usb/serial/option.c
index 9894e341c6ac..7ce31a4c7e7f 100644
--- a/drivers/usb/serial/option.c
+++ b/drivers/usb/serial/option.c
@@ -268,6 +268,8 @@ static void option_instat_callback(struct urb *urb);
 #define TELIT_PRODUCT_CC864_SINGLE              0x1006
 #define TELIT_PRODUCT_DE910_DUAL                0x1010
 #define TELIT_PRODUCT_UE910_V2                  0x1012
+#define TELIT_PRODUCT_LE922_USBCFG1             0x1040
+#define TELIT_PRODUCT_LE922_USBCFG2             0x1041
 #define TELIT_PRODUCT_LE922_USBCFG0             0x1042
 #define TELIT_PRODUCT_LE922_USBCFG3             0x1043
 #define TELIT_PRODUCT_LE922_USBCFG5             0x1045
@@ -1210,6 +1212,10 @@ static const struct usb_device_id option_ids[] = {
         { USB_DEVICE(TELIT_VENDOR_ID, TELIT_PRODUCT_UE910_V2) },
         { USB_DEVICE(TELIT_VENDOR_ID, TELIT_PRODUCT_LE922_USBCFG0),
                 .driver_info = (kernel_ulong_t)&telit_le922_blacklist_usbcfg0 },
+        { USB_DEVICE(TELIT_VENDOR_ID, TELIT_PRODUCT_LE922_USBCFG1),
+                .driver_info = (kernel_ulong_t)&telit_le910_blacklist },
+        { USB_DEVICE(TELIT_VENDOR_ID, TELIT_PRODUCT_LE922_USBCFG2),
+                .driver_info = (kernel_ulong_t)&telit_le922_blacklist_usbcfg3 },
         { USB_DEVICE(TELIT_VENDOR_ID, TELIT_PRODUCT_LE922_USBCFG3),
                 .driver_info = (kernel_ulong_t)&telit_le922_blacklist_usbcfg3 },
         { USB_DEVICE_INTERFACE_CLASS(TELIT_VENDOR_ID, TELIT_PRODUCT_LE922_USBCFG5, 0xff),
@@ -1989,6 +1995,7 @@ static const struct usb_device_id option_ids[] = {
         { USB_DEVICE_AND_INTERFACE_INFO(0x2001, 0x7d02, 0xff, 0x00, 0x00) },
         { USB_DEVICE_AND_INTERFACE_INFO(0x2001, 0x7d03, 0xff, 0x02, 0x01) },
         { USB_DEVICE_AND_INTERFACE_INFO(0x2001, 0x7d03, 0xff, 0x00, 0x00) },
+        { USB_DEVICE_INTERFACE_CLASS(0x2001, 0x7d04, 0xff) },                   /* D-Link DWM-158 */
         { USB_DEVICE_INTERFACE_CLASS(0x2001, 0x7e19, 0xff),                     /* D-Link DWM-221 B1 */
           .driver_info = (kernel_ulong_t)&net_intf4_blacklist },
         { USB_DEVICE_AND_INTERFACE_INFO(0x07d1, 0x3e01, 0xff, 0xff, 0xff) }, /* D-Link DWM-152/C1 */
diff --git a/drivers/usb/serial/quatech2.c b/drivers/usb/serial/quatech2.c
index 85acb50a7ee2..659cb8606bd9 100644
--- a/drivers/usb/serial/quatech2.c
+++ b/drivers/usb/serial/quatech2.c
@@ -463,9 +463,6 @@ static int get_serial_info(struct usb_serial_port *port,
 {
         struct serial_struct tmp;
 
-        if (!retinfo)
-                return -EFAULT;
-
         memset(&tmp, 0, sizeof(tmp));
         tmp.line                = port->minor;
         tmp.port                = 0;
diff --git a/drivers/usb/serial/ssu100.c b/drivers/usb/serial/ssu100.c
index 70a098de429f..2a156144c76c 100644
--- a/drivers/usb/serial/ssu100.c
+++ b/drivers/usb/serial/ssu100.c
@@ -318,9 +318,6 @@ static int get_serial_info(struct usb_serial_port *port,
 {
         struct serial_struct tmp;
 
-        if (!retinfo)
-                return -EFAULT;
-
         memset(&tmp, 0, sizeof(tmp));
         tmp.line                = port->minor;
         tmp.port                = 0;
diff --git a/drivers/usb/serial/ti_usb_3410_5052.c b/drivers/usb/serial/ti_usb_3410_5052.c
index a8b9bdba314f..8db9d071d940 100644
--- a/drivers/usb/serial/ti_usb_3410_5052.c
+++ b/drivers/usb/serial/ti_usb_3410_5052.c
@@ -1426,9 +1426,6 @@ static int ti_get_serial_info(struct ti_port *tport,
         struct serial_struct ret_serial;
         unsigned cwait;
 
-        if (!ret_arg)
-                return -EFAULT;
-
         cwait = port->port.closing_wait;
         if (cwait != ASYNC_CLOSING_WAIT_NONE)
                 cwait = jiffies_to_msecs(cwait) / 10;
diff --git a/drivers/usb/serial/usb_wwan.c b/drivers/usb/serial/usb_wwan.c
index 3dfdfc81254b..59bfcb3da116 100644
--- a/drivers/usb/serial/usb_wwan.c
+++ b/drivers/usb/serial/usb_wwan.c
@@ -140,9 +140,6 @@ static int get_serial_info(struct usb_serial_port *port,
 {
         struct serial_struct tmp;
 
-        if (!retinfo)
-                return -EFAULT;
-
         memset(&tmp, 0, sizeof(tmp));
         tmp.line            = port->minor;
         tmp.port            = port->port_number;
diff --git a/drivers/usb/storage/usb.c b/drivers/usb/storage/usb.c
index 2cba13a532cd..615bea08ec0a 100644
--- a/drivers/usb/storage/usb.c
+++ b/drivers/usb/storage/usb.c
@@ -52,7 +52,6 @@
 
 #include <linux/sched.h>
 #include <linux/errno.h>
-#include <linux/freezer.h>
 #include <linux/module.h>
 #include <linux/slab.h>
 #include <linux/kthread.h>
diff --git a/drivers/usb/usbip/vhci_hcd.c b/drivers/usb/usbip/vhci_hcd.c
index 03eccf29ace0..c4724fb3a691 100644
--- a/drivers/usb/usbip/vhci_hcd.c
+++ b/drivers/usb/usbip/vhci_hcd.c
@@ -460,13 +460,14 @@ static void vhci_tx_urb(struct urb *urb)
 {
         struct vhci_device *vdev = get_vdev(urb->dev);
         struct vhci_priv *priv;
-        struct vhci_hcd *vhci = vdev_to_vhci(vdev);
+        struct vhci_hcd *vhci;
         unsigned long flags;
 
         if (!vdev) {
                 pr_err("could not get virtual device");
                 return;
         }
+        vhci = vdev_to_vhci(vdev);
 
         priv = kzalloc(sizeof(struct vhci_priv), GFP_ATOMIC);
         if (!priv) {
diff --git a/drivers/usb/usbip/vhci_sysfs.c b/drivers/usb/usbip/vhci_sysfs.c
index c404017c1b5a..b96e5b189269 100644
--- a/drivers/usb/usbip/vhci_sysfs.c
+++ b/drivers/usb/usbip/vhci_sysfs.c
@@ -361,6 +361,7 @@ static void set_status_attr(int id)
         status->attr.attr.name = status->name;
         status->attr.attr.mode = S_IRUGO;
         status->attr.show = status_show;
+        sysfs_attr_init(&status->attr.attr);
 }
 
 static int init_status_attrs(void)
diff --git a/drivers/usb/usbip/vudc_dev.c b/drivers/usb/usbip/vudc_dev.c
index 7091848df6c8..968471b62cbc 100644
--- a/drivers/usb/usbip/vudc_dev.c
+++ b/drivers/usb/usbip/vudc_dev.c
@@ -242,10 +242,10 @@ static const struct usb_gadget_ops vgadget_ops = {
 static int vep_enable(struct usb_ep *_ep,
                 const struct usb_endpoint_descriptor *desc)
 {
-        struct vep *ep;
-        struct vudc *udc;
-        unsigned maxp;
-        unsigned long flags;
+        struct vep      *ep;
+        struct vudc     *udc;
+        unsigned int    maxp;
+        unsigned long   flags;
 
         ep = to_vep(_ep);
         udc = ep_to_vudc(ep);
@@ -259,7 +259,7 @@ static int vep_enable(struct usb_ep *_ep,
 
         spin_lock_irqsave(&udc->lock, flags);
 
-        maxp = usb_endpoint_maxp(desc) & 0x7ff;
+        maxp = usb_endpoint_maxp(desc);
         _ep->maxpacket = maxp;
         ep->desc = desc;
         ep->type = usb_endpoint_type(desc);
@@ -549,30 +549,34 @@ static int init_vudc_hw(struct vudc *udc)
                 sprintf(ep->name, "ep%d%s", num,
                         i ? (is_out ? "out" : "in") : "");
                 ep->ep.name = ep->name;
+
+                ep->ep.ops = &vep_ops;
+
+                usb_ep_set_maxpacket_limit(&ep->ep, ~0);
+                ep->ep.max_streams = 16;
+                ep->gadget = &udc->gadget;
+                INIT_LIST_HEAD(&ep->req_queue);
+
                 if (i == 0) {
+                        /* ep0 */
                         ep->ep.caps.type_control = true;
                         ep->ep.caps.dir_out = true;
                         ep->ep.caps.dir_in = true;
+
+                        udc->gadget.ep0 = &ep->ep;
                 } else {
+                        /* All other eps */
                         ep->ep.caps.type_iso = true;
                         ep->ep.caps.type_int = true;
                         ep->ep.caps.type_bulk = true;
-                }
 
-                if (is_out)
-                        ep->ep.caps.dir_out = true;
-                else
-                        ep->ep.caps.dir_in = true;
+                        if (is_out)
+                                ep->ep.caps.dir_out = true;
+                        else
+                                ep->ep.caps.dir_in = true;
 
-                ep->ep.ops = &vep_ops;
-                list_add_tail(&ep->ep.ep_list, &udc->gadget.ep_list);
-                ep->halted = ep->wedged = ep->already_seen =
-                        ep->setup_stage = 0;
-                usb_ep_set_maxpacket_limit(&ep->ep, ~0);
-                ep->ep.max_streams = 16;
-                ep->gadget = &udc->gadget;
-                ep->desc = NULL;
-                INIT_LIST_HEAD(&ep->req_queue);
+                        list_add_tail(&ep->ep.ep_list, &udc->gadget.ep_list);
+                }
         }
 
         spin_lock_init(&udc->lock);
@@ -589,9 +593,6 @@ static int init_vudc_hw(struct vudc *udc)
         ud->eh_ops.reset    = vudc_device_reset;
         ud->eh_ops.unusable = vudc_device_unusable;
 
-        udc->gadget.ep0 = &udc->ep[0].ep;
-        list_del_init(&udc->ep[0].ep.ep_list);
-
         v_init_timer(udc);
         return 0;
 
diff --git a/drivers/usb/usbip/vudc_transfer.c b/drivers/usb/usbip/vudc_transfer.c
index aba6bd478045..4cfd475ee865 100644
--- a/drivers/usb/usbip/vudc_transfer.c
+++ b/drivers/usb/usbip/vudc_transfer.c
@@ -73,8 +73,8 @@ static int handle_control_request(struct vudc *udc, struct urb *urb,
 {
         struct vep      *ep2;
         int             ret_val = 1;
-        unsigned        w_index;
-        unsigned        w_value;
+        unsigned int    w_index;
+        unsigned int    w_value;
 
         w_index = le16_to_cpu(setup->wIndex);
         w_value = le16_to_cpu(setup->wValue);
@@ -200,7 +200,7 @@ static int transfer(struct vudc *udc,
 top:
         /* if there's no request queued, the device is NAKing; return */
         list_for_each_entry(req, &ep->req_queue, req_entry) {
-                unsigned        host_len, dev_len, len;
+                unsigned int    host_len, dev_len, len;
                 void            *ubuf_pos, *rbuf_pos;
                 int             is_short, to_host;
                 int             rescan = 0;
@@ -339,6 +339,8 @@ static void v_timer(unsigned long _vudc)
                 total = timer->frame_limit;
         }
 
+        /* We have to clear ep0 flags separately as it's not on the list */
+        udc->ep[0].already_seen = 0;
         list_for_each_entry(_ep, &udc->gadget.ep_list, ep_list) {
                 ep = to_vep(_ep);
                 ep->already_seen = 0;
diff --git a/drivers/usb/wusbcore/dev-sysfs.c b/drivers/usb/wusbcore/dev-sysfs.c
index 415b14002a61..d4de56b93d68 100644
--- a/drivers/usb/wusbcore/dev-sysfs.c
+++ b/drivers/usb/wusbcore/dev-sysfs.c
@@ -53,7 +53,7 @@ static ssize_t wusb_disconnect_store(struct device *dev,
         wusbhc_put(wusbhc);
         return size;
 }
-static DEVICE_ATTR(wusb_disconnect, 0200, NULL, wusb_disconnect_store);
+static DEVICE_ATTR_WO(wusb_disconnect);
 
 static ssize_t wusb_cdid_show(struct device *dev,
                               struct device_attribute *attr, char *buf)
@@ -69,7 +69,7 @@ static ssize_t wusb_cdid_show(struct device *dev,
         wusb_dev_put(wusb_dev);
         return result + 1;
 }
-static DEVICE_ATTR(wusb_cdid, 0444, wusb_cdid_show, NULL);
+static DEVICE_ATTR_RO(wusb_cdid);
 
 static ssize_t wusb_ck_store(struct device *dev,
                              struct device_attribute *attr,
@@ -105,7 +105,7 @@ static ssize_t wusb_ck_store(struct device *dev,
         wusbhc_put(wusbhc);
         return result < 0 ? result : size;
 }
-static DEVICE_ATTR(wusb_ck, 0200, NULL, wusb_ck_store);
+static DEVICE_ATTR_WO(wusb_ck);
 
 static struct attribute *wusb_dev_attrs[] = {
                 &dev_attr_wusb_disconnect.attr,
diff --git a/drivers/usb/wusbcore/security.c b/drivers/usb/wusbcore/security.c
index 8c9421b69da0..170f2c38de9b 100644
--- a/drivers/usb/wusbcore/security.c
+++ b/drivers/usb/wusbcore/security.c
@@ -240,6 +240,7 @@ int wusb_dev_sec_add(struct wusbhc *wusbhc,
         if (new_secd == NULL) {
                 dev_err(dev,
                         "Can't allocate space for security descriptors\n");
+                result = -ENOMEM;
                 goto out;
         }
         secd = new_secd;
diff --git a/drivers/usb/wusbcore/wa-nep.c b/drivers/usb/wusbcore/wa-nep.c
index ed4622279c63..e3819fc182b0 100644
--- a/drivers/usb/wusbcore/wa-nep.c
+++ b/drivers/usb/wusbcore/wa-nep.c
@@ -198,6 +198,7 @@ static int wa_nep_queue(struct wahc *wa, size_t size)
         if (nw == NULL) {
                 if (printk_ratelimit())
                         dev_err(dev, "No memory to queue notification\n");
+                result = -ENOMEM;
                 goto out;
         }
         INIT_WORK(&nw->work, wa_notif_dispatch);
diff --git a/drivers/usb/wusbcore/wa-xfer.c b/drivers/usb/wusbcore/wa-xfer.c
index 167fcc71f5f6..e70322b1dd02 100644
--- a/drivers/usb/wusbcore/wa-xfer.c
+++ b/drivers/usb/wusbcore/wa-xfer.c
@@ -1203,6 +1203,7 @@ static int __wa_xfer_setup_segs(struct wa_xfer *xfer, size_t xfer_hdr_size)
                                 sizeof(struct wa_xfer_packet_info_hwaiso) +
                                 (seg_isoc_frame_count * sizeof(__le16));
                 }
+                result = -ENOMEM;
                 seg = xfer->seg[cnt] = kmalloc(alloc_size + iso_pkt_descr_size,
                                                 GFP_ATOMIC);
                 if (seg == NULL)
diff --git a/drivers/usb/wusbcore/wusbhc.c b/drivers/usb/wusbcore/wusbhc.c
index 94f401ab859f..a273a91cf667 100644
--- a/drivers/usb/wusbcore/wusbhc.c
+++ b/drivers/usb/wusbcore/wusbhc.c
@@ -84,8 +84,7 @@ static ssize_t wusb_trust_timeout_store(struct device *dev,
 out:
         return result < 0 ? result : size;
 }
-static DEVICE_ATTR(wusb_trust_timeout, 0644, wusb_trust_timeout_show,
-                                             wusb_trust_timeout_store);
+static DEVICE_ATTR_RW(wusb_trust_timeout);
 
 /*
  * Show the current WUSB CHID.
@@ -145,7 +144,7 @@ static ssize_t wusb_chid_store(struct device *dev,
         result = wusbhc_chid_set(wusbhc, &chid);
         return result < 0 ? result : size;
 }
-static DEVICE_ATTR(wusb_chid, 0644, wusb_chid_show, wusb_chid_store);
+static DEVICE_ATTR_RW(wusb_chid);
 
 
 static ssize_t wusb_phy_rate_show(struct device *dev,
@@ -174,8 +173,7 @@ static ssize_t wusb_phy_rate_store(struct device *dev,
         wusbhc->phy_rate = phy_rate;
         return size;
 }
-static DEVICE_ATTR(wusb_phy_rate, 0644, wusb_phy_rate_show,
-                        wusb_phy_rate_store);
+static DEVICE_ATTR_RW(wusb_phy_rate);
 
 static ssize_t wusb_dnts_show(struct device *dev,
                                   struct device_attribute *attr,
@@ -205,7 +203,7 @@ static ssize_t wusb_dnts_store(struct device *dev,
 
         return size;
 }
-static DEVICE_ATTR(wusb_dnts, 0644, wusb_dnts_show, wusb_dnts_store);
+static DEVICE_ATTR_RW(wusb_dnts);
 
 static ssize_t wusb_retry_count_show(struct device *dev,
                                   struct device_attribute *attr,
@@ -234,8 +232,7 @@ static ssize_t wusb_retry_count_store(struct device *dev,
 
         return size;
 }
-static DEVICE_ATTR(wusb_retry_count, 0644, wusb_retry_count_show,
-        wusb_retry_count_store);
+static DEVICE_ATTR_RW(wusb_retry_count);
 
 /* Group all the WUSBHC attributes */
 static struct attribute *wusbhc_attrs[] = {
diff --git a/include/linux/fsl_devices.h b/include/linux/fsl_devices.h
index f2912914141a..60cef8227534 100644
--- a/include/linux/fsl_devices.h
+++ b/include/linux/fsl_devices.h
@@ -100,6 +100,7 @@ struct fsl_usb2_platform_data {
         unsigned        already_suspended:1;
         unsigned        has_fsl_erratum_a007792:1;
         unsigned        has_fsl_erratum_a005275:1;
+        unsigned        has_fsl_erratum_a005697:1;
         unsigned        check_phy_clk_valid:1;
 
         /* register save area for suspend/resume */
diff --git a/include/linux/usb.h b/include/linux/usb.h
index eba1f10e8cfd..7e68259360de 100644
--- a/include/linux/usb.h
+++ b/include/linux/usb.h
@@ -1160,7 +1160,7 @@ extern struct bus_type usb_bus_type;
  * @minor_base: the start of the minor range for this driver.
  *
  * This structure is used for the usb_register_dev() and
- * usb_unregister_dev() functions, to consolidate a number of the
+ * usb_deregister_dev() functions, to consolidate a number of the
  * parameters used for them.
  */
 struct usb_class_driver {
diff --git a/include/linux/usb/gadget.h b/include/linux/usb/gadget.h
index 8e81f9eb95e4..e4516e9ded0f 100644
--- a/include/linux/usb/gadget.h
+++ b/include/linux/usb/gadget.h
@@ -429,7 +429,9 @@ static inline struct usb_gadget *dev_to_usb_gadget(struct device *dev)
  */
 static inline size_t usb_ep_align(struct usb_ep *ep, size_t len)
 {
-        return round_up(len, (size_t)le16_to_cpu(ep->desc->wMaxPacketSize));
+        int max_packet_size = (size_t)usb_endpoint_maxp(ep->desc) & 0x7ff;
+
+        return round_up(len, max_packet_size);
 }
 
 /**
diff --git a/include/linux/usb/hcd.h b/include/linux/usb/hcd.h
index 66fc13705ab7..40edf6a8533e 100644
--- a/include/linux/usb/hcd.h
+++ b/include/linux/usb/hcd.h
@@ -566,21 +566,22 @@ extern void usb_ep0_reinit(struct usb_device *);
         ((USB_DIR_OUT|USB_TYPE_STANDARD|USB_RECIP_INTERFACE)<<8)
 
 /* class requests from the USB 2.0 hub spec, table 11-15 */
+#define HUB_CLASS_REQ(dir, type, request) ((((dir) | (type)) << 8) | (request))
 /* GetBusState and SetHubDescriptor are optional, omitted */
-#define ClearHubFeature         (0x2000 | USB_REQ_CLEAR_FEATURE)
-#define ClearPortFeature        (0x2300 | USB_REQ_CLEAR_FEATURE)
-#define GetHubDescriptor        (0xa000 | USB_REQ_GET_DESCRIPTOR)
-#define GetHubStatus            (0xa000 | USB_REQ_GET_STATUS)
-#define GetPortStatus           (0xa300 | USB_REQ_GET_STATUS)
-#define SetHubFeature           (0x2000 | USB_REQ_SET_FEATURE)
-#define SetPortFeature          (0x2300 | USB_REQ_SET_FEATURE)
+#define ClearHubFeature         HUB_CLASS_REQ(USB_DIR_OUT, USB_RT_HUB, USB_REQ_CLEAR_FEATURE)
+#define ClearPortFeature        HUB_CLASS_REQ(USB_DIR_OUT, USB_RT_PORT, USB_REQ_CLEAR_FEATURE)
+#define GetHubDescriptor        HUB_CLASS_REQ(USB_DIR_IN, USB_RT_HUB, USB_REQ_GET_DESCRIPTOR)
+#define GetHubStatus            HUB_CLASS_REQ(USB_DIR_IN, USB_RT_HUB, USB_REQ_GET_STATUS)
+#define GetPortStatus           HUB_CLASS_REQ(USB_DIR_IN, USB_RT_PORT, USB_REQ_GET_STATUS)
+#define SetHubFeature           HUB_CLASS_REQ(USB_DIR_OUT, USB_RT_HUB, USB_REQ_SET_FEATURE)
+#define SetPortFeature          HUB_CLASS_REQ(USB_DIR_OUT, USB_RT_PORT, USB_REQ_SET_FEATURE)
 
 
 /*-------------------------------------------------------------------------*/
 
 /* class requests from USB 3.1 hub spec, table 10-7 */
-#define SetHubDepth             (0x2000 | HUB_SET_DEPTH)
-#define GetPortErrorCount       (0xa300 | HUB_GET_PORT_ERR_COUNT)
+#define SetHubDepth             HUB_CLASS_REQ(USB_DIR_OUT, USB_RT_HUB, HUB_SET_DEPTH)
+#define GetPortErrorCount       HUB_CLASS_REQ(USB_DIR_IN, USB_RT_PORT, HUB_GET_PORT_ERR_COUNT)
 
 /*
  * Generic bandwidth allocation constants/support
diff --git a/include/uapi/linux/usb/ch9.h b/include/uapi/linux/usb/ch9.h
index a8acc24765fe..2c5d7c4a69e3 100644
--- a/include/uapi/linux/usb/ch9.h
+++ b/include/uapi/linux/usb/ch9.h
@@ -423,6 +423,12 @@ struct usb_endpoint_descriptor {
 #define USB_ENDPOINT_XFER_INT           3
 #define USB_ENDPOINT_MAX_ADJUSTABLE     0x80
 
+#define USB_ENDPOINT_MAXP_MASK  0x07ff
+#define USB_EP_MAXP_MULT_SHIFT  11
+#define USB_EP_MAXP_MULT_MASK   (3 << USB_EP_MAXP_MULT_SHIFT)
+#define USB_EP_MAXP_MULT(m) \
+        (((m) & USB_EP_MAXP_MULT_MASK) >> USB_EP_MAXP_MULT_SHIFT)
+
 /* The USB 3.0 spec redefines bits 5:4 of bmAttributes as interrupt ep type. */
 #define USB_ENDPOINT_INTRTYPE           0x30
 #define USB_ENDPOINT_INTR_PERIODIC      (0 << 4)
@@ -623,11 +629,25 @@ static inline int usb_endpoint_is_isoc_out(
  * usb_endpoint_maxp - get endpoint's max packet size
  * @epd: endpoint to be checked
  *
- * Returns @epd's max packet
+ * Returns @epd's max packet bits [10:0]
  */
 static inline int usb_endpoint_maxp(const struct usb_endpoint_descriptor *epd)
 {
-        return __le16_to_cpu(epd->wMaxPacketSize);
+        return __le16_to_cpu(epd->wMaxPacketSize) & USB_ENDPOINT_MAXP_MASK;
+}
+
+/**
+ * usb_endpoint_maxp_mult - get endpoint's transactional opportunities
+ * @epd: endpoint to be checked
+ *
+ * Return @epd's wMaxPacketSize[12:11] + 1
+ */
+static inline int
+usb_endpoint_maxp_mult(const struct usb_endpoint_descriptor *epd)
+{
+        int maxp = __le16_to_cpu(epd->wMaxPacketSize);
+
+        return USB_EP_MAXP_MULT(maxp) + 1;
 }
 
 static inline int usb_endpoint_interrupt_type(
diff --git a/tools/usb/usbip/.gitignore b/tools/usb/usbip/.gitignore
index 9aad9e30a8ba..03b892c8bd8c 100644
--- a/tools/usb/usbip/.gitignore
+++ b/tools/usb/usbip/.gitignore
@@ -2,6 +2,7 @@ Makefile
 Makefile.in
 aclocal.m4
 autom4te.cache/
+compile
 config.guess
 config.h
 config.h.in
@@ -21,7 +22,10 @@ src/Makefile.in
 stamp-h1
 libsrc/libusbip.la
 libsrc/libusbip_la-names.lo
+libsrc/libusbip_la-sysfs_utils.lo
 libsrc/libusbip_la-usbip_common.lo
+libsrc/libusbip_la-usbip_device_driver.lo
+libsrc/libusbip_la-usbip_host_common.lo
 libsrc/libusbip_la-usbip_host_driver.lo
 libsrc/libusbip_la-vhci_driver.lo
 src/usbip
diff --git a/tools/usb/usbip/src/usbipd.c b/tools/usb/usbip/src/usbipd.c
index a0972dea9e6c..009afb4a3aae 100644
--- a/tools/usb/usbip/src/usbipd.c
+++ b/tools/usb/usbip/src/usbipd.c
@@ -398,13 +398,6 @@ static int listen_all_addrinfo(struct addrinfo *ai_head, int sockfdlist[],
                  * (see do_standalone_mode()) */
                 usbip_net_set_v6only(sock);
 
-                if (sock >= FD_SETSIZE) {
-                        err("FD_SETSIZE: %s: sock=%d, max=%d",
-                            ai_buf, sock, FD_SETSIZE);
-                        close(sock);
-                        continue;
-                }
-
                 ret = bind(sock, ai->ai_addr, ai->ai_addrlen);
                 if (ret < 0) {
                         err("bind: %s: %d (%s)",