764 files changed, 6609 insertions, 9083 deletions

diff --git a/Documentation/devicetree/bindings/phy/brcm,brcmstb-usb-phy.txt b/Documentation/devicetree/bindings/phy/brcm,brcmstb-usb-phy.txt
new file mode 100644
index 000000000000..24a0d06acd1d
--- /dev/null
+++ b/Documentation/devicetree/bindings/phy/brcm,brcmstb-usb-phy.txt
@@ -0,0 +1,43 @@
+Broadcom STB USB PHY
+
+Required properties:
+ - compatible: brcm,brcmstb-usb-phy
+ - reg: two offset and length pairs.
+        The first pair specifies a manditory set of memory mapped
+        registers used for general control of the PHY.
+        The second pair specifies optional registers used by some of
+        the SoCs that support USB 3.x
+ - #phy-cells: Shall be 1 as it expects one argument for setting
+               the type of the PHY. Possible values are:
+               - PHY_TYPE_USB2 for USB1.1/2.0 PHY
+               - PHY_TYPE_USB3 for USB3.x PHY
+
+Optional Properties:
+- clocks : clock phandles.
+- clock-names: String, clock name.
+- brcm,ipp: Boolean, Invert Port Power.
+  Possible values are: 0 (Don't invert), 1 (Invert)
+- brcm,ioc: Boolean, Invert Over Current detection.
+  Possible values are: 0 (Don't invert), 1 (Invert)
+NOTE: one or both of the following two properties must be set
+- brcm,has-xhci: Boolean indicating the phy has an XHCI phy.
+- brcm,has-eohci: Boolean indicating the phy has an EHCI/OHCI phy.
+- dr_mode: String, PHY Device mode.
+  Possible values are: "host", "peripheral ", "drd" or "typec-pd"
+  If this property is not defined, the phy will default to "host" mode.
+
+Example:
+
+usbphy_0: usb-phy@f0470200 {
+        reg = <0xf0470200 0xb8>,
+                <0xf0471940 0x6c0>;
+        compatible = "brcm,brcmstb-usb-phy";
+        #phy-cells = <1>;
+        dr_mode = "host"
+        brcm,ioc = <1>;
+        brcm,ipp = <1>;
+        brcm,has-xhci;
+        brcm,has-eohci;
+        clocks = <&usb20>, <&usb30>;
+        clock-names = "sw_usb", "sw_usb3";
+};
diff --git a/Documentation/devicetree/bindings/phy/brcm-sata-phy.txt b/Documentation/devicetree/bindings/phy/brcm-sata-phy.txt
index 97977cd29a98..0aced97d8092 100644
--- a/Documentation/devicetree/bindings/phy/brcm-sata-phy.txt
+++ b/Documentation/devicetree/bindings/phy/brcm-sata-phy.txt
@@ -27,7 +27,16 @@ Sub-nodes optional properties:
      This property is not applicable for "brcm,iproc-ns2-sata-phy",
      "brcm,iproc-nsp-sata-phy" and "brcm,iproc-sr-sata-phy".
 
-Example:
+- brcm,rxaeq-mode: string that indicates the desired RX equalizer
+  mode, possible values are:
+        "off" (equivalent to not specifying the property)
+        "auto"
+        "manual" (brcm,rxaeq-value is used in that case)
+
+- brcm,rxaeq-value: when 'rxaeq-mode' is set to "manual", provides the RX
+  equalizer value that should be used. Allowed range is 0..63.
+
+Example
         sata-phy@f0458100 {
                 compatible = "brcm,bcm7445-sata-phy", "brcm,phy-sata3";
                 reg = <0xf0458100 0x1e00>, <0xf045804c 0x10>;
diff --git a/Documentation/devicetree/bindings/phy/rcar-gen2-phy.txt b/Documentation/devicetree/bindings/phy/rcar-gen2-phy.txt
index 91da947ae9b6..eeb9e1874ea6 100644
--- a/Documentation/devicetree/bindings/phy/rcar-gen2-phy.txt
+++ b/Documentation/devicetree/bindings/phy/rcar-gen2-phy.txt
@@ -4,10 +4,13 @@ This file provides information on what the device node for the R-Car generation
 2 USB PHY contains.
 
 Required properties:
-- compatible: "renesas,usb-phy-r8a7790" if the device is a part of R8A7790 SoC.
+- compatible: "renesas,usb-phy-r8a7743" if the device is a part of R8A7743 SoC.
+              "renesas,usb-phy-r8a7745" if the device is a part of R8A7745 SoC.
+              "renesas,usb-phy-r8a7790" if the device is a part of R8A7790 SoC.
               "renesas,usb-phy-r8a7791" if the device is a part of R8A7791 SoC.
               "renesas,usb-phy-r8a7794" if the device is a part of R8A7794 SoC.
-              "renesas,rcar-gen2-usb-phy" for a generic R-Car Gen2 compatible device.
+              "renesas,rcar-gen2-usb-phy" for a generic R-Car Gen2 or
+                                          RZ/G1 compatible device.
 
               When compatible with the generic version, nodes must list the
               SoC-specific version corresponding to the platform first
diff --git a/Documentation/devicetree/bindings/phy/rcar-gen3-phy-usb2.txt b/Documentation/devicetree/bindings/phy/rcar-gen3-phy-usb2.txt
index ace9cce2704a..99b651b33110 100644
--- a/Documentation/devicetree/bindings/phy/rcar-gen3-phy-usb2.txt
+++ b/Documentation/devicetree/bindings/phy/rcar-gen3-phy-usb2.txt
@@ -8,6 +8,8 @@ Required properties:
               SoC.
               "renesas,usb2-phy-r8a7796" if the device is a part of an R8A7796
               SoC.
+              "renesas,usb2-phy-r8a77995" if the device is a part of an
+              R8A77995 SoC.
               "renesas,rcar-gen3-usb2-phy" for a generic R-Car Gen3 compatible device.
 
               When compatible with the generic version, nodes must list the
diff --git a/Documentation/devicetree/bindings/usb/dwc2.txt b/Documentation/devicetree/bindings/usb/dwc2.txt
index fcf199b64d3d..e64d903bcbe8 100644
--- a/Documentation/devicetree/bindings/usb/dwc2.txt
+++ b/Documentation/devicetree/bindings/usb/dwc2.txt
@@ -19,6 +19,8 @@ Required properties:
   configured in FS mode;
   - "st,stm32f4x9-hsotg": The DWC2 USB HS controller instance in STM32F4x9 SoCs
   configured in HS mode;
+  - "st,stm32f7xx-hsotg": The DWC2 USB HS controller instance in STM32F7xx SoCs
+    configured in HS mode;
 - reg : Should contain 1 register range (address and length)
 - interrupts : Should contain 1 interrupt
 - clocks: clock provider specifier
diff --git a/Documentation/devicetree/bindings/usb/maxim,max3421.txt b/Documentation/devicetree/bindings/usb/maxim,max3421.txt
new file mode 100644
index 000000000000..8cdbe0c85188
--- /dev/null
+++ b/Documentation/devicetree/bindings/usb/maxim,max3421.txt
@@ -0,0 +1,26 @@
+Maxim Integrated SPI-based USB 2.0 host controller MAX3421E
+
+Required properties:
+ - compatible: Should be "maxim,max3421"
+ - spi-max-frequency: maximum frequency for this device must not exceed 26 MHz.
+ - reg: chip select number to which this device is connected.
+ - maxim,vbus-en-pin: <GPOUTx ACTIVE_LEVEL>
+   GPOUTx is the number (1-8) of the GPOUT pin of MAX3421E to drive Vbus.
+   ACTIVE_LEVEL is 0 or 1.
+ - interrupts: the interrupt line description for the interrupt controller.
+   The driver configures MAX3421E for active low level triggered interrupts,
+   configure your interrupt line accordingly.
+
+Optional property:
+ - interrupt-parent: the phandle to the associated interrupt controller.
+
+Example:
+
+        usb@0 {
+                compatible = "maxim,max3421";
+                reg = <0>;
+                maxim,vbus-en-pin = <3 1>;
+                spi-max-frequency = <26000000>;
+                interrupt-parent = <&PIC>;
+                interrupts = <42>;
+        };
diff --git a/Documentation/devicetree/bindings/usb/mediatek,mtk-xhci.txt b/Documentation/devicetree/bindings/usb/mediatek,mtk-xhci.txt
index 5611a2e4ddf0..30595964876a 100644
--- a/Documentation/devicetree/bindings/usb/mediatek,mtk-xhci.txt
+++ b/Documentation/devicetree/bindings/usb/mediatek,mtk-xhci.txt
@@ -26,10 +26,11 @@ Required properties:
  - clocks : a list of phandle + clock-specifier pairs, one for each
         entry in clock-names
  - clock-names : must contain
-        "sys_ck": for clock of xHCI MAC
-        "ref_ck": for reference clock of xHCI MAC
-        "wakeup_deb_p0": for USB wakeup debounce clock of port0
-        "wakeup_deb_p1": for USB wakeup debounce clock of port1
+        "sys_ck": controller clock used by normal mode,
+        the following ones are optional:
+        "ref_ck": reference clock used by low power mode etc,
+        "mcu_ck": mcu_bus clock for register access,
+        "dma_ck": dma_bus clock for data transfer by DMA
 
  - phys : a list of phandle + phy specifier pairs
 
@@ -38,6 +39,8 @@ Optional properties:
         mode;
  - mediatek,syscon-wakeup : phandle to syscon used to access USB wakeup
         control register, it depends on "mediatek,wakeup-src".
+ - mediatek,u3p-dis-msk : mask to disable u3ports, bit0 for u3port0,
+        bit1 for u3port1, ... etc;
  - vbus-supply : reference to the VBUS regulator;
  - usb3-lpm-capable : supports USB3.0 LPM
  - pinctrl-names : a pinctrl state named "default" must be defined
@@ -55,9 +58,7 @@ usb30: usb@11270000 {
         clocks = <&topckgen CLK_TOP_USB30_SEL>, <&clk26m>,
                  <&pericfg CLK_PERI_USB0>,
                  <&pericfg CLK_PERI_USB1>;
-        clock-names = "sys_ck", "ref_ck",
-                      "wakeup_deb_p0",
-                      "wakeup_deb_p1";
+        clock-names = "sys_ck", "ref_ck";
         phys = <&phy_port0 PHY_TYPE_USB3>,
                <&phy_port1 PHY_TYPE_USB2>;
         vusb33-supply = <&mt6397_vusb_reg>;
@@ -89,9 +90,8 @@ Required properties:
 
  - 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
-        "ref_ck": for reference clock of xHCI MAC
+ - clock-names : must contain "sys_ck", and the following ones are optional:
+        "ref_ck", "mcu_ck" and "dma_ck"
 
 Optional properties:
  - vbus-supply : reference to the VBUS regulator;
diff --git a/Documentation/devicetree/bindings/usb/mediatek,mtu3.txt b/Documentation/devicetree/bindings/usb/mediatek,mtu3.txt
index 49f54767cd21..b2271d8e6b50 100644
--- a/Documentation/devicetree/bindings/usb/mediatek,mtu3.txt
+++ b/Documentation/devicetree/bindings/usb/mediatek,mtu3.txt
@@ -14,9 +14,9 @@ Required properties:
  - vusb33-supply : regulator of USB avdd3.3v
  - clocks : a list of phandle + clock-specifier pairs, one for each
         entry in clock-names
- - clock-names : must contain "sys_ck" and "ref_ck" for clock of controller;
-        "wakeup_deb_p0" and "wakeup_deb_p1" are optional, they are
-        depends on "mediatek,enable-wakeup"
+ - clock-names : must contain "sys_ck" for clock of controller,
+        the following clocks are optional:
+        "ref_ck", "mcu_ck" and "dam_ck";
  - phys : a list of phandle + phy specifier pairs
  - dr_mode : should be one of "host", "peripheral" or "otg",
         refer to usb/generic.txt
@@ -30,9 +30,10 @@ Optional properties:
         when supports dual-role mode.
  - vbus-supply : reference to the VBUS regulator, needed when supports
         dual-role mode.
- - pinctl-names : a pinctrl state named "default" must be defined,
-        "id_float" and "id_ground" are optinal which depends on
-        "mediatek,enable-manual-drd"
+ - pinctrl-names : a pinctrl state named "default" is optional, and need be
+        defined if auto drd switch is enabled, that means the property dr_mode
+        is set as "otg", and meanwhile the property "mediatek,enable-manual-drd"
+        is not set.
  - pinctrl-0 : pin control group
         See: Documentation/devicetree/bindings/pinctrl/pinctrl-bindings.txt
 
@@ -44,6 +45,8 @@ Optional properties:
  - mediatek,enable-wakeup : supports ip sleep wakeup used by host mode
  - mediatek,syscon-wakeup : phandle to syscon used to access USB wakeup
         control register, it depends on "mediatek,enable-wakeup".
+ - mediatek,u3p-dis-msk : mask to disable u3ports, bit0 for u3port0,
+        bit1 for u3port1, ... etc;
 
 Sub-nodes:
 The xhci should be added as subnode to mtu3 as shown in the following example
@@ -63,9 +66,7 @@ ssusb: usb@11271000 {
         clocks = <&topckgen CLK_TOP_USB30_SEL>, <&clk26m>,
                  <&pericfg CLK_PERI_USB0>,
                  <&pericfg CLK_PERI_USB1>;
-        clock-names = "sys_ck", "ref_ck",
-                      "wakeup_deb_p0",
-                      "wakeup_deb_p1";
+        clock-names = "sys_ck", "ref_ck";
         vusb33-supply = <&mt6397_vusb_reg>;
         vbus-supply = <&usb_p0_vbus>;
         extcon = <&extcon_usb>;
diff --git a/Documentation/devicetree/bindings/usb/renesas_usb3.txt b/Documentation/devicetree/bindings/usb/renesas_usb3.txt
index e28025883b79..87a45e2f9b7f 100644
--- a/Documentation/devicetree/bindings/usb/renesas_usb3.txt
+++ b/Documentation/devicetree/bindings/usb/renesas_usb3.txt
@@ -15,6 +15,10 @@ Required properties:
   - interrupts: Interrupt specifier for the USB3.0 Peripheral
   - clocks: clock phandle and specifier pair
 
+Optional properties:
+  - phys: phandle + phy specifier pair
+  - phy-names: must be "usb"
+
 Example of R-Car H3 ES1.x:
         usb3_peri0: usb@ee020000 {
                 compatible = "renesas,r8a7795-usb3-peri",
diff --git a/Documentation/devicetree/bindings/usb/renesas_usbhs.txt b/Documentation/devicetree/bindings/usb/renesas_usbhs.txt
index 9e18e000339e..47394ab788e3 100644
--- a/Documentation/devicetree/bindings/usb/renesas_usbhs.txt
+++ b/Documentation/devicetree/bindings/usb/renesas_usbhs.txt
@@ -3,6 +3,8 @@ Renesas Electronics USBHS driver
 Required properties:
   - compatible: Must contain one or more of the following:
 
+        - "renesas,usbhs-r8a7743" for r8a7743 (RZ/G1M) compatible device
+        - "renesas,usbhs-r8a7745" for r8a7745 (RZ/G1E) compatible device
         - "renesas,usbhs-r8a7790" for r8a7790 (R-Car H2) compatible device
         - "renesas,usbhs-r8a7791" for r8a7791 (R-Car M2-W) compatible device
         - "renesas,usbhs-r8a7792" for r8a7792 (R-Car V2H) compatible device
@@ -10,7 +12,8 @@ Required properties:
         - "renesas,usbhs-r8a7794" for r8a7794 (R-Car E2) compatible device
         - "renesas,usbhs-r8a7795" for r8a7795 (R-Car H3) compatible device
         - "renesas,usbhs-r8a7796" for r8a7796 (R-Car M3-W) compatible device
-        - "renesas,rcar-gen2-usbhs" for R-Car Gen2 compatible device
+        - "renesas,usbhs-r8a77995" for r8a77995 (R-Car D3) compatible device
+        - "renesas,rcar-gen2-usbhs" for R-Car Gen2 or RZ/G1 compatible devices
         - "renesas,rcar-gen3-usbhs" for R-Car Gen3 compatible device
 
         When compatible with the generic version, nodes must list the
diff --git a/Documentation/devicetree/bindings/usb/usb-xhci.txt b/Documentation/devicetree/bindings/usb/usb-xhci.txt
index 2d80b60eeabe..ae6e484a8d7c 100644
--- a/Documentation/devicetree/bindings/usb/usb-xhci.txt
+++ b/Documentation/devicetree/bindings/usb/usb-xhci.txt
@@ -26,6 +26,7 @@ Required properties:
 
 Optional properties:
   - clocks: reference to a clock
+  - usb2-lpm-disable: indicate if we don't want to enable USB2 HW LPM
   - usb3-lpm-capable: determines if platform is USB3 LPM capable
   - quirk-broken-port-ped: set if the controller has broken port disable mechanism
 
diff --git a/Documentation/devicetree/bindings/usb/usb251xb.txt b/Documentation/devicetree/bindings/usb/usb251xb.txt
index 3957d4edaa74..168ff819e827 100644
--- a/Documentation/devicetree/bindings/usb/usb251xb.txt
+++ b/Documentation/devicetree/bindings/usb/usb251xb.txt
@@ -1,16 +1,17 @@
 Microchip USB 2.0 Hi-Speed Hub Controller
 
-The device node for the configuration of a Microchip USB251xB/xBi USB 2.0
+The device node for the configuration of a Microchip USB251x/xBi USB 2.0
 Hi-Speed Controller.
 
 Required properties :
  - compatible : Should be "microchip,usb251xb" or one of the specific types:
         "microchip,usb2512b", "microchip,usb2512bi", "microchip,usb2513b",
-        "microchip,usb2513bi", "microchip,usb2514b", "microchip,usb2514bi"
- - reset-gpios : Should specify the gpio for hub reset
+        "microchip,usb2513bi", "microchip,usb2514b", "microchip,usb2514bi",
+        "microchip,usb2517", "microchip,usb2517i"
  - reg : I2C address on the selected bus (default is <0x2C>)
 
 Optional properties :
+ - reset-gpios : Should specify the gpio for hub reset
  - skip-config : Skip Hub configuration, but only send the USB-Attach command
  - vendor-id : Set USB Vendor ID of the hub (16 bit, default is 0x0424)
  - product-id : Set USB Product ID of the hub (16 bit, default depends on type)
@@ -19,29 +20,47 @@ Optional properties :
  - manufacturer : Set USB Manufacturer string (max 31 characters long)
  - product : Set USB Product string (max 31 characters long)
  - serial : Set USB Serial string (max 31 characters long)
- - {bus,self}-powered : selects between self- and bus-powered operation (default
-        is self-powered)
- - disable-hi-speed : disable USB Hi-Speed support
+ - {bus,self}-powered : selects between self- and bus-powered operation
+        (boolean, default is self-powered)
+ - disable-hi-speed : disable USB Hi-Speed support (boolean)
  - {multi,single}-tt : selects between multi- and single-transaction-translator
-        (default is multi-tt)
- - disable-eop : disable End of Packet generation in full-speed mode
+        (boolean, default is multi-tt)
+ - disable-eop : disable End of Packet generation in full-speed mode (boolean)
  - {ganged,individual}-sensing : select over-current sense type in self-powered
-        mode (default is individual)
+        mode (boolean, default is individual)
  - {ganged,individual}-port-switching : select port power switching mode
-        (default is individual)
+        (boolean, default is individual)
  - dynamic-power-switching : enable auto-switching from self- to bus-powered
-        operation if the local power source is removed or unavailable
+        operation if the local power source is removed or unavailable (boolean)
  - oc-delay-us : Delay time (in microseconds) for filtering the over-current
         sense inputs. Valid values are 100, 4000, 8000 (default) and 16000. If
         an invalid value is given, the default is used instead.
- - compound-device : indicate the hub is part of a compound device
- - port-mapping-mode : enable port mapping mode
+ - compound-device : indicate the hub is part of a compound device (boolean)
+ - port-mapping-mode : enable port mapping mode (boolean)
+ - led-{usb,speed}-mode : led usb/speed indication mode selection
+        (boolean, default is speed mode)
  - string-support : enable string descriptor support (required for manufacturer,
         product and serial string configuration)
  - non-removable-ports : Should specify the ports which have a non-removable
         device connected.
  - sp-disabled-ports : Specifies the ports which will be self-power disabled
  - bp-disabled-ports : Specifies the ports which will be bus-power disabled
+ - sp-max-total-current-microamp: Specifies max current consumed by the hub
+        from VBUS when operating in self-powered hub. It includes the hub
+        silicon along with all associated circuitry including a permanently
+        attached peripheral (range: 0 - 100000 uA, default 1000 uA)
+ - bp-max-total-current-microamp: Specifies max current consumed by the hub
+        from VBUS when operating in self-powered hub. It includes the hub
+        silicon along with all associated circuitry including a permanently
+        attached peripheral (range: 0 - 510000 uA, default 100000 uA)
+ - sp-max-removable-current-microamp: Specifies max current consumed by the hub
+        from VBUS when operating in self-powered hub. It includes the hub
+        silicon along with all associated circuitry excluding a permanently
+        attached peripheral (range: 0 - 100000 uA, default 1000 uA)
+ - bp-max-removable-current-microamp: Specifies max current consumed by the hub
+        from VBUS when operating in self-powered hub. It includes the hub
+        silicon along with all associated circuitry excluding a permanently
+        attached peripheral (range: 0 - 510000 uA, default 100000 uA)
  - power-on-time-ms : Specifies the time it takes from the time the host
         initiates the power-on sequence to a port until the port has adequate
         power. The value is given in ms in a 0 - 510 range (default is 100ms).
@@ -56,7 +75,6 @@ Examples:
         usb2514b@2c {
                 compatible = "microchip,usb2514b";
                 reg = <0x2c>;
-                reset-gpios = <&gpio1 4 GPIO_ACTIVE_LOW>;
                 vendor-id = /bits/ 16 <0x0000>;
                 product-id = /bits/ 16 <0x0000>;
                 string-support;
diff --git a/MAINTAINERS b/MAINTAINERS
index ee5d9d2aabb1..650aa0e0e9d8 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2896,6 +2896,13 @@ S:	Supported
 F:      drivers/gpio/gpio-brcmstb.c
 F:      Documentation/devicetree/bindings/gpio/brcm,brcmstb-gpio.txt
 
+BROADCOM BRCMSTB USB2 and USB3 PHY DRIVER
+M:      Al Cooper <alcooperx@gmail.com>
+L:      linux-kernel@vger.kernel.org
+L:      bcm-kernel-feedback-list@broadcom.com
+S:      Maintained
+F:      drivers/phy/broadcom/phy-brcm-usb*
+
 BROADCOM GENET ETHERNET DRIVER
 M:      Florian Fainelli <f.fainelli@gmail.com>
 L:      netdev@vger.kernel.org
diff --git a/drivers/extcon/extcon-adc-jack.c b/drivers/extcon/extcon-adc-jack.c
index 6f6537ab0a79..3877d86c746a 100644
--- a/drivers/extcon/extcon-adc-jack.c
+++ b/drivers/extcon/extcon-adc-jack.c
@@ -26,7 +26,7 @@
 #include <linux/workqueue.h>
 #include <linux/iio/consumer.h>
 #include <linux/extcon/extcon-adc-jack.h>
-#include <linux/extcon.h>
+#include <linux/extcon-provider.h>
 
 /**
  * struct adc_jack_data - internal data for adc_jack device driver
diff --git a/drivers/extcon/extcon-arizona.c b/drivers/extcon/extcon-arizona.c
index f84da4a17724..da0e9bc4262f 100644
--- a/drivers/extcon/extcon-arizona.c
+++ b/drivers/extcon/extcon-arizona.c
@@ -27,7 +27,7 @@
 #include <linux/pm_runtime.h>
 #include <linux/property.h>
 #include <linux/regulator/consumer.h>
-#include <linux/extcon.h>
+#include <linux/extcon-provider.h>
 
 #include <sound/soc.h>
 
diff --git a/drivers/extcon/extcon-axp288.c b/drivers/extcon/extcon-axp288.c
index f4fd03e58e37..981fba56bc18 100644
--- a/drivers/extcon/extcon-axp288.c
+++ b/drivers/extcon/extcon-axp288.c
@@ -22,7 +22,7 @@
 #include <linux/platform_device.h>
 #include <linux/property.h>
 #include <linux/notifier.h>
-#include <linux/extcon.h>
+#include <linux/extcon-provider.h>
 #include <linux/regmap.h>
 #include <linux/gpio.h>
 #include <linux/gpio/consumer.h>
diff --git a/drivers/extcon/extcon-gpio.c b/drivers/extcon/extcon-gpio.c
index ebed22f22d75..ab770adcca7e 100644
--- a/drivers/extcon/extcon-gpio.c
+++ b/drivers/extcon/extcon-gpio.c
@@ -17,7 +17,7 @@
  * GNU General Public License for more details.
  */
 
-#include <linux/extcon.h>
+#include <linux/extcon-provider.h>
 #include <linux/extcon/extcon-gpio.h>
 #include <linux/gpio.h>
 #include <linux/gpio/consumer.h>
diff --git a/drivers/extcon/extcon-intel-cht-wc.c b/drivers/extcon/extcon-intel-cht-wc.c
index 91a0023074af..7c4bc8c44c3f 100644
--- a/drivers/extcon/extcon-intel-cht-wc.c
+++ b/drivers/extcon/extcon-intel-cht-wc.c
@@ -15,7 +15,7 @@
  * more details.
  */
 
-#include <linux/extcon.h>
+#include <linux/extcon-provider.h>
 #include <linux/interrupt.h>
 #include <linux/kernel.h>
 #include <linux/mfd/intel_soc_pmic.h>
diff --git a/drivers/extcon/extcon-intel-int3496.c b/drivers/extcon/extcon-intel-int3496.c
index 1a45e745717d..c8691b5a9cb0 100644
--- a/drivers/extcon/extcon-intel-int3496.c
+++ b/drivers/extcon/extcon-intel-int3496.c
@@ -19,7 +19,7 @@
  */
 
 #include <linux/acpi.h>
-#include <linux/extcon.h>
+#include <linux/extcon-provider.h>
 #include <linux/gpio.h>
 #include <linux/interrupt.h>
 #include <linux/module.h>
diff --git a/drivers/extcon/extcon-max14577.c b/drivers/extcon/extcon-max14577.c
index f6414b7fa5bc..b871836da8a4 100644
--- a/drivers/extcon/extcon-max14577.c
+++ b/drivers/extcon/extcon-max14577.c
@@ -23,7 +23,7 @@
 #include <linux/platform_device.h>
 #include <linux/mfd/max14577.h>
 #include <linux/mfd/max14577-private.h>
-#include <linux/extcon.h>
+#include <linux/extcon-provider.h>
 
 #define DELAY_MS_DEFAULT                17000           /* unit: millisecond */
 
@@ -204,8 +204,8 @@ static int max14577_muic_set_debounce_time(struct max14577_muic_info *info,
 static int max14577_muic_set_path(struct max14577_muic_info *info,
                 u8 val, bool attached)
 {
-        int ret = 0;
         u8 ctrl1, ctrl2 = 0;
+        int ret;
 
         /* Set open state to path before changing hw path */
         ret = max14577_update_reg(info->max14577->regmap,
diff --git a/drivers/extcon/extcon-max3355.c b/drivers/extcon/extcon-max3355.c
index 533e16a952b8..0aa410836f4e 100644
--- a/drivers/extcon/extcon-max3355.c
+++ b/drivers/extcon/extcon-max3355.c
@@ -9,7 +9,7 @@
  * may be copied, distributed, and modified under those terms.
  */
 
-#include <linux/extcon.h>
+#include <linux/extcon-provider.h>
 #include <linux/gpio.h>
 #include <linux/gpio/consumer.h>
 #include <linux/interrupt.h>
diff --git a/drivers/extcon/extcon-max77693.c b/drivers/extcon/extcon-max77693.c
index 7a5856809047..643411066ad9 100644
--- a/drivers/extcon/extcon-max77693.c
+++ b/drivers/extcon/extcon-max77693.c
@@ -26,7 +26,7 @@
 #include <linux/mfd/max77693.h>
 #include <linux/mfd/max77693-common.h>
 #include <linux/mfd/max77693-private.h>
-#include <linux/extcon.h>
+#include <linux/extcon-provider.h>
 #include <linux/regmap.h>
 #include <linux/irqdomain.h>
 
diff --git a/drivers/extcon/extcon-max77843.c b/drivers/extcon/extcon-max77843.c
index 6e722d552cf1..c9fcd6cd41cb 100644
--- a/drivers/extcon/extcon-max77843.c
+++ b/drivers/extcon/extcon-max77843.c
@@ -11,7 +11,7 @@
  * (at your option) any later version.
  */
 
-#include <linux/extcon.h>
+#include <linux/extcon-provider.h>
 #include <linux/i2c.h>
 #include <linux/interrupt.h>
 #include <linux/kernel.h>
@@ -80,7 +80,7 @@ enum max77843_muic_accessory_type {
         MAX77843_MUIC_ADC_REMOTE_S12_BUTTON,
         MAX77843_MUIC_ADC_RESERVED_ACC_1,
         MAX77843_MUIC_ADC_RESERVED_ACC_2,
-        MAX77843_MUIC_ADC_RESERVED_ACC_3,
+        MAX77843_MUIC_ADC_RESERVED_ACC_3, /* SmartDock */
         MAX77843_MUIC_ADC_RESERVED_ACC_4,
         MAX77843_MUIC_ADC_RESERVED_ACC_5,
         MAX77843_MUIC_ADC_AUDIO_DEVICE_TYPE2,
@@ -119,6 +119,7 @@ enum max77843_muic_charger_type {
         MAX77843_MUIC_CHG_SPECIAL_BIAS,
         MAX77843_MUIC_CHG_RESERVED,
         MAX77843_MUIC_CHG_GND,
+        MAX77843_MUIC_CHG_DOCK,
 };
 
 static const unsigned int max77843_extcon_cable[] = {
@@ -130,6 +131,7 @@ static const unsigned int max77843_extcon_cable[] = {
         EXTCON_CHG_USB_FAST,
         EXTCON_CHG_USB_SLOW,
         EXTCON_DISP_MHL,
+        EXTCON_DOCK,
         EXTCON_JIG,
         EXTCON_NONE,
 };
@@ -200,7 +202,7 @@ static const struct regmap_irq_chip max77843_muic_irq_chip = {
 };
 
 static int max77843_muic_set_path(struct max77843_muic_info *info,
-                u8 val, bool attached)
+                u8 val, bool attached, bool nobccomp)
 {
         struct max77693_dev *max77843 = info->max77843;
         int ret = 0;
@@ -210,10 +212,16 @@ static int max77843_muic_set_path(struct max77843_muic_info *info,
                 ctrl1 = val;
         else
                 ctrl1 = MAX77843_MUIC_CONTROL1_SW_OPEN;
+        if (nobccomp) {
+                /* Disable BC1.2 protocol and force manual switch control */
+                ctrl1 |= MAX77843_MUIC_CONTROL1_NOBCCOMP_MASK;
+        }
 
         ret = regmap_update_bits(max77843->regmap_muic,
                         MAX77843_MUIC_REG_CONTROL1,
-                        MAX77843_MUIC_CONTROL1_COM_SW, ctrl1);
+                        MAX77843_MUIC_CONTROL1_COM_SW |
+                                MAX77843_MUIC_CONTROL1_NOBCCOMP_MASK,
+                        ctrl1);
         if (ret < 0) {
                 dev_err(info->dev, "Cannot switch MUIC port\n");
                 return ret;
@@ -240,6 +248,21 @@ static int max77843_muic_set_path(struct max77843_muic_info *info,
         return 0;
 }
 
+static void max77843_charger_set_otg_vbus(struct max77843_muic_info *info,
+                 bool on)
+{
+        struct max77693_dev *max77843 = info->max77843;
+        unsigned int cnfg00;
+
+        if (on)
+                cnfg00 = MAX77843_CHG_OTG_MASK | MAX77843_CHG_BOOST_MASK;
+        else
+                cnfg00 = MAX77843_CHG_ENABLE | MAX77843_CHG_BUCK_MASK;
+
+        regmap_update_bits(max77843->regmap_chg, MAX77843_CHG_REG_CHG_CNFG_00,
+                           MAX77843_CHG_MODE_MASK, cnfg00);
+}
+
 static int max77843_muic_get_cable_type(struct max77843_muic_info *info,
                 enum max77843_muic_cable_group group, bool *attached)
 {
@@ -288,6 +311,19 @@ static int max77843_muic_get_cable_type(struct max77843_muic_info *info,
                         break;
                 }
 
+                if (adc == MAX77843_MUIC_ADC_RESERVED_ACC_3) { /* SmartDock */
+                        if (chg_type == MAX77843_MUIC_CHG_NONE) {
+                                *attached = false;
+                                cable_type = info->prev_chg_type;
+                                info->prev_chg_type = MAX77843_MUIC_CHG_NONE;
+                        } else {
+                                *attached = true;
+                                cable_type = MAX77843_MUIC_CHG_DOCK;
+                                info->prev_chg_type = MAX77843_MUIC_CHG_DOCK;
+                        }
+                        break;
+                }
+
                 if (chg_type == MAX77843_MUIC_CHG_NONE) {
                         *attached = false;
                         cable_type = info->prev_chg_type;
@@ -350,17 +386,18 @@ static int max77843_muic_adc_gnd_handler(struct max77843_muic_info *info)
         case MAX77843_MUIC_GND_USB_HOST_VB:
                 ret = max77843_muic_set_path(info,
                                              MAX77843_MUIC_CONTROL1_SW_USB,
-                                             attached);
+                                             attached, false);
                 if (ret < 0)
                         return ret;
 
                 extcon_set_state_sync(info->edev, EXTCON_USB_HOST, attached);
+                max77843_charger_set_otg_vbus(info, attached);
                 break;
         case MAX77843_MUIC_GND_MHL_VB:
         case MAX77843_MUIC_GND_MHL:
                 ret = max77843_muic_set_path(info,
                                              MAX77843_MUIC_CONTROL1_SW_OPEN,
-                                             attached);
+                                             attached, false);
                 if (ret < 0)
                         return ret;
 
@@ -396,7 +433,7 @@ static int max77843_muic_jig_handler(struct max77843_muic_info *info,
                 return -EINVAL;
         }
 
-        ret = max77843_muic_set_path(info, path, attached);
+        ret = max77843_muic_set_path(info, path, attached, false);
         if (ret < 0)
                 return ret;
 
@@ -405,6 +442,26 @@ static int max77843_muic_jig_handler(struct max77843_muic_info *info,
         return 0;
 }
 
+static int max77843_muic_dock_handler(struct max77843_muic_info *info,
+                bool attached)
+{
+        int ret;
+
+        dev_dbg(info->dev, "external connector is %s (adc: 0x10)\n",
+                        attached ? "attached" : "detached");
+
+        ret = max77843_muic_set_path(info, MAX77843_MUIC_CONTROL1_SW_USB,
+                                     attached, attached);
+        if (ret < 0)
+                return ret;
+
+        extcon_set_state_sync(info->edev, EXTCON_DISP_MHL, attached);
+        extcon_set_state_sync(info->edev, EXTCON_USB_HOST, attached);
+        extcon_set_state_sync(info->edev, EXTCON_DOCK, attached);
+
+        return 0;
+}
+
 static int max77843_muic_adc_handler(struct max77843_muic_info *info)
 {
         int ret, cable_type;
@@ -419,6 +476,11 @@ static int max77843_muic_adc_handler(struct max77843_muic_info *info)
                 info->prev_cable_type);
 
         switch (cable_type) {
+        case MAX77843_MUIC_ADC_RESERVED_ACC_3: /* SmartDock */
+                ret = max77843_muic_dock_handler(info, attached);
+                if (ret < 0)
+                        return ret;
+                break;
         case MAX77843_MUIC_ADC_GROUND:
                 ret = max77843_muic_adc_gnd_handler(info);
                 if (ret < 0)
@@ -446,7 +508,6 @@ static int max77843_muic_adc_handler(struct max77843_muic_info *info)
         case MAX77843_MUIC_ADC_REMOTE_S12_BUTTON:
         case MAX77843_MUIC_ADC_RESERVED_ACC_1:
         case MAX77843_MUIC_ADC_RESERVED_ACC_2:
-        case MAX77843_MUIC_ADC_RESERVED_ACC_3:
         case MAX77843_MUIC_ADC_RESERVED_ACC_4:
         case MAX77843_MUIC_ADC_RESERVED_ACC_5:
         case MAX77843_MUIC_ADC_AUDIO_DEVICE_TYPE2:
@@ -490,7 +551,7 @@ static int max77843_muic_chg_handler(struct max77843_muic_info *info)
         case MAX77843_MUIC_CHG_USB:
                 ret = max77843_muic_set_path(info,
                                              MAX77843_MUIC_CONTROL1_SW_USB,
-                                             attached);
+                                             attached, false);
                 if (ret < 0)
                         return ret;
 
@@ -501,7 +562,7 @@ static int max77843_muic_chg_handler(struct max77843_muic_info *info)
         case MAX77843_MUIC_CHG_DOWNSTREAM:
                 ret = max77843_muic_set_path(info,
                                              MAX77843_MUIC_CONTROL1_SW_OPEN,
-                                             attached);
+                                             attached, false);
                 if (ret < 0)
                         return ret;
 
@@ -511,7 +572,7 @@ static int max77843_muic_chg_handler(struct max77843_muic_info *info)
         case MAX77843_MUIC_CHG_DEDICATED:
                 ret = max77843_muic_set_path(info,
                                              MAX77843_MUIC_CONTROL1_SW_OPEN,
-                                             attached);
+                                             attached, false);
                 if (ret < 0)
                         return ret;
 
@@ -521,7 +582,7 @@ static int max77843_muic_chg_handler(struct max77843_muic_info *info)
         case MAX77843_MUIC_CHG_SPECIAL_500MA:
                 ret = max77843_muic_set_path(info,
                                              MAX77843_MUIC_CONTROL1_SW_OPEN,
-                                             attached);
+                                             attached, false);
                 if (ret < 0)
                         return ret;
 
@@ -531,7 +592,7 @@ static int max77843_muic_chg_handler(struct max77843_muic_info *info)
         case MAX77843_MUIC_CHG_SPECIAL_1A:
                 ret = max77843_muic_set_path(info,
                                              MAX77843_MUIC_CONTROL1_SW_OPEN,
-                                             attached);
+                                             attached, false);
                 if (ret < 0)
                         return ret;
 
@@ -550,6 +611,9 @@ static int max77843_muic_chg_handler(struct max77843_muic_info *info)
                         extcon_set_state_sync(info->edev, EXTCON_CHG_USB_DCP,
                                                 false);
                 break;
+        case MAX77843_MUIC_CHG_DOCK:
+                extcon_set_state_sync(info->edev, EXTCON_CHG_USB_DCP, attached);
+                break;
         case MAX77843_MUIC_CHG_NONE:
                 break;
         default:
@@ -558,7 +622,7 @@ static int max77843_muic_chg_handler(struct max77843_muic_info *info)
                         attached ? "attached" : "detached", chg_type);
 
                 max77843_muic_set_path(info, MAX77843_MUIC_CONTROL1_SW_OPEN,
-                                       attached);
+                                       attached, false);
                 return -EINVAL;
         }
 
@@ -798,7 +862,8 @@ static int max77843_muic_probe(struct platform_device *pdev)
         max77843_muic_set_debounce_time(info, MAX77843_DEBOUNCE_TIME_25MS);
 
         /* Set initial path for UART */
-        max77843_muic_set_path(info, MAX77843_MUIC_CONTROL1_SW_UART, true);
+        max77843_muic_set_path(info, MAX77843_MUIC_CONTROL1_SW_UART, true,
+                               false);
 
         /* Check revision number of MUIC device */
         ret = regmap_read(max77843->regmap_muic, MAX77843_MUIC_REG_ID, &id);
diff --git a/drivers/extcon/extcon-max8997.c b/drivers/extcon/extcon-max8997.c
index 4a0612fb9c07..8152790d72e1 100644
--- a/drivers/extcon/extcon-max8997.c
+++ b/drivers/extcon/extcon-max8997.c
@@ -25,7 +25,7 @@
 #include <linux/kobject.h>
 #include <linux/mfd/max8997.h>
 #include <linux/mfd/max8997-private.h>
-#include <linux/extcon.h>
+#include <linux/extcon-provider.h>
 #include <linux/irqdomain.h>
 
 #define DEV_NAME                        "max8997-muic"
diff --git a/drivers/extcon/extcon-qcom-spmi-misc.c b/drivers/extcon/extcon-qcom-spmi-misc.c
index b8cde096a808..660bbf163bf5 100644
--- a/drivers/extcon/extcon-qcom-spmi-misc.c
+++ b/drivers/extcon/extcon-qcom-spmi-misc.c
@@ -15,7 +15,7 @@
  * GNU General Public License for more details.
  */
 
-#include <linux/extcon.h>
+#include <linux/extcon-provider.h>
 #include <linux/init.h>
 #include <linux/interrupt.h>
 #include <linux/kernel.h>
diff --git a/drivers/extcon/extcon-rt8973a.c b/drivers/extcon/extcon-rt8973a.c
index eaa355e7d9e4..e059bd5f2041 100644
--- a/drivers/extcon/extcon-rt8973a.c
+++ b/drivers/extcon/extcon-rt8973a.c
@@ -20,7 +20,7 @@
 #include <linux/platform_device.h>
 #include <linux/regmap.h>
 #include <linux/slab.h>
-#include <linux/extcon.h>
+#include <linux/extcon-provider.h>
 
 #include "extcon-rt8973a.h"
 
diff --git a/drivers/extcon/extcon-sm5502.c b/drivers/extcon/extcon-sm5502.c
index 106ef0297b53..0cfb5a3efdf6 100644
--- a/drivers/extcon/extcon-sm5502.c
+++ b/drivers/extcon/extcon-sm5502.c
@@ -19,7 +19,7 @@
 #include <linux/platform_device.h>
 #include <linux/regmap.h>
 #include <linux/slab.h>
-#include <linux/extcon.h>
+#include <linux/extcon-provider.h>
 
 #include "extcon-sm5502.h"
 
diff --git a/drivers/extcon/extcon-usb-gpio.c b/drivers/extcon/extcon-usb-gpio.c
index 9c925b05b7aa..53762864a9f7 100644
--- a/drivers/extcon/extcon-usb-gpio.c
+++ b/drivers/extcon/extcon-usb-gpio.c
@@ -14,7 +14,7 @@
  * GNU General Public License for more details.
  */
 
-#include <linux/extcon.h>
+#include <linux/extcon-provider.h>
 #include <linux/gpio.h>
 #include <linux/gpio/consumer.h>
 #include <linux/init.h>
diff --git a/drivers/extcon/extcon-usbc-cros-ec.c b/drivers/extcon/extcon-usbc-cros-ec.c
index 598956f1dcae..6187f731b29d 100644
--- a/drivers/extcon/extcon-usbc-cros-ec.c
+++ b/drivers/extcon/extcon-usbc-cros-ec.c
@@ -14,7 +14,7 @@
  * GNU General Public License for more details.
  */
 
-#include <linux/extcon.h>
+#include <linux/extcon-provider.h>
 #include <linux/kernel.h>
 #include <linux/mfd/cros_ec.h>
 #include <linux/module.h>
diff --git a/drivers/extcon/extcon.c b/drivers/extcon/extcon.c
index 35e9fb885486..cb38c2747684 100644
--- a/drivers/extcon/extcon.c
+++ b/drivers/extcon/extcon.c
@@ -36,7 +36,7 @@
 
 #define SUPPORTED_CABLE_MAX     32
 
-struct __extcon_info {
+static const struct __extcon_info {
         unsigned int type;
         unsigned int id;
         const char *name;
diff --git a/drivers/extcon/extcon.h b/drivers/extcon/extcon.h
index 61358479bfcc..93b5e0306966 100644
--- a/drivers/extcon/extcon.h
+++ b/drivers/extcon/extcon.h
@@ -2,7 +2,7 @@
 #ifndef __LINUX_EXTCON_INTERNAL_H__
 #define __LINUX_EXTCON_INTERNAL_H__
 
-#include <linux/extcon.h>
+#include <linux/extcon-provider.h>
 
 /**
  * struct extcon_dev - An extcon device represents one external connector.
diff --git a/drivers/pci/dwc/pci-dra7xx.c b/drivers/pci/dwc/pci-dra7xx.c
index 34427a6a15af..362607f727ee 100644
--- a/drivers/pci/dwc/pci-dra7xx.c
+++ b/drivers/pci/dwc/pci-dra7xx.c
@@ -11,6 +11,7 @@
  */
 
 #include <linux/delay.h>
+#include <linux/device.h>
 #include <linux/err.h>
 #include <linux/interrupt.h>
 #include <linux/irq.h>
@@ -594,6 +595,7 @@ static int __init dra7xx_pcie_probe(struct platform_device *pdev)
         int i;
         int phy_count;
         struct phy **phy;
+        struct device_link **link;
         void __iomem *base;
         struct resource *res;
         struct dw_pcie *pci;
@@ -649,11 +651,21 @@ static int __init dra7xx_pcie_probe(struct platform_device *pdev)
         if (!phy)
                 return -ENOMEM;
 
+        link = devm_kzalloc(dev, sizeof(*link) * phy_count, GFP_KERNEL);
+        if (!link)
+                return -ENOMEM;
+
         for (i = 0; i < phy_count; i++) {
                 snprintf(name, sizeof(name), "pcie-phy%d", i);
                 phy[i] = devm_phy_get(dev, name);
                 if (IS_ERR(phy[i]))
                         return PTR_ERR(phy[i]);
+
+                link[i] = device_link_add(dev, &phy[i]->dev, DL_FLAG_STATELESS);
+                if (!link[i]) {
+                        ret = -EINVAL;
+                        goto err_link;
+                }
         }
 
         dra7xx->base = base;
@@ -732,6 +744,10 @@ err_get_sync:
         pm_runtime_disable(dev);
         dra7xx_pcie_disable_phy(dra7xx);
 
+err_link:
+        while (--i >= 0)
+                device_link_del(link[i]);
+
         return ret;
 }
 
diff --git a/drivers/phy/allwinner/phy-sun4i-usb.c b/drivers/phy/allwinner/phy-sun4i-usb.c
index 1161e11fb3cf..aa857be692cf 100644
--- a/drivers/phy/allwinner/phy-sun4i-usb.c
+++ b/drivers/phy/allwinner/phy-sun4i-usb.c
@@ -24,7 +24,7 @@
 #include <linux/clk.h>
 #include <linux/delay.h>
 #include <linux/err.h>
-#include <linux/extcon.h>
+#include <linux/extcon-provider.h>
 #include <linux/io.h>
 #include <linux/interrupt.h>
 #include <linux/kernel.h>
@@ -926,6 +926,7 @@ static const struct sun4i_usb_phy_cfg sun8i_v3s_cfg = {
         .phyctl_offset = REG_PHYCTL_A33,
         .dedicated_clocks = true,
         .enable_pmu_unk1 = true,
+        .phy0_dual_route = true,
 };
 
 static const struct sun4i_usb_phy_cfg sun50i_a64_cfg = {
diff --git a/drivers/phy/broadcom/Kconfig b/drivers/phy/broadcom/Kconfig
index 64fc59c3ae6d..97d27b0d5cc7 100644
--- a/drivers/phy/broadcom/Kconfig
+++ b/drivers/phy/broadcom/Kconfig
@@ -67,3 +67,16 @@ config PHY_BRCM_SATA
         help
           Enable this to support the Broadcom SATA PHY.
           If unsure, say N.
+
+config PHY_BRCM_USB
+        tristate "Broadcom STB USB PHY driver"
+        depends on ARCH_BRCMSTB
+        depends on OF
+        select GENERIC_PHY
+        select SOC_BRCMSTB
+        default ARCH_BRCMSTB
+        help
+          Enable this to support the Broadcom STB USB PHY.
+          This driver is required by the USB XHCI, EHCI and OHCI
+          drivers.
+          If unsure, say N.
diff --git a/drivers/phy/broadcom/Makefile b/drivers/phy/broadcom/Makefile
index fdd9ec8fd70b..13e000c1a43a 100644
--- a/drivers/phy/broadcom/Makefile
+++ b/drivers/phy/broadcom/Makefile
@@ -6,3 +6,6 @@ obj-$(CONFIG_PHY_BCM_NS_USB3)		+= phy-bcm-ns-usb3.o
 obj-$(CONFIG_PHY_NS2_PCIE)              += phy-bcm-ns2-pcie.o
 obj-$(CONFIG_PHY_NS2_USB_DRD)           += phy-bcm-ns2-usbdrd.o
 obj-$(CONFIG_PHY_BRCM_SATA)             += phy-brcm-sata.o
+obj-$(CONFIG_PHY_BRCM_USB)              += phy-brcm-usb-dvr.o
+
+phy-brcm-usb-dvr-objs := phy-brcm-usb.o phy-brcm-usb-init.o
diff --git a/drivers/phy/broadcom/phy-bcm-ns2-usbdrd.c b/drivers/phy/broadcom/phy-bcm-ns2-usbdrd.c
index d099a0c8cee5..7ceea5ae2704 100644
--- a/drivers/phy/broadcom/phy-bcm-ns2-usbdrd.c
+++ b/drivers/phy/broadcom/phy-bcm-ns2-usbdrd.c
@@ -12,7 +12,7 @@
  */
 
 #include <linux/delay.h>
-#include <linux/extcon.h>
+#include <linux/extcon-provider.h>
 #include <linux/gpio.h>
 #include <linux/gpio/consumer.h>
 #include <linux/init.h>
diff --git a/drivers/phy/broadcom/phy-brcm-sata.c b/drivers/phy/broadcom/phy-brcm-sata.c
index 9d7f74fe3d7c..3f953db70288 100644
--- a/drivers/phy/broadcom/phy-brcm-sata.c
+++ b/drivers/phy/broadcom/phy-brcm-sata.c
@@ -49,11 +49,29 @@ enum brcm_sata_phy_version {
         BRCM_SATA_PHY_IPROC_SR,
 };
 
+enum brcm_sata_phy_rxaeq_mode {
+        RXAEQ_MODE_OFF = 0,
+        RXAEQ_MODE_AUTO,
+        RXAEQ_MODE_MANUAL,
+};
+
+static enum brcm_sata_phy_rxaeq_mode rxaeq_to_val(const char *m)
+{
+        if (!strcmp(m, "auto"))
+                return RXAEQ_MODE_AUTO;
+        else if (!strcmp(m, "manual"))
+                return RXAEQ_MODE_MANUAL;
+        else
+                return RXAEQ_MODE_OFF;
+}
+
 struct brcm_sata_port {
         int portnum;
         struct phy *phy;
         struct brcm_sata_phy *phy_priv;
         bool ssc_en;
+        enum brcm_sata_phy_rxaeq_mode rxaeq_mode;
+        u32 rxaeq_val;
 };
 
 struct brcm_sata_phy {
@@ -93,6 +111,15 @@ enum sata_phy_regs {
         TX_ACTRL0                               = 0x80,
         TX_ACTRL0_TXPOL_FLIP                    = BIT(6),
 
+        AEQRX_REG_BANK_0                        = 0xd0,
+        AEQ_CONTROL1                            = 0x81,
+        AEQ_CONTROL1_ENABLE                     = BIT(2),
+        AEQ_CONTROL1_FREEZE                     = BIT(3),
+        AEQ_FRC_EQ                              = 0x83,
+        AEQ_FRC_EQ_FORCE                        = BIT(0),
+        AEQ_FRC_EQ_FORCE_VAL                    = BIT(1),
+        AEQRX_REG_BANK_1                        = 0xe0,
+
         OOB_REG_BANK                            = 0x150,
         OOB1_REG_BANK                           = 0x160,
         OOB_CTRL1                               = 0x80,
@@ -190,7 +217,7 @@ static u32 brcm_sata_phy_rd(void __iomem *pcb_base, u32 bank, u32 ofs)
 #define STB_FMAX_VAL_DEFAULT    0x3df
 #define STB_FMAX_VAL_SSC        0x83
 
-static int brcm_stb_sata_init(struct brcm_sata_port *port)
+static void brcm_stb_sata_ssc_init(struct brcm_sata_port *port)
 {
         void __iomem *base = brcm_sata_pcb_base(port);
         struct brcm_sata_phy *priv = port->phy_priv;
@@ -215,10 +242,47 @@ static int brcm_stb_sata_init(struct brcm_sata_port *port)
 
         brcm_sata_phy_wr(base, TXPMD_REG_BANK, TXPMD_TX_FREQ_CTRL_CONTROL3,
                           ~TXPMD_TX_FREQ_CTRL_CONTROL3_FMAX_MASK, tmp);
+}
+
+#define AEQ_FRC_EQ_VAL_SHIFT    2
+#define AEQ_FRC_EQ_VAL_MASK     0x3f
+
+static int brcm_stb_sata_rxaeq_init(struct brcm_sata_port *port)
+{
+        void __iomem *base = brcm_sata_pcb_base(port);
+        u32 tmp = 0, reg = 0;
+
+        switch (port->rxaeq_mode) {
+        case RXAEQ_MODE_OFF:
+                return 0;
+
+        case RXAEQ_MODE_AUTO:
+                reg = AEQ_CONTROL1;
+                tmp = AEQ_CONTROL1_ENABLE | AEQ_CONTROL1_FREEZE;
+                break;
+
+        case RXAEQ_MODE_MANUAL:
+                reg = AEQ_FRC_EQ;
+                tmp = AEQ_FRC_EQ_FORCE | AEQ_FRC_EQ_FORCE_VAL;
+                if (port->rxaeq_val > AEQ_FRC_EQ_VAL_MASK)
+                        return -EINVAL;
+                tmp |= port->rxaeq_val << AEQ_FRC_EQ_VAL_SHIFT;
+                break;
+        }
+
+        brcm_sata_phy_wr(base, AEQRX_REG_BANK_0, reg, ~tmp, tmp);
+        brcm_sata_phy_wr(base, AEQRX_REG_BANK_1, reg, ~tmp, tmp);
 
         return 0;
 }
 
+static int brcm_stb_sata_init(struct brcm_sata_port *port)
+{
+        brcm_stb_sata_ssc_init(port);
+
+        return brcm_stb_sata_rxaeq_init(port);
+}
+
 /* NS2 SATA PLL1 defaults were characterized by H/W group */
 #define NS2_PLL1_ACTRL2_MAGIC   0x1df8
 #define NS2_PLL1_ACTRL3_MAGIC   0x2b00
@@ -463,6 +527,7 @@ MODULE_DEVICE_TABLE(of, brcm_sata_phy_of_match);
 
 static int brcm_sata_phy_probe(struct platform_device *pdev)
 {
+        const char *rxaeq_mode;
         struct device *dev = &pdev->dev;
         struct device_node *dn = dev->of_node, *child;
         const struct of_device_id *of_id;
@@ -525,6 +590,13 @@ static int brcm_sata_phy_probe(struct platform_device *pdev)
                 port->portnum = id;
                 port->phy_priv = priv;
                 port->phy = devm_phy_create(dev, child, &phy_ops);
+                port->rxaeq_mode = RXAEQ_MODE_OFF;
+                if (!of_property_read_string(child, "brcm,rxaeq-mode",
+                                             &rxaeq_mode))
+                        port->rxaeq_mode = rxaeq_to_val(rxaeq_mode);
+                if (port->rxaeq_mode == RXAEQ_MODE_MANUAL)
+                        of_property_read_u32(child, "brcm,rxaeq-value",
+                                             &port->rxaeq_val);
                 port->ssc_en = of_property_read_bool(child, "brcm,enable-ssc");
                 if (IS_ERR(port->phy)) {
                         dev_err(dev, "failed to create PHY\n");
diff --git a/drivers/phy/broadcom/phy-brcm-usb-init.c b/drivers/phy/broadcom/phy-brcm-usb-init.c
new file mode 100644
index 000000000000..1e7ce0b6f299
--- /dev/null
+++ b/drivers/phy/broadcom/phy-brcm-usb-init.c
@@ -0,0 +1,1017 @@
+/*
+ * phy-brcm-usb-init.c - Broadcom USB Phy chip specific init functions
+ *
+ * Copyright (C) 2014-2017 Broadcom
+ *
+ * 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.
+ */
+
+/*
+ * This module contains USB PHY initialization for power up and S3 resume
+ */
+
+#include <linux/delay.h>
+#include <linux/io.h>
+
+#include <linux/soc/brcmstb/brcmstb.h>
+#include "phy-brcm-usb-init.h"
+
+#define PHY_PORTS 2
+#define PHY_PORT_SELECT_0 0
+#define PHY_PORT_SELECT_1 0x1000
+
+/* Register definitions for the USB CTRL block */
+#define USB_CTRL_SETUP                  0x00
+#define   USB_CTRL_SETUP_IOC_MASK                       0x00000010
+#define   USB_CTRL_SETUP_IPP_MASK                       0x00000020
+#define   USB_CTRL_SETUP_BABO_MASK                      0x00000001
+#define   USB_CTRL_SETUP_FNHW_MASK                      0x00000002
+#define   USB_CTRL_SETUP_FNBO_MASK                      0x00000004
+#define   USB_CTRL_SETUP_WABO_MASK                      0x00000008
+#define   USB_CTRL_SETUP_SCB_CLIENT_SWAP_MASK           0x00002000 /* option */
+#define   USB_CTRL_SETUP_SCB1_EN_MASK                   0x00004000 /* option */
+#define   USB_CTRL_SETUP_SCB2_EN_MASK                   0x00008000 /* option */
+#define   USB_CTRL_SETUP_SS_EHCI64BIT_EN_MASK           0X00020000 /* option */
+#define   USB_CTRL_SETUP_SS_EHCI64BIT_EN_VAR_MASK       0x00010000 /* option */
+#define   USB_CTRL_SETUP_STRAP_IPP_SEL_MASK             0x02000000 /* option */
+#define   USB_CTRL_SETUP_CC_DRD_MODE_ENABLE_MASK        0x04000000 /* option */
+#define   USB_CTRL_SETUP_STRAP_CC_DRD_MODE_ENABLE_SEL_MASK 0x08000000 /* opt */
+#define   USB_CTRL_SETUP_OC3_DISABLE_MASK               0xc0000000 /* option */
+#define USB_CTRL_PLL_CTL                0x04
+#define   USB_CTRL_PLL_CTL_PLL_SUSPEND_EN_MASK          0x08000000
+#define   USB_CTRL_PLL_CTL_PLL_RESETB_MASK              0x40000000
+#define   USB_CTRL_PLL_CTL_PLL_IDDQ_PWRDN_MASK          0x80000000 /* option */
+#define USB_CTRL_EBRIDGE                0x0c
+#define   USB_CTRL_EBRIDGE_ESTOP_SCB_REQ_MASK           0x00020000 /* option */
+#define USB_CTRL_MDIO                   0x14
+#define USB_CTRL_MDIO2                  0x18
+#define USB_CTRL_UTMI_CTL_1             0x2c
+#define   USB_CTRL_UTMI_CTL_1_POWER_UP_FSM_EN_MASK      0x00000800
+#define   USB_CTRL_UTMI_CTL_1_POWER_UP_FSM_EN_P1_MASK   0x08000000
+#define USB_CTRL_USB_PM                 0x34
+#define   USB_CTRL_USB_PM_BDC_SOFT_RESETB_MASK          0x00800000 /* option */
+#define   USB_CTRL_USB_PM_XHC_SOFT_RESETB_MASK          0x00400000 /* option */
+#define   USB_CTRL_USB_PM_XHC_SOFT_RESETB_VAR_MASK      0x40000000 /* option */
+#define   USB_CTRL_USB_PM_USB_PWRDN_MASK                0x80000000 /* option */
+#define   USB_CTRL_USB_PM_SOFT_RESET_MASK               0x40000000 /* option */
+#define   USB_CTRL_USB_PM_USB20_HC_RESETB_MASK          0x30000000 /* option */
+#define   USB_CTRL_USB_PM_USB20_HC_RESETB_VAR_MASK      0x00300000 /* option */
+#define USB_CTRL_USB30_CTL1             0x60
+#define   USB_CTRL_USB30_CTL1_PHY3_PLL_SEQ_START_MASK   0x00000010
+#define   USB_CTRL_USB30_CTL1_PHY3_RESETB_MASK          0x00010000
+#define   USB_CTRL_USB30_CTL1_XHC_SOFT_RESETB_MASK      0x00020000 /* option */
+#define   USB_CTRL_USB30_CTL1_USB3_IOC_MASK             0x10000000 /* option */
+#define   USB_CTRL_USB30_CTL1_USB3_IPP_MASK             0x20000000 /* option */
+#define USB_CTRL_USB30_PCTL             0x70
+#define   USB_CTRL_USB30_PCTL_PHY3_SOFT_RESETB_MASK     0x00000002
+#define   USB_CTRL_USB30_PCTL_PHY3_SOFT_RESETB_P1_MASK  0x00020000
+#define USB_CTRL_USB_DEVICE_CTL1        0x90
+#define   USB_CTRL_USB_DEVICE_CTL1_PORT_MODE_MASK       0x00000003 /* option */
+
+/* Register definitions for the XHCI EC block */
+#define USB_XHCI_EC_IRAADR 0x658
+#define USB_XHCI_EC_IRADAT 0x65c
+
+enum brcm_family_type {
+        BRCM_FAMILY_3390A0,
+        BRCM_FAMILY_7250B0,
+        BRCM_FAMILY_7271A0,
+        BRCM_FAMILY_7364A0,
+        BRCM_FAMILY_7366C0,
+        BRCM_FAMILY_74371A0,
+        BRCM_FAMILY_7439B0,
+        BRCM_FAMILY_7445D0,
+        BRCM_FAMILY_7260A0,
+        BRCM_FAMILY_7278A0,
+        BRCM_FAMILY_COUNT,
+};
+
+#define USB_BRCM_FAMILY(chip) \
+        [BRCM_FAMILY_##chip] = __stringify(chip)
+
+static const char *family_names[BRCM_FAMILY_COUNT] = {
+        USB_BRCM_FAMILY(3390A0),
+        USB_BRCM_FAMILY(7250B0),
+        USB_BRCM_FAMILY(7271A0),
+        USB_BRCM_FAMILY(7364A0),
+        USB_BRCM_FAMILY(7366C0),
+        USB_BRCM_FAMILY(74371A0),
+        USB_BRCM_FAMILY(7439B0),
+        USB_BRCM_FAMILY(7445D0),
+        USB_BRCM_FAMILY(7260A0),
+        USB_BRCM_FAMILY(7278A0),
+};
+
+enum {
+        USB_CTRL_SETUP_SCB1_EN_SELECTOR,
+        USB_CTRL_SETUP_SCB2_EN_SELECTOR,
+        USB_CTRL_SETUP_SS_EHCI64BIT_EN_SELECTOR,
+        USB_CTRL_SETUP_STRAP_IPP_SEL_SELECTOR,
+        USB_CTRL_SETUP_OC3_DISABLE_SELECTOR,
+        USB_CTRL_PLL_CTL_PLL_IDDQ_PWRDN_SELECTOR,
+        USB_CTRL_EBRIDGE_ESTOP_SCB_REQ_SELECTOR,
+        USB_CTRL_USB_PM_BDC_SOFT_RESETB_SELECTOR,
+        USB_CTRL_USB_PM_XHC_SOFT_RESETB_SELECTOR,
+        USB_CTRL_USB_PM_USB_PWRDN_SELECTOR,
+        USB_CTRL_USB30_CTL1_XHC_SOFT_RESETB_SELECTOR,
+        USB_CTRL_USB30_CTL1_USB3_IOC_SELECTOR,
+        USB_CTRL_USB30_CTL1_USB3_IPP_SELECTOR,
+        USB_CTRL_USB_DEVICE_CTL1_PORT_MODE_SELECTOR,
+        USB_CTRL_USB_PM_SOFT_RESET_SELECTOR,
+        USB_CTRL_SETUP_CC_DRD_MODE_ENABLE_SELECTOR,
+        USB_CTRL_SETUP_STRAP_CC_DRD_MODE_ENABLE_SEL_SELECTOR,
+        USB_CTRL_USB_PM_USB20_HC_RESETB_SELECTOR,
+        USB_CTRL_SETUP_ENDIAN_SELECTOR,
+        USB_CTRL_SELECTOR_COUNT,
+};
+
+#define USB_CTRL_REG(base, reg) ((void *)base + USB_CTRL_##reg)
+#define USB_XHCI_EC_REG(base, reg) ((void *)base + USB_XHCI_EC_##reg)
+#define USB_CTRL_MASK(reg, field) \
+        USB_CTRL_##reg##_##field##_MASK
+#define USB_CTRL_MASK_FAMILY(params, reg, field)                        \
+        (params->usb_reg_bits_map[USB_CTRL_##reg##_##field##_SELECTOR])
+
+#define USB_CTRL_SET_FAMILY(params, reg, field) \
+        usb_ctrl_set_family(params, USB_CTRL_##reg,     \
+                        USB_CTRL_##reg##_##field##_SELECTOR)
+#define USB_CTRL_UNSET_FAMILY(params, reg, field)       \
+        usb_ctrl_unset_family(params, USB_CTRL_##reg,   \
+                USB_CTRL_##reg##_##field##_SELECTOR)
+
+#define USB_CTRL_SET(base, reg, field)  \
+        usb_ctrl_set(USB_CTRL_REG(base, reg),           \
+                     USB_CTRL_##reg##_##field##_MASK)
+#define USB_CTRL_UNSET(base, reg, field)        \
+        usb_ctrl_unset(USB_CTRL_REG(base, reg),         \
+                       USB_CTRL_##reg##_##field##_MASK)
+
+#define MDIO_USB2       0
+#define MDIO_USB3       BIT(31)
+
+#define USB_CTRL_SETUP_ENDIAN_BITS (    \
+                USB_CTRL_MASK(SETUP, BABO) |    \
+                USB_CTRL_MASK(SETUP, FNHW) |    \
+                USB_CTRL_MASK(SETUP, FNBO) |    \
+                USB_CTRL_MASK(SETUP, WABO))
+
+#ifdef __LITTLE_ENDIAN
+#define ENDIAN_SETTINGS (                       \
+                USB_CTRL_MASK(SETUP, BABO) |    \
+                USB_CTRL_MASK(SETUP, FNHW))
+#else
+#define ENDIAN_SETTINGS (                       \
+                USB_CTRL_MASK(SETUP, FNHW) |    \
+                USB_CTRL_MASK(SETUP, FNBO) |    \
+                USB_CTRL_MASK(SETUP, WABO))
+#endif
+
+struct id_to_type {
+        u32 id;
+        int type;
+};
+
+static const struct id_to_type id_to_type_table[] = {
+        { 0x33900000, BRCM_FAMILY_3390A0 },
+        { 0x72500010, BRCM_FAMILY_7250B0 },
+        { 0x72600000, BRCM_FAMILY_7260A0 },
+        { 0x72680000, BRCM_FAMILY_7271A0 },
+        { 0x72710000, BRCM_FAMILY_7271A0 },
+        { 0x73640000, BRCM_FAMILY_7364A0 },
+        { 0x73660020, BRCM_FAMILY_7366C0 },
+        { 0x07437100, BRCM_FAMILY_74371A0 },
+        { 0x74390010, BRCM_FAMILY_7439B0 },
+        { 0x74450030, BRCM_FAMILY_7445D0 },
+        { 0x72780000, BRCM_FAMILY_7278A0 },
+        { 0, BRCM_FAMILY_7271A0 }, /* default */
+};
+
+static const u32
+usb_reg_bits_map_table[BRCM_FAMILY_COUNT][USB_CTRL_SELECTOR_COUNT] = {
+        /* 3390B0 */
+        [BRCM_FAMILY_3390A0] = {
+                USB_CTRL_SETUP_SCB1_EN_MASK,
+                USB_CTRL_SETUP_SCB2_EN_MASK,
+                USB_CTRL_SETUP_SS_EHCI64BIT_EN_MASK,
+                USB_CTRL_SETUP_STRAP_IPP_SEL_MASK,
+                USB_CTRL_SETUP_OC3_DISABLE_MASK,
+                0, /* USB_CTRL_PLL_CTL_PLL_IDDQ_PWRDN_MASK */
+                USB_CTRL_EBRIDGE_ESTOP_SCB_REQ_MASK,
+                0, /* USB_CTRL_USB_PM_BDC_SOFT_RESETB_MASK */
+                USB_CTRL_USB_PM_XHC_SOFT_RESETB_MASK,
+                USB_CTRL_USB_PM_USB_PWRDN_MASK,
+                0, /* USB_CTRL_USB30_CTL1_XHC_SOFT_RESETB_MASK */
+                0, /* USB_CTRL_USB30_CTL1_USB3_IOC_MASK */
+                0, /* USB_CTRL_USB30_CTL1_USB3_IPP_MASK */
+                USB_CTRL_USB_DEVICE_CTL1_PORT_MODE_MASK,
+                0, /* USB_CTRL_USB_PM_SOFT_RESET_MASK */
+                0, /* USB_CTRL_SETUP_CC_DRD_MODE_ENABLE_MASK */
+                0, /* USB_CTRL_SETUP_STRAP_CC_DRD_MODE_ENABLE_SEL_MASK */
+                USB_CTRL_USB_PM_USB20_HC_RESETB_VAR_MASK,
+                ENDIAN_SETTINGS, /* USB_CTRL_SETUP ENDIAN bits */
+        },
+        /* 7250b0 */
+        [BRCM_FAMILY_7250B0] = {
+                USB_CTRL_SETUP_SCB1_EN_MASK,
+                USB_CTRL_SETUP_SCB2_EN_MASK,
+                USB_CTRL_SETUP_SS_EHCI64BIT_EN_MASK,
+                0, /* USB_CTRL_SETUP_STRAP_IPP_SEL_MASK */
+                USB_CTRL_SETUP_OC3_DISABLE_MASK,
+                USB_CTRL_PLL_CTL_PLL_IDDQ_PWRDN_MASK,
+                USB_CTRL_EBRIDGE_ESTOP_SCB_REQ_MASK,
+                0, /* USB_CTRL_USB_PM_BDC_SOFT_RESETB_MASK */
+                USB_CTRL_USB_PM_XHC_SOFT_RESETB_VAR_MASK,
+                0, /* USB_CTRL_USB_PM_USB_PWRDN_MASK */
+                0, /* USB_CTRL_USB30_CTL1_XHC_SOFT_RESETB_MASK */
+                0, /* USB_CTRL_USB30_CTL1_USB3_IOC_MASK */
+                0, /* USB_CTRL_USB30_CTL1_USB3_IPP_MASK */
+                0, /* USB_CTRL_USB_DEVICE_CTL1_PORT_MODE_MASK */
+                0, /* USB_CTRL_USB_PM_SOFT_RESET_MASK */
+                0, /* USB_CTRL_SETUP_CC_DRD_MODE_ENABLE_MASK */
+                0, /* USB_CTRL_SETUP_STRAP_CC_DRD_MODE_ENABLE_SEL_MASK */
+                USB_CTRL_USB_PM_USB20_HC_RESETB_MASK,
+                ENDIAN_SETTINGS, /* USB_CTRL_SETUP ENDIAN bits */
+        },
+        /* 7271a0 */
+        [BRCM_FAMILY_7271A0] = {
+                0, /* USB_CTRL_SETUP_SCB1_EN_MASK */
+                0, /* USB_CTRL_SETUP_SCB2_EN_MASK */
+                USB_CTRL_SETUP_SS_EHCI64BIT_EN_MASK,
+                USB_CTRL_SETUP_STRAP_IPP_SEL_MASK,
+                USB_CTRL_SETUP_OC3_DISABLE_MASK,
+                0, /* USB_CTRL_PLL_CTL_PLL_IDDQ_PWRDN_MASK */
+                USB_CTRL_EBRIDGE_ESTOP_SCB_REQ_MASK,
+                USB_CTRL_USB_PM_BDC_SOFT_RESETB_MASK,
+                USB_CTRL_USB_PM_XHC_SOFT_RESETB_MASK,
+                USB_CTRL_USB_PM_USB_PWRDN_MASK,
+                0, /* USB_CTRL_USB30_CTL1_XHC_SOFT_RESETB_MASK */
+                0, /* USB_CTRL_USB30_CTL1_USB3_IOC_MASK */
+                0, /* USB_CTRL_USB30_CTL1_USB3_IPP_MASK */
+                USB_CTRL_USB_DEVICE_CTL1_PORT_MODE_MASK,
+                USB_CTRL_USB_PM_SOFT_RESET_MASK,
+                USB_CTRL_SETUP_CC_DRD_MODE_ENABLE_MASK,
+                USB_CTRL_SETUP_STRAP_CC_DRD_MODE_ENABLE_SEL_MASK,
+                USB_CTRL_USB_PM_USB20_HC_RESETB_VAR_MASK,
+                ENDIAN_SETTINGS, /* USB_CTRL_SETUP ENDIAN bits */
+        },
+        /* 7364a0 */
+        [BRCM_FAMILY_7364A0] = {
+                USB_CTRL_SETUP_SCB1_EN_MASK,
+                USB_CTRL_SETUP_SCB2_EN_MASK,
+                USB_CTRL_SETUP_SS_EHCI64BIT_EN_MASK,
+                0, /* USB_CTRL_SETUP_STRAP_IPP_SEL_MASK */
+                USB_CTRL_SETUP_OC3_DISABLE_MASK,
+                USB_CTRL_PLL_CTL_PLL_IDDQ_PWRDN_MASK,
+                USB_CTRL_EBRIDGE_ESTOP_SCB_REQ_MASK,
+                0, /* USB_CTRL_USB_PM_BDC_SOFT_RESETB_MASK */
+                USB_CTRL_USB_PM_XHC_SOFT_RESETB_VAR_MASK,
+                0, /* USB_CTRL_USB_PM_USB_PWRDN_MASK */
+                0, /* USB_CTRL_USB30_CTL1_XHC_SOFT_RESETB_MASK */
+                0, /* USB_CTRL_USB30_CTL1_USB3_IOC_MASK */
+                0, /* USB_CTRL_USB30_CTL1_USB3_IPP_MASK */
+                0, /* USB_CTRL_USB_DEVICE_CTL1_PORT_MODE_MASK */
+                0, /* USB_CTRL_USB_PM_SOFT_RESET_MASK */
+                0, /* USB_CTRL_SETUP_CC_DRD_MODE_ENABLE_MASK */
+                0, /* USB_CTRL_SETUP_STRAP_CC_DRD_MODE_ENABLE_SEL_MASK */
+                USB_CTRL_USB_PM_USB20_HC_RESETB_MASK,
+                ENDIAN_SETTINGS, /* USB_CTRL_SETUP ENDIAN bits */
+        },
+        /* 7366c0 */
+        [BRCM_FAMILY_7366C0] = {
+                USB_CTRL_SETUP_SCB1_EN_MASK,
+                USB_CTRL_SETUP_SCB2_EN_MASK,
+                USB_CTRL_SETUP_SS_EHCI64BIT_EN_MASK,
+                0, /* USB_CTRL_SETUP_STRAP_IPP_SEL_MASK */
+                USB_CTRL_SETUP_OC3_DISABLE_MASK,
+                0, /* USB_CTRL_PLL_CTL_PLL_IDDQ_PWRDN_MASK */
+                USB_CTRL_EBRIDGE_ESTOP_SCB_REQ_MASK,
+                0, /* USB_CTRL_USB_PM_BDC_SOFT_RESETB_MASK */
+                USB_CTRL_USB_PM_XHC_SOFT_RESETB_VAR_MASK,
+                USB_CTRL_USB_PM_USB_PWRDN_MASK,
+                0, /* USB_CTRL_USB30_CTL1_XHC_SOFT_RESETB_MASK */
+                0, /* USB_CTRL_USB30_CTL1_USB3_IOC_MASK */
+                0, /* USB_CTRL_USB30_CTL1_USB3_IPP_MASK */
+                0, /* USB_CTRL_USB_DEVICE_CTL1_PORT_MODE_MASK */
+                0, /* USB_CTRL_USB_PM_SOFT_RESET_MASK */
+                0, /* USB_CTRL_SETUP_CC_DRD_MODE_ENABLE_MASK */
+                0, /* USB_CTRL_SETUP_STRAP_CC_DRD_MODE_ENABLE_SEL_MASK */
+                USB_CTRL_USB_PM_USB20_HC_RESETB_MASK,
+                ENDIAN_SETTINGS, /* USB_CTRL_SETUP ENDIAN bits */
+        },
+        /* 74371A0 */
+        [BRCM_FAMILY_74371A0] = {
+                USB_CTRL_SETUP_SCB1_EN_MASK,
+                USB_CTRL_SETUP_SCB2_EN_MASK,
+                USB_CTRL_SETUP_SS_EHCI64BIT_EN_VAR_MASK,
+                0, /* USB_CTRL_SETUP_STRAP_IPP_SEL_MASK */
+                0, /* USB_CTRL_SETUP_OC3_DISABLE_MASK */
+                USB_CTRL_PLL_CTL_PLL_IDDQ_PWRDN_MASK,
+                0, /* USB_CTRL_EBRIDGE_ESTOP_SCB_REQ_MASK */
+                0, /* USB_CTRL_USB_PM_BDC_SOFT_RESETB_MASK */
+                0, /* USB_CTRL_USB_PM_XHC_SOFT_RESETB_MASK */
+                0, /* USB_CTRL_USB_PM_USB_PWRDN_MASK */
+                USB_CTRL_USB30_CTL1_XHC_SOFT_RESETB_MASK,
+                USB_CTRL_USB30_CTL1_USB3_IOC_MASK,
+                USB_CTRL_USB30_CTL1_USB3_IPP_MASK,
+                0, /* USB_CTRL_USB_DEVICE_CTL1_PORT_MODE_MASK */
+                0, /* USB_CTRL_USB_PM_SOFT_RESET_MASK */
+                0, /* USB_CTRL_SETUP_CC_DRD_MODE_ENABLE_MASK */
+                0, /* USB_CTRL_SETUP_STRAP_CC_DRD_MODE_ENABLE_SEL_MASK */
+                0, /* USB_CTRL_USB_PM_USB20_HC_RESETB_MASK */
+                ENDIAN_SETTINGS, /* USB_CTRL_SETUP ENDIAN bits */
+        },
+        /* 7439B0 */
+        [BRCM_FAMILY_7439B0] = {
+                USB_CTRL_SETUP_SCB1_EN_MASK,
+                USB_CTRL_SETUP_SCB2_EN_MASK,
+                USB_CTRL_SETUP_SS_EHCI64BIT_EN_MASK,
+                USB_CTRL_SETUP_STRAP_IPP_SEL_MASK,
+                USB_CTRL_SETUP_OC3_DISABLE_MASK,
+                0, /* USB_CTRL_PLL_CTL_PLL_IDDQ_PWRDN_MASK */
+                0, /* USB_CTRL_EBRIDGE_ESTOP_SCB_REQ_MASK */
+                USB_CTRL_USB_PM_BDC_SOFT_RESETB_MASK,
+                USB_CTRL_USB_PM_XHC_SOFT_RESETB_MASK,
+                USB_CTRL_USB_PM_USB_PWRDN_MASK,
+                0, /* USB_CTRL_USB30_CTL1_XHC_SOFT_RESETB_MASK */
+                0, /* USB_CTRL_USB30_CTL1_USB3_IOC_MASK */
+                0, /* USB_CTRL_USB30_CTL1_USB3_IPP_MASK */
+                USB_CTRL_USB_DEVICE_CTL1_PORT_MODE_MASK,
+                0, /* USB_CTRL_USB_PM_SOFT_RESET_MASK */
+                0, /* USB_CTRL_SETUP_CC_DRD_MODE_ENABLE_MASK */
+                0, /* USB_CTRL_SETUP_STRAP_CC_DRD_MODE_ENABLE_SEL_MASK */
+                USB_CTRL_USB_PM_USB20_HC_RESETB_VAR_MASK,
+                ENDIAN_SETTINGS, /* USB_CTRL_SETUP ENDIAN bits */
+        },
+        /* 7445d0 */
+        [BRCM_FAMILY_7445D0] = {
+                USB_CTRL_SETUP_SCB1_EN_MASK,
+                USB_CTRL_SETUP_SCB2_EN_MASK,
+                USB_CTRL_SETUP_SS_EHCI64BIT_EN_VAR_MASK,
+                0, /* USB_CTRL_SETUP_STRAP_IPP_SEL_MASK */
+                USB_CTRL_SETUP_OC3_DISABLE_MASK,
+                USB_CTRL_PLL_CTL_PLL_IDDQ_PWRDN_MASK,
+                0, /* USB_CTRL_EBRIDGE_ESTOP_SCB_REQ_MASK */
+                0, /* USB_CTRL_USB_PM_BDC_SOFT_RESETB_MASK */
+                0, /* USB_CTRL_USB_PM_XHC_SOFT_RESETB_MASK */
+                0, /* USB_CTRL_USB_PM_USB_PWRDN_MASK */
+                USB_CTRL_USB30_CTL1_XHC_SOFT_RESETB_MASK,
+                0, /* USB_CTRL_USB30_CTL1_USB3_IOC_MASK */
+                0, /* USB_CTRL_USB30_CTL1_USB3_IPP_MASK */
+                0, /* USB_CTRL_USB_DEVICE_CTL1_PORT_MODE_MASK */
+                0, /* USB_CTRL_USB_PM_SOFT_RESET_MASK */
+                0, /* USB_CTRL_SETUP_CC_DRD_MODE_ENABLE_MASK */
+                0, /* USB_CTRL_SETUP_STRAP_CC_DRD_MODE_ENABLE_SEL_MASK */
+                USB_CTRL_USB_PM_USB20_HC_RESETB_VAR_MASK,
+                ENDIAN_SETTINGS, /* USB_CTRL_SETUP ENDIAN bits */
+        },
+        /* 7260a0 */
+        [BRCM_FAMILY_7260A0] = {
+                0, /* USB_CTRL_SETUP_SCB1_EN_MASK */
+                0, /* USB_CTRL_SETUP_SCB2_EN_MASK */
+                USB_CTRL_SETUP_SS_EHCI64BIT_EN_MASK,
+                USB_CTRL_SETUP_STRAP_IPP_SEL_MASK,
+                USB_CTRL_SETUP_OC3_DISABLE_MASK,
+                0, /* USB_CTRL_PLL_CTL_PLL_IDDQ_PWRDN_MASK */
+                USB_CTRL_EBRIDGE_ESTOP_SCB_REQ_MASK,
+                USB_CTRL_USB_PM_BDC_SOFT_RESETB_MASK,
+                USB_CTRL_USB_PM_XHC_SOFT_RESETB_MASK,
+                USB_CTRL_USB_PM_USB_PWRDN_MASK,
+                0, /* USB_CTRL_USB30_CTL1_XHC_SOFT_RESETB_MASK */
+                0, /* USB_CTRL_USB30_CTL1_USB3_IOC_MASK */
+                0, /* USB_CTRL_USB30_CTL1_USB3_IPP_MASK */
+                USB_CTRL_USB_DEVICE_CTL1_PORT_MODE_MASK,
+                USB_CTRL_USB_PM_SOFT_RESET_MASK,
+                USB_CTRL_SETUP_CC_DRD_MODE_ENABLE_MASK,
+                USB_CTRL_SETUP_STRAP_CC_DRD_MODE_ENABLE_SEL_MASK,
+                USB_CTRL_USB_PM_USB20_HC_RESETB_VAR_MASK,
+                ENDIAN_SETTINGS, /* USB_CTRL_SETUP ENDIAN bits */
+        },
+        /* 7278a0 */
+        [BRCM_FAMILY_7278A0] = {
+                0, /* USB_CTRL_SETUP_SCB1_EN_MASK */
+                0, /* USB_CTRL_SETUP_SCB2_EN_MASK */
+                0, /*USB_CTRL_SETUP_SS_EHCI64BIT_EN_MASK */
+                USB_CTRL_SETUP_STRAP_IPP_SEL_MASK,
+                USB_CTRL_SETUP_OC3_DISABLE_MASK,
+                0, /* USB_CTRL_PLL_CTL_PLL_IDDQ_PWRDN_MASK */
+                USB_CTRL_EBRIDGE_ESTOP_SCB_REQ_MASK,
+                USB_CTRL_USB_PM_BDC_SOFT_RESETB_MASK,
+                USB_CTRL_USB_PM_XHC_SOFT_RESETB_MASK,
+                USB_CTRL_USB_PM_USB_PWRDN_MASK,
+                0, /* USB_CTRL_USB30_CTL1_XHC_SOFT_RESETB_MASK */
+                0, /* USB_CTRL_USB30_CTL1_USB3_IOC_MASK */
+                0, /* USB_CTRL_USB30_CTL1_USB3_IPP_MASK */
+                USB_CTRL_USB_DEVICE_CTL1_PORT_MODE_MASK,
+                USB_CTRL_USB_PM_SOFT_RESET_MASK,
+                0, /* USB_CTRL_SETUP_CC_DRD_MODE_ENABLE_MASK */
+                0, /* USB_CTRL_SETUP_STRAP_CC_DRD_MODE_ENABLE_SEL_MASK */
+                0, /* USB_CTRL_USB_PM_USB20_HC_RESETB_MASK */
+                0, /* USB_CTRL_SETUP ENDIAN bits */
+        },
+};
+
+static inline u32 brcmusb_readl(void __iomem *addr)
+{
+        return readl(addr);
+}
+
+static inline void brcmusb_writel(u32 val, void __iomem *addr)
+{
+        writel(val, addr);
+}
+
+static inline
+void usb_ctrl_unset_family(struct brcm_usb_init_params *params,
+                           u32 reg_offset, u32 field)
+{
+        u32 mask;
+        void *reg;
+
+        mask = params->usb_reg_bits_map[field];
+        reg = params->ctrl_regs + reg_offset;
+        brcmusb_writel(brcmusb_readl(reg) & ~mask, reg);
+};
+
+static inline
+void usb_ctrl_set_family(struct brcm_usb_init_params *params,
+                         u32 reg_offset, u32 field)
+{
+        u32 mask;
+        void *reg;
+
+        mask = params->usb_reg_bits_map[field];
+        reg = params->ctrl_regs + reg_offset;
+        brcmusb_writel(brcmusb_readl(reg) | mask, reg);
+};
+
+static inline void usb_ctrl_set(void __iomem *reg, u32 field)
+{
+        u32 value;
+
+        value = brcmusb_readl(reg);
+        brcmusb_writel(value | field, reg);
+}
+
+static inline void usb_ctrl_unset(void __iomem *reg, u32 field)
+{
+        u32 value;
+
+        value = brcmusb_readl(reg);
+        brcmusb_writel(value & ~field, reg);
+}
+
+static u32 brcmusb_usb_mdio_read(void __iomem *ctrl_base, u32 reg, int mode)
+{
+        u32 data;
+
+        data = (reg << 16) | mode;
+        brcmusb_writel(data, USB_CTRL_REG(ctrl_base, MDIO));
+        data |= (1 << 24);
+        brcmusb_writel(data, USB_CTRL_REG(ctrl_base, MDIO));
+        data &= ~(1 << 24);
+        /* wait for the 60MHz parallel to serial shifter */
+        usleep_range(10, 20);
+        brcmusb_writel(data, USB_CTRL_REG(ctrl_base, MDIO));
+        /* wait for the 60MHz parallel to serial shifter */
+        usleep_range(10, 20);
+
+        return brcmusb_readl(USB_CTRL_REG(ctrl_base, MDIO2)) & 0xffff;
+}
+
+static void brcmusb_usb_mdio_write(void __iomem *ctrl_base, u32 reg,
+                                   u32 val, int mode)
+{
+        u32 data;
+
+        data = (reg << 16) | val | mode;
+        brcmusb_writel(data, USB_CTRL_REG(ctrl_base, MDIO));
+        data |= (1 << 25);
+        brcmusb_writel(data, USB_CTRL_REG(ctrl_base, MDIO));
+        data &= ~(1 << 25);
+
+        /* wait for the 60MHz parallel to serial shifter */
+        usleep_range(10, 20);
+        brcmusb_writel(data, USB_CTRL_REG(ctrl_base, MDIO));
+        /* wait for the 60MHz parallel to serial shifter */
+        usleep_range(10, 20);
+}
+
+static void brcmusb_usb_phy_ldo_fix(void __iomem *ctrl_base)
+{
+        /* first disable FSM but also leave it that way */
+        /* to allow normal suspend/resume */
+        USB_CTRL_UNSET(ctrl_base, UTMI_CTL_1, POWER_UP_FSM_EN);
+        USB_CTRL_UNSET(ctrl_base, UTMI_CTL_1, POWER_UP_FSM_EN_P1);
+
+        /* reset USB 2.0 PLL */
+        USB_CTRL_UNSET(ctrl_base, PLL_CTL, PLL_RESETB);
+        /* PLL reset period */
+        udelay(1);
+        USB_CTRL_SET(ctrl_base, PLL_CTL, PLL_RESETB);
+        /* Give PLL enough time to lock */
+        usleep_range(1000, 2000);
+}
+
+static void brcmusb_usb2_eye_fix(void __iomem *ctrl_base)
+{
+        /* Increase USB 2.0 TX level to meet spec requirement */
+        brcmusb_usb_mdio_write(ctrl_base, 0x1f, 0x80a0, MDIO_USB2);
+        brcmusb_usb_mdio_write(ctrl_base, 0x0a, 0xc6a0, MDIO_USB2);
+}
+
+static void brcmusb_usb3_pll_fix(void __iomem *ctrl_base)
+{
+        /* Set correct window for PLL lock detect */
+        brcmusb_usb_mdio_write(ctrl_base, 0x1f, 0x8000, MDIO_USB3);
+        brcmusb_usb_mdio_write(ctrl_base, 0x07, 0x1503, MDIO_USB3);
+}
+
+static void brcmusb_usb3_enable_pipe_reset(void __iomem *ctrl_base)
+{
+        u32 val;
+
+        /* Re-enable USB 3.0 pipe reset */
+        brcmusb_usb_mdio_write(ctrl_base, 0x1f, 0x8000, MDIO_USB3);
+        val = brcmusb_usb_mdio_read(ctrl_base, 0x0f, MDIO_USB3) | 0x200;
+        brcmusb_usb_mdio_write(ctrl_base, 0x0f, val, MDIO_USB3);
+}
+
+static void brcmusb_usb3_enable_sigdet(void __iomem *ctrl_base)
+{
+        u32 val, ofs;
+        int ii;
+
+        ofs = 0;
+        for (ii = 0; ii < PHY_PORTS; ++ii) {
+                /* Set correct default for sigdet */
+                brcmusb_usb_mdio_write(ctrl_base, 0x1f, (0x8080 + ofs),
+                                       MDIO_USB3);
+                val = brcmusb_usb_mdio_read(ctrl_base, 0x05, MDIO_USB3);
+                val = (val & ~0x800f) | 0x800d;
+                brcmusb_usb_mdio_write(ctrl_base, 0x05, val, MDIO_USB3);
+                ofs = PHY_PORT_SELECT_1;
+        }
+}
+
+static void brcmusb_usb3_enable_skip_align(void __iomem *ctrl_base)
+{
+        u32 val, ofs;
+        int ii;
+
+        ofs = 0;
+        for (ii = 0; ii < PHY_PORTS; ++ii) {
+                /* Set correct default for SKIP align */
+                brcmusb_usb_mdio_write(ctrl_base, 0x1f, (0x8060 + ofs),
+                                       MDIO_USB3);
+                val = brcmusb_usb_mdio_read(ctrl_base, 0x01, MDIO_USB3) | 0x200;
+                brcmusb_usb_mdio_write(ctrl_base, 0x01, val, MDIO_USB3);
+                ofs = PHY_PORT_SELECT_1;
+        }
+}
+
+static void brcmusb_usb3_unfreeze_aeq(void __iomem *ctrl_base)
+{
+        u32 val, ofs;
+        int ii;
+
+        ofs = 0;
+        for (ii = 0; ii < PHY_PORTS; ++ii) {
+                /* Let EQ freeze after TSEQ */
+                brcmusb_usb_mdio_write(ctrl_base, 0x1f, (0x80e0 + ofs),
+                                       MDIO_USB3);
+                val = brcmusb_usb_mdio_read(ctrl_base, 0x01, MDIO_USB3);
+                val &= ~0x0008;
+                brcmusb_usb_mdio_write(ctrl_base, 0x01, val, MDIO_USB3);
+                ofs = PHY_PORT_SELECT_1;
+        }
+}
+
+static void brcmusb_usb3_pll_54mhz(struct brcm_usb_init_params *params)
+{
+        u32 ofs;
+        int ii;
+        void __iomem *ctrl_base = params->ctrl_regs;
+
+        /*
+         * On newer B53 based SoC's, the reference clock for the
+         * 3.0 PLL has been changed from 50MHz to 54MHz so the
+         * PLL needs to be reprogrammed.
+         * See SWLINUX-4006.
+         *
+         * On the 7364C0, the reference clock for the
+         * 3.0 PLL has been changed from 50MHz to 54MHz to
+         * work around a MOCA issue.
+         * See SWLINUX-4169.
+         */
+        switch (params->selected_family) {
+        case BRCM_FAMILY_3390A0:
+        case BRCM_FAMILY_7250B0:
+        case BRCM_FAMILY_7366C0:
+        case BRCM_FAMILY_74371A0:
+        case BRCM_FAMILY_7439B0:
+        case BRCM_FAMILY_7445D0:
+        case BRCM_FAMILY_7260A0:
+                return;
+        case BRCM_FAMILY_7364A0:
+                if (BRCM_REV(params->family_id) < 0x20)
+                        return;
+                break;
+        }
+
+        /* set USB 3.0 PLL to accept 54Mhz reference clock */
+        USB_CTRL_UNSET(ctrl_base, USB30_CTL1, PHY3_PLL_SEQ_START);
+
+        brcmusb_usb_mdio_write(ctrl_base, 0x1f, 0x8000, MDIO_USB3);
+        brcmusb_usb_mdio_write(ctrl_base, 0x10, 0x5784, MDIO_USB3);
+        brcmusb_usb_mdio_write(ctrl_base, 0x11, 0x01d0, MDIO_USB3);
+        brcmusb_usb_mdio_write(ctrl_base, 0x12, 0x1DE8, MDIO_USB3);
+        brcmusb_usb_mdio_write(ctrl_base, 0x13, 0xAA80, MDIO_USB3);
+        brcmusb_usb_mdio_write(ctrl_base, 0x14, 0x8826, MDIO_USB3);
+        brcmusb_usb_mdio_write(ctrl_base, 0x15, 0x0044, MDIO_USB3);
+        brcmusb_usb_mdio_write(ctrl_base, 0x16, 0x8000, MDIO_USB3);
+        brcmusb_usb_mdio_write(ctrl_base, 0x17, 0x0851, MDIO_USB3);
+        brcmusb_usb_mdio_write(ctrl_base, 0x18, 0x0000, MDIO_USB3);
+
+        /* both ports */
+        ofs = 0;
+        for (ii = 0; ii < PHY_PORTS; ++ii) {
+                brcmusb_usb_mdio_write(ctrl_base, 0x1f, (0x8040 + ofs),
+                                       MDIO_USB3);
+                brcmusb_usb_mdio_write(ctrl_base, 0x03, 0x0090, MDIO_USB3);
+                brcmusb_usb_mdio_write(ctrl_base, 0x04, 0x0134, MDIO_USB3);
+                brcmusb_usb_mdio_write(ctrl_base, 0x1f, (0x8020 + ofs),
+                                       MDIO_USB3);
+                brcmusb_usb_mdio_write(ctrl_base, 0x01, 0x00e2, MDIO_USB3);
+                ofs = PHY_PORT_SELECT_1;
+        }
+
+        /* restart PLL sequence */
+        USB_CTRL_SET(ctrl_base, USB30_CTL1, PHY3_PLL_SEQ_START);
+        /* Give PLL enough time to lock */
+        usleep_range(1000, 2000);
+}
+
+static void brcmusb_usb3_ssc_enable(void __iomem *ctrl_base)
+{
+        u32 val;
+
+        /* Enable USB 3.0 TX spread spectrum */
+        brcmusb_usb_mdio_write(ctrl_base, 0x1f, 0x8040, MDIO_USB3);
+        val = brcmusb_usb_mdio_read(ctrl_base, 0x01, MDIO_USB3) | 0xf;
+        brcmusb_usb_mdio_write(ctrl_base, 0x01, val, MDIO_USB3);
+
+        /* Currently, USB 3.0 SSC is enabled via port 0 MDIO registers,
+         * which should have been adequate. However, due to a bug in the
+         * USB 3.0 PHY, it must be enabled via both ports (HWUSB3DVT-26).
+         */
+        brcmusb_usb_mdio_write(ctrl_base, 0x1f, 0x9040, MDIO_USB3);
+        val = brcmusb_usb_mdio_read(ctrl_base, 0x01, MDIO_USB3) | 0xf;
+        brcmusb_usb_mdio_write(ctrl_base, 0x01, val, MDIO_USB3);
+}
+
+static void brcmusb_usb3_phy_workarounds(struct brcm_usb_init_params *params)
+{
+        void __iomem *ctrl_base = params->ctrl_regs;
+
+        brcmusb_usb3_pll_fix(ctrl_base);
+        brcmusb_usb3_pll_54mhz(params);
+        brcmusb_usb3_ssc_enable(ctrl_base);
+        brcmusb_usb3_enable_pipe_reset(ctrl_base);
+        brcmusb_usb3_enable_sigdet(ctrl_base);
+        brcmusb_usb3_enable_skip_align(ctrl_base);
+        brcmusb_usb3_unfreeze_aeq(ctrl_base);
+}
+
+static void brcmusb_memc_fix(struct brcm_usb_init_params *params)
+{
+        u32 prid;
+
+        if (params->selected_family != BRCM_FAMILY_7445D0)
+                return;
+        /*
+         * This is a workaround for HW7445-1869 where a DMA write ends up
+         * doing a read pre-fetch after the end of the DMA buffer. This
+         * causes a problem when the DMA buffer is at the end of physical
+         * memory, causing the pre-fetch read to access non-existent memory,
+         * and the chip bondout has MEMC2 disabled. When the pre-fetch read
+         * tries to use the disabled MEMC2, it hangs the bus. The workaround
+         * is to disable MEMC2 access in the usb controller which avoids
+         * the hang.
+         */
+
+        prid = params->product_id & 0xfffff000;
+        switch (prid) {
+        case 0x72520000:
+        case 0x74480000:
+        case 0x74490000:
+        case 0x07252000:
+        case 0x07448000:
+        case 0x07449000:
+                USB_CTRL_UNSET_FAMILY(params, SETUP, SCB2_EN);
+        }
+}
+
+static void brcmusb_usb3_otp_fix(struct brcm_usb_init_params *params)
+{
+        void __iomem *xhci_ec_base = params->xhci_ec_regs;
+        u32 val;
+
+        if (params->family_id != 0x74371000 || xhci_ec_base == 0)
+                return;
+        brcmusb_writel(0xa20c, USB_XHCI_EC_REG(xhci_ec_base, IRAADR));
+        val = brcmusb_readl(USB_XHCI_EC_REG(xhci_ec_base, IRADAT));
+
+        /* set cfg_pick_ss_lock */
+        val |= (1 << 27);
+        brcmusb_writel(val, USB_XHCI_EC_REG(xhci_ec_base, IRADAT));
+
+        /* Reset USB 3.0 PHY for workaround to take effect */
+        USB_CTRL_UNSET(params->ctrl_regs, USB30_CTL1, PHY3_RESETB);
+        USB_CTRL_SET(params->ctrl_regs, USB30_CTL1, PHY3_RESETB);
+}
+
+static void brcmusb_xhci_soft_reset(struct brcm_usb_init_params *params,
+                                    int on_off)
+{
+        /* Assert reset */
+        if (on_off) {
+                if (USB_CTRL_MASK_FAMILY(params, USB_PM, XHC_SOFT_RESETB))
+                        USB_CTRL_UNSET_FAMILY(params, USB_PM, XHC_SOFT_RESETB);
+                else
+                        USB_CTRL_UNSET_FAMILY(params,
+                                              USB30_CTL1, XHC_SOFT_RESETB);
+        } else { /* De-assert reset */
+                if (USB_CTRL_MASK_FAMILY(params, USB_PM, XHC_SOFT_RESETB))
+                        USB_CTRL_SET_FAMILY(params, USB_PM, XHC_SOFT_RESETB);
+                else
+                        USB_CTRL_SET_FAMILY(params, USB30_CTL1,
+                                            XHC_SOFT_RESETB);
+        }
+}
+
+/*
+ * Return the best map table family. The order is:
+ *   - exact match of chip and major rev
+ *   - exact match of chip and closest older major rev
+ *   - default chip/rev.
+ * NOTE: The minor rev is always ignored.
+ */
+static enum brcm_family_type brcmusb_get_family_type(
+        struct brcm_usb_init_params *params)
+{
+        int last_type = -1;
+        u32 last_family = 0;
+        u32 family_no_major;
+        unsigned int x;
+        u32 family;
+
+        family = params->family_id & 0xfffffff0;
+        family_no_major = params->family_id & 0xffffff00;
+        for (x = 0; id_to_type_table[x].id; x++) {
+                if (family == id_to_type_table[x].id)
+                        return id_to_type_table[x].type;
+                if (family_no_major == (id_to_type_table[x].id & 0xffffff00))
+                        if (family > id_to_type_table[x].id &&
+                            last_family < id_to_type_table[x].id) {
+                                last_family = id_to_type_table[x].id;
+                                last_type = id_to_type_table[x].type;
+                        }
+        }
+
+        /* If no match, return the default family */
+        if (last_type == -1)
+                return id_to_type_table[x].type;
+        return last_type;
+}
+
+void brcm_usb_init_ipp(struct brcm_usb_init_params *params)
+{
+        void __iomem *ctrl = params->ctrl_regs;
+        u32 reg;
+        u32 orig_reg;
+
+        /* Starting with the 7445d0, there are no longer separate 3.0
+         * versions of IOC and IPP.
+         */
+        if (USB_CTRL_MASK_FAMILY(params, USB30_CTL1, USB3_IOC)) {
+                if (params->ioc)
+                        USB_CTRL_SET_FAMILY(params, USB30_CTL1, USB3_IOC);
+                if (params->ipp == 1)
+                        USB_CTRL_SET_FAMILY(params, USB30_CTL1, USB3_IPP);
+        }
+
+        reg = brcmusb_readl(USB_CTRL_REG(ctrl, SETUP));
+        orig_reg = reg;
+        if (USB_CTRL_MASK_FAMILY(params, SETUP, STRAP_CC_DRD_MODE_ENABLE_SEL))
+                /* Never use the strap, it's going away. */
+                reg &= ~(USB_CTRL_MASK_FAMILY(params,
+                                              SETUP,
+                                              STRAP_CC_DRD_MODE_ENABLE_SEL));
+        if (USB_CTRL_MASK_FAMILY(params, SETUP, STRAP_IPP_SEL))
+                if (params->ipp != 2)
+                        /* override ipp strap pin (if it exits) */
+                        reg &= ~(USB_CTRL_MASK_FAMILY(params, SETUP,
+                                                      STRAP_IPP_SEL));
+
+        /* Override the default OC and PP polarity */
+        reg &= ~(USB_CTRL_MASK(SETUP, IPP) | USB_CTRL_MASK(SETUP, IOC));
+        if (params->ioc)
+                reg |= USB_CTRL_MASK(SETUP, IOC);
+        if (params->ipp == 1 && ((reg & USB_CTRL_MASK(SETUP, IPP)) == 0))
+                reg |= USB_CTRL_MASK(SETUP, IPP);
+        brcmusb_writel(reg, USB_CTRL_REG(ctrl, SETUP));
+
+        /*
+         * If we're changing IPP, make sure power is off long enough
+         * to turn off any connected devices.
+         */
+        if (reg != orig_reg)
+                msleep(50);
+}
+
+int brcm_usb_init_get_dual_select(struct brcm_usb_init_params *params)
+{
+        void __iomem *ctrl = params->ctrl_regs;
+        u32 reg = 0;
+
+        if (USB_CTRL_MASK_FAMILY(params, USB_DEVICE_CTL1, PORT_MODE)) {
+                reg = brcmusb_readl(USB_CTRL_REG(ctrl, USB_DEVICE_CTL1));
+                reg &= USB_CTRL_MASK_FAMILY(params, USB_DEVICE_CTL1,
+                                        PORT_MODE);
+        }
+        return reg;
+}
+
+void brcm_usb_init_set_dual_select(struct brcm_usb_init_params *params,
+                                   int mode)
+{
+        void __iomem *ctrl = params->ctrl_regs;
+        u32 reg;
+
+        if (USB_CTRL_MASK_FAMILY(params, USB_DEVICE_CTL1, PORT_MODE)) {
+                reg = brcmusb_readl(USB_CTRL_REG(ctrl, USB_DEVICE_CTL1));
+                reg &= ~USB_CTRL_MASK_FAMILY(params, USB_DEVICE_CTL1,
+                                        PORT_MODE);
+                reg |= mode;
+                brcmusb_writel(reg, USB_CTRL_REG(ctrl, USB_DEVICE_CTL1));
+        }
+}
+
+void brcm_usb_init_common(struct brcm_usb_init_params *params)
+{
+        u32 reg;
+        void __iomem *ctrl = params->ctrl_regs;
+
+        /* Take USB out of power down */
+        if (USB_CTRL_MASK_FAMILY(params, PLL_CTL, PLL_IDDQ_PWRDN)) {
+                USB_CTRL_UNSET_FAMILY(params, PLL_CTL, PLL_IDDQ_PWRDN);
+                /* 1 millisecond - for USB clocks to settle down */
+                usleep_range(1000, 2000);
+        }
+
+        if (USB_CTRL_MASK_FAMILY(params, USB_PM, USB_PWRDN)) {
+                USB_CTRL_UNSET_FAMILY(params, USB_PM, USB_PWRDN);
+                /* 1 millisecond - for USB clocks to settle down */
+                usleep_range(1000, 2000);
+        }
+
+        if (params->selected_family != BRCM_FAMILY_74371A0 &&
+            (BRCM_ID(params->family_id) != 0x7364))
+                /*
+                 * HW7439-637: 7439a0 and its derivatives do not have large
+                 * enough descriptor storage for this.
+                 */
+                USB_CTRL_SET_FAMILY(params, SETUP, SS_EHCI64BIT_EN);
+
+        /* Block auto PLL suspend by USB2 PHY (Sasi) */
+        USB_CTRL_SET(ctrl, PLL_CTL, PLL_SUSPEND_EN);
+
+        reg = brcmusb_readl(USB_CTRL_REG(ctrl, SETUP));
+        if (params->selected_family == BRCM_FAMILY_7364A0)
+                /* Suppress overcurrent indication from USB30 ports for A0 */
+                reg |= USB_CTRL_MASK_FAMILY(params, SETUP, OC3_DISABLE);
+
+        brcmusb_usb_phy_ldo_fix(ctrl);
+        brcmusb_usb2_eye_fix(ctrl);
+
+        /*
+         * Make sure the the second and third memory controller
+         * interfaces are enabled if they exist.
+         */
+        if (USB_CTRL_MASK_FAMILY(params, SETUP, SCB1_EN))
+                reg |= USB_CTRL_MASK_FAMILY(params, SETUP, SCB1_EN);
+        if (USB_CTRL_MASK_FAMILY(params, SETUP, SCB2_EN))
+                reg |= USB_CTRL_MASK_FAMILY(params, SETUP, SCB2_EN);
+        brcmusb_writel(reg, USB_CTRL_REG(ctrl, SETUP));
+
+        brcmusb_memc_fix(params);
+
+        if (USB_CTRL_MASK_FAMILY(params, USB_DEVICE_CTL1, PORT_MODE)) {
+                reg = brcmusb_readl(USB_CTRL_REG(ctrl, USB_DEVICE_CTL1));
+                reg &= ~USB_CTRL_MASK_FAMILY(params, USB_DEVICE_CTL1,
+                                        PORT_MODE);
+                reg |= params->mode;
+                brcmusb_writel(reg, USB_CTRL_REG(ctrl, USB_DEVICE_CTL1));
+        }
+        if (USB_CTRL_MASK_FAMILY(params, USB_PM, BDC_SOFT_RESETB)) {
+                switch (params->mode) {
+                case USB_CTLR_MODE_HOST:
+                        USB_CTRL_UNSET_FAMILY(params, USB_PM, BDC_SOFT_RESETB);
+                        break;
+                default:
+                        USB_CTRL_SET_FAMILY(params, USB_PM, BDC_SOFT_RESETB);
+                break;
+                }
+        }
+        if (USB_CTRL_MASK_FAMILY(params, SETUP, CC_DRD_MODE_ENABLE)) {
+                if (params->mode == USB_CTLR_MODE_TYPEC_PD)
+                        USB_CTRL_SET_FAMILY(params, SETUP, CC_DRD_MODE_ENABLE);
+                else
+                        USB_CTRL_UNSET_FAMILY(params, SETUP,
+                                              CC_DRD_MODE_ENABLE);
+        }
+}
+
+void brcm_usb_init_eohci(struct brcm_usb_init_params *params)
+{
+        u32 reg;
+        void __iomem *ctrl = params->ctrl_regs;
+
+        if (USB_CTRL_MASK_FAMILY(params, USB_PM, USB20_HC_RESETB))
+                USB_CTRL_SET_FAMILY(params, USB_PM, USB20_HC_RESETB);
+
+        if (params->selected_family == BRCM_FAMILY_7366C0)
+                /*
+                 * Don't enable this so the memory controller doesn't read
+                 * into memory holes. NOTE: This bit is low true on 7366C0.
+                 */
+                USB_CTRL_SET_FAMILY(params, EBRIDGE, ESTOP_SCB_REQ);
+
+        /* Setup the endian bits */
+        reg = brcmusb_readl(USB_CTRL_REG(ctrl, SETUP));
+        reg &= ~USB_CTRL_SETUP_ENDIAN_BITS;
+        reg |= USB_CTRL_MASK_FAMILY(params, SETUP, ENDIAN);
+        brcmusb_writel(reg, USB_CTRL_REG(ctrl, SETUP));
+}
+
+void brcm_usb_init_xhci(struct brcm_usb_init_params *params)
+{
+        void __iomem *ctrl = params->ctrl_regs;
+
+        if (BRCM_ID(params->family_id) == 0x7366) {
+                /*
+                 * The PHY3_SOFT_RESETB bits default to the wrong state.
+                 */
+                USB_CTRL_SET(ctrl, USB30_PCTL, PHY3_SOFT_RESETB);
+                USB_CTRL_SET(ctrl, USB30_PCTL, PHY3_SOFT_RESETB_P1);
+        }
+
+        /*
+         * Kick start USB3 PHY
+         * Make sure it's low to insure a rising edge.
+         */
+        USB_CTRL_UNSET(ctrl, USB30_CTL1, PHY3_PLL_SEQ_START);
+        USB_CTRL_SET(ctrl, USB30_CTL1, PHY3_PLL_SEQ_START);
+
+        brcmusb_usb3_phy_workarounds(params);
+        brcmusb_xhci_soft_reset(params, 0);
+        brcmusb_usb3_otp_fix(params);
+}
+
+void brcm_usb_uninit_common(struct brcm_usb_init_params *params)
+{
+        if (USB_CTRL_MASK_FAMILY(params, USB_PM, USB_PWRDN))
+                USB_CTRL_SET_FAMILY(params, USB_PM, USB_PWRDN);
+
+        if (USB_CTRL_MASK_FAMILY(params, PLL_CTL, PLL_IDDQ_PWRDN))
+                USB_CTRL_SET_FAMILY(params, PLL_CTL, PLL_IDDQ_PWRDN);
+}
+
+void brcm_usb_uninit_eohci(struct brcm_usb_init_params *params)
+{
+        if (USB_CTRL_MASK_FAMILY(params, USB_PM, USB20_HC_RESETB))
+                USB_CTRL_UNSET_FAMILY(params, USB_PM, USB20_HC_RESETB);
+}
+
+void brcm_usb_uninit_xhci(struct brcm_usb_init_params *params)
+{
+        brcmusb_xhci_soft_reset(params, 1);
+}
+
+void brcm_usb_set_family_map(struct brcm_usb_init_params *params)
+{
+        int fam;
+
+        fam = brcmusb_get_family_type(params);
+        params->selected_family = fam;
+        params->usb_reg_bits_map =
+                &usb_reg_bits_map_table[fam][0];
+        params->family_name = family_names[fam];
+}
diff --git a/drivers/phy/broadcom/phy-brcm-usb-init.h b/drivers/phy/broadcom/phy-brcm-usb-init.h
new file mode 100644
index 000000000000..bb77b863885e
--- /dev/null
+++ b/drivers/phy/broadcom/phy-brcm-usb-init.h
@@ -0,0 +1,50 @@
+/*
+ * Copyright (C) 2014-2017 Broadcom
+ *
+ * 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 _USB_BRCM_COMMON_INIT_H
+#define _USB_BRCM_COMMON_INIT_H
+
+#define USB_CTLR_MODE_HOST 0
+#define USB_CTLR_MODE_DEVICE 1
+#define USB_CTLR_MODE_DRD 2
+#define USB_CTLR_MODE_TYPEC_PD 3
+
+struct  brcm_usb_init_params;
+
+struct  brcm_usb_init_params {
+        void __iomem *ctrl_regs;
+        void __iomem *xhci_ec_regs;
+        int ioc;
+        int ipp;
+        int mode;
+        u32 family_id;
+        u32 product_id;
+        int selected_family;
+        const char *family_name;
+        const u32 *usb_reg_bits_map;
+};
+
+void brcm_usb_set_family_map(struct brcm_usb_init_params *params);
+int brcm_usb_init_get_dual_select(struct brcm_usb_init_params *params);
+void brcm_usb_init_set_dual_select(struct brcm_usb_init_params *params,
+                                   int mode);
+
+void brcm_usb_init_ipp(struct brcm_usb_init_params *ini);
+void brcm_usb_init_common(struct brcm_usb_init_params *ini);
+void brcm_usb_init_eohci(struct brcm_usb_init_params *ini);
+void brcm_usb_init_xhci(struct brcm_usb_init_params *ini);
+void brcm_usb_uninit_common(struct brcm_usb_init_params *ini);
+void brcm_usb_uninit_eohci(struct brcm_usb_init_params *ini);
+void brcm_usb_uninit_xhci(struct brcm_usb_init_params *ini);
+
+#endif /* _USB_BRCM_COMMON_INIT_H */
diff --git a/drivers/phy/broadcom/phy-brcm-usb.c b/drivers/phy/broadcom/phy-brcm-usb.c
new file mode 100644
index 000000000000..195b98139e5f
--- /dev/null
+++ b/drivers/phy/broadcom/phy-brcm-usb.c
@@ -0,0 +1,459 @@
+/*
+ * phy-brcm-usb.c - Broadcom USB Phy Driver
+ *
+ * Copyright (C) 2015-2017 Broadcom
+ *
+ * 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/delay.h>
+#include <linux/err.h>
+#include <linux/io.h>
+#include <linux/module.h>
+#include <linux/of.h>
+#include <linux/phy/phy.h>
+#include <linux/platform_device.h>
+#include <linux/interrupt.h>
+#include <linux/soc/brcmstb/brcmstb.h>
+#include <dt-bindings/phy/phy.h>
+
+#include "phy-brcm-usb-init.h"
+
+static DEFINE_MUTEX(sysfs_lock);
+
+enum brcm_usb_phy_id {
+        BRCM_USB_PHY_2_0 = 0,
+        BRCM_USB_PHY_3_0,
+        BRCM_USB_PHY_ID_MAX
+};
+
+struct value_to_name_map {
+        int value;
+        const char *name;
+};
+
+static struct value_to_name_map brcm_dr_mode_to_name[] = {
+        { USB_CTLR_MODE_HOST, "host" },
+        { USB_CTLR_MODE_DEVICE, "peripheral" },
+        { USB_CTLR_MODE_DRD, "drd" },
+        { USB_CTLR_MODE_TYPEC_PD, "typec-pd" }
+};
+
+static struct value_to_name_map brcm_dual_mode_to_name[] = {
+        { 0, "host" },
+        { 1, "device" },
+        { 2, "auto" },
+};
+
+struct brcm_usb_phy {
+        struct phy *phy;
+        unsigned int id;
+        bool inited;
+};
+
+struct brcm_usb_phy_data {
+        struct  brcm_usb_init_params ini;
+        bool                    has_eohci;
+        bool                    has_xhci;
+        struct clk              *usb_20_clk;
+        struct clk              *usb_30_clk;
+        struct mutex            mutex;  /* serialize phy init */
+        int                     init_count;
+        struct brcm_usb_phy     phys[BRCM_USB_PHY_ID_MAX];
+};
+
+static int brcm_usb_phy_init(struct phy *gphy)
+{
+        struct brcm_usb_phy *phy = phy_get_drvdata(gphy);
+        struct brcm_usb_phy_data *priv =
+                container_of(phy, struct brcm_usb_phy_data, phys[phy->id]);
+
+        /*
+         * Use a lock to make sure a second caller waits until
+         * the base phy is inited before using it.
+         */
+        mutex_lock(&priv->mutex);
+        if (priv->init_count++ == 0) {
+                clk_enable(priv->usb_20_clk);
+                clk_enable(priv->usb_30_clk);
+                brcm_usb_init_common(&priv->ini);
+        }
+        mutex_unlock(&priv->mutex);
+        if (phy->id == BRCM_USB_PHY_2_0)
+                brcm_usb_init_eohci(&priv->ini);
+        else if (phy->id == BRCM_USB_PHY_3_0)
+                brcm_usb_init_xhci(&priv->ini);
+        phy->inited = true;
+        dev_dbg(&gphy->dev, "INIT, id: %d, total: %d\n", phy->id,
+                priv->init_count);
+
+        return 0;
+}
+
+static int brcm_usb_phy_exit(struct phy *gphy)
+{
+        struct brcm_usb_phy *phy = phy_get_drvdata(gphy);
+        struct brcm_usb_phy_data *priv =
+                container_of(phy, struct brcm_usb_phy_data, phys[phy->id]);
+
+        dev_dbg(&gphy->dev, "EXIT\n");
+        if (phy->id == BRCM_USB_PHY_2_0)
+                brcm_usb_uninit_eohci(&priv->ini);
+        if (phy->id == BRCM_USB_PHY_3_0)
+                brcm_usb_uninit_xhci(&priv->ini);
+
+        /* If both xhci and eohci are gone, reset everything else */
+        mutex_lock(&priv->mutex);
+        if (--priv->init_count == 0) {
+                brcm_usb_uninit_common(&priv->ini);
+                clk_disable(priv->usb_20_clk);
+                clk_disable(priv->usb_30_clk);
+        }
+        mutex_unlock(&priv->mutex);
+        phy->inited = false;
+        return 0;
+}
+
+static struct phy_ops brcm_usb_phy_ops = {
+        .init           = brcm_usb_phy_init,
+        .exit           = brcm_usb_phy_exit,
+        .owner          = THIS_MODULE,
+};
+
+static struct phy *brcm_usb_phy_xlate(struct device *dev,
+                                      struct of_phandle_args *args)
+{
+        struct brcm_usb_phy_data *data = dev_get_drvdata(dev);
+
+        /*
+         * values 0 and 1 are for backward compatibility with
+         * device tree nodes from older bootloaders.
+         */
+        switch (args->args[0]) {
+        case 0:
+        case PHY_TYPE_USB2:
+                if (data->phys[BRCM_USB_PHY_2_0].phy)
+                        return data->phys[BRCM_USB_PHY_2_0].phy;
+                dev_warn(dev, "Error, 2.0 Phy not found\n");
+                break;
+        case 1:
+        case PHY_TYPE_USB3:
+                if (data->phys[BRCM_USB_PHY_3_0].phy)
+                        return data->phys[BRCM_USB_PHY_3_0].phy;
+                dev_warn(dev, "Error, 3.0 Phy not found\n");
+                break;
+        }
+        return ERR_PTR(-ENODEV);
+}
+
+static int name_to_value(struct value_to_name_map *table, int count,
+                         const char *name, int *value)
+{
+        int x;
+
+        *value = 0;
+        for (x = 0; x < count; x++) {
+                if (sysfs_streq(name, table[x].name)) {
+                        *value = x;
+                        return 0;
+                }
+        }
+        return -EINVAL;
+}
+
+static const char *value_to_name(struct value_to_name_map *table, int count,
+                                 int value)
+{
+        if (value >= count)
+                return "unknown";
+        return table[value].name;
+}
+
+static ssize_t dr_mode_show(struct device *dev,
+                            struct device_attribute *attr,
+                            char *buf)
+{
+        struct brcm_usb_phy_data *priv = dev_get_drvdata(dev);
+
+        return sprintf(buf, "%s\n",
+                value_to_name(&brcm_dr_mode_to_name[0],
+                              ARRAY_SIZE(brcm_dr_mode_to_name),
+                              priv->ini.mode));
+}
+static DEVICE_ATTR_RO(dr_mode);
+
+static ssize_t dual_select_store(struct device *dev,
+                                 struct device_attribute *attr,
+                                 const char *buf, size_t len)
+{
+        struct brcm_usb_phy_data *priv = dev_get_drvdata(dev);
+        int value;
+        int res;
+
+        mutex_lock(&sysfs_lock);
+        res = name_to_value(&brcm_dual_mode_to_name[0],
+                            ARRAY_SIZE(brcm_dual_mode_to_name), buf, &value);
+        if (!res) {
+                brcm_usb_init_set_dual_select(&priv->ini, value);
+                res = len;
+        }
+        mutex_unlock(&sysfs_lock);
+        return res;
+}
+
+static ssize_t dual_select_show(struct device *dev,
+                                struct device_attribute *attr,
+                                char *buf)
+{
+        struct brcm_usb_phy_data *priv = dev_get_drvdata(dev);
+        int value;
+
+        mutex_lock(&sysfs_lock);
+        value = brcm_usb_init_get_dual_select(&priv->ini);
+        mutex_unlock(&sysfs_lock);
+        return sprintf(buf, "%s\n",
+                value_to_name(&brcm_dual_mode_to_name[0],
+                              ARRAY_SIZE(brcm_dual_mode_to_name),
+                              value));
+}
+static DEVICE_ATTR_RW(dual_select);
+
+static struct attribute *brcm_usb_phy_attrs[] = {
+        &dev_attr_dr_mode.attr,
+        &dev_attr_dual_select.attr,
+        NULL
+};
+
+static const struct attribute_group brcm_usb_phy_group = {
+        .attrs = brcm_usb_phy_attrs,
+};
+
+static int brcm_usb_phy_dvr_init(struct device *dev,
+                                 struct brcm_usb_phy_data *priv,
+                                 struct device_node *dn)
+{
+        struct phy *gphy;
+        int err;
+
+        priv->usb_20_clk = of_clk_get_by_name(dn, "sw_usb");
+        if (IS_ERR(priv->usb_20_clk)) {
+                dev_info(dev, "Clock not found in Device Tree\n");
+                priv->usb_20_clk = NULL;
+        }
+        err = clk_prepare_enable(priv->usb_20_clk);
+        if (err)
+                return err;
+
+        if (priv->has_eohci) {
+                gphy = devm_phy_create(dev, NULL, &brcm_usb_phy_ops);
+                if (IS_ERR(gphy)) {
+                        dev_err(dev, "failed to create EHCI/OHCI PHY\n");
+                        return PTR_ERR(gphy);
+                }
+                priv->phys[BRCM_USB_PHY_2_0].phy = gphy;
+                priv->phys[BRCM_USB_PHY_2_0].id = BRCM_USB_PHY_2_0;
+                phy_set_drvdata(gphy, &priv->phys[BRCM_USB_PHY_2_0]);
+        }
+
+        if (priv->has_xhci) {
+                gphy = devm_phy_create(dev, NULL, &brcm_usb_phy_ops);
+                if (IS_ERR(gphy)) {
+                        dev_err(dev, "failed to create XHCI PHY\n");
+                        return PTR_ERR(gphy);
+                }
+                priv->phys[BRCM_USB_PHY_3_0].phy = gphy;
+                priv->phys[BRCM_USB_PHY_3_0].id = BRCM_USB_PHY_3_0;
+                phy_set_drvdata(gphy, &priv->phys[BRCM_USB_PHY_3_0]);
+
+                priv->usb_30_clk = of_clk_get_by_name(dn, "sw_usb3");
+                if (IS_ERR(priv->usb_30_clk)) {
+                        dev_info(dev,
+                                 "USB3.0 clock not found in Device Tree\n");
+                        priv->usb_30_clk = NULL;
+                }
+                err = clk_prepare_enable(priv->usb_30_clk);
+                if (err)
+                        return err;
+        }
+        return 0;
+}
+
+static int brcm_usb_phy_probe(struct platform_device *pdev)
+{
+        struct resource *res;
+        struct device *dev = &pdev->dev;
+        struct brcm_usb_phy_data *priv;
+        struct phy_provider *phy_provider;
+        struct device_node *dn = pdev->dev.of_node;
+        int err;
+        const char *mode;
+
+        priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL);
+        if (!priv)
+                return -ENOMEM;
+        platform_set_drvdata(pdev, priv);
+
+        priv->ini.family_id = brcmstb_get_family_id();
+        priv->ini.product_id = brcmstb_get_product_id();
+        brcm_usb_set_family_map(&priv->ini);
+        dev_dbg(dev, "Best mapping table is for %s\n",
+                priv->ini.family_name);
+        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+        if (!res) {
+                dev_err(dev, "can't get USB_CTRL base address\n");
+                return -EINVAL;
+        }
+        priv->ini.ctrl_regs = devm_ioremap_resource(dev, res);
+        if (IS_ERR(priv->ini.ctrl_regs)) {
+                dev_err(dev, "can't map CTRL register space\n");
+                return -EINVAL;
+        }
+
+        /* The XHCI EC registers are optional */
+        res = platform_get_resource(pdev, IORESOURCE_MEM, 1);
+        if (res) {
+                priv->ini.xhci_ec_regs =
+                        devm_ioremap_resource(dev, res);
+                if (IS_ERR(priv->ini.xhci_ec_regs)) {
+                        dev_err(dev, "can't map XHCI EC register space\n");
+                        return -EINVAL;
+                }
+        }
+
+        of_property_read_u32(dn, "brcm,ipp", &priv->ini.ipp);
+        of_property_read_u32(dn, "brcm,ioc", &priv->ini.ioc);
+
+        priv->ini.mode = USB_CTLR_MODE_HOST;
+        err = of_property_read_string(dn, "dr_mode", &mode);
+        if (err == 0) {
+                name_to_value(&brcm_dr_mode_to_name[0],
+                              ARRAY_SIZE(brcm_dr_mode_to_name),
+                        mode, &priv->ini.mode);
+        }
+        if (of_property_read_bool(dn, "brcm,has_xhci"))
+                priv->has_xhci = true;
+        if (of_property_read_bool(dn, "brcm,has_eohci"))
+                priv->has_eohci = true;
+
+        err = brcm_usb_phy_dvr_init(dev, priv, dn);
+        if (err)
+                return err;
+
+        mutex_init(&priv->mutex);
+
+        /* make sure invert settings are correct */
+        brcm_usb_init_ipp(&priv->ini);
+
+        /*
+         * Create sysfs entries for mode.
+         * Remove "dual_select" attribute if not in dual mode
+         */
+        if (priv->ini.mode != USB_CTLR_MODE_DRD)
+                brcm_usb_phy_attrs[1] = NULL;
+        err = sysfs_create_group(&dev->kobj, &brcm_usb_phy_group);
+        if (err)
+                dev_warn(dev, "Error creating sysfs attributes\n");
+
+        /* start with everything off */
+        if (priv->has_xhci)
+                brcm_usb_uninit_xhci(&priv->ini);
+        if (priv->has_eohci)
+                brcm_usb_uninit_eohci(&priv->ini);
+        brcm_usb_uninit_common(&priv->ini);
+        clk_disable(priv->usb_20_clk);
+        clk_disable(priv->usb_30_clk);
+
+        phy_provider = devm_of_phy_provider_register(dev, brcm_usb_phy_xlate);
+        if (IS_ERR(phy_provider))
+                return PTR_ERR(phy_provider);
+
+        return 0;
+}
+
+#ifdef CONFIG_PM_SLEEP
+static int brcm_usb_phy_suspend(struct device *dev)
+{
+        struct brcm_usb_phy_data *priv = dev_get_drvdata(dev);
+
+        if (priv->init_count) {
+                clk_disable(priv->usb_20_clk);
+                clk_disable(priv->usb_30_clk);
+        }
+        return 0;
+}
+
+static int brcm_usb_phy_resume(struct device *dev)
+{
+        struct brcm_usb_phy_data *priv = dev_get_drvdata(dev);
+
+        clk_enable(priv->usb_20_clk);
+        clk_enable(priv->usb_30_clk);
+        brcm_usb_init_ipp(&priv->ini);
+
+        /*
+         * Initialize anything that was previously initialized.
+         * Uninitialize anything that wasn't previously initialized.
+         */
+        if (priv->init_count) {
+                brcm_usb_init_common(&priv->ini);
+                if (priv->phys[BRCM_USB_PHY_2_0].inited) {
+                        brcm_usb_init_eohci(&priv->ini);
+                } else if (priv->has_eohci) {
+                        brcm_usb_uninit_eohci(&priv->ini);
+                        clk_disable(priv->usb_20_clk);
+                }
+                if (priv->phys[BRCM_USB_PHY_3_0].inited) {
+                        brcm_usb_init_xhci(&priv->ini);
+                } else if (priv->has_xhci) {
+                        brcm_usb_uninit_xhci(&priv->ini);
+                        clk_disable(priv->usb_30_clk);
+                }
+        } else {
+                if (priv->has_xhci)
+                        brcm_usb_uninit_xhci(&priv->ini);
+                if (priv->has_eohci)
+                        brcm_usb_uninit_eohci(&priv->ini);
+                brcm_usb_uninit_common(&priv->ini);
+                clk_disable(priv->usb_20_clk);
+                clk_disable(priv->usb_30_clk);
+        }
+
+        return 0;
+}
+#endif /* CONFIG_PM_SLEEP */
+
+static const struct dev_pm_ops brcm_usb_phy_pm_ops = {
+        SET_LATE_SYSTEM_SLEEP_PM_OPS(brcm_usb_phy_suspend, brcm_usb_phy_resume)
+};
+
+static const struct of_device_id brcm_usb_dt_ids[] = {
+        { .compatible = "brcm,brcmstb-usb-phy" },
+        { /* sentinel */ }
+};
+
+MODULE_DEVICE_TABLE(of, brcm_usb_dt_ids);
+
+static struct platform_driver brcm_usb_driver = {
+        .probe          = brcm_usb_phy_probe,
+        .driver         = {
+                .name   = "brcmstb-usb-phy",
+                .owner  = THIS_MODULE,
+                .pm = &brcm_usb_phy_pm_ops,
+                .of_match_table = brcm_usb_dt_ids,
+        },
+};
+
+module_platform_driver(brcm_usb_driver);
+
+MODULE_ALIAS("platform:brcmstb-usb-phy");
+MODULE_AUTHOR("Al Cooper <acooper@broadcom.com>");
+MODULE_DESCRIPTION("BRCM USB PHY driver");
+MODULE_LICENSE("GPL v2");
diff --git a/drivers/phy/marvell/phy-mvebu-cp110-comphy.c b/drivers/phy/marvell/phy-mvebu-cp110-comphy.c
index 89c887ea5557..a0d522154cdf 100644
--- a/drivers/phy/marvell/phy-mvebu-cp110-comphy.c
+++ b/drivers/phy/marvell/phy-mvebu-cp110-comphy.c
@@ -154,7 +154,6 @@ struct mvebu_comphy_priv {
         void __iomem *base;
         struct regmap *regmap;
         struct device *dev;
-        int modes[MVEBU_COMPHY_LANES];
 };
 
 struct mvebu_comphy_lane {
diff --git a/drivers/phy/mediatek/phy-mtk-tphy.c b/drivers/phy/mediatek/phy-mtk-tphy.c
index 721a2a1c97ef..402385f2562a 100644
--- a/drivers/phy/mediatek/phy-mtk-tphy.c
+++ b/drivers/phy/mediatek/phy-mtk-tphy.c
@@ -96,9 +96,11 @@
 
 #define U3P_U2PHYDTM1           0x06C
 #define P2C_RG_UART_EN                  BIT(16)
+#define P2C_FORCE_IDDIG         BIT(9)
 #define P2C_RG_VBUSVALID                BIT(5)
 #define P2C_RG_SESSEND                  BIT(4)
 #define P2C_RG_AVALID                   BIT(2)
+#define P2C_RG_IDDIG                    BIT(1)
 
 #define U3P_U3_CHIP_GPIO_CTLD           0x0c
 #define P3C_REG_IP_SW_RST               BIT(31)
@@ -585,6 +587,31 @@ static void u2_phy_instance_exit(struct mtk_tphy *tphy,
         }
 }
 
+static void u2_phy_instance_set_mode(struct mtk_tphy *tphy,
+                                     struct mtk_phy_instance *instance,
+                                     enum phy_mode mode)
+{
+        struct u2phy_banks *u2_banks = &instance->u2_banks;
+        u32 tmp;
+
+        tmp = readl(u2_banks->com + U3P_U2PHYDTM1);
+        switch (mode) {
+        case PHY_MODE_USB_DEVICE:
+                tmp |= P2C_FORCE_IDDIG | P2C_RG_IDDIG;
+                break;
+        case PHY_MODE_USB_HOST:
+                tmp |= P2C_FORCE_IDDIG;
+                tmp &= ~P2C_RG_IDDIG;
+                break;
+        case PHY_MODE_USB_OTG:
+                tmp &= ~(P2C_FORCE_IDDIG | P2C_RG_IDDIG);
+                break;
+        default:
+                return;
+        }
+        writel(tmp, u2_banks->com + U3P_U2PHYDTM1);
+}
+
 static void pcie_phy_instance_init(struct mtk_tphy *tphy,
         struct mtk_phy_instance *instance)
 {
@@ -881,6 +908,17 @@ static int mtk_phy_exit(struct phy *phy)
         return 0;
 }
 
+static int mtk_phy_set_mode(struct phy *phy, enum phy_mode mode)
+{
+        struct mtk_phy_instance *instance = phy_get_drvdata(phy);
+        struct mtk_tphy *tphy = dev_get_drvdata(phy->dev.parent);
+
+        if (instance->type == PHY_TYPE_USB2)
+                u2_phy_instance_set_mode(tphy, instance, mode);
+
+        return 0;
+}
+
 static struct phy *mtk_phy_xlate(struct device *dev,
                                         struct of_phandle_args *args)
 {
@@ -931,6 +969,7 @@ static const struct phy_ops mtk_tphy_ops = {
         .exit           = mtk_phy_exit,
         .power_on       = mtk_phy_power_on,
         .power_off      = mtk_phy_power_off,
+        .set_mode       = mtk_phy_set_mode,
         .owner          = THIS_MODULE,
 };
 
diff --git a/drivers/phy/phy-core.c b/drivers/phy/phy-core.c
index a268f4d6f3e9..b4964b067aec 100644
--- a/drivers/phy/phy-core.c
+++ b/drivers/phy/phy-core.c
@@ -372,6 +372,21 @@ int phy_reset(struct phy *phy)
 }
 EXPORT_SYMBOL_GPL(phy_reset);
 
+int phy_calibrate(struct phy *phy)
+{
+        int ret;
+
+        if (!phy || !phy->ops->calibrate)
+                return 0;
+
+        mutex_lock(&phy->mutex);
+        ret = phy->ops->calibrate(phy);
+        mutex_unlock(&phy->mutex);
+
+        return ret;
+}
+EXPORT_SYMBOL_GPL(phy_calibrate);
+
 /**
  * _of_phy_get() - lookup and obtain a reference to a phy by phandle
  * @np: device_node for which to get the phy
diff --git a/drivers/phy/qualcomm/phy-qcom-ufs-i.h b/drivers/phy/qualcomm/phy-qcom-ufs-i.h
index 13b02b7de30b..822c83b8efcd 100644
--- a/drivers/phy/qualcomm/phy-qcom-ufs-i.h
+++ b/drivers/phy/qualcomm/phy-qcom-ufs-i.h
@@ -114,14 +114,16 @@ struct ufs_qcom_phy {
         struct ufs_qcom_phy_calibration *cached_regs;
         int cached_regs_table_size;
         bool is_powered_on;
+        bool is_started;
         struct ufs_qcom_phy_specific_ops *phy_spec_ops;
+
+        enum phy_mode mode;
 };
 
 /**
  * struct ufs_qcom_phy_specific_ops - set of pointers to functions which have a
  * specific implementation per phy. Each UFS phy, should implement
  * those functions according to its spec and requirements
- * @calibrate_phy: pointer to a function that calibrate the phy
  * @start_serdes: pointer to a function that starts the serdes
  * @is_physical_coding_sublayer_ready: pointer to a function that
  * checks pcs readiness. returns 0 for success and non-zero for error.
@@ -130,7 +132,6 @@ struct ufs_qcom_phy {
  * and writes to QSERDES_RX_SIGDET_CNTRL attribute
  */
 struct ufs_qcom_phy_specific_ops {
-        int (*calibrate_phy)(struct ufs_qcom_phy *phy, bool is_rate_B);
         void (*start_serdes)(struct ufs_qcom_phy *phy);
         int (*is_physical_coding_sublayer_ready)(struct ufs_qcom_phy *phy);
         void (*set_tx_lane_enable)(struct ufs_qcom_phy *phy, u32 val);
diff --git a/drivers/phy/qualcomm/phy-qcom-ufs-qmp-14nm.c b/drivers/phy/qualcomm/phy-qcom-ufs-qmp-14nm.c
index 12a1b498dc4b..ba1895b76a5d 100644
--- a/drivers/phy/qualcomm/phy-qcom-ufs-qmp-14nm.c
+++ b/drivers/phy/qualcomm/phy-qcom-ufs-qmp-14nm.c
@@ -44,7 +44,19 @@ void ufs_qcom_phy_qmp_14nm_advertise_quirks(struct ufs_qcom_phy *phy_common)
 
 static int ufs_qcom_phy_qmp_14nm_init(struct phy *generic_phy)
 {
-        return 0;
+        struct ufs_qcom_phy *phy_common = get_ufs_qcom_phy(generic_phy);
+        bool is_rate_B = false;
+        int ret;
+
+        if (phy_common->mode == PHY_MODE_UFS_HS_B)
+                is_rate_B = true;
+
+        ret = ufs_qcom_phy_qmp_14nm_phy_calibrate(phy_common, is_rate_B);
+        if (!ret)
+                /* phy calibrated, but yet to be started */
+                phy_common->is_started = false;
+
+        return ret;
 }
 
 static int ufs_qcom_phy_qmp_14nm_exit(struct phy *generic_phy)
@@ -53,6 +65,19 @@ static int ufs_qcom_phy_qmp_14nm_exit(struct phy *generic_phy)
 }
 
 static
+int ufs_qcom_phy_qmp_14nm_set_mode(struct phy *generic_phy, enum phy_mode mode)
+{
+        struct ufs_qcom_phy *phy_common = get_ufs_qcom_phy(generic_phy);
+
+        phy_common->mode = PHY_MODE_INVALID;
+
+        if (mode > 0)
+                phy_common->mode = mode;
+
+        return 0;
+}
+
+static
 void ufs_qcom_phy_qmp_14nm_power_control(struct ufs_qcom_phy *phy, bool val)
 {
         writel_relaxed(val ? 0x1 : 0x0, phy->mmio + UFS_PHY_POWER_DOWN_CONTROL);
@@ -102,11 +127,11 @@ static const struct phy_ops ufs_qcom_phy_qmp_14nm_phy_ops = {
         .exit           = ufs_qcom_phy_qmp_14nm_exit,
         .power_on       = ufs_qcom_phy_power_on,
         .power_off      = ufs_qcom_phy_power_off,
+        .set_mode       = ufs_qcom_phy_qmp_14nm_set_mode,
         .owner          = THIS_MODULE,
 };
 
 static struct ufs_qcom_phy_specific_ops phy_14nm_ops = {
-        .calibrate_phy          = ufs_qcom_phy_qmp_14nm_phy_calibrate,
         .start_serdes           = ufs_qcom_phy_qmp_14nm_start_serdes,
         .is_physical_coding_sublayer_ready = ufs_qcom_phy_qmp_14nm_is_pcs_ready,
         .set_tx_lane_enable     = ufs_qcom_phy_qmp_14nm_set_tx_lane_enable,
diff --git a/drivers/phy/qualcomm/phy-qcom-ufs-qmp-20nm.c b/drivers/phy/qualcomm/phy-qcom-ufs-qmp-20nm.c
index 4f68acb58b73..49f435c71147 100644
--- a/drivers/phy/qualcomm/phy-qcom-ufs-qmp-20nm.c
+++ b/drivers/phy/qualcomm/phy-qcom-ufs-qmp-20nm.c
@@ -63,7 +63,19 @@ void ufs_qcom_phy_qmp_20nm_advertise_quirks(struct ufs_qcom_phy *phy_common)
 
 static int ufs_qcom_phy_qmp_20nm_init(struct phy *generic_phy)
 {
-        return 0;
+        struct ufs_qcom_phy *phy_common = get_ufs_qcom_phy(generic_phy);
+        bool is_rate_B = false;
+        int ret;
+
+        if (phy_common->mode == PHY_MODE_UFS_HS_B)
+                is_rate_B = true;
+
+        ret = ufs_qcom_phy_qmp_20nm_phy_calibrate(phy_common, is_rate_B);
+        if (!ret)
+                /* phy calibrated, but yet to be started */
+                phy_common->is_started = false;
+
+        return ret;
 }
 
 static int ufs_qcom_phy_qmp_20nm_exit(struct phy *generic_phy)
@@ -72,6 +84,19 @@ static int ufs_qcom_phy_qmp_20nm_exit(struct phy *generic_phy)
 }
 
 static
+int ufs_qcom_phy_qmp_20nm_set_mode(struct phy *generic_phy, enum phy_mode mode)
+{
+        struct ufs_qcom_phy *phy_common = get_ufs_qcom_phy(generic_phy);
+
+        phy_common->mode = PHY_MODE_INVALID;
+
+        if (mode > 0)
+                phy_common->mode = mode;
+
+        return 0;
+}
+
+static
 void ufs_qcom_phy_qmp_20nm_power_control(struct ufs_qcom_phy *phy, bool val)
 {
         bool hibern8_exit_after_pwr_collapse = phy->quirks &
@@ -160,11 +185,11 @@ static const struct phy_ops ufs_qcom_phy_qmp_20nm_phy_ops = {
         .exit           = ufs_qcom_phy_qmp_20nm_exit,
         .power_on       = ufs_qcom_phy_power_on,
         .power_off      = ufs_qcom_phy_power_off,
+        .set_mode       = ufs_qcom_phy_qmp_20nm_set_mode,
         .owner          = THIS_MODULE,
 };
 
 static struct ufs_qcom_phy_specific_ops phy_20nm_ops = {
-        .calibrate_phy          = ufs_qcom_phy_qmp_20nm_phy_calibrate,
         .start_serdes           = ufs_qcom_phy_qmp_20nm_start_serdes,
         .is_physical_coding_sublayer_ready = ufs_qcom_phy_qmp_20nm_is_pcs_ready,
         .set_tx_lane_enable     = ufs_qcom_phy_qmp_20nm_set_tx_lane_enable,
diff --git a/drivers/phy/qualcomm/phy-qcom-ufs.c b/drivers/phy/qualcomm/phy-qcom-ufs.c
index 43865ef340e2..c5ff4525edef 100644
--- a/drivers/phy/qualcomm/phy-qcom-ufs.c
+++ b/drivers/phy/qualcomm/phy-qcom-ufs.c
@@ -518,9 +518,8 @@ void ufs_qcom_phy_disable_iface_clk(struct ufs_qcom_phy *phy)
         }
 }
 
-int ufs_qcom_phy_start_serdes(struct phy *generic_phy)
+static int ufs_qcom_phy_start_serdes(struct ufs_qcom_phy *ufs_qcom_phy)
 {
-        struct ufs_qcom_phy *ufs_qcom_phy = get_ufs_qcom_phy(generic_phy);
         int ret = 0;
 
         if (!ufs_qcom_phy->phy_spec_ops->start_serdes) {
@@ -533,7 +532,6 @@ int ufs_qcom_phy_start_serdes(struct phy *generic_phy)
 
         return ret;
 }
-EXPORT_SYMBOL_GPL(ufs_qcom_phy_start_serdes);
 
 int ufs_qcom_phy_set_tx_lane_enable(struct phy *generic_phy, u32 tx_lanes)
 {
@@ -564,31 +562,8 @@ void ufs_qcom_phy_save_controller_version(struct phy *generic_phy,
 }
 EXPORT_SYMBOL_GPL(ufs_qcom_phy_save_controller_version);
 
-int ufs_qcom_phy_calibrate_phy(struct phy *generic_phy, bool is_rate_B)
-{
-        struct ufs_qcom_phy *ufs_qcom_phy = get_ufs_qcom_phy(generic_phy);
-        int ret = 0;
-
-        if (!ufs_qcom_phy->phy_spec_ops->calibrate_phy) {
-                dev_err(ufs_qcom_phy->dev, "%s: calibrate_phy() callback is not supported\n",
-                        __func__);
-                ret = -ENOTSUPP;
-        } else {
-                ret = ufs_qcom_phy->phy_spec_ops->
-                                calibrate_phy(ufs_qcom_phy, is_rate_B);
-                if (ret)
-                        dev_err(ufs_qcom_phy->dev, "%s: calibrate_phy() failed %d\n",
-                                __func__, ret);
-        }
-
-        return ret;
-}
-EXPORT_SYMBOL_GPL(ufs_qcom_phy_calibrate_phy);
-
-int ufs_qcom_phy_is_pcs_ready(struct phy *generic_phy)
+static int ufs_qcom_phy_is_pcs_ready(struct ufs_qcom_phy *ufs_qcom_phy)
 {
-        struct ufs_qcom_phy *ufs_qcom_phy = get_ufs_qcom_phy(generic_phy);
-
         if (!ufs_qcom_phy->phy_spec_ops->is_physical_coding_sublayer_ready) {
                 dev_err(ufs_qcom_phy->dev, "%s: is_physical_coding_sublayer_ready() callback is not supported\n",
                         __func__);
@@ -598,7 +573,6 @@ int ufs_qcom_phy_is_pcs_ready(struct phy *generic_phy)
         return ufs_qcom_phy->phy_spec_ops->
                         is_physical_coding_sublayer_ready(ufs_qcom_phy);
 }
-EXPORT_SYMBOL_GPL(ufs_qcom_phy_is_pcs_ready);
 
 int ufs_qcom_phy_power_on(struct phy *generic_phy)
 {
@@ -609,6 +583,18 @@ int ufs_qcom_phy_power_on(struct phy *generic_phy)
         if (phy_common->is_powered_on)
                 return 0;
 
+        if (!phy_common->is_started) {
+                err = ufs_qcom_phy_start_serdes(phy_common);
+                if (err)
+                        return err;
+
+                err = ufs_qcom_phy_is_pcs_ready(phy_common);
+                if (err)
+                        return err;
+
+                phy_common->is_started = true;
+        }
+
         err = ufs_qcom_phy_enable_vreg(dev, &phy_common->vdda_phy);
         if (err) {
                 dev_err(dev, "%s enable vdda_phy failed, err=%d\n",
diff --git a/drivers/phy/renesas/phy-rcar-gen3-usb2.c b/drivers/phy/renesas/phy-rcar-gen3-usb2.c
index 54c34298a000..9c90e7d67e0a 100644
--- a/drivers/phy/renesas/phy-rcar-gen3-usb2.c
+++ b/drivers/phy/renesas/phy-rcar-gen3-usb2.c
@@ -1,7 +1,7 @@
 /*
  * Renesas R-Car Gen3 for USB2.0 PHY driver
  *
- * Copyright (C) 2015 Renesas Electronics Corporation
+ * Copyright (C) 2015-2017 Renesas Electronics Corporation
  *
  * This is based on the phy-rcar-gen2 driver:
  * Copyright (C) 2014 Renesas Solutions Corp.
@@ -12,16 +12,18 @@
  * published by the Free Software Foundation.
  */
 
-#include <linux/extcon.h>
+#include <linux/extcon-provider.h>
 #include <linux/interrupt.h>
 #include <linux/io.h>
 #include <linux/module.h>
 #include <linux/of.h>
 #include <linux/of_address.h>
+#include <linux/of_device.h>
 #include <linux/phy/phy.h>
 #include <linux/platform_device.h>
 #include <linux/pm_runtime.h>
 #include <linux/regulator/consumer.h>
+#include <linux/usb/of.h>
 #include <linux/workqueue.h>
 
 /******* USB2.0 Host registers (original offset is +0x200) *******/
@@ -79,6 +81,8 @@
 #define USB2_ADPCTRL_IDPULLUP           BIT(5)  /* 1 = ID sampling is enabled */
 #define USB2_ADPCTRL_DRVVBUS            BIT(4)
 
+#define RCAR_GEN3_PHY_HAS_DEDICATED_PINS        1
+
 struct rcar_gen3_chan {
         void __iomem *base;
         struct extcon_dev *extcon;
@@ -86,7 +90,7 @@ struct rcar_gen3_chan {
         struct regulator *vbus;
         struct work_struct work;
         bool extcon_host;
-        bool has_otg;
+        bool has_otg_pins;
 };
 
 static void rcar_gen3_phy_usb2_work(struct work_struct *work)
@@ -218,33 +222,40 @@ static bool rcar_gen3_is_host(struct rcar_gen3_chan *ch)
         return !(readl(ch->base + USB2_COMMCTRL) & USB2_COMMCTRL_OTG_PERI);
 }
 
+static enum phy_mode rcar_gen3_get_phy_mode(struct rcar_gen3_chan *ch)
+{
+        if (rcar_gen3_is_host(ch))
+                return PHY_MODE_USB_HOST;
+
+        return PHY_MODE_USB_DEVICE;
+}
+
 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;
+        bool is_b_device;
+        enum phy_mode cur_mode, new_mode;
 
-        if (!ch->has_otg || !ch->phy->init_count)
+        if (!ch->has_otg_pins || !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;
+                new_mode = PHY_MODE_USB_HOST;
         else if (!strncmp(buf, "peripheral", strlen("peripheral")))
-                new_mode_is_host = false;
+                new_mode = PHY_MODE_USB_DEVICE;
         else
                 return -EINVAL;
 
+        /* is_b_device: true is B-Device. false is A-Device. */
+        is_b_device = rcar_gen3_check_id(ch);
+        cur_mode = rcar_gen3_get_phy_mode(ch);
+
         /* If current and new mode is the same, this returns the error */
-        if (is_host == new_mode_is_host)
+        if (cur_mode == new_mode)
                 return -EINVAL;
 
-        if (new_mode_is_host) {         /* And is_host must be false */
+        if (new_mode == PHY_MODE_USB_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 */
@@ -264,7 +275,7 @@ static ssize_t role_show(struct device *dev, struct device_attribute *attr,
 {
         struct rcar_gen3_chan *ch = dev_get_drvdata(dev);
 
-        if (!ch->has_otg || !ch->phy->init_count)
+        if (!ch->has_otg_pins || !ch->phy->init_count)
                 return -EIO;
 
         return sprintf(buf, "%s\n", rcar_gen3_is_host(ch) ? "host" :
@@ -303,7 +314,7 @@ static int rcar_gen3_phy_usb2_init(struct phy *p)
         writel(USB2_OC_TIMSET_INIT, usb2_base + USB2_OC_TIMSET);
 
         /* Initialize otg part */
-        if (channel->has_otg)
+        if (channel->has_otg_pins)
                 rcar_gen3_init_otg(channel);
 
         return 0;
@@ -377,9 +388,17 @@ static irqreturn_t rcar_gen3_phy_usb2_irq(int irq, void *_ch)
 }
 
 static const struct of_device_id rcar_gen3_phy_usb2_match_table[] = {
-        { .compatible = "renesas,usb2-phy-r8a7795" },
-        { .compatible = "renesas,usb2-phy-r8a7796" },
-        { .compatible = "renesas,rcar-gen3-usb2-phy" },
+        {
+                .compatible = "renesas,usb2-phy-r8a7795",
+                .data = (void *)RCAR_GEN3_PHY_HAS_DEDICATED_PINS,
+        },
+        {
+                .compatible = "renesas,usb2-phy-r8a7796",
+                .data = (void *)RCAR_GEN3_PHY_HAS_DEDICATED_PINS,
+        },
+        {
+                .compatible = "renesas,rcar-gen3-usb2-phy",
+        },
         { }
 };
 MODULE_DEVICE_TABLE(of, rcar_gen3_phy_usb2_match_table);
@@ -415,14 +434,17 @@ static int rcar_gen3_phy_usb2_probe(struct platform_device *pdev)
         /* call request_irq for OTG */
         irq = platform_get_irq(pdev, 0);
         if (irq >= 0) {
-                int ret;
-
                 INIT_WORK(&channel->work, rcar_gen3_phy_usb2_work);
                 irq = devm_request_irq(dev, irq, rcar_gen3_phy_usb2_irq,
                                        IRQF_SHARED, dev_name(dev), channel);
                 if (irq < 0)
                         dev_err(dev, "No irq handler (%d)\n", irq);
-                channel->has_otg = true;
+        }
+
+        if (of_usb_get_dr_mode_by_phy(dev->of_node, 0) == USB_DR_MODE_OTG) {
+                int ret;
+
+                channel->has_otg_pins = (uintptr_t)of_device_get_match_data(dev);
                 channel->extcon = devm_extcon_dev_allocate(dev,
                                                         rcar_gen3_phy_cable);
                 if (IS_ERR(channel->extcon))
@@ -464,7 +486,7 @@ static int rcar_gen3_phy_usb2_probe(struct platform_device *pdev)
                 dev_err(dev, "Failed to register PHY provider\n");
                 ret = PTR_ERR(provider);
                 goto error;
-        } else if (channel->has_otg) {
+        } else if (channel->has_otg_pins) {
                 int ret;
 
                 ret = device_create_file(dev, &dev_attr_role);
@@ -484,7 +506,7 @@ static int rcar_gen3_phy_usb2_remove(struct platform_device *pdev)
 {
         struct rcar_gen3_chan *channel = platform_get_drvdata(pdev);
 
-        if (channel->has_otg)
+        if (channel->has_otg_pins)
                 device_remove_file(&pdev->dev, &dev_attr_role);
 
         pm_runtime_disable(&pdev->dev);
diff --git a/drivers/phy/rockchip/phy-rockchip-inno-usb2.c b/drivers/phy/rockchip/phy-rockchip-inno-usb2.c
index ee7ce5ee53f9..5049dac79bd0 100644
--- a/drivers/phy/rockchip/phy-rockchip-inno-usb2.c
+++ b/drivers/phy/rockchip/phy-rockchip-inno-usb2.c
@@ -17,7 +17,7 @@
 #include <linux/clk.h>
 #include <linux/clk-provider.h>
 #include <linux/delay.h>
-#include <linux/extcon.h>
+#include <linux/extcon-provider.h>
 #include <linux/interrupt.h>
 #include <linux/io.h>
 #include <linux/gpio/consumer.h>
diff --git a/drivers/phy/rockchip/phy-rockchip-typec.c b/drivers/phy/rockchip/phy-rockchip-typec.c
index a958c9bced01..ee85fa0ca4b0 100644
--- a/drivers/phy/rockchip/phy-rockchip-typec.c
+++ b/drivers/phy/rockchip/phy-rockchip-typec.c
@@ -102,9 +102,40 @@
 #define CMN_PLL1_SS_CTRL1               (0xb8 << 2)
 #define CMN_PLL1_SS_CTRL2               (0xb9 << 2)
 #define CMN_RXCAL_OVRD                  (0xd1 << 2)
+
 #define CMN_TXPUCAL_CTRL                (0xe0 << 2)
 #define CMN_TXPUCAL_OVRD                (0xe1 << 2)
+#define CMN_TXPDCAL_CTRL                (0xf0 << 2)
 #define CMN_TXPDCAL_OVRD                (0xf1 << 2)
+
+/* For CMN_TXPUCAL_CTRL, CMN_TXPDCAL_CTRL */
+#define CMN_TXPXCAL_START               BIT(15)
+#define CMN_TXPXCAL_DONE                BIT(14)
+#define CMN_TXPXCAL_NO_RESPONSE         BIT(13)
+#define CMN_TXPXCAL_CURRENT_RESPONSE    BIT(12)
+
+#define CMN_TXPU_ADJ_CTRL               (0x108 << 2)
+#define CMN_TXPD_ADJ_CTRL               (0x10c << 2)
+
+/*
+ * For CMN_TXPUCAL_CTRL, CMN_TXPDCAL_CTRL,
+ *     CMN_TXPU_ADJ_CTRL, CMN_TXPDCAL_CTRL
+ *
+ * NOTE: some of these registers are documented to be 2's complement
+ * signed numbers, but then documented to be always positive.  Weird.
+ * In such a case, using CMN_CALIB_CODE_POS() avoids the unnecessary
+ * sign extension.
+ */
+#define CMN_CALIB_CODE_WIDTH    7
+#define CMN_CALIB_CODE_OFFSET   0
+#define CMN_CALIB_CODE_MASK     GENMASK(CMN_CALIB_CODE_WIDTH, 0)
+#define CMN_CALIB_CODE(x)       \
+        sign_extend32((x) >> CMN_CALIB_CODE_OFFSET, CMN_CALIB_CODE_WIDTH)
+
+#define CMN_CALIB_CODE_POS_MASK GENMASK(CMN_CALIB_CODE_WIDTH - 1, 0)
+#define CMN_CALIB_CODE_POS(x)   \
+        (((x) >> CMN_CALIB_CODE_OFFSET) & CMN_CALIB_CODE_POS_MASK)
+
 #define CMN_DIAG_PLL0_FBH_OVRD          (0x1c0 << 2)
 #define CMN_DIAG_PLL0_FBL_OVRD          (0x1c1 << 2)
 #define CMN_DIAG_PLL0_OVRD              (0x1c2 << 2)
@@ -138,6 +169,15 @@
 #define TX_TXCC_MGNFS_MULT_101(n)       ((0x4055 | ((n) << 9)) << 2)
 #define TX_TXCC_MGNFS_MULT_110(n)       ((0x4056 | ((n) << 9)) << 2)
 #define TX_TXCC_MGNFS_MULT_111(n)       ((0x4057 | ((n) << 9)) << 2)
+#define TX_TXCC_MGNLS_MULT_000(n)       ((0x4058 | ((n) << 9)) << 2)
+#define TX_TXCC_MGNLS_MULT_001(n)       ((0x4059 | ((n) << 9)) << 2)
+#define TX_TXCC_MGNLS_MULT_010(n)       ((0x405a | ((n) << 9)) << 2)
+#define TX_TXCC_MGNLS_MULT_011(n)       ((0x405b | ((n) << 9)) << 2)
+#define TX_TXCC_MGNLS_MULT_100(n)       ((0x405c | ((n) << 9)) << 2)
+#define TX_TXCC_MGNLS_MULT_101(n)       ((0x405d | ((n) << 9)) << 2)
+#define TX_TXCC_MGNLS_MULT_110(n)       ((0x405e | ((n) << 9)) << 2)
+#define TX_TXCC_MGNLS_MULT_111(n)       ((0x405f | ((n) << 9)) << 2)
+
 #define XCVR_DIAG_PLLDRC_CTRL(n)        ((0x40e0 | ((n) << 9)) << 2)
 #define XCVR_DIAG_BIDI_CTRL(n)          ((0x40e8 | ((n) << 9)) << 2)
 #define XCVR_DIAG_LANE_FCM_EN_MGN(n)    ((0x40f2 | ((n) << 9)) << 2)
@@ -150,10 +190,63 @@
 #define TX_RCVDET_ST_TMR(n)             ((0x4123 | ((n) << 9)) << 2)
 #define TX_DIAG_TX_DRV(n)               ((0x41e1 | ((n) << 9)) << 2)
 #define TX_DIAG_BGREF_PREDRV_DELAY      (0x41e7 << 2)
+
+/* Use this for "n" in macros like "_MULT_XXX" to target the aux channel */
+#define AUX_CH_LANE                     8
+
 #define TX_ANA_CTRL_REG_1               (0x5020 << 2)
+
+#define TXDA_DP_AUX_EN                  BIT(15)
+#define AUXDA_SE_EN                     BIT(14)
+#define TXDA_CAL_LATCH_EN               BIT(13)
+#define AUXDA_POLARITY                  BIT(12)
+#define TXDA_DRV_POWER_ISOLATION_EN     BIT(11)
+#define TXDA_DRV_POWER_EN_PH_2_N        BIT(10)
+#define TXDA_DRV_POWER_EN_PH_1_N        BIT(9)
+#define TXDA_BGREF_EN                   BIT(8)
+#define TXDA_DRV_LDO_EN                 BIT(7)
+#define TXDA_DECAP_EN_DEL               BIT(6)
+#define TXDA_DECAP_EN                   BIT(5)
+#define TXDA_UPHY_SUPPLY_EN_DEL         BIT(4)
+#define TXDA_UPHY_SUPPLY_EN             BIT(3)
+#define TXDA_LOW_LEAKAGE_EN             BIT(2)
+#define TXDA_DRV_IDLE_LOWI_EN           BIT(1)
+#define TXDA_DRV_CMN_MODE_EN            BIT(0)
+
 #define TX_ANA_CTRL_REG_2               (0x5021 << 2)
+
+#define AUXDA_DEBOUNCING_CLK            BIT(15)
+#define TXDA_LPBK_RECOVERED_CLK_EN      BIT(14)
+#define TXDA_LPBK_ISI_GEN_EN            BIT(13)
+#define TXDA_LPBK_SERIAL_EN             BIT(12)
+#define TXDA_LPBK_LINE_EN               BIT(11)
+#define TXDA_DRV_LDO_REDC_SINKIQ        BIT(10)
+#define XCVR_DECAP_EN_DEL               BIT(9)
+#define XCVR_DECAP_EN                   BIT(8)
+#define TXDA_MPHY_ENABLE_HS_NT          BIT(7)
+#define TXDA_MPHY_SA_MODE               BIT(6)
+#define TXDA_DRV_LDO_RBYR_FB_EN         BIT(5)
+#define TXDA_DRV_RST_PULL_DOWN          BIT(4)
+#define TXDA_DRV_LDO_BG_FB_EN           BIT(3)
+#define TXDA_DRV_LDO_BG_REF_EN          BIT(2)
+#define TXDA_DRV_PREDRV_EN_DEL          BIT(1)
+#define TXDA_DRV_PREDRV_EN              BIT(0)
+
 #define TXDA_COEFF_CALC_CTRL            (0x5022 << 2)
+
+#define TX_HIGH_Z                       BIT(6)
+#define TX_VMARGIN_OFFSET               3
+#define TX_VMARGIN_MASK                 0x7
+#define LOW_POWER_SWING_EN              BIT(2)
+#define TX_FCM_DRV_MAIN_EN              BIT(1)
+#define TX_FCM_FULL_MARGIN              BIT(0)
+
 #define TX_DIG_CTRL_REG_2               (0x5024 << 2)
+
+#define TX_HIGH_Z_TM_EN                 BIT(15)
+#define TX_RESCAL_CODE_OFFSET           0
+#define TX_RESCAL_CODE_MASK             0x3f
+
 #define TXDA_CYA_AUXDA_CYA              (0x5025 << 2)
 #define TX_ANA_CTRL_REG_3               (0x5026 << 2)
 #define TX_ANA_CTRL_REG_4               (0x5027 << 2)
@@ -456,54 +549,72 @@ static void tcphy_dp_aux_set_flip(struct rockchip_typec_phy *tcphy)
          */
         tx_ana_ctrl_reg_1 = readl(tcphy->base + TX_ANA_CTRL_REG_1);
         if (!tcphy->flip)
-                tx_ana_ctrl_reg_1 |= BIT(12);
+                tx_ana_ctrl_reg_1 |= AUXDA_POLARITY;
         else
-                tx_ana_ctrl_reg_1 &= ~BIT(12);
+                tx_ana_ctrl_reg_1 &= ~AUXDA_POLARITY;
         writel(tx_ana_ctrl_reg_1, tcphy->base + TX_ANA_CTRL_REG_1);
 }
 
 static void tcphy_dp_aux_calibration(struct rockchip_typec_phy *tcphy)
 {
+        u16 val;
         u16 tx_ana_ctrl_reg_1;
-        u16 rdata, rdata2, val;
-
-        /* disable txda_cal_latch_en for rewrite the calibration values */
-        tx_ana_ctrl_reg_1 = readl(tcphy->base + TX_ANA_CTRL_REG_1);
-        tx_ana_ctrl_reg_1 &= ~BIT(13);
-        writel(tx_ana_ctrl_reg_1, tcphy->base + TX_ANA_CTRL_REG_1);
+        u16 tx_ana_ctrl_reg_2;
+        s32 pu_calib_code, pd_calib_code;
+        s32 pu_adj, pd_adj;
+        u16 calib;
 
         /*
-         * read a resistor calibration code from CMN_TXPUCAL_CTRL[6:0] and
-         * write it to TX_DIG_CTRL_REG_2[6:0], and delay 1ms to make sure it
-         * works.
+         * Calculate calibration code as per docs: use an average of the
+         * pull down and pull up.  Then add in adjustments.
          */
-        rdata = readl(tcphy->base + TX_DIG_CTRL_REG_2);
-        rdata = rdata & 0xffc0;
+        val = readl(tcphy->base + CMN_TXPUCAL_CTRL);
+        pu_calib_code = CMN_CALIB_CODE_POS(val);
+        val = readl(tcphy->base + CMN_TXPDCAL_CTRL);
+        pd_calib_code = CMN_CALIB_CODE_POS(val);
+        val = readl(tcphy->base + CMN_TXPU_ADJ_CTRL);
+        pu_adj = CMN_CALIB_CODE(val);
+        val = readl(tcphy->base + CMN_TXPD_ADJ_CTRL);
+        pd_adj = CMN_CALIB_CODE(val);
+        calib = (pu_calib_code + pd_calib_code) / 2 + pu_adj + pd_adj;
 
-        rdata2 = readl(tcphy->base + CMN_TXPUCAL_CTRL);
-        rdata2 = rdata2 & 0x3f;
+        /* disable txda_cal_latch_en for rewrite the calibration values */
+        tx_ana_ctrl_reg_1 = readl(tcphy->base + TX_ANA_CTRL_REG_1);
+        tx_ana_ctrl_reg_1 &= ~TXDA_CAL_LATCH_EN;
+        writel(tx_ana_ctrl_reg_1, tcphy->base + TX_ANA_CTRL_REG_1);
 
-        val = rdata | rdata2;
+        /* write the calibration, then delay 10 ms as sample in docs */
+        val = readl(tcphy->base + TX_DIG_CTRL_REG_2);
+        val &= ~(TX_RESCAL_CODE_MASK << TX_RESCAL_CODE_OFFSET);
+        val |= calib << TX_RESCAL_CODE_OFFSET;
         writel(val, tcphy->base + TX_DIG_CTRL_REG_2);
-        usleep_range(1000, 1050);
+        usleep_range(10000, 10050);
 
         /*
          * Enable signal for latch that sample and holds calibration values.
          * Activate this signal for 1 clock cycle to sample new calibration
          * values.
          */
-        tx_ana_ctrl_reg_1 |= BIT(13);
+        tx_ana_ctrl_reg_1 |= TXDA_CAL_LATCH_EN;
         writel(tx_ana_ctrl_reg_1, tcphy->base + TX_ANA_CTRL_REG_1);
         usleep_range(150, 200);
 
         /* set TX Voltage Level and TX Deemphasis to 0 */
         writel(0, tcphy->base + PHY_DP_TX_CTL);
+
         /* re-enable decap */
-        writel(0x100, tcphy->base + TX_ANA_CTRL_REG_2);
-        writel(0x300, tcphy->base + TX_ANA_CTRL_REG_2);
-        tx_ana_ctrl_reg_1 |= BIT(3);
+        tx_ana_ctrl_reg_2 = XCVR_DECAP_EN;
+        writel(tx_ana_ctrl_reg_2, tcphy->base + TX_ANA_CTRL_REG_2);
+        udelay(1);
+        tx_ana_ctrl_reg_2 |= XCVR_DECAP_EN_DEL;
+        writel(tx_ana_ctrl_reg_2, tcphy->base + TX_ANA_CTRL_REG_2);
+
+        writel(0, tcphy->base + TX_ANA_CTRL_REG_3);
+
+        tx_ana_ctrl_reg_1 |= TXDA_UPHY_SUPPLY_EN;
         writel(tx_ana_ctrl_reg_1, tcphy->base + TX_ANA_CTRL_REG_1);
-        tx_ana_ctrl_reg_1 |= BIT(4);
+        udelay(1);
+        tx_ana_ctrl_reg_1 |= TXDA_UPHY_SUPPLY_EN_DEL;
         writel(tx_ana_ctrl_reg_1, tcphy->base + TX_ANA_CTRL_REG_1);
 
         writel(0, tcphy->base + TX_ANA_CTRL_REG_5);
@@ -515,44 +626,66 @@ static void tcphy_dp_aux_calibration(struct rockchip_typec_phy *tcphy)
         writel(0x1001, tcphy->base + TX_ANA_CTRL_REG_4);
 
         /* re-enables Bandgap reference for LDO */
-        tx_ana_ctrl_reg_1 |= BIT(7);
+        tx_ana_ctrl_reg_1 |= TXDA_DRV_LDO_EN;
         writel(tx_ana_ctrl_reg_1, tcphy->base + TX_ANA_CTRL_REG_1);
-        tx_ana_ctrl_reg_1 |= BIT(8);
+        udelay(5);
+        tx_ana_ctrl_reg_1 |= TXDA_BGREF_EN;
         writel(tx_ana_ctrl_reg_1, tcphy->base + TX_ANA_CTRL_REG_1);
 
         /*
          * re-enables the transmitter pre-driver, driver data selection MUX,
          * and receiver detect circuits.
          */
-        writel(0x301, tcphy->base + TX_ANA_CTRL_REG_2);
-        writel(0x303, tcphy->base + TX_ANA_CTRL_REG_2);
+        tx_ana_ctrl_reg_2 |= TXDA_DRV_PREDRV_EN;
+        writel(tx_ana_ctrl_reg_2, tcphy->base + TX_ANA_CTRL_REG_2);
+        udelay(1);
+        tx_ana_ctrl_reg_2 |= TXDA_DRV_PREDRV_EN_DEL;
+        writel(tx_ana_ctrl_reg_2, tcphy->base + TX_ANA_CTRL_REG_2);
 
         /*
-         * Do some magic undocumented stuff, some of which appears to
-         * undo the "re-enables Bandgap reference for LDO" above.
+         * Do all the undocumented magic:
+         * - Turn on TXDA_DP_AUX_EN, whatever that is, even though sample
+         *   never shows this going on.
+         * - Turn on TXDA_DECAP_EN (and TXDA_DECAP_EN_DEL) even though
+         *   docs say for aux it's always 0.
+         * - Turn off the LDO and BGREF, which we just spent time turning
+         *   on above (???).
+         *
+         * Without this magic, things seem worse.
          */
-        tx_ana_ctrl_reg_1 |=  BIT(15);
-        tx_ana_ctrl_reg_1 &= ~BIT(8);
-        tx_ana_ctrl_reg_1 &= ~BIT(7);
-        tx_ana_ctrl_reg_1 |=  BIT(6);
-        tx_ana_ctrl_reg_1 |=  BIT(5);
+        tx_ana_ctrl_reg_1 |= TXDA_DP_AUX_EN;
+        tx_ana_ctrl_reg_1 |= TXDA_DECAP_EN;
+        tx_ana_ctrl_reg_1 &= ~TXDA_DRV_LDO_EN;
+        tx_ana_ctrl_reg_1 &= ~TXDA_BGREF_EN;
+        writel(tx_ana_ctrl_reg_1, tcphy->base + TX_ANA_CTRL_REG_1);
+        udelay(1);
+        tx_ana_ctrl_reg_1 |= TXDA_DECAP_EN_DEL;
         writel(tx_ana_ctrl_reg_1, tcphy->base + TX_ANA_CTRL_REG_1);
-
-        writel(0, tcphy->base + TX_ANA_CTRL_REG_3);
-        writel(0, tcphy->base + TX_ANA_CTRL_REG_4);
-        writel(0, tcphy->base + TX_ANA_CTRL_REG_5);
 
         /*
-         * Controls low_power_swing_en, don't set the voltage swing of the
-         * driver to 400mv. The values below are peak to peak (differential)
-         * values.
+         * Undo the work we did to set the LDO voltage.
+         * This doesn't seem to help nor hurt, but it kinda goes with the
+         * undocumented magic above.
          */
+        writel(0, tcphy->base + TX_ANA_CTRL_REG_4);
+
+        /* Don't set voltage swing to 400 mV peak to peak (differential) */
         writel(0, tcphy->base + TXDA_COEFF_CALC_CTRL);
+
+        /* Init TXDA_CYA_AUXDA_CYA for unknown magic reasons */
         writel(0, tcphy->base + TXDA_CYA_AUXDA_CYA);
 
-        /* Controls tx_high_z_tm_en */
+        /*
+         * More undocumented magic, presumably the goal of which is to
+         * make the "auxda_source_aux_oen" be ignored and instead to decide
+         * about "high impedance state" based on what software puts in the
+         * register TXDA_COEFF_CALC_CTRL (see TX_HIGH_Z).  Since we only
+         * program that register once and we don't set the bit TX_HIGH_Z,
+         * presumably the goal here is that we should never put the analog
+         * driver in high impedance state.
+         */
         val = readl(tcphy->base + TX_DIG_CTRL_REG_2);
-        val |= BIT(15);
+        val |= TX_HIGH_Z_TM_EN;
         writel(val, tcphy->base + TX_DIG_CTRL_REG_2);
 }
 
diff --git a/drivers/phy/ti/phy-ti-pipe3.c b/drivers/phy/ti/phy-ti-pipe3.c
index 0e564f32749f..68ce4a082b9b 100644
--- a/drivers/phy/ti/phy-ti-pipe3.c
+++ b/drivers/phy/ti/phy-ti-pipe3.c
@@ -68,6 +68,40 @@
 #define PCIE_PCS_MASK                   0xFF0000
 #define PCIE_PCS_DELAY_COUNT_SHIFT      0x10
 
+#define PCIEPHYRX_ANA_PROGRAMMABILITY   0x0000000C
+#define INTERFACE_MASK                  GENMASK(31, 27)
+#define INTERFACE_SHIFT                 27
+#define LOSD_MASK                       GENMASK(17, 14)
+#define LOSD_SHIFT                      14
+#define MEM_PLLDIV                      GENMASK(6, 5)
+
+#define PCIEPHYRX_TRIM                  0x0000001C
+#define MEM_DLL_TRIM_SEL                GENMASK(31, 30)
+#define MEM_DLL_TRIM_SHIFT              30
+
+#define PCIEPHYRX_DLL                   0x00000024
+#define MEM_DLL_PHINT_RATE              GENMASK(31, 30)
+
+#define PCIEPHYRX_DIGITAL_MODES         0x00000028
+#define MEM_CDR_FASTLOCK                BIT(23)
+#define MEM_CDR_LBW                     GENMASK(22, 21)
+#define MEM_CDR_STEPCNT                 GENMASK(20, 19)
+#define MEM_CDR_STL_MASK                GENMASK(18, 16)
+#define MEM_CDR_STL_SHIFT               16
+#define MEM_CDR_THR_MASK                GENMASK(15, 13)
+#define MEM_CDR_THR_SHIFT               13
+#define MEM_CDR_THR_MODE                BIT(12)
+#define MEM_CDR_CDR_2NDO_SDM_MODE       BIT(11)
+#define MEM_OVRD_HS_RATE                BIT(26)
+
+#define PCIEPHYRX_EQUALIZER             0x00000038
+#define MEM_EQLEV                       GENMASK(31, 16)
+#define MEM_EQFTC                       GENMASK(15, 11)
+#define MEM_EQCTL                       GENMASK(10, 7)
+#define MEM_EQCTL_SHIFT                 7
+#define MEM_OVRD_EQLEV                  BIT(2)
+#define MEM_OVRD_EQFTC                  BIT(1)
+
 /*
  * This is an Empirical value that works, need to confirm the actual
  * value required for the PIPE3PHY_PLL_CONFIGURATION2.PLL_IDLE status
@@ -91,6 +125,8 @@ struct pipe3_dpll_map {
 
 struct ti_pipe3 {
         void __iomem            *pll_ctrl_base;
+        void __iomem            *phy_rx;
+        void __iomem            *phy_tx;
         struct device           *dev;
         struct device           *control_dev;
         struct clk              *wkupclk;
@@ -261,6 +297,37 @@ static int ti_pipe3_dpll_program(struct ti_pipe3 *phy)
         return ti_pipe3_dpll_wait_lock(phy);
 }
 
+static void ti_pipe3_calibrate(struct ti_pipe3 *phy)
+{
+        u32 val;
+
+        val = ti_pipe3_readl(phy->phy_rx, PCIEPHYRX_ANA_PROGRAMMABILITY);
+        val &= ~(INTERFACE_MASK | LOSD_MASK | MEM_PLLDIV);
+        val = (0x1 << INTERFACE_SHIFT | 0xA << LOSD_SHIFT);
+        ti_pipe3_writel(phy->phy_rx, PCIEPHYRX_ANA_PROGRAMMABILITY, val);
+
+        val = ti_pipe3_readl(phy->phy_rx, PCIEPHYRX_DIGITAL_MODES);
+        val &= ~(MEM_CDR_STEPCNT | MEM_CDR_STL_MASK | MEM_CDR_THR_MASK |
+                 MEM_CDR_CDR_2NDO_SDM_MODE | MEM_OVRD_HS_RATE);
+        val |= (MEM_CDR_FASTLOCK | MEM_CDR_LBW | 0x3 << MEM_CDR_STL_SHIFT |
+                0x1 << MEM_CDR_THR_SHIFT | MEM_CDR_THR_MODE);
+        ti_pipe3_writel(phy->phy_rx, PCIEPHYRX_DIGITAL_MODES, val);
+
+        val = ti_pipe3_readl(phy->phy_rx, PCIEPHYRX_TRIM);
+        val &= ~MEM_DLL_TRIM_SEL;
+        val |= 0x2 << MEM_DLL_TRIM_SHIFT;
+        ti_pipe3_writel(phy->phy_rx, PCIEPHYRX_TRIM, val);
+
+        val = ti_pipe3_readl(phy->phy_rx, PCIEPHYRX_DLL);
+        val |= MEM_DLL_PHINT_RATE;
+        ti_pipe3_writel(phy->phy_rx, PCIEPHYRX_DLL, val);
+
+        val = ti_pipe3_readl(phy->phy_rx, PCIEPHYRX_EQUALIZER);
+        val &= ~(MEM_EQLEV | MEM_EQCTL | MEM_OVRD_EQLEV | MEM_OVRD_EQFTC);
+        val |= MEM_EQFTC | 0x1 << MEM_EQCTL_SHIFT;
+        ti_pipe3_writel(phy->phy_rx, PCIEPHYRX_EQUALIZER, val);
+}
+
 static int ti_pipe3_init(struct phy *x)
 {
         struct ti_pipe3 *phy = phy_get_drvdata(x);
@@ -282,7 +349,12 @@ static int ti_pipe3_init(struct phy *x)
                 val = 0x96 << OMAP_CTRL_PCIE_PCS_DELAY_COUNT_SHIFT;
                 ret = regmap_update_bits(phy->pcs_syscon, phy->pcie_pcs_reg,
                                          PCIE_PCS_MASK, val);
-                return ret;
+                if (ret)
+                        return ret;
+
+                ti_pipe3_calibrate(phy);
+
+                return 0;
         }
 
         /* Bring it out of IDLE if it is IDLE */
@@ -513,6 +585,29 @@ static int ti_pipe3_get_sysctrl(struct ti_pipe3 *phy)
         return 0;
 }
 
+static int ti_pipe3_get_tx_rx_base(struct ti_pipe3 *phy)
+{
+        struct resource *res;
+        struct device *dev = phy->dev;
+        struct device_node *node = dev->of_node;
+        struct platform_device *pdev = to_platform_device(dev);
+
+        if (!of_device_is_compatible(node, "ti,phy-pipe3-pcie"))
+                return 0;
+
+        res = platform_get_resource_byname(pdev, IORESOURCE_MEM,
+                                           "phy_rx");
+        phy->phy_rx = devm_ioremap_resource(dev, res);
+        if (IS_ERR(phy->phy_rx))
+                return PTR_ERR(phy->phy_rx);
+
+        res = platform_get_resource_byname(pdev, IORESOURCE_MEM,
+                                           "phy_tx");
+        phy->phy_tx = devm_ioremap_resource(dev, res);
+
+        return PTR_ERR_OR_ZERO(phy->phy_tx);
+}
+
 static int ti_pipe3_get_pll_base(struct ti_pipe3 *phy)
 {
         struct resource *res;
@@ -559,6 +654,10 @@ static int ti_pipe3_probe(struct platform_device *pdev)
         if (ret)
                 return ret;
 
+        ret = ti_pipe3_get_tx_rx_base(phy);
+        if (ret)
+                return ret;
+
         ret = ti_pipe3_get_sysctrl(phy);
         if (ret)
                 return ret;
diff --git a/drivers/power/supply/qcom_smbb.c b/drivers/power/supply/qcom_smbb.c
index f6a0d245731d..11de691b9a71 100644
--- a/drivers/power/supply/qcom_smbb.c
+++ b/drivers/power/supply/qcom_smbb.c
@@ -34,7 +34,7 @@
 #include <linux/power_supply.h>
 #include <linux/regmap.h>
 #include <linux/slab.h>
-#include <linux/extcon.h>
+#include <linux/extcon-provider.h>
 #include <linux/regulator/driver.h>
 
 #define SMBB_CHG_VMAX           0x040
diff --git a/drivers/scsi/ufs/ufs-qcom.c b/drivers/scsi/ufs/ufs-qcom.c
index c87d770b519a..890eafeb8ad4 100644
--- a/drivers/scsi/ufs/ufs-qcom.c
+++ b/drivers/scsi/ufs/ufs-qcom.c
@@ -273,15 +273,18 @@ static int ufs_qcom_power_up_sequence(struct ufs_hba *hba)
         bool is_rate_B = (UFS_QCOM_LIMIT_HS_RATE == PA_HS_MODE_B)
                                                         ? true : false;
 
+        if (is_rate_B)
+                phy_set_mode(phy, PHY_MODE_UFS_HS_B);
+
         /* Assert PHY reset and apply PHY calibration values */
         ufs_qcom_assert_reset(hba);
         /* provide 1ms delay to let the reset pulse propagate */
         usleep_range(1000, 1100);
 
-        ret = ufs_qcom_phy_calibrate_phy(phy, is_rate_B);
-
+        /* phy initialization - calibrate the phy */
+        ret = phy_init(phy);
         if (ret) {
-                dev_err(hba->dev, "%s: ufs_qcom_phy_calibrate_phy() failed, ret = %d\n",
+                dev_err(hba->dev, "%s: phy init failed, ret = %d\n",
                         __func__, ret);
                 goto out;
         }
@@ -294,21 +297,22 @@ static int ufs_qcom_power_up_sequence(struct ufs_hba *hba)
          * voltage, current to settle down before starting serdes.
          */
         usleep_range(1000, 1100);
-        ret = ufs_qcom_phy_start_serdes(phy);
+
+        /* power on phy - start serdes and phy's power and clocks */
+        ret = phy_power_on(phy);
         if (ret) {
-                dev_err(hba->dev, "%s: ufs_qcom_phy_start_serdes() failed, ret = %d\n",
+                dev_err(hba->dev, "%s: phy power on failed, ret = %d\n",
                         __func__, ret);
-                goto out;
+                goto out_disable_phy;
         }
 
-        ret = ufs_qcom_phy_is_pcs_ready(phy);
-        if (ret)
-                dev_err(hba->dev,
-                        "%s: is_physical_coding_sublayer_ready() failed, ret = %d\n",
-                        __func__, ret);
-
         ufs_qcom_select_unipro_mode(host);
 
+        return 0;
+
+out_disable_phy:
+        ufs_qcom_assert_reset(hba);
+        phy_exit(phy);
 out:
         return ret;
 }
@@ -1273,14 +1277,9 @@ static int ufs_qcom_init(struct ufs_hba *hba)
         ufs_qcom_phy_save_controller_version(host->generic_phy,
                 host->hw_ver.major, host->hw_ver.minor, host->hw_ver.step);
 
-        phy_init(host->generic_phy);
-        err = phy_power_on(host->generic_phy);
-        if (err)
-                goto out_unregister_bus;
-
         err = ufs_qcom_init_lane_clks(host);
         if (err)
-                goto out_disable_phy;
+                goto out_variant_clear;
 
         ufs_qcom_set_caps(hba);
         ufs_qcom_advertise_quirks(hba);
@@ -1301,10 +1300,6 @@ static int ufs_qcom_init(struct ufs_hba *hba)
 
         goto out;
 
-out_disable_phy:
-        phy_power_off(host->generic_phy);
-out_unregister_bus:
-        phy_exit(host->generic_phy);
 out_variant_clear:
         ufshcd_set_variant(hba, NULL);
 out:
diff --git a/drivers/soc/bcm/brcmstb/common.c b/drivers/soc/bcm/brcmstb/common.c
index 22e98a90468c..a71730da6385 100644
--- a/drivers/soc/bcm/brcmstb/common.c
+++ b/drivers/soc/bcm/brcmstb/common.c
@@ -40,6 +40,18 @@ bool soc_is_brcmstb(void)
         return of_match_node(brcmstb_machine_match, root) != NULL;
 }
 
+u32 brcmstb_get_family_id(void)
+{
+        return family_id;
+}
+EXPORT_SYMBOL(brcmstb_get_family_id);
+
+u32 brcmstb_get_product_id(void)
+{
+        return product_id;
+}
+EXPORT_SYMBOL(brcmstb_get_product_id);
+
 static const struct of_device_id sun_top_ctrl_match[] = {
         { .compatible = "brcm,bcm7125-sun-top-ctrl", },
         { .compatible = "brcm,bcm7346-sun-top-ctrl", },
diff --git a/drivers/staging/wlan-ng/hfa384x_usb.c b/drivers/staging/wlan-ng/hfa384x_usb.c
index 5975d47dfa71..197f5a914e8f 100644
--- a/drivers/staging/wlan-ng/hfa384x_usb.c
+++ b/drivers/staging/wlan-ng/hfa384x_usb.c
@@ -2457,7 +2457,7 @@ int hfa384x_drvr_start(struct hfa384x *hw)
          * ok
          */
         result =
-            usb_get_status(hw->usb, USB_RECIP_ENDPOINT, hw->endp_in, &status);
+            usb_get_std_status(hw->usb, USB_RECIP_ENDPOINT, hw->endp_in, &status);
         if (result < 0) {
                 netdev_err(hw->wlandev->netdev, "Cannot get bulk in endpoint status.\n");
                 goto done;
@@ -2466,7 +2466,7 @@ int hfa384x_drvr_start(struct hfa384x *hw)
                 netdev_err(hw->wlandev->netdev, "Failed to reset bulk in endpoint.\n");
 
         result =
-            usb_get_status(hw->usb, USB_RECIP_ENDPOINT, hw->endp_out, &status);
+            usb_get_std_status(hw->usb, USB_RECIP_ENDPOINT, hw->endp_out, &status);
         if (result < 0) {
                 netdev_err(hw->wlandev->netdev, "Cannot get bulk out endpoint status.\n");
                 goto done;
diff --git a/drivers/usb/Kconfig b/drivers/usb/Kconfig
index 939a63bca82f..f699abab1787 100644
--- a/drivers/usb/Kconfig
+++ b/drivers/usb/Kconfig
@@ -77,11 +77,12 @@ config USB_PCI
         depends on PCI
         default y
         ---help---
-          A lot of embeded system SOC (e.g. freescale T2080) have both
-          PCI and USB modules. But USB module is controlled by registers
-          directly, it have no relationship with PCI module.
+          Many embedded system SOCs (e.g. freescale T2080) have both
+          PCI and USB modules with the USB module directly controlled by
+          registers and having no relationship to the PCI module.
 
-          When say N here it will not build PCI related code in USB driver.
+          If you have such a device you may say N here and PCI related code
+          will not be built in the USB driver.
 
 if USB
 
diff --git a/drivers/usb/atm/cxacru.c b/drivers/usb/atm/cxacru.c
index 5160a4a966b3..6470d259b7d8 100644
--- a/drivers/usb/atm/cxacru.c
+++ b/drivers/usb/atm/cxacru.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0+
 /******************************************************************************
  *  cxacru.c  -  driver for USB ADSL modems based on
  *               Conexant AccessRunner chipset
@@ -6,21 +7,6 @@
  *  Copyright (C) 2005 Duncan Sands, Roman Kagan (rkagan % mail ! ru)
  *  Copyright (C) 2007 Simon Arlott
  *  Copyright (C) 2009 Simon Arlott
- *
- *  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.
- *
- *  This program is distributed in the hope that it will be useful, but WITHOUT
- *  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- *  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- *  more details.
- *
- *  You should have received a copy of the GNU General Public License along with
- *  this program; if not, write to the Free Software Foundation, Inc., 59
- *  Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- *
  ******************************************************************************/
 
 /*
@@ -424,6 +410,7 @@ static ssize_t cxacru_sysfs_store_adsl_state(struct device *dev,
                 case CXPOLL_STOPPING:
                         /* abort stop request */
                         instance->poll_state = CXPOLL_POLLING;
+                        /* fall through */
                 case CXPOLL_POLLING:
                 case CXPOLL_SHUTDOWN:
                         /* don't start polling */
@@ -570,10 +557,8 @@ static int cxacru_start_wait_urb(struct urb *urb, struct completion *done,
 {
         struct timer_list timer;
 
-        init_timer(&timer);
+        setup_timer(&timer, cxacru_timeout_kill, (unsigned long)urb);
         timer.expires = jiffies + msecs_to_jiffies(CMD_TIMEOUT);
-        timer.data = (unsigned long) urb;
-        timer.function = cxacru_timeout_kill;
         add_timer(&timer);
         wait_for_completion(done);
         del_timer_sync(&timer);
@@ -797,6 +782,7 @@ static int cxacru_atm_start(struct usbatm_data *usbatm_instance,
         case CXPOLL_STOPPING:
                 /* abort stop request */
                 instance->poll_state = CXPOLL_POLLING;
+                /* fall through */
         case CXPOLL_POLLING:
         case CXPOLL_SHUTDOWN:
                 /* don't start polling */
diff --git a/drivers/usb/atm/speedtch.c b/drivers/usb/atm/speedtch.c
index 3676adb40d89..5a5e8c0aaa39 100644
--- a/drivers/usb/atm/speedtch.c
+++ b/drivers/usb/atm/speedtch.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0+
 /******************************************************************************
  *  speedtch.c  -  Alcatel SpeedTouch USB xDSL modem driver
  *
@@ -6,21 +7,6 @@
  *  Copyright (C) 2004, David Woodhouse
  *
  *  Based on "modem_run.c", copyright (C) 2001, Benoit Papillault
- *
- *  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.
- *
- *  This program is distributed in the hope that it will be useful, but WITHOUT
- *  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- *  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- *  more details.
- *
- *  You should have received a copy of the GNU General Public License along with
- *  this program; if not, write to the Free Software Foundation, Inc., 59
- *  Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- *
  ******************************************************************************/
 
 #include <asm/page.h>
@@ -874,16 +860,13 @@ static int speedtch_bind(struct usbatm_data *usbatm,
         usbatm->flags |= (use_isoc ? UDSL_USE_ISOC : 0);
 
         INIT_WORK(&instance->status_check_work, speedtch_check_status);
-        init_timer(&instance->status_check_timer);
-
-        instance->status_check_timer.function = speedtch_status_poll;
-        instance->status_check_timer.data = (unsigned long)instance;
+        setup_timer(&instance->status_check_timer, speedtch_status_poll,
+                    (unsigned long)instance);
         instance->last_status = 0xff;
         instance->poll_delay = MIN_POLL_DELAY;
 
-        init_timer(&instance->resubmit_timer);
-        instance->resubmit_timer.function = speedtch_resubmit_int;
-        instance->resubmit_timer.data = (unsigned long)instance;
+        setup_timer(&instance->resubmit_timer, speedtch_resubmit_int,
+                    (unsigned long)instance);
 
         instance->int_urb = usb_alloc_urb(0, GFP_KERNEL);
 
diff --git a/drivers/usb/atm/ueagle-atm.c b/drivers/usb/atm/ueagle-atm.c
index ba7616395db2..ab75690044bb 100644
--- a/drivers/usb/atm/ueagle-atm.c
+++ b/drivers/usb/atm/ueagle-atm.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause)
 /*-
  * Copyright (c) 2003, 2004
  *      Damien Bergamini <damien.bergamini@free.fr>. All rights reserved.
diff --git a/drivers/usb/atm/usbatm.c b/drivers/usb/atm/usbatm.c
index 8607af758bbd..044264aa1f96 100644
--- a/drivers/usb/atm/usbatm.c
+++ b/drivers/usb/atm/usbatm.c
@@ -1,24 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0+
 /******************************************************************************
  *  usbatm.c - Generic USB xDSL driver core
  *
  *  Copyright (C) 2001, Alcatel
  *  Copyright (C) 2003, Duncan Sands, SolNegro, Josep Comas
  *  Copyright (C) 2004, David Woodhouse, Roman Kagan
- *
- *  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.
- *
- *  This program is distributed in the hope that it will be useful, but WITHOUT
- *  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- *  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- *  more details.
- *
- *  You should have received a copy of the GNU General Public License along with
- *  this program; if not, write to the Free Software Foundation, Inc., 59
- *  Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- *
  ******************************************************************************/
 
 /*
diff --git a/drivers/usb/atm/usbatm.h b/drivers/usb/atm/usbatm.h
index f3eecd967a8a..d3bdc4cc47aa 100644
--- a/drivers/usb/atm/usbatm.h
+++ b/drivers/usb/atm/usbatm.h
@@ -1,24 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0+
 /******************************************************************************
  *  usbatm.h - Generic USB xDSL driver core
  *
  *  Copyright (C) 2001, Alcatel
  *  Copyright (C) 2003, Duncan Sands, SolNegro, Josep Comas
  *  Copyright (C) 2004, David Woodhouse
- *
- *  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.
- *
- *  This program is distributed in the hope that it will be useful, but WITHOUT
- *  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- *  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- *  more details.
- *
- *  You should have received a copy of the GNU General Public License along with
- *  this program; if not, write to the Free Software Foundation, Inc., 59
- *  Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- *
  ******************************************************************************/
 
 #ifndef _USBATM_H_
diff --git a/drivers/usb/atm/xusbatm.c b/drivers/usb/atm/xusbatm.c
index c73c1ec3005e..ffc9810070a3 100644
--- a/drivers/usb/atm/xusbatm.c
+++ b/drivers/usb/atm/xusbatm.c
@@ -1,22 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0+
 /******************************************************************************
  *  xusbatm.c - dumb usbatm-based driver for modems initialized in userspace
  *
  *  Copyright (C) 2005 Duncan Sands, Roman Kagan (rkagan % mail ! ru)
- *
- *  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.
- *
- *  This program is distributed in the hope that it will be useful, but WITHOUT
- *  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- *  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- *  more details.
- *
- *  You should have received a copy of the GNU General Public License along with
- *  this program; if not, write to the Free Software Foundation, Inc., 59
- *  Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- *
  ******************************************************************************/
 
 #include <linux/module.h>
diff --git a/drivers/usb/c67x00/Makefile b/drivers/usb/c67x00/Makefile
index da5f314a5de0..0cde62d06e5d 100644
--- a/drivers/usb/c67x00/Makefile
+++ b/drivers/usb/c67x00/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for Cypress C67X00 USB Controller
 #
diff --git a/drivers/usb/c67x00/c67x00-drv.c b/drivers/usb/c67x00/c67x00-drv.c
index 5796c8820514..53838e7d4eef 100644
--- a/drivers/usb/c67x00/c67x00-drv.c
+++ b/drivers/usb/c67x00/c67x00-drv.c
@@ -1,24 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * c67x00-drv.c: Cypress C67X00 USB Common infrastructure
  *
  * Copyright (C) 2006-2008 Barco N.V.
  *    Derived from the Cypress cy7c67200/300 ezusb linux driver and
  *    based on multiple host controller drivers inside the linux kernel.
- *
- * 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.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301  USA.
  */
 
 /*
diff --git a/drivers/usb/c67x00/c67x00-hcd.c b/drivers/usb/c67x00/c67x00-hcd.c
index 30d3f346686e..c39eee17c0e4 100644
--- a/drivers/usb/c67x00/c67x00-hcd.c
+++ b/drivers/usb/c67x00/c67x00-hcd.c
@@ -1,24 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * c67x00-hcd.c: Cypress C67X00 USB Host Controller Driver
  *
  * Copyright (C) 2006-2008 Barco N.V.
  *    Derived from the Cypress cy7c67200/300 ezusb linux driver and
  *    based on multiple host controller drivers inside the linux kernel.
- *
- * 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.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301  USA.
  */
 
 #include <linux/device.h>
diff --git a/drivers/usb/c67x00/c67x00-hcd.h b/drivers/usb/c67x00/c67x00-hcd.h
index cf8a455a6403..3b181d4c7a03 100644
--- a/drivers/usb/c67x00/c67x00-hcd.h
+++ b/drivers/usb/c67x00/c67x00-hcd.h
@@ -1,24 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * c67x00-hcd.h: Cypress C67X00 USB HCD
  *
  * Copyright (C) 2006-2008 Barco N.V.
  *    Derived from the Cypress cy7c67200/300 ezusb linux driver and
  *    based on multiple host controller drivers inside the linux kernel.
- *
- * 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.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301  USA.
  */
 
 #ifndef _USB_C67X00_HCD_H
diff --git a/drivers/usb/c67x00/c67x00-ll-hpi.c b/drivers/usb/c67x00/c67x00-ll-hpi.c
index b58151841e10..e1fe3603140a 100644
--- a/drivers/usb/c67x00/c67x00-ll-hpi.c
+++ b/drivers/usb/c67x00/c67x00-ll-hpi.c
@@ -1,24 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * c67x00-ll-hpi.c: Cypress C67X00 USB Low level interface using HPI
  *
  * Copyright (C) 2006-2008 Barco N.V.
  *    Derived from the Cypress cy7c67200/300 ezusb linux driver and
  *    based on multiple host controller drivers inside the linux kernel.
- *
- * 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.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301  USA.
  */
 
 #include <asm/byteorder.h>
diff --git a/drivers/usb/c67x00/c67x00-sched.c b/drivers/usb/c67x00/c67x00-sched.c
index 7311ed61e99a..633c52de3bb3 100644
--- a/drivers/usb/c67x00/c67x00-sched.c
+++ b/drivers/usb/c67x00/c67x00-sched.c
@@ -1,24 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * c67x00-sched.c: Cypress C67X00 USB Host Controller Driver - TD scheduling
  *
  * Copyright (C) 2006-2008 Barco N.V.
  *    Derived from the Cypress cy7c67200/300 ezusb linux driver and
  *    based on multiple host controller drivers inside the linux kernel.
- *
- * 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.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301  USA.
  */
 
 #include <linux/kthread.h>
@@ -966,13 +952,11 @@ static void c67x00_handle_successful_td(struct c67x00_hcd *c67x00,
 static void c67x00_handle_isoc(struct c67x00_hcd *c67x00, struct c67x00_td *td)
 {
         struct urb *urb = td->urb;
-        struct c67x00_urb_priv *urbp;
         int cnt;
 
         if (!urb)
                 return;
 
-        urbp = urb->hcpriv;
         cnt = td->privdata;
 
         if (td->status & TD_ERROR_MASK)
diff --git a/drivers/usb/c67x00/c67x00.h b/drivers/usb/c67x00/c67x00.h
index a26e9ded0f32..7ce10928b037 100644
--- a/drivers/usb/c67x00/c67x00.h
+++ b/drivers/usb/c67x00/c67x00.h
@@ -1,24 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * c67x00.h: Cypress C67X00 USB register and field definitions
  *
  * Copyright (C) 2006-2008 Barco N.V.
  *    Derived from the Cypress cy7c67200/300 ezusb linux driver and
  *    based on multiple host controller drivers inside the linux kernel.
- *
- * 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.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301  USA.
  */
 
 #ifndef _USB_C67X00_H
diff --git a/drivers/usb/chipidea/Kconfig b/drivers/usb/chipidea/Kconfig
index 51f4157bbecf..785f0ed037f7 100644
--- a/drivers/usb/chipidea/Kconfig
+++ b/drivers/usb/chipidea/Kconfig
@@ -9,7 +9,7 @@ config USB_CHIPIDEA
           Dual-role switch (ID, OTG FSM, sysfs), Host-only, and
           Peripheral-only.
 
-          When compiled dynamically, the module will be called ci-hdrc.ko.
+          When compiled dynamically, the module will be called ci_hdrc.ko.
 
 if USB_CHIPIDEA
 
diff --git a/drivers/usb/chipidea/bits.h b/drivers/usb/chipidea/bits.h
index e462f55c8b99..98da99510be7 100644
--- a/drivers/usb/chipidea/bits.h
+++ b/drivers/usb/chipidea/bits.h
@@ -1,13 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * bits.h - register bits of the ChipIdea USB IP core
  *
  * Copyright (C) 2008 Chipidea - MIPS Technologies, Inc. All rights reserved.
  *
  * Author: David Lopo
- *
- * 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.
  */
 
 #ifndef __DRIVERS_USB_CHIPIDEA_BITS_H
diff --git a/drivers/usb/chipidea/ci.h b/drivers/usb/chipidea/ci.h
index 6743f85b1b7a..98b7cb3d0064 100644
--- a/drivers/usb/chipidea/ci.h
+++ b/drivers/usb/chipidea/ci.h
@@ -1,13 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * ci.h - common structures, functions, and macros of the ChipIdea driver
  *
  * Copyright (C) 2008 Chipidea - MIPS Technologies, Inc. All rights reserved.
  *
  * Author: David Lopo
- *
- * 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.
  */
 
 #ifndef __DRIVERS_USB_CHIPIDEA_CI_H
diff --git a/drivers/usb/chipidea/ci_hdrc_imx.c b/drivers/usb/chipidea/ci_hdrc_imx.c
index 5f4a8157fad8..3b45c25f296e 100644
--- a/drivers/usb/chipidea/ci_hdrc_imx.c
+++ b/drivers/usb/chipidea/ci_hdrc_imx.c
@@ -1,14 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright 2012 Freescale Semiconductor, Inc.
  * Copyright (C) 2012 Marek Vasut <marex@denx.de>
  * on behalf of DENX Software Engineering GmbH
- *
- * The code contained herein is licensed under the GNU General Public
- * License. You may obtain a copy of the GNU General Public License
- * Version 2 or later at the following locations:
- *
- * http://www.opensource.org/licenses/gpl-license.html
- * http://www.gnu.org/copyleft/gpl.html
  */
 
 #include <linux/module.h>
diff --git a/drivers/usb/chipidea/ci_hdrc_imx.h b/drivers/usb/chipidea/ci_hdrc_imx.h
index d666c9f036ba..204275f47573 100644
--- a/drivers/usb/chipidea/ci_hdrc_imx.h
+++ b/drivers/usb/chipidea/ci_hdrc_imx.h
@@ -1,12 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright 2012 Freescale Semiconductor, Inc.
- *
- * The code contained herein is licensed under the GNU General Public
- * License. You may obtain a copy of the GNU General Public License
- * Version 2 or later at the following locations:
- *
- * http://www.opensource.org/licenses/gpl-license.html
- * http://www.gnu.org/copyleft/gpl.html
  */
 
 #ifndef __DRIVER_USB_CHIPIDEA_CI_HDRC_IMX_H
diff --git a/drivers/usb/chipidea/ci_hdrc_msm.c b/drivers/usb/chipidea/ci_hdrc_msm.c
index bb626120296f..3593ce0ec641 100644
--- a/drivers/usb/chipidea/ci_hdrc_msm.c
+++ b/drivers/usb/chipidea/ci_hdrc_msm.c
@@ -1,9 +1,5 @@
-/* Copyright (c) 2010, Code Aurora Forum. All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 and
- * only version 2 as published by the Free Software Foundation.
- */
+// SPDX-License-Identifier: GPL-2.0
+/* Copyright (c) 2010, Code Aurora Forum. All rights reserved. */
 
 #include <linux/module.h>
 #include <linux/platform_device.h>
diff --git a/drivers/usb/chipidea/ci_hdrc_pci.c b/drivers/usb/chipidea/ci_hdrc_pci.c
index 39414e4b2d81..49a61549cee6 100644
--- a/drivers/usb/chipidea/ci_hdrc_pci.c
+++ b/drivers/usb/chipidea/ci_hdrc_pci.c
@@ -1,13 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * ci_hdrc_pci.c - MIPS USB IP core family device controller
  *
  * Copyright (C) 2008 Chipidea - MIPS Technologies, Inc. All rights reserved.
  *
  * Author: David Lopo
- *
- * 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>
diff --git a/drivers/usb/chipidea/ci_hdrc_tegra.c b/drivers/usb/chipidea/ci_hdrc_tegra.c
index bfcee2702d50..7b65a1040d2c 100644
--- a/drivers/usb/chipidea/ci_hdrc_tegra.c
+++ b/drivers/usb/chipidea/ci_hdrc_tegra.c
@@ -1,9 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Copyright (c) 2016, NVIDIA Corporation
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms and conditions of the GNU General Public License,
- * version 2, as published by the Free Software Foundation.
  */
 
 #include <linux/clk.h>
diff --git a/drivers/usb/chipidea/ci_hdrc_usb2.c b/drivers/usb/chipidea/ci_hdrc_usb2.c
index 99425db9ba62..c044fba463e4 100644
--- a/drivers/usb/chipidea/ci_hdrc_usb2.c
+++ b/drivers/usb/chipidea/ci_hdrc_usb2.c
@@ -1,11 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Copyright (C) 2014 Marvell Technology Group Ltd.
  *
  * Antoine Tenart <antoine.tenart@free-electrons.com>
- *
- * This file is licensed under the terms of the GNU General Public
- * License version 2. This program is licensed "as is" without any
- * warranty of any kind, whether express or implied.
  */
 
 #include <linux/clk.h>
diff --git a/drivers/usb/chipidea/ci_hdrc_zevio.c b/drivers/usb/chipidea/ci_hdrc_zevio.c
index 1264de505527..e1634da4a4b1 100644
--- a/drivers/usb/chipidea/ci_hdrc_zevio.c
+++ b/drivers/usb/chipidea/ci_hdrc_zevio.c
@@ -1,12 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *      Copyright (C) 2013 Daniel Tang <tangrs@tangrs.id.au>
  *
- * 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.
- *
  * Based off drivers/usb/chipidea/ci_hdrc_msm.c
- *
  */
 
 #include <linux/module.h>
diff --git a/drivers/usb/chipidea/core.c b/drivers/usb/chipidea/core.c
index 43ea5fb87b9a..dd2dd9391bb7 100644
--- a/drivers/usb/chipidea/core.c
+++ b/drivers/usb/chipidea/core.c
@@ -1,13 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * core.c - ChipIdea USB IP core family device controller
  *
  * Copyright (C) 2008 Chipidea - MIPS Technologies, Inc. All rights reserved.
  *
  * Author: David Lopo
- *
- * 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.
  */
 
 /*
diff --git a/drivers/usb/chipidea/host.c b/drivers/usb/chipidea/host.c
index 18cb8e46262d..19d60ed7e41f 100644
--- a/drivers/usb/chipidea/host.c
+++ b/drivers/usb/chipidea/host.c
@@ -1,22 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * host.c - ChipIdea USB host controller driver
  *
  * Copyright (c) 2012 Intel Corporation
  *
  * Author: Alexander Shishkin
- *
- * 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.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
 #include <linux/kernel.h>
diff --git a/drivers/usb/chipidea/otg.c b/drivers/usb/chipidea/otg.c
index 10236fe71522..db4ceffcf2a6 100644
--- a/drivers/usb/chipidea/otg.c
+++ b/drivers/usb/chipidea/otg.c
@@ -1,13 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * otg.c - ChipIdea USB IP core OTG driver
  *
  * Copyright (C) 2013 Freescale Semiconductor, Inc.
  *
  * Author: Peter Chen
- *
- * 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.
  */
 
 /*
diff --git a/drivers/usb/chipidea/otg.h b/drivers/usb/chipidea/otg.h
index 9ecb598e48f0..7e7428e48bfa 100644
--- a/drivers/usb/chipidea/otg.h
+++ b/drivers/usb/chipidea/otg.h
@@ -1,11 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Copyright (C) 2013-2014 Freescale Semiconductor, Inc.
  *
  * Author: Peter Chen
- *
- * 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.
  */
 
 #ifndef __DRIVERS_USB_CHIPIDEA_OTG_H
diff --git a/drivers/usb/chipidea/otg_fsm.c b/drivers/usb/chipidea/otg_fsm.c
index 5ea0246f650d..9e2d300060bc 100644
--- a/drivers/usb/chipidea/otg_fsm.c
+++ b/drivers/usb/chipidea/otg_fsm.c
@@ -1,13 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * otg_fsm.c - ChipIdea USB IP core OTG FSM driver
  *
  * Copyright (C) 2014 Freescale Semiconductor, Inc.
  *
  * Author: Jun Li
- *
- * 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.
  */
 
 /*
diff --git a/drivers/usb/chipidea/otg_fsm.h b/drivers/usb/chipidea/otg_fsm.h
index 6366fe398ba6..2b49d29bf2fb 100644
--- a/drivers/usb/chipidea/otg_fsm.h
+++ b/drivers/usb/chipidea/otg_fsm.h
@@ -1,11 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Copyright (C) 2014 Freescale Semiconductor, Inc.
  *
  * Author: Jun Li
- *
- * 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.
  */
 
 #ifndef __DRIVERS_USB_CHIPIDEA_OTG_FSM_H
diff --git a/drivers/usb/chipidea/udc.c b/drivers/usb/chipidea/udc.c
index fe8a90543ea3..9852ec5e6e01 100644
--- a/drivers/usb/chipidea/udc.c
+++ b/drivers/usb/chipidea/udc.c
@@ -1,13 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * udc.c - ChipIdea UDC driver
  *
  * Copyright (C) 2008 Chipidea - MIPS Technologies, Inc. All rights reserved.
  *
  * Author: David Lopo
- *
- * 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/delay.h>
@@ -1526,6 +1523,10 @@ static int ci_udc_vbus_session(struct usb_gadget *_gadget, int is_active)
                 gadget_ready = 1;
         spin_unlock_irqrestore(&ci->lock, flags);
 
+        if (ci->usb_phy)
+                usb_phy_set_charger_state(ci->usb_phy, is_active ?
+                        USB_CHARGER_PRESENT : USB_CHARGER_ABSENT);
+
         if (gadget_ready) {
                 if (is_active) {
                         pm_runtime_get_sync(&_gadget->dev);
diff --git a/drivers/usb/chipidea/udc.h b/drivers/usb/chipidea/udc.h
index 2ecd1174d66c..e023735d94b7 100644
--- a/drivers/usb/chipidea/udc.h
+++ b/drivers/usb/chipidea/udc.h
@@ -1,13 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * udc.h - ChipIdea UDC structures
  *
  * Copyright (C) 2008 Chipidea - MIPS Technologies, Inc. All rights reserved.
  *
  * Author: David Lopo
- *
- * 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.
  */
 
 #ifndef __DRIVERS_USB_CHIPIDEA_UDC_H
diff --git a/drivers/usb/chipidea/ulpi.c b/drivers/usb/chipidea/ulpi.c
index 1219583dc1b2..6da42dcd2888 100644
--- a/drivers/usb/chipidea/ulpi.c
+++ b/drivers/usb/chipidea/ulpi.c
@@ -1,14 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Copyright (c) 2016 Linaro Ltd.
- *
- * 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/device.h>
diff --git a/drivers/usb/chipidea/usbmisc_imx.c b/drivers/usb/chipidea/usbmisc_imx.c
index 9f4a0185dd60..8cdf0af156c6 100644
--- a/drivers/usb/chipidea/usbmisc_imx.c
+++ b/drivers/usb/chipidea/usbmisc_imx.c
@@ -1,12 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright 2012 Freescale Semiconductor, Inc.
- *
- * The code contained herein is licensed under the GNU General Public
- * License. You may obtain a copy of the GNU General Public License
- * Version 2 or later at the following locations:
- *
- * http://www.opensource.org/licenses/gpl-license.html
- * http://www.gnu.org/copyleft/gpl.html
  */
 
 #include <linux/module.h>
diff --git a/drivers/usb/class/Makefile b/drivers/usb/class/Makefile
index 32e85277b5cf..5d393a28f7f2 100644
--- a/drivers/usb/class/Makefile
+++ b/drivers/usb/class/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for USB Class drivers
 # (one step up from the misc category)
diff --git a/drivers/usb/class/cdc-acm.c b/drivers/usb/class/cdc-acm.c
index 18c923a4c16e..8e0636c963a7 100644
--- a/drivers/usb/class/cdc-acm.c
+++ b/drivers/usb/class/cdc-acm.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * cdc-acm.c
  *
@@ -12,20 +13,6 @@
  * USB Abstract Control Model driver for USB modems and ISDN adapters
  *
  * Sponsored by SuSE
- *
- * 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.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
 #undef DEBUG
diff --git a/drivers/usb/class/cdc-wdm.c b/drivers/usb/class/cdc-wdm.c
index fbaa2a90d25d..6c181a625daf 100644
--- a/drivers/usb/class/cdc-wdm.c
+++ b/drivers/usb/class/cdc-wdm.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * cdc-wdm.c
  *
diff --git a/drivers/usb/class/usblp.c b/drivers/usb/class/usblp.c
index fb87c17ed6fa..c454885ef4a0 100644
--- a/drivers/usb/class/usblp.c
+++ b/drivers/usb/class/usblp.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * usblp.c
  *
@@ -31,22 +32,6 @@
  *      none  - Maintained in Linux kernel after v0.13
  */
 
-/*
- * 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.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
-
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/sched/signal.h>
diff --git a/drivers/usb/class/usbtmc.c b/drivers/usb/class/usbtmc.c
index 6ebfabfa0dc7..0b8b0f3bdd2f 100644
--- a/drivers/usb/class/usbtmc.c
+++ b/drivers/usb/class/usbtmc.c
@@ -1,22 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0+
 /**
  * drivers/usb/class/usbtmc.c - USB Test & Measurement class driver
  *
  * Copyright (C) 2007 Stefan Kopp, Gechingen, Germany
  * Copyright (C) 2008 Novell, Inc.
  * Copyright (C) 2008 Greg Kroah-Hartman <gregkh@suse.de>
- *
- * 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.
- *
- * 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.
- *
- * The GNU General Public License is available at
- * http://www.gnu.org/copyleft/gpl.html.
  */
 
 #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
@@ -1343,6 +1331,7 @@ static void usbtmc_interrupt(struct urb *urb)
         case -EOVERFLOW:
                 dev_err(dev, "overflow with length %d, actual length is %d\n",
                         data->iin_wMaxPacketSize, urb->actual_length);
+                /* fall through */
         case -ECONNRESET:
         case -ENOENT:
         case -ESHUTDOWN:
diff --git a/drivers/usb/common/common.c b/drivers/usb/common/common.c
index 552ff7ac5a6b..50a2362ed3ea 100644
--- a/drivers/usb/common/common.c
+++ b/drivers/usb/common/common.c
@@ -1,10 +1,7 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Provides code common for host and device side USB.
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation, version 2.
- *
  * If either host side (ie. CONFIG_USB=y) or device side USB stack
  * (ie. CONFIG_USB_GADGET=y) is compiled in the kernel, this module is
  * compiled-in as well.  Otherwise, if either of the two stacks is
diff --git a/drivers/usb/common/led.c b/drivers/usb/common/led.c
index df23da00a901..7bd81166b77d 100644
--- a/drivers/usb/common/led.c
+++ b/drivers/usb/common/led.c
@@ -1,12 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * LED Triggers for USB Activity
  *
  * Copyright 2014 Michal Sojka <sojka@merica.cz>
- *
- * 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/module.h>
diff --git a/drivers/usb/common/ulpi.c b/drivers/usb/common/ulpi.c
index 4aa5195db8ea..8b351444cc40 100644
--- a/drivers/usb/common/ulpi.c
+++ b/drivers/usb/common/ulpi.c
@@ -1,13 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0
 /**
  * ulpi.c - USB ULPI PHY bus
  *
  * Copyright (C) 2015 Intel Corporation
  *
  * Author: Heikki Krogerus <heikki.krogerus@linux.intel.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/ulpi/interface.h>
diff --git a/drivers/usb/common/usb-otg-fsm.c b/drivers/usb/common/usb-otg-fsm.c
index b8fe31e409a5..3740cf95560e 100644
--- a/drivers/usb/common/usb-otg-fsm.c
+++ b/drivers/usb/common/usb-otg-fsm.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * OTG Finite State Machine from OTG spec
  *
@@ -5,20 +6,6 @@
  *
  * Author:      Li Yang <LeoLi@freescale.com>
  *              Jerry Huang <Chang-Ming.Huang@freescale.com>
- *
- * 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.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the  GNU General Public License along
- * with this program; if not, write  to the Free Software Foundation, Inc.,
- * 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
 #include <linux/module.h>
diff --git a/drivers/usb/core/buffer.c b/drivers/usb/core/buffer.c
index b64568cf572c..77eef8acff94 100644
--- a/drivers/usb/core/buffer.c
+++ b/drivers/usb/core/buffer.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * DMA memory management for framework level HCD code (hc_driver)
  *
@@ -5,7 +6,6 @@
  * 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 883549ee946c..da8acd980fc6 100644
--- a/drivers/usb/core/config.c
+++ b/drivers/usb/core/config.c
@@ -1,6 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Released under the GPLv2 only.
- * SPDX-License-Identifier: GPL-2.0
  */
 
 #include <linux/usb.h>
diff --git a/drivers/usb/core/devices.c b/drivers/usb/core/devices.c
index 55dea2e7828f..c2cf62b7043a 100644
--- a/drivers/usb/core/devices.c
+++ b/drivers/usb/core/devices.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * devices.c
  * (C) Copyright 1999 Randy Dunlap.
@@ -5,20 +6,6 @@
  *     (proc file per device)
  * (C) Copyright 1999 Deti Fliegl (new USB architecture)
  *
- * 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.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
  *************************************************************
  *
  * <mountpoint>/devices contains USB topology, device, config, class,
diff --git a/drivers/usb/core/devio.c b/drivers/usb/core/devio.c
index 4ae667d8c238..705c573d0257 100644
--- a/drivers/usb/core/devio.c
+++ b/drivers/usb/core/devio.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*****************************************************************************/
 
 /*
@@ -5,20 +6,6 @@
  *
  *      Copyright (C) 1999-2000  Thomas Sailer (sailer@ife.ee.ethz.ch)
  *
- *      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.
- *
- *      This program is distributed in the hope that it will be useful,
- *      but WITHOUT ANY WARRANTY; without even the implied warranty of
- *      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *      GNU General Public License for more details.
- *
- *      You should have received a copy of the GNU General Public License
- *      along with this program; if not, write to the Free Software
- *      Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
  *  This file implements the usbfs/x/y files, where
  *  x is the bus number and y the device number.
  *
@@ -1833,6 +1820,18 @@ static int proc_unlinkurb(struct usb_dev_state *ps, void __user *arg)
         return 0;
 }
 
+static void compute_isochronous_actual_length(struct urb *urb)
+{
+        unsigned int i;
+
+        if (urb->number_of_packets > 0) {
+                urb->actual_length = 0;
+                for (i = 0; i < urb->number_of_packets; i++)
+                        urb->actual_length +=
+                                        urb->iso_frame_desc[i].actual_length;
+        }
+}
+
 static int processcompl(struct async *as, void __user * __user *arg)
 {
         struct urb *urb = as->urb;
@@ -1840,6 +1839,7 @@ static int processcompl(struct async *as, void __user * __user *arg)
         void __user *addr = as->userurb;
         unsigned int i;
 
+        compute_isochronous_actual_length(urb);
         if (as->userbuffer && urb->actual_length) {
                 if (copy_urb_data_to_user(as->userbuffer, urb))
                         goto err_out;
@@ -2008,6 +2008,7 @@ static int processcompl_compat(struct async *as, void __user * __user *arg)
         void __user *addr = as->userurb;
         unsigned int i;
 
+        compute_isochronous_actual_length(urb);
         if (as->userbuffer && urb->actual_length) {
                 if (copy_urb_data_to_user(as->userbuffer, urb))
                         return -EFAULT;
diff --git a/drivers/usb/core/driver.c b/drivers/usb/core/driver.c
index eb87a259d55c..64262a9a8829 100644
--- a/drivers/usb/core/driver.c
+++ b/drivers/usb/core/driver.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * drivers/usb/driver.c - most of the driver model stuff for usb
  *
@@ -16,7 +17,6 @@
  *      (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
@@ -1340,8 +1340,8 @@ static int usb_suspend_both(struct usb_device *udev, pm_message_t msg)
                         int err;
                         u16 devstat;
 
-                        err = usb_get_status(udev, USB_RECIP_DEVICE, 0,
-                                             &devstat);
+                        err = usb_get_std_status(udev, USB_RECIP_DEVICE, 0,
+                                                 &devstat);
                         if (err) {
                                 dev_err(&udev->dev,
                                         "Failed to suspend device, error %d\n",
@@ -1461,6 +1461,7 @@ static void choose_wakeup(struct usb_device *udev, pm_message_t msg)
 int usb_suspend(struct device *dev, pm_message_t msg)
 {
         struct usb_device       *udev = to_usb_device(dev);
+        int r;
 
         unbind_no_pm_drivers_interfaces(udev);
 
@@ -1469,7 +1470,14 @@ int usb_suspend(struct device *dev, pm_message_t msg)
          * so we may still need to unbind and rebind upon resume
          */
         choose_wakeup(udev, msg);
-        return usb_suspend_both(udev, msg);
+        r = usb_suspend_both(udev, msg);
+        if (r)
+                return r;
+
+        if (udev->quirks & USB_QUIRK_DISCONNECT_SUSPEND)
+                usb_port_disable(udev);
+
+        return 0;
 }
 
 /* The device lock is held by the PM core */
diff --git a/drivers/usb/core/endpoint.c b/drivers/usb/core/endpoint.c
index a60bc830a056..1c2c04079676 100644
--- a/drivers/usb/core/endpoint.c
+++ b/drivers/usb/core/endpoint.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * drivers/usb/core/endpoint.c
  *
@@ -6,7 +7,6 @@
  * (C) Copyright 2006 Novell Inc.
  *
  * Released under the GPLv2 only.
- * SPDX-License-Identifier: GPL-2.0
  *
  * Endpoint sysfs stuff
  */
diff --git a/drivers/usb/core/file.c b/drivers/usb/core/file.c
index 87ad6b6bfee8..65de6f73b672 100644
--- a/drivers/usb/core/file.c
+++ b/drivers/usb/core/file.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * drivers/usb/core/file.c
  *
@@ -14,7 +15,6 @@
  * (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 bd3e0c5a6db2..83c14dda6300 100644
--- a/drivers/usb/core/generic.c
+++ b/drivers/usb/core/generic.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * drivers/usb/generic.c - generic driver for USB devices (not interfaces)
  *
@@ -16,7 +17,6 @@
  *      (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/hcd-pci.c b/drivers/usb/core/hcd-pci.c
index ea829ad798c0..66fe1b78d952 100644
--- a/drivers/usb/core/hcd-pci.c
+++ b/drivers/usb/core/hcd-pci.c
@@ -1,19 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * (C) Copyright David Brownell 2000-2002
- *
- * 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.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
 #include <linux/kernel.h>
diff --git a/drivers/usb/core/hcd.c b/drivers/usb/core/hcd.c
index 75ad6718858c..19b5c4afeef2 100644
--- a/drivers/usb/core/hcd.c
+++ b/drivers/usb/core/hcd.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * (C) Copyright Linus Torvalds 1999
  * (C) Copyright Johannes Erdfelt 1999-2001
@@ -6,20 +7,6 @@
  * (C) Copyright Deti Fliegl 1999
  * (C) Copyright Randy Dunlap 2000
  * (C) Copyright David Brownell 2000-2002
- *
- * 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.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
 #include <linux/bcd.h>
@@ -2558,9 +2545,7 @@ struct usb_hcd *__usb_create_hcd(const struct hc_driver *driver,
         hcd->self.bus_name = bus_name;
         hcd->self.uses_dma = (sysdev->dma_mask != NULL);
 
-        init_timer(&hcd->rh_timer);
-        hcd->rh_timer.function = rh_timer_func;
-        hcd->rh_timer.data = (unsigned long) hcd;
+        setup_timer(&hcd->rh_timer, rh_timer_func, (unsigned long)hcd);
 #ifdef CONFIG_PM
         INIT_WORK(&hcd->wakeup_work, hcd_resume_work);
 #endif
diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c
index e9ce6bb0b22d..7ccdd3d4db84 100644
--- a/drivers/usb/core/hub.c
+++ b/drivers/usb/core/hub.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * USB hub driver.
  *
@@ -7,7 +8,6 @@
  * (C) Copyright 2001 Brad Hards (bhards@bigpond.net.au)
  *
  * Released under the GPLv2 only.
- * SPDX-License-Identifier: GPL-2.0
  */
 
 #include <linux/kernel.h>
@@ -1482,7 +1482,7 @@ static int hub_configure(struct usb_hub *hub,
         /* power budgeting mostly matters with bus-powered hubs,
          * and battery-powered root hubs (may provide just 8 mA).
          */
-        ret = usb_get_status(hdev, USB_RECIP_DEVICE, 0, &hubstatus);
+        ret = usb_get_std_status(hdev, USB_RECIP_DEVICE, 0, &hubstatus);
         if (ret) {
                 message = "can't get hub status";
                 goto fail;
@@ -3279,7 +3279,7 @@ static int finish_port_resume(struct usb_device *udev)
          */
         if (status == 0) {
                 devstatus = 0;
-                status = usb_get_status(udev, USB_RECIP_DEVICE, 0, &devstatus);
+                status = usb_get_std_status(udev, USB_RECIP_DEVICE, 0, &devstatus);
 
                 /* If a normal resume failed, try doing a reset-resume */
                 if (status && !udev->reset_resume && udev->persist_enabled) {
@@ -3303,7 +3303,7 @@ static int finish_port_resume(struct usb_device *udev)
                         if (devstatus & (1 << USB_DEVICE_REMOTE_WAKEUP))
                                 status = usb_disable_remote_wakeup(udev);
                 } else {
-                        status = usb_get_status(udev, USB_RECIP_INTERFACE, 0,
+                        status = usb_get_std_status(udev, USB_RECIP_INTERFACE, 0,
                                         &devstatus);
                         if (!status && devstatus & (USB_INTRF_STAT_FUNC_RW_CAP
                                         | USB_INTRF_STAT_FUNC_RW))
@@ -4183,6 +4183,19 @@ static int hub_port_disable(struct usb_hub *hub, int port1, int set_state)
         return ret;
 }
 
+/*
+ * usb_port_disable - disable a usb device's upstream port
+ * @udev: device to disable
+ * Context: @udev locked, must be able to sleep.
+ *
+ * Disables a USB device that isn't in active use.
+ */
+int usb_port_disable(struct usb_device *udev)
+{
+        struct usb_hub *hub = usb_hub_to_struct_hub(udev->parent);
+
+        return hub_port_disable(hub, udev->portnum, 0);
+}
 
 /* USB 2.0 spec, 7.1.7.3 / fig 7-29:
  *
@@ -4853,7 +4866,7 @@ static void hub_port_connect(struct usb_hub *hub, int port1, u16 portstatus,
                                 && udev->bus_mA <= unit_load) {
                         u16     devstat;
 
-                        status = usb_get_status(udev, USB_RECIP_DEVICE, 0,
+                        status = usb_get_std_status(udev, USB_RECIP_DEVICE, 0,
                                         &devstat);
                         if (status) {
                                 dev_dbg(&udev->dev, "get status %d ?\n", status);
diff --git a/drivers/usb/core/hub.h b/drivers/usb/core/hub.h
index 34c1a7e22aae..2a700ccc868c 100644
--- a/drivers/usb/core/hub.h
+++ b/drivers/usb/core/hub.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * usb hub driver head file
  *
@@ -8,15 +9,6 @@
  * Copyright (C) 2012 Intel Corp (tianyu.lan@intel.com)
  *
  *  move struct usb_hub to this file.
- *
- * 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.
- *
- * 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/usb.h>
diff --git a/drivers/usb/core/ledtrig-usbport.c b/drivers/usb/core/ledtrig-usbport.c
index 1af877942110..9dbb429cd471 100644
--- a/drivers/usb/core/ledtrig-usbport.c
+++ b/drivers/usb/core/ledtrig-usbport.c
@@ -1,11 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * USB port LED trigger
  *
  * Copyright (C) 2016 Rafał Miłecki <rafal@milecki.pl>
- *
- * 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/device.h>
diff --git a/drivers/usb/core/message.c b/drivers/usb/core/message.c
index 371a07d874a3..77001bcfc504 100644
--- a/drivers/usb/core/message.c
+++ b/drivers/usb/core/message.c
@@ -1,8 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * message.c - synchronous message handling
  *
  * Released under the GPLv2 only.
- * SPDX-License-Identifier: GPL-2.0
  */
 
 #include <linux/pci.h>  /* for scatterlist macros */
@@ -918,7 +918,8 @@ int usb_get_device_descriptor(struct usb_device *dev, unsigned int size)
 /**
  * usb_get_status - issues a GET_STATUS call
  * @dev: the device whose status is being checked
- * @type: USB_RECIP_*; for device, interface, or endpoint
+ * @recip: USB_RECIP_*; for device, interface, or endpoint
+ * @type: USB_STATUS_TYPE_*; for standard or PTM status types
  * @target: zero (for device), else interface or endpoint number
  * @data: pointer to two bytes of bitmap data
  * Context: !in_interrupt ()
@@ -937,24 +938,58 @@ int usb_get_device_descriptor(struct usb_device *dev, unsigned int size)
  * Returns 0 and the status value in *@data (in host byte order) on success,
  * or else the status code from the underlying usb_control_msg() call.
  */
-int usb_get_status(struct usb_device *dev, int type, int target, void *data)
+int usb_get_status(struct usb_device *dev, int recip, int type, int target,
+                void *data)
 {
         int ret;
-        __le16 *status = kmalloc(sizeof(*status), GFP_KERNEL);
+        void *status;
+        int length;
+
+        switch (type) {
+        case USB_STATUS_TYPE_STANDARD:
+                length = 2;
+                break;
+        case USB_STATUS_TYPE_PTM:
+                if (recip != USB_RECIP_DEVICE)
+                        return -EINVAL;
 
+                length = 4;
+                break;
+        default:
+                return -EINVAL;
+        }
+
+        status =  kmalloc(length, GFP_KERNEL);
         if (!status)
                 return -ENOMEM;
 
         ret = usb_control_msg(dev, usb_rcvctrlpipe(dev, 0),
-                USB_REQ_GET_STATUS, USB_DIR_IN | type, 0, target, status,
-                sizeof(*status), USB_CTRL_GET_TIMEOUT);
+                USB_REQ_GET_STATUS, USB_DIR_IN | recip, USB_STATUS_TYPE_STANDARD,
+                target, status, length, USB_CTRL_GET_TIMEOUT);
 
-        if (ret == 2) {
-                *(u16 *) data = le16_to_cpu(*status);
+        switch (ret) {
+        case 4:
+                if (type != USB_STATUS_TYPE_PTM) {
+                        ret = -EIO;
+                        break;
+                }
+
+                *(u32 *) data = le32_to_cpu(*(__le32 *) status);
+                ret = 0;
+                break;
+        case 2:
+                if (type != USB_STATUS_TYPE_STANDARD) {
+                        ret = -EIO;
+                        break;
+                }
+
+                *(u16 *) data = le16_to_cpu(*(__le16 *) status);
                 ret = 0;
-        } else if (ret >= 0) {
+                break;
+        default:
                 ret = -EIO;
         }
+
         kfree(status);
         return ret;
 }
diff --git a/drivers/usb/core/notify.c b/drivers/usb/core/notify.c
index b12a463a3e22..ab474b11523e 100644
--- a/drivers/usb/core/notify.c
+++ b/drivers/usb/core/notify.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * All the USB notify logic
  *
@@ -7,7 +8,6 @@
  * 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/of.c b/drivers/usb/core/of.c
index 3863bb1ce8c5..2be968353257 100644
--- a/drivers/usb/core/of.c
+++ b/drivers/usb/core/of.c
@@ -1,20 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * of.c         The helpers for hcd device tree support
  *
  * Copyright (C) 2016 Freescale Semiconductor, Inc.
  * Author: Peter Chen <peter.chen@freescale.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.
- *
- * 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/of.h>
diff --git a/drivers/usb/core/otg_whitelist.h b/drivers/usb/core/otg_whitelist.h
index 085049d37d7a..2ae90158ded7 100644
--- a/drivers/usb/core/otg_whitelist.h
+++ b/drivers/usb/core/otg_whitelist.h
@@ -1,12 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * drivers/usb/core/otg_whitelist.h
  *
  * Copyright (C) 2004 Texas Instruments
- *
- * 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.
  */
 
 /*
diff --git a/drivers/usb/core/port.c b/drivers/usb/core/port.c
index 460c855be0d0..1a01e9ad3804 100644
--- a/drivers/usb/core/port.c
+++ b/drivers/usb/core/port.c
@@ -1,19 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * usb port device code
  *
  * Copyright (C) 2012 Intel Corp
  *
  * Author: Lan Tianyu <tianyu.lan@intel.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.
- *
- * 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/slab.h>
diff --git a/drivers/usb/core/quirks.c b/drivers/usb/core/quirks.c
index a6aaf2f193a4..f1dbab6f798f 100644
--- a/drivers/usb/core/quirks.c
+++ b/drivers/usb/core/quirks.c
@@ -1,14 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * USB device quirk handling logic and table
  *
  * Copyright (c) 2007 Oliver Neukum
  * Copyright (c) 2007 Greg Kroah-Hartman <gregkh@suse.de>
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, version 2.
- *
- *
  */
 
 #include <linux/usb.h>
@@ -203,6 +198,12 @@ static const struct usb_device_id usb_quirk_list[] = {
         { USB_DEVICE(0x10d6, 0x2200), .driver_info =
                         USB_QUIRK_STRING_FETCH_255 },
 
+        /* Huawei 4G LTE module */
+        { USB_DEVICE(0x12d1, 0x15bb), .driver_info =
+                        USB_QUIRK_DISCONNECT_SUSPEND },
+        { USB_DEVICE(0x12d1, 0x15c3), .driver_info =
+                        USB_QUIRK_DISCONNECT_SUSPEND },
+
         /* SKYMEDI USB_DRIVE */
         { USB_DEVICE(0x1516, 0x8628), .driver_info = USB_QUIRK_RESET_RESUME },
 
@@ -221,6 +222,9 @@ static const struct usb_device_id usb_quirk_list[] = {
         /* Corsair Strafe RGB */
         { USB_DEVICE(0x1b1c, 0x1b20), .driver_info = USB_QUIRK_DELAY_INIT },
 
+        /* Corsair K70 LUX */
+        { USB_DEVICE(0x1b1c, 0x1b36), .driver_info = USB_QUIRK_DELAY_INIT },
+
         /* MIDI keyboard WORLDE MINI */
         { USB_DEVICE(0x1c75, 0x0204), .driver_info =
                         USB_QUIRK_CONFIG_INTF_STRINGS },
diff --git a/drivers/usb/core/sysfs.c b/drivers/usb/core/sysfs.c
index 58d59c5f8592..27bb34043053 100644
--- a/drivers/usb/core/sysfs.c
+++ b/drivers/usb/core/sysfs.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * drivers/usb/core/sysfs.c
  *
@@ -8,7 +9,6 @@
  * All of the sysfs file attributes for usb devices and interfaces.
  *
  * Released under the GPLv2 only.
- * SPDX-License-Identifier: GPL-2.0
  */
 
 
@@ -654,7 +654,8 @@ static int add_power_attributes(struct device *dev)
                 if (udev->usb2_hw_lpm_capable == 1)
                         rc = sysfs_merge_group(&dev->kobj,
                                         &usb2_hardware_lpm_attr_group);
-                if (udev->speed == USB_SPEED_SUPER &&
+                if ((udev->speed == USB_SPEED_SUPER ||
+                     udev->speed == USB_SPEED_SUPER_PLUS) &&
                                 udev->lpm_capable == 1)
                         rc = sysfs_merge_group(&dev->kobj,
                                         &usb3_hardware_lpm_attr_group);
diff --git a/drivers/usb/core/urb.c b/drivers/usb/core/urb.c
index 47903d510955..f501af0b3079 100644
--- a/drivers/usb/core/urb.c
+++ b/drivers/usb/core/urb.c
@@ -1,6 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Released under the GPLv2 only.
- * SPDX-License-Identifier: GPL-2.0
  */
 
 #include <linux/module.h>
@@ -492,6 +492,7 @@ int usb_submit_urb(struct urb *urb, gfp_t mem_flags)
                         if ((urb->interval < 6)
                                 && (xfertype == USB_ENDPOINT_XFER_INT))
                                 return -EINVAL;
+                        /* fall through */
                 default:
                         if (urb->interval <= 0)
                                 return -EINVAL;
diff --git a/drivers/usb/core/usb-acpi.c b/drivers/usb/core/usb-acpi.c
index ef9cf4a21afe..84da17460568 100644
--- a/drivers/usb/core/usb-acpi.c
+++ b/drivers/usb/core/usb-acpi.c
@@ -1,12 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * USB-ACPI glue code
  *
  * Copyright 2012 Red Hat <mjg@redhat.com>
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, version 2.
- *
  */
 #include <linux/module.h>
 #include <linux/usb.h>
diff --git a/drivers/usb/core/usb.c b/drivers/usb/core/usb.c
index 17681d5638ac..845286f08ab0 100644
--- a/drivers/usb/core/usb.c
+++ b/drivers/usb/core/usb.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * drivers/usb/core/usb.c
  *
@@ -13,7 +14,6 @@
  * (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
diff --git a/drivers/usb/core/usb.h b/drivers/usb/core/usb.h
index dc6949248823..2bee08d084ae 100644
--- a/drivers/usb/core/usb.h
+++ b/drivers/usb/core/usb.h
@@ -1,6 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Released under the GPLv2 only.
- * SPDX-License-Identifier: GPL-2.0
  */
 
 #include <linux/pm.h>
@@ -73,6 +73,7 @@ extern void usb_hub_cleanup(void);
 extern int usb_major_init(void);
 extern void usb_major_cleanup(void);
 extern int usb_device_supports_lpm(struct usb_device *udev);
+extern int usb_port_disable(struct usb_device *udev);
 
 #ifdef  CONFIG_PM
 
diff --git a/drivers/usb/dwc2/core.c b/drivers/usb/dwc2/core.c
index 1b6612c2cdda..82a7d98c3436 100644
--- a/drivers/usb/dwc2/core.c
+++ b/drivers/usb/dwc2/core.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause)
 /*
  * core.c - DesignWare HS OTG Controller common routines
  *
diff --git a/drivers/usb/dwc2/core.h b/drivers/usb/dwc2/core.h
index 8367d4f985c1..f66c94130cac 100644
--- a/drivers/usb/dwc2/core.h
+++ b/drivers/usb/dwc2/core.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause)
 /*
  * core.h - DesignWare HS OTG Controller common declarations
  *
@@ -395,6 +396,9 @@ enum dwc2_ep0_state {
  *                           (default when phy_type is UTMI+ or ULPI)
  *                       1 - 6 MHz
  *                           (default when phy_type is Full Speed)
+ * @oc_disable:         Flag to disable overcurrent condition.
+ *                      0 - Allow overcurrent condition to get detected
+ *                      1 - Disable overcurrent condtion to get detected
  * @ts_dline:           Enable Term Select Dline pulsing
  *                       0 - No (default)
  *                       1 - Yes
@@ -492,6 +496,7 @@ struct dwc2_core_params {
         bool dma_desc_fs_enable;
         bool host_support_fs_ls_low_power;
         bool host_ls_low_power_phy_clk;
+        bool oc_disable;
 
         u8 host_channels;
         u16 host_rx_fifo_size;
diff --git a/drivers/usb/dwc2/core_intr.c b/drivers/usb/dwc2/core_intr.c
index b8bcb007c92a..ab3fa1630853 100644
--- a/drivers/usb/dwc2/core_intr.c
+++ b/drivers/usb/dwc2/core_intr.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause)
 /*
  * core_intr.c - DesignWare HS OTG Controller common interrupt handling
  *
diff --git a/drivers/usb/dwc2/debug.h b/drivers/usb/dwc2/debug.h
index 8222783e6822..6f23219c13cb 100644
--- a/drivers/usb/dwc2/debug.h
+++ b/drivers/usb/dwc2/debug.h
@@ -1,17 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0
 /**
  * debug.h - Designware USB2 DRD controller debug header
  *
  * Copyright (C) 2015 Intel Corporation
  * Mian Yousaf Kaukab <yousaf.kaukab@intel.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 "core.h"
diff --git a/drivers/usb/dwc2/debugfs.c b/drivers/usb/dwc2/debugfs.c
index 794b959a7c8c..f4650a88be78 100644
--- a/drivers/usb/dwc2/debugfs.c
+++ b/drivers/usb/dwc2/debugfs.c
@@ -1,17 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0
 /**
  * debugfs.c - Designware USB2 DRD controller debugfs
  *
  * Copyright (C) 2015 Intel Corporation
  * Mian Yousaf Kaukab <yousaf.kaukab@intel.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 <linux/spinlock.h>
diff --git a/drivers/usb/dwc2/gadget.c b/drivers/usb/dwc2/gadget.c
index 0d8e09ccb59c..88529d092503 100644
--- a/drivers/usb/dwc2/gadget.c
+++ b/drivers/usb/dwc2/gadget.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /**
  * Copyright (c) 2011 Samsung Electronics Co., Ltd.
  *              http://www.samsung.com
@@ -8,10 +9,6 @@
  *      http://armlinux.simtec.co.uk/
  *
  * S3C USB2.0 High-speed / OtG driver
- *
- * 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/kernel.h>
@@ -3202,6 +3199,8 @@ void dwc2_hsotg_disconnect(struct dwc2_hsotg *hsotg)
 
         call_gadget(hsotg, disconnect);
         hsotg->lx_state = DWC2_L3;
+
+        usb_gadget_set_state(&hsotg->gadget, USB_STATE_NOTATTACHED);
 }
 
 /**
@@ -4004,6 +4003,11 @@ static int dwc2_hsotg_ep_disable(struct usb_ep *ep)
                 return -EINVAL;
         }
 
+        if (hsotg->op_state != OTG_STATE_B_PERIPHERAL) {
+                dev_err(hsotg->dev, "%s: called in host mode?\n", __func__);
+                return -EINVAL;
+        }
+
         epctrl_reg = dir_in ? DIEPCTL(index) : DOEPCTL(index);
 
         spin_lock_irqsave(&hsotg->lock, flags);
diff --git a/drivers/usb/dwc2/hcd.c b/drivers/usb/dwc2/hcd.c
index c2631145f404..69eb40cd1b47 100644
--- a/drivers/usb/dwc2/hcd.c
+++ b/drivers/usb/dwc2/hcd.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause)
 /*
  * hcd.c - DesignWare HS OTG Controller host-mode routines
  *
@@ -213,6 +214,11 @@ static int dwc2_hs_phy_init(struct dwc2_hsotg *hsotg, bool select_phy)
                 usbcfg &= ~(GUSBCFG_PHYIF16 | GUSBCFG_DDRSEL);
                 if (hsotg->params.phy_ulpi_ddr)
                         usbcfg |= GUSBCFG_DDRSEL;
+
+                /* Set external VBUS indicator as needed. */
+                if (hsotg->params.oc_disable)
+                        usbcfg |= (GUSBCFG_ULPI_INT_VBUS_IND |
+                                   GUSBCFG_INDICATORPASSTHROUGH);
                 break;
         case DWC2_PHY_TYPE_PARAM_UTMI:
                 /* UTMI+ interface */
@@ -3277,7 +3283,6 @@ static void dwc2_conn_id_status_change(struct work_struct *work)
                 dwc2_core_init(hsotg, false);
                 dwc2_enable_global_interrupts(hsotg);
                 spin_lock_irqsave(&hsotg->lock, flags);
-                dwc2_hsotg_disconnect(hsotg);
                 dwc2_hsotg_core_init_disconnected(hsotg, false);
                 spin_unlock_irqrestore(&hsotg->lock, flags);
                 dwc2_hsotg_core_connect(hsotg);
@@ -3296,8 +3301,12 @@ host:
                 if (count > 250)
                         dev_err(hsotg->dev,
                                 "Connection id status change timed out\n");
-                hsotg->op_state = OTG_STATE_A_HOST;
 
+                spin_lock_irqsave(&hsotg->lock, flags);
+                dwc2_hsotg_disconnect(hsotg);
+                spin_unlock_irqrestore(&hsotg->lock, flags);
+
+                hsotg->op_state = OTG_STATE_A_HOST;
                 /* Initialize the Core for Host mode */
                 dwc2_core_init(hsotg, false);
                 dwc2_enable_global_interrupts(hsotg);
diff --git a/drivers/usb/dwc2/hcd.h b/drivers/usb/dwc2/hcd.h
index 11c3c145b793..78e9e01051b5 100644
--- a/drivers/usb/dwc2/hcd.h
+++ b/drivers/usb/dwc2/hcd.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause)
 /*
  * hcd.h - DesignWare HS OTG Controller host-mode declarations
  *
diff --git a/drivers/usb/dwc2/hcd_ddma.c b/drivers/usb/dwc2/hcd_ddma.c
index b8bdf545c3a7..28c8898b3b66 100644
--- a/drivers/usb/dwc2/hcd_ddma.c
+++ b/drivers/usb/dwc2/hcd_ddma.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause)
 /*
  * hcd_ddma.c - DesignWare HS OTG Controller descriptor DMA routines
  *
diff --git a/drivers/usb/dwc2/hcd_intr.c b/drivers/usb/dwc2/hcd_intr.c
index 28a8210710b1..916d991b96b8 100644
--- a/drivers/usb/dwc2/hcd_intr.c
+++ b/drivers/usb/dwc2/hcd_intr.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause)
 /*
  * hcd_intr.c - DesignWare HS OTG Controller host-mode interrupt handling
  *
diff --git a/drivers/usb/dwc2/hcd_queue.c b/drivers/usb/dwc2/hcd_queue.c
index 3ae8b1bbaa55..f472de238ac2 100644
--- a/drivers/usb/dwc2/hcd_queue.c
+++ b/drivers/usb/dwc2/hcd_queue.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause)
 /*
  * hcd_queue.c - DesignWare HS OTG Controller host queuing routines
  *
diff --git a/drivers/usb/dwc2/hw.h b/drivers/usb/dwc2/hw.h
index 4592012c4743..2c906d8ee465 100644
--- a/drivers/usb/dwc2/hw.h
+++ b/drivers/usb/dwc2/hw.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause)
 /*
  * hw.h - DesignWare HS OTG Controller hardware definitions
  *
diff --git a/drivers/usb/dwc2/params.c b/drivers/usb/dwc2/params.c
index a3ffe97170ff..ef73af6e03a9 100644
--- a/drivers/usb/dwc2/params.c
+++ b/drivers/usb/dwc2/params.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause)
 /*
  * Copyright (C) 2004-2016 Synopsys, Inc.
  *
@@ -136,6 +137,15 @@ static void dwc2_set_stm32f4x9_fsotg_params(struct dwc2_hsotg *hsotg)
         p->activate_stm_fs_transceiver = true;
 }
 
+static void dwc2_set_stm32f7xx_hsotg_params(struct dwc2_hsotg *hsotg)
+{
+        struct dwc2_core_params *p = &hsotg->params;
+
+        p->host_rx_fifo_size = 622;
+        p->host_nperio_tx_fifo_size = 128;
+        p->host_perio_tx_fifo_size = 256;
+}
+
 const struct of_device_id dwc2_of_match_table[] = {
         { .compatible = "brcm,bcm2835-usb", .data = dwc2_set_bcm_params },
         { .compatible = "hisilicon,hi6220-usb", .data = dwc2_set_his_params  },
@@ -154,6 +164,8 @@ const struct of_device_id dwc2_of_match_table[] = {
         { .compatible = "st,stm32f4x9-fsotg",
           .data = dwc2_set_stm32f4x9_fsotg_params },
         { .compatible = "st,stm32f4x9-hsotg" },
+        { .compatible = "st,stm32f7xx-hsotg",
+          .data = dwc2_set_stm32f7xx_hsotg_params },
         {},
 };
 MODULE_DEVICE_TABLE(of, dwc2_of_match_table);
@@ -335,6 +347,9 @@ static void dwc2_get_device_properties(struct dwc2_hsotg *hsotg)
                                                        num);
                 }
         }
+
+        if (of_find_property(hsotg->dev->of_node, "disable-over-current", NULL))
+                p->oc_disable = true;
 }
 
 static void dwc2_check_param_otg_cap(struct dwc2_hsotg *hsotg)
diff --git a/drivers/usb/dwc2/pci.c b/drivers/usb/dwc2/pci.c
index fdeb8c7bf30a..3ecc951a1aea 100644
--- a/drivers/usb/dwc2/pci.c
+++ b/drivers/usb/dwc2/pci.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause)
 /*
  * pci.c - DesignWare HS OTG Controller PCI driver
  *
diff --git a/drivers/usb/dwc2/platform.c b/drivers/usb/dwc2/platform.c
index daf0d37acb37..3e26550d13dd 100644
--- a/drivers/usb/dwc2/platform.c
+++ b/drivers/usb/dwc2/platform.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause)
 /*
  * platform.c - DesignWare HS OTG Controller platform driver
  *
diff --git a/drivers/usb/dwc3/core.c b/drivers/usb/dwc3/core.c
index 03474d3575ab..07832509584f 100644
--- a/drivers/usb/dwc3/core.c
+++ b/drivers/usb/dwc3/core.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /**
  * core.c - DesignWare USB3 DRD Controller Core file
  *
@@ -5,18 +6,6 @@
  *
  * Authors: Felipe Balbi <balbi@ti.com>,
  *          Sebastian Andrzej Siewior <bigeasy@linutronix.de>
- *
- * 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.
- *
- * 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/version.h>
@@ -156,9 +145,8 @@ static void __dwc3_set_mode(struct work_struct *work)
                 } else {
                         if (dwc->usb2_phy)
                                 otg_set_vbus(dwc->usb2_phy->otg, true);
-                        if (dwc->usb2_generic_phy)
-                                phy_set_mode(dwc->usb2_generic_phy, PHY_MODE_USB_HOST);
-
+                        phy_set_mode(dwc->usb2_generic_phy, PHY_MODE_USB_HOST);
+                        phy_set_mode(dwc->usb3_generic_phy, PHY_MODE_USB_HOST);
                 }
                 break;
         case DWC3_GCTL_PRTCAP_DEVICE:
@@ -166,8 +154,8 @@ static void __dwc3_set_mode(struct work_struct *work)
 
                 if (dwc->usb2_phy)
                         otg_set_vbus(dwc->usb2_phy->otg, false);
-                if (dwc->usb2_generic_phy)
-                        phy_set_mode(dwc->usb2_generic_phy, PHY_MODE_USB_DEVICE);
+                phy_set_mode(dwc->usb2_generic_phy, PHY_MODE_USB_DEVICE);
+                phy_set_mode(dwc->usb3_generic_phy, PHY_MODE_USB_DEVICE);
 
                 ret = dwc3_gadget_init(dwc);
                 if (ret)
@@ -927,12 +915,13 @@ static int dwc3_core_init_mode(struct dwc3 *dwc)
 
         switch (dwc->dr_mode) {
         case USB_DR_MODE_PERIPHERAL:
+                dwc->current_dr_role = DWC3_GCTL_PRTCAP_DEVICE;
                 dwc3_set_prtcap(dwc, DWC3_GCTL_PRTCAP_DEVICE);
 
                 if (dwc->usb2_phy)
                         otg_set_vbus(dwc->usb2_phy->otg, false);
-                if (dwc->usb2_generic_phy)
-                        phy_set_mode(dwc->usb2_generic_phy, PHY_MODE_USB_DEVICE);
+                phy_set_mode(dwc->usb2_generic_phy, PHY_MODE_USB_DEVICE);
+                phy_set_mode(dwc->usb3_generic_phy, PHY_MODE_USB_DEVICE);
 
                 ret = dwc3_gadget_init(dwc);
                 if (ret) {
@@ -942,12 +931,13 @@ static int dwc3_core_init_mode(struct dwc3 *dwc)
                 }
                 break;
         case USB_DR_MODE_HOST:
+                dwc->current_dr_role = DWC3_GCTL_PRTCAP_HOST;
                 dwc3_set_prtcap(dwc, DWC3_GCTL_PRTCAP_HOST);
 
                 if (dwc->usb2_phy)
                         otg_set_vbus(dwc->usb2_phy->otg, true);
-                if (dwc->usb2_generic_phy)
-                        phy_set_mode(dwc->usb2_generic_phy, PHY_MODE_USB_HOST);
+                phy_set_mode(dwc->usb2_generic_phy, PHY_MODE_USB_HOST);
+                phy_set_mode(dwc->usb3_generic_phy, PHY_MODE_USB_HOST);
 
                 ret = dwc3_host_init(dwc);
                 if (ret) {
@@ -1293,21 +1283,19 @@ static int dwc3_suspend_common(struct dwc3 *dwc)
 {
         unsigned long   flags;
 
-        switch (dwc->dr_mode) {
-        case USB_DR_MODE_PERIPHERAL:
-        case USB_DR_MODE_OTG:
+        switch (dwc->current_dr_role) {
+        case DWC3_GCTL_PRTCAP_DEVICE:
                 spin_lock_irqsave(&dwc->lock, flags);
                 dwc3_gadget_suspend(dwc);
                 spin_unlock_irqrestore(&dwc->lock, flags);
+                dwc3_core_exit(dwc);
                 break;
-        case USB_DR_MODE_HOST:
+        case DWC3_GCTL_PRTCAP_HOST:
         default:
                 /* do nothing */
                 break;
         }
 
-        dwc3_core_exit(dwc);
-
         return 0;
 }
 
@@ -1316,18 +1304,17 @@ static int dwc3_resume_common(struct dwc3 *dwc)
         unsigned long   flags;
         int             ret;
 
-        ret = dwc3_core_init(dwc);
-        if (ret)
-                return ret;
+        switch (dwc->current_dr_role) {
+        case DWC3_GCTL_PRTCAP_DEVICE:
+                ret = dwc3_core_init(dwc);
+                if (ret)
+                        return ret;
 
-        switch (dwc->dr_mode) {
-        case USB_DR_MODE_PERIPHERAL:
-        case USB_DR_MODE_OTG:
                 spin_lock_irqsave(&dwc->lock, flags);
                 dwc3_gadget_resume(dwc);
                 spin_unlock_irqrestore(&dwc->lock, flags);
-                /* FALLTHROUGH */
-        case USB_DR_MODE_HOST:
+                break;
+        case DWC3_GCTL_PRTCAP_HOST:
         default:
                 /* do nothing */
                 break;
@@ -1338,7 +1325,7 @@ static int dwc3_resume_common(struct dwc3 *dwc)
 
 static int dwc3_runtime_checks(struct dwc3 *dwc)
 {
-        switch (dwc->dr_mode) {
+        switch (dwc->current_dr_role) {
         case USB_DR_MODE_PERIPHERAL:
         case USB_DR_MODE_OTG:
                 if (dwc->connected)
@@ -1381,19 +1368,17 @@ static int dwc3_runtime_resume(struct device *dev)
         if (ret)
                 return ret;
 
-        switch (dwc->dr_mode) {
-        case USB_DR_MODE_PERIPHERAL:
-        case USB_DR_MODE_OTG:
+        switch (dwc->current_dr_role) {
+        case DWC3_GCTL_PRTCAP_DEVICE:
                 dwc3_gadget_process_pending_events(dwc);
                 break;
-        case USB_DR_MODE_HOST:
+        case DWC3_GCTL_PRTCAP_HOST:
         default:
                 /* do nothing */
                 break;
         }
 
         pm_runtime_mark_last_busy(dev);
-        pm_runtime_put(dev);
 
         return 0;
 }
@@ -1402,13 +1387,12 @@ static int dwc3_runtime_idle(struct device *dev)
 {
         struct dwc3     *dwc = dev_get_drvdata(dev);
 
-        switch (dwc->dr_mode) {
-        case USB_DR_MODE_PERIPHERAL:
-        case USB_DR_MODE_OTG:
+        switch (dwc->current_dr_role) {
+        case DWC3_GCTL_PRTCAP_DEVICE:
                 if (dwc3_runtime_checks(dwc))
                         return -EBUSY;
                 break;
-        case USB_DR_MODE_HOST:
+        case DWC3_GCTL_PRTCAP_HOST:
         default:
                 /* do nothing */
                 break;
diff --git a/drivers/usb/dwc3/core.h b/drivers/usb/dwc3/core.h
index ea910acb4bb0..4a4a4c98508c 100644
--- a/drivers/usb/dwc3/core.h
+++ b/drivers/usb/dwc3/core.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * core.h - DesignWare USB3 DRD Core Header
  *
@@ -5,15 +6,6 @@
  *
  * Authors: Felipe Balbi <balbi@ti.com>,
  *          Sebastian Andrzej Siewior <bigeasy@linutronix.de>
- *
- * 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.
  */
 
 #ifndef __DRIVERS_USB_DWC3_CORE_H
@@ -529,6 +521,7 @@ struct dwc3_event_buffer {
  * @number: endpoint number (1 - 15)
  * @type: set to bmAttributes & USB_ENDPOINT_XFERTYPE_MASK
  * @resource_index: Resource transfer index
+ * @frame_number: set to the frame number we want this transfer to start (ISOC)
  * @interval: the interval on which the ISOC transfer is started
  * @allocated_requests: number of requests allocated
  * @queued_requests: number of requests queued for transfer
@@ -581,6 +574,7 @@ struct dwc3_ep {
         u8                      resource_index;
         u32                     allocated_requests;
         u32                     queued_requests;
+        u32                     frame_number;
         u32                     interval;
 
         char                    name[20];
diff --git a/drivers/usb/dwc3/debug.h b/drivers/usb/dwc3/debug.h
index 5e9c070ec874..368f8e59219a 100644
--- a/drivers/usb/dwc3/debug.h
+++ b/drivers/usb/dwc3/debug.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /**
  * debug.h - DesignWare USB3 DRD Controller Debug Header
  *
@@ -5,15 +6,6 @@
  *
  * Authors: Felipe Balbi <balbi@ti.com>,
  *          Sebastian Andrzej Siewior <bigeasy@linutronix.de>
- *
- * 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.
  */
 
 #ifndef __DWC3_DEBUG_H
diff --git a/drivers/usb/dwc3/debugfs.c b/drivers/usb/dwc3/debugfs.c
index 4e09be80e59f..00e65530c81e 100644
--- a/drivers/usb/dwc3/debugfs.c
+++ b/drivers/usb/dwc3/debugfs.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /**
  * debugfs.c - DesignWare USB3 DRD Controller DebugFS file
  *
@@ -5,15 +6,6 @@
  *
  * Authors: Felipe Balbi <balbi@ti.com>,
  *          Sebastian Andrzej Siewior <bigeasy@linutronix.de>
- *
- * 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 <linux/kernel.h>
diff --git a/drivers/usb/dwc3/drd.c b/drivers/usb/dwc3/drd.c
index 2765c51c7ef5..cc8ab9a8e9d2 100644
--- a/drivers/usb/dwc3/drd.c
+++ b/drivers/usb/dwc3/drd.c
@@ -1,21 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0
 /**
  * drd.c - DesignWare USB3 DRD Controller Dual-role support
  *
  * Copyright (C) 2017 Texas Instruments Incorporated - http://www.ti.com
  *
  * Authors: Roger Quadros <rogerq@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.
- *
- * 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/extcon.h>
diff --git a/drivers/usb/dwc3/dwc3-exynos.c b/drivers/usb/dwc3/dwc3-exynos.c
index e089df72f766..a94fb1ba8f2c 100644
--- a/drivers/usb/dwc3/dwc3-exynos.c
+++ b/drivers/usb/dwc3/dwc3-exynos.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /**
  * dwc3-exynos.c - Samsung EXYNOS DWC3 Specific Glue layer
  *
@@ -5,15 +6,6 @@
  *              http://www.samsung.com
  *
  * Author: Anton Tikhomirov <av.tikhomirov@samsung.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 <linux/module.h>
diff --git a/drivers/usb/dwc3/dwc3-keystone.c b/drivers/usb/dwc3/dwc3-keystone.c
index d2ed9523e77c..193a9a88222a 100644
--- a/drivers/usb/dwc3/dwc3-keystone.c
+++ b/drivers/usb/dwc3/dwc3-keystone.c
@@ -1,18 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0
 /**
  * dwc3-keystone.c - Keystone Specific Glue layer
  *
  * Copyright (C) 2010-2013 Texas Instruments Incorporated - http://www.ti.com
  *
  * Author: WingMan Kwok <w-kwok2@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 <linux/module.h>
diff --git a/drivers/usb/dwc3/dwc3-of-simple.c b/drivers/usb/dwc3/dwc3-of-simple.c
index a26d1fde0f5e..c4a4d7bd2766 100644
--- a/drivers/usb/dwc3/dwc3-of-simple.c
+++ b/drivers/usb/dwc3/dwc3-of-simple.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /**
  * dwc3-of-simple.c - OF glue layer for simple integrations
  *
@@ -5,15 +6,6 @@
  *
  * 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.
- *
  * This is a combination of the old dwc3-qcom.c by Ivan T. Ivanov
  * <iivanov@mm-sol.com> and the original patch adding support for Xilinx' SoC
  * by Subbaraya Sundeep Bhatta <subbaraya.sundeep.bhatta@xilinx.com>
@@ -28,11 +20,13 @@
 #include <linux/of.h>
 #include <linux/of_platform.h>
 #include <linux/pm_runtime.h>
+#include <linux/reset.h>
 
 struct dwc3_of_simple {
         struct device           *dev;
         struct clk              **clks;
         int                     num_clocks;
+        struct reset_control    *resets;
 };
 
 static int dwc3_of_simple_clk_init(struct dwc3_of_simple *simple, int count)
@@ -95,10 +89,21 @@ static int dwc3_of_simple_probe(struct platform_device *pdev)
         platform_set_drvdata(pdev, simple);
         simple->dev = dev;
 
+        simple->resets = of_reset_control_array_get_optional_exclusive(np);
+        if (IS_ERR(simple->resets)) {
+                ret = PTR_ERR(simple->resets);
+                dev_err(dev, "failed to get device resets, err=%d\n", ret);
+                return ret;
+        }
+
+        ret = reset_control_deassert(simple->resets);
+        if (ret)
+                goto err_resetc_put;
+
         ret = dwc3_of_simple_clk_init(simple, of_count_phandle_with_args(np,
                                                 "clocks", "#clock-cells"));
         if (ret)
-                return ret;
+                goto err_resetc_assert;
 
         ret = of_platform_populate(np, NULL, NULL, dev);
         if (ret) {
@@ -107,7 +112,7 @@ static int dwc3_of_simple_probe(struct platform_device *pdev)
                         clk_put(simple->clks[i]);
                 }
 
-                return ret;
+                goto err_resetc_assert;
         }
 
         pm_runtime_set_active(dev);
@@ -115,6 +120,13 @@ static int dwc3_of_simple_probe(struct platform_device *pdev)
         pm_runtime_get_sync(dev);
 
         return 0;
+
+err_resetc_assert:
+        reset_control_assert(simple->resets);
+
+err_resetc_put:
+        reset_control_put(simple->resets);
+        return ret;
 }
 
 static int dwc3_of_simple_remove(struct platform_device *pdev)
@@ -123,12 +135,15 @@ static int dwc3_of_simple_remove(struct platform_device *pdev)
         struct device           *dev = &pdev->dev;
         int                     i;
 
+        of_platform_depopulate(dev);
+
         for (i = 0; i < simple->num_clocks; i++) {
                 clk_disable_unprepare(simple->clks[i]);
                 clk_put(simple->clks[i]);
         }
 
-        of_platform_depopulate(dev);
+        reset_control_assert(simple->resets);
+        reset_control_put(simple->resets);
 
         pm_runtime_put_sync(dev);
         pm_runtime_disable(dev);
diff --git a/drivers/usb/dwc3/dwc3-omap.c b/drivers/usb/dwc3/dwc3-omap.c
index 3530795bbb8f..a4719e853b85 100644
--- a/drivers/usb/dwc3/dwc3-omap.c
+++ b/drivers/usb/dwc3/dwc3-omap.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /**
  * dwc3-omap.c - OMAP Specific Glue layer
  *
@@ -5,15 +6,6 @@
  *
  * Authors: Felipe Balbi <balbi@ti.com>,
  *          Sebastian Andrzej Siewior <bigeasy@linutronix.de>
- *
- * 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 <linux/module.h>
diff --git a/drivers/usb/dwc3/dwc3-pci.c b/drivers/usb/dwc3/dwc3-pci.c
index 54343fbd85ee..3ba11136ebf0 100644
--- a/drivers/usb/dwc3/dwc3-pci.c
+++ b/drivers/usb/dwc3/dwc3-pci.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /**
  * dwc3-pci.c - PCI Specific glue layer
  *
@@ -5,21 +6,13 @@
  *
  * Authors: Felipe Balbi <balbi@ti.com>,
  *          Sebastian Andrzej Siewior <bigeasy@linutronix.de>
- *
- * 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 <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/slab.h>
 #include <linux/pci.h>
+#include <linux/workqueue.h>
 #include <linux/pm_runtime.h>
 #include <linux/platform_device.h>
 #include <linux/gpio/consumer.h>
@@ -61,6 +54,7 @@ struct dwc3_pci {
         guid_t guid;
 
         unsigned int has_dsm_for_pm:1;
+        struct work_struct wakeup_work;
 };
 
 static const struct acpi_gpio_params reset_gpios = { 0, 0, false };
@@ -174,6 +168,22 @@ static int dwc3_pci_quirks(struct dwc3_pci *dwc)
         return 0;
 }
 
+#ifdef CONFIG_PM
+static void dwc3_pci_resume_work(struct work_struct *work)
+{
+        struct dwc3_pci *dwc = container_of(work, struct dwc3_pci, wakeup_work);
+        struct platform_device *dwc3 = dwc->dwc3;
+        int ret;
+
+        ret = pm_runtime_get_sync(&dwc3->dev);
+        if (ret)
+                return;
+
+        pm_runtime_mark_last_busy(&dwc3->dev);
+        pm_runtime_put_sync_autosuspend(&dwc3->dev);
+}
+#endif
+
 static int dwc3_pci_probe(struct pci_dev *pci,
                 const struct pci_device_id *id)
 {
@@ -232,6 +242,9 @@ static int dwc3_pci_probe(struct pci_dev *pci,
         device_init_wakeup(dev, true);
         pci_set_drvdata(pci, dwc);
         pm_runtime_put(dev);
+#ifdef CONFIG_PM
+        INIT_WORK(&dwc->wakeup_work, dwc3_pci_resume_work);
+#endif
 
         return 0;
 err:
@@ -243,6 +256,9 @@ static void dwc3_pci_remove(struct pci_dev *pci)
 {
         struct dwc3_pci         *dwc = pci_get_drvdata(pci);
 
+#ifdef CONFIG_PM
+        cancel_work_sync(&dwc->wakeup_work);
+#endif
         device_init_wakeup(&pci->dev, false);
         pm_runtime_get(&pci->dev);
         platform_device_unregister(dwc->dwc3);
@@ -318,14 +334,15 @@ static int dwc3_pci_runtime_suspend(struct device *dev)
 static int dwc3_pci_runtime_resume(struct device *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);
+        queue_work(pm_wq, &dwc->wakeup_work);
+
+        return 0;
 }
 #endif /* CONFIG_PM */
 
diff --git a/drivers/usb/dwc3/dwc3-st.c b/drivers/usb/dwc3/dwc3-st.c
index 505676fd3ba4..16081383c401 100644
--- a/drivers/usb/dwc3/dwc3-st.c
+++ b/drivers/usb/dwc3/dwc3-st.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0+
 /**
  * dwc3-st.c Support for dwc3 platform devices on ST Microelectronics platforms
  *
@@ -10,11 +11,6 @@
  * Contributors: Aymen Bouattay <aymen.bouattay@st.com>
  *               Peter Griffin <peter.griffin@linaro.org>
  *
- * 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.
- *
  * Inspired by dwc3-omap.c and dwc3-exynos.c.
  */
 
diff --git a/drivers/usb/dwc3/ep0.c b/drivers/usb/dwc3/ep0.c
index 75e6cb044eb2..fd3e7ad2eb0e 100644
--- a/drivers/usb/dwc3/ep0.c
+++ b/drivers/usb/dwc3/ep0.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * ep0.c - DesignWare USB3 DRD Controller Endpoint 0 Handling
  *
@@ -5,15 +6,6 @@
  *
  * Authors: Felipe Balbi <balbi@ti.com>,
  *          Sebastian Andrzej Siewior <bigeasy@linutronix.de>
- *
- * 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 <linux/kernel.h>
@@ -487,14 +479,10 @@ static int dwc3_ep0_handle_device(struct dwc3 *dwc,
 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:
@@ -517,14 +505,10 @@ 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;
 
         wValue = le16_to_cpu(ctrl->wValue);
-        wIndex = le16_to_cpu(ctrl->wIndex);
-        state = dwc->gadget.state;
 
         switch (wValue) {
         case USB_ENDPOINT_HALT:
@@ -551,10 +535,8 @@ static int dwc3_ep0_handle_feature(struct dwc3 *dwc,
 {
         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:
@@ -712,12 +694,10 @@ static int dwc3_ep0_set_sel(struct dwc3 *dwc, struct usb_ctrlrequest *ctrl)
         struct dwc3_ep  *dep;
         enum usb_device_state state = dwc->gadget.state;
         u16             wLength;
-        u16             wValue;
 
         if (state == USB_STATE_DEFAULT)
                 return -EINVAL;
 
-        wValue = le16_to_cpu(ctrl->wValue);
         wLength = le16_to_cpu(ctrl->wLength);
 
         if (wLength != 6) {
@@ -842,9 +822,6 @@ static void dwc3_ep0_complete_data(struct dwc3 *dwc,
         struct usb_request      *ur;
         struct dwc3_trb         *trb;
         struct dwc3_ep          *ep0;
-        unsigned                maxp;
-        unsigned                remaining_ur_length;
-        void                    *buf;
         u32                     transferred = 0;
         u32                     status;
         u32                     length;
@@ -871,11 +848,8 @@ static void dwc3_ep0_complete_data(struct dwc3 *dwc,
         }
 
         ur = &r->request;
-        buf = ur->buf;
-        remaining_ur_length = ur->length;
 
         length = trb->size & DWC3_TRB_SIZE_MASK;
-        maxp = ep0->endpoint.maxpacket;
         transferred = ur->length - length;
         ur->actual += transferred;
 
@@ -1001,7 +975,6 @@ static void __dwc3_ep0_do_control_data(struct dwc3 *dwc,
         } else if (IS_ALIGNED(req->request.length, dep->endpoint.maxpacket) &&
                    req->request.length && req->request.zero) {
                 u32     maxpacket;
-                u32     rem;
 
                 ret = usb_gadget_map_request_by_dev(dwc->sysdev,
                                 &req->request, dep->number);
@@ -1009,7 +982,6 @@ static void __dwc3_ep0_do_control_data(struct dwc3 *dwc,
                         return;
 
                 maxpacket = dep->endpoint.maxpacket;
-                rem = req->request.length % maxpacket;
 
                 /* prepare normal TRB */
                 dwc3_ep0_prepare_one_trb(dep, req->request.dma,
diff --git a/drivers/usb/dwc3/gadget.c b/drivers/usb/dwc3/gadget.c
index f064f1549333..981fd986cf82 100644
--- a/drivers/usb/dwc3/gadget.c
+++ b/drivers/usb/dwc3/gadget.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * gadget.c - DesignWare USB3 DRD Controller Gadget Framework Link
  *
@@ -5,15 +6,6 @@
  *
  * Authors: Felipe Balbi <balbi@ti.com>,
  *          Sebastian Andrzej Siewior <bigeasy@linutronix.de>
- *
- * 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 <linux/kernel.h>
@@ -1151,9 +1143,6 @@ static void dwc3_prepare_trbs(struct dwc3_ep *dep)
 
         BUILD_BUG_ON_NOT_POWER_OF_2(DWC3_TRB_NUM);
 
-        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
@@ -1194,7 +1183,7 @@ static void dwc3_prepare_trbs(struct dwc3_ep *dep)
         }
 }
 
-static int __dwc3_gadget_kick_transfer(struct dwc3_ep *dep, u16 cmd_param)
+static int __dwc3_gadget_kick_transfer(struct dwc3_ep *dep)
 {
         struct dwc3_gadget_ep_cmd_params params;
         struct dwc3_request             *req;
@@ -1202,6 +1191,9 @@ static int __dwc3_gadget_kick_transfer(struct dwc3_ep *dep, u16 cmd_param)
         int                             ret;
         u32                             cmd;
 
+        if (!dwc3_calc_trbs_left(dep))
+                return 0;
+
         starting = !(dep->flags & DWC3_EP_BUSY);
 
         dwc3_prepare_trbs(dep);
@@ -1216,8 +1208,10 @@ static int __dwc3_gadget_kick_transfer(struct dwc3_ep *dep, u16 cmd_param)
         if (starting) {
                 params.param0 = upper_32_bits(req->trb_dma);
                 params.param1 = lower_32_bits(req->trb_dma);
-                cmd = DWC3_DEPCMD_STARTTRANSFER |
-                        DWC3_DEPCMD_PARAM(cmd_param);
+                cmd = DWC3_DEPCMD_STARTTRANSFER;
+
+                if (usb_endpoint_xfer_isoc(dep->endpoint.desc))
+                        cmd |= DWC3_DEPCMD_PARAM(dep->frame_number);
         } else {
                 cmd = DWC3_DEPCMD_UPDATETRANSFER |
                         DWC3_DEPCMD_PARAM(dep->resource_index);
@@ -1258,8 +1252,6 @@ static int __dwc3_gadget_get_frame(struct dwc3 *dwc)
 static void __dwc3_gadget_start_isoc(struct dwc3 *dwc,
                 struct dwc3_ep *dep, u32 cur_uf)
 {
-        u32 uf;
-
         if (list_empty(&dep->pending_list)) {
                 dev_info(dwc->dev, "%s: ran out of requests\n",
                                 dep->name);
@@ -1271,9 +1263,8 @@ static void __dwc3_gadget_start_isoc(struct dwc3 *dwc,
          * Schedule the first trb for one interval in the future or at
          * least 4 microframes.
          */
-        uf = cur_uf + max_t(u32, 4, dep->interval);
-
-        __dwc3_gadget_kick_transfer(dep, uf);
+        dep->frame_number = cur_uf + max_t(u32, 4, dep->interval);
+        __dwc3_gadget_kick_transfer(dep);
 }
 
 static void dwc3_gadget_start_isoc(struct dwc3 *dwc,
@@ -1290,7 +1281,6 @@ static void dwc3_gadget_start_isoc(struct dwc3 *dwc,
 static int __dwc3_gadget_ep_queue(struct dwc3_ep *dep, struct dwc3_request *req)
 {
         struct dwc3             *dwc = dep->dwc;
-        int                     ret = 0;
 
         if (!dep->endpoint.desc) {
                 dev_err(dwc->dev, "%s: can't queue to disabled endpoint\n",
@@ -1337,24 +1327,14 @@ static int __dwc3_gadget_ep_queue(struct dwc3_ep *dep, struct dwc3_request *req)
                 }
 
                 if ((dep->flags & DWC3_EP_BUSY) &&
-                    !(dep->flags & DWC3_EP_MISSED_ISOC)) {
-                        WARN_ON_ONCE(!dep->resource_index);
-                        ret = __dwc3_gadget_kick_transfer(dep,
-                                                          dep->resource_index);
-                }
-
-                goto out;
-        }
+                    !(dep->flags & DWC3_EP_MISSED_ISOC))
+                        goto out;
 
-        if (!dwc3_calc_trbs_left(dep))
                 return 0;
+        }
 
-        ret = __dwc3_gadget_kick_transfer(dep, 0);
 out:
-        if (ret == -EBUSY)
-                ret = 0;
-
-        return ret;
+        return __dwc3_gadget_kick_transfer(dep);
 }
 
 static int dwc3_gadget_ep_queue(struct usb_ep *ep, struct usb_request *request,
@@ -2347,7 +2327,7 @@ static int dwc3_cleanup_done_reqs(struct dwc3 *dwc, struct dwc3_ep *dep,
                 req->request.actual = length - req->remaining;
 
                 if ((req->request.actual < length) && req->num_pending_sgs)
-                        return __dwc3_gadget_kick_transfer(dep, 0);
+                        return __dwc3_gadget_kick_transfer(dep);
 
                 dwc3_gadget_giveback(dep, req, status);
 
@@ -2440,13 +2420,8 @@ static void dwc3_endpoint_transfer_complete(struct dwc3 *dwc,
         if (!dep->endpoint.desc)
                 return;
 
-        if (!usb_endpoint_xfer_isoc(dep->endpoint.desc)) {
-                int ret;
-
-                ret = __dwc3_gadget_kick_transfer(dep, 0);
-                if (!ret || ret == -EBUSY)
-                        return;
-        }
+        if (!usb_endpoint_xfer_isoc(dep->endpoint.desc))
+                __dwc3_gadget_kick_transfer(dep);
 }
 
 static void dwc3_endpoint_interrupt(struct dwc3 *dwc,
@@ -2487,15 +2462,10 @@ static void dwc3_endpoint_interrupt(struct dwc3 *dwc,
                 dwc3_endpoint_transfer_complete(dwc, dep, event);
                 break;
         case DWC3_DEPEVT_XFERNOTREADY:
-                if (usb_endpoint_xfer_isoc(dep->endpoint.desc)) {
+                if (usb_endpoint_xfer_isoc(dep->endpoint.desc))
                         dwc3_gadget_start_isoc(dwc, dep, event);
-                } else {
-                        int ret;
-
-                        ret = __dwc3_gadget_kick_transfer(dep, 0);
-                        if (!ret || ret == -EBUSY)
-                                return;
-                }
+                else
+                        __dwc3_gadget_kick_transfer(dep);
 
                 break;
         case DWC3_DEPEVT_STREAMEVT:
diff --git a/drivers/usb/dwc3/gadget.h b/drivers/usb/dwc3/gadget.h
index 4a3227543255..578aa856f986 100644
--- a/drivers/usb/dwc3/gadget.h
+++ b/drivers/usb/dwc3/gadget.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * gadget.h - DesignWare USB3 DRD Gadget Header
  *
@@ -5,15 +6,6 @@
  *
  * Authors: Felipe Balbi <balbi@ti.com>,
  *          Sebastian Andrzej Siewior <bigeasy@linutronix.de>
- *
- * 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.
  */
 
 #ifndef __DRIVERS_USB_DWC3_GADGET_H
diff --git a/drivers/usb/dwc3/host.c b/drivers/usb/dwc3/host.c
index 76f0b0df37c1..1a3878a3be78 100644
--- a/drivers/usb/dwc3/host.c
+++ b/drivers/usb/dwc3/host.c
@@ -1,18 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0
 /**
  * host.c - DesignWare USB3 DRD Controller Host Glue
  *
  * Copyright (C) 2011 Texas Instruments Incorporated - http://www.ti.com
  *
  * Authors: 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 <linux/platform_device.h>
diff --git a/drivers/usb/dwc3/io.h b/drivers/usb/dwc3/io.h
index c69b06696824..70acdf94a0bf 100644
--- a/drivers/usb/dwc3/io.h
+++ b/drivers/usb/dwc3/io.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /**
  * io.h - DesignWare USB3 DRD IO Header
  *
@@ -5,15 +6,6 @@
  *
  * Authors: Felipe Balbi <balbi@ti.com>,
  *          Sebastian Andrzej Siewior <bigeasy@linutronix.de>
- *
- * 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.
  */
 
 #ifndef __DRIVERS_USB_DWC3_IO_H
diff --git a/drivers/usb/dwc3/trace.c b/drivers/usb/dwc3/trace.c
index 6cd166412ad0..f8886f3f3c9e 100644
--- a/drivers/usb/dwc3/trace.c
+++ b/drivers/usb/dwc3/trace.c
@@ -1,18 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0
 /**
  * trace.c - DesignWare USB3 DRD Controller 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.
  */
 
 #define CREATE_TRACE_POINTS
diff --git a/drivers/usb/dwc3/trace.h b/drivers/usb/dwc3/trace.h
index 6504b116da04..a9dd5c64e6c7 100644
--- a/drivers/usb/dwc3/trace.h
+++ b/drivers/usb/dwc3/trace.h
@@ -1,18 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0
 /**
  * trace.h - DesignWare USB3 DRD Controller 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.
  */
 
 #undef TRACE_SYSTEM
diff --git a/drivers/usb/dwc3/ulpi.c b/drivers/usb/dwc3/ulpi.c
index e87ce8e9edee..f62b5f3c2d67 100644
--- a/drivers/usb/dwc3/ulpi.c
+++ b/drivers/usb/dwc3/ulpi.c
@@ -1,13 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0
 /**
  * ulpi.c - DesignWare USB3 Controller's ULPI PHY interface
  *
  * Copyright (C) 2015 Intel Corporation
  *
  * Author: Heikki Krogerus <heikki.krogerus@linux.intel.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/ulpi/regs.h>
diff --git a/drivers/usb/early/Makefile b/drivers/usb/early/Makefile
index fcde2286da1c..7b77b49d3b8c 100644
--- a/drivers/usb/early/Makefile
+++ b/drivers/usb/early/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for early USB devices
 #
diff --git a/drivers/usb/early/ehci-dbgp.c b/drivers/usb/early/ehci-dbgp.c
index e2654443e8eb..d633c2abe5a4 100644
--- a/drivers/usb/early/ehci-dbgp.c
+++ b/drivers/usb/early/ehci-dbgp.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Standalone EHCI usb debug driver
  *
diff --git a/drivers/usb/early/xhci-dbc.c b/drivers/usb/early/xhci-dbc.c
index 12fe70beae69..8a700b45b9a9 100644
--- a/drivers/usb/early/xhci-dbc.c
+++ b/drivers/usb/early/xhci-dbc.c
@@ -1,13 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0
 /**
  * xhci-dbc.c - xHCI debug capability early driver
  *
  * Copyright (C) 2016 Intel Corporation
  *
  * Author: Lu Baolu <baolu.lu@linux.intel.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.
  */
 
 #define pr_fmt(fmt)     KBUILD_MODNAME ":%s: " fmt, __func__
diff --git a/drivers/usb/early/xhci-dbc.h b/drivers/usb/early/xhci-dbc.h
index 2df0f6e613fe..673686eeddd7 100644
--- a/drivers/usb/early/xhci-dbc.h
+++ b/drivers/usb/early/xhci-dbc.h
@@ -1,13 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * xhci-dbc.h - xHCI debug capability early driver
  *
  * Copyright (C) 2016 Intel Corporation
  *
  * Author: Lu Baolu <baolu.lu@linux.intel.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.
  */
 
 #ifndef __LINUX_XHCI_DBC_H
@@ -90,8 +87,8 @@ struct xdbc_context {
 
 #define XDBC_INFO_CONTEXT_SIZE          48
 #define XDBC_MAX_STRING_LENGTH          64
-#define XDBC_STRING_MANUFACTURER        "Linux"
-#define XDBC_STRING_PRODUCT             "Remote GDB"
+#define XDBC_STRING_MANUFACTURER        "Linux Foundation"
+#define XDBC_STRING_PRODUCT             "Linux USB GDB Target"
 #define XDBC_STRING_SERIAL              "0001"
 
 struct xdbc_strings {
@@ -103,7 +100,7 @@ struct xdbc_strings {
 
 #define XDBC_PROTOCOL           1       /* GNU Remote Debug Command Set */
 #define XDBC_VENDOR_ID          0x1d6b  /* Linux Foundation 0x1d6b */
-#define XDBC_PRODUCT_ID         0x0004  /* __le16 idProduct; device 0004 */
+#define XDBC_PRODUCT_ID         0x0011  /* __le16 idProduct; device 0011 */
 #define XDBC_DEVICE_REV         0x0010  /* 0.10 */
 
 /*
diff --git a/drivers/usb/gadget/composite.c b/drivers/usb/gadget/composite.c
index 5d061b3d8224..eec14e6ed20b 100644
--- a/drivers/usb/gadget/composite.c
+++ b/drivers/usb/gadget/composite.c
@@ -1,12 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * composite.c - infrastructure for Composite USB Gadgets
  *
  * Copyright (C) 2006-2008 David Brownell
- *
- * 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.
  */
 
 /* #define VERBOSE_DEBUG */
@@ -170,20 +166,20 @@ int config_ep_by_speed(struct usb_gadget *g,
                         want_comp_desc = 1;
                         break;
                 }
-                /* else: Fall trough */
+                /* fall through */
         case USB_SPEED_SUPER:
                 if (gadget_is_superspeed(g)) {
                         speed_desc = f->ss_descriptors;
                         want_comp_desc = 1;
                         break;
                 }
-                /* else: Fall trough */
+                /* fall through */
         case USB_SPEED_HIGH:
                 if (gadget_is_dualspeed(g)) {
                         speed_desc = f->hs_descriptors;
                         break;
                 }
-                /* else: fall through */
+                /* fall through */
         default:
                 speed_desc = f->fs_descriptors;
         }
@@ -224,6 +220,7 @@ ep_found:
                 case USB_ENDPOINT_XFER_ISOC:
                         /* mult: bits 1:0 of bmAttributes */
                         _ep->mult = (comp_desc->bmAttributes & 0x3) + 1;
+                        /* fall through */
                 case USB_ENDPOINT_XFER_BULK:
                 case USB_ENDPOINT_XFER_INT:
                         _ep->maxburst = comp_desc->bMaxBurst + 1;
diff --git a/drivers/usb/gadget/config.c b/drivers/usb/gadget/config.c
index 17a6077b89a4..2d115353424c 100644
--- a/drivers/usb/gadget/config.c
+++ b/drivers/usb/gadget/config.c
@@ -1,12 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * usb/gadget/config.c -- simplify building config descriptors
  *
  * Copyright (C) 2003 David Brownell
- *
- * 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.
  */
 
 #include <linux/errno.h>
diff --git a/drivers/usb/gadget/configfs.c b/drivers/usb/gadget/configfs.c
index aeb9f3c40521..4ddf063b9f47 100644
--- a/drivers/usb/gadget/configfs.c
+++ b/drivers/usb/gadget/configfs.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/configfs.h>
 #include <linux/module.h>
 #include <linux/slab.h>
diff --git a/drivers/usb/gadget/epautoconf.c b/drivers/usb/gadget/epautoconf.c
index 30fdab0ae383..71b15c65b90f 100644
--- a/drivers/usb/gadget/epautoconf.c
+++ b/drivers/usb/gadget/epautoconf.c
@@ -1,12 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * epautoconf.c -- endpoint autoconfiguration for usb gadget drivers
  *
  * Copyright (C) 2004 David Brownell
- *
- * 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.
  */
 
 #include <linux/kernel.h>
diff --git a/drivers/usb/gadget/function/f_acm.c b/drivers/usb/gadget/function/f_acm.c
index 5e3828d9dac7..7140bf3c74fa 100644
--- a/drivers/usb/gadget/function/f_acm.c
+++ b/drivers/usb/gadget/function/f_acm.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * f_acm.c -- USB CDC serial (ACM) function driver
  *
@@ -6,10 +7,6 @@
  * Copyright (C) 2008 by Nokia Corporation
  * Copyright (C) 2009 by Samsung Electronics
  * Author: Michal Nazarewicz (mina86@mina86.com)
- *
- * This software is distributed under the terms of the GNU General
- * Public License ("GPL") as published by the Free Software Foundation,
- * either version 2 of that License or (at your option) any later version.
  */
 
 /* #define VERBOSE_DEBUG */
diff --git a/drivers/usb/gadget/function/f_ecm.c b/drivers/usb/gadget/function/f_ecm.c
index 4c488d15b6f6..b322ca20cd98 100644
--- a/drivers/usb/gadget/function/f_ecm.c
+++ b/drivers/usb/gadget/function/f_ecm.c
@@ -1,13 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * f_ecm.c -- USB CDC Ethernet (ECM) link function driver
  *
  * Copyright (C) 2003-2005,2008 David Brownell
  * Copyright (C) 2008 Nokia Corporation
- *
- * 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.
  */
 
 /* #define VERBOSE_DEBUG */
diff --git a/drivers/usb/gadget/function/f_eem.c b/drivers/usb/gadget/function/f_eem.c
index 007ec6e4a5d4..def3a450a340 100644
--- a/drivers/usb/gadget/function/f_eem.c
+++ b/drivers/usb/gadget/function/f_eem.c
@@ -1,14 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * f_eem.c -- USB CDC Ethernet (EEM) link function driver
  *
  * Copyright (C) 2003-2005,2008 David Brownell
  * Copyright (C) 2008 Nokia Corporation
  * Copyright (C) 2009 EF Johnson Technologies
- *
- * 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.
  */
 
 #include <linux/kernel.h>
diff --git a/drivers/usb/gadget/function/f_fs.c b/drivers/usb/gadget/function/f_fs.c
index 8b342587f8ad..b1001c3f43fb 100644
--- a/drivers/usb/gadget/function/f_fs.c
+++ b/drivers/usb/gadget/function/f_fs.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * f_fs.c -- user mode file system API for USB composite function controllers
  *
@@ -7,11 +8,6 @@
  * Based on inode.c (GadgetFS) which was:
  * Copyright (C) 2003-2004 David Brownell
  * Copyright (C) 2003 Agilent Technologies
- *
- * 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.
  */
 
 
@@ -3677,6 +3673,7 @@ static void ffs_closed(struct ffs_data *ffs)
                 goto done;
 
         ffs_obj->desc_ready = false;
+        ffs_obj->ffs_data = NULL;
 
         if (test_and_clear_bit(FFS_FL_CALL_CLOSED_CALLBACK, &ffs->flags) &&
             ffs_obj->ffs_closed_callback)
diff --git a/drivers/usb/gadget/function/f_hid.c b/drivers/usb/gadget/function/f_hid.c
index d8e359ef6eb1..52576f1b57f1 100644
--- a/drivers/usb/gadget/function/f_hid.c
+++ b/drivers/usb/gadget/function/f_hid.c
@@ -1,12 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * f_hid.c -- USB HID function driver
  *
  * Copyright (C) 2010 Fabien Chouteau <fabien.chouteau@barco.com>
- *
- * 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.
  */
 
 #include <linux/kernel.h>
diff --git a/drivers/usb/gadget/function/f_loopback.c b/drivers/usb/gadget/function/f_loopback.c
index e70093835e14..ed3b054a0a2e 100644
--- a/drivers/usb/gadget/function/f_loopback.c
+++ b/drivers/usb/gadget/function/f_loopback.c
@@ -1,13 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * f_loopback.c - USB peripheral loopback configuration driver
  *
  * Copyright (C) 2003-2008 David Brownell
  * Copyright (C) 2008 by Nokia Corporation
- *
- * 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.
  */
 
 /* #define VERBOSE_DEBUG */
diff --git a/drivers/usb/gadget/function/f_mass_storage.c b/drivers/usb/gadget/function/f_mass_storage.c
index 5153e29870c3..697224237976 100644
--- a/drivers/usb/gadget/function/f_mass_storage.c
+++ b/drivers/usb/gadget/function/f_mass_storage.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause)
 /*
  * f_mass_storage.c -- Mass Storage USB Composite Function
  *
diff --git a/drivers/usb/gadget/function/f_midi.c b/drivers/usb/gadget/function/f_midi.c
index 5d3d7941d2c2..5ea713a975c7 100644
--- a/drivers/usb/gadget/function/f_midi.c
+++ b/drivers/usb/gadget/function/f_midi.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * f_midi.c -- USB MIDI class function driver
  *
@@ -15,8 +16,6 @@
  * and drivers/usb/gadget/midi.c,
  *   Copyright (C) 2006 Thumtronics Pty Ltd.
  *   Ben Williamson <ben.williamson@greyinnovation.com>
- *
- * Licensed under the GPL-2 or later.
  */
 
 #include <linux/kernel.h>
diff --git a/drivers/usb/gadget/function/f_ncm.c b/drivers/usb/gadget/function/f_ncm.c
index 45b334ceaf2e..87d4e7767f96 100644
--- a/drivers/usb/gadget/function/f_ncm.c
+++ b/drivers/usb/gadget/function/f_ncm.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * f_ncm.c -- USB CDC Network (NCM) link function driver
  *
@@ -8,11 +9,6 @@
  *
  * Copyright (C) 2003-2005,2008 David Brownell
  * Copyright (C) 2008 Nokia Corporation
- *
- * 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.
  */
 
 #include <linux/kernel.h>
diff --git a/drivers/usb/gadget/function/f_obex.c b/drivers/usb/gadget/function/f_obex.c
index d43e86cea74f..082f948aa7fd 100644
--- a/drivers/usb/gadget/function/f_obex.c
+++ b/drivers/usb/gadget/function/f_obex.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * f_obex.c -- USB CDC OBEX function driver
  *
@@ -5,11 +6,6 @@
  * Contact: Felipe Balbi <felipe.balbi@nokia.com>
  *
  * Based on f_acm.c by Al Borchers and David Brownell.
- *
- * 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.
  */
 
 /* #define VERBOSE_DEBUG */
diff --git a/drivers/usb/gadget/function/f_phonet.c b/drivers/usb/gadget/function/f_phonet.c
index 9c4c58e4a1a2..2d867b1ffb47 100644
--- a/drivers/usb/gadget/function/f_phonet.c
+++ b/drivers/usb/gadget/function/f_phonet.c
@@ -1,13 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * f_phonet.c -- USB CDC Phonet function
  *
  * Copyright (C) 2007-2008 Nokia Corporation. All rights reserved.
  *
  * Author: Rémi Denis-Courmont
- *
- * 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/mm.h>
@@ -215,6 +212,7 @@ static void pn_tx_complete(struct usb_ep *ep, struct usb_request *req)
         case -ESHUTDOWN: /* disconnected */
         case -ECONNRESET: /* disabled */
                 dev->stats.tx_aborted_errors++;
+                /* fall through */
         default:
                 dev->stats.tx_errors++;
         }
@@ -362,6 +360,7 @@ static void pn_rx_complete(struct usb_ep *ep, struct usb_request *req)
         /* Do resubmit in these cases: */
         case -EOVERFLOW: /* request buffer overflow */
                 dev->stats.rx_over_errors++;
+                /* fall through */
         default:
                 dev->stats.rx_errors++;
                 break;
diff --git a/drivers/usb/gadget/function/f_printer.c b/drivers/usb/gadget/function/f_printer.c
index ea0da35a44e2..587575453f48 100644
--- a/drivers/usb/gadget/function/f_printer.c
+++ b/drivers/usb/gadget/function/f_printer.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * f_printer.c - USB printer function driver
  *
@@ -8,11 +9,6 @@
  *
  * Copyright (C) 2003-2005 David Brownell
  * Copyright (C) 2006 Craig W. Nadler
- *
- * 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.
  */
 
 #include <linux/module.h>
diff --git a/drivers/usb/gadget/function/f_rndis.c b/drivers/usb/gadget/function/f_rndis.c
index c7c5b3ce1d98..9c5bf92c4617 100644
--- a/drivers/usb/gadget/function/f_rndis.c
+++ b/drivers/usb/gadget/function/f_rndis.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * f_rndis.c -- RNDIS link function driver
  *
@@ -6,11 +7,6 @@
  * Copyright (C) 2008 Nokia Corporation
  * Copyright (C) 2009 Samsung Electronics
  *                    Author: Michal Nazarewicz (mina86@mina86.com)
- *
- * 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.
  */
 
 /* #define VERBOSE_DEBUG */
diff --git a/drivers/usb/gadget/function/f_serial.c b/drivers/usb/gadget/function/f_serial.c
index cb00ada21d9c..a41fb83e353e 100644
--- a/drivers/usb/gadget/function/f_serial.c
+++ b/drivers/usb/gadget/function/f_serial.c
@@ -1,13 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * f_serial.c - generic USB serial function driver
  *
  * Copyright (C) 2003 Al Borchers (alborchers@steinerpoint.com)
  * Copyright (C) 2008 by David Brownell
  * Copyright (C) 2008 by Nokia Corporation
- *
- * This software is distributed under the terms of the GNU General
- * Public License ("GPL") as published by the Free Software Foundation,
- * either version 2 of that License or (at your option) any later version.
  */
 
 #include <linux/slab.h>
diff --git a/drivers/usb/gadget/function/f_sourcesink.c b/drivers/usb/gadget/function/f_sourcesink.c
index 8784fa12ea2c..39757dd04744 100644
--- a/drivers/usb/gadget/function/f_sourcesink.c
+++ b/drivers/usb/gadget/function/f_sourcesink.c
@@ -1,13 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * f_sourcesink.c - USB peripheral source/sink configuration driver
  *
  * Copyright (C) 2003-2008 David Brownell
  * Copyright (C) 2008 by Nokia Corporation
- *
- * 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.
  */
 
 /* #define VERBOSE_DEBUG */
diff --git a/drivers/usb/gadget/function/f_subset.c b/drivers/usb/gadget/function/f_subset.c
index 434b983f3b4c..a52d17a69977 100644
--- a/drivers/usb/gadget/function/f_subset.c
+++ b/drivers/usb/gadget/function/f_subset.c
@@ -1,13 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * f_subset.c -- "CDC Subset" Ethernet link function driver
  *
  * Copyright (C) 2003-2005,2008 David Brownell
  * Copyright (C) 2008 Nokia Corporation
- *
- * 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.
  */
 
 #include <linux/slab.h>
diff --git a/drivers/usb/gadget/function/f_tcm.c b/drivers/usb/gadget/function/f_tcm.c
index a82e2bd5ea34..28cb53de51b8 100644
--- a/drivers/usb/gadget/function/f_tcm.c
+++ b/drivers/usb/gadget/function/f_tcm.c
@@ -1,10 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0
 /* Target based USB-Gadget
  *
  * UAS protocol handling, target callbacks, configfs handling,
  * BBB (USB Mass Storage Class Bulk-Only (BBB) and Transport protocol handling.
  *
  * Author: Sebastian Andrzej Siewior <bigeasy at linutronix dot de>
- * License: GPLv2 as published by FSF.
  */
 #include <linux/kernel.h>
 #include <linux/module.h>
@@ -1145,6 +1145,7 @@ static int usbg_submit_command(struct f_uas *fu,
         default:
                 pr_debug_once("Unsupported prio_attr: %02x.\n",
                                 cmd_iu->prio_attr);
+                /* fall through */
         case UAS_SIMPLE_TAG:
                 cmd->prio_attr = TCM_SIMPLE_TAG;
                 break;
diff --git a/drivers/usb/gadget/function/f_uac1.c b/drivers/usb/gadget/function/f_uac1.c
index 29efbedc91f9..91e3f3e6bf78 100644
--- a/drivers/usb/gadget/function/f_uac1.c
+++ b/drivers/usb/gadget/function/f_uac1.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * f_uac1.c -- USB Audio Class 1.0 Function (using u_audio API)
  *
@@ -10,11 +11,6 @@
  * This file is based on f_uac1.c which is
  *   Copyright (C) 2008 Bryan Wu <cooloney@kernel.org>
  *   Copyright (C) 2008 Analog Devices, Inc
- *
- * 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.
  */
 
 #include <linux/usb/audio.h>
diff --git a/drivers/usb/gadget/function/f_uac1_legacy.c b/drivers/usb/gadget/function/f_uac1_legacy.c
index 5d229e72912e..8bd6f6e8d24a 100644
--- a/drivers/usb/gadget/function/f_uac1_legacy.c
+++ b/drivers/usb/gadget/function/f_uac1_legacy.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * f_audio.c -- USB Audio class function driver
   *
@@ -5,8 +6,6 @@
  * Copyright (C) 2008 Analog Devices, Inc
  *
  * Enter bugs at http://blackfin.uclinux.org/
- *
- * Licensed under the GPL-2 or later.
  */
 
 #include <linux/slab.h>
diff --git a/drivers/usb/gadget/function/f_uac2.c b/drivers/usb/gadget/function/f_uac2.c
index f05c3f3e6103..9dc33a70db33 100644
--- a/drivers/usb/gadget/function/f_uac2.c
+++ b/drivers/usb/gadget/function/f_uac2.c
@@ -1,14 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * f_uac2.c -- USB Audio Class 2.0 Function
  *
  * Copyright (C) 2011
  *    Yadwinder Singh (yadi.brar01@gmail.com)
  *    Jaswinder Singh (jaswinder.singh@linaro.org)
- *
- * 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.
  */
 
 #include <linux/usb/audio.h>
diff --git a/drivers/usb/gadget/function/f_uvc.c b/drivers/usb/gadget/function/f_uvc.c
index f8a1881609a2..439eba660e95 100644
--- a/drivers/usb/gadget/function/f_uvc.c
+++ b/drivers/usb/gadget/function/f_uvc.c
@@ -1,13 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  *      uvc_gadget.c  --  USB Video Class Gadget driver
  *
  *      Copyright (C) 2009-2010
  *          Laurent Pinchart (laurent.pinchart@ideasonboard.com)
- *
- *      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.
  */
 
 #include <linux/kernel.h>
diff --git a/drivers/usb/gadget/function/f_uvc.h b/drivers/usb/gadget/function/f_uvc.h
index d0a73bdcbba1..81defe4557fe 100644
--- a/drivers/usb/gadget/function/f_uvc.h
+++ b/drivers/usb/gadget/function/f_uvc.h
@@ -1,13 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  *      f_uvc.h  --  USB Video Class Gadget driver
  *
  *      Copyright (C) 2009-2010
  *          Laurent Pinchart (laurent.pinchart@ideasonboard.com)
- *
- *      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.
  */
 
 #ifndef _F_UVC_H_
diff --git a/drivers/usb/gadget/function/rndis.c b/drivers/usb/gadget/function/rndis.c
index d6341045c631..51dd3e90b06c 100644
--- a/drivers/usb/gadget/function/rndis.c
+++ b/drivers/usb/gadget/function/rndis.c
@@ -1,13 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * RNDIS MSG parser
  *
  * Authors:     Benedikt Spranger, Pengutronix
  *              Robert Schwebel, Pengutronix
  *
- *              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.
- *
  *              This software was originally developed in conformance with
  *              Microsoft's Remote NDIS Specification License Agreement.
  *
diff --git a/drivers/usb/gadget/function/rndis.h b/drivers/usb/gadget/function/rndis.h
index 21e0430ffb98..c7e3a70ce6c1 100644
--- a/drivers/usb/gadget/function/rndis.h
+++ b/drivers/usb/gadget/function/rndis.h
@@ -1,13 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * RNDIS        Definitions for Remote NDIS
  *
  * Authors:     Benedikt Spranger, Pengutronix
  *              Robert Schwebel, Pengutronix
  *
- *              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.
- *
  *              This software was originally developed in conformance with
  *              Microsoft's Remote NDIS Specification License Agreement.
  */
diff --git a/drivers/usb/gadget/function/storage_common.c b/drivers/usb/gadget/function/storage_common.c
index 8fbf6861690d..f7e6c42558eb 100644
--- a/drivers/usb/gadget/function/storage_common.c
+++ b/drivers/usb/gadget/function/storage_common.c
@@ -1,14 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * storage_common.c -- Common definitions for mass storage functionality
  *
  * Copyright (C) 2003-2008 Alan Stern
  * Copyeight (C) 2009 Samsung Electronics
  * Author: Michal Nazarewicz (mina86@mina86.com)
- *
- * 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.
  */
 
 /*
diff --git a/drivers/usb/gadget/function/u_audio.c b/drivers/usb/gadget/function/u_audio.c
index 3971bbab88bd..a72295c953bb 100644
--- a/drivers/usb/gadget/function/u_audio.c
+++ b/drivers/usb/gadget/function/u_audio.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * u_audio.c -- interface to USB gadget "ALSA sound card" utilities
  *
@@ -9,16 +10,6 @@
  *    Copyright (C) 2011
  *    Yadwinder Singh (yadi.brar01@gmail.com)
  *    Jaswinder Singh (jaswinder.singh@linaro.org)
- *
- * 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.
- *
- * 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/module.h>
diff --git a/drivers/usb/gadget/function/u_audio.h b/drivers/usb/gadget/function/u_audio.h
index 07e13784cbb8..81d3d4ed6dfb 100644
--- a/drivers/usb/gadget/function/u_audio.h
+++ b/drivers/usb/gadget/function/u_audio.h
@@ -1,19 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * u_audio.h -- interface to USB gadget "ALSA sound card" utilities
  *
  * Copyright (C) 2016
  * Author: Ruslan Bilovol <ruslan.bilovol@gmail.com>
- *
- * 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.
- *
- * 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 __U_AUDIO_H
diff --git a/drivers/usb/gadget/function/u_ecm.h b/drivers/usb/gadget/function/u_ecm.h
index 262cc03cc2c0..050aa672ee7f 100644
--- a/drivers/usb/gadget/function/u_ecm.h
+++ b/drivers/usb/gadget/function/u_ecm.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * u_ecm.h
  *
@@ -7,10 +8,6 @@
  *              http://www.samsung.com
  *
  * Author: Andrzej Pietrasiewicz <andrzej.p@samsung.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.
  */
 
 #ifndef U_ECM_H
diff --git a/drivers/usb/gadget/function/u_eem.h b/drivers/usb/gadget/function/u_eem.h
index e3ae97874c4f..de3828d3e8f0 100644
--- a/drivers/usb/gadget/function/u_eem.h
+++ b/drivers/usb/gadget/function/u_eem.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * u_eem.h
  *
@@ -7,10 +8,6 @@
  *              http://www.samsung.com
  *
  * Author: Andrzej Pietrasiewicz <andrzej.p@samsung.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.
  */
 
 #ifndef U_EEM_H
diff --git a/drivers/usb/gadget/function/u_ether.c b/drivers/usb/gadget/function/u_ether.c
index bdbc3fdc7c4f..6fcda62f55ea 100644
--- a/drivers/usb/gadget/function/u_ether.c
+++ b/drivers/usb/gadget/function/u_ether.c
@@ -1,14 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * u_ether.c -- Ethernet-over-USB link layer utilities for Gadget stack
  *
  * Copyright (C) 2003-2005,2008 David Brownell
  * Copyright (C) 2003-2004 Robert Schwebel, Benedikt Spranger
  * Copyright (C) 2008 Nokia Corporation
- *
- * 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.
  */
 
 /* #define VERBOSE_DEBUG */
diff --git a/drivers/usb/gadget/function/u_ether.h b/drivers/usb/gadget/function/u_ether.h
index c77145bd6b5b..332307d54292 100644
--- a/drivers/usb/gadget/function/u_ether.h
+++ b/drivers/usb/gadget/function/u_ether.h
@@ -1,14 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * u_ether.h -- interface to USB gadget "ethernet link" utilities
  *
  * Copyright (C) 2003-2005,2008 David Brownell
  * Copyright (C) 2003-2004 Robert Schwebel, Benedikt Spranger
  * Copyright (C) 2008 Nokia Corporation
- *
- * 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.
  */
 
 #ifndef __U_ETHER_H
diff --git a/drivers/usb/gadget/function/u_ether_configfs.h b/drivers/usb/gadget/function/u_ether_configfs.h
index e4c3f84af4c3..cd33cee4d78b 100644
--- a/drivers/usb/gadget/function/u_ether_configfs.h
+++ b/drivers/usb/gadget/function/u_ether_configfs.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * u_ether_configfs.h
  *
@@ -7,10 +8,6 @@
  *              http://www.samsung.com
  *
  * Author: Andrzej Pietrasiewicz <andrzej.p@samsung.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.
  */
 
 #ifndef __U_ETHER_CONFIGFS_H
diff --git a/drivers/usb/gadget/function/u_fs.h b/drivers/usb/gadget/function/u_fs.h
index 79f70ebf85dc..c3aba4dfa958 100644
--- a/drivers/usb/gadget/function/u_fs.h
+++ b/drivers/usb/gadget/function/u_fs.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * u_fs.h
  *
@@ -7,10 +8,6 @@
  *              http://www.samsung.com
  *
  * Author: Andrzej Pietrasiewicz <andrzej.p@samsung.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.
  */
 
 #ifndef U_FFS_H
diff --git a/drivers/usb/gadget/function/u_gether.h b/drivers/usb/gadget/function/u_gether.h
index d4078426ba5d..5b7e2eb90336 100644
--- a/drivers/usb/gadget/function/u_gether.h
+++ b/drivers/usb/gadget/function/u_gether.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * u_gether.h
  *
@@ -7,10 +8,6 @@
  *              http://www.samsung.com
  *
  * Author: Andrzej Pietrasiewicz <andrzej.p@samsung.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.
  */
 
 #ifndef U_GETHER_H
diff --git a/drivers/usb/gadget/function/u_hid.h b/drivers/usb/gadget/function/u_hid.h
index aaa0e368a159..2f5ca4bfa7ff 100644
--- a/drivers/usb/gadget/function/u_hid.h
+++ b/drivers/usb/gadget/function/u_hid.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * u_hid.h
  *
@@ -7,10 +8,6 @@
  *              http://www.samsung.com
  *
  * Author: Andrzej Pietrasiewicz <andrzej.p@samsung.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.
  */
 
 #ifndef U_HID_H
diff --git a/drivers/usb/gadget/function/u_midi.h b/drivers/usb/gadget/function/u_midi.h
index 22510189758e..5599aa5fc977 100644
--- a/drivers/usb/gadget/function/u_midi.h
+++ b/drivers/usb/gadget/function/u_midi.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * u_midi.h
  *
@@ -7,10 +8,6 @@
  *              http://www.samsung.com
  *
  * Author: Andrzej Pietrasiewicz <andrzej.p@samsung.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.
  */
 
 #ifndef U_MIDI_H
diff --git a/drivers/usb/gadget/function/u_ncm.h b/drivers/usb/gadget/function/u_ncm.h
index ce0f3a78ca13..67324f983343 100644
--- a/drivers/usb/gadget/function/u_ncm.h
+++ b/drivers/usb/gadget/function/u_ncm.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * u_ncm.h
  *
@@ -7,10 +8,6 @@
  *              http://www.samsung.com
  *
  * Author: Andrzej Pietrasiewicz <andrzej.p@samsung.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.
  */
 
 #ifndef U_NCM_H
diff --git a/drivers/usb/gadget/function/u_phonet.h b/drivers/usb/gadget/function/u_phonet.h
index 98ced18779ea..12fb613f85d1 100644
--- a/drivers/usb/gadget/function/u_phonet.h
+++ b/drivers/usb/gadget/function/u_phonet.h
@@ -1,11 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * u_phonet.h - interface to Phonet
  *
  * Copyright (C) 2007-2008 by Nokia Corporation
- *
- * This software is distributed under the terms of the GNU General
- * Public License ("GPL") as published by the Free Software Foundation,
- * either version 2 of that License or (at your option) any later version.
  */
 
 #ifndef __U_PHONET_H
diff --git a/drivers/usb/gadget/function/u_printer.h b/drivers/usb/gadget/function/u_printer.h
index 8d30b7577f87..6088ff744194 100644
--- a/drivers/usb/gadget/function/u_printer.h
+++ b/drivers/usb/gadget/function/u_printer.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * u_printer.h
  *
@@ -7,10 +8,6 @@
  *              http://www.samsung.com
  *
  * Author: Andrzej Pietrasiewicz <andrzej.p@samsung.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.
  */
 
 #ifndef U_PRINTER_H
diff --git a/drivers/usb/gadget/function/u_rndis.h b/drivers/usb/gadget/function/u_rndis.h
index efdb7ac381d9..d65fb4ebac3c 100644
--- a/drivers/usb/gadget/function/u_rndis.h
+++ b/drivers/usb/gadget/function/u_rndis.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * u_rndis.h
  *
@@ -7,10 +8,6 @@
  *              http://www.samsung.com
  *
  * Author: Andrzej Pietrasiewicz <andrzej.p@samsung.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.
  */
 
 #ifndef U_RNDIS_H
diff --git a/drivers/usb/gadget/function/u_serial.c b/drivers/usb/gadget/function/u_serial.c
index 4176216d54be..4d653d2960d4 100644
--- a/drivers/usb/gadget/function/u_serial.c
+++ b/drivers/usb/gadget/function/u_serial.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * u_serial.c - utilities for USB gadget "serial port"/TTY support
  *
@@ -9,10 +10,6 @@
  * Copyright (C) 1999 - 2002 Greg Kroah-Hartman (greg@kroah.com)
  * Copyright (C) 2000 Peter Berger (pberger@brimson.com)
  * Copyright (C) 2000 Al Borchers (alborchers@steinerpoint.com)
- *
- * This software is distributed under the terms of the GNU General
- * Public License ("GPL") as published by the Free Software Foundation,
- * either version 2 of that License or (at your option) any later version.
  */
 
 /* #define VERBOSE_DEBUG */
@@ -1078,6 +1075,7 @@ static void gs_complete_out(struct usb_ep *ep, struct usb_request *req)
         default:
                 pr_warn("%s: unexpected %s status %d\n",
                         __func__, ep->name, req->status);
+                /* fall through */
         case 0:
                 /* normal completion */
                 spin_lock(&info->con_lock);
diff --git a/drivers/usb/gadget/function/u_serial.h b/drivers/usb/gadget/function/u_serial.h
index c20210c0babd..9acaac1cbb75 100644
--- a/drivers/usb/gadget/function/u_serial.h
+++ b/drivers/usb/gadget/function/u_serial.h
@@ -1,12 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * u_serial.h - interface to USB gadget "serial port"/TTY utilities
  *
  * Copyright (C) 2008 David Brownell
  * Copyright (C) 2008 by Nokia Corporation
- *
- * This software is distributed under the terms of the GNU General
- * Public License ("GPL") as published by the Free Software Foundation,
- * either version 2 of that License or (at your option) any later version.
  */
 
 #ifndef __U_SERIAL_H
diff --git a/drivers/usb/gadget/function/u_tcm.h b/drivers/usb/gadget/function/u_tcm.h
index 0bd751e0483f..3f7ccecb0f9b 100644
--- a/drivers/usb/gadget/function/u_tcm.h
+++ b/drivers/usb/gadget/function/u_tcm.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * u_tcm.h
  *
@@ -7,10 +8,6 @@
  *              http://www.samsung.com
  *
  * Author: Andrzej Pietrasiewicz <andrzej.p@xxxxxxxxxxx>
- *
- * 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.
  */
 
 #ifndef U_TCM_H
diff --git a/drivers/usb/gadget/function/u_uac1.h b/drivers/usb/gadget/function/u_uac1.h
index 6f188fd8633f..6f1a9d73defe 100644
--- a/drivers/usb/gadget/function/u_uac1.h
+++ b/drivers/usb/gadget/function/u_uac1.h
@@ -1,11 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * u_uac1.h - Utility definitions for UAC1 function
  *
  * Copyright (C) 2016 Ruslan Bilovol <ruslan.bilovol@gmail.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.
  */
 
 #ifndef __U_UAC1_H
diff --git a/drivers/usb/gadget/function/u_uac1_legacy.c b/drivers/usb/gadget/function/u_uac1_legacy.c
index fa4684a1c54c..cbc868d117af 100644
--- a/drivers/usb/gadget/function/u_uac1_legacy.c
+++ b/drivers/usb/gadget/function/u_uac1_legacy.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * u_uac1.c -- ALSA audio utilities for Gadget stack
  *
@@ -5,8 +6,6 @@
  * Copyright (C) 2008 Analog Devices, Inc
  *
  * Enter bugs at http://blackfin.uclinux.org/
- *
- * Licensed under the GPL-2 or later.
  */
 
 #include <linux/kernel.h>
diff --git a/drivers/usb/gadget/function/u_uac1_legacy.h b/drivers/usb/gadget/function/u_uac1_legacy.h
index d715b1af56a4..dd69e408a3d9 100644
--- a/drivers/usb/gadget/function/u_uac1_legacy.h
+++ b/drivers/usb/gadget/function/u_uac1_legacy.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * u_uac1.h -- interface to USB gadget "ALSA AUDIO" utilities
  *
@@ -5,8 +6,6 @@
  * Copyright (C) 2008 Analog Devices, Inc
  *
  * Enter bugs at http://blackfin.uclinux.org/
- *
- * Licensed under the GPL-2 or later.
  */
 
 #ifndef __U_UAC1_LEGACY_H
diff --git a/drivers/usb/gadget/function/u_uac2.h b/drivers/usb/gadget/function/u_uac2.h
index 19eeb83538a5..8362ee572e1e 100644
--- a/drivers/usb/gadget/function/u_uac2.h
+++ b/drivers/usb/gadget/function/u_uac2.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * u_uac2.h
  *
@@ -7,10 +8,6 @@
  *              http://www.samsung.com
  *
  * Author: Andrzej Pietrasiewicz <andrzej.p@samsung.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.
  */
 
 #ifndef U_UAC2_H
diff --git a/drivers/usb/gadget/function/u_uvc.h b/drivers/usb/gadget/function/u_uvc.h
index 4676b60a5063..d00d3ded71c0 100644
--- a/drivers/usb/gadget/function/u_uvc.h
+++ b/drivers/usb/gadget/function/u_uvc.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * u_uvc.h
  *
@@ -7,10 +8,6 @@
  *              http://www.samsung.com
  *
  * Author: Andrzej Pietrasiewicz <andrzej.p@samsung.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.
  */
 
 #ifndef U_UVC_H
diff --git a/drivers/usb/gadget/function/uvc.h b/drivers/usb/gadget/function/uvc.h
index 11d70dead32b..a64e07e61f8c 100644
--- a/drivers/usb/gadget/function/uvc.h
+++ b/drivers/usb/gadget/function/uvc.h
@@ -1,13 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  *      uvc_gadget.h  --  USB Video Class Gadget driver
  *
  *      Copyright (C) 2009-2010
  *          Laurent Pinchart (laurent.pinchart@ideasonboard.com)
- *
- *      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.
  */
 
 #ifndef _UVC_GADGET_H_
diff --git a/drivers/usb/gadget/function/uvc_configfs.c b/drivers/usb/gadget/function/uvc_configfs.c
index 844cb738bafd..d2ad1442769a 100644
--- a/drivers/usb/gadget/function/uvc_configfs.c
+++ b/drivers/usb/gadget/function/uvc_configfs.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * uvc_configfs.c
  *
@@ -7,10 +8,6 @@
  *              http://www.samsung.com
  *
  * Author: Andrzej Pietrasiewicz <andrzej.p@samsung.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 "u_uvc.h"
 #include "uvc_configfs.h"
diff --git a/drivers/usb/gadget/function/uvc_configfs.h b/drivers/usb/gadget/function/uvc_configfs.h
index 085e67be7c71..8549c0b27b9d 100644
--- a/drivers/usb/gadget/function/uvc_configfs.h
+++ b/drivers/usb/gadget/function/uvc_configfs.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * uvc_configfs.h
  *
@@ -7,10 +8,6 @@
  *              http://www.samsung.com
  *
  * Author: Andrzej Pietrasiewicz <andrzej.p@samsung.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.
  */
 #ifndef UVC_CONFIGFS_H
 #define UVC_CONFIGFS_H
diff --git a/drivers/usb/gadget/function/uvc_queue.c b/drivers/usb/gadget/function/uvc_queue.c
index 6377e9fee6e5..278d50ff1eea 100644
--- a/drivers/usb/gadget/function/uvc_queue.c
+++ b/drivers/usb/gadget/function/uvc_queue.c
@@ -1,13 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  *      uvc_queue.c  --  USB Video Class driver - Buffers management
  *
  *      Copyright (C) 2005-2010
  *          Laurent Pinchart (laurent.pinchart@ideasonboard.com)
- *
- *      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.
  */
 
 #include <linux/atomic.h>
diff --git a/drivers/usb/gadget/function/uvc_v4l2.c b/drivers/usb/gadget/function/uvc_v4l2.c
index 3e22b45687d3..f3069db6f08e 100644
--- a/drivers/usb/gadget/function/uvc_v4l2.c
+++ b/drivers/usb/gadget/function/uvc_v4l2.c
@@ -1,13 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  *      uvc_v4l2.c  --  USB Video Class Gadget driver
  *
  *      Copyright (C) 2009-2010
  *          Laurent Pinchart (laurent.pinchart@ideasonboard.com)
- *
- *      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.
  */
 
 #include <linux/kernel.h>
@@ -354,7 +350,7 @@ static unsigned long uvcg_v4l2_get_unmapped_area(struct file *file,
 }
 #endif
 
-struct v4l2_file_operations uvc_v4l2_fops = {
+const struct v4l2_file_operations uvc_v4l2_fops = {
         .owner          = THIS_MODULE,
         .open           = uvc_v4l2_open,
         .release        = uvc_v4l2_release,
diff --git a/drivers/usb/gadget/function/uvc_v4l2.h b/drivers/usb/gadget/function/uvc_v4l2.h
index 2683b92fda65..a75e9c397446 100644
--- a/drivers/usb/gadget/function/uvc_v4l2.h
+++ b/drivers/usb/gadget/function/uvc_v4l2.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *      uvc_v4l2.h  --  USB Video Class Gadget driver
  *
@@ -7,16 +8,12 @@
  * Copyright (c) 2013 Samsung Electronics Co., Ltd.
  *              http://www.samsung.com
  *              Author: Andrzej Pietrasiewicz <andrzej.p@samsung.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.
  */
 
 #ifndef __UVC_V4L2_H__
 #define __UVC_V4L2_H__
 
 extern const struct v4l2_ioctl_ops uvc_v4l2_ioctl_ops;
-extern struct v4l2_file_operations uvc_v4l2_fops;
+extern const struct v4l2_file_operations uvc_v4l2_fops;
 
 #endif /* __UVC_V4L2_H__ */
diff --git a/drivers/usb/gadget/function/uvc_video.c b/drivers/usb/gadget/function/uvc_video.c
index 0f01c04d7cbd..d3567b90343a 100644
--- a/drivers/usb/gadget/function/uvc_video.c
+++ b/drivers/usb/gadget/function/uvc_video.c
@@ -1,13 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  *      uvc_video.c  --  USB Video Class Gadget driver
  *
  *      Copyright (C) 2009-2010
  *          Laurent Pinchart (laurent.pinchart@ideasonboard.com)
- *
- *      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.
  */
 
 #include <linux/kernel.h>
diff --git a/drivers/usb/gadget/function/uvc_video.h b/drivers/usb/gadget/function/uvc_video.h
index ef00f06fa00b..6c20aa75f966 100644
--- a/drivers/usb/gadget/function/uvc_video.h
+++ b/drivers/usb/gadget/function/uvc_video.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *      uvc_video.h  --  USB Video Class Gadget driver
  *
@@ -7,10 +8,6 @@
  * Copyright (c) 2013 Samsung Electronics Co., Ltd.
  *              http://www.samsung.com
  *              Author: Andrzej Pietrasiewicz <andrzej.p@samsung.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.
  */
 #ifndef __UVC_VIDEO_H__
 #define __UVC_VIDEO_H__
diff --git a/drivers/usb/gadget/functions.c b/drivers/usb/gadget/functions.c
index b13f839e7368..203361a64212 100644
--- a/drivers/usb/gadget/functions.c
+++ b/drivers/usb/gadget/functions.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/kernel.h>
 #include <linux/slab.h>
 #include <linux/module.h>
diff --git a/drivers/usb/gadget/legacy/acm_ms.c b/drivers/usb/gadget/legacy/acm_ms.c
index c39de65a448b..af16672d5118 100644
--- a/drivers/usb/gadget/legacy/acm_ms.c
+++ b/drivers/usb/gadget/legacy/acm_ms.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * acm_ms.c -- Composite driver, with ACM and mass storage support
  *
@@ -7,11 +8,6 @@
  * Modified: Klaus Schwarzkopf <schwarzkopf@sensortherm.de>
  *
  * Heavily based on multi.c and cdc2.c
- *
- * 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.
  */
 
 #include <linux/kernel.h>
diff --git a/drivers/usb/gadget/legacy/audio.c b/drivers/usb/gadget/legacy/audio.c
index 1f5cdbe162df..7b11dce98b94 100644
--- a/drivers/usb/gadget/legacy/audio.c
+++ b/drivers/usb/gadget/legacy/audio.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * audio.c -- Audio gadget driver
  *
@@ -5,8 +6,6 @@
  * Copyright (C) 2008 Analog Devices, Inc
  *
  * Enter bugs at http://blackfin.uclinux.org/
- *
- * Licensed under the GPL-2 or later.
  */
 
 /* #define VERBOSE_DEBUG */
diff --git a/drivers/usb/gadget/legacy/cdc2.c b/drivers/usb/gadget/legacy/cdc2.c
index 51c08682de84..da1c37933ca1 100644
--- a/drivers/usb/gadget/legacy/cdc2.c
+++ b/drivers/usb/gadget/legacy/cdc2.c
@@ -1,13 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * cdc2.c -- CDC Composite driver, with ECM and ACM support
  *
  * Copyright (C) 2008 David Brownell
  * Copyright (C) 2008 Nokia Corporation
- *
- * 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.
  */
 
 #include <linux/kernel.h>
diff --git a/drivers/usb/gadget/legacy/dbgp.c b/drivers/usb/gadget/legacy/dbgp.c
index 99ca3dabc4f3..e1d566c9918a 100644
--- a/drivers/usb/gadget/legacy/dbgp.c
+++ b/drivers/usb/gadget/legacy/dbgp.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * dbgp.c -- EHCI Debug Port device gadget
  *
diff --git a/drivers/usb/gadget/legacy/ether.c b/drivers/usb/gadget/legacy/ether.c
index 25a2c2e48592..30313b233680 100644
--- a/drivers/usb/gadget/legacy/ether.c
+++ b/drivers/usb/gadget/legacy/ether.c
@@ -1,14 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * ether.c -- Ethernet gadget driver, with CDC and non-CDC options
  *
  * Copyright (C) 2003-2005,2008 David Brownell
  * Copyright (C) 2003-2004 Robert Schwebel, Benedikt Spranger
  * Copyright (C) 2008 Nokia Corporation
- *
- * 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.
  */
 
 /* #define VERBOSE_DEBUG */
diff --git a/drivers/usb/gadget/legacy/g_ffs.c b/drivers/usb/gadget/legacy/g_ffs.c
index 6da7316f8e87..b640ed3fcf70 100644
--- a/drivers/usb/gadget/legacy/g_ffs.c
+++ b/drivers/usb/gadget/legacy/g_ffs.c
@@ -1,13 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * g_ffs.c -- user mode file system API for USB composite function controllers
  *
  * Copyright (C) 2010 Samsung Electronics
  * Author: Michal Nazarewicz <mina86@mina86.com>
- *
- * 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.
  */
 
 #define pr_fmt(fmt) "g_ffs: " fmt
diff --git a/drivers/usb/gadget/legacy/gmidi.c b/drivers/usb/gadget/legacy/gmidi.c
index 0bf39c3ccdb1..9eea2d18f2bf 100644
--- a/drivers/usb/gadget/legacy/gmidi.c
+++ b/drivers/usb/gadget/legacy/gmidi.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * gmidi.c -- USB MIDI Gadget Driver
  *
@@ -5,9 +6,6 @@
  * Developed for Thumtronics by Grey Innovation
  * Ben Williamson <ben.williamson@greyinnovation.com>
  *
- * This software is distributed under the terms of the GNU General Public
- * License ("GPL") version 2, as published by the Free Software Foundation.
- *
  * This code is based in part on:
  *
  * Gadget Zero driver, Copyright (C) 2003-2004 David Brownell.
diff --git a/drivers/usb/gadget/legacy/hid.c b/drivers/usb/gadget/legacy/hid.c
index a71a884f79fc..c4eda7fe7ab4 100644
--- a/drivers/usb/gadget/legacy/hid.c
+++ b/drivers/usb/gadget/legacy/hid.c
@@ -1,14 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * hid.c -- HID Composite driver
  *
  * Based on multi.c
  *
  * Copyright (C) 2010 Fabien Chouteau <fabien.chouteau@barco.com>
- *
- * 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.
  */
 
 
diff --git a/drivers/usb/gadget/legacy/inode.c b/drivers/usb/gadget/legacy/inode.c
index 5c28bee327e1..9343ec436485 100644
--- a/drivers/usb/gadget/legacy/inode.c
+++ b/drivers/usb/gadget/legacy/inode.c
@@ -1,13 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * inode.c -- user mode filesystem api for usb gadget controllers
  *
  * Copyright (C) 2003-2004 David Brownell
  * Copyright (C) 2003 Agilent Technologies
- *
- * 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.
  */
 
 
diff --git a/drivers/usb/gadget/legacy/mass_storage.c b/drivers/usb/gadget/legacy/mass_storage.c
index fcba59782f26..ef3d25259b0e 100644
--- a/drivers/usb/gadget/legacy/mass_storage.c
+++ b/drivers/usb/gadget/legacy/mass_storage.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * mass_storage.c -- Mass Storage USB Gadget
  *
@@ -5,11 +6,6 @@
  * Copyright (C) 2009 Samsung Electronics
  *                    Author: Michal Nazarewicz <mina86@mina86.com>
  * All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
  */
 
 
diff --git a/drivers/usb/gadget/legacy/multi.c b/drivers/usb/gadget/legacy/multi.c
index a70a406580ea..50515f9e1022 100644
--- a/drivers/usb/gadget/legacy/multi.c
+++ b/drivers/usb/gadget/legacy/multi.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * multi.c -- Multifunction Composite driver
  *
@@ -5,11 +6,6 @@
  * Copyright (C) 2008 Nokia Corporation
  * Copyright (C) 2009 Samsung Electronics
  * Author: Michal Nazarewicz (mina86@mina86.com)
- *
- * 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.
  */
 
 
diff --git a/drivers/usb/gadget/legacy/ncm.c b/drivers/usb/gadget/legacy/ncm.c
index 0aba68253e3d..fcee1ee0bf66 100644
--- a/drivers/usb/gadget/legacy/ncm.c
+++ b/drivers/usb/gadget/legacy/ncm.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * ncm.c -- NCM gadget driver
  *
@@ -9,11 +10,6 @@
  * Copyright (C) 2003-2005,2008 David Brownell
  * Copyright (C) 2003-2004 Robert Schwebel, Benedikt Spranger
  * Copyright (C) 2008 Nokia Corporation
- *
- * 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.
  */
 
 /* #define DEBUG */
diff --git a/drivers/usb/gadget/legacy/nokia.c b/drivers/usb/gadget/legacy/nokia.c
index b1e535f4022e..978c1a34a932 100644
--- a/drivers/usb/gadget/legacy/nokia.c
+++ b/drivers/usb/gadget/legacy/nokia.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * nokia.c -- Nokia Composite Gadget Driver
  *
@@ -9,10 +10,6 @@
  * Copyright (C) 2003 Al Borchers (alborchers@steinerpoint.com)
  * Copyright (C) 2008 by David Brownell
  * Copyright (C) 2008 by Nokia Corporation
- *
- * This software is distributed under the terms of the GNU General
- * Public License ("GPL") as published by the Free Software Foundation,
- * version 2 of that License.
  */
 
 #include <linux/kernel.h>
diff --git a/drivers/usb/gadget/legacy/printer.c b/drivers/usb/gadget/legacy/printer.c
index 4c9cfff34a03..57858f0c2b6c 100644
--- a/drivers/usb/gadget/legacy/printer.c
+++ b/drivers/usb/gadget/legacy/printer.c
@@ -1,13 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * printer.c -- Printer gadget driver
  *
  * Copyright (C) 2003-2005 David Brownell
  * Copyright (C) 2006 Craig W. Nadler
- *
- * 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.
  */
 
 #include <linux/module.h>
diff --git a/drivers/usb/gadget/legacy/serial.c b/drivers/usb/gadget/legacy/serial.c
index 9d89adce756d..de30d7628eef 100644
--- a/drivers/usb/gadget/legacy/serial.c
+++ b/drivers/usb/gadget/legacy/serial.c
@@ -1,13 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * serial.c -- USB gadget serial driver
  *
  * Copyright (C) 2003 Al Borchers (alborchers@steinerpoint.com)
  * Copyright (C) 2008 by David Brownell
  * Copyright (C) 2008 by Nokia Corporation
- *
- * This software is distributed under the terms of the GNU General
- * Public License ("GPL") as published by the Free Software Foundation,
- * either version 2 of that License or (at your option) any later version.
  */
 
 #include <linux/kernel.h>
diff --git a/drivers/usb/gadget/legacy/tcm_usb_gadget.c b/drivers/usb/gadget/legacy/tcm_usb_gadget.c
index 0b0bb98319cd..682bf99dcf76 100644
--- a/drivers/usb/gadget/legacy/tcm_usb_gadget.c
+++ b/drivers/usb/gadget/legacy/tcm_usb_gadget.c
@@ -1,10 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0
 /* Target based USB-Gadget
  *
  * UAS protocol handling, target callbacks, configfs handling,
  * BBB (USB Mass Storage Class Bulk-Only (BBB) and Transport protocol handling.
  *
  * Author: Sebastian Andrzej Siewior <bigeasy at linutronix dot de>
- * License: GPLv2 as published by FSF.
  */
 #include <linux/kernel.h>
 #include <linux/module.h>
diff --git a/drivers/usb/gadget/legacy/webcam.c b/drivers/usb/gadget/legacy/webcam.c
index 82c13fce9232..6b86568c9157 100644
--- a/drivers/usb/gadget/legacy/webcam.c
+++ b/drivers/usb/gadget/legacy/webcam.c
@@ -1,13 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  *      webcam.c -- USB webcam gadget driver
  *
  *      Copyright (C) 2009-2010
  *          Laurent Pinchart (laurent.pinchart@ideasonboard.com)
- *
- *      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.
  */
 
 #include <linux/kernel.h>
diff --git a/drivers/usb/gadget/legacy/zero.c b/drivers/usb/gadget/legacy/zero.c
index d02e2ce73ea5..6e84b44c8a3b 100644
--- a/drivers/usb/gadget/legacy/zero.c
+++ b/drivers/usb/gadget/legacy/zero.c
@@ -1,13 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * zero.c -- Gadget Zero, for USB development
  *
  * Copyright (C) 2003-2008 David Brownell
  * Copyright (C) 2008 by Nokia Corporation
- *
- * 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.
  */
 
 /*
@@ -154,10 +150,11 @@ static struct usb_gadget_strings *dev_strings[] = {
 /*-------------------------------------------------------------------------*/
 
 static struct timer_list        autoresume_timer;
+static struct usb_composite_dev *autoresume_cdev;
 
-static void zero_autoresume(unsigned long _c)
+static void zero_autoresume(struct timer_list *unused)
 {
-        struct usb_composite_dev        *cdev = (void *)_c;
+        struct usb_composite_dev        *cdev = autoresume_cdev;
         struct usb_gadget               *g = cdev->gadget;
 
         /* unconfigured devices can't issue wakeups */
@@ -282,7 +279,8 @@ static int zero_bind(struct usb_composite_dev *cdev)
         device_desc.iProduct = strings_dev[USB_GADGET_PRODUCT_IDX].id;
         device_desc.iSerialNumber = strings_dev[USB_GADGET_SERIAL_IDX].id;
 
-        setup_timer(&autoresume_timer, zero_autoresume, (unsigned long) cdev);
+        autoresume_cdev = cdev;
+        timer_setup(&autoresume_timer, zero_autoresume, 0);
 
         func_inst_ss = usb_get_function_instance("SourceSink");
         if (IS_ERR(func_inst_ss))
diff --git a/drivers/usb/gadget/u_f.c b/drivers/usb/gadget/u_f.c
index 18839732c840..dbaa46eee853 100644
--- a/drivers/usb/gadget/u_f.c
+++ b/drivers/usb/gadget/u_f.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * u_f.c -- USB function utilities for Gadget stack
  *
@@ -5,10 +6,6 @@
  *              http://www.samsung.com
  *
  * Author: Andrzej Pietrasiewicz <andrzej.p@samsung.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 "u_f.h"
diff --git a/drivers/usb/gadget/u_f.h b/drivers/usb/gadget/u_f.h
index 7d53a4773d1a..c3fbef2bb5db 100644
--- a/drivers/usb/gadget/u_f.h
+++ b/drivers/usb/gadget/u_f.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * u_f.h
  *
@@ -7,10 +8,6 @@
  *              http://www.samsung.com
  *
  * Author: Andrzej Pietrasiewicz <andrzej.p@samsung.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.
  */
 
 #ifndef __U_F_H__
diff --git a/drivers/usb/gadget/u_os_desc.h b/drivers/usb/gadget/u_os_desc.h
index 947b7ddff691..8acd21779ac8 100644
--- a/drivers/usb/gadget/u_os_desc.h
+++ b/drivers/usb/gadget/u_os_desc.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * u_os_desc.h
  *
@@ -7,10 +8,6 @@
  *              http://www.samsung.com
  *
  * Author: Andrzej Pietrasiewicz <andrzej.p@samsung.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.
  */
 
 #ifndef __U_OS_DESC_H__
diff --git a/drivers/usb/gadget/udc/amd5536udc.h b/drivers/usb/gadget/udc/amd5536udc.h
index 4fe22d432af2..dfdef6a28904 100644
--- a/drivers/usb/gadget/udc/amd5536udc.h
+++ b/drivers/usb/gadget/udc/amd5536udc.h
@@ -1,13 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * amd5536.h -- header for AMD 5536 UDC high/full speed USB device controller
  *
  * Copyright (C) 2007 AMD (http://www.amd.com)
  * Author: Thomas Dahlmann
- *
- * 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.
  */
 
 #ifndef AMD5536UDC_H
diff --git a/drivers/usb/gadget/udc/amd5536udc_pci.c b/drivers/usb/gadget/udc/amd5536udc_pci.c
index 57a13f080a79..57b6f66331cf 100644
--- a/drivers/usb/gadget/udc/amd5536udc_pci.c
+++ b/drivers/usb/gadget/udc/amd5536udc_pci.c
@@ -1,13 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * amd5536udc_pci.c -- AMD 5536 UDC high/full speed USB device controller
  *
  * Copyright (C) 2005-2007 AMD (http://www.amd.com)
  * Author: Thomas Dahlmann
- *
- * 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.
  */
 
 /*
diff --git a/drivers/usb/gadget/udc/at91_udc.c b/drivers/usb/gadget/udc/at91_udc.c
index 8bc78418d40e..bfe278294e88 100644
--- a/drivers/usb/gadget/udc/at91_udc.c
+++ b/drivers/usb/gadget/udc/at91_udc.c
@@ -1,14 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * at91_udc -- driver for at91-series USB peripheral controller
  *
  * Copyright (C) 2004 by Thomas Rathbone
  * Copyright (C) 2005 by HP Labs
  * Copyright (C) 2005 by David Brownell
- *
- * 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.
  */
 
 #undef  VERBOSE_DEBUG
diff --git a/drivers/usb/gadget/udc/at91_udc.h b/drivers/usb/gadget/udc/at91_udc.h
index 9bbe72764f31..fd58c5b81826 100644
--- a/drivers/usb/gadget/udc/at91_udc.h
+++ b/drivers/usb/gadget/udc/at91_udc.h
@@ -1,12 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright (C) 2004 by Thomas Rathbone, HP Labs
  * Copyright (C) 2005 by Ivan Kokshaysky
  * Copyright (C) 2006 by SAN People
- *
- * 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.
  */
 
 #ifndef AT91_UDC_H
diff --git a/drivers/usb/gadget/udc/atmel_usba_udc.c b/drivers/usb/gadget/udc/atmel_usba_udc.c
index a884c022df7a..075eaaa8a408 100644
--- a/drivers/usb/gadget/udc/atmel_usba_udc.c
+++ b/drivers/usb/gadget/udc/atmel_usba_udc.c
@@ -1,11 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Driver for the Atmel USBA high speed USB device controller
  *
  * Copyright (C) 2005-2007 Atmel Corporation
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
  */
 #include <linux/clk.h>
 #include <linux/clk/at91_pmc.h>
diff --git a/drivers/usb/gadget/udc/atmel_usba_udc.h b/drivers/usb/gadget/udc/atmel_usba_udc.h
index f8ebe0389bd4..860a00a6fdd0 100644
--- a/drivers/usb/gadget/udc/atmel_usba_udc.h
+++ b/drivers/usb/gadget/udc/atmel_usba_udc.h
@@ -1,11 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Driver for the Atmel USBA high speed USB device controller
  *
  * Copyright (C) 2005-2007 Atmel Corporation
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
  */
 #ifndef __LINUX_USB_GADGET_USBA_UDC_H__
 #define __LINUX_USB_GADGET_USBA_UDC_H__
diff --git a/drivers/usb/gadget/udc/bcm63xx_udc.c b/drivers/usb/gadget/udc/bcm63xx_udc.c
index f78503203f42..29f254793592 100644
--- a/drivers/usb/gadget/udc/bcm63xx_udc.c
+++ b/drivers/usb/gadget/udc/bcm63xx_udc.c
@@ -1,13 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * bcm63xx_udc.c -- BCM63xx UDC high/full speed USB device controller
  *
  * Copyright (C) 2012 Kevin Cernekee <cernekee@gmail.com>
  * Copyright (C) 2012 Broadcom Corporation
- *
- * 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.
  */
 
 #include <linux/bitops.h>
diff --git a/drivers/usb/gadget/udc/bdc/bdc.h b/drivers/usb/gadget/udc/bdc/bdc.h
index 6df0352cdc50..6e1e881dc51e 100644
--- a/drivers/usb/gadget/udc/bdc/bdc.h
+++ b/drivers/usb/gadget/udc/bdc/bdc.h
@@ -1,15 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * bdc.h - header for the BRCM BDC USB3.0 device controller
  *
  * Copyright (C) 2014 Broadcom Corporation
  *
  * Author: Ashwini Pahuja
- *
- * 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.
- *
  */
 
 #ifndef __LINUX_BDC_H__
diff --git a/drivers/usb/gadget/udc/bdc/bdc_cmd.c b/drivers/usb/gadget/udc/bdc/bdc_cmd.c
index 6e920f1dce02..6305bf2c8b59 100644
--- a/drivers/usb/gadget/udc/bdc/bdc_cmd.c
+++ b/drivers/usb/gadget/udc/bdc/bdc_cmd.c
@@ -1,15 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * bdc_cmd.c - BRCM BDC USB3.0 device controller
  *
  * Copyright (C) 2014 Broadcom Corporation
  *
  * Author: Ashwini Pahuja
- *
- * 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.
- *
  */
 #include <linux/scatterlist.h>
 #include <linux/slab.h>
diff --git a/drivers/usb/gadget/udc/bdc/bdc_cmd.h b/drivers/usb/gadget/udc/bdc/bdc_cmd.h
index 61d0e3bf9853..29cc988a671a 100644
--- a/drivers/usb/gadget/udc/bdc/bdc_cmd.h
+++ b/drivers/usb/gadget/udc/bdc/bdc_cmd.h
@@ -1,15 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * bdc_cmd.h - header for the BDC debug functions
  *
  * Copyright (C) 2014 Broadcom Corporation
  *
  * Author: Ashwini Pahuja
- *
- * 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.
- *
  */
 #ifndef __LINUX_BDC_CMD_H__
 #define __LINUX_BDC_CMD_H__
diff --git a/drivers/usb/gadget/udc/bdc/bdc_core.c b/drivers/usb/gadget/udc/bdc/bdc_core.c
index 7a8af4b916cf..d39f070acbd7 100644
--- a/drivers/usb/gadget/udc/bdc/bdc_core.c
+++ b/drivers/usb/gadget/udc/bdc/bdc_core.c
@@ -1,15 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * bdc_core.c - BRCM BDC USB3.0 device controller core operations
  *
  * Copyright (C) 2014 Broadcom Corporation
  *
  * Author: Ashwini Pahuja
- *
- * 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.
- *
  */
 #include <linux/module.h>
 #include <linux/kernel.h>
diff --git a/drivers/usb/gadget/udc/bdc/bdc_dbg.c b/drivers/usb/gadget/udc/bdc/bdc_dbg.c
index ac98f6f681b7..7ba7448ad743 100644
--- a/drivers/usb/gadget/udc/bdc/bdc_dbg.c
+++ b/drivers/usb/gadget/udc/bdc/bdc_dbg.c
@@ -1,15 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * bdc_dbg.c - BRCM BDC USB3.0 device controller debug functions
  *
  * Copyright (C) 2014 Broadcom Corporation
  *
  * Author: Ashwini Pahuja
- *
- * 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.
- *
  */
 
 #include "bdc.h"
diff --git a/drivers/usb/gadget/udc/bdc/bdc_dbg.h b/drivers/usb/gadget/udc/bdc/bdc_dbg.h
index 338a6c701315..373d5abffbb8 100644
--- a/drivers/usb/gadget/udc/bdc/bdc_dbg.h
+++ b/drivers/usb/gadget/udc/bdc/bdc_dbg.h
@@ -1,15 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * bdc_dbg.h - header for the BDC debug functions
  *
  * Copyright (C) 2014 Broadcom Corporation
  *
  * Author: Ashwini Pahuja
- *
- * 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.
- *
  */
 #ifndef __LINUX_BDC_DBG_H__
 #define __LINUX_BDC_DBG_H__
diff --git a/drivers/usb/gadget/udc/bdc/bdc_ep.c b/drivers/usb/gadget/udc/bdc/bdc_ep.c
index bfd8f7ade935..f40d4c13cfa4 100644
--- a/drivers/usb/gadget/udc/bdc/bdc_ep.c
+++ b/drivers/usb/gadget/udc/bdc/bdc_ep.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * bdc_ep.c - BRCM BDC USB3.0 device controller endpoint related functions
  *
@@ -6,12 +7,6 @@
  * Author: Ashwini Pahuja
  *
  * Based on drivers under drivers/usb/
- *
- * 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.
- *
  */
 #include <linux/module.h>
 #include <linux/pci.h>
diff --git a/drivers/usb/gadget/udc/bdc/bdc_ep.h b/drivers/usb/gadget/udc/bdc/bdc_ep.h
index 8a6b36cbf2ea..a37ff8033b4f 100644
--- a/drivers/usb/gadget/udc/bdc/bdc_ep.h
+++ b/drivers/usb/gadget/udc/bdc/bdc_ep.h
@@ -1,15 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * bdc_ep.h - header for the BDC debug functions
  *
  * Copyright (C) 2014 Broadcom Corporation
  *
  * Author: Ashwini Pahuja
- *
- * 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.
- *
  */
 #ifndef __LINUX_BDC_EP_H__
 #define __LINUX_BDC_EP_H__
diff --git a/drivers/usb/gadget/udc/bdc/bdc_pci.c b/drivers/usb/gadget/udc/bdc/bdc_pci.c
index 02968842b359..1e940f054cb8 100644
--- a/drivers/usb/gadget/udc/bdc/bdc_pci.c
+++ b/drivers/usb/gadget/udc/bdc/bdc_pci.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * bdc_pci.c - BRCM BDC USB3.0 device controller PCI interface file.
  *
@@ -6,12 +7,6 @@
  * Author: Ashwini Pahuja
  *
  * Based on drivers under drivers/usb/
- *
- * 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.
- *
  */
 
 #include <linux/kernel.h>
diff --git a/drivers/usb/gadget/udc/bdc/bdc_udc.c b/drivers/usb/gadget/udc/bdc/bdc_udc.c
index c84346146456..7bfd58c846f7 100644
--- a/drivers/usb/gadget/udc/bdc/bdc_udc.c
+++ b/drivers/usb/gadget/udc/bdc/bdc_udc.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * bdc_udc.c - BRCM BDC USB3.0 device controller gagdet ops
  *
@@ -6,12 +7,6 @@
  * Author: Ashwini Pahuja
  *
  * Based on drivers under drivers/usb/gadget/udc/
- *
- * 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.
- *
  */
 #include <linux/module.h>
 #include <linux/pci.h>
diff --git a/drivers/usb/gadget/udc/core.c b/drivers/usb/gadget/udc/core.c
index d41d07aae0ce..61422d624ad0 100644
--- a/drivers/usb/gadget/udc/core.c
+++ b/drivers/usb/gadget/udc/core.c
@@ -1,20 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0
 /**
  * udc.c - Core UDC Framework
  *
  * Copyright (C) 2010 Texas Instruments
  * 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.
- *
- * 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/kernel.h>
@@ -912,7 +901,7 @@ int usb_gadget_ep_match_desc(struct usb_gadget *gadget,
                 return 0;
 
         type = usb_endpoint_type(desc);
-        max = 0x7ff & usb_endpoint_maxp(desc);
+        max = usb_endpoint_maxp(desc);
 
         if (usb_endpoint_dir_in(desc) && !ep->caps.dir_in)
                 return 0;
diff --git a/drivers/usb/gadget/udc/dummy_hcd.c b/drivers/usb/gadget/udc/dummy_hcd.c
index f04e91ef9e7c..4f1b1809472c 100644
--- a/drivers/usb/gadget/udc/dummy_hcd.c
+++ b/drivers/usb/gadget/udc/dummy_hcd.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * dummy_hcd.c -- Dummy/Loopback USB host and device emulator driver.
  *
@@ -5,11 +6,6 @@
  *
  * Copyright (C) 2003 David Brownell
  * Copyright (C) 2003-2005 Alan Stern
- *
- * 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.
  */
 
 
@@ -23,6 +19,8 @@
  *
  * Having this all in one kernel can help some stages of development,
  * bypassing some hardware (and driver) issues.  UML could help too.
+ *
+ * Note: The emulation does not include isochronous transfers!
  */
 
 #include <linux/module.h>
@@ -137,6 +135,9 @@ static const struct {
                 .caps = _caps, \
         }
 
+/* we don't provide isochronous endpoints since we don't support them */
+#define TYPE_BULK_OR_INT        (USB_EP_CAPS_TYPE_BULK | USB_EP_CAPS_TYPE_INT)
+
         /* everyone has ep0 */
         EP_INFO(ep0name,
                 USB_EP_CAPS(USB_EP_CAPS_TYPE_CONTROL, USB_EP_CAPS_DIR_ALL)),
@@ -145,64 +146,72 @@ static const struct {
                 USB_EP_CAPS(USB_EP_CAPS_TYPE_BULK, USB_EP_CAPS_DIR_IN)),
         EP_INFO("ep2out-bulk",
                 USB_EP_CAPS(USB_EP_CAPS_TYPE_BULK, USB_EP_CAPS_DIR_OUT)),
+/*
         EP_INFO("ep3in-iso",
                 USB_EP_CAPS(USB_EP_CAPS_TYPE_ISO, USB_EP_CAPS_DIR_IN)),
         EP_INFO("ep4out-iso",
                 USB_EP_CAPS(USB_EP_CAPS_TYPE_ISO, USB_EP_CAPS_DIR_OUT)),
+*/
         EP_INFO("ep5in-int",
                 USB_EP_CAPS(USB_EP_CAPS_TYPE_INT, USB_EP_CAPS_DIR_IN)),
         EP_INFO("ep6in-bulk",
                 USB_EP_CAPS(USB_EP_CAPS_TYPE_BULK, USB_EP_CAPS_DIR_IN)),
         EP_INFO("ep7out-bulk",
                 USB_EP_CAPS(USB_EP_CAPS_TYPE_BULK, USB_EP_CAPS_DIR_OUT)),
+/*
         EP_INFO("ep8in-iso",
                 USB_EP_CAPS(USB_EP_CAPS_TYPE_ISO, USB_EP_CAPS_DIR_IN)),
         EP_INFO("ep9out-iso",
                 USB_EP_CAPS(USB_EP_CAPS_TYPE_ISO, USB_EP_CAPS_DIR_OUT)),
+*/
         EP_INFO("ep10in-int",
                 USB_EP_CAPS(USB_EP_CAPS_TYPE_INT, USB_EP_CAPS_DIR_IN)),
         EP_INFO("ep11in-bulk",
                 USB_EP_CAPS(USB_EP_CAPS_TYPE_BULK, USB_EP_CAPS_DIR_IN)),
         EP_INFO("ep12out-bulk",
                 USB_EP_CAPS(USB_EP_CAPS_TYPE_BULK, USB_EP_CAPS_DIR_OUT)),
+/*
         EP_INFO("ep13in-iso",
                 USB_EP_CAPS(USB_EP_CAPS_TYPE_ISO, USB_EP_CAPS_DIR_IN)),
         EP_INFO("ep14out-iso",
                 USB_EP_CAPS(USB_EP_CAPS_TYPE_ISO, USB_EP_CAPS_DIR_OUT)),
+*/
         EP_INFO("ep15in-int",
                 USB_EP_CAPS(USB_EP_CAPS_TYPE_INT, USB_EP_CAPS_DIR_IN)),
+
         /* or like sa1100: two fixed function endpoints */
         EP_INFO("ep1out-bulk",
                 USB_EP_CAPS(USB_EP_CAPS_TYPE_BULK, USB_EP_CAPS_DIR_OUT)),
         EP_INFO("ep2in-bulk",
                 USB_EP_CAPS(USB_EP_CAPS_TYPE_BULK, USB_EP_CAPS_DIR_IN)),
+
         /* and now some generic EPs so we have enough in multi config */
         EP_INFO("ep3out",
-                USB_EP_CAPS(USB_EP_CAPS_TYPE_ALL, USB_EP_CAPS_DIR_OUT)),
+                USB_EP_CAPS(TYPE_BULK_OR_INT, USB_EP_CAPS_DIR_OUT)),
         EP_INFO("ep4in",
-                USB_EP_CAPS(USB_EP_CAPS_TYPE_ALL, USB_EP_CAPS_DIR_IN)),
+                USB_EP_CAPS(TYPE_BULK_OR_INT, USB_EP_CAPS_DIR_IN)),
         EP_INFO("ep5out",
-                USB_EP_CAPS(USB_EP_CAPS_TYPE_ALL, USB_EP_CAPS_DIR_OUT)),
+                USB_EP_CAPS(TYPE_BULK_OR_INT, USB_EP_CAPS_DIR_OUT)),
         EP_INFO("ep6out",
-                USB_EP_CAPS(USB_EP_CAPS_TYPE_ALL, USB_EP_CAPS_DIR_OUT)),
+                USB_EP_CAPS(TYPE_BULK_OR_INT, USB_EP_CAPS_DIR_OUT)),
         EP_INFO("ep7in",
-                USB_EP_CAPS(USB_EP_CAPS_TYPE_ALL, USB_EP_CAPS_DIR_IN)),
+                USB_EP_CAPS(TYPE_BULK_OR_INT, USB_EP_CAPS_DIR_IN)),
         EP_INFO("ep8out",
-                USB_EP_CAPS(USB_EP_CAPS_TYPE_ALL, USB_EP_CAPS_DIR_OUT)),
+                USB_EP_CAPS(TYPE_BULK_OR_INT, USB_EP_CAPS_DIR_OUT)),
         EP_INFO("ep9in",
-                USB_EP_CAPS(USB_EP_CAPS_TYPE_ALL, USB_EP_CAPS_DIR_IN)),
+                USB_EP_CAPS(TYPE_BULK_OR_INT, USB_EP_CAPS_DIR_IN)),
         EP_INFO("ep10out",
-                USB_EP_CAPS(USB_EP_CAPS_TYPE_ALL, USB_EP_CAPS_DIR_OUT)),
+                USB_EP_CAPS(TYPE_BULK_OR_INT, USB_EP_CAPS_DIR_OUT)),
         EP_INFO("ep11out",
-                USB_EP_CAPS(USB_EP_CAPS_TYPE_ALL, USB_EP_CAPS_DIR_OUT)),
+                USB_EP_CAPS(TYPE_BULK_OR_INT, USB_EP_CAPS_DIR_OUT)),
         EP_INFO("ep12in",
-                USB_EP_CAPS(USB_EP_CAPS_TYPE_ALL, USB_EP_CAPS_DIR_IN)),
+                USB_EP_CAPS(TYPE_BULK_OR_INT, USB_EP_CAPS_DIR_IN)),
         EP_INFO("ep13out",
-                USB_EP_CAPS(USB_EP_CAPS_TYPE_ALL, USB_EP_CAPS_DIR_OUT)),
+                USB_EP_CAPS(TYPE_BULK_OR_INT, USB_EP_CAPS_DIR_OUT)),
         EP_INFO("ep14in",
-                USB_EP_CAPS(USB_EP_CAPS_TYPE_ALL, USB_EP_CAPS_DIR_IN)),
+                USB_EP_CAPS(TYPE_BULK_OR_INT, USB_EP_CAPS_DIR_IN)),
         EP_INFO("ep15out",
-                USB_EP_CAPS(USB_EP_CAPS_TYPE_ALL, USB_EP_CAPS_DIR_OUT)),
+                USB_EP_CAPS(TYPE_BULK_OR_INT, USB_EP_CAPS_DIR_OUT)),
 
 #undef EP_INFO
 };
@@ -556,10 +565,12 @@ static int dummy_enable(struct usb_ep *_ep,
                         if (max <= 1024)
                                 break;
                         /* save a return statement */
+                        /* fall through */
                 case USB_SPEED_FULL:
                         if (max <= 64)
                                 break;
                         /* save a return statement */
+                        /* fall through */
                 default:
                         if (max <= 8)
                                 break;
@@ -577,6 +588,7 @@ static int dummy_enable(struct usb_ep *_ep,
                         if (max <= 1024)
                                 break;
                         /* save a return statement */
+                        /* fall through */
                 case USB_SPEED_FULL:
                         if (max <= 1023)
                                 break;
@@ -1769,6 +1781,7 @@ static void dummy_timer(unsigned long _dum_hcd)
         int                     i;
 
         /* simplistic model for one frame's bandwidth */
+        /* FIXME: account for transaction and packet overhead */
         switch (dum->gadget.speed) {
         case USB_SPEED_LOW:
                 total = 8/*bytes*/ * 12/*packets*/;
@@ -1813,7 +1826,6 @@ restart:
                 struct dummy_request    *req;
                 u8                      address;
                 struct dummy_ep         *ep = NULL;
-                int                     type;
                 int                     status = -EINPROGRESS;
 
                 /* stop when we reach URBs queued after the timer interrupt */
@@ -1825,14 +1837,10 @@ restart:
                         goto return_urb;
                 else if (dum_hcd->rh_state != DUMMY_RH_RUNNING)
                         continue;
-                type = usb_pipetype(urb->pipe);
 
-                /* used up this frame's non-periodic bandwidth?
-                 * FIXME there's infinite bandwidth for control and
-                 * periodic transfers ... unrealistic.
-                 */
-                if (total <= 0 && type == PIPE_BULK)
-                        continue;
+                /* Used up this frame's bandwidth? */
+                if (total <= 0)
+                        break;
 
                 /* find the gadget's ep for this request (if configured) */
                 address = usb_pipeendpoint (urb->pipe);
@@ -1930,13 +1938,17 @@ restart:
                 limit = total;
                 switch (usb_pipetype(urb->pipe)) {
                 case PIPE_ISOCHRONOUS:
-                        /* FIXME is it urb->interval since the last xfer?
-                         * use urb->iso_frame_desc[i].
-                         * complete whether or not ep has requests queued.
-                         * report random errors, to debug drivers.
+                        /*
+                         * We don't support isochronous.  But if we did,
+                         * here are some of the issues we'd have to face:
+                         *
+                         * Is it urb->interval since the last xfer?
+                         * Use urb->iso_frame_desc[i].
+                         * Complete whether or not ep has requests queued.
+                         * Report random errors, to debug drivers.
                          */
                         limit = max(limit, periodic_bytes(dum, ep));
-                        status = -ENOSYS;
+                        status = -EINVAL;       /* fail all xfers */
                         break;
 
                 case PIPE_INTERRUPT:
@@ -2433,9 +2445,7 @@ static DEVICE_ATTR_RO(urbs);
 
 static int dummy_start_ss(struct dummy_hcd *dum_hcd)
 {
-        init_timer(&dum_hcd->timer);
-        dum_hcd->timer.function = dummy_timer;
-        dum_hcd->timer.data = (unsigned long)dum_hcd;
+        setup_timer(&dum_hcd->timer, dummy_timer, (unsigned long)dum_hcd);
         dum_hcd->rh_state = DUMMY_RH_RUNNING;
         dum_hcd->stream_en_ep = 0;
         INIT_LIST_HEAD(&dum_hcd->urbp_list);
@@ -2464,9 +2474,7 @@ static int dummy_start(struct usb_hcd *hcd)
                 return dummy_start_ss(dum_hcd);
 
         spin_lock_init(&dum_hcd->dum->lock);
-        init_timer(&dum_hcd->timer);
-        dum_hcd->timer.function = dummy_timer;
-        dum_hcd->timer.data = (unsigned long)dum_hcd;
+        setup_timer(&dum_hcd->timer, dummy_timer, (unsigned long)dum_hcd);
         dum_hcd->rh_state = DUMMY_RH_RUNNING;
 
         INIT_LIST_HEAD(&dum_hcd->urbp_list);
diff --git a/drivers/usb/gadget/udc/fotg210-udc.c b/drivers/usb/gadget/udc/fotg210-udc.c
index 78d0204e3e20..53a48f561458 100644
--- a/drivers/usb/gadget/udc/fotg210-udc.c
+++ b/drivers/usb/gadget/udc/fotg210-udc.c
@@ -1,13 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * FOTG210 UDC Driver supports Bulk transfer so far
  *
  * Copyright (C) 2013 Faraday Technology Corporation
  *
  * Author : Yuan-Hsin Chen <yhchen@faraday-tech.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
  */
 
 #include <linux/dma-mapping.h>
diff --git a/drivers/usb/gadget/udc/fotg210.h b/drivers/usb/gadget/udc/fotg210.h
index bbf991bcbe7c..08c32957503b 100644
--- a/drivers/usb/gadget/udc/fotg210.h
+++ b/drivers/usb/gadget/udc/fotg210.h
@@ -1,13 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Faraday FOTG210 USB OTG controller
  *
  * Copyright (C) 2013 Faraday Technology Corporation
  * Author: Yuan-Hsin Chen <yhchen@faraday-tech.com>
- *
- * 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.
  */
 
 #include <linux/kernel.h>
diff --git a/drivers/usb/gadget/udc/fsl_mxc_udc.c b/drivers/usb/gadget/udc/fsl_mxc_udc.c
index f16e149c5b3e..f29cf5c6160c 100644
--- a/drivers/usb/gadget/udc/fsl_mxc_udc.c
+++ b/drivers/usb/gadget/udc/fsl_mxc_udc.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright (C) 2009
  * Guennadi Liakhovetski, DENX Software Engineering, <lg@denx.de>
@@ -5,11 +6,6 @@
  * Description:
  * Helper routines for i.MX3x SoCs from Freescale, needed by the fsl_usb2_udc.c
  * driver to function correctly on these systems.
- *
- * 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.
  */
 #include <linux/clk.h>
 #include <linux/delay.h>
diff --git a/drivers/usb/gadget/udc/fsl_qe_udc.c b/drivers/usb/gadget/udc/fsl_qe_udc.c
index a3e72d690eef..2707be628298 100644
--- a/drivers/usb/gadget/udc/fsl_qe_udc.c
+++ b/drivers/usb/gadget/udc/fsl_qe_udc.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * driver/usb/gadget/fsl_qe_udc.c
  *
@@ -11,11 +12,6 @@
  * Freescle QE/CPM USB Pheripheral Controller Driver
  * The controller can be found on MPC8360, MPC8272, and etc.
  * MPC8360 Rev 1.1 may need QE mircocode update
- *
- * 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.
  */
 
 #undef USB_TRACE
diff --git a/drivers/usb/gadget/udc/fsl_qe_udc.h b/drivers/usb/gadget/udc/fsl_qe_udc.h
index 7026919fc901..2c537a904ee7 100644
--- a/drivers/usb/gadget/udc/fsl_qe_udc.h
+++ b/drivers/usb/gadget/udc/fsl_qe_udc.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * drivers/usb/gadget/qe_udc.h
  *
@@ -8,11 +9,6 @@
  *
  * Description:
  * Freescale USB device/endpoint management registers
- *
- * 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.
  */
 
 #ifndef __FSL_QE_UDC_H
diff --git a/drivers/usb/gadget/udc/fsl_udc_core.c b/drivers/usb/gadget/udc/fsl_udc_core.c
index 6f2f71c054be..d606d4f13098 100644
--- a/drivers/usb/gadget/udc/fsl_udc_core.c
+++ b/drivers/usb/gadget/udc/fsl_udc_core.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright (C) 2004-2007,2011-2012 Freescale Semiconductor, Inc.
  * All rights reserved.
@@ -10,11 +11,6 @@
  * This can be found on MPC8349E/MPC8313E/MPC5121E cpus.
  * The driver is previously named as mpc_udc.  Based on bare board
  * code from Dave Liu and Shlomi Gridish.
- *
- * 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.
  */
 
 #undef VERBOSE
diff --git a/drivers/usb/gadget/udc/fsl_usb2_udc.h b/drivers/usb/gadget/udc/fsl_usb2_udc.h
index e92b8408b6f6..4ba651ae9048 100644
--- a/drivers/usb/gadget/udc/fsl_usb2_udc.h
+++ b/drivers/usb/gadget/udc/fsl_usb2_udc.h
@@ -1,12 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright (C) 2004,2012 Freescale Semiconductor, Inc
  * All rights reserved.
  *
- * This program is free software; you can redistribute  it and/or modify it
- * under  the terms of  the GNU General  Public License as published by the
- * Free Software Foundation;  either version 2 of the  License, or (at your
- * option) any later version.
- *
  * Freescale USB device/endpoint management registers
  */
 #ifndef __FSL_USB2_UDC_H
diff --git a/drivers/usb/gadget/udc/fusb300_udc.c b/drivers/usb/gadget/udc/fusb300_udc.c
index e0c1b0099265..263804d154a7 100644
--- a/drivers/usb/gadget/udc/fusb300_udc.c
+++ b/drivers/usb/gadget/udc/fusb300_udc.c
@@ -1,13 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Fusb300 UDC (USB gadget)
  *
  * Copyright (C) 2010 Faraday Technology Corp.
  *
  * Author : Yuan-hsin Chen <yhchen@faraday-tech.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
  */
 #include <linux/dma-mapping.h>
 #include <linux/err.h>
diff --git a/drivers/usb/gadget/udc/fusb300_udc.h b/drivers/usb/gadget/udc/fusb300_udc.h
index ad39f892d200..eb3d6d379ba7 100644
--- a/drivers/usb/gadget/udc/fusb300_udc.h
+++ b/drivers/usb/gadget/udc/fusb300_udc.h
@@ -1,13 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Fusb300 UDC (USB gadget)
  *
  * Copyright (C) 2010 Faraday Technology Corp.
  *
  * Author : Yuan-hsin Chen <yhchen@faraday-tech.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
  */
 
 
diff --git a/drivers/usb/gadget/udc/goku_udc.c b/drivers/usb/gadget/udc/goku_udc.c
index 8433c22900dc..4504d0b202db 100644
--- a/drivers/usb/gadget/udc/goku_udc.c
+++ b/drivers/usb/gadget/udc/goku_udc.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Toshiba TC86C001 ("Goku-S") USB Device Controller driver
  *
@@ -5,10 +6,6 @@
  *      by Stuart Lynne, Tom Rushworth, and Bruce Balden
  * Copyright (C) 2002 Toshiba Corporation
  * Copyright (C) 2003 MontaVista Software (source@mvista.com)
- *
- * This file is licensed under the terms of the GNU General Public
- * License version 2.  This program is licensed "as is" without any
- * warranty of any kind, whether express or implied.
  */
 
 /*
@@ -127,11 +124,15 @@ goku_ep_enable(struct usb_ep *_ep, const struct usb_endpoint_descriptor *desc)
         mode = 0;
         max = get_unaligned_le16(&desc->wMaxPacketSize);
         switch (max) {
-        case 64:        mode++;
-        case 32:        mode++;
-        case 16:        mode++;
-        case 8:         mode <<= 3;
-                        break;
+        case 64:
+                mode++; /* fall through */
+        case 32:
+                mode++; /* fall through */
+        case 16:
+                mode++; /* fall through */
+        case 8:
+                mode <<= 3;
+                break;
         default:
                 return -EINVAL;
         }
diff --git a/drivers/usb/gadget/udc/goku_udc.h b/drivers/usb/gadget/udc/goku_udc.h
index 86d2adafe149..26601bf4e7a9 100644
--- a/drivers/usb/gadget/udc/goku_udc.h
+++ b/drivers/usb/gadget/udc/goku_udc.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Toshiba TC86C001 ("Goku-S") USB Device Controller driver
  *
@@ -5,10 +6,6 @@
  *      by Stuart Lynne, Tom Rushworth, and Bruce Balden
  * Copyright (C) 2002 Toshiba Corporation
  * Copyright (C) 2003 MontaVista Software (source@mvista.com)
- *
- * This file is licensed under the terms of the GNU General Public
- * License version 2.  This program is licensed "as is" without any
- * warranty of any kind, whether express or implied.
  */
 
 /*
diff --git a/drivers/usb/gadget/udc/gr_udc.c b/drivers/usb/gadget/udc/gr_udc.c
index 0b59fa50aa30..b3fb1bbdb854 100644
--- a/drivers/usb/gadget/udc/gr_udc.c
+++ b/drivers/usb/gadget/udc/gr_udc.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * USB Peripheral Controller driver for Aeroflex Gaisler GRUSBDC.
  *
@@ -9,11 +10,6 @@
  * Full documentation of the GRUSBDC core can be found here:
  * http://www.gaisler.com/products/grlib/grip.pdf
  *
- * 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.
- *
  * Contributors:
  * - Andreas Larsson <andreas@gaisler.com>
  * - Marko Isomaki
@@ -1538,7 +1534,7 @@ static int gr_ep_enable(struct usb_ep *_ep,
          * Bits 10-0 set the max payload. 12-11 set the number of
          * additional transactions.
          */
-        max = 0x7ff & usb_endpoint_maxp(desc);
+        max = usb_endpoint_maxp(desc);
         nt = usb_endpoint_maxp_mult(desc) - 1;
         buffer_size = GR_BUFFER_SIZE(epctrl);
         if (nt && (mode == 0 || mode == 2)) {
diff --git a/drivers/usb/gadget/udc/gr_udc.h b/drivers/usb/gadget/udc/gr_udc.h
index 4297c4e8021f..3e913268c8c5 100644
--- a/drivers/usb/gadget/udc/gr_udc.h
+++ b/drivers/usb/gadget/udc/gr_udc.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * USB Peripheral Controller driver for Aeroflex Gaisler GRUSBDC.
  *
@@ -9,11 +10,6 @@
  * Full documentation of the GRUSBDC core can be found here:
  * http://www.gaisler.com/products/grlib/grip.pdf
  *
- * 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.
- *
  * Contributors:
  * - Andreas Larsson <andreas@gaisler.com>
  * - Marko Isomaki
diff --git a/drivers/usb/gadget/udc/lpc32xx_udc.c b/drivers/usb/gadget/udc/lpc32xx_udc.c
index 8f32b5ee7734..b0781771704e 100644
--- a/drivers/usb/gadget/udc/lpc32xx_udc.c
+++ b/drivers/usb/gadget/udc/lpc32xx_udc.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * USB Gadget driver for LPC32xx
  *
@@ -12,20 +13,6 @@
  *
  * Note: This driver is based on original work done by Mike James for
  *       the LPC3180.
- *
- * 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.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include <linux/clk.h>
diff --git a/drivers/usb/gadget/udc/m66592-udc.c b/drivers/usb/gadget/udc/m66592-udc.c
index 46ce7bc15f2b..f19e6282a688 100644
--- a/drivers/usb/gadget/udc/m66592-udc.c
+++ b/drivers/usb/gadget/udc/m66592-udc.c
@@ -1,13 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * M66592 UDC (USB gadget)
  *
  * Copyright (C) 2006-2007 Renesas Solutions Corp.
  *
  * Author : Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
  */
 
 #include <linux/module.h>
@@ -1592,9 +1589,7 @@ static int m66592_probe(struct platform_device *pdev)
         m66592->gadget.max_speed = USB_SPEED_HIGH;
         m66592->gadget.name = udc_name;
 
-        init_timer(&m66592->timer);
-        m66592->timer.function = m66592_timer;
-        m66592->timer.data = (unsigned long)m66592;
+        setup_timer(&m66592->timer, m66592_timer, (unsigned long)m66592);
         m66592->reg = reg;
 
         ret = request_irq(ires->start, m66592_irq, IRQF_SHARED,
diff --git a/drivers/usb/gadget/udc/m66592-udc.h b/drivers/usb/gadget/udc/m66592-udc.h
index 96d49d7bfb6b..01a64685b8a3 100644
--- a/drivers/usb/gadget/udc/m66592-udc.h
+++ b/drivers/usb/gadget/udc/m66592-udc.h
@@ -1,13 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * M66592 UDC (USB gadget)
  *
  * Copyright (C) 2006-2007 Renesas Solutions Corp.
  *
  * Author : Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
  */
 
 #ifndef __M66592_UDC_H__
diff --git a/drivers/usb/gadget/udc/mv_u3d.h b/drivers/usb/gadget/udc/mv_u3d.h
index e32a787ac373..982625b7197a 100644
--- a/drivers/usb/gadget/udc/mv_u3d.h
+++ b/drivers/usb/gadget/udc/mv_u3d.h
@@ -1,9 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Copyright (C) 2011 Marvell International Ltd. All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms and conditions of the GNU General Public License,
- * version 2, as published by the Free Software Foundation.
  */
 
 #ifndef __MV_U3D_H
diff --git a/drivers/usb/gadget/udc/mv_u3d_core.c b/drivers/usb/gadget/udc/mv_u3d_core.c
index 772049afe166..35e02a8d0091 100644
--- a/drivers/usb/gadget/udc/mv_u3d_core.c
+++ b/drivers/usb/gadget/udc/mv_u3d_core.c
@@ -1,9 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Copyright (C) 2011 Marvell International Ltd. All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms and conditions of the GNU General Public License,
- * version 2, as published by the Free Software Foundation.
  */
 
 #include <linux/module.h>
diff --git a/drivers/usb/gadget/udc/mv_udc.h b/drivers/usb/gadget/udc/mv_udc.h
index be77f207dbaf..b3f759c0962c 100644
--- a/drivers/usb/gadget/udc/mv_udc.h
+++ b/drivers/usb/gadget/udc/mv_udc.h
@@ -1,10 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright (C) 2011 Marvell International Ltd. All rights reserved.
- *
- * This program is free software; you can redistribute  it and/or modify it
- * under  the terms of  the GNU General  Public License as published by the
- * Free Software Foundation;  either version 2 of the  License, or (at your
- * option) any later version.
  */
 
 #ifndef __MV_UDC_H
diff --git a/drivers/usb/gadget/udc/mv_udc_core.c b/drivers/usb/gadget/udc/mv_udc_core.c
index 4103bf7cf52a..95f52232493b 100644
--- a/drivers/usb/gadget/udc/mv_udc_core.c
+++ b/drivers/usb/gadget/udc/mv_udc_core.c
@@ -1,12 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright (C) 2011 Marvell International Ltd. All rights reserved.
  * Author: Chao Xie <chao.xie@marvell.com>
  *         Neil Zhang <zhangwm@marvell.com>
- *
- * 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.
  */
 
 #include <linux/module.h>
diff --git a/drivers/usb/gadget/udc/net2272.c b/drivers/usb/gadget/udc/net2272.c
index 8f85a51bd2b3..660878a19505 100644
--- a/drivers/usb/gadget/udc/net2272.c
+++ b/drivers/usb/gadget/udc/net2272.c
@@ -1,22 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Driver for PLX NET2272 USB device controller
  *
  * Copyright (C) 2005-2006 PLX Technology, Inc.
  * Copyright (C) 2006-2011 Analog Devices, Inc.
- *
- * 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.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include <linux/delay.h>
diff --git a/drivers/usb/gadget/udc/net2272.h b/drivers/usb/gadget/udc/net2272.h
index 69bc9c3c6ce4..8e644627992d 100644
--- a/drivers/usb/gadget/udc/net2272.h
+++ b/drivers/usb/gadget/udc/net2272.h
@@ -1,22 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * PLX NET2272 high/full speed USB device controller
  *
  * Copyright (C) 2005-2006 PLX Technology, Inc.
  * Copyright (C) 2006-2011 Analog Devices, Inc.
- *
- * 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.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #ifndef __NET2272_H__
diff --git a/drivers/usb/gadget/udc/net2280.c b/drivers/usb/gadget/udc/net2280.c
index f608c1f85e61..318246d8b2e2 100644
--- a/drivers/usb/gadget/udc/net2280.c
+++ b/drivers/usb/gadget/udc/net2280.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Driver for the PLX NET2280 USB device controller.
  * Specs and errata are available from <http://www.plxtech.com>.
@@ -31,11 +32,6 @@
  *
  * Modified Ricardo Ribalda Qtechnology AS  to provide compatibility
  *      with usb 338x chip. Based on PLX driver
- *
- * 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.
  */
 
 #include <linux/module.h>
diff --git a/drivers/usb/gadget/udc/net2280.h b/drivers/usb/gadget/udc/net2280.h
index 1088c3745999..b65a797544d7 100644
--- a/drivers/usb/gadget/udc/net2280.h
+++ b/drivers/usb/gadget/udc/net2280.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * NetChip 2280 high/full speed USB device controller.
  * Unlike many such controllers, this one talks PCI.
@@ -7,11 +8,6 @@
  * Copyright (C) 2002 NetChip Technology, Inc. (http://www.netchip.com)
  * Copyright (C) 2003 David Brownell
  * Copyright (C) 2014 Ricardo Ribalda - Qtechnology/AS
- *
- * 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.
  */
 
 #include <linux/usb/net2280.h>
diff --git a/drivers/usb/gadget/udc/omap_udc.c b/drivers/usb/gadget/udc/omap_udc.c
index f05ba6825bfe..fc7f810baef7 100644
--- a/drivers/usb/gadget/udc/omap_udc.c
+++ b/drivers/usb/gadget/udc/omap_udc.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * omap_udc.c -- for OMAP full speed udc; most chips support OTG.
  *
@@ -5,11 +6,6 @@
  * Copyright (C) 2004-2005 David Brownell
  *
  * OMAP2 & DMA support by Kyungmin Park <kyungmin.park@samsung.com>
- *
- * 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.
  */
 
 #undef  DEBUG
diff --git a/drivers/usb/gadget/udc/pch_udc.c b/drivers/usb/gadget/udc/pch_udc.c
index 84dcbcd756f0..afaea11ec771 100644
--- a/drivers/usb/gadget/udc/pch_udc.c
+++ b/drivers/usb/gadget/udc/pch_udc.c
@@ -1,9 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Copyright (C) 2011 LAPIS Semiconductor Co., Ltd.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
  */
 #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
 #include <linux/kernel.h>
diff --git a/drivers/usb/gadget/udc/pxa25x_udc.c b/drivers/usb/gadget/udc/pxa25x_udc.c
index a238da906115..8f135d9fa245 100644
--- a/drivers/usb/gadget/udc/pxa25x_udc.c
+++ b/drivers/usb/gadget/udc/pxa25x_udc.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Intel PXA25x and IXP4xx on-chip full speed USB device controllers
  *
@@ -6,11 +7,6 @@
  * Copyright (C) 2003 Benedikt Spranger, Pengutronix
  * Copyright (C) 2003 David Brownell
  * Copyright (C) 2003 Joshua Wise
- *
- * 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.
  */
 
 /* #define VERBOSE_DEBUG */
@@ -2417,9 +2413,7 @@ static int pxa25x_udc_probe(struct platform_device *pdev)
                 gpio_direction_output(dev->mach->gpio_pullup, 0);
         }
 
-        init_timer(&dev->timer);
-        dev->timer.function = udc_watchdog;
-        dev->timer.data = (unsigned long) dev;
+        setup_timer(&dev->timer, udc_watchdog, (unsigned long)dev);
 
         the_controller = dev;
         platform_set_drvdata(pdev, dev);
diff --git a/drivers/usb/gadget/udc/pxa25x_udc.h b/drivers/usb/gadget/udc/pxa25x_udc.h
index a458bec2536d..ccc6b921f067 100644
--- a/drivers/usb/gadget/udc/pxa25x_udc.h
+++ b/drivers/usb/gadget/udc/pxa25x_udc.h
@@ -1,14 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Intel PXA25x on-chip full speed USB device controller
  *
  * Copyright (C) 2003 Robert Schwebel <r.schwebel@pengutronix.de>, Pengutronix
  * Copyright (C) 2003 David Brownell
- *
- *
- * 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.
  */
 
 #ifndef __LINUX_USB_GADGET_PXA25X_H
diff --git a/drivers/usb/gadget/udc/pxa27x_udc.c b/drivers/usb/gadget/udc/pxa27x_udc.c
index d48e239660c3..be2761f1b3f5 100644
--- a/drivers/usb/gadget/udc/pxa27x_udc.c
+++ b/drivers/usb/gadget/udc/pxa27x_udc.c
@@ -1,13 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Handles the Intel 27x USB Device Controller (UDC)
  *
  * Inspired by original driver by Frank Becker, David Brownell, and others.
  * Copyright (C) 2008 Robert Jarzmik
- *
- * 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.
  */
 #include <linux/module.h>
 #include <linux/kernel.h>
diff --git a/drivers/usb/gadget/udc/pxa27x_udc.h b/drivers/usb/gadget/udc/pxa27x_udc.h
index cea2cb79b30c..1128d39a4255 100644
--- a/drivers/usb/gadget/udc/pxa27x_udc.h
+++ b/drivers/usb/gadget/udc/pxa27x_udc.h
@@ -1,14 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * linux/drivers/usb/gadget/pxa27x_udc.h
  * Intel PXA27x on-chip full speed USB device controller
  *
  * Inspired by original driver by Frank Becker, David Brownell, and others.
  * Copyright (C) 2008 Robert Jarzmik
- *
- * 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.
  */
 
 #ifndef __LINUX_USB_GADGET_PXA27X_H
diff --git a/drivers/usb/gadget/udc/r8a66597-udc.c b/drivers/usb/gadget/udc/r8a66597-udc.c
index 118ad70f1af0..143122ed3c66 100644
--- a/drivers/usb/gadget/udc/r8a66597-udc.c
+++ b/drivers/usb/gadget/udc/r8a66597-udc.c
@@ -1,13 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * R8A66597 UDC (USB gadget)
  *
  * Copyright (C) 2006-2009 Renesas Solutions Corp.
  *
  * Author : Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
  */
 
 #include <linux/module.h>
@@ -1877,9 +1874,7 @@ static int r8a66597_probe(struct platform_device *pdev)
         r8a66597->gadget.max_speed = USB_SPEED_HIGH;
         r8a66597->gadget.name = udc_name;
 
-        init_timer(&r8a66597->timer);
-        r8a66597->timer.function = r8a66597_timer;
-        r8a66597->timer.data = (unsigned long)r8a66597;
+        setup_timer(&r8a66597->timer, r8a66597_timer, (unsigned long)r8a66597);
         r8a66597->reg = reg;
 
         if (r8a66597->pdata->on_chip) {
diff --git a/drivers/usb/gadget/udc/r8a66597-udc.h b/drivers/usb/gadget/udc/r8a66597-udc.h
index 45c4b2df1785..9a115caba661 100644
--- a/drivers/usb/gadget/udc/r8a66597-udc.h
+++ b/drivers/usb/gadget/udc/r8a66597-udc.h
@@ -1,13 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * R8A66597 UDC
  *
  * Copyright (C) 2007-2009 Renesas Solutions Corp.
  *
  * Author : Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
  */
 
 #ifndef __R8A66597_H__
diff --git a/drivers/usb/gadget/udc/renesas_usb3.c b/drivers/usb/gadget/udc/renesas_usb3.c
index 63a206122058..bc37f40baacf 100644
--- a/drivers/usb/gadget/udc/renesas_usb3.c
+++ b/drivers/usb/gadget/udc/renesas_usb3.c
@@ -1,22 +1,20 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Renesas USB3.0 Peripheral driver (USB gadget)
  *
- * Copyright (C) 2015  Renesas Electronics Corporation
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
+ * Copyright (C) 2015-2017  Renesas Electronics Corporation
  */
 
 #include <linux/debugfs.h>
 #include <linux/delay.h>
 #include <linux/dma-mapping.h>
 #include <linux/err.h>
-#include <linux/extcon.h>
+#include <linux/extcon-provider.h>
 #include <linux/interrupt.h>
 #include <linux/io.h>
 #include <linux/module.h>
 #include <linux/of_device.h>
+#include <linux/phy/phy.h>
 #include <linux/platform_device.h>
 #include <linux/pm_runtime.h>
 #include <linux/sizes.h>
@@ -334,6 +332,7 @@ struct renesas_usb3 {
         struct usb_gadget_driver *driver;
         struct extcon_dev *extcon;
         struct work_struct extcon_work;
+        struct phy *phy;
 
         struct renesas_usb3_ep *usb3_ep;
         int num_usb3_eps;
@@ -2056,7 +2055,7 @@ static u32 usb3_calc_rammap_val(struct renesas_usb3_ep *usb3_ep,
                                 const struct usb_endpoint_descriptor *desc)
 {
         int i;
-        const u32 max_packet_array[] = {8, 16, 32, 64, 512};
+        static const u32 max_packet_array[] = {8, 16, 32, 64, 512};
         u32 mpkt = PN_RAMMAP_MPKT(1024);
 
         for (i = 0; i < ARRAY_SIZE(max_packet_array); i++) {
@@ -2239,7 +2238,9 @@ static int renesas_usb3_start(struct usb_gadget *gadget,
         /* hook up the driver */
         usb3->driver = driver;
 
-        pm_runtime_enable(usb3_to_dev(usb3));
+        if (usb3->phy)
+                phy_init(usb3->phy);
+
         pm_runtime_get_sync(usb3_to_dev(usb3));
 
         renesas_usb3_init_controller(usb3);
@@ -2256,8 +2257,10 @@ static int renesas_usb3_stop(struct usb_gadget *gadget)
         usb3->driver = NULL;
         renesas_usb3_stop_controller(usb3);
 
+        if (usb3->phy)
+                phy_exit(usb3->phy);
+
         pm_runtime_put(usb3_to_dev(usb3));
-        pm_runtime_disable(usb3_to_dev(usb3));
 
         return 0;
 }
@@ -2405,6 +2408,9 @@ static int renesas_usb3_remove(struct platform_device *pdev)
         renesas_usb3_dma_free_prd(usb3, &pdev->dev);
 
         __renesas_usb3_ep_free_request(usb3->ep0_req);
+        if (usb3->phy)
+                phy_put(usb3->phy);
+        pm_runtime_disable(usb3_to_dev(usb3));
 
         return 0;
 }
@@ -2560,20 +2566,15 @@ static int renesas_usb3_probe(struct platform_device *pdev)
 {
         struct renesas_usb3 *usb3;
         struct resource *res;
-        const struct of_device_id *match;
         int irq, ret;
         const struct renesas_usb3_priv *priv;
         const struct soc_device_attribute *attr;
 
-        match = of_match_node(usb3_of_match, pdev->dev.of_node);
-        if (!match)
-                return -ENODEV;
-
         attr = soc_device_match(renesas_usb3_quirks_match);
         if (attr)
                 priv = attr->data;
         else
-                priv = match->data;
+                priv = of_device_get_match_data(&pdev->dev);
 
         irq = platform_get_irq(pdev, 0);
         if (irq < 0) {
@@ -2635,11 +2636,20 @@ static int renesas_usb3_probe(struct platform_device *pdev)
         if (ret < 0)
                 goto err_dev_create;
 
+        /*
+         * This is an optional. So, if this driver cannot get a phy,
+         * this driver will not handle a phy anymore.
+         */
+        usb3->phy = devm_phy_get(&pdev->dev, "usb");
+        if (IS_ERR(usb3->phy))
+                usb3->phy = NULL;
+
         usb3->workaround_for_vbus = priv->workaround_for_vbus;
 
         renesas_usb3_debugfs_init(usb3, &pdev->dev);
 
-        dev_info(&pdev->dev, "probed\n");
+        dev_info(&pdev->dev, "probed%s\n", usb3->phy ? " with phy" : "");
+        pm_runtime_enable(usb3_to_dev(usb3));
 
         return 0;
 
@@ -2655,11 +2665,49 @@ err_alloc_prd:
         return ret;
 }
 
+#ifdef CONFIG_PM_SLEEP
+static int renesas_usb3_suspend(struct device *dev)
+{
+        struct renesas_usb3 *usb3 = dev_get_drvdata(dev);
+
+        /* Not started */
+        if (!usb3->driver)
+                return 0;
+
+        renesas_usb3_stop_controller(usb3);
+        if (usb3->phy)
+                phy_exit(usb3->phy);
+        pm_runtime_put(dev);
+
+        return 0;
+}
+
+static int renesas_usb3_resume(struct device *dev)
+{
+        struct renesas_usb3 *usb3 = dev_get_drvdata(dev);
+
+        /* Not started */
+        if (!usb3->driver)
+                return 0;
+
+        if (usb3->phy)
+                phy_init(usb3->phy);
+        pm_runtime_get_sync(dev);
+        renesas_usb3_init_controller(usb3);
+
+        return 0;
+}
+#endif
+
+static SIMPLE_DEV_PM_OPS(renesas_usb3_pm_ops, renesas_usb3_suspend,
+                        renesas_usb3_resume);
+
 static struct platform_driver renesas_usb3_driver = {
         .probe          = renesas_usb3_probe,
         .remove         = renesas_usb3_remove,
         .driver         = {
                 .name = (char *)udc_name,
+                .pm             = &renesas_usb3_pm_ops,
                 .of_match_table = of_match_ptr(usb3_of_match),
         },
 };
diff --git a/drivers/usb/gadget/udc/s3c-hsudc.c b/drivers/usb/gadget/udc/s3c-hsudc.c
index 42587b738a1f..31c7c5587cf9 100644
--- a/drivers/usb/gadget/udc/s3c-hsudc.c
+++ b/drivers/usb/gadget/udc/s3c-hsudc.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /* linux/drivers/usb/gadget/s3c-hsudc.c
  *
  * Copyright (c) 2010 Samsung Electronics Co., Ltd.
@@ -8,11 +9,7 @@
  * The S3C24XX USB 2.0 high-speed USB controller supports upto 9 endpoints.
  * Each endpoint can be configured as either in or out endpoint. Endpoints
  * can be configured for Bulk or Interrupt transfer mode.
- *
- * 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/kernel.h>
 #include <linux/module.h>
diff --git a/drivers/usb/gadget/udc/s3c2410_udc.c b/drivers/usb/gadget/udc/s3c2410_udc.c
index 394abd5d65c0..f154f49e98c8 100644
--- a/drivers/usb/gadget/udc/s3c2410_udc.c
+++ b/drivers/usb/gadget/udc/s3c2410_udc.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * linux/drivers/usb/gadget/s3c2410_udc.c
  *
@@ -5,11 +6,6 @@
  *
  * Copyright (C) 2004-2007 Herbert Pötzl - Arnaud Patard
  *      Additional cleanups by Ben Dooks <ben-linux@fluff.org>
- *
- * 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.
  */
 
 #define pr_fmt(fmt) "s3c2410_udc: " fmt
diff --git a/drivers/usb/gadget/udc/s3c2410_udc.h b/drivers/usb/gadget/udc/s3c2410_udc.h
index 93bf225f1969..bdcaa8dd300f 100644
--- a/drivers/usb/gadget/udc/s3c2410_udc.h
+++ b/drivers/usb/gadget/udc/s3c2410_udc.h
@@ -1,14 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * linux/drivers/usb/gadget/s3c2410_udc.h
  * Samsung on-chip full speed USB device controllers
  *
  * Copyright (C) 2004-2007 Herbert Pötzl - Arnaud Patard
  *      Additional cleanups by Ben Dooks <ben-linux@fluff.org>
- *
- * 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.
  */
 
 #ifndef _S3C2410_UDC_H
diff --git a/drivers/usb/gadget/udc/snps_udc_core.c b/drivers/usb/gadget/udc/snps_udc_core.c
index 38a165dbf924..d4da47f4f6f4 100644
--- a/drivers/usb/gadget/udc/snps_udc_core.c
+++ b/drivers/usb/gadget/udc/snps_udc_core.c
@@ -1,13 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * amd5536.c -- AMD 5536 UDC high/full speed USB device controller
  *
  * Copyright (C) 2005-2007 AMD (http://www.amd.com)
  * Author: Thomas Dahlmann
- *
- * 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.
  */
 
 /*
@@ -1733,7 +1729,7 @@ static void udc_soft_reset(struct udc *dev)
 }
 
 /* RDE timer callback to set RDE bit */
-static void udc_timer_function(unsigned long v)
+static void udc_timer_function(struct timer_list *unused)
 {
         u32 tmp;
 
@@ -1813,7 +1809,7 @@ static void udc_handle_halt_state(struct udc_ep *ep)
 }
 
 /* Stall timer callback to poll S bit and set it again after */
-static void udc_pollstall_timer_function(unsigned long v)
+static void udc_pollstall_timer_function(struct timer_list *unused)
 {
         struct udc_ep *ep;
         int halted = 0;
@@ -3067,14 +3063,12 @@ void udc_remove(struct udc *dev)
         stop_timer++;
         if (timer_pending(&udc_timer))
                 wait_for_completion(&on_exit);
-        if (udc_timer.data)
-                del_timer_sync(&udc_timer);
+        del_timer_sync(&udc_timer);
         /* remove pollstall timer */
         stop_pollstall_timer++;
         if (timer_pending(&udc_pollstall_timer))
                 wait_for_completion(&on_pollstall_exit);
-        if (udc_pollstall_timer.data)
-                del_timer_sync(&udc_pollstall_timer);
+        del_timer_sync(&udc_pollstall_timer);
         udc = NULL;
 }
 EXPORT_SYMBOL_GPL(udc_remove);
@@ -3164,10 +3158,6 @@ int udc_probe(struct udc *dev)
         u32             reg;
         int             retval;
 
-        /* mark timer as not initialized */
-        udc_timer.data = 0;
-        udc_pollstall_timer.data = 0;
-
         /* device struct setup */
         dev->gadget.ops = &udc_ops;
 
@@ -3207,13 +3197,8 @@ int udc_probe(struct udc *dev)
                 goto finished;
 
         /* timer init */
-        init_timer(&udc_timer);
-        udc_timer.function = udc_timer_function;
-        udc_timer.data = 1;
-        /* timer pollstall init */
-        init_timer(&udc_pollstall_timer);
-        udc_pollstall_timer.function = udc_pollstall_timer_function;
-        udc_pollstall_timer.data = 1;
+        timer_setup(&udc_timer, udc_timer_function, 0);
+        timer_setup(&udc_pollstall_timer, udc_pollstall_timer_function, 0);
 
         /* set SD */
         reg = readl(&dev->regs->ctl);
diff --git a/drivers/usb/gadget/udc/snps_udc_plat.c b/drivers/usb/gadget/udc/snps_udc_plat.c
index e8a5fdaee37d..32f1d3e90c26 100644
--- a/drivers/usb/gadget/udc/snps_udc_plat.c
+++ b/drivers/usb/gadget/udc/snps_udc_plat.c
@@ -1,16 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * snps_udc_plat.c - Synopsys UDC Platform Driver
  *
  * Copyright (C) 2016 Broadcom
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation version 2.
- *
- * This program is distributed "as is" WITHOUT ANY WARRANTY of any
- * kind, whether express or implied; without even the implied warranty
- * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
  */
 
 #include <linux/extcon.h>
diff --git a/drivers/usb/gadget/udc/trace.c b/drivers/usb/gadget/udc/trace.c
index 8c551ab91ad8..7430624c0bd7 100644
--- a/drivers/usb/gadget/udc/trace.c
+++ b/drivers/usb/gadget/udc/trace.c
@@ -1,17 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0
 /**
  * trace.c - USB Gadget Framework Trace Support
  *
  * Copyright (C) 2016 Intel Corporation
  * Author: Felipe Balbi <felipe.balbi@linux.intel.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.
  */
 
 #define CREATE_TRACE_POINTS
diff --git a/drivers/usb/gadget/udc/trace.h b/drivers/usb/gadget/udc/trace.h
index da29874b5366..f07ddb3f4bb9 100644
--- a/drivers/usb/gadget/udc/trace.h
+++ b/drivers/usb/gadget/udc/trace.h
@@ -1,20 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0
 /**
  * udc.c - Core UDC Framework
  *
  * Copyright (C) 2016 Intel Corporation
  * Author: Felipe Balbi <felipe.balbi@linux.intel.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.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #undef TRACE_SYSTEM
diff --git a/drivers/usb/gadget/udc/udc-xilinx.c b/drivers/usb/gadget/udc/udc-xilinx.c
index de207a90571e..7da2b9ce8cb3 100644
--- a/drivers/usb/gadget/udc/udc-xilinx.c
+++ b/drivers/usb/gadget/udc/udc-xilinx.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Xilinx USB peripheral controller driver
  *
@@ -8,12 +9,6 @@
  *
  * Some parts of this driver code is based on the driver for at91-series
  * USB peripheral controller (at91_udc.c).
- *
- * 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.
  */
 
 #include <linux/delay.h>
diff --git a/drivers/usb/gadget/usbstring.c b/drivers/usb/gadget/usbstring.c
index 73a4dfba0edb..566ab261e8b7 100644
--- a/drivers/usb/gadget/usbstring.c
+++ b/drivers/usb/gadget/usbstring.c
@@ -1,10 +1,6 @@
+// SPDX-License-Identifier: LGPL-2.1+
 /*
  * Copyright (C) 2003 David Brownell
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published
- * by the Free Software Foundation; either version 2.1 of the License, or
- * (at your option) any later version.
  */
 
 #include <linux/errno.h>
diff --git a/drivers/usb/host/Kconfig b/drivers/usb/host/Kconfig
index fa5692dec832..b80a94e632af 100644
--- a/drivers/usb/host/Kconfig
+++ b/drivers/usb/host/Kconfig
@@ -45,12 +45,12 @@ config USB_XHCI_PLATFORM
           If unsure, say N.
 
 config USB_XHCI_MTK
-        tristate "xHCI support for Mediatek MT65xx/MT7621"
+        tristate "xHCI support for MediaTek SoCs"
         select MFD_SYSCON
         depends on (MIPS && SOC_MT7621) || ARCH_MEDIATEK || COMPILE_TEST
         ---help---
           Say 'Y' to enable the support for the xHCI host controller
-          found in Mediatek MT65xx SoCs.
+          found in MediaTek SoCs.
           If unsure, say N.
 
 config USB_XHCI_MVEBU
@@ -222,18 +222,6 @@ config USB_EHCI_HCD_AT91
           Enables support for the on-chip EHCI controller on
           Atmel chips.
 
-config USB_EHCI_MSM
-        tristate "Support for Qualcomm QSD/MSM on-chip EHCI USB controller"
-        depends on ARCH_QCOM
-        select USB_EHCI_ROOT_HUB_TT
-        ---help---
-          Enables support for the USB Host controller present on the
-          Qualcomm chipsets. Root Hub has inbuilt TT.
-          This driver depends on OTG driver for PHY initialization,
-          clock management, powering up VBUS, and power management.
-          This driver is not supported on boards like trout which
-          has an external PHY.
-
 config USB_EHCI_TEGRA
        tristate "NVIDIA Tegra HCD support"
        depends on ARCH_TEGRA
diff --git a/drivers/usb/host/Makefile b/drivers/usb/host/Makefile
index 4ab2689c8952..32b036e2ffef 100644
--- a/drivers/usb/host/Makefile
+++ b/drivers/usb/host/Makefile
@@ -26,6 +26,10 @@ ifneq ($(CONFIG_USB_XHCI_RCAR), )
         xhci-plat-hcd-y         += xhci-rcar.o
 endif
 
+ifneq ($(CONFIG_DEBUG_FS),)
+        xhci-hcd-y              += xhci-debugfs.o
+endif
+
 obj-$(CONFIG_USB_WHCI_HCD)      += whci/
 
 obj-$(CONFIG_USB_PCI)   += pci-quirks.o
@@ -40,7 +44,6 @@ obj-$(CONFIG_USB_EHCI_HCD_SPEAR)	+= ehci-spear.o
 obj-$(CONFIG_USB_EHCI_HCD_STI)  += ehci-st.o
 obj-$(CONFIG_USB_EHCI_EXYNOS)   += ehci-exynos.o
 obj-$(CONFIG_USB_EHCI_HCD_AT91) += ehci-atmel.o
-obj-$(CONFIG_USB_EHCI_MSM)      += ehci-msm.o
 obj-$(CONFIG_USB_EHCI_TEGRA)    += ehci-tegra.o
 obj-$(CONFIG_USB_W90X900_EHCI)  += ehci-w90x900.o
 
diff --git a/drivers/usb/host/bcma-hcd.c b/drivers/usb/host/bcma-hcd.c
index 5f425c89faf1..2400a826397a 100644
--- a/drivers/usb/host/bcma-hcd.c
+++ b/drivers/usb/host/bcma-hcd.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Broadcom specific Advanced Microcontroller Bus
  * Broadcom USB-core driver (BCMA bus glue)
@@ -16,8 +17,6 @@
  *
  * Derived from the USBcore related parts of Broadcom-SB
  * Copyright 2005-2011 Broadcom Corporation
- *
- * Licensed under the GNU/GPL. See COPYING for details.
  */
 #include <linux/bcma/bcma.h>
 #include <linux/delay.h>
diff --git a/drivers/usb/host/ehci-atmel.c b/drivers/usb/host/ehci-atmel.c
index 7440722bfbf0..3ba140ceaf52 100644
--- a/drivers/usb/host/ehci-atmel.c
+++ b/drivers/usb/host/ehci-atmel.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Driver for EHCI UHP on Atmel chips
  *
@@ -5,10 +6,6 @@
  *                     Nicolas Ferre <nicolas.ferre@atmel.com>
  *
  *  Based on various ehci-*.c drivers
- *
- * This file is subject to the terms and conditions of the GNU General Public
- * License.  See the file COPYING in the main directory of this archive for
- * more details.
  */
 
 #include <linux/clk.h>
@@ -205,7 +202,8 @@ static int __maybe_unused ehci_atmel_drv_resume(struct device *dev)
         struct atmel_ehci_priv *atmel_ehci = hcd_to_atmel_ehci_priv(hcd);
 
         atmel_start_clock(atmel_ehci);
-        return ehci_resume(hcd, false);
+        ehci_resume(hcd, false);
+        return 0;
 }
 
 #ifdef CONFIG_OF
diff --git a/drivers/usb/host/ehci-dbg.c b/drivers/usb/host/ehci-dbg.c
index cbb9b8e12c3c..19f00424f53e 100644
--- a/drivers/usb/host/ehci-dbg.c
+++ b/drivers/usb/host/ehci-dbg.c
@@ -1,16 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright (c) 2001-2002 by David Brownell
- *
- * 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.
- *
- * 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.
- *
  */
 
 /* this file is part of ehci-hcd.c */
diff --git a/drivers/usb/host/ehci-exynos.c b/drivers/usb/host/ehci-exynos.c
index 26b641100639..d9145a8f35d2 100644
--- a/drivers/usb/host/ehci-exynos.c
+++ b/drivers/usb/host/ehci-exynos.c
@@ -1,15 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * SAMSUNG EXYNOS USB HOST EHCI Controller
  *
  * Copyright (C) 2011 Samsung Electronics Co.Ltd
  * Author: Jingoo Han <jg1.han@samsung.com>
  * Author: Joonyoung Shim <jy0922.shim@samsung.com>
- *
- * 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.
- *
  */
 
 #include <linux/clk.h>
diff --git a/drivers/usb/host/ehci-fsl.c b/drivers/usb/host/ehci-fsl.c
index d025cc06dda7..c5094cb88cd5 100644
--- a/drivers/usb/host/ehci-fsl.c
+++ b/drivers/usb/host/ehci-fsl.c
@@ -1,21 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright 2005-2009 MontaVista Software, Inc.
  * Copyright 2008,2012,2015      Freescale Semiconductor, Inc.
  *
- * 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.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
  * Ported to 834x by Randy Vinson <rvinson@mvista.com> using code provided
  * by Hunter Wu.
  * Power Management support by Dave Liu <daveliu@freescale.com>,
diff --git a/drivers/usb/host/ehci-fsl.h b/drivers/usb/host/ehci-fsl.h
index 1a8a60a57cf2..cbc422032e50 100644
--- a/drivers/usb/host/ehci-fsl.h
+++ b/drivers/usb/host/ehci-fsl.h
@@ -1,19 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+
 /* Copyright (C) 2005-2010,2012 Freescale Semiconductor, Inc.
  * Copyright (c) 2005 MontaVista Software
- *
- * 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.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the  GNU General Public License along
- * with this program; if not, write  to the Free Software Foundation, Inc.,
- * 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 #ifndef _EHCI_FSL_H
 #define _EHCI_FSL_H
diff --git a/drivers/usb/host/ehci-grlib.c b/drivers/usb/host/ehci-grlib.c
index 21650044b09e..656b8c08efc8 100644
--- a/drivers/usb/host/ehci-grlib.c
+++ b/drivers/usb/host/ehci-grlib.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Driver for Aeroflex Gaisler GRLIB GRUSBHC EHCI host controller
  *
@@ -9,20 +10,6 @@
  * (c) Valentine Barshak <vbarshak@ru.mvista.com>
  * and in turn based on "ehci-ppc-soc.c" by Stefan Roese <sr@denx.de>
  * and "ohci-ppc-of.c" by Sylvain Munaut <tnt@246tNt.com>
- *
- * 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.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
 #include <linux/err.h>
diff --git a/drivers/usb/host/ehci-hcd.c b/drivers/usb/host/ehci-hcd.c
index 6e834b83a104..7f0737449df7 100644
--- a/drivers/usb/host/ehci-hcd.c
+++ b/drivers/usb/host/ehci-hcd.c
@@ -1,23 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Enhanced Host Controller Interface (EHCI) driver for USB.
  *
  * Maintainer: Alan Stern <stern@rowland.harvard.edu>
  *
  * Copyright (c) 2000-2004 by David Brownell
- *
- * 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.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
 #include <linux/module.h>
@@ -1012,7 +999,7 @@ idle_timeout:
                         qh_destroy(ehci, qh);
                         break;
                 }
-                /* else FALL THROUGH */
+                /* fall through */
         default:
                 /* caller was supposed to have unlinked any requests;
                  * that's not our job.  just leak this memory.
diff --git a/drivers/usb/host/ehci-hub.c b/drivers/usb/host/ehci-hub.c
index df169c8e7225..facafdf8fb95 100644
--- a/drivers/usb/host/ehci-hub.c
+++ b/drivers/usb/host/ehci-hub.c
@@ -1,19 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright (C) 2001-2004 by David Brownell
- *
- * 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.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
 /* this file is part of ehci-hcd.c */
diff --git a/drivers/usb/host/ehci-mem.c b/drivers/usb/host/ehci-mem.c
index 9b7e63977215..21307d862af6 100644
--- a/drivers/usb/host/ehci-mem.c
+++ b/drivers/usb/host/ehci-mem.c
@@ -1,19 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright (c) 2001 by David Brownell
- *
- * 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.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
 /* this file is part of ehci-hcd.c */
diff --git a/drivers/usb/host/ehci-msm.c b/drivers/usb/host/ehci-msm.c
deleted file mode 100644
index 2f8d3af811ce..000000000000
--- a/drivers/usb/host/ehci-msm.c
+++ /dev/null
@@ -1,265 +0,0 @@
-/* ehci-msm.c - HSUSB Host Controller Driver Implementation
- *
- * Copyright (c) 2008-2011, Code Aurora Forum. All rights reserved.
- *
- * Partly derived from ehci-fsl.c and ehci-hcd.c
- * Copyright (c) 2000-2004 by David Brownell
- * Copyright (c) 2005 MontaVista Software
- *
- * All source code in this file is licensed under the following license except
- * where indicated.
- *
- * 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.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- * See the GNU General Public License for more details.
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, you can find it at http://www.fsf.org
- */
-
-#include <linux/clk.h>
-#include <linux/err.h>
-#include <linux/io.h>
-#include <linux/kernel.h>
-#include <linux/module.h>
-#include <linux/platform_device.h>
-#include <linux/pm_runtime.h>
-#include <linux/usb/otg.h>
-#include <linux/usb/msm_hsusb_hw.h>
-#include <linux/usb.h>
-#include <linux/usb/hcd.h>
-#include <linux/acpi.h>
-
-#include "ehci.h"
-
-#define MSM_USB_BASE (hcd->regs)
-
-#define DRIVER_DESC "Qualcomm On-Chip EHCI Host Controller"
-
-static const char hcd_name[] = "ehci-msm";
-static struct hc_driver __read_mostly msm_hc_driver;
-
-static int ehci_msm_reset(struct usb_hcd *hcd)
-{
-        struct ehci_hcd *ehci = hcd_to_ehci(hcd);
-        int retval;
-
-        ehci->caps = USB_CAPLENGTH;
-        hcd->has_tt = 1;
-
-        retval = ehci_setup(hcd);
-        if (retval)
-                return retval;
-
-        /* select ULPI phy and clear other status/control bits in PORTSC */
-        writel(PORTSC_PTS_ULPI, USB_PORTSC);
-        /* bursts of unspecified length. */
-        writel(0, USB_AHBBURST);
-        /* Use the AHB transactor, allow posted data writes */
-        writel(0x8, USB_AHBMODE);
-        /* Disable streaming mode and select host mode */
-        writel(0x13, USB_USBMODE);
-        /* Disable ULPI_TX_PKT_EN_CLR_FIX which is valid only for HSIC */
-        writel(readl(USB_GENCONFIG_2) & ~ULPI_TX_PKT_EN_CLR_FIX, USB_GENCONFIG_2);
-
-        return 0;
-}
-
-static int ehci_msm_probe(struct platform_device *pdev)
-{
-        struct usb_hcd *hcd;
-        struct resource *res;
-        struct usb_phy *phy;
-        int ret;
-
-        dev_dbg(&pdev->dev, "ehci_msm proble\n");
-
-        hcd = usb_create_hcd(&msm_hc_driver, &pdev->dev, dev_name(&pdev->dev));
-        if (!hcd) {
-                dev_err(&pdev->dev, "Unable to create HCD\n");
-                return  -ENOMEM;
-        }
-
-        ret = platform_get_irq(pdev, 0);
-        if (ret < 0) {
-                dev_err(&pdev->dev, "Unable to get IRQ resource\n");
-                goto put_hcd;
-        }
-        hcd->irq = ret;
-
-        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-        if (!res) {
-                dev_err(&pdev->dev, "Unable to get memory resource\n");
-                ret = -ENODEV;
-                goto put_hcd;
-        }
-
-        hcd->rsrc_start = res->start;
-        hcd->rsrc_len = resource_size(res);
-        hcd->regs = devm_ioremap(&pdev->dev, hcd->rsrc_start, hcd->rsrc_len);
-        if (!hcd->regs) {
-                dev_err(&pdev->dev, "ioremap failed\n");
-                ret = -ENOMEM;
-                goto put_hcd;
-        }
-
-        /*
-         * If there is an OTG driver, let it take care of PHY initialization,
-         * clock management, powering up VBUS, mapping of registers address
-         * space and power management.
-         */
-        if (pdev->dev.of_node)
-                phy = devm_usb_get_phy_by_phandle(&pdev->dev, "usb-phy", 0);
-        else
-                phy = devm_usb_get_phy(&pdev->dev, USB_PHY_TYPE_USB2);
-
-        if (IS_ERR(phy)) {
-                if (PTR_ERR(phy) == -EPROBE_DEFER) {
-                        dev_err(&pdev->dev, "unable to find transceiver\n");
-                        ret = -EPROBE_DEFER;
-                        goto put_hcd;
-                }
-                phy = NULL;
-        }
-
-        hcd->usb_phy = phy;
-        device_init_wakeup(&pdev->dev, 1);
-
-        if (phy && phy->otg) {
-                /*
-                 * MSM OTG driver takes care of adding the HCD and
-                 * placing hardware into low power mode via runtime PM.
-                 */
-                ret = otg_set_host(phy->otg, &hcd->self);
-                if (ret < 0) {
-                        dev_err(&pdev->dev, "unable to register with transceiver\n");
-                        goto put_hcd;
-                }
-
-                pm_runtime_no_callbacks(&pdev->dev);
-                pm_runtime_enable(&pdev->dev);
-        } else {
-                ret = usb_add_hcd(hcd, hcd->irq, IRQF_SHARED);
-                if (ret)
-                        goto put_hcd;
-        }
-
-        return 0;
-
-put_hcd:
-        usb_put_hcd(hcd);
-
-        return ret;
-}
-
-static int ehci_msm_remove(struct platform_device *pdev)
-{
-        struct usb_hcd *hcd = platform_get_drvdata(pdev);
-
-        device_init_wakeup(&pdev->dev, 0);
-        pm_runtime_disable(&pdev->dev);
-        pm_runtime_set_suspended(&pdev->dev);
-
-        if (hcd->usb_phy && hcd->usb_phy->otg)
-                otg_set_host(hcd->usb_phy->otg, NULL);
-        else
-                usb_remove_hcd(hcd);
-
-        usb_put_hcd(hcd);
-
-        return 0;
-}
-
-#ifdef CONFIG_PM
-static int ehci_msm_pm_suspend(struct device *dev)
-{
-        struct usb_hcd *hcd = dev_get_drvdata(dev);
-        struct ehci_hcd *ehci = hcd_to_ehci(hcd);
-        bool do_wakeup = device_may_wakeup(dev);
-
-        dev_dbg(dev, "ehci-msm PM suspend\n");
-
-        /* Only call ehci_suspend if ehci_setup has been done */
-        if (ehci->sbrn)
-                return ehci_suspend(hcd, do_wakeup);
-
-        return 0;
-}
-
-static int ehci_msm_pm_resume(struct device *dev)
-{
-        struct usb_hcd *hcd = dev_get_drvdata(dev);
-        struct ehci_hcd *ehci = hcd_to_ehci(hcd);
-
-        dev_dbg(dev, "ehci-msm PM resume\n");
-
-        /* Only call ehci_resume if ehci_setup has been done */
-        if (ehci->sbrn)
-                ehci_resume(hcd, false);
-
-        return 0;
-}
-
-#else
-#define ehci_msm_pm_suspend     NULL
-#define ehci_msm_pm_resume      NULL
-#endif
-
-static const struct dev_pm_ops ehci_msm_dev_pm_ops = {
-        .suspend         = ehci_msm_pm_suspend,
-        .resume          = ehci_msm_pm_resume,
-};
-
-static const struct acpi_device_id msm_ehci_acpi_ids[] = {
-        { "QCOM8040", 0 },
-        { }
-};
-MODULE_DEVICE_TABLE(acpi, msm_ehci_acpi_ids);
-
-static const struct of_device_id msm_ehci_dt_match[] = {
-        { .compatible = "qcom,ehci-host", },
-        {}
-};
-MODULE_DEVICE_TABLE(of, msm_ehci_dt_match);
-
-static struct platform_driver ehci_msm_driver = {
-        .probe  = ehci_msm_probe,
-        .remove = ehci_msm_remove,
-        .shutdown = usb_hcd_platform_shutdown,
-        .driver = {
-                   .name = "msm_hsusb_host",
-                   .pm = &ehci_msm_dev_pm_ops,
-                   .of_match_table = msm_ehci_dt_match,
-                   .acpi_match_table = ACPI_PTR(msm_ehci_acpi_ids),
-        },
-};
-
-static const struct ehci_driver_overrides msm_overrides __initconst = {
-        .reset = ehci_msm_reset,
-};
-
-static int __init ehci_msm_init(void)
-{
-        if (usb_disabled())
-                return -ENODEV;
-
-        pr_info("%s: " DRIVER_DESC "\n", hcd_name);
-        ehci_init_driver(&msm_hc_driver, &msm_overrides);
-        return platform_driver_register(&ehci_msm_driver);
-}
-module_init(ehci_msm_init);
-
-static void __exit ehci_msm_cleanup(void)
-{
-        platform_driver_unregister(&ehci_msm_driver);
-}
-module_exit(ehci_msm_cleanup);
-
-MODULE_DESCRIPTION(DRIVER_DESC);
-MODULE_ALIAS("platform:msm-ehci");
-MODULE_LICENSE("GPL");
diff --git a/drivers/usb/host/ehci-mv.c b/drivers/usb/host/ehci-mv.c
index 849806a75f1c..de764459e05a 100644
--- a/drivers/usb/host/ehci-mv.c
+++ b/drivers/usb/host/ehci-mv.c
@@ -1,12 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright (C) 2011 Marvell International Ltd. All rights reserved.
  * Author: Chao Xie <chao.xie@marvell.com>
  *        Neil Zhang <zhangwm@marvell.com>
- *
- * 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.
  */
 
 #include <linux/kernel.h>
diff --git a/drivers/usb/host/ehci-mxc.c b/drivers/usb/host/ehci-mxc.c
index c7a9b31eeaef..c9f91e6c72b6 100644
--- a/drivers/usb/host/ehci-mxc.c
+++ b/drivers/usb/host/ehci-mxc.c
@@ -1,20 +1,7 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright (c) 2008 Sascha Hauer <s.hauer@pengutronix.de>, Pengutronix
  * Copyright (c) 2009 Daniel Mack <daniel@caiaq.de>
- *
- * 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.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
 #include <linux/kernel.h>
diff --git a/drivers/usb/host/ehci-omap.c b/drivers/usb/host/ehci-omap.c
index 4d308533bc83..854b146a457d 100644
--- a/drivers/usb/host/ehci-omap.c
+++ b/drivers/usb/host/ehci-omap.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * ehci-omap.c - driver for USBHOST on OMAP3/4 processors
  *
@@ -14,21 +15,6 @@
  *      Contact: Felipe Balbi <felipe.balbi@nokia.com>
  *
  * Based on "ehci-fsl.c" and "ehci-au1xxx.c" ehci glue layers
- *
- * 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.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
- *
  */
 
 #include <linux/kernel.h>
diff --git a/drivers/usb/host/ehci-orion.c b/drivers/usb/host/ehci-orion.c
index 1aec87ec68df..1ad72647a069 100644
--- a/drivers/usb/host/ehci-orion.c
+++ b/drivers/usb/host/ehci-orion.c
@@ -1,11 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * drivers/usb/host/ehci-orion.c
  *
  * Tzachi Perelstein <tzachi@marvell.com>
- *
- * This file is licensed under  the terms of the GNU General Public
- * License version 2. This program is licensed "as is" without any
- * warranty of any kind, whether express or implied.
  */
 
 #include <linux/kernel.h>
diff --git a/drivers/usb/host/ehci-pci.c b/drivers/usb/host/ehci-pci.c
index 93326974ff4b..fe9422d3bcdc 100644
--- a/drivers/usb/host/ehci-pci.c
+++ b/drivers/usb/host/ehci-pci.c
@@ -1,21 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * EHCI HCD (Host Controller Driver) PCI Bus Glue.
  *
  * Copyright (c) 2000-2004 by David Brownell
- *
- * 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.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
 #include <linux/kernel.h>
diff --git a/drivers/usb/host/ehci-platform.c b/drivers/usb/host/ehci-platform.c
index f1908ea9fbd8..b065a960adc2 100644
--- a/drivers/usb/host/ehci-platform.c
+++ b/drivers/usb/host/ehci-platform.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Generic platform ehci driver
  *
@@ -16,8 +17,6 @@
  * Copyright 2000-2002 David Brownell
  * Copyright 1999 Linus Torvalds
  * Copyright 1999 Gregory P. Smith
- *
- * Licensed under the GNU/GPL. See COPYING for details.
  */
 #include <linux/acpi.h>
 #include <linux/clk.h>
@@ -40,12 +39,11 @@
 
 #define DRIVER_DESC "EHCI generic platform driver"
 #define EHCI_MAX_CLKS 4
-#define EHCI_MAX_RSTS 4
 #define hcd_to_ehci_priv(h) ((struct ehci_platform_priv *)hcd_to_ehci(h)->priv)
 
 struct ehci_platform_priv {
         struct clk *clks[EHCI_MAX_CLKS];
-        struct reset_control *rsts[EHCI_MAX_RSTS];
+        struct reset_control *rsts;
         struct phy **phys;
         int num_phys;
         bool reset_on_resume;
@@ -151,7 +149,7 @@ static int ehci_platform_probe(struct platform_device *dev)
         struct usb_ehci_pdata *pdata = dev_get_platdata(&dev->dev);
         struct ehci_platform_priv *priv;
         struct ehci_hcd *ehci;
-        int err, irq, phy_num, clk = 0, rst;
+        int err, irq, phy_num, clk = 0;
 
         if (usb_disabled())
                 return -ENODEV;
@@ -239,22 +237,16 @@ static int ehci_platform_probe(struct platform_device *dev)
                 }
         }
 
-        for (rst = 0; rst < EHCI_MAX_RSTS; rst++) {
-                priv->rsts[rst] = devm_reset_control_get_shared_by_index(
-                                        &dev->dev, rst);
-                if (IS_ERR(priv->rsts[rst])) {
-                        err = PTR_ERR(priv->rsts[rst]);
-                        if (err == -EPROBE_DEFER)
-                                goto err_reset;
-                        priv->rsts[rst] = NULL;
-                        break;
-                }
-
-                err = reset_control_deassert(priv->rsts[rst]);
-                if (err)
-                        goto err_reset;
+        priv->rsts = devm_reset_control_array_get_optional_shared(&dev->dev);
+        if (IS_ERR(priv->rsts)) {
+                err = PTR_ERR(priv->rsts);
+                goto err_put_clks;
         }
 
+        err = reset_control_deassert(priv->rsts);
+        if (err)
+                goto err_put_clks;
+
         if (pdata->big_endian_desc)
                 ehci->big_endian_desc = 1;
         if (pdata->big_endian_mmio)
@@ -310,8 +302,7 @@ err_power:
         if (pdata->power_off)
                 pdata->power_off(dev);
 err_reset:
-        while (--rst >= 0)
-                reset_control_assert(priv->rsts[rst]);
+        reset_control_assert(priv->rsts);
 err_put_clks:
         while (--clk >= 0)
                 clk_put(priv->clks[clk]);
@@ -329,15 +320,14 @@ static int ehci_platform_remove(struct platform_device *dev)
         struct usb_hcd *hcd = platform_get_drvdata(dev);
         struct usb_ehci_pdata *pdata = dev_get_platdata(&dev->dev);
         struct ehci_platform_priv *priv = hcd_to_ehci_priv(hcd);
-        int clk, rst;
+        int clk;
 
         usb_remove_hcd(hcd);
 
         if (pdata->power_off)
                 pdata->power_off(dev);
 
-        for (rst = 0; rst < EHCI_MAX_RSTS && priv->rsts[rst]; rst++)
-                reset_control_assert(priv->rsts[rst]);
+        reset_control_assert(priv->rsts);
 
         for (clk = 0; clk < EHCI_MAX_CLKS && priv->clks[clk]; clk++)
                 clk_put(priv->clks[clk]);
diff --git a/drivers/usb/host/ehci-pmcmsp.c b/drivers/usb/host/ehci-pmcmsp.c
index 342816a7f8b1..46e160370d6e 100644
--- a/drivers/usb/host/ehci-pmcmsp.c
+++ b/drivers/usb/host/ehci-pmcmsp.c
@@ -1,12 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * PMC MSP EHCI (Host Controller Driver) for USB.
  *
  * (C) Copyright 2006-2010 PMC-Sierra Inc
- *
- * This file is subject to the terms and conditions of the GNU General Public
- * License.  See the file "COPYING" in the main directory of this archive
- * for more details.
- *
  */
 
 /* includes */
diff --git a/drivers/usb/host/ehci-ppc-of.c b/drivers/usb/host/ehci-ppc-of.c
index 1a10c8d542ca..576f7d79ad4e 100644
--- a/drivers/usb/host/ehci-ppc-of.c
+++ b/drivers/usb/host/ehci-ppc-of.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-1.0+
 /*
  * EHCI HCD (Host Controller Driver) for USB.
  *
diff --git a/drivers/usb/host/ehci-ps3.c b/drivers/usb/host/ehci-ps3.c
index 7934ff9b35e1..8c733492d8fe 100644
--- a/drivers/usb/host/ehci-ps3.c
+++ b/drivers/usb/host/ehci-ps3.c
@@ -1,21 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  PS3 EHCI Host Controller driver
  *
  *  Copyright (C) 2006 Sony Computer Entertainment Inc.
  *  Copyright 2006 Sony Corp.
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; version 2 of the License.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include <asm/firmware.h>
diff --git a/drivers/usb/host/ehci-q.c b/drivers/usb/host/ehci-q.c
index 8f3f055c05fa..88158324dcae 100644
--- a/drivers/usb/host/ehci-q.c
+++ b/drivers/usb/host/ehci-q.c
@@ -1,19 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright (C) 2001-2004 by David Brownell
- *
- * 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.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
 /* this file is part of ehci-hcd.c */
diff --git a/drivers/usb/host/ehci-sched.c b/drivers/usb/host/ehci-sched.c
index 6bc6304672bc..e56db44708bc 100644
--- a/drivers/usb/host/ehci-sched.c
+++ b/drivers/usb/host/ehci-sched.c
@@ -1,20 +1,7 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright (c) 2001-2004 by David Brownell
  * Copyright (c) 2003 Michal Sojka, for high-speed iso transfers
- *
- * 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.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
 /* this file is part of ehci-hcd.c */
diff --git a/drivers/usb/host/ehci-sh.c b/drivers/usb/host/ehci-sh.c
index 5caf88d679e4..a9ee767952c1 100644
--- a/drivers/usb/host/ehci-sh.c
+++ b/drivers/usb/host/ehci-sh.c
@@ -1,13 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * SuperH EHCI host controller driver
  *
  * Copyright (C) 2010  Paul Mundt
  *
  * Based on ohci-sh.c and ehci-atmel.c.
- *
- * This file is subject to the terms and conditions of the GNU General Public
- * License.  See the file "COPYING" in the main directory of this archive
- * for more details.
  */
 #include <linux/platform_device.h>
 #include <linux/clk.h>
diff --git a/drivers/usb/host/ehci-spear.c b/drivers/usb/host/ehci-spear.c
index 1f25c7985f5b..add796c78561 100644
--- a/drivers/usb/host/ehci-spear.c
+++ b/drivers/usb/host/ehci-spear.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
 * Driver for EHCI HCD on SPEAr SOC
 *
@@ -5,10 +6,6 @@
 * Deepak Sikri <deepak.sikri@st.com>
 *
 * Based on various ehci-*.c drivers
-*
-* This file is subject to the terms and conditions of the GNU General Public
-* License. See the file COPYING in the main directory of this archive for
-* more details.
 */
 
 #include <linux/clk.h>
diff --git a/drivers/usb/host/ehci-st.c b/drivers/usb/host/ehci-st.c
index be4a2788fc58..3c1362ab70be 100644
--- a/drivers/usb/host/ehci-st.c
+++ b/drivers/usb/host/ehci-st.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * ST EHCI driver
  *
@@ -6,10 +7,6 @@
  * Author: Peter Griffin <peter.griffin@linaro.org>
  *
  * Derived from ehci-platform.c
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
  */
 
 #include <linux/clk.h>
diff --git a/drivers/usb/host/ehci-sysfs.c b/drivers/usb/host/ehci-sysfs.c
index 5216f2b09d63..71fb61dd4a87 100644
--- a/drivers/usb/host/ehci-sysfs.c
+++ b/drivers/usb/host/ehci-sysfs.c
@@ -1,19 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright (C) 2007 by Alan Stern
- *
- * 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.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
 /* this file is part of ehci-hcd.c */
diff --git a/drivers/usb/host/ehci-tegra.c b/drivers/usb/host/ehci-tegra.c
index 9a3d7db5be57..c809f7d2f08f 100644
--- a/drivers/usb/host/ehci-tegra.c
+++ b/drivers/usb/host/ehci-tegra.c
@@ -1,19 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * EHCI-compliant USB host controller driver for NVIDIA Tegra SoCs
  *
  * Copyright (C) 2010 Google, Inc.
  * Copyright (C) 2009 - 2013 NVIDIA Corporation
- *
- * 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.
- *
- * 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>
diff --git a/drivers/usb/host/ehci-tilegx.c b/drivers/usb/host/ehci-tilegx.c
index bdb93b6a356f..610ed437ed2c 100644
--- a/drivers/usb/host/ehci-tilegx.c
+++ b/drivers/usb/host/ehci-tilegx.c
@@ -1,15 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Copyright 2012 Tilera Corporation. All Rights Reserved.
- *
- *   This program is free software; you can redistribute it and/or
- *   modify it under the terms of the GNU General Public License
- *   as published by the Free Software Foundation, version 2.
- *
- *   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, GOOD TITLE or
- *   NON INFRINGEMENT.  See the GNU General Public License for
- *   more details.
  */
 
 /*
diff --git a/drivers/usb/host/ehci-timer.c b/drivers/usb/host/ehci-timer.c
index 0b6cdb723192..4fcebda4b79d 100644
--- a/drivers/usb/host/ehci-timer.c
+++ b/drivers/usb/host/ehci-timer.c
@@ -1,15 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright (C) 2012 by Alan Stern
- *
- * 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.
- *
- * 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.
  */
 
 /* This file is part of ehci-hcd.c */
diff --git a/drivers/usb/host/ehci-w90x900.c b/drivers/usb/host/ehci-w90x900.c
index 63b9d0c67963..6d77ace1697b 100644
--- a/drivers/usb/host/ehci-w90x900.c
+++ b/drivers/usb/host/ehci-w90x900.c
@@ -1,14 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * linux/driver/usb/host/ehci-w90x900.c
  *
  * Copyright (c) 2008 Nuvoton technology corporation.
  *
  * Wan ZongShun <mcuos.com@gmail.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation;version 2 of the License.
- *
  */
 
 #include <linux/dma-mapping.h>
diff --git a/drivers/usb/host/ehci-xilinx-of.c b/drivers/usb/host/ehci-xilinx-of.c
index f54480850bb8..d2a27578e440 100644
--- a/drivers/usb/host/ehci-xilinx-of.c
+++ b/drivers/usb/host/ehci-xilinx-of.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * EHCI HCD (Host Controller Driver) for USB.
  *
@@ -8,21 +9,6 @@
  * Based on "ehci-ppc-of.c" by Valentine Barshak <vbarshak@ru.mvista.com>
  * and "ehci-ppc-soc.c" by Stefan Roese <sr@denx.de>
  * and "ohci-ppc-of.c" by Sylvain Munaut <tnt@246tNt.com>
- *
- * 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.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
  */
 
 #include <linux/err.h>
diff --git a/drivers/usb/host/ehci.h b/drivers/usb/host/ehci.h
index a8e36170d8b8..c8e9a48e1d51 100644
--- a/drivers/usb/host/ehci.h
+++ b/drivers/usb/host/ehci.h
@@ -1,19 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright (c) 2001-2002 by David Brownell
- *
- * 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.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
 #ifndef __LINUX_EHCI_HCD_H
diff --git a/drivers/usb/host/fhci-dbg.c b/drivers/usb/host/fhci-dbg.c
index b58e7a60913a..fafa91189e45 100644
--- a/drivers/usb/host/fhci-dbg.c
+++ b/drivers/usb/host/fhci-dbg.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Freescale QUICC Engine USB Host Controller Driver
  *
@@ -8,11 +9,6 @@
  *               Peter Barada <peterb@logicpd.com>
  * Copyright (c) MontaVista Software, Inc. 2008.
  *               Anton Vorontsov <avorontsov@ru.mvista.com>
- *
- * 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.
  */
 
 #include <linux/kernel.h>
diff --git a/drivers/usb/host/fhci-hcd.c b/drivers/usb/host/fhci-hcd.c
index 55a0ae6f2d74..48fe9e6c2465 100644
--- a/drivers/usb/host/fhci-hcd.c
+++ b/drivers/usb/host/fhci-hcd.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Freescale QUICC Engine USB Host Controller Driver
  *
@@ -8,11 +9,6 @@
  *               Peter Barada <peterb@logicpd.com>
  * Copyright (c) MontaVista Software, Inc. 2008.
  *               Anton Vorontsov <avorontsov@ru.mvista.com>
- *
- * 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.
  */
 
 #include <linux/module.h>
diff --git a/drivers/usb/host/fhci-hub.c b/drivers/usb/host/fhci-hub.c
index 60d55eb3de0d..c359dcdb9b13 100644
--- a/drivers/usb/host/fhci-hub.c
+++ b/drivers/usb/host/fhci-hub.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Freescale QUICC Engine USB Host Controller Driver
  *
@@ -8,11 +9,6 @@
  *               Peter Barada <peterb@logicpd.com>
  * Copyright (c) MontaVista Software, Inc. 2008.
  *               Anton Vorontsov <avorontsov@ru.mvista.com>
- *
- * 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.
  */
 
 #include <linux/kernel.h>
diff --git a/drivers/usb/host/fhci-mem.c b/drivers/usb/host/fhci-mem.c
index b0b88f57a5ac..658aedc6adc1 100644
--- a/drivers/usb/host/fhci-mem.c
+++ b/drivers/usb/host/fhci-mem.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Freescale QUICC Engine USB Host Controller Driver
  *
@@ -8,11 +9,6 @@
  *               Peter Barada <peterb@logicpd.com>
  * Copyright (c) MontaVista Software, Inc. 2008.
  *               Anton Vorontsov <avorontsov@ru.mvista.com>
- *
- * 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.
  */
 
 #include <linux/kernel.h>
diff --git a/drivers/usb/host/fhci-q.c b/drivers/usb/host/fhci-q.c
index 03be7494a476..669c240523fe 100644
--- a/drivers/usb/host/fhci-q.c
+++ b/drivers/usb/host/fhci-q.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Freescale QUICC Engine USB Host Controller Driver
  *
@@ -8,11 +9,6 @@
  *               Peter Barada <peterb@logicpd.com>
  * Copyright (c) MontaVista Software, Inc. 2008.
  *               Anton Vorontsov <avorontsov@ru.mvista.com>
- *
- * 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.
  */
 
 #include <linux/kernel.h>
diff --git a/drivers/usb/host/fhci-sched.c b/drivers/usb/host/fhci-sched.c
index 2f162faabbca..3d12cdd5f999 100644
--- a/drivers/usb/host/fhci-sched.c
+++ b/drivers/usb/host/fhci-sched.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Freescale QUICC Engine USB Host Controller Driver
  *
@@ -8,11 +9,6 @@
  *               Peter Barada <peterb@logicpd.com>
  * Copyright (c) MontaVista Software, Inc. 2008.
  *               Anton Vorontsov <avorontsov@ru.mvista.com>
- *
- * 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.
  */
 
 #include <linux/kernel.h>
diff --git a/drivers/usb/host/fhci-tds.c b/drivers/usb/host/fhci-tds.c
index f82ad5df1b0d..3a4e8f616751 100644
--- a/drivers/usb/host/fhci-tds.c
+++ b/drivers/usb/host/fhci-tds.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Freescale QUICC Engine USB Host Controller Driver
  *
@@ -8,11 +9,6 @@
  *               Peter Barada <peterb@logicpd.com>
  * Copyright (c) MontaVista Software, Inc. 2008.
  *               Anton Vorontsov <avorontsov@ru.mvista.com>
- *
- * 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.
  */
 
 #include <linux/kernel.h>
diff --git a/drivers/usb/host/fhci.h b/drivers/usb/host/fhci.h
index 3fc82c1c3c73..e7ec41d62410 100644
--- a/drivers/usb/host/fhci.h
+++ b/drivers/usb/host/fhci.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Freescale QUICC Engine USB Host Controller Driver
  *
@@ -8,11 +9,6 @@
  *               Peter Barada <peterb@logicpd.com>
  * Copyright (c) MontaVista Software, Inc. 2008.
  *               Anton Vorontsov <avorontsov@ru.mvista.com>
- *
- * 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.
  */
 
 #ifndef __FHCI_H
diff --git a/drivers/usb/host/fotg210-hcd.c b/drivers/usb/host/fotg210-hcd.c
index 457cc6525abd..62fc955085a1 100644
--- a/drivers/usb/host/fotg210-hcd.c
+++ b/drivers/usb/host/fotg210-hcd.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0+
 /* Faraday FOTG210 EHCI-like driver
  *
  * Copyright (c) 2013 Faraday Technology Corporation
@@ -7,20 +8,6 @@
  *         Po-Yu Chuang <ratbert.chuang@gmail.com>
  *
  * Most of code borrowed from the Linux-3.7 EHCI driver
- *
- * 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.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 #include <linux/module.h>
 #include <linux/device.h>
@@ -5449,7 +5436,7 @@ idle_timeout:
                         qh_destroy(fotg210, qh);
                         break;
                 }
-                /* else FALL THROUGH */
+                /* fall through */
         default:
                 /* caller was supposed to have unlinked any requests;
                  * that's not our job.  just leak this memory.
diff --git a/drivers/usb/host/fsl-mph-dr-of.c b/drivers/usb/host/fsl-mph-dr-of.c
index ba557cdba8ef..677f9d592109 100644
--- a/drivers/usb/host/fsl-mph-dr-of.c
+++ b/drivers/usb/host/fsl-mph-dr-of.c
@@ -1,12 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Setup platform devices needed by the Freescale multi-port host
  * and/or dual-role USB controller modules based on the description
  * in flat device tree.
- *
- * 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.
  */
 
 #include <linux/kernel.h>
diff --git a/drivers/usb/host/hwa-hc.c b/drivers/usb/host/hwa-hc.c
index da3b18038d23..684d6f074c3a 100644
--- a/drivers/usb/host/hwa-hc.c
+++ b/drivers/usb/host/hwa-hc.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Host Wire Adapter:
  * Driver glue, HWA-specific functions, bridges to WAHC and WUSBHC
@@ -5,21 +6,6 @@
  * Copyright (C) 2005-2006 Intel Corporation
  * Inaky Perez-Gonzalez <inaky.perez-gonzalez@intel.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.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301, USA.
- *
- *
  * The HWA driver is a simple layer that forwards requests to the WAHC
  * (Wire Adater Host Controller) or WUSBHC (Wireless USB Host
  * Controller) layers.
diff --git a/drivers/usb/host/imx21-dbg.c b/drivers/usb/host/imx21-dbg.c
index 4f320d050da7..b964f9a51d87 100644
--- a/drivers/usb/host/imx21-dbg.c
+++ b/drivers/usb/host/imx21-dbg.c
@@ -1,19 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright (c) 2009 by Martin Fuzzey
- *
- * 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.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
 /* this file is part of imx21-hcd.c */
diff --git a/drivers/usb/host/imx21-hcd.c b/drivers/usb/host/imx21-hcd.c
index 39ae7fb64b6f..3a8bbfe43a8e 100644
--- a/drivers/usb/host/imx21-hcd.c
+++ b/drivers/usb/host/imx21-hcd.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * USB Host Controller Driver for IMX21
  *
@@ -5,20 +6,6 @@
  * Copyright (C) 2009 Martin Fuzzey
  * Originally written by Jay Monkman <jtm@lopingdog.com>
  * Ported to 2.6.30, debugged and enhanced by Martin Fuzzey
- *
- * 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.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
 
diff --git a/drivers/usb/host/imx21-hcd.h b/drivers/usb/host/imx21-hcd.h
index 05122f8a6983..7b9cf0a38d6e 100644
--- a/drivers/usb/host/imx21-hcd.h
+++ b/drivers/usb/host/imx21-hcd.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Macros and prototypes for i.MX21
  *
@@ -5,20 +6,6 @@
  * Copyright (C) 2009 Martin Fuzzey
  * Originally written by Jay Monkman <jtm@lopingdog.com>
  * Ported to 2.6.30, debugged and enhanced by Martin Fuzzey
- *
- * 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.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
 #ifndef __LINUX_IMX21_HCD_H__
diff --git a/drivers/usb/host/isp116x-hcd.c b/drivers/usb/host/isp116x-hcd.c
index 73fec38754f9..5f9234b9cf7b 100644
--- a/drivers/usb/host/isp116x-hcd.c
+++ b/drivers/usb/host/isp116x-hcd.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * ISP116x HCD (Host Controller Driver) for USB.
  *
@@ -1018,6 +1019,7 @@ static int isp116x_hub_control(struct usb_hcd *hcd,
                         spin_lock_irqsave(&isp116x->lock, flags);
                         isp116x_write_reg32(isp116x, HCRHSTATUS, RH_HS_OCIC);
                         spin_unlock_irqrestore(&isp116x->lock, flags);
+                        /* fall through */
                 case C_HUB_LOCAL_POWER:
                         DBG("C_HUB_LOCAL_POWER\n");
                         break;
@@ -1433,8 +1435,10 @@ static int isp116x_bus_suspend(struct usb_hcd *hcd)
                 isp116x_write_reg32(isp116x, HCCONTROL,
                                     (val & ~HCCONTROL_HCFS) |
                                     HCCONTROL_USB_RESET);
+                /* fall through */
         case HCCONTROL_USB_RESET:
                 ret = -EBUSY;
+                /* fall through */
         default:                /* HCCONTROL_USB_SUSPEND */
                 spin_unlock_irqrestore(&isp116x->lock, flags);
                 break;
diff --git a/drivers/usb/host/isp1362-hcd.c b/drivers/usb/host/isp1362-hcd.c
index 9b7e307e2d54..b21c386e6a46 100644
--- a/drivers/usb/host/isp1362-hcd.c
+++ b/drivers/usb/host/isp1362-hcd.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * ISP1362 HCD (Host Controller Driver) for USB.
  *
@@ -712,7 +713,7 @@ static inline void enable_istl_transfers(struct isp1362_hcd *isp1362_hcd, int fl
 static int submit_req(struct isp1362_hcd *isp1362_hcd, struct urb *urb,
                       struct isp1362_ep *ep, struct isp1362_ep_queue *epq)
 {
-        int index = epq->free_ptd;
+        int index;
 
         prepare_ptd(isp1362_hcd, urb, ep, epq, 0);
         index = claim_ptd_buffers(epq, ep, ep->length);
@@ -1578,6 +1579,7 @@ static int isp1362_hub_control(struct usb_hcd *hcd, u16 typeReq, u16 wValue,
                         spin_lock_irqsave(&isp1362_hcd->lock, flags);
                         isp1362_write_reg32(isp1362_hcd, HCRHSTATUS, RH_HS_OCIC);
                         spin_unlock_irqrestore(&isp1362_hcd->lock, flags);
+                        break;
                 case C_HUB_LOCAL_POWER:
                         DBG(0, "C_HUB_LOCAL_POWER\n");
                         break;
@@ -2251,7 +2253,6 @@ static int isp1362_mem_config(struct usb_hcd *hcd)
                 return -ENOMEM;
         }
 
-        total = istl_size + intl_size + atl_size;
         spin_lock_irqsave(&isp1362_hcd->lock, flags);
 
         for (i = 0; i < 2; i++) {
diff --git a/drivers/usb/host/max3421-hcd.c b/drivers/usb/host/max3421-hcd.c
index 0ece9a9341e5..afa321ab55fc 100644
--- a/drivers/usb/host/max3421-hcd.c
+++ b/drivers/usb/host/max3421-hcd.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * MAX3421 Host Controller driver for USB.
  *
@@ -60,6 +61,7 @@
 #include <linux/spi/spi.h>
 #include <linux/usb.h>
 #include <linux/usb/hcd.h>
+#include <linux/of.h>
 
 #include <linux/platform_data/max3421-hcd.h>
 
@@ -85,6 +87,8 @@
                           USB_PORT_STAT_C_OVERCURRENT | \
                           USB_PORT_STAT_C_RESET) << 16)
 
+#define MAX3421_GPOUT_COUNT     8
+
 enum max3421_rh_state {
         MAX3421_RH_RESET,
         MAX3421_RH_SUSPENDED,
@@ -1672,7 +1676,7 @@ max3421_gpout_set_value(struct usb_hcd *hcd, u8 pin_number, u8 value)
         u8 mask, idx;
 
         --pin_number;
-        if (pin_number > 7)
+        if (pin_number >= MAX3421_GPOUT_COUNT)
                 return;
 
         mask = 1u << (pin_number % 4);
@@ -1696,10 +1700,10 @@ max3421_hub_control(struct usb_hcd *hcd, u16 type_req, u16 value, u16 index,
         unsigned long flags;
         int retval = 0;
 
-        spin_lock_irqsave(&max3421_hcd->lock, flags);
-
         pdata = spi->dev.platform_data;
 
+        spin_lock_irqsave(&max3421_hcd->lock, flags);
+
         switch (type_req) {
         case ClearHubFeature:
                 break;
@@ -1832,10 +1836,34 @@ static const struct hc_driver max3421_hcd_desc = {
 };
 
 static int
+max3421_of_vbus_en_pin(struct device *dev, struct max3421_hcd_platform_data *pdata)
+{
+        int retval;
+        uint32_t value[2];
+
+        if (!pdata)
+                return -EINVAL;
+
+        retval = of_property_read_u32_array(dev->of_node, "maxim,vbus-en-pin", value, 2);
+        if (retval) {
+                dev_err(dev, "device tree node property 'maxim,vbus-en-pin' is missing\n");
+                return retval;
+        }
+        dev_info(dev, "property 'maxim,vbus-en-pin' value is <%d %d>\n", value[0], value[1]);
+
+        pdata->vbus_gpout = value[0];
+        pdata->vbus_active_level = value[1];
+
+        return 0;
+}
+
+static int
 max3421_probe(struct spi_device *spi)
 {
+        struct device *dev = &spi->dev;
         struct max3421_hcd *max3421_hcd;
         struct usb_hcd *hcd = NULL;
+        struct max3421_hcd_platform_data *pdata = NULL;
         int retval = -ENOMEM;
 
         if (spi_setup(spi) < 0) {
@@ -1843,6 +1871,41 @@ max3421_probe(struct spi_device *spi)
                 return -EFAULT;
         }
 
+        if (!spi->irq) {
+                dev_err(dev, "Failed to get SPI IRQ");
+                return -EFAULT;
+        }
+
+        if (IS_ENABLED(CONFIG_OF) && dev->of_node) {
+                pdata = devm_kzalloc(&spi->dev, sizeof(*pdata), GFP_KERNEL);
+                if (!pdata) {
+                        retval = -ENOMEM;
+                        goto error;
+                }
+                retval = max3421_of_vbus_en_pin(dev, pdata);
+                if (retval)
+                        goto error;
+
+                spi->dev.platform_data = pdata;
+        }
+
+        pdata = spi->dev.platform_data;
+        if (!pdata) {
+                dev_err(&spi->dev, "driver configuration data is not provided\n");
+                retval = -EFAULT;
+                goto error;
+        }
+        if (pdata->vbus_active_level > 1) {
+                dev_err(&spi->dev, "vbus active level value %d is out of range (0/1)\n", pdata->vbus_active_level);
+                retval = -EINVAL;
+                goto error;
+        }
+        if (pdata->vbus_gpout < 1 || pdata->vbus_gpout > MAX3421_GPOUT_COUNT) {
+                dev_err(&spi->dev, "vbus gpout value %d is out of range (1..8)\n", pdata->vbus_gpout);
+                retval = -EINVAL;
+                goto error;
+        }
+
         hcd = usb_create_hcd(&max3421_hcd_desc, &spi->dev,
                              dev_name(&spi->dev));
         if (!hcd) {
@@ -1885,6 +1948,11 @@ max3421_probe(struct spi_device *spi)
         return 0;
 
 error:
+        if (IS_ENABLED(CONFIG_OF) && dev->of_node && pdata) {
+                devm_kfree(&spi->dev, pdata);
+                spi->dev.platform_data = NULL;
+        }
+
         if (hcd) {
                 kfree(max3421_hcd->tx);
                 kfree(max3421_hcd->rx);
@@ -1929,11 +1997,18 @@ max3421_remove(struct spi_device *spi)
         return 0;
 }
 
+static const struct of_device_id max3421_of_match_table[] = {
+        { .compatible = "maxim,max3421", },
+        {},
+};
+MODULE_DEVICE_TABLE(of, max3421_of_match_table);
+
 static struct spi_driver max3421_driver = {
         .probe          = max3421_probe,
         .remove         = max3421_remove,
         .driver         = {
                 .name   = "max3421-hcd",
+                .of_match_table = of_match_ptr(max3421_of_match_table),
         },
 };
 
diff --git a/drivers/usb/host/ohci-at91.c b/drivers/usb/host/ohci-at91.c
index 5302f988e7e6..5ad9e9bdc8ee 100644
--- a/drivers/usb/host/ohci-at91.c
+++ b/drivers/usb/host/ohci-at91.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-1.0+
 /*
  * OHCI HCD (Host Controller Driver) for USB.
  *
diff --git a/drivers/usb/host/ohci-da8xx.c b/drivers/usb/host/ohci-da8xx.c
index 05da2cb59612..0c507a0cfe1f 100644
--- a/drivers/usb/host/ohci-da8xx.c
+++ b/drivers/usb/host/ohci-da8xx.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * OHCI HCD (Host Controller Driver) for USB.
  *
@@ -5,10 +6,6 @@
  *
  * Derived from: ohci-omap.c and ohci-s3c2410.c
  * Copyright (C) 2008-2009 MontaVista Software, Inc. <source@mvista.com>
- *
- * This file is licensed under the terms of the GNU General Public License
- * version 2. This program is licensed "as is" without any warranty of any
- * kind, whether express or implied.
  */
 
 #include <linux/clk.h>
diff --git a/drivers/usb/host/ohci-dbg.c b/drivers/usb/host/ohci-dbg.c
index c3eded317495..ac7d4ac34b02 100644
--- a/drivers/usb/host/ohci-dbg.c
+++ b/drivers/usb/host/ohci-dbg.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-1.0+
 /*
  * OHCI HCD (Host Controller Driver) for USB.
  *
diff --git a/drivers/usb/host/ohci-exynos.c b/drivers/usb/host/ohci-exynos.c
index 6865b919403f..a39fae41bc70 100644
--- a/drivers/usb/host/ohci-exynos.c
+++ b/drivers/usb/host/ohci-exynos.c
@@ -1,14 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * SAMSUNG EXYNOS USB HOST OHCI Controller
  *
  * Copyright (C) 2011 Samsung Electronics Co.Ltd
  * Author: Jingoo Han <jg1.han@samsung.com>
- *
- * 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.
- *
  */
 
 #include <linux/clk.h>
diff --git a/drivers/usb/host/ohci-hcd.c b/drivers/usb/host/ohci-hcd.c
index c86f89babd57..10887e09e9bc 100644
--- a/drivers/usb/host/ohci-hcd.c
+++ b/drivers/usb/host/ohci-hcd.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-1.0+
 /*
  * Open Host Controller Interface (OHCI) driver for USB.
  *
@@ -382,7 +383,7 @@ sanitize:
                         ed_free (ohci, ed);
                         break;
                 }
-                /* else FALL THROUGH */
+                /* fall through */
         default:
                 /* caller was supposed to have unlinked any requests;
                  * that's not our job.  can't recover; must leak ed.
diff --git a/drivers/usb/host/ohci-hub.c b/drivers/usb/host/ohci-hub.c
index 248eb7702463..fb7aaa3b9d06 100644
--- a/drivers/usb/host/ohci-hub.c
+++ b/drivers/usb/host/ohci-hub.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-1.0+
 /*
  * OHCI HCD (Host Controller Driver) for USB.
  *
diff --git a/drivers/usb/host/ohci-mem.c b/drivers/usb/host/ohci-mem.c
index ed8a762b8670..b3da3f12e5b1 100644
--- a/drivers/usb/host/ohci-mem.c
+++ b/drivers/usb/host/ohci-mem.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-1.0+
 /*
  * OHCI HCD (Host Controller Driver) for USB.
  *
diff --git a/drivers/usb/host/ohci-nxp.c b/drivers/usb/host/ohci-nxp.c
index 6df8e2ed40fd..f5f532601092 100644
--- a/drivers/usb/host/ohci-nxp.c
+++ b/drivers/usb/host/ohci-nxp.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * driver for NXP USB Host devices
  *
@@ -13,10 +14,7 @@
  * NOTE: This driver does not have suspend/resume functionality
  * This driver is intended for engineering development purposes only
  *
- * 2005-2006 (c) MontaVista Software, Inc. This file is licensed under
- * the terms of the GNU General Public License version 2. This program
- * is licensed "as is" without any warranty of any kind, whether express
- * or implied.
+ * 2005-2006 (c) MontaVista Software, Inc.
  */
 #include <linux/clk.h>
 #include <linux/dma-mapping.h>
diff --git a/drivers/usb/host/ohci-omap.c b/drivers/usb/host/ohci-omap.c
index 91393ec7d850..0201c49bc4fc 100644
--- a/drivers/usb/host/ohci-omap.c
+++ b/drivers/usb/host/ohci-omap.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-1.0+
 /*
  * OHCI HCD (Host Controller Driver) for USB.
  *
diff --git a/drivers/usb/host/ohci-pci.c b/drivers/usb/host/ohci-pci.c
index a84aebe9b0a9..fbcd34911025 100644
--- a/drivers/usb/host/ohci-pci.c
+++ b/drivers/usb/host/ohci-pci.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-1.0+
 /*
  * OHCI HCD (Host Controller Driver) for USB.
  *
diff --git a/drivers/usb/host/ohci-platform.c b/drivers/usb/host/ohci-platform.c
index 61fe2b985070..1e6c954f4b3f 100644
--- a/drivers/usb/host/ohci-platform.c
+++ b/drivers/usb/host/ohci-platform.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Generic platform ohci driver
  *
@@ -11,8 +12,6 @@
  * Copyright 2000-2002 David Brownell
  * Copyright 1999 Linus Torvalds
  * Copyright 1999 Gregory P. Smith
- *
- * Licensed under the GNU/GPL. See COPYING for details.
  */
 
 #include <linux/clk.h>
@@ -34,12 +33,11 @@
 
 #define DRIVER_DESC "OHCI generic platform driver"
 #define OHCI_MAX_CLKS 3
-#define OHCI_MAX_RESETS 2
 #define hcd_to_ohci_priv(h) ((struct ohci_platform_priv *)hcd_to_ohci(h)->priv)
 
 struct ohci_platform_priv {
         struct clk *clks[OHCI_MAX_CLKS];
-        struct reset_control *resets[OHCI_MAX_RESETS];
+        struct reset_control *resets;
         struct phy **phys;
         int num_phys;
 };
@@ -119,7 +117,7 @@ static int ohci_platform_probe(struct platform_device *dev)
         struct usb_ohci_pdata *pdata = dev_get_platdata(&dev->dev);
         struct ohci_platform_priv *priv;
         struct ohci_hcd *ohci;
-        int err, irq, phy_num, clk = 0, rst = 0;
+        int err, irq, phy_num, clk = 0;
 
         if (usb_disabled())
                 return -ENODEV;
@@ -204,21 +202,17 @@ static int ohci_platform_probe(struct platform_device *dev)
                                 break;
                         }
                 }
-                for (rst = 0; rst < OHCI_MAX_RESETS; rst++) {
-                        priv->resets[rst] =
-                                devm_reset_control_get_shared_by_index(
-                                                                &dev->dev, rst);
-                        if (IS_ERR(priv->resets[rst])) {
-                                err = PTR_ERR(priv->resets[rst]);
-                                if (err == -EPROBE_DEFER)
-                                        goto err_reset;
-                                priv->resets[rst] = NULL;
-                                break;
-                        }
-                        err = reset_control_deassert(priv->resets[rst]);
-                        if (err)
-                                goto err_reset;
+
+                priv->resets = devm_reset_control_array_get_optional_shared(
+                                                                &dev->dev);
+                if (IS_ERR(priv->resets)) {
+                        err = PTR_ERR(priv->resets);
+                        goto err_put_clks;
                 }
+
+                err = reset_control_deassert(priv->resets);
+                if (err)
+                        goto err_put_clks;
         }
 
         if (pdata->big_endian_desc)
@@ -279,8 +273,7 @@ err_power:
                 pdata->power_off(dev);
 err_reset:
         pm_runtime_disable(&dev->dev);
-        while (--rst >= 0)
-                reset_control_assert(priv->resets[rst]);
+        reset_control_assert(priv->resets);
 err_put_clks:
         while (--clk >= 0)
                 clk_put(priv->clks[clk]);
@@ -298,7 +291,7 @@ static int ohci_platform_remove(struct platform_device *dev)
         struct usb_hcd *hcd = platform_get_drvdata(dev);
         struct usb_ohci_pdata *pdata = dev_get_platdata(&dev->dev);
         struct ohci_platform_priv *priv = hcd_to_ohci_priv(hcd);
-        int clk, rst;
+        int clk;
 
         pm_runtime_get_sync(&dev->dev);
         usb_remove_hcd(hcd);
@@ -306,8 +299,7 @@ static int ohci_platform_remove(struct platform_device *dev)
         if (pdata->power_off)
                 pdata->power_off(dev);
 
-        for (rst = 0; rst < OHCI_MAX_RESETS && priv->resets[rst]; rst++)
-                reset_control_assert(priv->resets[rst]);
+        reset_control_assert(priv->resets);
 
         for (clk = 0; clk < OHCI_MAX_CLKS && priv->clks[clk]; clk++)
                 clk_put(priv->clks[clk]);
diff --git a/drivers/usb/host/ohci-ppc-of.c b/drivers/usb/host/ohci-ppc-of.c
index 4f87a5c61b08..76a9b40b08f1 100644
--- a/drivers/usb/host/ohci-ppc-of.c
+++ b/drivers/usb/host/ohci-ppc-of.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-1.0+
 /*
  * OHCI HCD (Host Controller Driver) for USB.
  *
diff --git a/drivers/usb/host/ohci-ps3.c b/drivers/usb/host/ohci-ps3.c
index 71d8bc4c27f6..20a23d795adf 100644
--- a/drivers/usb/host/ohci-ps3.c
+++ b/drivers/usb/host/ohci-ps3.c
@@ -1,21 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  PS3 OHCI Host Controller driver
  *
  *  Copyright (C) 2006 Sony Computer Entertainment Inc.
  *  Copyright 2006 Sony Corp.
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; version 2 of the License.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include <asm/firmware.h>
diff --git a/drivers/usb/host/ohci-pxa27x.c b/drivers/usb/host/ohci-pxa27x.c
index 21c010ffb03c..3e2474959735 100644
--- a/drivers/usb/host/ohci-pxa27x.c
+++ b/drivers/usb/host/ohci-pxa27x.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-1.0+
 /*
  * OHCI HCD (Host Controller Driver) for USB.
  *
diff --git a/drivers/usb/host/ohci-q.c b/drivers/usb/host/ohci-q.c
index 641fed609911..b2ec8c399363 100644
--- a/drivers/usb/host/ohci-q.c
+++ b/drivers/usb/host/ohci-q.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-1.0+
 /*
  * OHCI HCD (Host Controller Driver) for USB.
  *
diff --git a/drivers/usb/host/ohci-s3c2410.c b/drivers/usb/host/ohci-s3c2410.c
index b006b93126f7..4511e27e9da8 100644
--- a/drivers/usb/host/ohci-s3c2410.c
+++ b/drivers/usb/host/ohci-s3c2410.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-1.0+
 /*
  * OHCI HCD (Host Controller Driver) for USB.
  *
diff --git a/drivers/usb/host/ohci-sa1111.c b/drivers/usb/host/ohci-sa1111.c
index 3a9ea32508df..ebec9a7699e3 100644
--- a/drivers/usb/host/ohci-sa1111.c
+++ b/drivers/usb/host/ohci-sa1111.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-1.0+
 /*
  * OHCI HCD (Host Controller Driver) for USB.
  *
@@ -42,7 +43,7 @@
 #if 0
 static void dump_hci_status(struct usb_hcd *hcd, const char *label)
 {
-        unsigned long status = sa1111_readl(hcd->regs + USB_STATUS);
+        unsigned long status = readl_relaxed(hcd->regs + USB_STATUS);
 
         printk(KERN_DEBUG "%s USB_STATUS = { %s%s%s%s%s}\n", label,
              ((status & USB_STATUS_IRQHCIRMTWKUP) ? "IRQHCIRMTWKUP " : ""),
@@ -134,7 +135,7 @@ static int sa1111_start_hc(struct sa1111_dev *dev)
          * Configure the power sense and control lines.  Place the USB
          * host controller in reset.
          */
-        sa1111_writel(usb_rst | USB_RESET_FORCEIFRESET | USB_RESET_FORCEHCRESET,
+        writel_relaxed(usb_rst | USB_RESET_FORCEIFRESET | USB_RESET_FORCEHCRESET,
                       dev->mapbase + USB_RESET);
 
         /*
@@ -144,7 +145,7 @@ static int sa1111_start_hc(struct sa1111_dev *dev)
         ret = sa1111_enable_device(dev);
         if (ret == 0) {
                 udelay(11);
-                sa1111_writel(usb_rst, dev->mapbase + USB_RESET);
+                writel_relaxed(usb_rst, dev->mapbase + USB_RESET);
         }
 
         return ret;
@@ -159,8 +160,8 @@ static void sa1111_stop_hc(struct sa1111_dev *dev)
         /*
          * Put the USB host controller into reset.
          */
-        usb_rst = sa1111_readl(dev->mapbase + USB_RESET);
-        sa1111_writel(usb_rst | USB_RESET_FORCEIFRESET | USB_RESET_FORCEHCRESET,
+        usb_rst = readl_relaxed(dev->mapbase + USB_RESET);
+        writel_relaxed(usb_rst | USB_RESET_FORCEIFRESET | USB_RESET_FORCEHCRESET,
                       dev->mapbase + USB_RESET);
 
         /*
@@ -178,7 +179,7 @@ static void sa1111_stop_hc(struct sa1111_dev *dev)
 static int ohci_hcd_sa1111_probe(struct sa1111_dev *dev)
 {
         struct usb_hcd *hcd;
-        int ret;
+        int ret, irq;
 
         if (usb_disabled())
                 return -ENODEV;
@@ -196,6 +197,12 @@ static int ohci_hcd_sa1111_probe(struct sa1111_dev *dev)
         hcd->rsrc_start = dev->res.start;
         hcd->rsrc_len = resource_size(&dev->res);
 
+        irq = sa1111_get_irq(dev, 1);
+        if (irq <= 0) {
+                ret = irq ? : -ENXIO;
+                goto err1;
+        }
+
         if (!request_mem_region(hcd->rsrc_start, hcd->rsrc_len, hcd_name)) {
                 dev_dbg(&dev->dev, "request_mem_region failed\n");
                 ret = -EBUSY;
@@ -208,7 +215,7 @@ static int ohci_hcd_sa1111_probe(struct sa1111_dev *dev)
         if (ret)
                 goto err2;
 
-        ret = usb_add_hcd(hcd, dev->irq[1], 0);
+        ret = usb_add_hcd(hcd, irq, 0);
         if (ret == 0) {
                 device_wakeup_enable(hcd->self.controller);
                 return ret;
@@ -241,8 +248,9 @@ static int ohci_hcd_sa1111_remove(struct sa1111_dev *dev)
         return 0;
 }
 
-static void ohci_hcd_sa1111_shutdown(struct sa1111_dev *dev)
+static void ohci_hcd_sa1111_shutdown(struct device *_dev)
 {
+        struct sa1111_dev *dev = to_sa1111_device(_dev);
         struct usb_hcd *hcd = sa1111_get_drvdata(dev);
 
         if (test_bit(HCD_FLAG_HW_ACCESSIBLE, &hcd->flags)) {
@@ -255,9 +263,9 @@ static struct sa1111_driver ohci_hcd_sa1111_driver = {
         .drv = {
                 .name   = "sa1111-ohci",
                 .owner  = THIS_MODULE,
+                .shutdown = ohci_hcd_sa1111_shutdown,
         },
         .devid          = SA1111_DEVID_USB,
         .probe          = ohci_hcd_sa1111_probe,
         .remove         = ohci_hcd_sa1111_remove,
-        .shutdown       = ohci_hcd_sa1111_shutdown,
 };
diff --git a/drivers/usb/host/ohci-sm501.c b/drivers/usb/host/ohci-sm501.c
index d4e0f7cd96fa..c9233cddf9a2 100644
--- a/drivers/usb/host/ohci-sm501.c
+++ b/drivers/usb/host/ohci-sm501.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-1.0+
 /*
  * OHCI HCD (Host Controller Driver) for USB.
  *
diff --git a/drivers/usb/host/ohci-spear.c b/drivers/usb/host/ohci-spear.c
index 56478ed2f932..69fa04697793 100644
--- a/drivers/usb/host/ohci-spear.c
+++ b/drivers/usb/host/ohci-spear.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
 * OHCI HCD (Host Controller Driver) for USB.
 *
@@ -5,10 +6,6 @@
 * Deepak Sikri<deepak.sikri@st.com>
 *
 * Based on various ohci-*.c drivers
-*
-* This file is licensed under the terms of the GNU General Public
-* License version 2. This program is licensed "as is" without any
-* warranty of any kind, whether express or implied.
 */
 
 #include <linux/clk.h>
diff --git a/drivers/usb/host/ohci-st.c b/drivers/usb/host/ohci-st.c
index 02816a1515a1..992807c9850a 100644
--- a/drivers/usb/host/ohci-st.c
+++ b/drivers/usb/host/ohci-st.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * ST OHCI driver
  *
@@ -6,10 +7,6 @@
  * Author: Peter Griffin <peter.griffin@linaro.org>
  *
  * Derived from ohci-platform.c
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
  */
 
 #include <linux/clk.h>
diff --git a/drivers/usb/host/ohci-tilegx.c b/drivers/usb/host/ohci-tilegx.c
index e1b208da460a..d21ca3ce9a30 100644
--- a/drivers/usb/host/ohci-tilegx.c
+++ b/drivers/usb/host/ohci-tilegx.c
@@ -1,15 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Copyright 2012 Tilera Corporation. All Rights Reserved.
- *
- *   This program is free software; you can redistribute it and/or
- *   modify it under the terms of the GNU General Public License
- *   as published by the Free Software Foundation, version 2.
- *
- *   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, GOOD TITLE or
- *   NON INFRINGEMENT.  See the GNU General Public License for
- *   more details.
  */
 
 /*
diff --git a/drivers/usb/host/ohci-tmio.c b/drivers/usb/host/ohci-tmio.c
index 16d081a093bb..a631dbb369d7 100644
--- a/drivers/usb/host/ohci-tmio.c
+++ b/drivers/usb/host/ohci-tmio.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * OHCI HCD(Host Controller Driver) for USB.
  *
@@ -18,10 +19,6 @@
  * Written from sparse documentation from Toshiba and Sharp's driver
  * for the 2.4 kernel,
  *      usb-ohci-tc6393.c(C) Copyright 2004 Lineo Solutions, Inc.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
  */
 
 /*#include <linux/fs.h>
diff --git a/drivers/usb/host/ohci.h b/drivers/usb/host/ohci.h
index 12742d002d2d..508a803139dd 100644
--- a/drivers/usb/host/ohci.h
+++ b/drivers/usb/host/ohci.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-1.0+
 /*
  * OHCI HCD (Host Controller Driver) for USB.
  *
diff --git a/drivers/usb/host/oxu210hp-hcd.c b/drivers/usb/host/oxu210hp-hcd.c
index ed20fb34c897..0bf7759aae78 100644
--- a/drivers/usb/host/oxu210hp-hcd.c
+++ b/drivers/usb/host/oxu210hp-hcd.c
@@ -1,23 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright (c) 2008 Rodolfo Giometti <giometti@linux.it>
  * Copyright (c) 2008 Eurotech S.p.A. <info@eurtech.it>
  *
  * This code is *strongly* based on EHCI-HCD code by David Brownell since
  * the chip is a quasi-EHCI compatible.
- *
- * 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.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
 #include <linux/module.h>
@@ -3040,7 +3027,7 @@ idle_timeout:
                         qh_put(qh);
                         break;
                 }
-                /* else FALL THROUGH */
+                /* fall through */
         default:
 nogood:
                 /* caller was supposed to have unlinked any requests;
diff --git a/drivers/usb/host/pci-quirks.c b/drivers/usb/host/pci-quirks.c
index 6dda3623a276..161536717025 100644
--- a/drivers/usb/host/pci-quirks.c
+++ b/drivers/usb/host/pci-quirks.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * This file contains code to reset and initialize USB host controllers.
  * Some of it includes work-arounds for PCI hardware and BIOS quirks.
@@ -841,7 +842,7 @@ static void quirk_usb_disable_ehci(struct pci_dev *pdev)
                         ehci_bios_handoff(pdev, op_reg_base, cap, offset);
                         break;
                 case 0: /* Illegal reserved cap, set cap=0 so we exit */
-                        cap = 0; /* then fallthrough... */
+                        cap = 0; /* fall through */
                 default:
                         dev_warn(&pdev->dev,
                                  "EHCI: unrecognized capability %02x\n",
diff --git a/drivers/usb/host/r8a66597-hcd.c b/drivers/usb/host/r8a66597-hcd.c
index 5e5fc9d7d533..f3d9ba420a97 100644
--- a/drivers/usb/host/r8a66597-hcd.c
+++ b/drivers/usb/host/r8a66597-hcd.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * R8A66597 HCD (Host Controller Driver)
  *
@@ -7,20 +8,6 @@
  * Portions Copyright (C) 1999 Roman Weissgaerber
  *
  * Author : Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- *
  */
 
 #include <linux/module.h>
@@ -1273,7 +1260,7 @@ static void set_td_timer(struct r8a66597 *r8a66597, struct r8a66597_td *td)
                         break;
                 }
 
-                mod_timer(&r8a66597->td_timer[td->pipenum],
+                mod_timer(&r8a66597->timers[td->pipenum].td,
                           jiffies + msecs_to_jiffies(time));
         }
 }
@@ -1733,9 +1720,10 @@ static void r8a66597_root_hub_control(struct r8a66597 *r8a66597, int port)
         }
 }
 
-static void r8a66597_interval_timer(unsigned long _r8a66597)
+static void r8a66597_interval_timer(struct timer_list *t)
 {
-        struct r8a66597 *r8a66597 = (struct r8a66597 *)_r8a66597;
+        struct r8a66597_timers *timers = from_timer(timers, t, interval);
+        struct r8a66597 *r8a66597 = timers->r8a66597;
         unsigned long flags;
         u16 pipenum;
         struct r8a66597_td *td;
@@ -1745,7 +1733,7 @@ static void r8a66597_interval_timer(unsigned long _r8a66597)
         for (pipenum = 0; pipenum < R8A66597_MAX_NUM_PIPE; pipenum++) {
                 if (!(r8a66597->interval_map & (1 << pipenum)))
                         continue;
-                if (timer_pending(&r8a66597->interval_timer[pipenum]))
+                if (timer_pending(&r8a66597->timers[pipenum].interval))
                         continue;
 
                 td = r8a66597_get_td(r8a66597, pipenum);
@@ -1756,9 +1744,10 @@ static void r8a66597_interval_timer(unsigned long _r8a66597)
         spin_unlock_irqrestore(&r8a66597->lock, flags);
 }
 
-static void r8a66597_td_timer(unsigned long _r8a66597)
+static void r8a66597_td_timer(struct timer_list *t)
 {
-        struct r8a66597 *r8a66597 = (struct r8a66597 *)_r8a66597;
+        struct r8a66597_timers *timers = from_timer(timers, t, td);
+        struct r8a66597 *r8a66597 = timers->r8a66597;
         unsigned long flags;
         u16 pipenum;
         struct r8a66597_td *td, *new_td = NULL;
@@ -1768,7 +1757,7 @@ static void r8a66597_td_timer(unsigned long _r8a66597)
         for (pipenum = 0; pipenum < R8A66597_MAX_NUM_PIPE; pipenum++) {
                 if (!(r8a66597->timeout_map & (1 << pipenum)))
                         continue;
-                if (timer_pending(&r8a66597->td_timer[pipenum]))
+                if (timer_pending(&r8a66597->timers[pipenum].td))
                         continue;
 
                 td = r8a66597_get_td(r8a66597, pipenum);
@@ -1942,7 +1931,7 @@ static int r8a66597_urb_enqueue(struct usb_hcd *hcd,
         if (request) {
                 if (td->pipe->info.timer_interval) {
                         r8a66597->interval_map |= 1 << td->pipenum;
-                        mod_timer(&r8a66597->interval_timer[td->pipenum],
+                        mod_timer(&r8a66597->timers[td->pipenum].interval,
                                   jiffies + msecs_to_jiffies(
                                         td->pipe->info.timer_interval));
                 } else {
@@ -2495,11 +2484,10 @@ static int r8a66597_probe(struct platform_device *pdev)
 
         for (i = 0; i < R8A66597_MAX_NUM_PIPE; i++) {
                 INIT_LIST_HEAD(&r8a66597->pipe_queue[i]);
-                setup_timer(&r8a66597->td_timer[i], r8a66597_td_timer,
-                            (unsigned long)r8a66597);
-                setup_timer(&r8a66597->interval_timer[i],
-                                r8a66597_interval_timer,
-                                (unsigned long)r8a66597);
+                r8a66597->timers[i].r8a66597 = r8a66597;
+                timer_setup(&r8a66597->timers[i].td, r8a66597_td_timer, 0);
+                timer_setup(&r8a66597->timers[i].interval,
+                            r8a66597_interval_timer, 0);
         }
         INIT_LIST_HEAD(&r8a66597->child_device);
 
diff --git a/drivers/usb/host/r8a66597.h b/drivers/usb/host/r8a66597.h
index 672cea307abb..51973a923526 100644
--- a/drivers/usb/host/r8a66597.h
+++ b/drivers/usb/host/r8a66597.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * R8A66597 HCD (Host Controller Driver)
  *
@@ -7,20 +8,6 @@
  * Portions Copyright (C) 1999 Roman Weissgaerber
  *
  * Author : Yoshihiro Shimoda <shimoda.yoshihiro@renesas.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- *
  */
 
 #ifndef __R8A66597_H__
@@ -107,6 +94,14 @@ struct r8a66597_root_hub {
         struct r8a66597_device  *dev;
 };
 
+struct r8a66597;
+
+struct r8a66597_timers {
+        struct timer_list td;
+        struct timer_list interval;
+        struct r8a66597 *r8a66597;
+};
+
 struct r8a66597 {
         spinlock_t lock;
         void __iomem *reg;
@@ -117,8 +112,7 @@ struct r8a66597 {
         struct list_head                pipe_queue[R8A66597_MAX_NUM_PIPE];
 
         struct timer_list rh_timer;
-        struct timer_list td_timer[R8A66597_MAX_NUM_PIPE];
-        struct timer_list interval_timer[R8A66597_MAX_NUM_PIPE];
+        struct r8a66597_timers timers[R8A66597_MAX_NUM_PIPE];
 
         unsigned short address_map;
         unsigned short timeout_map;
diff --git a/drivers/usb/host/sl811-hcd.c b/drivers/usb/host/sl811-hcd.c
index 24ad1d6cec25..601fb00603cc 100644
--- a/drivers/usb/host/sl811-hcd.c
+++ b/drivers/usb/host/sl811-hcd.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * SL811HS HCD (Host Controller Driver) for USB.
  *
diff --git a/drivers/usb/host/sl811_cs.c b/drivers/usb/host/sl811_cs.c
index 88a9bffe93df..72136373ffab 100644
--- a/drivers/usb/host/sl811_cs.c
+++ b/drivers/usb/host/sl811_cs.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * PCMCIA driver for SL811HS (as found in REX-CFU1U)
  * Filename: sl811_cs.c
diff --git a/drivers/usb/host/ssb-hcd.c b/drivers/usb/host/ssb-hcd.c
index 62b6b7804c66..016987764afb 100644
--- a/drivers/usb/host/ssb-hcd.c
+++ b/drivers/usb/host/ssb-hcd.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Sonics Silicon Backplane
  * Broadcom USB-core driver  (SSB bus glue)
@@ -15,8 +16,6 @@
  *
  * Derived from the USBcore related parts of Broadcom-SB
  * Copyright 2005-2011 Broadcom Corporation
- *
- * Licensed under the GNU/GPL. See COPYING for details.
  */
 #include <linux/ssb/ssb.h>
 #include <linux/delay.h>
diff --git a/drivers/usb/host/u132-hcd.c b/drivers/usb/host/u132-hcd.c
index c38855aed62c..032b8652910a 100644
--- a/drivers/usb/host/u132-hcd.c
+++ b/drivers/usb/host/u132-hcd.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
 * Host Controller Driver for the Elan Digital Systems U132 adapter
 *
@@ -7,11 +8,6 @@
 * Author and Maintainer - Tony Olech - Elan Digital Systems
 * tony.olech@elandigitalsystems.com
 *
-* This program is free software;you can redistribute it and/or
-* modify it under the terms of the GNU General Public License as
-* published by the Free Software Foundation, version 2.
-*
-*
 * This driver was written by Tony Olech(tony.olech@elandigitalsystems.com)
 * based on various USB host drivers in the 2.6.15 linux kernel
 * with constant reference to the 3rd Edition of Linux Device Drivers
diff --git a/drivers/usb/host/uhci-hcd.c b/drivers/usb/host/uhci-hcd.c
index c3267a78c94e..babeefd84ffd 100644
--- a/drivers/usb/host/uhci-hcd.c
+++ b/drivers/usb/host/uhci-hcd.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Universal Host Controller Interface driver for USB.
  *
diff --git a/drivers/usb/host/whci/asl.c b/drivers/usb/host/whci/asl.c
index 773249306031..c5ac9efb076a 100644
--- a/drivers/usb/host/whci/asl.c
+++ b/drivers/usb/host/whci/asl.c
@@ -1,19 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Wireless Host Controller (WHC) asynchronous schedule management.
  *
  * Copyright (C) 2007 Cambridge Silicon Radio Ltd.
- *
- * 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.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include <linux/kernel.h>
 #include <linux/gfp.h>
diff --git a/drivers/usb/host/whci/debug.c b/drivers/usb/host/whci/debug.c
index 774b89d28fae..f154e5791bfd 100644
--- a/drivers/usb/host/whci/debug.c
+++ b/drivers/usb/host/whci/debug.c
@@ -1,19 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Wireless Host Controller (WHC) debug.
  *
  * Copyright (C) 2008 Cambridge Silicon Radio Ltd.
- *
- * 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.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include <linux/slab.h>
 #include <linux/kernel.h>
diff --git a/drivers/usb/host/whci/hcd.c b/drivers/usb/host/whci/hcd.c
index cf84269c3e6d..8af9dcfea127 100644
--- a/drivers/usb/host/whci/hcd.c
+++ b/drivers/usb/host/whci/hcd.c
@@ -1,19 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Wireless Host Controller (WHC) driver.
  *
  * Copyright (C) 2007 Cambridge Silicon Radio Ltd.
- *
- * 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.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include <linux/kernel.h>
 #include <linux/init.h>
diff --git a/drivers/usb/host/whci/hw.c b/drivers/usb/host/whci/hw.c
index 6afa2e379160..22b3b7f7419d 100644
--- a/drivers/usb/host/whci/hw.c
+++ b/drivers/usb/host/whci/hw.c
@@ -1,19 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Wireless Host Controller (WHC) hardware access helpers.
  *
  * Copyright (C) 2007 Cambridge Silicon Radio Ltd.
- *
- * 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.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include <linux/kernel.h>
 #include <linux/dma-mapping.h>
diff --git a/drivers/usb/host/whci/init.c b/drivers/usb/host/whci/init.c
index ad8eb575c30a..82416973f773 100644
--- a/drivers/usb/host/whci/init.c
+++ b/drivers/usb/host/whci/init.c
@@ -1,19 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Wireless Host Controller (WHC) initialization.
  *
  * Copyright (C) 2007 Cambridge Silicon Radio Ltd.
- *
- * 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.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include <linux/kernel.h>
 #include <linux/gfp.h>
diff --git a/drivers/usb/host/whci/int.c b/drivers/usb/host/whci/int.c
index 0c086b2790d1..7e4ad1b8f3e3 100644
--- a/drivers/usb/host/whci/int.c
+++ b/drivers/usb/host/whci/int.c
@@ -1,19 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Wireless Host Controller (WHC) interrupt handling.
  *
  * Copyright (C) 2007 Cambridge Silicon Radio Ltd.
- *
- * 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.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include <linux/kernel.h>
 #include <linux/uwb/umc.h>
diff --git a/drivers/usb/host/whci/pzl.c b/drivers/usb/host/whci/pzl.c
index 33c5580b4d25..bb84366f7bd3 100644
--- a/drivers/usb/host/whci/pzl.c
+++ b/drivers/usb/host/whci/pzl.c
@@ -1,19 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Wireless Host Controller (WHC) periodic schedule management.
  *
  * Copyright (C) 2007 Cambridge Silicon Radio Ltd.
- *
- * 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.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include <linux/kernel.h>
 #include <linux/gfp.h>
diff --git a/drivers/usb/host/whci/qset.c b/drivers/usb/host/whci/qset.c
index c0e6812426b3..925166a207aa 100644
--- a/drivers/usb/host/whci/qset.c
+++ b/drivers/usb/host/whci/qset.c
@@ -1,19 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Wireless Host Controller (WHC) qset management.
  *
  * Copyright (C) 2007 Cambridge Silicon Radio Ltd.
- *
- * 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.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include <linux/kernel.h>
 #include <linux/dma-mapping.h>
diff --git a/drivers/usb/host/whci/whcd.h b/drivers/usb/host/whci/whcd.h
index c80c7d93bc4a..139476997e7c 100644
--- a/drivers/usb/host/whci/whcd.h
+++ b/drivers/usb/host/whci/whcd.h
@@ -1,21 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Wireless Host Controller (WHC) private header.
  *
  * Copyright (C) 2007 Cambridge Silicon Radio Ltd.
- *
- * 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.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301, USA.
  */
 #ifndef __WHCD_H
 #define __WHCD_H
diff --git a/drivers/usb/host/whci/whci-hc.h b/drivers/usb/host/whci/whci-hc.h
index 4d4cbc0730bf..5a86a57a80cc 100644
--- a/drivers/usb/host/whci/whci-hc.h
+++ b/drivers/usb/host/whci/whci-hc.h
@@ -1,21 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Wireless Host Controller (WHC) data structures.
  *
  * Copyright (C) 2007 Cambridge Silicon Radio Ltd.
- *
- * 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.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301, USA.
  */
 #ifndef _WHCI_WHCI_HC_H
 #define _WHCI_WHCI_HC_H
diff --git a/drivers/usb/host/whci/wusb.c b/drivers/usb/host/whci/wusb.c
index 8d2762682869..8a4d805ff63a 100644
--- a/drivers/usb/host/whci/wusb.c
+++ b/drivers/usb/host/whci/wusb.c
@@ -1,19 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Wireless Host Controller (WHC) WUSB operations.
  *
  * Copyright (C) 2007 Cambridge Silicon Radio Ltd.
- *
- * 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.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include <linux/kernel.h>
 #include <linux/uwb/umc.h>
diff --git a/drivers/usb/host/xhci-dbg.c b/drivers/usb/host/xhci-dbg.c
index 2c83b37ae8f2..584d7b9a3683 100644
--- a/drivers/usb/host/xhci-dbg.c
+++ b/drivers/usb/host/xhci-dbg.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * xHCI host controller driver
  *
@@ -5,19 +6,6 @@
  *
  * Author: Sarah Sharp
  * Some code borrowed from the Linux EHCI driver.
- *
- * 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.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
 #include "xhci.h"
diff --git a/drivers/usb/host/xhci-debugfs.c b/drivers/usb/host/xhci-debugfs.c
new file mode 100644
index 000000000000..4f7895dbcf88
--- /dev/null
+++ b/drivers/usb/host/xhci-debugfs.c
@@ -0,0 +1,523 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * xhci-debugfs.c - xHCI debugfs interface
+ *
+ * Copyright (C) 2017 Intel Corporation
+ *
+ * Author: Lu Baolu <baolu.lu@linux.intel.com>
+ */
+
+#include <linux/slab.h>
+
+#include "xhci.h"
+#include "xhci-debugfs.h"
+
+static const struct debugfs_reg32 xhci_cap_regs[] = {
+        dump_register(CAPLENGTH),
+        dump_register(HCSPARAMS1),
+        dump_register(HCSPARAMS2),
+        dump_register(HCSPARAMS3),
+        dump_register(HCCPARAMS1),
+        dump_register(DOORBELLOFF),
+        dump_register(RUNTIMEOFF),
+        dump_register(HCCPARAMS2),
+};
+
+static const struct debugfs_reg32 xhci_op_regs[] = {
+        dump_register(USBCMD),
+        dump_register(USBSTS),
+        dump_register(PAGESIZE),
+        dump_register(DNCTRL),
+        dump_register(CRCR),
+        dump_register(DCBAAP_LOW),
+        dump_register(DCBAAP_HIGH),
+        dump_register(CONFIG),
+};
+
+static const struct debugfs_reg32 xhci_runtime_regs[] = {
+        dump_register(MFINDEX),
+        dump_register(IR0_IMAN),
+        dump_register(IR0_IMOD),
+        dump_register(IR0_ERSTSZ),
+        dump_register(IR0_ERSTBA_LOW),
+        dump_register(IR0_ERSTBA_HIGH),
+        dump_register(IR0_ERDP_LOW),
+        dump_register(IR0_ERDP_HIGH),
+};
+
+static const struct debugfs_reg32 xhci_extcap_legsup[] = {
+        dump_register(EXTCAP_USBLEGSUP),
+        dump_register(EXTCAP_USBLEGCTLSTS),
+};
+
+static const struct debugfs_reg32 xhci_extcap_protocol[] = {
+        dump_register(EXTCAP_REVISION),
+        dump_register(EXTCAP_NAME),
+        dump_register(EXTCAP_PORTINFO),
+        dump_register(EXTCAP_PORTTYPE),
+        dump_register(EXTCAP_MANTISSA1),
+        dump_register(EXTCAP_MANTISSA2),
+        dump_register(EXTCAP_MANTISSA3),
+        dump_register(EXTCAP_MANTISSA4),
+        dump_register(EXTCAP_MANTISSA5),
+        dump_register(EXTCAP_MANTISSA6),
+};
+
+static const struct debugfs_reg32 xhci_extcap_dbc[] = {
+        dump_register(EXTCAP_DBC_CAPABILITY),
+        dump_register(EXTCAP_DBC_DOORBELL),
+        dump_register(EXTCAP_DBC_ERSTSIZE),
+        dump_register(EXTCAP_DBC_ERST_LOW),
+        dump_register(EXTCAP_DBC_ERST_HIGH),
+        dump_register(EXTCAP_DBC_ERDP_LOW),
+        dump_register(EXTCAP_DBC_ERDP_HIGH),
+        dump_register(EXTCAP_DBC_CONTROL),
+        dump_register(EXTCAP_DBC_STATUS),
+        dump_register(EXTCAP_DBC_PORTSC),
+        dump_register(EXTCAP_DBC_CONT_LOW),
+        dump_register(EXTCAP_DBC_CONT_HIGH),
+        dump_register(EXTCAP_DBC_DEVINFO1),
+        dump_register(EXTCAP_DBC_DEVINFO2),
+};
+
+static struct dentry *xhci_debugfs_root;
+
+static struct xhci_regset *xhci_debugfs_alloc_regset(struct xhci_hcd *xhci)
+{
+        struct xhci_regset      *regset;
+
+        regset = kzalloc(sizeof(*regset), GFP_KERNEL);
+        if (!regset)
+                return NULL;
+
+        /*
+         * The allocation and free of regset are executed in order.
+         * We needn't a lock here.
+         */
+        INIT_LIST_HEAD(&regset->list);
+        list_add_tail(&regset->list, &xhci->regset_list);
+
+        return regset;
+}
+
+static void xhci_debugfs_free_regset(struct xhci_regset *regset)
+{
+        if (!regset)
+                return;
+
+        list_del(&regset->list);
+        kfree(regset);
+}
+
+static void xhci_debugfs_regset(struct xhci_hcd *xhci, u32 base,
+                                const struct debugfs_reg32 *regs,
+                                size_t nregs, struct dentry *parent,
+                                const char *fmt, ...)
+{
+        struct xhci_regset      *rgs;
+        va_list                 args;
+        struct debugfs_regset32 *regset;
+        struct usb_hcd          *hcd = xhci_to_hcd(xhci);
+
+        rgs = xhci_debugfs_alloc_regset(xhci);
+        if (!rgs)
+                return;
+
+        va_start(args, fmt);
+        vsnprintf(rgs->name, sizeof(rgs->name), fmt, args);
+        va_end(args);
+
+        regset = &rgs->regset;
+        regset->regs = regs;
+        regset->nregs = nregs;
+        regset->base = hcd->regs + base;
+
+        debugfs_create_regset32((const char *)rgs->name, 0444, parent, regset);
+}
+
+static void xhci_debugfs_extcap_regset(struct xhci_hcd *xhci, int cap_id,
+                                       const struct debugfs_reg32 *regs,
+                                       size_t n, const char *cap_name)
+{
+        u32                     offset;
+        int                     index = 0;
+        size_t                  psic, nregs = n;
+        void __iomem            *base = &xhci->cap_regs->hc_capbase;
+
+        offset = xhci_find_next_ext_cap(base, 0, cap_id);
+        while (offset) {
+                if (cap_id == XHCI_EXT_CAPS_PROTOCOL) {
+                        psic = XHCI_EXT_PORT_PSIC(readl(base + offset + 8));
+                        nregs = min(4 + psic, n);
+                }
+
+                xhci_debugfs_regset(xhci, offset, regs, nregs,
+                                    xhci->debugfs_root, "%s:%02d",
+                                    cap_name, index);
+                offset = xhci_find_next_ext_cap(base, offset, cap_id);
+                index++;
+        }
+}
+
+static int xhci_ring_enqueue_show(struct seq_file *s, void *unused)
+{
+        dma_addr_t              dma;
+        struct xhci_ring        *ring = s->private;
+
+        dma = xhci_trb_virt_to_dma(ring->enq_seg, ring->enqueue);
+        seq_printf(s, "%pad\n", &dma);
+
+        return 0;
+}
+
+static int xhci_ring_dequeue_show(struct seq_file *s, void *unused)
+{
+        dma_addr_t              dma;
+        struct xhci_ring        *ring = s->private;
+
+        dma = xhci_trb_virt_to_dma(ring->deq_seg, ring->dequeue);
+        seq_printf(s, "%pad\n", &dma);
+
+        return 0;
+}
+
+static int xhci_ring_cycle_show(struct seq_file *s, void *unused)
+{
+        struct xhci_ring        *ring = s->private;
+
+        seq_printf(s, "%d\n", ring->cycle_state);
+
+        return 0;
+}
+
+static void xhci_ring_dump_segment(struct seq_file *s,
+                                   struct xhci_segment *seg)
+{
+        int                     i;
+        dma_addr_t              dma;
+        union xhci_trb          *trb;
+
+        for (i = 0; i < TRBS_PER_SEGMENT; i++) {
+                trb = &seg->trbs[i];
+                dma = seg->dma + i * sizeof(*trb);
+                seq_printf(s, "%pad: %s\n", &dma,
+                           xhci_decode_trb(trb->generic.field[0],
+                                           trb->generic.field[1],
+                                           trb->generic.field[2],
+                                           trb->generic.field[3]));
+        }
+}
+
+static int xhci_ring_trb_show(struct seq_file *s, void *unused)
+{
+        int                     i;
+        struct xhci_ring        *ring = s->private;
+        struct xhci_segment     *seg = ring->first_seg;
+
+        for (i = 0; i < ring->num_segs; i++) {
+                xhci_ring_dump_segment(s, seg);
+                seg = seg->next;
+        }
+
+        return 0;
+}
+
+static struct xhci_file_map ring_files[] = {
+        {"enqueue",             xhci_ring_enqueue_show, },
+        {"dequeue",             xhci_ring_dequeue_show, },
+        {"cycle",               xhci_ring_cycle_show, },
+        {"trbs",                xhci_ring_trb_show, },
+};
+
+static int xhci_ring_open(struct inode *inode, struct file *file)
+{
+        int                     i;
+        struct xhci_file_map    *f_map;
+        const char              *file_name = file_dentry(file)->d_iname;
+
+        for (i = 0; i < ARRAY_SIZE(ring_files); i++) {
+                f_map = &ring_files[i];
+
+                if (strcmp(f_map->name, file_name) == 0)
+                        break;
+        }
+
+        return single_open(file, f_map->show, inode->i_private);
+}
+
+static const struct file_operations xhci_ring_fops = {
+        .open                   = xhci_ring_open,
+        .read                   = seq_read,
+        .llseek                 = seq_lseek,
+        .release                = single_release,
+};
+
+static int xhci_slot_context_show(struct seq_file *s, void *unused)
+{
+        struct xhci_hcd         *xhci;
+        struct xhci_slot_ctx    *slot_ctx;
+        struct xhci_slot_priv   *priv = s->private;
+        struct xhci_virt_device *dev = priv->dev;
+
+        xhci = hcd_to_xhci(bus_to_hcd(dev->udev->bus));
+        slot_ctx = xhci_get_slot_ctx(xhci, dev->out_ctx);
+        seq_printf(s, "%pad: %s\n", &dev->out_ctx->dma,
+                   xhci_decode_slot_context(slot_ctx->dev_info,
+                                            slot_ctx->dev_info2,
+                                            slot_ctx->tt_info,
+                                            slot_ctx->dev_state));
+
+        return 0;
+}
+
+static int xhci_endpoint_context_show(struct seq_file *s, void *unused)
+{
+        int                     dci;
+        dma_addr_t              dma;
+        struct xhci_hcd         *xhci;
+        struct xhci_ep_ctx      *ep_ctx;
+        struct xhci_slot_priv   *priv = s->private;
+        struct xhci_virt_device *dev = priv->dev;
+
+        xhci = hcd_to_xhci(bus_to_hcd(dev->udev->bus));
+
+        for (dci = 1; dci < 32; dci++) {
+                ep_ctx = xhci_get_ep_ctx(xhci, dev->out_ctx, dci);
+                dma = dev->out_ctx->dma + dci * CTX_SIZE(xhci->hcc_params);
+                seq_printf(s, "%pad: %s\n", &dma,
+                           xhci_decode_ep_context(ep_ctx->ep_info,
+                                                  ep_ctx->ep_info2,
+                                                  ep_ctx->deq,
+                                                  ep_ctx->tx_info));
+        }
+
+        return 0;
+}
+
+static int xhci_device_name_show(struct seq_file *s, void *unused)
+{
+        struct xhci_slot_priv   *priv = s->private;
+        struct xhci_virt_device *dev = priv->dev;
+
+        seq_printf(s, "%s\n", dev_name(&dev->udev->dev));
+
+        return 0;
+}
+
+static struct xhci_file_map context_files[] = {
+        {"name",                xhci_device_name_show, },
+        {"slot-context",        xhci_slot_context_show, },
+        {"ep-context",          xhci_endpoint_context_show, },
+};
+
+static int xhci_context_open(struct inode *inode, struct file *file)
+{
+        int                     i;
+        struct xhci_file_map    *f_map;
+        const char              *file_name = file_dentry(file)->d_iname;
+
+        for (i = 0; i < ARRAY_SIZE(context_files); i++) {
+                f_map = &context_files[i];
+
+                if (strcmp(f_map->name, file_name) == 0)
+                        break;
+        }
+
+        return single_open(file, f_map->show, inode->i_private);
+}
+
+static const struct file_operations xhci_context_fops = {
+        .open                   = xhci_context_open,
+        .read                   = seq_read,
+        .llseek                 = seq_lseek,
+        .release                = single_release,
+};
+
+static void xhci_debugfs_create_files(struct xhci_hcd *xhci,
+                                      struct xhci_file_map *files,
+                                      size_t nentries, void *data,
+                                      struct dentry *parent,
+                                      const struct file_operations *fops)
+{
+        int                     i;
+
+        for (i = 0; i < nentries; i++)
+                debugfs_create_file(files[i].name, 0444, parent, data, fops);
+}
+
+static struct dentry *xhci_debugfs_create_ring_dir(struct xhci_hcd *xhci,
+                                                   struct xhci_ring *ring,
+                                                   const char *name,
+                                                   struct dentry *parent)
+{
+        struct dentry           *dir;
+
+        dir = debugfs_create_dir(name, parent);
+        xhci_debugfs_create_files(xhci, ring_files, ARRAY_SIZE(ring_files),
+                                  ring, dir, &xhci_ring_fops);
+
+        return dir;
+}
+
+static void xhci_debugfs_create_context_files(struct xhci_hcd *xhci,
+                                              struct dentry *parent,
+                                              int slot_id)
+{
+        struct xhci_virt_device *dev = xhci->devs[slot_id];
+
+        xhci_debugfs_create_files(xhci, context_files,
+                                  ARRAY_SIZE(context_files),
+                                  dev->debugfs_private,
+                                  parent, &xhci_context_fops);
+}
+
+void xhci_debugfs_create_endpoint(struct xhci_hcd *xhci,
+                                  struct xhci_virt_device *dev,
+                                  int ep_index)
+{
+        struct xhci_ep_priv     *epriv;
+        struct xhci_slot_priv   *spriv = dev->debugfs_private;
+
+        if (spriv->eps[ep_index])
+                return;
+
+        epriv = kzalloc(sizeof(*epriv), GFP_KERNEL);
+        if (!epriv)
+                return;
+
+        snprintf(epriv->name, sizeof(epriv->name), "ep%02d", ep_index);
+        epriv->root = xhci_debugfs_create_ring_dir(xhci,
+                                                   dev->eps[ep_index].new_ring,
+                                                   epriv->name,
+                                                   spriv->root);
+        spriv->eps[ep_index] = epriv;
+}
+
+void xhci_debugfs_remove_endpoint(struct xhci_hcd *xhci,
+                                  struct xhci_virt_device *dev,
+                                  int ep_index)
+{
+        struct xhci_ep_priv     *epriv;
+        struct xhci_slot_priv   *spriv = dev->debugfs_private;
+
+        if (!spriv || !spriv->eps[ep_index])
+                return;
+
+        epriv = spriv->eps[ep_index];
+        debugfs_remove_recursive(epriv->root);
+        spriv->eps[ep_index] = NULL;
+        kfree(epriv);
+}
+
+void xhci_debugfs_create_slot(struct xhci_hcd *xhci, int slot_id)
+{
+        struct xhci_slot_priv   *priv;
+        struct xhci_virt_device *dev = xhci->devs[slot_id];
+
+        priv = kzalloc(sizeof(*priv), GFP_KERNEL);
+        if (!priv)
+                return;
+
+        snprintf(priv->name, sizeof(priv->name), "%02d", slot_id);
+        priv->root = debugfs_create_dir(priv->name, xhci->debugfs_slots);
+        priv->dev = dev;
+        dev->debugfs_private = priv;
+
+        xhci_debugfs_create_ring_dir(xhci, dev->eps[0].ring,
+                                     "ep00", priv->root);
+
+        xhci_debugfs_create_context_files(xhci, priv->root, slot_id);
+}
+
+void xhci_debugfs_remove_slot(struct xhci_hcd *xhci, int slot_id)
+{
+        int                     i;
+        struct xhci_slot_priv   *priv;
+        struct xhci_virt_device *dev = xhci->devs[slot_id];
+
+        if (!dev || !dev->debugfs_private)
+                return;
+
+        priv = dev->debugfs_private;
+
+        debugfs_remove_recursive(priv->root);
+
+        for (i = 0; i < 31; i++)
+                kfree(priv->eps[i]);
+
+        kfree(priv);
+        dev->debugfs_private = NULL;
+}
+
+void xhci_debugfs_init(struct xhci_hcd *xhci)
+{
+        struct device           *dev = xhci_to_hcd(xhci)->self.controller;
+
+        xhci->debugfs_root = debugfs_create_dir(dev_name(dev),
+                                                xhci_debugfs_root);
+
+        INIT_LIST_HEAD(&xhci->regset_list);
+
+        xhci_debugfs_regset(xhci,
+                            0,
+                            xhci_cap_regs, ARRAY_SIZE(xhci_cap_regs),
+                            xhci->debugfs_root, "reg-cap");
+
+        xhci_debugfs_regset(xhci,
+                            HC_LENGTH(readl(&xhci->cap_regs->hc_capbase)),
+                            xhci_op_regs, ARRAY_SIZE(xhci_op_regs),
+                            xhci->debugfs_root, "reg-op");
+
+        xhci_debugfs_regset(xhci,
+                            readl(&xhci->cap_regs->run_regs_off) & RTSOFF_MASK,
+                            xhci_runtime_regs, ARRAY_SIZE(xhci_runtime_regs),
+                            xhci->debugfs_root, "reg-runtime");
+
+        xhci_debugfs_extcap_regset(xhci, XHCI_EXT_CAPS_LEGACY,
+                                   xhci_extcap_legsup,
+                                   ARRAY_SIZE(xhci_extcap_legsup),
+                                   "reg-ext-legsup");
+
+        xhci_debugfs_extcap_regset(xhci, XHCI_EXT_CAPS_PROTOCOL,
+                                   xhci_extcap_protocol,
+                                   ARRAY_SIZE(xhci_extcap_protocol),
+                                   "reg-ext-protocol");
+
+        xhci_debugfs_extcap_regset(xhci, XHCI_EXT_CAPS_DEBUG,
+                                   xhci_extcap_dbc,
+                                   ARRAY_SIZE(xhci_extcap_dbc),
+                                   "reg-ext-dbc");
+
+        xhci_debugfs_create_ring_dir(xhci, xhci->cmd_ring,
+                                     "command-ring",
+                                     xhci->debugfs_root);
+
+        xhci_debugfs_create_ring_dir(xhci, xhci->event_ring,
+                                     "event-ring",
+                                     xhci->debugfs_root);
+
+        xhci->debugfs_slots = debugfs_create_dir("devices", xhci->debugfs_root);
+}
+
+void xhci_debugfs_exit(struct xhci_hcd *xhci)
+{
+        struct xhci_regset      *rgs, *tmp;
+
+        debugfs_remove_recursive(xhci->debugfs_root);
+        xhci->debugfs_root = NULL;
+        xhci->debugfs_slots = NULL;
+
+        list_for_each_entry_safe(rgs, tmp, &xhci->regset_list, list)
+                xhci_debugfs_free_regset(rgs);
+}
+
+void __init xhci_debugfs_create_root(void)
+{
+        xhci_debugfs_root = debugfs_create_dir("xhci", usb_debug_root);
+}
+
+void __exit xhci_debugfs_remove_root(void)
+{
+        debugfs_remove_recursive(xhci_debugfs_root);
+        xhci_debugfs_root = NULL;
+}
diff --git a/drivers/usb/host/xhci-debugfs.h b/drivers/usb/host/xhci-debugfs.h
new file mode 100644
index 000000000000..ac5bc40f5c3a
--- /dev/null
+++ b/drivers/usb/host/xhci-debugfs.h
@@ -0,0 +1,134 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * xhci-debugfs.h - xHCI debugfs interface
+ *
+ * Copyright (C) 2017 Intel Corporation
+ *
+ * Author: Lu Baolu <baolu.lu@linux.intel.com>
+ */
+
+#ifndef __LINUX_XHCI_DEBUGFS_H
+#define __LINUX_XHCI_DEBUGFS_H
+
+#include <linux/debugfs.h>
+
+#define DEBUGFS_NAMELEN 32
+
+#define REG_CAPLENGTH                                   0x00
+#define REG_HCSPARAMS1                                  0x04
+#define REG_HCSPARAMS2                                  0x08
+#define REG_HCSPARAMS3                                  0x0c
+#define REG_HCCPARAMS1                                  0x10
+#define REG_DOORBELLOFF                                 0x14
+#define REG_RUNTIMEOFF                                  0x18
+#define REG_HCCPARAMS2                                  0x1c
+
+#define REG_USBCMD                                      0x00
+#define REG_USBSTS                                      0x04
+#define REG_PAGESIZE                                    0x08
+#define REG_DNCTRL                                      0x14
+#define REG_CRCR                                        0x18
+#define REG_DCBAAP_LOW                                  0x30
+#define REG_DCBAAP_HIGH                                 0x34
+#define REG_CONFIG                                      0x38
+
+#define REG_MFINDEX                                     0x00
+#define REG_IR0_IMAN                                    0x20
+#define REG_IR0_IMOD                                    0x24
+#define REG_IR0_ERSTSZ                                  0x28
+#define REG_IR0_ERSTBA_LOW                              0x30
+#define REG_IR0_ERSTBA_HIGH                             0x34
+#define REG_IR0_ERDP_LOW                                0x38
+#define REG_IR0_ERDP_HIGH                               0x3c
+
+#define REG_EXTCAP_USBLEGSUP                            0x00
+#define REG_EXTCAP_USBLEGCTLSTS                         0x04
+
+#define REG_EXTCAP_REVISION                             0x00
+#define REG_EXTCAP_NAME                                 0x04
+#define REG_EXTCAP_PORTINFO                             0x08
+#define REG_EXTCAP_PORTTYPE                             0x0c
+#define REG_EXTCAP_MANTISSA1                            0x10
+#define REG_EXTCAP_MANTISSA2                            0x14
+#define REG_EXTCAP_MANTISSA3                            0x18
+#define REG_EXTCAP_MANTISSA4                            0x1c
+#define REG_EXTCAP_MANTISSA5                            0x20
+#define REG_EXTCAP_MANTISSA6                            0x24
+
+#define REG_EXTCAP_DBC_CAPABILITY                       0x00
+#define REG_EXTCAP_DBC_DOORBELL                         0x04
+#define REG_EXTCAP_DBC_ERSTSIZE                         0x08
+#define REG_EXTCAP_DBC_ERST_LOW                         0x10
+#define REG_EXTCAP_DBC_ERST_HIGH                        0x14
+#define REG_EXTCAP_DBC_ERDP_LOW                         0x18
+#define REG_EXTCAP_DBC_ERDP_HIGH                        0x1c
+#define REG_EXTCAP_DBC_CONTROL                          0x20
+#define REG_EXTCAP_DBC_STATUS                           0x24
+#define REG_EXTCAP_DBC_PORTSC                           0x28
+#define REG_EXTCAP_DBC_CONT_LOW                         0x30
+#define REG_EXTCAP_DBC_CONT_HIGH                        0x34
+#define REG_EXTCAP_DBC_DEVINFO1                         0x38
+#define REG_EXTCAP_DBC_DEVINFO2                         0x3c
+
+#define dump_register(nm)                               \
+{                                                       \
+        .name   = __stringify(nm),                      \
+        .offset = REG_ ##nm,                            \
+}
+
+struct xhci_regset {
+        char                    name[DEBUGFS_NAMELEN];
+        struct debugfs_regset32 regset;
+        size_t                  nregs;
+        struct dentry           *parent;
+        struct list_head        list;
+};
+
+struct xhci_file_map {
+        const char              *name;
+        int                     (*show)(struct seq_file *s, void *unused);
+};
+
+struct xhci_ep_priv {
+        char                    name[DEBUGFS_NAMELEN];
+        struct dentry           *root;
+};
+
+struct xhci_slot_priv {
+        char                    name[DEBUGFS_NAMELEN];
+        struct dentry           *root;
+        struct xhci_ep_priv     *eps[31];
+        struct xhci_virt_device *dev;
+};
+
+#ifdef CONFIG_DEBUG_FS
+void xhci_debugfs_init(struct xhci_hcd *xhci);
+void xhci_debugfs_exit(struct xhci_hcd *xhci);
+void __init xhci_debugfs_create_root(void);
+void __exit xhci_debugfs_remove_root(void);
+void xhci_debugfs_create_slot(struct xhci_hcd *xhci, int slot_id);
+void xhci_debugfs_remove_slot(struct xhci_hcd *xhci, int slot_id);
+void xhci_debugfs_create_endpoint(struct xhci_hcd *xhci,
+                                  struct xhci_virt_device *virt_dev,
+                                  int ep_index);
+void xhci_debugfs_remove_endpoint(struct xhci_hcd *xhci,
+                                  struct xhci_virt_device *virt_dev,
+                                  int ep_index);
+#else
+static inline void xhci_debugfs_init(struct xhci_hcd *xhci) { }
+static inline void xhci_debugfs_exit(struct xhci_hcd *xhci) { }
+static inline void __init xhci_debugfs_create_root(void) { }
+static inline void __exit xhci_debugfs_remove_root(void) { }
+static inline void xhci_debugfs_create_slot(struct xhci_hcd *x, int s) { }
+static inline void xhci_debugfs_remove_slot(struct xhci_hcd *x, int s) { }
+static inline void
+xhci_debugfs_create_endpoint(struct xhci_hcd *xhci,
+                             struct xhci_virt_device *virt_dev,
+                             int ep_index) { }
+static inline void
+xhci_debugfs_remove_endpoint(struct xhci_hcd *xhci,
+                             struct xhci_virt_device *virt_dev,
+                             int ep_index) { }
+#endif /* CONFIG_DEBUG_FS */
+
+#endif /* __LINUX_XHCI_DEBUGFS_H */
diff --git a/drivers/usb/host/xhci-ext-caps.h b/drivers/usb/host/xhci-ext-caps.h
index 28deea584884..bf7316e130d3 100644
--- a/drivers/usb/host/xhci-ext-caps.h
+++ b/drivers/usb/host/xhci-ext-caps.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * xHCI host controller driver
  *
@@ -5,19 +6,6 @@
  *
  * Author: Sarah Sharp
  * Some code borrowed from the Linux EHCI driver.
- *
- * 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.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 /* Up to 16 ms to halt an HC */
 #define XHCI_MAX_HALT_USEC      (16*1000)
diff --git a/drivers/usb/host/xhci-hub.c b/drivers/usb/host/xhci-hub.c
index a2336deb5e36..2a90229be7a6 100644
--- a/drivers/usb/host/xhci-hub.c
+++ b/drivers/usb/host/xhci-hub.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * xHCI host controller driver
  *
@@ -5,19 +6,6 @@
  *
  * Author: Sarah Sharp
  * Some code borrowed from the Linux EHCI driver.
- *
- * 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.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
 
@@ -634,7 +622,10 @@ static int xhci_enter_test_mode(struct xhci_hcd *xhci,
         xhci_dbg(xhci, "Disable all slots\n");
         spin_unlock_irqrestore(&xhci->lock, *flags);
         for (i = 1; i <= HCS_MAX_SLOTS(xhci->hcs_params1); i++) {
-                retval = xhci_disable_slot(xhci, NULL, i);
+                if (!xhci->devs[i])
+                        continue;
+
+                retval = xhci_disable_slot(xhci, i);
                 if (retval)
                         xhci_err(xhci, "Failed to disable slot %d, %d. Enter test mode anyway\n",
                                  i, retval);
@@ -1374,6 +1365,7 @@ int xhci_hub_control(struct usb_hcd *hcd, u16 typeReq, u16 wValue,
                         break;
                 case USB_PORT_FEAT_C_SUSPEND:
                         bus_state->port_c_suspend &= ~(1 << wIndex);
+                        /* fall through */
                 case USB_PORT_FEAT_C_RESET:
                 case USB_PORT_FEAT_C_BH_PORT_RESET:
                 case USB_PORT_FEAT_C_CONNECTION:
diff --git a/drivers/usb/host/xhci-mem.c b/drivers/usb/host/xhci-mem.c
index 2a82c927ded2..e1fba4688509 100644
--- a/drivers/usb/host/xhci-mem.c
+++ b/drivers/usb/host/xhci-mem.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * xHCI host controller driver
  *
@@ -5,19 +6,6 @@
  *
  * Author: Sarah Sharp
  * Some code borrowed from the Linux EHCI driver.
- *
- * 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.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
 #include <linux/usb.h>
@@ -28,6 +16,7 @@
 
 #include "xhci.h"
 #include "xhci-trace.h"
+#include "xhci-debugfs.h"
 
 /*
  * Allocates a generic ring segment from the ring pool, sets the dma address,
@@ -465,8 +454,6 @@ int xhci_ring_expansion(struct xhci_hcd *xhci, struct xhci_ring *ring,
         return 0;
 }
 
-#define CTX_SIZE(_hcc) (HCC_64BYTE_CONTEXT(_hcc) ? 64 : 32)
-
 static struct xhci_container_ctx *xhci_alloc_container_ctx(struct xhci_hcd *xhci,
                                                     int type, gfp_t flags)
 {
@@ -801,8 +788,8 @@ void xhci_free_stream_info(struct xhci_hcd *xhci,
 static void xhci_init_endpoint_timer(struct xhci_hcd *xhci,
                 struct xhci_virt_ep *ep)
 {
-        setup_timer(&ep->stop_cmd_timer, xhci_stop_endpoint_command_watchdog,
-                    (unsigned long)ep);
+        timer_setup(&ep->stop_cmd_timer, xhci_stop_endpoint_command_watchdog,
+                    0);
         ep->xhci = xhci;
 }
 
@@ -961,6 +948,7 @@ void xhci_free_virt_devices_depth_first(struct xhci_hcd *xhci, int slot_id)
                 }
         }
         /* we are now at a leaf device */
+        xhci_debugfs_remove_slot(xhci, slot_id);
         xhci_free_virt_device(xhci, slot_id);
 }
 
@@ -1311,6 +1299,7 @@ static unsigned int xhci_get_endpoint_interval(struct usb_device *udev,
                  * since it uses the same rules as low speed interrupt
                  * endpoints.
                  */
+                /* fall through */
 
         case USB_SPEED_LOW:
                 if (usb_endpoint_xfer_int(&ep->desc) ||
@@ -1496,7 +1485,6 @@ int xhci_endpoint_init(struct xhci_hcd *xhci,
         ep_ctx->tx_info = cpu_to_le32(EP_MAX_ESIT_PAYLOAD_LO(max_esit_payload) |
                                       EP_AVG_TRB_LENGTH(avg_trb_len));
 
-        /* FIXME Debug endpoint context */
         return 0;
 }
 
diff --git a/drivers/usb/host/xhci-mtk-sch.c b/drivers/usb/host/xhci-mtk-sch.c
index 6e7ddf6cafae..eea7360a18fc 100644
--- a/drivers/usb/host/xhci-mtk-sch.c
+++ b/drivers/usb/host/xhci-mtk-sch.c
@@ -1,18 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Copyright (c) 2015 MediaTek Inc.
  * Author:
  *  Zhigang.Wei <zhigang.wei@mediatek.com>
  *  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>
@@ -287,12 +278,13 @@ static bool need_bw_sch(struct usb_host_endpoint *ep,
 
 int xhci_mtk_sch_init(struct xhci_hcd_mtk *mtk)
 {
+        struct xhci_hcd *xhci = hcd_to_xhci(mtk->hcd);
         struct mu3h_sch_bw_info *sch_array;
         int num_usb_bus;
         int i;
 
         /* ss IN and OUT are separated */
-        num_usb_bus = mtk->num_u3_ports * 2 + mtk->num_u2_ports;
+        num_usb_bus = xhci->num_usb3_ports * 2 + xhci->num_usb2_ports;
 
         sch_array = kcalloc(num_usb_bus, sizeof(*sch_array), GFP_KERNEL);
         if (sch_array == NULL)
diff --git a/drivers/usb/host/xhci-mtk.c b/drivers/usb/host/xhci-mtk.c
index 8fb60657ed4f..b62a1d23244b 100644
--- a/drivers/usb/host/xhci-mtk.c
+++ b/drivers/usb/host/xhci-mtk.c
@@ -1,19 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * MediaTek xHCI Host Controller Driver
  *
  * Copyright (c) 2015 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>
@@ -43,6 +34,7 @@
 
 /* ip_pw_sts1 register */
 #define STS1_IP_SLEEP_STS       BIT(30)
+#define STS1_U3_MAC_RST BIT(16)
 #define STS1_XHCI_RST           BIT(11)
 #define STS1_SYS125_RST BIT(10)
 #define STS1_REF_RST            BIT(8)
@@ -91,6 +83,7 @@ static int xhci_mtk_host_enable(struct xhci_hcd_mtk *mtk)
 {
         struct mu3c_ippc_regs __iomem *ippc = mtk->ippc_regs;
         u32 value, check_val;
+        int u3_ports_disabed = 0;
         int ret;
         int i;
 
@@ -102,8 +95,13 @@ static int xhci_mtk_host_enable(struct xhci_hcd_mtk *mtk)
         value &= ~CTRL1_IP_HOST_PDN;
         writel(value, &ippc->ip_pw_ctr1);
 
-        /* power on and enable all u3 ports */
+        /* power on and enable u3 ports except skipped ones */
         for (i = 0; i < mtk->num_u3_ports; i++) {
+                if ((0x1 << i) & mtk->u3p_dis_msk) {
+                        u3_ports_disabed++;
+                        continue;
+                }
+
                 value = readl(&ippc->u3_ctrl_p[i]);
                 value &= ~(CTRL_U3_PORT_PDN | CTRL_U3_PORT_DIS);
                 value |= CTRL_U3_PORT_HOST_SEL;
@@ -125,6 +123,9 @@ static int xhci_mtk_host_enable(struct xhci_hcd_mtk *mtk)
         check_val = STS1_SYSPLL_STABLE | STS1_REF_RST |
                         STS1_SYS125_RST | STS1_XHCI_RST;
 
+        if (mtk->num_u3_ports > u3_ports_disabed)
+                check_val |= STS1_U3_MAC_RST;
+
         ret = readl_poll_timeout(&ippc->ip_pw_sts1, value,
                           (check_val == (value & check_val)), 100, 20000);
         if (ret) {
@@ -145,8 +146,11 @@ static int xhci_mtk_host_disable(struct xhci_hcd_mtk *mtk)
         if (!mtk->has_ippc)
                 return 0;
 
-        /* power down all u3 ports */
+        /* power down u3 ports except skipped ones */
         for (i = 0; i < mtk->num_u3_ports; i++) {
+                if ((0x1 << i) & mtk->u3p_dis_msk)
+                        continue;
+
                 value = readl(&ippc->u3_ctrl_p[i]);
                 value |= CTRL_U3_PORT_PDN;
                 writel(value, &ippc->u3_ctrl_p[i]);
@@ -208,6 +212,41 @@ static int xhci_mtk_ssusb_config(struct xhci_hcd_mtk *mtk)
         return xhci_mtk_host_enable(mtk);
 }
 
+/* ignore the error if the clock does not exist */
+static struct clk *optional_clk_get(struct device *dev, const char *id)
+{
+        struct clk *opt_clk;
+
+        opt_clk = devm_clk_get(dev, id);
+        /* ignore error number except EPROBE_DEFER */
+        if (IS_ERR(opt_clk) && (PTR_ERR(opt_clk) != -EPROBE_DEFER))
+                opt_clk = NULL;
+
+        return opt_clk;
+}
+
+static int xhci_mtk_clks_get(struct xhci_hcd_mtk *mtk)
+{
+        struct device *dev = mtk->dev;
+
+        mtk->sys_clk = devm_clk_get(dev, "sys_ck");
+        if (IS_ERR(mtk->sys_clk)) {
+                dev_err(dev, "fail to get sys_ck\n");
+                return PTR_ERR(mtk->sys_clk);
+        }
+
+        mtk->ref_clk = optional_clk_get(dev, "ref_ck");
+        if (IS_ERR(mtk->ref_clk))
+                return PTR_ERR(mtk->ref_clk);
+
+        mtk->mcu_clk = optional_clk_get(dev, "mcu_ck");
+        if (IS_ERR(mtk->mcu_clk))
+                return PTR_ERR(mtk->mcu_clk);
+
+        mtk->dma_clk = optional_clk_get(dev, "dma_ck");
+        return PTR_ERR_OR_ZERO(mtk->dma_clk);
+}
+
 static int xhci_mtk_clks_enable(struct xhci_hcd_mtk *mtk)
 {
         int ret;
@@ -224,37 +263,34 @@ static int xhci_mtk_clks_enable(struct xhci_hcd_mtk *mtk)
                 goto sys_clk_err;
         }
 
-        if (mtk->wakeup_src) {
-                ret = clk_prepare_enable(mtk->wk_deb_p0);
-                if (ret) {
-                        dev_err(mtk->dev, "failed to enable wk_deb_p0\n");
-                        goto usb_p0_err;
-                }
+        ret = clk_prepare_enable(mtk->mcu_clk);
+        if (ret) {
+                dev_err(mtk->dev, "failed to enable mcu_clk\n");
+                goto mcu_clk_err;
+        }
 
-                ret = clk_prepare_enable(mtk->wk_deb_p1);
-                if (ret) {
-                        dev_err(mtk->dev, "failed to enable wk_deb_p1\n");
-                        goto usb_p1_err;
-                }
+        ret = clk_prepare_enable(mtk->dma_clk);
+        if (ret) {
+                dev_err(mtk->dev, "failed to enable dma_clk\n");
+                goto dma_clk_err;
         }
+
         return 0;
 
-usb_p1_err:
-        clk_disable_unprepare(mtk->wk_deb_p0);
-usb_p0_err:
+dma_clk_err:
+        clk_disable_unprepare(mtk->mcu_clk);
+mcu_clk_err:
         clk_disable_unprepare(mtk->sys_clk);
 sys_clk_err:
         clk_disable_unprepare(mtk->ref_clk);
 ref_clk_err:
-        return -EINVAL;
+        return ret;
 }
 
 static void xhci_mtk_clks_disable(struct xhci_hcd_mtk *mtk)
 {
-        if (mtk->wakeup_src) {
-                clk_disable_unprepare(mtk->wk_deb_p1);
-                clk_disable_unprepare(mtk->wk_deb_p0);
-        }
+        clk_disable_unprepare(mtk->dma_clk);
+        clk_disable_unprepare(mtk->mcu_clk);
         clk_disable_unprepare(mtk->sys_clk);
         clk_disable_unprepare(mtk->ref_clk);
 }
@@ -358,18 +394,6 @@ static int usb_wakeup_of_property_parse(struct xhci_hcd_mtk *mtk,
         if (!mtk->wakeup_src)
                 return 0;
 
-        mtk->wk_deb_p0 = devm_clk_get(dev, "wakeup_deb_p0");
-        if (IS_ERR(mtk->wk_deb_p0)) {
-                dev_err(dev, "fail to get wakeup_deb_p0\n");
-                return PTR_ERR(mtk->wk_deb_p0);
-        }
-
-        mtk->wk_deb_p1 = devm_clk_get(dev, "wakeup_deb_p1");
-        if (IS_ERR(mtk->wk_deb_p1)) {
-                dev_err(dev, "fail to get wakeup_deb_p1\n");
-                return PTR_ERR(mtk->wk_deb_p1);
-        }
-
         mtk->pericfg = syscon_regmap_lookup_by_phandle(dn,
                                                 "mediatek,syscon-wakeup");
         if (IS_ERR(mtk->pericfg)) {
@@ -492,7 +516,6 @@ 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;
 
@@ -507,8 +530,6 @@ static int xhci_mtk_setup(struct usb_hcd *hcd)
                 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;
@@ -552,26 +573,14 @@ static int xhci_mtk_probe(struct platform_device *pdev)
                 return PTR_ERR(mtk->vusb33);
         }
 
-        mtk->sys_clk = devm_clk_get(dev, "sys_ck");
-        if (IS_ERR(mtk->sys_clk)) {
-                dev_err(dev, "fail to get sys_ck\n");
-                return PTR_ERR(mtk->sys_clk);
-        }
-
-        /*
-         * reference clock is usually a "fixed-clock", make it optional
-         * for backward compatibility and ignore the error if it does
-         * not exist.
-         */
-        mtk->ref_clk = devm_clk_get(dev, "ref_ck");
-        if (IS_ERR(mtk->ref_clk)) {
-                if (PTR_ERR(mtk->ref_clk) == -EPROBE_DEFER)
-                        return -EPROBE_DEFER;
-
-                mtk->ref_clk = NULL;
-        }
+        ret = xhci_mtk_clks_get(mtk);
+        if (ret)
+                return ret;
 
         mtk->lpm_support = of_property_read_bool(node, "usb3-lpm-capable");
+        /* optional property, ignore the error if it does not exist */
+        of_property_read_u32(node, "mediatek,u3p-dis-msk",
+                             &mtk->u3p_dis_msk);
 
         ret = usb_wakeup_of_property_parse(mtk, node);
         if (ret)
@@ -606,15 +615,10 @@ static int xhci_mtk_probe(struct platform_device *pdev)
         }
 
         /* Initialize dma_mask and coherent_dma_mask to 32-bits */
-        ret = dma_set_coherent_mask(dev, DMA_BIT_MASK(32));
+        ret = dma_set_mask_and_coherent(dev, DMA_BIT_MASK(32));
         if (ret)
                 goto disable_clk;
 
-        if (!dev->dma_mask)
-                dev->dma_mask = &dev->coherent_dma_mask;
-        else
-                dma_set_mask(dev, DMA_BIT_MASK(32));
-
         hcd = usb_create_hcd(driver, dev, dev_name(dev));
         if (!hcd) {
                 ret = -ENOMEM;
diff --git a/drivers/usb/host/xhci-mtk.h b/drivers/usb/host/xhci-mtk.h
index 3aa5e1d25064..6b74ce5b7564 100644
--- a/drivers/usb/host/xhci-mtk.h
+++ b/drivers/usb/host/xhci-mtk.h
@@ -1,18 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Copyright (c) 2015 MediaTek Inc.
  * Author:
  *  Zhigang.Wei <zhigang.wei@mediatek.com>
  *  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 _XHCI_MTK_H_
@@ -121,12 +112,13 @@ struct xhci_hcd_mtk {
         bool has_ippc;
         int num_u2_ports;
         int num_u3_ports;
+        int u3p_dis_msk;
         struct regulator *vusb33;
         struct regulator *vbus;
         struct clk *sys_clk;    /* sys and mac clock */
         struct clk *ref_clk;
-        struct clk *wk_deb_p0;  /* port0's wakeup debounce clock */
-        struct clk *wk_deb_p1;
+        struct clk *mcu_clk;
+        struct clk *dma_clk;
         struct regmap *pericfg;
         struct phy **phys;
         int num_phys;
diff --git a/drivers/usb/host/xhci-mvebu.c b/drivers/usb/host/xhci-mvebu.c
index 85908a3ecb8f..32e158568788 100644
--- a/drivers/usb/host/xhci-mvebu.c
+++ b/drivers/usb/host/xhci-mvebu.c
@@ -1,10 +1,7 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Copyright (C) 2014 Marvell
  * Author: Gregory CLEMENT <gregory.clement@free-electrons.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/io.h>
diff --git a/drivers/usb/host/xhci-mvebu.h b/drivers/usb/host/xhci-mvebu.h
index 301fc984cae6..09791df2cec0 100644
--- a/drivers/usb/host/xhci-mvebu.h
+++ b/drivers/usb/host/xhci-mvebu.h
@@ -1,11 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Copyright (C) 2014 Marvell
  *
  * Gregory Clement <gregory.clement@free-electrons.com>
- *
- * This file is licensed under the terms of the GNU General Public
- * License version 2.  This program is licensed "as is" without any
- * warranty of any kind, whether express or implied.
  */
 
 #ifndef __LINUX_XHCI_MVEBU_H
diff --git a/drivers/usb/host/xhci-pci.c b/drivers/usb/host/xhci-pci.c
index 76f392954733..7ef1274ef7f7 100644
--- a/drivers/usb/host/xhci-pci.c
+++ b/drivers/usb/host/xhci-pci.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * xHCI host controller driver PCI Bus Glue.
  *
@@ -5,19 +6,6 @@
  *
  * Author: Sarah Sharp
  * Some code borrowed from the Linux EHCI driver.
- *
- * 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.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
 #include <linux/pci.h>
diff --git a/drivers/usb/host/xhci-plat.c b/drivers/usb/host/xhci-plat.c
index 1cb6eaef4ae1..09f164f8cf8c 100644
--- a/drivers/usb/host/xhci-plat.c
+++ b/drivers/usb/host/xhci-plat.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * xhci-plat.c - xHCI host controller driver platform Bus Glue.
  *
@@ -5,10 +6,6 @@
  * Author: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
  *
  * A lot of code borrowed from the Linux xHCI driver.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * version 2 as published by the Free Software Foundation.
  */
 
 #include <linux/clk.h>
@@ -16,6 +13,7 @@
 #include <linux/module.h>
 #include <linux/pci.h>
 #include <linux/of.h>
+#include <linux/of_device.h>
 #include <linux/platform_device.h>
 #include <linux/usb/phy.h>
 #include <linux/slab.h>
@@ -152,7 +150,7 @@ MODULE_DEVICE_TABLE(of, usb_xhci_of_match);
 
 static int xhci_plat_probe(struct platform_device *pdev)
 {
-        const struct of_device_id *match;
+        const struct xhci_plat_priv *priv_match;
         const struct hc_driver  *driver;
         struct device           *sysdev;
         struct xhci_hcd         *xhci;
@@ -242,9 +240,8 @@ static int xhci_plat_probe(struct platform_device *pdev)
         }
 
         xhci = hcd_to_xhci(hcd);
-        match = of_match_node(usb_xhci_of_match, pdev->dev.of_node);
-        if (match) {
-                const struct xhci_plat_priv *priv_match = match->data;
+        priv_match = of_device_get_match_data(&pdev->dev);
+        if (priv_match) {
                 struct xhci_plat_priv *priv = hcd_to_xhci_priv(hcd);
 
                 /* Just copy data for now */
@@ -263,6 +260,9 @@ static int xhci_plat_probe(struct platform_device *pdev)
                 goto disable_clk;
         }
 
+        if (device_property_read_bool(sysdev, "usb2-lpm-disable"))
+                xhci->quirks |= XHCI_HW_LPM_DISABLE;
+
         if (device_property_read_bool(sysdev, "usb3-lpm-capable"))
                 xhci->quirks |= XHCI_LPM_SUPPORT;
 
diff --git a/drivers/usb/host/xhci-plat.h b/drivers/usb/host/xhci-plat.h
index 29b227895b07..ae29f22ff5bd 100644
--- a/drivers/usb/host/xhci-plat.h
+++ b/drivers/usb/host/xhci-plat.h
@@ -1,11 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * xhci-plat.h - xHCI host controller driver platform Bus Glue.
  *
  * Copyright (C) 2015 Renesas Electronics Corporation
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * version 2 as published by the Free Software Foundation.
  */
 
 #ifndef _XHCI_PLAT_H
diff --git a/drivers/usb/host/xhci-rcar.c b/drivers/usb/host/xhci-rcar.c
index 198bc188ab25..f0b559660007 100644
--- a/drivers/usb/host/xhci-rcar.c
+++ b/drivers/usb/host/xhci-rcar.c
@@ -1,11 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * xHCI host controller driver for R-Car SoCs
  *
  * Copyright (C) 2014 Renesas Electronics Corporation
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * version 2 as published by the Free Software Foundation.
  */
 
 #include <linux/firmware.h>
diff --git a/drivers/usb/host/xhci-rcar.h b/drivers/usb/host/xhci-rcar.h
index d247951147a1..804b6ab4246f 100644
--- a/drivers/usb/host/xhci-rcar.h
+++ b/drivers/usb/host/xhci-rcar.h
@@ -1,11 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * drivers/usb/host/xhci-rcar.h
  *
  * Copyright (C) 2014 Renesas Electronics Corporation
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * version 2 as published by the Free Software Foundation.
  */
 
 #ifndef _XHCI_RCAR_H
diff --git a/drivers/usb/host/xhci-ring.c b/drivers/usb/host/xhci-ring.c
index 82c746e2d85c..c239c688076c 100644
--- a/drivers/usb/host/xhci-ring.c
+++ b/drivers/usb/host/xhci-ring.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * xHCI host controller driver
  *
@@ -5,19 +6,6 @@
  *
  * Author: Sarah Sharp
  * Some code borrowed from the Linux EHCI driver.
- *
- * 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.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
 /*
@@ -171,13 +159,13 @@ static void inc_deq(struct xhci_hcd *xhci, struct xhci_ring *ring)
         if (ring->type == TYPE_EVENT) {
                 if (!last_trb_on_seg(ring->deq_seg, ring->dequeue)) {
                         ring->dequeue++;
-                        return;
+                        goto out;
                 }
                 if (last_trb_on_ring(ring, ring->deq_seg, ring->dequeue))
                         ring->cycle_state ^= 1;
                 ring->deq_seg = ring->deq_seg->next;
                 ring->dequeue = ring->deq_seg->trbs;
-                return;
+                goto out;
         }
 
         /* All other rings have link trbs */
@@ -190,6 +178,7 @@ static void inc_deq(struct xhci_hcd *xhci, struct xhci_ring *ring)
                 ring->dequeue = ring->deq_seg->trbs;
         }
 
+out:
         trace_xhci_inc_deq(ring);
 
         return;
@@ -946,15 +935,12 @@ void xhci_hc_died(struct xhci_hcd *xhci)
  * Instead we use a combination of that flag and checking if a new timer is
  * pending.
  */
-void xhci_stop_endpoint_command_watchdog(unsigned long arg)
+void xhci_stop_endpoint_command_watchdog(struct timer_list *t)
 {
-        struct xhci_hcd *xhci;
-        struct xhci_virt_ep *ep;
+        struct xhci_virt_ep *ep = from_timer(ep, t, stop_cmd_timer);
+        struct xhci_hcd *xhci = ep->xhci;
         unsigned long flags;
 
-        ep = (struct xhci_virt_ep *) arg;
-        xhci = ep->xhci;
-
         spin_lock_irqsave(&xhci->lock, flags);
 
         /* bail out if cmd completed but raced with stop ep watchdog timer.*/
@@ -1680,9 +1666,14 @@ static void handle_port_status(struct xhci_hcd *xhci,
                         bus_state->resume_done[faked_port_index] = jiffies +
                                 msecs_to_jiffies(USB_RESUME_TIMEOUT);
                         set_bit(faked_port_index, &bus_state->resuming_ports);
+                        /* Do the rest in GetPortStatus after resume time delay.
+                         * Avoid polling roothub status before that so that a
+                         * usb device auto-resume latency around ~40ms.
+                         */
+                        set_bit(HCD_FLAG_POLL_RH, &hcd->flags);
                         mod_timer(&hcd->rh_timer,
                                   bus_state->resume_done[faked_port_index]);
-                        /* Do the rest in GetPortStatus */
+                        bogus_port_status = true;
                 }
         }
 
diff --git a/drivers/usb/host/xhci-tegra.c b/drivers/usb/host/xhci-tegra.c
index 74436f8ca538..2c076ea80522 100644
--- a/drivers/usb/host/xhci-tegra.c
+++ b/drivers/usb/host/xhci-tegra.c
@@ -1,12 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * NVIDIA Tegra xHCI host controller driver
  *
  * Copyright (C) 2014 NVIDIA Corporation
  * Copyright (C) 2014 Google, Inc.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms and conditions of the GNU General Public License,
- * version 2, as published by the Free Software Foundation.
  */
 
 #include <linux/clk.h>
@@ -771,7 +768,7 @@ static int tegra_xusb_load_firmware(struct tegra_xusb *tegra)
         struct device *dev = tegra->dev;
         const struct firmware *fw;
         unsigned long timeout;
-        time_t timestamp;
+        time64_t timestamp;
         struct tm time;
         u64 address;
         u32 value;
@@ -877,7 +874,7 @@ static int tegra_xusb_load_firmware(struct tegra_xusb *tegra)
         }
 
         timestamp = le32_to_cpu(header->fwimg_created_time);
-        time_to_tm(timestamp, 0, &time);
+        time64_to_tm(timestamp, 0, &time);
 
         dev_info(dev, "Firmware timestamp: %ld-%02d-%02d %02d:%02d:%02d UTC\n",
                  time.tm_year + 1900, time.tm_mon + 1, time.tm_mday,
diff --git a/drivers/usb/host/xhci-trace.c b/drivers/usb/host/xhci-trace.c
index 367b630bdb3c..d0070814d1ea 100644
--- a/drivers/usb/host/xhci-trace.c
+++ b/drivers/usb/host/xhci-trace.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * xHCI host controller driver
  *
@@ -5,10 +6,6 @@
  *
  * Author: Xenia Ragiadakou
  * Email : burzalodowa@gmail.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.
  */
 
 #define CREATE_TRACE_POINTS
diff --git a/drivers/usb/host/xhci-trace.h b/drivers/usb/host/xhci-trace.h
index f20753b99624..a3b57c781db1 100644
--- a/drivers/usb/host/xhci-trace.h
+++ b/drivers/usb/host/xhci-trace.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * xHCI host controller driver
  *
@@ -5,10 +6,6 @@
  *
  * Author: Xenia Ragiadakou
  * Email : burzalodowa@gmail.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.
  */
 
 #undef TRACE_SYSTEM
@@ -388,6 +385,11 @@ DEFINE_EVENT(xhci_log_slot_ctx, xhci_handle_cmd_set_deq,
         TP_ARGS(ctx)
 );
 
+DEFINE_EVENT(xhci_log_slot_ctx, xhci_configure_endpoint,
+        TP_PROTO(struct xhci_slot_ctx *ctx),
+        TP_ARGS(ctx)
+);
+
 DECLARE_EVENT_CLASS(xhci_log_ring,
         TP_PROTO(struct xhci_ring *ring),
         TP_ARGS(ring),
diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c
index 51535ba2bcd4..327ba8b8a98b 100644
--- a/drivers/usb/host/xhci.c
+++ b/drivers/usb/host/xhci.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * xHCI host controller driver
  *
@@ -5,19 +6,6 @@
  *
  * Author: Sarah Sharp
  * Some code borrowed from the Linux EHCI driver.
- *
- * 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.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
 #include <linux/pci.h>
@@ -32,6 +20,7 @@
 #include "xhci.h"
 #include "xhci-trace.h"
 #include "xhci-mtk.h"
+#include "xhci-debugfs.h"
 
 #define DRIVER_AUTHOR "Sarah Sharp"
 #define DRIVER_DESC "'eXtensible' Host Controller (xHC) Driver"
@@ -632,6 +621,9 @@ int xhci_run(struct usb_hcd *hcd)
         }
         xhci_dbg_trace(xhci, trace_xhci_dbg_init,
                         "Finished xhci_run for USB2 roothub");
+
+        xhci_debugfs_init(xhci);
+
         return 0;
 }
 EXPORT_SYMBOL_GPL(xhci_run);
@@ -660,6 +652,8 @@ static void xhci_stop(struct usb_hcd *hcd)
                 return;
         }
 
+        xhci_debugfs_exit(xhci);
+
         spin_lock_irq(&xhci->lock);
         xhci->xhc_state |= XHCI_STATE_HALTED;
         xhci->cmd_ring_state = CMD_RING_STATE_STOPPED;
@@ -1600,6 +1594,8 @@ static int xhci_drop_endpoint(struct usb_hcd *hcd, struct usb_device *udev,
         ctrl_ctx->add_flags &= cpu_to_le32(~drop_flag);
         new_add_flags = le32_to_cpu(ctrl_ctx->add_flags);
 
+        xhci_debugfs_remove_endpoint(xhci, xhci->devs[udev->slot_id], ep_index);
+
         xhci_endpoint_zero(xhci, xhci->devs[udev->slot_id], ep);
 
         if (xhci->quirks & XHCI_MTK_HOST)
@@ -1723,6 +1719,8 @@ static int xhci_add_endpoint(struct usb_hcd *hcd, struct usb_device *udev,
         /* Store the usb_device pointer for later use */
         ep->hcpriv = udev;
 
+        xhci_debugfs_create_endpoint(xhci, virt_dev, ep_index);
+
         xhci_dbg(xhci, "add ep 0x%x, slot id %d, new drop flags = %#x, new add flags = %#x\n",
                         (unsigned int) ep->desc.bEndpointAddress,
                         udev->slot_id,
@@ -2555,6 +2553,7 @@ static int xhci_configure_endpoint(struct xhci_hcd *xhci,
         unsigned long flags;
         struct xhci_input_control_ctx *ctrl_ctx;
         struct xhci_virt_device *virt_dev;
+        struct xhci_slot_ctx *slot_ctx;
 
         if (!command)
                 return -EINVAL;
@@ -2593,6 +2592,9 @@ static int xhci_configure_endpoint(struct xhci_hcd *xhci,
                 return -ENOMEM;
         }
 
+        slot_ctx = xhci_get_slot_ctx(xhci, command->in_ctx);
+        trace_xhci_configure_endpoint(slot_ctx);
+
         if (!ctx_change)
                 ret = xhci_queue_configure_endpoint(xhci, command,
                                 command->in_ctx->dma,
@@ -2773,6 +2775,7 @@ static void xhci_reset_bandwidth(struct usb_hcd *hcd, struct usb_device *udev)
         /* Free any rings allocated for added endpoints */
         for (i = 0; i < 31; i++) {
                 if (virt_dev->eps[i].new_ring) {
+                        xhci_debugfs_remove_endpoint(xhci, virt_dev, i);
                         xhci_ring_free(xhci, virt_dev->eps[i].new_ring);
                         virt_dev->eps[i].new_ring = NULL;
                 }
@@ -3488,6 +3491,7 @@ static int xhci_discover_or_reset_device(struct usb_hcd *hcd,
                 }
 
                 if (ep->ring) {
+                        xhci_debugfs_remove_endpoint(xhci, virt_dev, i);
                         xhci_free_endpoint_ring(xhci, virt_dev, i);
                         last_freed_endpoint = i;
                 }
@@ -3520,11 +3524,8 @@ static void xhci_free_dev(struct usb_hcd *hcd, struct usb_device *udev)
         struct xhci_virt_device *virt_dev;
         struct xhci_slot_ctx *slot_ctx;
         int i, ret;
-        struct xhci_command *command;
 
-        command = xhci_alloc_command(xhci, false, false, GFP_KERNEL);
-        if (!command)
-                return;
+        xhci_debugfs_remove_slot(xhci, udev->slot_id);
 
 #ifndef CONFIG_USB_DEFAULT_PERSIST
         /*
@@ -3540,10 +3541,8 @@ static void xhci_free_dev(struct usb_hcd *hcd, struct usb_device *udev)
         /* If the host is halted due to driver unload, we still need to free the
          * device.
          */
-        if (ret <= 0 && ret != -ENODEV) {
-                kfree(command);
+        if (ret <= 0 && ret != -ENODEV)
                 return;
-        }
 
         virt_dev = xhci->devs[udev->slot_id];
         slot_ctx = xhci_get_slot_ctx(xhci, virt_dev->out_ctx);
@@ -3555,26 +3554,19 @@ static void xhci_free_dev(struct usb_hcd *hcd, struct usb_device *udev)
                 del_timer_sync(&virt_dev->eps[i].stop_cmd_timer);
         }
 
-        xhci_disable_slot(xhci, command, udev->slot_id);
-        /*
-         * Event command completion handler will free any data structures
-         * associated with the slot.  XXX Can free sleep?
-         */
+        ret = xhci_disable_slot(xhci, udev->slot_id);
+        if (ret)
+                xhci_free_virt_device(xhci, udev->slot_id);
 }
 
-int xhci_disable_slot(struct xhci_hcd *xhci, struct xhci_command *command,
-                        u32 slot_id)
+int xhci_disable_slot(struct xhci_hcd *xhci, u32 slot_id)
 {
+        struct xhci_command *command;
         unsigned long flags;
         u32 state;
         int ret = 0;
-        struct xhci_virt_device *virt_dev;
 
-        virt_dev = xhci->devs[slot_id];
-        if (!virt_dev)
-                return -EINVAL;
-        if (!command)
-                command = xhci_alloc_command(xhci, false, false, GFP_KERNEL);
+        command = xhci_alloc_command(xhci, false, false, GFP_KERNEL);
         if (!command)
                 return -ENOMEM;
 
@@ -3583,17 +3575,16 @@ int xhci_disable_slot(struct xhci_hcd *xhci, struct xhci_command *command,
         state = readl(&xhci->op_regs->status);
         if (state == 0xffffffff || (xhci->xhc_state & XHCI_STATE_DYING) ||
                         (xhci->xhc_state & XHCI_STATE_HALTED)) {
-                xhci_free_virt_device(xhci, slot_id);
                 spin_unlock_irqrestore(&xhci->lock, flags);
                 kfree(command);
-                return ret;
+                return -ENODEV;
         }
 
         ret = xhci_queue_slot_control(xhci, command, TRB_DISABLE_SLOT,
                                 slot_id);
         if (ret) {
                 spin_unlock_irqrestore(&xhci->lock, flags);
-                xhci_dbg(xhci, "FIXME: allocate a command ring segment\n");
+                kfree(command);
                 return ret;
         }
         xhci_ring_cmd_db(xhci);
@@ -3641,13 +3632,10 @@ int xhci_alloc_dev(struct usb_hcd *hcd, struct usb_device *udev)
         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);
         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");
                 xhci_free_command(xhci, command);
                 return 0;
@@ -3657,7 +3645,6 @@ int xhci_alloc_dev(struct usb_hcd *hcd, struct usb_device *udev)
 
         wait_for_completion(command->completion);
         slot_id = command->slot_id;
-        mutex_unlock(&xhci->mutex);
 
         if (!slot_id || command->status != COMP_SUCCESS) {
                 xhci_err(xhci, "Error while assigning device slot ID\n");
@@ -3668,6 +3655,8 @@ int xhci_alloc_dev(struct usb_hcd *hcd, struct usb_device *udev)
                 return 0;
         }
 
+        xhci_free_command(xhci, command);
+
         if ((xhci->quirks & XHCI_EP_LIMIT_QUIRK)) {
                 spin_lock_irqsave(&xhci->lock, flags);
                 ret = xhci_reserve_host_control_ep_resources(xhci);
@@ -3694,6 +3683,8 @@ int xhci_alloc_dev(struct usb_hcd *hcd, struct usb_device *udev)
 
         udev->slot_id = slot_id;
 
+        xhci_debugfs_create_slot(xhci, slot_id);
+
 #ifndef CONFIG_USB_DEFAULT_PERSIST
         /*
          * If resetting upon resume, we can't put the controller into runtime
@@ -3703,18 +3694,16 @@ int xhci_alloc_dev(struct usb_hcd *hcd, struct usb_device *udev)
                 pm_runtime_get_noresume(hcd->self.controller);
 #endif
 
-
-        xhci_free_command(xhci, command);
         /* Is this a LS or FS device under a HS hub? */
         /* Hub or peripherial? */
         return 1;
 
 disable_slot:
-        /* Disable slot, if we can do it without mem alloc */
-        kfree(command->completion);
-        command->completion = NULL;
-        command->status = 0;
-        return xhci_disable_slot(xhci, command, udev->slot_id);
+        ret = xhci_disable_slot(xhci, udev->slot_id);
+        if (ret)
+                xhci_free_virt_device(xhci, udev->slot_id);
+
+        return 0;
 }
 
 /*
@@ -3838,8 +3827,14 @@ static int xhci_setup_device(struct usb_hcd *hcd, struct usb_device *udev,
                 break;
         case COMP_USB_TRANSACTION_ERROR:
                 dev_warn(&udev->dev, "Device not responding to setup %s.\n", act);
-                ret = -EPROTO;
-                break;
+
+                mutex_unlock(&xhci->mutex);
+                ret = xhci_disable_slot(xhci, udev->slot_id);
+                if (!ret)
+                        xhci_alloc_dev(hcd, udev);
+                kfree(command->completion);
+                kfree(command);
+                return -EPROTO;
         case COMP_INCOMPATIBLE_DEVICE_ERROR:
                 dev_warn(&udev->dev,
                          "ERROR: Incompatible device for setup %s command\n", act);
@@ -4088,7 +4083,7 @@ static int xhci_set_usb2_hardware_lpm(struct usb_hcd *hcd,
         xhci_dbg(xhci, "%s port %d USB2 hardware LPM\n",
                         enable ? "enable" : "disable", port_num + 1);
 
-        if (enable) {
+        if (enable && !(xhci->quirks & XHCI_HW_LPM_DISABLE)) {
                 /* Host supports BESL timeout instead of HIRD */
                 if (udev->usb2_hw_lpm_besl_capable) {
                         /* if device doesn't have a preferred BESL value use a
@@ -4287,6 +4282,7 @@ static unsigned long long xhci_calculate_intel_u1_timeout(
                         break;
                 }
                 /* Otherwise the calculation is the same as isoc eps */
+                /* fall through */
         case USB_ENDPOINT_XFER_ISOC:
                 timeout_ns = xhci_service_interval_to_ns(desc);
                 timeout_ns = DIV_ROUND_UP_ULL(timeout_ns * 105, 100);
@@ -5005,6 +5001,8 @@ static int __init xhci_hcd_init(void)
         if (usb_disabled())
                 return -ENODEV;
 
+        xhci_debugfs_create_root();
+
         return 0;
 }
 
@@ -5012,7 +5010,10 @@ static int __init xhci_hcd_init(void)
  * If an init function is provided, an exit function must also be provided
  * to allow module unload.
  */
-static void __exit xhci_hcd_fini(void) { }
+static void __exit xhci_hcd_fini(void)
+{
+        xhci_debugfs_remove_root();
+}
 
 module_init(xhci_hcd_init);
 module_exit(xhci_hcd_fini);
diff --git a/drivers/usb/host/xhci.h b/drivers/usb/host/xhci.h
index 2b48aa4f6b76..99a014a920d3 100644
--- a/drivers/usb/host/xhci.h
+++ b/drivers/usb/host/xhci.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 
 /*
  * xHCI host controller driver
@@ -6,19 +7,6 @@
  *
  * Author: Sarah Sharp
  * Some code borrowed from the Linux EHCI driver.
- *
- * 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.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
 #ifndef __LINUX_XHCI_HCD_H
@@ -131,6 +119,8 @@ struct xhci_cap_regs {
 /* Extended Capabilities pointer from PCI base - section 5.3.6 */
 #define HCC_EXT_CAPS(p)         XHCI_HCC_EXT_CAPS(p)
 
+#define CTX_SIZE(_hcc)          (HCC_64BYTE_CONTEXT(_hcc) ? 64 : 32)
+
 /* db_off bitmask - bits 0:1 reserved */
 #define DBOFF_MASK      (~0x3)
 
@@ -1007,6 +997,8 @@ struct xhci_virt_device {
         struct xhci_tt_bw_info          *tt_info;
         /* The current max exit latency for the enabled USB3 link states. */
         u16                             current_mel;
+        /* Used for the debugfs interfaces. */
+        void                            *debugfs_private;
 };
 
 /*
@@ -1830,6 +1822,7 @@ struct xhci_hcd {
 #define XHCI_LIMIT_ENDPOINT_INTERVAL_7  (1 << 26)
 /* Reserved. It was XHCI_U2_DISABLE_WAKE */
 #define XHCI_ASMEDIA_MODIFY_FLOWCONTROL (1 << 28)
+#define XHCI_HW_LPM_DISABLE     (1 << 29)
 
         unsigned int            num_active_eps;
         unsigned int            limit_active_eps;
@@ -1859,6 +1852,10 @@ struct xhci_hcd {
 /* Compliance Mode Timer Triggered every 2 seconds */
 #define COMP_MODE_RCVRY_MSECS 2000
 
+        struct dentry           *debugfs_root;
+        struct dentry           *debugfs_slots;
+        struct list_head        regset_list;
+
         /* platform-specific data -- must come last */
         unsigned long           priv[0] __aligned(sizeof(s64));
 };
@@ -2012,8 +2009,7 @@ int xhci_run(struct usb_hcd *hcd);
 int xhci_gen_setup(struct usb_hcd *hcd, xhci_get_quirks_t get_quirks);
 void xhci_init_driver(struct hc_driver *drv,
                       const struct xhci_driver_overrides *over);
-int xhci_disable_slot(struct xhci_hcd *xhci,
-                        struct xhci_command *command, u32 slot_id);
+int xhci_disable_slot(struct xhci_hcd *xhci, u32 slot_id);
 
 int xhci_suspend(struct xhci_hcd *xhci, bool do_wakeup);
 int xhci_resume(struct xhci_hcd *xhci, bool hibernated);
@@ -2068,7 +2064,7 @@ void xhci_queue_new_dequeue_state(struct xhci_hcd *xhci,
                 struct xhci_dequeue_state *deq_state);
 void xhci_cleanup_stalled_ring(struct xhci_hcd *xhci, unsigned int ep_index,
                 unsigned int stream_id, struct xhci_td *td);
-void xhci_stop_endpoint_command_watchdog(unsigned long arg);
+void xhci_stop_endpoint_command_watchdog(struct timer_list *t);
 void xhci_handle_command_timeout(struct work_struct *work);
 
 void xhci_ring_ep_doorbell(struct xhci_hcd *xhci, unsigned int slot_id,
@@ -2107,6 +2103,7 @@ struct xhci_ep_ctx *xhci_get_ep_ctx(struct xhci_hcd *xhci, struct xhci_container
 struct xhci_ring *xhci_triad_to_transfer_ring(struct xhci_hcd *xhci,
                 unsigned int slot_id, unsigned int ep_index,
                 unsigned int stream_id);
+
 static inline struct xhci_ring *xhci_urb_to_transfer_ring(struct xhci_hcd *xhci,
                                                                 struct urb *urb)
 {
@@ -2442,11 +2439,12 @@ static inline const char *xhci_decode_portsc(u32 portsc)
         static char str[256];
         int ret;
 
-        ret = sprintf(str, "%s %s %s Link:%s ",
+        ret = sprintf(str, "%s %s %s Link:%s PortSpeed:%d ",
                       portsc & PORT_POWER       ? "Powered" : "Powered-off",
                       portsc & PORT_CONNECT     ? "Connected" : "Not-connected",
                       portsc & PORT_PE          ? "Enabled" : "Disabled",
-                      xhci_portsc_link_state_string(portsc));
+                      xhci_portsc_link_state_string(portsc),
+                      DEV_PORT_SPEED(portsc));
 
         if (portsc & PORT_OC)
                 ret += sprintf(str + ret, "OverCurrent ");
diff --git a/drivers/usb/image/Makefile b/drivers/usb/image/Makefile
index 4148ae306352..8997c81ba86b 100644
--- a/drivers/usb/image/Makefile
+++ b/drivers/usb/image/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for USB Image drivers
 #
diff --git a/drivers/usb/image/mdc800.c b/drivers/usb/image/mdc800.c
index e92540a21b6b..2388674042a9 100644
--- a/drivers/usb/image/mdc800.c
+++ b/drivers/usb/image/mdc800.c
@@ -1,19 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * copyright (C) 1999/2000 by Henning Zabel <henning@uni-paderborn.de>
- *
- * 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.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
 
@@ -893,6 +880,7 @@ static ssize_t mdc800_device_write (struct file *file, const char __user *buf, s
                                                 return -EIO;
                                         }
                                         mdc800->pic_len=-1;
+                                        /* fall through */
 
                                 case 0x09: /* Download Thumbnail */
                                         mdc800->download_left=answersize+64;
diff --git a/drivers/usb/image/microtek.c b/drivers/usb/image/microtek.c
index 0b21ba757bba..9f2f563c82ed 100644
--- a/drivers/usb/image/microtek.c
+++ b/drivers/usb/image/microtek.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /* Driver for Microtek Scanmaker X6 USB scanner, and possibly others.
  *
  * (C) Copyright 2000 John Fremlin <vii@penguinpowered.com>
diff --git a/drivers/usb/isp1760/Makefile b/drivers/usb/isp1760/Makefile
index 2b741074ad2b..9bb09e8290c4 100644
--- a/drivers/usb/isp1760/Makefile
+++ b/drivers/usb/isp1760/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 isp1760-y := isp1760-core.o isp1760-if.o
 isp1760-$(CONFIG_USB_ISP1760_HCD) += isp1760-hcd.o
 isp1760-$(CONFIG_USB_ISP1761_UDC) += isp1760-udc.o
diff --git a/drivers/usb/isp1760/isp1760-core.c b/drivers/usb/isp1760/isp1760-core.c
index bfa402cf3a27..05d22589b5cc 100644
--- a/drivers/usb/isp1760/isp1760-core.c
+++ b/drivers/usb/isp1760/isp1760-core.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Driver for the NXP ISP1760 chip
  *
@@ -7,10 +8,6 @@
  * Contacts:
  *      Sebastian Siewior <bigeasy@linutronix.de>
  *      Laurent Pinchart <laurent.pinchart@ideasonboard.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/delay.h>
diff --git a/drivers/usb/isp1760/isp1760-core.h b/drivers/usb/isp1760/isp1760-core.h
index c70f8368a794..97cb4d7a3e1c 100644
--- a/drivers/usb/isp1760/isp1760-core.h
+++ b/drivers/usb/isp1760/isp1760-core.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Driver for the NXP ISP1760 chip
  *
@@ -7,10 +8,6 @@
  * Contacts:
  *      Sebastian Siewior <bigeasy@linutronix.de>
  *      Laurent Pinchart <laurent.pinchart@ideasonboard.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.
  */
 
 #ifndef _ISP1760_CORE_H_
diff --git a/drivers/usb/isp1760/isp1760-hcd.c b/drivers/usb/isp1760/isp1760-hcd.c
index bb4d6d959871..42672d6ec525 100644
--- a/drivers/usb/isp1760/isp1760-hcd.c
+++ b/drivers/usb/isp1760/isp1760-hcd.c
@@ -1259,10 +1259,11 @@ leave:
 #define SLOT_TIMEOUT 300
 #define SLOT_CHECK_PERIOD 200
 static struct timer_list errata2_timer;
+static struct usb_hcd *errata2_timer_hcd;
 
-static void errata2_function(unsigned long data)
+static void errata2_function(struct timer_list *unused)
 {
-        struct usb_hcd *hcd = (struct usb_hcd *) data;
+        struct usb_hcd *hcd = errata2_timer_hcd;
         struct isp1760_hcd *priv = hcd_to_priv(hcd);
         int slot;
         struct ptd ptd;
@@ -1334,7 +1335,8 @@ static int isp1760_run(struct usb_hcd *hcd)
         if (retval)
                 return retval;
 
-        setup_timer(&errata2_timer, errata2_function, (unsigned long)hcd);
+        errata2_timer_hcd = hcd;
+        timer_setup(&errata2_timer, errata2_function, 0);
         errata2_timer.expires = jiffies + msecs_to_jiffies(SLOT_CHECK_PERIOD);
         add_timer(&errata2_timer);
 
diff --git a/drivers/usb/isp1760/isp1760-regs.h b/drivers/usb/isp1760/isp1760-regs.h
index b67095c9a9d4..1f00c3850cf7 100644
--- a/drivers/usb/isp1760/isp1760-regs.h
+++ b/drivers/usb/isp1760/isp1760-regs.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Driver for the NXP ISP1760 chip
  *
@@ -7,10 +8,6 @@
  * Contacts:
  *     Sebastian Siewior <bigeasy@linutronix.de>
  *     Laurent Pinchart <laurent.pinchart@ideasonboard.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.
  */
 
 #ifndef _ISP1760_REGS_H_
diff --git a/drivers/usb/isp1760/isp1760-udc.c b/drivers/usb/isp1760/isp1760-udc.c
index 69400f3da886..bac4ef5d9512 100644
--- a/drivers/usb/isp1760/isp1760-udc.c
+++ b/drivers/usb/isp1760/isp1760-udc.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Driver for the NXP ISP1761 device controller
  *
@@ -5,10 +6,6 @@
  *
  * Contacts:
  *      Laurent Pinchart <laurent.pinchart@ideasonboard.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/interrupt.h>
@@ -1331,9 +1328,9 @@ static irqreturn_t isp1760_udc_irq(int irq, void *dev)
         return status ? IRQ_HANDLED : IRQ_NONE;
 }
 
-static void isp1760_udc_vbus_poll(unsigned long data)
+static void isp1760_udc_vbus_poll(struct timer_list *t)
 {
-        struct isp1760_udc *udc = (struct isp1760_udc *)data;
+        struct isp1760_udc *udc = from_timer(udc, t, vbus_timer);
         unsigned long flags;
 
         spin_lock_irqsave(&udc->lock, flags);
@@ -1452,8 +1449,7 @@ int isp1760_udc_register(struct isp1760_device *isp, int irq,
         udc->regs = isp->regs;
 
         spin_lock_init(&udc->lock);
-        setup_timer(&udc->vbus_timer, isp1760_udc_vbus_poll,
-                    (unsigned long)udc);
+        timer_setup(&udc->vbus_timer, isp1760_udc_vbus_poll, 0);
 
         ret = isp1760_udc_init(udc);
         if (ret < 0)
diff --git a/drivers/usb/isp1760/isp1760-udc.h b/drivers/usb/isp1760/isp1760-udc.h
index 26899ed81145..2d0b88747701 100644
--- a/drivers/usb/isp1760/isp1760-udc.h
+++ b/drivers/usb/isp1760/isp1760-udc.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Driver for the NXP ISP1761 device controller
  *
@@ -5,10 +6,6 @@
  *
  * Contacts:
  *      Laurent Pinchart <laurent.pinchart@ideasonboard.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.
  */
 
 #ifndef _ISP1760_UDC_H_
diff --git a/drivers/usb/misc/Kconfig b/drivers/usb/misc/Kconfig
index 0f9f25db9163..68d2f2cd17dd 100644
--- a/drivers/usb/misc/Kconfig
+++ b/drivers/usb/misc/Kconfig
@@ -238,8 +238,8 @@ config USB_HUB_USB251XB
         depends on I2C
         help
           This option enables support for configuration via SMBus of the
-          Microchip USB251xB/xBi USB 2.0 Hub Controller series.
-          Configuration parameters may be set in devicetree or platform data.
+          Microchip USB251x/xBi USB 2.0 Hub Controller series. Configuration
+          parameters may be set in devicetree or platform data.
           Say Y or M here if you need to configure such a device via SMBus.
 
 config USB_HSIC_USB3503
diff --git a/drivers/usb/misc/adutux.c b/drivers/usb/misc/adutux.c
index 1c0ada75c35d..4b8712733fc7 100644
--- a/drivers/usb/misc/adutux.c
+++ b/drivers/usb/misc/adutux.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * adutux - driver for ADU devices from Ontrak Control Systems
  * This is an experimental driver. Use at your own risk.
@@ -5,11 +6,6 @@
  *
  * Copyright (c) 2003 John Homppi (SCO, leave this notice here)
  *
- * 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.
- *
  * derived from the Lego USB Tower driver 0.56:
  * Copyright (c) 2003 David Glance <davidgsf@sourceforge.net>
  *               2001 Juergen Stuber <stuber@loria.fr>
@@ -761,13 +757,11 @@ error:
 static void adu_disconnect(struct usb_interface *interface)
 {
         struct adu_device *dev;
-        int minor;
 
         dev = usb_get_intfdata(interface);
 
         mutex_lock(&dev->mtx);  /* not interruptible */
         dev->udev = NULL;       /* poison */
-        minor = dev->minor;
         usb_deregister_dev(interface, &adu_class);
         mutex_unlock(&dev->mtx);
 
diff --git a/drivers/usb/misc/appledisplay.c b/drivers/usb/misc/appledisplay.c
index 8efdc500e790..b3eb8b989bd4 100644
--- a/drivers/usb/misc/appledisplay.c
+++ b/drivers/usb/misc/appledisplay.c
@@ -1,23 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Apple Cinema Display driver
  *
  * Copyright (C) 2006  Michael Hanselmann (linux-kernel@hansmi.ch)
  *
  * Thanks to Caskey L. Dickson for his work with acdctl.
- *
- * 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.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
 #include <linux/kernel.h>
diff --git a/drivers/usb/misc/chaoskey.c b/drivers/usb/misc/chaoskey.c
index abec6e604a62..b6a1b9331aa0 100644
--- a/drivers/usb/misc/chaoskey.c
+++ b/drivers/usb/misc/chaoskey.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * chaoskey - driver for ChaosKey device from Altus Metrum.
  *
@@ -11,15 +12,6 @@
  * bit stream.
  *
  * Copyright © 2015 Keith Packard <keithp@keithp.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
  */
 
 #include <linux/module.h>
diff --git a/drivers/usb/misc/cypress_cy7c63.c b/drivers/usb/misc/cypress_cy7c63.c
index 5c93a888c40e..bf4d2778907e 100644
--- a/drivers/usb/misc/cypress_cy7c63.c
+++ b/drivers/usb/misc/cypress_cy7c63.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
 * cypress_cy7c63.c
 *
@@ -23,10 +24,6 @@
 *
 *       For up-to-date information please visit:
 *       http://www.obock.de/kernel/cypress
-*
-*       This program is free software; you can redistribute it and/or
-*       modify it under the terms of the GNU General Public License as
-*       published by the Free Software Foundation, version 2.
 */
 
 #include <linux/module.h>
diff --git a/drivers/usb/misc/cytherm.c b/drivers/usb/misc/cytherm.c
index 63207c42acf6..66be86077292 100644
--- a/drivers/usb/misc/cytherm.c
+++ b/drivers/usb/misc/cytherm.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /* -*- linux-c -*-
  * Cypress USB Thermometer driver 
  * 
@@ -6,11 +7,6 @@
  * This driver works with Elektor magazine USB Interface as published in 
  * issue #291. It should also work with the original starter kit/demo board
  * from Cypress.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation, version 2.
- *
  */
 
 
diff --git a/drivers/usb/misc/ehset.c b/drivers/usb/misc/ehset.c
index c31b4a33e6bb..7895d61e733b 100644
--- a/drivers/usb/misc/ehset.c
+++ b/drivers/usb/misc/ehset.c
@@ -1,14 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Copyright (c) 2010-2013, The Linux Foundation. All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 and
- * only version 2 as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
  */
 
 #include <linux/kernel.h>
diff --git a/drivers/usb/misc/emi26.c b/drivers/usb/misc/emi26.c
index 8950fa5e973d..24d841850e05 100644
--- a/drivers/usb/misc/emi26.c
+++ b/drivers/usb/misc/emi26.c
@@ -1,12 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0
 /* 
  * Emagic EMI 2|6 usb audio interface firmware loader.
  * Copyright (C) 2002
  *      Tapio Laxström (tapio.laxstrom@iptime.fi)
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License, as published by
- * the Free Software Foundation, version 2.
- * 
  * emi26.c,v 1.13 2002/03/08 13:10:26 tapio Exp
  */
 #include <linux/kernel.h>
diff --git a/drivers/usb/misc/emi62.c b/drivers/usb/misc/emi62.c
index 1d9be4431b72..3eea60437f56 100644
--- a/drivers/usb/misc/emi62.c
+++ b/drivers/usb/misc/emi62.c
@@ -1,11 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0
 /* 
  * Emagic EMI 2|6 usb audio interface firmware loader.
  * Copyright (C) 2002
  *      Tapio Laxström (tapio.laxstrom@iptime.fi)
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License, as published by
- * the Free Software Foundation, version 2.
  */
 #include <linux/kernel.h>
 #include <linux/errno.h>
diff --git a/drivers/usb/misc/ezusb.c b/drivers/usb/misc/ezusb.c
index 837208f14f86..f058d8029761 100644
--- a/drivers/usb/misc/ezusb.c
+++ b/drivers/usb/misc/ezusb.c
@@ -1,11 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * EZ-USB specific functions used by some of the USB to Serial drivers.
  *
  * Copyright (C) 1999 - 2002 Greg Kroah-Hartman (greg@kroah.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/kernel.h>
diff --git a/drivers/usb/misc/ftdi-elan.c b/drivers/usb/misc/ftdi-elan.c
index 424ff12f3b51..76c718ac8c78 100644
--- a/drivers/usb/misc/ftdi-elan.c
+++ b/drivers/usb/misc/ftdi-elan.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * USB FTDI client driver for Elan Digital Systems's Uxxx adapters
  *
@@ -7,11 +8,6 @@
  * Author and Maintainer - Tony Olech - Elan Digital Systems
  * tony.olech@elandigitalsystems.com
  *
- * This program is free software;you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation, version 2.
- *
- *
  * This driver was written by Tony Olech(tony.olech@elandigitalsystems.com)
  * based on various USB client drivers in the 2.6.15 linux kernel
  * with constant reference to the 3rd Edition of Linux Device Drivers
diff --git a/drivers/usb/misc/idmouse.c b/drivers/usb/misc/idmouse.c
index 39d8fedfaf3b..20b0f91a5d9b 100644
--- a/drivers/usb/misc/idmouse.c
+++ b/drivers/usb/misc/idmouse.c
@@ -1,10 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+
 /* Siemens ID Mouse driver v0.6
 
-  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) 2004-5 by Florian 'Floe' Echtler  <echtler@fs.tum.de>
                       and Andreas  'ad'  Deresch <aderesch@fs.tum.de>
 
diff --git a/drivers/usb/misc/iowarrior.c b/drivers/usb/misc/iowarrior.c
index be5881303681..ad3109490c0f 100644
--- a/drivers/usb/misc/iowarrior.c
+++ b/drivers/usb/misc/iowarrior.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  Native support for the I/O-Warrior USB devices
  *
diff --git a/drivers/usb/misc/isight_firmware.c b/drivers/usb/misc/isight_firmware.c
index 1c61830e96f9..4d30095d6ad2 100644
--- a/drivers/usb/misc/isight_firmware.c
+++ b/drivers/usb/misc/isight_firmware.c
@@ -1,12 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Driver for loading USB isight firmware
  *
  * Copyright (C) 2008 Matthew Garrett <mjg@redhat.com>
  *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, version 2.
- *
  * The USB isight cameras in recent Apples are roughly compatible with the USB
  * video class specification, and can be driven by uvcvideo. However, they
  * need firmware to be loaded beforehand. After firmware loading, the device
diff --git a/drivers/usb/misc/ldusb.c b/drivers/usb/misc/ldusb.c
index 680bddb3ce05..5c1a3b852453 100644
--- a/drivers/usb/misc/ldusb.c
+++ b/drivers/usb/misc/ldusb.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0+
 /**
  * Generic USB driver for report based interrupt in/out devices
  * like LD Didactic's USB devices. LD Didactic's USB devices are
@@ -12,11 +13,6 @@
  *
  * Copyright (C) 2005 Michael Hund <mhund@ld-didactic.de>
  *
- *      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.
- *
  * Derived from Lego USB Tower driver
  * Copyright (C) 2003 David Glance <advidgsf@sourceforge.net>
  *               2001-2004 Juergen Stuber <starblue@users.sourceforge.net>
diff --git a/drivers/usb/misc/legousbtower.c b/drivers/usb/misc/legousbtower.c
index 5628f678ab59..c5be6e9e24a5 100644
--- a/drivers/usb/misc/legousbtower.c
+++ b/drivers/usb/misc/legousbtower.c
@@ -1,14 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * LEGO USB Tower driver
  *
  * Copyright (C) 2003 David Glance <davidgsf@sourceforge.net>
  *               2001-2004 Juergen Stuber <starblue@users.sourceforge.net>
  *
- *      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.
- *
  * derived from USB Skeleton driver - 0.5
  * Copyright (C) 2001 Greg Kroah-Hartman (greg@kroah.com)
  *
diff --git a/drivers/usb/misc/lvstest.c b/drivers/usb/misc/lvstest.c
index ddddd6387f66..e5c03c6d16e9 100644
--- a/drivers/usb/misc/lvstest.c
+++ b/drivers/usb/misc/lvstest.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * drivers/usb/misc/lvstest.c
  *
@@ -5,10 +6,6 @@
  *
  * Copyright (C) 2014 ST Microelectronics
  * Pratyush Anand <pratyush.anand@gmail.com>
- *
- * This file is licensed under the terms of the GNU General Public
- * License version 2. This program is licensed "as is" without any
- * warranty of any kind, whether express or implied.
  */
 
 #include <linux/init.h>
diff --git a/drivers/usb/misc/rio500.c b/drivers/usb/misc/rio500.c
index ddfebb144aaa..7b9adeb3e7aa 100644
--- a/drivers/usb/misc/rio500.c
+++ b/drivers/usb/misc/rio500.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0+
 /* -*- linux-c -*- */
 
 /* 
@@ -6,20 +7,6 @@
  * Cesar Miquel (miquel@df.uba.ar)
  * 
  * based on hp_scanner.c by David E. Nelson (dnelson@jump.net)
- * 
- * 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.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  * Based upon mouse.c (Brad Keryan) and printer.c (Michael Gee).
  *
diff --git a/drivers/usb/misc/rio500_usb.h b/drivers/usb/misc/rio500_usb.h
index 359abc98e706..6db7a5863496 100644
--- a/drivers/usb/misc/rio500_usb.h
+++ b/drivers/usb/misc/rio500_usb.h
@@ -1,25 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*  ----------------------------------------------------------------------
-
     Copyright (C) 2000  Cesar Miquel  (miquel@df.uba.ar)
-
-    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.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
     ---------------------------------------------------------------------- */
 
-
-
 #define RIO_SEND_COMMAND                        0x1
 #define RIO_RECV_COMMAND                        0x2
 
diff --git a/drivers/usb/misc/sisusbvga/Makefile b/drivers/usb/misc/sisusbvga/Makefile
index 3142476ccc8e..6ed3a638261a 100644
--- a/drivers/usb/misc/sisusbvga/Makefile
+++ b/drivers/usb/misc/sisusbvga/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for the sisusb driver (if driver is inside kernel tree).
 #
diff --git a/drivers/usb/misc/sisusbvga/sisusb.c b/drivers/usb/misc/sisusbvga/sisusb.c
index 30774e0aeadd..3e65bdc2615c 100644
--- a/drivers/usb/misc/sisusbvga/sisusb.c
+++ b/drivers/usb/misc/sisusbvga/sisusb.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: (GPL-2.0 OR BSD-3-Clause)
 /*
  * sisusb - usb kernel driver for SiS315(E) based USB2VGA dongles
  *
diff --git a/drivers/usb/misc/sisusbvga/sisusb.h b/drivers/usb/misc/sisusbvga/sisusb.h
index 55492a5930bd..20f03ad0ea16 100644
--- a/drivers/usb/misc/sisusbvga/sisusb.h
+++ b/drivers/usb/misc/sisusbvga/sisusb.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: (GPL-2.0 OR BSD-3-Clause)
 /*
  * sisusb - usb kernel driver for Net2280/SiS315 based USB2VGA dongles
  *
diff --git a/drivers/usb/misc/sisusbvga/sisusb_con.c b/drivers/usb/misc/sisusbvga/sisusb_con.c
index f019d80ca9e4..73f7bde78e11 100644
--- a/drivers/usb/misc/sisusbvga/sisusb_con.c
+++ b/drivers/usb/misc/sisusbvga/sisusb_con.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: (GPL-2.0 OR BSD-3-Clause)
 /*
  * sisusb - usb kernel driver for SiS315(E) based USB2VGA dongles
  *
diff --git a/drivers/usb/misc/sisusbvga/sisusb_init.c b/drivers/usb/misc/sisusbvga/sisusb_init.c
index bf0032ca35ed..6a30e8bd9221 100644
--- a/drivers/usb/misc/sisusbvga/sisusb_init.c
+++ b/drivers/usb/misc/sisusbvga/sisusb_init.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: (GPL-2.0 OR BSD-3-Clause)
 /*
  * sisusb - usb kernel driver for SiS315(E) based USB2VGA dongles
  *
diff --git a/drivers/usb/misc/sisusbvga/sisusb_init.h b/drivers/usb/misc/sisusbvga/sisusb_init.h
index e79a616f0d26..1782c759c4ad 100644
--- a/drivers/usb/misc/sisusbvga/sisusb_init.h
+++ b/drivers/usb/misc/sisusbvga/sisusb_init.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause)
 /* $XFree86$ */
 /* $XdotOrg$ */
 /*
diff --git a/drivers/usb/misc/sisusbvga/sisusb_struct.h b/drivers/usb/misc/sisusbvga/sisusb_struct.h
index 1c4240e802c1..706d77090e00 100644
--- a/drivers/usb/misc/sisusbvga/sisusb_struct.h
+++ b/drivers/usb/misc/sisusbvga/sisusb_struct.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause)
 /*
  * General structure definitions for universal mode switching modules
  *
diff --git a/drivers/usb/misc/trancevibrator.c b/drivers/usb/misc/trancevibrator.c
index 1862ed15ce28..d83af2a332e4 100644
--- a/drivers/usb/misc/trancevibrator.c
+++ b/drivers/usb/misc/trancevibrator.c
@@ -1,21 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * PlayStation 2 Trance Vibrator driver
  *
  * Copyright (C) 2006 Sam Hocevar <sam@zoy.org>
- *
- *  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.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
 /* Standard include files */
diff --git a/drivers/usb/misc/usb251xb.c b/drivers/usb/misc/usb251xb.c
index 135c91c434bf..a6efb9a72939 100644
--- a/drivers/usb/misc/usb251xb.c
+++ b/drivers/usb/misc/usb251xb.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Driver for Microchip USB251xB USB 2.0 Hi-Speed Hub Controller
  * Configuration via SMBus.
@@ -7,25 +8,14 @@
  * This work is based on the USB3503 driver by Dongjin Kim and
  * a not-accepted patch by Fabien Lahoudere, see:
  * https://patchwork.kernel.org/patch/9257715/
- *
- * 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.
- *
- * 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/delay.h>
-#include <linux/gpio.h>
+#include <linux/gpio/consumer.h>
 #include <linux/i2c.h>
 #include <linux/module.h>
 #include <linux/nls.h>
 #include <linux/of_device.h>
-#include <linux/of_gpio.h>
 #include <linux/slab.h>
 
 /* Internal Register Set Addresses & Default Values acc. to DS00001692C */
@@ -38,6 +28,7 @@
 #define USB251XB_DEF_PRODUCT_ID_12      0x2512 /* USB2512B/12Bi */
 #define USB251XB_DEF_PRODUCT_ID_13      0x2513 /* USB2513B/13Bi */
 #define USB251XB_DEF_PRODUCT_ID_14      0x2514 /* USB2514B/14Bi */
+#define USB251XB_DEF_PRODUCT_ID_17      0x2517 /* USB2517/17i */
 
 #define USB251XB_ADDR_DEVICE_ID_LSB     0x04
 #define USB251XB_ADDR_DEVICE_ID_MSB     0x05
@@ -82,7 +73,7 @@
 
 #define USB251XB_ADDR_PRODUCT_STRING_LEN        0x14
 #define USB251XB_ADDR_PRODUCT_STRING            0x54
-#define USB251XB_DEF_PRODUCT_STRING             "USB251xB/xBi"
+#define USB251XB_DEF_PRODUCT_STRING             "USB251xB/xBi/7i"
 
 #define USB251XB_ADDR_SERIAL_STRING_LEN         0x15
 #define USB251XB_ADDR_SERIAL_STRING             0x92
@@ -93,8 +84,10 @@
 
 #define USB251XB_ADDR_BOOST_UP  0xF6
 #define USB251XB_DEF_BOOST_UP   0x00
-#define USB251XB_ADDR_BOOST_X   0xF8
-#define USB251XB_DEF_BOOST_X    0x00
+#define USB251XB_ADDR_BOOST_57  0xF7
+#define USB251XB_DEF_BOOST_57   0x00
+#define USB251XB_ADDR_BOOST_14  0xF8
+#define USB251XB_DEF_BOOST_14   0x00
 
 #define USB251XB_ADDR_PORT_SWAP 0xFA
 #define USB251XB_DEF_PORT_SWAP  0x00
@@ -102,7 +95,11 @@
 #define USB251XB_ADDR_PORT_MAP_12       0xFB
 #define USB251XB_DEF_PORT_MAP_12        0x00
 #define USB251XB_ADDR_PORT_MAP_34       0xFC
-#define USB251XB_DEF_PORT_MAP_34        0x00 /* USB2513B/i & USB2514B/i only */
+#define USB251XB_DEF_PORT_MAP_34        0x00 /* USB251{3B/i,4B/i,7/i} only */
+#define USB251XB_ADDR_PORT_MAP_56       0xFD
+#define USB251XB_DEF_PORT_MAP_56        0x00 /* USB2517/i only */
+#define USB251XB_ADDR_PORT_MAP_7        0xFE
+#define USB251XB_DEF_PORT_MAP_7         0x00 /* USB2517/i only */
 
 #define USB251XB_ADDR_STATUS_COMMAND            0xFF
 #define USB251XB_STATUS_COMMAND_SMBUS_DOWN      0x04
@@ -119,7 +116,7 @@ struct usb251xb {
         struct device *dev;
         struct i2c_client *i2c;
         u8 skip_config;
-        int gpio_reset;
+        struct gpio_desc *gpio_reset;
         u16 vendor_id;
         u16 product_id;
         u16 device_id;
@@ -143,57 +140,97 @@ struct usb251xb {
         char serial[USB251XB_STRING_BUFSIZE];
         u8  bat_charge_en;
         u8  boost_up;
-        u8  boost_x;
+        u8  boost_57;
+        u8  boost_14;
         u8  port_swap;
         u8  port_map12;
         u8  port_map34;
+        u8  port_map56;
+        u8  port_map7;
         u8  status;
 };
 
 struct usb251xb_data {
         u16 product_id;
+        u8 port_cnt;
+        bool led_support;
+        bool bat_support;
         char product_str[USB251XB_STRING_BUFSIZE / 2]; /* ASCII string */
 };
 
 static const struct usb251xb_data usb2512b_data = {
         .product_id = 0x2512,
+        .port_cnt = 2,
+        .led_support = false,
+        .bat_support = true,
         .product_str = "USB2512B",
 };
 
 static const struct usb251xb_data usb2512bi_data = {
         .product_id = 0x2512,
+        .port_cnt = 2,
+        .led_support = false,
+        .bat_support = true,
         .product_str = "USB2512Bi",
 };
 
 static const struct usb251xb_data usb2513b_data = {
         .product_id = 0x2513,
+        .port_cnt = 3,
+        .led_support = false,
+        .bat_support = true,
         .product_str = "USB2513B",
 };
 
 static const struct usb251xb_data usb2513bi_data = {
         .product_id = 0x2513,
+        .port_cnt = 3,
+        .led_support = false,
+        .bat_support = true,
         .product_str = "USB2513Bi",
 };
 
 static const struct usb251xb_data usb2514b_data = {
         .product_id = 0x2514,
+        .port_cnt = 4,
+        .led_support = false,
+        .bat_support = true,
         .product_str = "USB2514B",
 };
 
 static const struct usb251xb_data usb2514bi_data = {
         .product_id = 0x2514,
+        .port_cnt = 4,
+        .led_support = false,
+        .bat_support = true,
         .product_str = "USB2514Bi",
 };
 
+static const struct usb251xb_data usb2517_data = {
+        .product_id = 0x2517,
+        .port_cnt = 7,
+        .led_support = true,
+        .bat_support = false,
+        .product_str = "USB2517",
+};
+
+static const struct usb251xb_data usb2517i_data = {
+        .product_id = 0x2517,
+        .port_cnt = 7,
+        .led_support = true,
+        .bat_support = false,
+        .product_str = "USB2517i",
+};
+
 static void usb251xb_reset(struct usb251xb *hub, int state)
 {
-        if (!gpio_is_valid(hub->gpio_reset))
+        if (!hub->gpio_reset)
                 return;
 
-        gpio_set_value_cansleep(hub->gpio_reset, state);
+        gpiod_set_value_cansleep(hub->gpio_reset, state);
 
         /* wait for hub recovery/stabilization */
-        if (state)
+        if (!state)
                 usleep_range(500, 750); /* >=500us at power on */
         else
                 usleep_range(1, 10);    /* >=1us at power down */
@@ -212,7 +249,7 @@ static int usb251xb_connect(struct usb251xb *hub)
                 i2c_wb[0] = 0x01;
                 i2c_wb[1] = USB251XB_STATUS_COMMAND_ATTACH;
 
-                usb251xb_reset(hub, 1);
+                usb251xb_reset(hub, 0);
 
                 err = i2c_smbus_write_i2c_block_data(hub->i2c,
                                 USB251XB_ADDR_STATUS_COMMAND, 2, i2c_wb);
@@ -253,13 +290,16 @@ static int usb251xb_connect(struct usb251xb *hub)
                USB251XB_STRING_BUFSIZE);
         i2c_wb[USB251XB_ADDR_BATTERY_CHARGING_ENABLE] = hub->bat_charge_en;
         i2c_wb[USB251XB_ADDR_BOOST_UP]          = hub->boost_up;
-        i2c_wb[USB251XB_ADDR_BOOST_X]           = hub->boost_x;
+        i2c_wb[USB251XB_ADDR_BOOST_57]          = hub->boost_57;
+        i2c_wb[USB251XB_ADDR_BOOST_14]          = hub->boost_14;
         i2c_wb[USB251XB_ADDR_PORT_SWAP]         = hub->port_swap;
         i2c_wb[USB251XB_ADDR_PORT_MAP_12]       = hub->port_map12;
         i2c_wb[USB251XB_ADDR_PORT_MAP_34]       = hub->port_map34;
+        i2c_wb[USB251XB_ADDR_PORT_MAP_56]       = hub->port_map56;
+        i2c_wb[USB251XB_ADDR_PORT_MAP_7]        = hub->port_map7;
         i2c_wb[USB251XB_ADDR_STATUS_COMMAND] = USB251XB_STATUS_COMMAND_ATTACH;
 
-        usb251xb_reset(hub, 1);
+        usb251xb_reset(hub, 0);
 
         /* write registers */
         for (i = 0; i < (USB251XB_I2C_REG_SZ / USB251XB_I2C_WRITE_SZ); i++) {
@@ -297,7 +337,7 @@ static int usb251xb_get_ofdata(struct usb251xb *hub,
         struct device *dev = hub->dev;
         struct device_node *np = dev->of_node;
         int len, err, i;
-        u32 *property_u32 = NULL;
+        u32 property_u32 = 0;
         const u32 *cproperty_u32;
         const char *cproperty_char;
         char str[USB251XB_STRING_BUFSIZE / 2];
@@ -312,19 +352,13 @@ static int usb251xb_get_ofdata(struct usb251xb *hub,
         else
                 hub->skip_config = 0;
 
-        hub->gpio_reset = of_get_named_gpio(np, "reset-gpios", 0);
-        if (hub->gpio_reset == -EPROBE_DEFER)
+        hub->gpio_reset = devm_gpiod_get_optional(dev, "reset", GPIOD_OUT_HIGH);
+        if (PTR_ERR(hub->gpio_reset) == -EPROBE_DEFER) {
                 return -EPROBE_DEFER;
-        if (gpio_is_valid(hub->gpio_reset)) {
-                err = devm_gpio_request_one(dev, hub->gpio_reset,
-                                            GPIOF_OUT_INIT_LOW,
-                                            "usb251xb reset");
-                if (err) {
-                        dev_err(dev,
-                                "unable to request GPIO %d as reset pin (%d)\n",
-                                hub->gpio_reset, err);
-                        return err;
-                }
+        } else if (IS_ERR(hub->gpio_reset)) {
+                err = PTR_ERR(hub->gpio_reset);
+                dev_err(dev, "unable to request GPIO reset pin (%d)\n", err);
+                return err;
         }
 
         if (of_property_read_u16_array(np, "vendor-id", &hub->vendor_id, 1))
@@ -374,16 +408,16 @@ static int usb251xb_get_ofdata(struct usb251xb *hub,
         if (of_get_property(np, "dynamic-power-switching", NULL))
                 hub->conf_data2 |= BIT(7);
 
-        if (!of_property_read_u32(np, "oc-delay-us", property_u32)) {
-                if (*property_u32 == 100) {
+        if (!of_property_read_u32(np, "oc-delay-us", &property_u32)) {
+                if (property_u32 == 100) {
                         /* 100 us*/
                         hub->conf_data2 &= ~BIT(5);
                         hub->conf_data2 &= ~BIT(4);
-                } else if (*property_u32 == 4000) {
+                } else if (property_u32 == 4000) {
                         /* 4 ms */
                         hub->conf_data2 &= ~BIT(5);
                         hub->conf_data2 |= BIT(4);
-                } else if (*property_u32 == 16000) {
+                } else if (property_u32 == 16000) {
                         /* 16 ms */
                         hub->conf_data2 |= BIT(5);
                         hub->conf_data2 |= BIT(4);
@@ -401,6 +435,9 @@ static int usb251xb_get_ofdata(struct usb251xb *hub,
         if (of_get_property(np, "port-mapping-mode", NULL))
                 hub->conf_data3 |= BIT(3);
 
+        if (data->led_support && of_get_property(np, "led-usb-mode", NULL))
+                hub->conf_data3 &= ~BIT(1);
+
         if (of_get_property(np, "string-support", NULL))
                 hub->conf_data3 |= BIT(0);
 
@@ -410,8 +447,11 @@ static int usb251xb_get_ofdata(struct usb251xb *hub,
                 for (i = 0; i < len / sizeof(u32); i++) {
                         u32 port = be32_to_cpu(cproperty_u32[i]);
 
-                        if ((port >= 1) && (port <= 4))
+                        if ((port >= 1) && (port <= data->port_cnt))
                                 hub->non_rem_dev |= BIT(port);
+                        else
+                                dev_warn(dev, "NRD port %u doesn't exist\n",
+                                        port);
                 }
         }
 
@@ -421,8 +461,11 @@ static int usb251xb_get_ofdata(struct usb251xb *hub,
                 for (i = 0; i < len / sizeof(u32); i++) {
                         u32 port = be32_to_cpu(cproperty_u32[i]);
 
-                        if ((port >= 1) && (port <= 4))
+                        if ((port >= 1) && (port <= data->port_cnt))
                                 hub->port_disable_sp |= BIT(port);
+                        else
+                                dev_warn(dev, "PDS port %u doesn't exist\n",
+                                        port);
                 }
         }
 
@@ -432,14 +475,37 @@ static int usb251xb_get_ofdata(struct usb251xb *hub,
                 for (i = 0; i < len / sizeof(u32); i++) {
                         u32 port = be32_to_cpu(cproperty_u32[i]);
 
-                        if ((port >= 1) && (port <= 4))
+                        if ((port >= 1) && (port <= data->port_cnt))
                                 hub->port_disable_bp |= BIT(port);
+                        else
+                                dev_warn(dev, "PDB port %u doesn't exist\n",
+                                        port);
                 }
         }
 
+        hub->max_power_sp = USB251XB_DEF_MAX_POWER_SELF;
+        if (!of_property_read_u32(np, "sp-max-total-current-microamp",
+            &property_u32))
+                hub->max_power_sp = min_t(u8, property_u32 / 2000, 50);
+
+        hub->max_power_bp = USB251XB_DEF_MAX_POWER_BUS;
+        if (!of_property_read_u32(np, "bp-max-total-current-microamp",
+            &property_u32))
+                hub->max_power_bp = min_t(u8, property_u32 / 2000, 255);
+
+        hub->max_current_sp = USB251XB_DEF_MAX_CURRENT_SELF;
+        if (!of_property_read_u32(np, "sp-max-removable-current-microamp",
+            &property_u32))
+                hub->max_current_sp = min_t(u8, property_u32 / 2000, 50);
+
+        hub->max_current_bp = USB251XB_DEF_MAX_CURRENT_BUS;
+        if (!of_property_read_u32(np, "bp-max-removable-current-microamp",
+            &property_u32))
+                hub->max_current_bp = min_t(u8, property_u32 / 2000, 255);
+
         hub->power_on_time = USB251XB_DEF_POWER_ON_TIME;
-        if (!of_property_read_u32(np, "power-on-time-ms", property_u32))
-                hub->power_on_time = min_t(u8, *property_u32 / 2, 255);
+        if (!of_property_read_u32(np, "power-on-time-ms", &property_u32))
+                hub->power_on_time = min_t(u8, property_u32 / 2, 255);
 
         if (of_property_read_u16_array(np, "language-id", &hub->lang_id, 1))
                 hub->lang_id = USB251XB_DEF_LANGUAGE_ID;
@@ -476,16 +542,15 @@ static int usb251xb_get_ofdata(struct usb251xb *hub,
         /* The following parameters are currently not exposed to devicetree, but
          * may be as soon as needed.
          */
-        hub->max_power_sp = USB251XB_DEF_MAX_POWER_SELF;
-        hub->max_power_bp = USB251XB_DEF_MAX_POWER_BUS;
-        hub->max_current_sp = USB251XB_DEF_MAX_CURRENT_SELF;
-        hub->max_current_bp = USB251XB_DEF_MAX_CURRENT_BUS;
         hub->bat_charge_en = USB251XB_DEF_BATTERY_CHARGING_ENABLE;
         hub->boost_up = USB251XB_DEF_BOOST_UP;
-        hub->boost_x = USB251XB_DEF_BOOST_X;
+        hub->boost_57 = USB251XB_DEF_BOOST_57;
+        hub->boost_14 = USB251XB_DEF_BOOST_14;
         hub->port_swap = USB251XB_DEF_PORT_SWAP;
         hub->port_map12 = USB251XB_DEF_PORT_MAP_12;
         hub->port_map34 = USB251XB_DEF_PORT_MAP_34;
+        hub->port_map56 = USB251XB_DEF_PORT_MAP_56;
+        hub->port_map7  = USB251XB_DEF_PORT_MAP_7;
 
         return 0;
 }
@@ -510,6 +575,12 @@ static const struct of_device_id usb251xb_of_match[] = {
                 .compatible = "microchip,usb2514bi",
                 .data = &usb2514bi_data,
         }, {
+                .compatible = "microchip,usb2517",
+                .data = &usb2517_data,
+        }, {
+                .compatible = "microchip,usb2517i",
+                .data = &usb2517i_data,
+        }, {
                 /* sentinel */
         }
 };
@@ -573,6 +644,8 @@ static const struct i2c_device_id usb251xb_id[] = {
         { "usb2513bi", 0 },
         { "usb2514b", 0 },
         { "usb2514bi", 0 },
+        { "usb2517", 0 },
+        { "usb2517i", 0 },
         { /* sentinel */ }
 };
 MODULE_DEVICE_TABLE(i2c, usb251xb_id);
@@ -589,5 +662,5 @@ static struct i2c_driver usb251xb_i2c_driver = {
 module_i2c_driver(usb251xb_i2c_driver);
 
 MODULE_AUTHOR("Richard Leitner <richard.leitner@skidata.com>");
-MODULE_DESCRIPTION("USB251xB/xBi USB 2.0 Hub Controller Driver");
+MODULE_DESCRIPTION("USB251x/xBi USB 2.0 Hub Controller Driver");
 MODULE_LICENSE("GPL");
diff --git a/drivers/usb/misc/usb3503.c b/drivers/usb/misc/usb3503.c
index 8e7737d7ac0a..465dbf68b463 100644
--- a/drivers/usb/misc/usb3503.c
+++ b/drivers/usb/misc/usb3503.c
@@ -1,21 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Driver for SMSC USB3503 USB 2.0 hub controller driver
  *
  * Copyright (c) 2012-2013 Dongjin Kim (tobetter@gmail.com)
- *
- * 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.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include <linux/clk.h>
diff --git a/drivers/usb/misc/usb4604.c b/drivers/usb/misc/usb4604.c
index e9f37fb746ac..1b4de651e697 100644
--- a/drivers/usb/misc/usb4604.c
+++ b/drivers/usb/misc/usb4604.c
@@ -1,19 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Driver for SMSC USB4604 USB HSIC 4-port 2.0 hub controller driver
  * Based on usb3503 driver
  *
  * Copyright (c) 2012-2013 Dongjin Kim (tobetter@gmail.com)
  * Copyright (c) 2016 Linaro Ltd.
- *
- * 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.
- *
- * 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/i2c.h>
diff --git a/drivers/usb/misc/usb_u132.h b/drivers/usb/misc/usb_u132.h
index dc2e5a31caec..4bf77736914f 100644
--- a/drivers/usb/misc/usb_u132.h
+++ b/drivers/usb/misc/usb_u132.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
 * Common Header File for the Elan Digital Systems U132 adapter
 * this file should be included by both the "ftdi-u132" and
@@ -9,11 +10,6 @@
 * Author and Maintainer - Tony Olech - Elan Digital Systems
 *(tony.olech@elandigitalsystems.com)
 *
-* This program is free software;you can redistribute it and/or
-* modify it under the terms of the GNU General Public License as
-* published by the Free Software Foundation, version 2.
-*
-*
 * The driver was written by Tony Olech(tony.olech@elandigitalsystems.com)
 * based on various USB client drivers in the 2.6.15 linux kernel
 * with constant reference to the 3rd Edition of Linux Device Drivers
diff --git a/drivers/usb/misc/usblcd.c b/drivers/usb/misc/usblcd.c
index 0f5ad896c7e3..9ba4a4e68d91 100644
--- a/drivers/usb/misc/usblcd.c
+++ b/drivers/usb/misc/usblcd.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*****************************************************************************
  *                          USBLCD Kernel Driver                             *
  *                            Version 1.05                                   *
diff --git a/drivers/usb/misc/usbsevseg.c b/drivers/usb/misc/usbsevseg.c
index 3f6a28045b53..12f7e94695a2 100644
--- a/drivers/usb/misc/usbsevseg.c
+++ b/drivers/usb/misc/usbsevseg.c
@@ -1,13 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * USB 7 Segment Driver
  *
  * Copyright (C) 2008 Harrison Metzger <harrisonmetz@gmail.com>
  * Based on usbled.c by Greg Kroah-Hartman (greg@kroah.com)
- *
- *      This program is free software; you can redistribute it and/or
- *      modify it under the terms of the GNU General Public License as
- *      published by the Free Software Foundation, version 2.
- *
  */
 
 #include <linux/kernel.h>
diff --git a/drivers/usb/misc/usbtest.c b/drivers/usb/misc/usbtest.c
index 5ad74750e8a4..aedc9a7f149e 100644
--- a/drivers/usb/misc/usbtest.c
+++ b/drivers/usb/misc/usbtest.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/kernel.h>
 #include <linux/errno.h>
 #include <linux/init.h>
@@ -1023,7 +1024,7 @@ static int ch9_postconfig(struct usbtest_dev *dev)
         /* FIXME fetch strings from at least the device descriptor */
 
         /* [9.4.5] get_status always works */
-        retval = usb_get_status(udev, USB_RECIP_DEVICE, 0, dev->buf);
+        retval = usb_get_std_status(udev, USB_RECIP_DEVICE, 0, dev->buf);
         if (retval) {
                 dev_err(&iface->dev, "get dev status --> %d\n", retval);
                 return retval;
@@ -1033,7 +1034,7 @@ static int ch9_postconfig(struct usbtest_dev *dev)
          * the device's remote wakeup feature ... if we can, test that here
          */
 
-        retval = usb_get_status(udev, USB_RECIP_INTERFACE,
+        retval = usb_get_std_status(udev, USB_RECIP_INTERFACE,
                         iface->altsetting[0].desc.bInterfaceNumber, dev->buf);
         if (retval) {
                 dev_err(&iface->dev, "get interface status --> %d\n", retval);
@@ -1622,7 +1623,7 @@ static int verify_not_halted(struct usbtest_dev *tdev, int ep, struct urb *urb)
         u16     status;
 
         /* shouldn't look or act halted */
-        retval = usb_get_status(urb->dev, USB_RECIP_ENDPOINT, ep, &status);
+        retval = usb_get_std_status(urb->dev, USB_RECIP_ENDPOINT, ep, &status);
         if (retval < 0) {
                 ERROR(tdev, "ep %02x couldn't get no-halt status, %d\n",
                                 ep, retval);
@@ -1644,7 +1645,7 @@ static int verify_halted(struct usbtest_dev *tdev, int ep, struct urb *urb)
         u16     status;
 
         /* should look and act halted */
-        retval = usb_get_status(urb->dev, USB_RECIP_ENDPOINT, ep, &status);
+        retval = usb_get_std_status(urb->dev, USB_RECIP_ENDPOINT, ep, &status);
         if (retval < 0) {
                 ERROR(tdev, "ep %02x couldn't get halt status, %d\n",
                                 ep, retval);
@@ -1917,7 +1918,7 @@ static struct urb *iso_alloc_urb(
 
         if (bytes < 0 || !desc)
                 return NULL;
-        maxp = 0x7ff & usb_endpoint_maxp(desc);
+        maxp = usb_endpoint_maxp(desc);
         maxp *= usb_endpoint_maxp_mult(desc);
         packets = DIV_ROUND_UP(bytes, maxp);
 
diff --git a/drivers/usb/misc/uss720.c b/drivers/usb/misc/uss720.c
index 8a13b2fcf3e1..263c97fec708 100644
--- a/drivers/usb/misc/uss720.c
+++ b/drivers/usb/misc/uss720.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*****************************************************************************/
 
 /*
@@ -6,20 +7,6 @@
  *      Copyright (C) 1999, 2005, 2010
  *          Thomas Sailer (t.sailer@alumni.ethz.ch)
  *
- *      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.
- *
- *      This program is distributed in the hope that it will be useful,
- *      but WITHOUT ANY WARRANTY; without even the implied warranty of
- *      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *      GNU General Public License for more details.
- *
- *      You should have received a copy of the GNU General Public License
- *      along with this program; if not, write to the Free Software
- *      Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
  *  Based on parport_pc.c
  *
  *  History:
diff --git a/drivers/usb/misc/yurex.c b/drivers/usb/misc/yurex.c
index 58abdf28620a..8abb6cbbd98a 100644
--- a/drivers/usb/misc/yurex.c
+++ b/drivers/usb/misc/yurex.c
@@ -1,12 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Driver for Meywa-Denki & KAYAC YUREX
  *
  * Copyright (C) 2010 Tomoki Sekiyama (tomoki.sekiyama@gmail.com)
- *
- *      This program is free software; you can redistribute it and/or
- *      modify it under the terms of the GNU General Public License as
- *      published by the Free Software Foundation, version 2.
- *
  */
 
 #include <linux/kernel.h>
diff --git a/drivers/usb/mon/Makefile b/drivers/usb/mon/Makefile
index 8ed24ab08698..09f43e89633c 100644
--- a/drivers/usb/mon/Makefile
+++ b/drivers/usb/mon/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for USB monitor
 #
diff --git a/drivers/usb/mon/mon_main.c b/drivers/usb/mon/mon_main.c
index 46847340b819..9812d102a005 100644
--- a/drivers/usb/mon/mon_main.c
+++ b/drivers/usb/mon/mon_main.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * The USB Monitor, inspired by Dave Harding's USBMon.
  *
diff --git a/drivers/usb/mtu3/mtu3.h b/drivers/usb/mtu3/mtu3.h
index b26fffc58446..3c888d942a9f 100644
--- a/drivers/usb/mtu3/mtu3.h
+++ b/drivers/usb/mtu3/mtu3.h
@@ -1,19 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * 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__
@@ -46,6 +37,9 @@ struct mtu3_request;
 #define MU3D_EP_RXCR1(epnum)    (U3D_RX1CSR1 + (((epnum) - 1) * 0x10))
 #define MU3D_EP_RXCR2(epnum)    (U3D_RX1CSR2 + (((epnum) - 1) * 0x10))
 
+#define USB_QMU_TQHIAR(epnum)   (U3D_TXQHIAR1 + (((epnum) - 1) * 0x4))
+#define USB_QMU_RQHIAR(epnum)   (U3D_RXQHIAR1 + (((epnum) - 1) * 0x4))
+
 #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))
@@ -91,6 +85,7 @@ enum mtu3_speed {
         MTU3_SPEED_FULL = 1,
         MTU3_SPEED_HIGH = 3,
         MTU3_SPEED_SUPER = 4,
+        MTU3_SPEED_SUPER_PLUS = 5,
 };
 
 /**
@@ -112,6 +107,19 @@ enum mtu3_g_ep0_state {
 };
 
 /**
+ * MTU3_DR_FORCE_NONE: automatically switch host and periperal mode
+ *              by IDPIN signal.
+ * MTU3_DR_FORCE_HOST: force to enter host mode and override OTG
+ *              IDPIN signal.
+ * MTU3_DR_FORCE_DEVICE: force to enter peripheral mode.
+ */
+enum mtu3_dr_force_mode {
+        MTU3_DR_FORCE_NONE = 0,
+        MTU3_DR_FORCE_HOST,
+        MTU3_DR_FORCE_DEVICE,
+};
+
+/**
  * @base: the base address of fifo
  * @limit: the bitmap size in bits
  * @bitmap: fifo bitmap in unit of @MTU3_EP_FIFO_UNIT
@@ -138,23 +146,33 @@ struct mtu3_fifo_info {
  *      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
+ * @tx_ext_addr (TX ONLY): [3:0] are 4 extension bits of @buffer,
+ *      [7:4] are 4 extension bits of @next_gpd
  * @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
+ * @rx_ext_addr(RX ONLY): [3:0] are 4 extension bits of @buffer,
+ *      [7:4] are 4 extension bits of @next_gpd
  * @ext_flag:
  *      bit5 (TX ONLY): Zero Length Packet (ZLP),
  */
 struct qmu_gpd {
         __u8 flag;
         __u8 chksum;
-        __le16 data_buf_len;
+        union {
+                __le16 data_buf_len;
+                __le16 tx_ext_addr;
+        };
         __le32 next_gpd;
         __le32 buffer;
         __le16 buf_len;
-        __u8 ext_len;
+        union {
+                __u8 ext_len;
+                __u8 rx_ext_addr;
+        };
         __u8 ext_flag;
 } __packed;
 
@@ -183,7 +201,6 @@ struct mtu3_gpd_ring {
 *               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.
 */
@@ -194,10 +211,6 @@ struct otg_switch_mtk {
         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;
 };
 
@@ -206,14 +219,17 @@ struct otg_switch_mtk {
  * @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
+ * @ref_clk: reference clock
+ * @mcu_clk: mcu_bus_ck clock for AHB bus etc
+ * @dma_clk: dma_bus_ck clock for AXI bus etc
  * @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
+ * @u3p_dis_msk: mask of disabling usb3 ports, for example, bit0==1 to
+ *              disable u3port0, bit1==1 to disable u3port1,... etc
  * @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;
@@ -226,17 +242,18 @@ struct ssusb_mtk {
         struct regulator *vusb33;
         struct clk *sys_clk;
         struct clk *ref_clk;
+        struct clk *mcu_clk;
+        struct clk *dma_clk;
         /* otg */
         struct otg_switch_mtk otg_switch;
         enum usb_dr_mode dr_mode;
         bool is_host;
         int u2_ports;
         int u3_ports;
+        int u3p_dis_msk;
         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;
 };
 
diff --git a/drivers/usb/mtu3/mtu3_core.c b/drivers/usb/mtu3/mtu3_core.c
index 99c65b0788ff..b1b99a8f6a7a 100644
--- a/drivers/usb/mtu3/mtu3_core.c
+++ b/drivers/usb/mtu3/mtu3_core.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * mtu3_core.c - hardware access layer and gadget init/exit of
  *                     MediaTek usb3 Dual-Role Controller Driver
@@ -5,18 +6,9 @@
  * 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/dma-mapping.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/of_address.h>
@@ -114,7 +106,9 @@ static int mtu3_device_enable(struct mtu3 *mtu)
         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);
+
+        if (mtu->ssusb->dr_mode == USB_DR_MODE_OTG)
+                mtu3_setbits(ibase, SSUSB_U2_CTRL(0), SSUSB_U2_PORT_OTG_SEL);
 
         return ssusb_check_clocks(mtu->ssusb, check_clk);
 }
@@ -129,7 +123,10 @@ static void mtu3_device_disable(struct mtu3 *mtu)
 
         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);
+
+        if (mtu->ssusb->dr_mode == USB_DR_MODE_OTG)
+                mtu3_clrbits(ibase, SSUSB_U2_CTRL(0), SSUSB_U2_PORT_OTG_SEL);
+
         mtu3_setbits(ibase, U3D_SSUSB_IP_PW_CTRL2, SSUSB_IP_DEV_PDN);
 }
 
@@ -236,7 +233,7 @@ void mtu3_ep_stall_set(struct mtu3_ep *mep, bool set)
 
 void mtu3_dev_on_off(struct mtu3 *mtu, int is_on)
 {
-        if (mtu->is_u3_ip && (mtu->max_speed == USB_SPEED_SUPER))
+        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);
@@ -546,6 +543,9 @@ static void mtu3_set_speed(struct mtu3 *mtu)
                 mtu3_clrbits(mbase, U3D_USB3_CONFIG, USB3_EN);
                 /* HS/FS detected by HW */
                 mtu3_setbits(mbase, U3D_POWER_MANAGEMENT, HS_ENABLE);
+        } else if (mtu->max_speed == USB_SPEED_SUPER) {
+                mtu3_clrbits(mtu->ippc_base, SSUSB_U3_CTRL(0),
+                             SSUSB_U3_PORT_SSP_SPEED);
         }
 
         dev_info(mtu->dev, "max_speed: %s\n",
@@ -623,6 +623,10 @@ static irqreturn_t mtu3_link_isr(struct mtu3 *mtu)
                 udev_speed = USB_SPEED_SUPER;
                 maxpkt = 512;
                 break;
+        case MTU3_SPEED_SUPER_PLUS:
+                udev_speed = USB_SPEED_SUPER_PLUS;
+                maxpkt = 512;
+                break;
         default:
                 udev_speed = USB_SPEED_UNKNOWN;
                 break;
@@ -759,7 +763,31 @@ static void mtu3_hw_exit(struct mtu3 *mtu)
         mtu3_mem_free(mtu);
 }
 
-/*-------------------------------------------------------------------------*/
+/**
+ * we set 32-bit DMA mask by default, here check whether the controller
+ * supports 36-bit DMA or not, if it does, set 36-bit DMA mask.
+ */
+static int mtu3_set_dma_mask(struct mtu3 *mtu)
+{
+        struct device *dev = mtu->dev;
+        bool is_36bit = false;
+        int ret = 0;
+        u32 value;
+
+        value = mtu3_readl(mtu->mac_base, U3D_MISC_CTRL);
+        if (value & DMA_ADDR_36BIT) {
+                is_36bit = true;
+                ret = dma_set_mask_and_coherent(dev, DMA_BIT_MASK(36));
+                /* If set 36-bit DMA mask fails, fall back to 32-bit DMA mask */
+                if (ret) {
+                        is_36bit = false;
+                        ret = dma_set_mask_and_coherent(dev, DMA_BIT_MASK(32));
+                }
+        }
+        dev_info(dev, "dma mask: %s bits\n", is_36bit ? "36" : "32");
+
+        return ret;
+}
 
 int ssusb_gadget_init(struct ssusb_mtk *ssusb)
 {
@@ -774,9 +802,9 @@ int ssusb_gadget_init(struct ssusb_mtk *ssusb)
                 return -ENOMEM;
 
         mtu->irq = platform_get_irq(pdev, 0);
-        if (mtu->irq <= 0) {
+        if (mtu->irq < 0) {
                 dev_err(dev, "fail to get irq number\n");
-                return -ENODEV;
+                return mtu->irq;
         }
         dev_info(dev, "irq %d\n", mtu->irq);
 
@@ -800,14 +828,15 @@ int ssusb_gadget_init(struct ssusb_mtk *ssusb)
         case USB_SPEED_FULL:
         case USB_SPEED_HIGH:
         case USB_SPEED_SUPER:
+        case USB_SPEED_SUPER_PLUS:
                 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;
+                /* default as SSP */
+                mtu->max_speed = USB_SPEED_SUPER_PLUS;
                 break;
         }
 
@@ -820,6 +849,12 @@ int ssusb_gadget_init(struct ssusb_mtk *ssusb)
                 return ret;
         }
 
+        ret = mtu3_set_dma_mask(mtu);
+        if (ret) {
+                dev_err(dev, "mtu3 set dma_mask failed:%d\n", ret);
+                goto dma_mask_err;
+        }
+
         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);
@@ -845,6 +880,7 @@ int ssusb_gadget_init(struct ssusb_mtk *ssusb)
 gadget_err:
         device_init_wakeup(dev, false);
 
+dma_mask_err:
 irq_err:
         mtu3_hw_exit(mtu);
         ssusb->u3d = NULL;
diff --git a/drivers/usb/mtu3/mtu3_dr.c b/drivers/usb/mtu3/mtu3_dr.c
index 560256115b23..db7562d99b95 100644
--- a/drivers/usb/mtu3/mtu3_dr.c
+++ b/drivers/usb/mtu3/mtu3_dr.c
@@ -1,19 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * 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>
@@ -261,21 +252,22 @@ static void extcon_register_dwork(struct work_struct *work)
  * 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);
+        if (to_host) {
+                ssusb_set_force_mode(ssusb, MTU3_DR_FORCE_HOST);
+                ssusb_set_mailbox(otg_sx, MTU3_VBUS_OFF);
+                ssusb_set_mailbox(otg_sx, MTU3_ID_GROUND);
+        } else {
+                ssusb_set_force_mode(ssusb, MTU3_DR_FORCE_DEVICE);
+                ssusb_set_mailbox(otg_sx, MTU3_ID_FLOAT);
+                ssusb_set_mailbox(otg_sx, MTU3_VBUS_VALID);
+        }
 }
 
-
 static int ssusb_mode_show(struct seq_file *sf, void *unused)
 {
         struct ssusb_mtk *ssusb = sf->private;
@@ -388,17 +380,45 @@ static void ssusb_debugfs_exit(struct ssusb_mtk *ssusb)
         debugfs_remove_recursive(ssusb->dbgfs_root);
 }
 
+void ssusb_set_force_mode(struct ssusb_mtk *ssusb,
+                          enum mtu3_dr_force_mode mode)
+{
+        u32 value;
+
+        value = mtu3_readl(ssusb->ippc_base, SSUSB_U2_CTRL(0));
+        switch (mode) {
+        case MTU3_DR_FORCE_DEVICE:
+                value |= SSUSB_U2_PORT_FORCE_IDDIG | SSUSB_U2_PORT_RG_IDDIG;
+                break;
+        case MTU3_DR_FORCE_HOST:
+                value |= SSUSB_U2_PORT_FORCE_IDDIG;
+                value &= ~SSUSB_U2_PORT_RG_IDDIG;
+                break;
+        case MTU3_DR_FORCE_NONE:
+                value &= ~(SSUSB_U2_PORT_FORCE_IDDIG | SSUSB_U2_PORT_RG_IDDIG);
+                break;
+        default:
+                return;
+        }
+        mtu3_writel(ssusb->ippc_base, SSUSB_U2_CTRL(0), value);
+}
+
 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)
+        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);
+        } else {
+                INIT_DELAYED_WORK(&otg_sx->extcon_reg_dwork,
+                                  extcon_register_dwork);
+
+                /*
+                 * It is enough to delay 1s for waiting for
+                 * host initialization
+                 */
+                schedule_delayed_work(&otg_sx->extcon_reg_dwork, HZ);
+        }
 
         return 0;
 }
@@ -407,8 +427,8 @@ 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->manual_drd_enabled)
                 ssusb_debugfs_exit(ssusb);
+        else
+                cancel_delayed_work(&otg_sx->extcon_reg_dwork);
 }
diff --git a/drivers/usb/mtu3/mtu3_dr.h b/drivers/usb/mtu3/mtu3_dr.h
index 9b228b5811b0..c179192408ba 100644
--- a/drivers/usb/mtu3/mtu3_dr.h
+++ b/drivers/usb/mtu3/mtu3_dr.h
@@ -1,19 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * 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_
@@ -87,6 +78,8 @@ static inline void ssusb_gadget_exit(struct ssusb_mtk *ssusb)
 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);
+void ssusb_set_force_mode(struct ssusb_mtk *ssusb,
+                          enum mtu3_dr_force_mode mode);
 
 #else
 
@@ -103,6 +96,10 @@ static inline int ssusb_set_vbus(struct otg_switch_mtk *otg_sx, int is_on)
         return 0;
 }
 
+static inline void
+ssusb_set_force_mode(struct ssusb_mtk *ssusb, enum mtu3_dr_force_mode mode)
+{}
+
 #endif
 
 #endif          /* _MTU3_DR_H_ */
diff --git a/drivers/usb/mtu3/mtu3_gadget.c b/drivers/usb/mtu3/mtu3_gadget.c
index 434fca58143c..f05f10f5c171 100644
--- a/drivers/usb/mtu3/mtu3_gadget.c
+++ b/drivers/usb/mtu3/mtu3_gadget.c
@@ -1,19 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * 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"
@@ -89,6 +80,7 @@ static int mtu3_ep_enable(struct mtu3_ep *mep)
 
         switch (mtu->g.speed) {
         case USB_SPEED_SUPER:
+        case USB_SPEED_SUPER_PLUS:
                 if (usb_endpoint_xfer_int(desc) ||
                                 usb_endpoint_xfer_isoc(desc)) {
                         interval = desc->bInterval;
@@ -456,7 +448,7 @@ static int mtu3_gadget_wakeup(struct usb_gadget *gadget)
                 return  -EOPNOTSUPP;
 
         spin_lock_irqsave(&mtu->lock, flags);
-        if (mtu->g.speed == USB_SPEED_SUPER) {
+        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);
diff --git a/drivers/usb/mtu3/mtu3_gadget_ep0.c b/drivers/usb/mtu3/mtu3_gadget_ep0.c
index 958d74dd2b78..ebdcf7a38c29 100644
--- a/drivers/usb/mtu3/mtu3_gadget_ep0.c
+++ b/drivers/usb/mtu3/mtu3_gadget_ep0.c
@@ -1,19 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * 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 <linux/usb/composite.h>
@@ -212,8 +203,8 @@ ep0_get_status(struct mtu3 *mtu, const struct usb_ctrlrequest *setup)
         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) {
+
+                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;
                 }
@@ -329,8 +320,8 @@ static int ep0_handle_feature_dev(struct mtu3 *mtu,
                 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)
+                if (mtu->g.speed < USB_SPEED_SUPER ||
+                    mtu->g.state != USB_STATE_CONFIGURED)
                         break;
 
                 lpc = mtu3_readl(mbase, U3D_LINK_POWER_CONTROL);
@@ -344,8 +335,8 @@ static int ep0_handle_feature_dev(struct mtu3 *mtu,
                 handled = 1;
                 break;
         case USB_DEVICE_U2_ENABLE:
-                if (mtu->g.speed != USB_SPEED_SUPER ||
-                        mtu->g.state != USB_STATE_CONFIGURED)
+                if (mtu->g.speed < USB_SPEED_SUPER ||
+                    mtu->g.state != USB_STATE_CONFIGURED)
                         break;
 
                 lpc = mtu3_readl(mbase, U3D_LINK_POWER_CONTROL);
@@ -384,8 +375,8 @@ static int ep0_handle_feature(struct mtu3 *mtu,
                 break;
         case USB_RECIP_INTERFACE:
                 /* superspeed only */
-                if ((value == USB_INTRF_FUNC_SUSPEND)
-                        && (mtu->g.speed == USB_SPEED_SUPER)) {
+                if (value == USB_INTRF_FUNC_SUSPEND &&
+                    mtu->g.speed >= USB_SPEED_SUPER) {
                         /*
                          * forward the request because function drivers
                          * should handle it
diff --git a/drivers/usb/mtu3/mtu3_host.c b/drivers/usb/mtu3/mtu3_host.c
index e42d308b8dc2..d237d7e65c44 100644
--- a/drivers/usb/mtu3/mtu3_host.c
+++ b/drivers/usb/mtu3/mtu3_host.c
@@ -1,19 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * 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>
@@ -79,20 +70,6 @@ int ssusb_wakeup_of_property_parse(struct ssusb_mtk *ssusb,
         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)) {
@@ -103,36 +80,6 @@ int ssusb_wakeup_of_property_parse(struct ssusb_mtk *ssusb,
         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;
@@ -151,6 +98,7 @@ 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;
+        int u3_ports_disabed;
         u32 check_clk;
         u32 value;
         int i;
@@ -158,8 +106,14 @@ int ssusb_host_enable(struct ssusb_mtk *ssusb)
         /* power on host ip */
         mtu3_clrbits(ibase, U3D_SSUSB_IP_PW_CTRL1, SSUSB_IP_HOST_PDN);
 
-        /* power on and enable all u3 ports */
+        /* power on and enable u3 ports except skipped ones */
+        u3_ports_disabed = 0;
         for (i = 0; i < num_u3p; i++) {
+                if ((0x1 << i) & ssusb->u3p_dis_msk) {
+                        u3_ports_disabed++;
+                        continue;
+                }
+
                 value = mtu3_readl(ibase, SSUSB_U3_CTRL(i));
                 value &= ~(SSUSB_U3_PORT_PDN | SSUSB_U3_PORT_DIS);
                 value |= SSUSB_U3_PORT_HOST_SEL;
@@ -175,7 +129,7 @@ int ssusb_host_enable(struct ssusb_mtk *ssusb)
         }
 
         check_clk = SSUSB_XHCI_RST_B_STS;
-        if (num_u3p)
+        if (num_u3p > u3_ports_disabed)
                 check_clk = SSUSB_U3_MAC_RST_B_STS;
 
         return ssusb_check_clocks(ssusb, check_clk);
@@ -190,8 +144,11 @@ int ssusb_host_disable(struct ssusb_mtk *ssusb, bool suspend)
         int ret;
         int i;
 
-        /* power down and disable all u3 ports */
+        /* power down and disable u3 ports except skipped ones */
         for (i = 0; i < num_u3p; i++) {
+                if ((0x1 << i) & ssusb->u3p_dis_msk)
+                        continue;
+
                 value = mtu3_readl(ibase, SSUSB_U3_CTRL(i));
                 value |= SSUSB_U3_PORT_PDN;
                 value |= suspend ? 0 : SSUSB_U3_PORT_DIS;
@@ -223,6 +180,8 @@ int ssusb_host_disable(struct ssusb_mtk *ssusb, bool suspend)
 
 static void ssusb_host_setup(struct ssusb_mtk *ssusb)
 {
+        struct otg_switch_mtk *otg_sx = &ssusb->otg_switch;
+
         host_ports_num_get(ssusb);
 
         /*
@@ -231,6 +190,9 @@ static void ssusb_host_setup(struct ssusb_mtk *ssusb)
          */
         ssusb_host_enable(ssusb);
 
+        if (otg_sx->manual_drd_enabled)
+                ssusb_set_force_mode(ssusb, MTU3_DR_FORCE_HOST);
+
         /* if port0 supports dual-role, works as host mode by default */
         ssusb_set_vbus(&ssusb->otg_switch, 1);
 }
@@ -276,19 +238,14 @@ void ssusb_host_exit(struct ssusb_mtk *ssusb)
 
 int ssusb_wakeup_enable(struct ssusb_mtk *ssusb)
 {
-        int ret = 0;
-
-        if (ssusb->wakeup_en) {
-                ret = ssusb_wakeup_clks_enable(ssusb);
+        if (ssusb->wakeup_en)
                 ssusb_wakeup_ip_sleep_en(ssusb);
-        }
-        return ret;
+
+        return 0;
 }
 
 void ssusb_wakeup_disable(struct ssusb_mtk *ssusb)
 {
-        if (ssusb->wakeup_en) {
+        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
index 06b29664470f..6ee371478d89 100644
--- a/drivers/usb/mtu3/mtu3_hw_regs.h
+++ b/drivers/usb/mtu3/mtu3_hw_regs.h
@@ -1,19 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * 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_
@@ -58,6 +49,8 @@
 #define U3D_QCR1                (SSUSB_DEV_BASE + 0x0404)
 #define U3D_QCR2                (SSUSB_DEV_BASE + 0x0408)
 #define U3D_QCR3                (SSUSB_DEV_BASE + 0x040C)
+#define U3D_TXQHIAR1            (SSUSB_DEV_BASE + 0x0484)
+#define U3D_RXQHIAR1            (SSUSB_DEV_BASE + 0x04C4)
 
 #define U3D_TXQCSR1             (SSUSB_DEV_BASE + 0x0510)
 #define U3D_TXQSAR1             (SSUSB_DEV_BASE + 0x0514)
@@ -189,6 +182,13 @@
 #define QMU_RX_COZ(x)           (BIT(16) << (x))
 #define QMU_RX_ZLP(x)           (BIT(0) << (x))
 
+/* U3D_TXQHIAR1 */
+/* U3D_RXQHIAR1 */
+#define QMU_LAST_DONE_PTR_HI(x) (((x) >> 16) & 0xf)
+#define QMU_CUR_GPD_ADDR_HI(x)  (((x) >> 8) & 0xf)
+#define QMU_START_ADDR_HI_MSK   GENMASK(3, 0)
+#define QMU_START_ADDR_HI(x)    (((x) & 0xf) << 0)
+
 /* U3D_TXQCSR1 */
 /* U3D_RXQCSR1 */
 #define QMU_Q_ACTIVE            BIT(15)
@@ -225,6 +225,7 @@
 #define CAP_TX_EP_NUM(x)        ((x) & 0x1f)
 
 /* U3D_MISC_CTRL */
+#define DMA_ADDR_36BIT          BIT(31)
 #define VBUS_ON                 BIT(1)
 #define VBUS_FRC_EN             BIT(0)
 
@@ -457,11 +458,14 @@
 #define SSUSB_VBUS_CHG_INT_B_EN         BIT(6)
 
 /* U3D_SSUSB_U3_CTRL_0P */
+#define SSUSB_U3_PORT_SSP_SPEED BIT(9)
 #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_RG_IDDIG          BIT(12)
+#define SSUSB_U2_PORT_FORCE_IDDIG       BIT(11)
 #define SSUSB_U2_PORT_VBUSVALID BIT(9)
 #define SSUSB_U2_PORT_OTG_SEL           BIT(7)
 #define SSUSB_U2_PORT_HOST              BIT(2)
diff --git a/drivers/usb/mtu3/mtu3_plat.c b/drivers/usb/mtu3/mtu3_plat.c
index 088e3e685c4f..3650fd11fc49 100644
--- a/drivers/usb/mtu3/mtu3_plat.c
+++ b/drivers/usb/mtu3/mtu3_plat.c
@@ -1,17 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * 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>
@@ -21,7 +12,6 @@
 #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"
@@ -110,15 +100,9 @@ static void ssusb_phy_power_off(struct ssusb_mtk *ssusb)
                 phy_power_off(ssusb->phys[i]);
 }
 
-static int ssusb_rscs_init(struct ssusb_mtk *ssusb)
+static int ssusb_clks_enable(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;
-        }
+        int ret;
 
         ret = clk_prepare_enable(ssusb->sys_clk);
         if (ret) {
@@ -132,6 +116,52 @@ static int ssusb_rscs_init(struct ssusb_mtk *ssusb)
                 goto ref_clk_err;
         }
 
+        ret = clk_prepare_enable(ssusb->mcu_clk);
+        if (ret) {
+                dev_err(ssusb->dev, "failed to enable mcu_clk\n");
+                goto mcu_clk_err;
+        }
+
+        ret = clk_prepare_enable(ssusb->dma_clk);
+        if (ret) {
+                dev_err(ssusb->dev, "failed to enable dma_clk\n");
+                goto dma_clk_err;
+        }
+
+        return 0;
+
+dma_clk_err:
+        clk_disable_unprepare(ssusb->mcu_clk);
+mcu_clk_err:
+        clk_disable_unprepare(ssusb->ref_clk);
+ref_clk_err:
+        clk_disable_unprepare(ssusb->sys_clk);
+sys_clk_err:
+        return ret;
+}
+
+static void ssusb_clks_disable(struct ssusb_mtk *ssusb)
+{
+        clk_disable_unprepare(ssusb->dma_clk);
+        clk_disable_unprepare(ssusb->mcu_clk);
+        clk_disable_unprepare(ssusb->ref_clk);
+        clk_disable_unprepare(ssusb->sys_clk);
+}
+
+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 = ssusb_clks_enable(ssusb);
+        if (ret)
+                goto clks_err;
+
         ret = ssusb_phy_init(ssusb);
         if (ret) {
                 dev_err(ssusb->dev, "failed to init phy\n");
@@ -149,20 +179,16 @@ static int ssusb_rscs_init(struct ssusb_mtk *ssusb)
 phy_err:
         ssusb_phy_exit(ssusb);
 phy_init_err:
-        clk_disable_unprepare(ssusb->ref_clk);
-ref_clk_err:
-        clk_disable_unprepare(ssusb->sys_clk);
-sys_clk_err:
+        ssusb_clks_disable(ssusb);
+clks_err:
         regulator_disable(ssusb->vusb33);
 vusb33_err:
-
         return ret;
 }
 
 static void ssusb_rscs_exit(struct ssusb_mtk *ssusb)
 {
-        clk_disable_unprepare(ssusb->sys_clk);
-        clk_disable_unprepare(ssusb->ref_clk);
+        ssusb_clks_disable(ssusb);
         regulator_disable(ssusb->vusb33);
         ssusb_phy_power_off(ssusb);
         ssusb_phy_exit(ssusb);
@@ -176,31 +202,17 @@ static void ssusb_ip_sw_reset(struct ssusb_mtk *ssusb)
         mtu3_clrbits(ssusb->ippc_base, U3D_SSUSB_IP_PW_CTRL0, SSUSB_IP_SW_RST);
 }
 
-static int get_iddig_pinctrl(struct ssusb_mtk *ssusb)
+/* ignore the error if the clock does not exist */
+static struct clk *get_optional_clk(struct device *dev, const char *id)
 {
-        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);
-        }
+        struct clk *opt_clk;
 
-        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);
-        }
+        opt_clk = devm_clk_get(dev, id);
+        /* ignore error number except EPROBE_DEFER */
+        if (IS_ERR(opt_clk) && (PTR_ERR(opt_clk) != -EPROBE_DEFER))
+                opt_clk = NULL;
 
-        return 0;
+        return opt_clk;
 }
 
 static int get_ssusb_rscs(struct platform_device *pdev, struct ssusb_mtk *ssusb)
@@ -225,18 +237,17 @@ static int get_ssusb_rscs(struct platform_device *pdev, struct ssusb_mtk *ssusb)
                 return PTR_ERR(ssusb->sys_clk);
         }
 
-        /*
-         * reference clock is usually a "fixed-clock", make it optional
-         * for backward compatibility and ignore the error if it does
-         * not exist.
-         */
-        ssusb->ref_clk = devm_clk_get(dev, "ref_ck");
-        if (IS_ERR(ssusb->ref_clk)) {
-                if (PTR_ERR(ssusb->ref_clk) == -EPROBE_DEFER)
-                        return -EPROBE_DEFER;
+        ssusb->ref_clk = get_optional_clk(dev, "ref_ck");
+        if (IS_ERR(ssusb->ref_clk))
+                return PTR_ERR(ssusb->ref_clk);
 
-                ssusb->ref_clk = NULL;
-        }
+        ssusb->mcu_clk = get_optional_clk(dev, "mcu_ck");
+        if (IS_ERR(ssusb->mcu_clk))
+                return PTR_ERR(ssusb->mcu_clk);
+
+        ssusb->dma_clk = get_optional_clk(dev, "dma_ck");
+        if (IS_ERR(ssusb->dma_clk))
+                return PTR_ERR(ssusb->dma_clk);
 
         ssusb->num_phys = of_count_phandle_with_args(node,
                         "phys", "#phy-cells");
@@ -263,10 +274,8 @@ static int get_ssusb_rscs(struct platform_device *pdev, struct ssusb_mtk *ssusb)
                 return PTR_ERR(ssusb->ippc_base);
 
         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_UNKNOWN)
+                ssusb->dr_mode = USB_DR_MODE_OTG;
 
         if (ssusb->dr_mode == USB_DR_MODE_PERIPHERAL)
                 return 0;
@@ -276,10 +285,10 @@ static int get_ssusb_rscs(struct platform_device *pdev, struct ssusb_mtk *ssusb)
         if (ret)
                 return ret;
 
-        if (ssusb->dr_mode != USB_DR_MODE_OTG)
-                return 0;
+        /* optional property, ignore the error if it does not exist */
+        of_property_read_u32(node, "mediatek,u3p-dis-msk",
+                             &ssusb->u3p_dis_msk);
 
-        /* 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");
@@ -287,6 +296,10 @@ static int get_ssusb_rscs(struct platform_device *pdev, struct ssusb_mtk *ssusb)
         }
         otg_sx->vbus = vbus;
 
+        if (ssusb->dr_mode == USB_DR_MODE_HOST)
+                return 0;
+
+        /* if dual-role mode is supported */
         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");
@@ -297,15 +310,11 @@ static int get_ssusb_rscs(struct platform_device *pdev, struct ssusb_mtk *ssusb)
                         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);
+        dev_info(dev, "dr_mode: %d, is_u3_dr: %d, u3p_dis_msk: %x, drd: %s\n",
+                ssusb->dr_mode, otg_sx->is_u3_drd, ssusb->u3p_dis_msk,
+                otg_sx->manual_drd_enabled ? "manual" : "auto");
 
         return 0;
 }
@@ -447,8 +456,7 @@ static int __maybe_unused mtu3_suspend(struct device *dev)
 
         ssusb_host_disable(ssusb, true);
         ssusb_phy_power_off(ssusb);
-        clk_disable_unprepare(ssusb->sys_clk);
-        clk_disable_unprepare(ssusb->ref_clk);
+        ssusb_clks_disable(ssusb);
         ssusb_wakeup_enable(ssusb);
 
         return 0;
@@ -466,27 +474,21 @@ static int __maybe_unused mtu3_resume(struct device *dev)
                 return 0;
 
         ssusb_wakeup_disable(ssusb);
-        ret = clk_prepare_enable(ssusb->sys_clk);
-        if (ret)
-                goto err_sys_clk;
-
-        ret = clk_prepare_enable(ssusb->ref_clk);
+        ret = ssusb_clks_enable(ssusb);
         if (ret)
-                goto err_ref_clk;
+                goto clks_err;
 
         ret = ssusb_phy_power_on(ssusb);
         if (ret)
-                goto err_power_on;
+                goto phy_err;
 
         ssusb_host_enable(ssusb);
 
         return 0;
 
-err_power_on:
-        clk_disable_unprepare(ssusb->ref_clk);
-err_ref_clk:
-        clk_disable_unprepare(ssusb->sys_clk);
-err_sys_clk:
+phy_err:
+        ssusb_clks_disable(ssusb);
+clks_err:
         return ret;
 }
 
diff --git a/drivers/usb/mtu3/mtu3_qmu.c b/drivers/usb/mtu3/mtu3_qmu.c
index 7d9ba8a52368..ff62ba232177 100644
--- a/drivers/usb/mtu3/mtu3_qmu.c
+++ b/drivers/usb/mtu3/mtu3_qmu.c
@@ -1,19 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * 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.
- *
  */
 
 /*
@@ -40,7 +31,58 @@
 #define GPD_FLAGS_IOC   BIT(7)
 
 #define GPD_EXT_FLAG_ZLP        BIT(5)
+#define GPD_EXT_NGP(x)          (((x) & 0xf) << 4)
+#define GPD_EXT_BUF(x)          (((x) & 0xf) << 0)
+
+#define HILO_GEN64(hi, lo) (((u64)(hi) << 32) + (lo))
+#define HILO_DMA(hi, lo)        \
+        ((dma_addr_t)HILO_GEN64((le32_to_cpu(hi)), (le32_to_cpu(lo))))
+
+static dma_addr_t read_txq_cur_addr(void __iomem *mbase, u8 epnum)
+{
+        u32 txcpr;
+        u32 txhiar;
+
+        txcpr = mtu3_readl(mbase, USB_QMU_TQCPR(epnum));
+        txhiar = mtu3_readl(mbase, USB_QMU_TQHIAR(epnum));
 
+        return HILO_DMA(QMU_CUR_GPD_ADDR_HI(txhiar), txcpr);
+}
+
+static dma_addr_t read_rxq_cur_addr(void __iomem *mbase, u8 epnum)
+{
+        u32 rxcpr;
+        u32 rxhiar;
+
+        rxcpr = mtu3_readl(mbase, USB_QMU_RQCPR(epnum));
+        rxhiar = mtu3_readl(mbase, USB_QMU_RQHIAR(epnum));
+
+        return HILO_DMA(QMU_CUR_GPD_ADDR_HI(rxhiar), rxcpr);
+}
+
+static void write_txq_start_addr(void __iomem *mbase, u8 epnum, dma_addr_t dma)
+{
+        u32 tqhiar;
+
+        mtu3_writel(mbase, USB_QMU_TQSAR(epnum),
+                    cpu_to_le32(lower_32_bits(dma)));
+        tqhiar = mtu3_readl(mbase, USB_QMU_TQHIAR(epnum));
+        tqhiar &= ~QMU_START_ADDR_HI_MSK;
+        tqhiar |= QMU_START_ADDR_HI(upper_32_bits(dma));
+        mtu3_writel(mbase, USB_QMU_TQHIAR(epnum), tqhiar);
+}
+
+static void write_rxq_start_addr(void __iomem *mbase, u8 epnum, dma_addr_t dma)
+{
+        u32 rqhiar;
+
+        mtu3_writel(mbase, USB_QMU_RQSAR(epnum),
+                    cpu_to_le32(lower_32_bits(dma)));
+        rqhiar = mtu3_readl(mbase, USB_QMU_RQHIAR(epnum));
+        rqhiar &= ~QMU_START_ADDR_HI_MSK;
+        rqhiar |= QMU_START_ADDR_HI(upper_32_bits(dma));
+        mtu3_writel(mbase, USB_QMU_RQHIAR(epnum), rqhiar);
+}
 
 static struct qmu_gpd *gpd_dma_to_virt(struct mtu3_gpd_ring *ring,
                 dma_addr_t dma_addr)
@@ -193,21 +235,27 @@ static int mtu3_prepare_tx_gpd(struct mtu3_ep *mep, struct mtu3_request *mreq)
         struct mtu3_gpd_ring *ring = &mep->gpd_ring;
         struct qmu_gpd *gpd = ring->enqueue;
         struct usb_request *req = &mreq->request;
+        dma_addr_t enq_dma;
+        u16 ext_addr;
 
         /* set all fields to zero as default value */
         memset(gpd, 0, sizeof(*gpd));
 
-        gpd->buffer = cpu_to_le32((u32)req->dma);
+        gpd->buffer = cpu_to_le32(lower_32_bits(req->dma));
+        ext_addr = GPD_EXT_BUF(upper_32_bits(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_dma = gpd_virt_to_dma(ring, enq);
+        dev_dbg(mep->mtu->dev, "TX-EP%d queue gpd=%p, enq=%p, qdma=%pad\n",
+                mep->epnum, gpd, enq, &enq_dma);
 
         enq->flag &= ~GPD_FLAGS_HWO;
-        gpd->next_gpd = cpu_to_le32((u32)gpd_virt_to_dma(ring, enq));
+        gpd->next_gpd = cpu_to_le32(lower_32_bits(enq_dma));
+        ext_addr |= GPD_EXT_NGP(upper_32_bits(enq_dma));
+        gpd->tx_ext_addr = cpu_to_le16(ext_addr);
 
         if (req->zero)
                 gpd->ext_flag |= GPD_EXT_FLAG_ZLP;
@@ -226,21 +274,27 @@ static int mtu3_prepare_rx_gpd(struct mtu3_ep *mep, struct mtu3_request *mreq)
         struct mtu3_gpd_ring *ring = &mep->gpd_ring;
         struct qmu_gpd *gpd = ring->enqueue;
         struct usb_request *req = &mreq->request;
+        dma_addr_t enq_dma;
+        u16 ext_addr;
 
         /* set all fields to zero as default value */
         memset(gpd, 0, sizeof(*gpd));
 
-        gpd->buffer = cpu_to_le32((u32)req->dma);
+        gpd->buffer = cpu_to_le32(lower_32_bits(req->dma));
+        ext_addr = GPD_EXT_BUF(upper_32_bits(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_dma = gpd_virt_to_dma(ring, enq);
+        dev_dbg(mep->mtu->dev, "RX-EP%d queue gpd=%p, enq=%p, qdma=%pad\n",
+                mep->epnum, gpd, enq, &enq_dma);
 
         enq->flag &= ~GPD_FLAGS_HWO;
-        gpd->next_gpd = cpu_to_le32((u32)gpd_virt_to_dma(ring, enq));
+        gpd->next_gpd = cpu_to_le32(lower_32_bits(enq_dma));
+        ext_addr |= GPD_EXT_NGP(upper_32_bits(enq_dma));
+        gpd->rx_ext_addr = cpu_to_le16(ext_addr);
         gpd->chksum = qmu_calc_checksum((u8 *)gpd);
         gpd->flag |= GPD_FLAGS_HWO;
 
@@ -267,8 +321,8 @@ int mtu3_qmu_start(struct mtu3_ep *mep)
 
         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);
+                write_txq_start_addr(mbase, epnum, ring->dma);
+                mtu3_setbits(mbase, MU3D_EP_TXCR0(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));
@@ -282,8 +336,8 @@ int mtu3_qmu_start(struct mtu3_ep *mep)
                 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);
+                write_rxq_start_addr(mbase, epnum, ring->dma);
+                mtu3_setbits(mbase, MU3D_EP_RXCR0(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));
@@ -353,9 +407,9 @@ static void qmu_tx_zlp_error_handler(struct mtu3 *mtu, u8 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;
+        dma_addr_t cur_gpd_dma;
         u32 txcsr = 0;
         int ret;
 
@@ -365,7 +419,8 @@ static void qmu_tx_zlp_error_handler(struct mtu3 *mtu, u8 epnum)
         else
                 return;
 
-        gpd_current = gpd_dma_to_virt(ring, gpd_dma);
+        cur_gpd_dma = read_txq_cur_addr(mbase, epnum);
+        gpd_current = gpd_dma_to_virt(ring, cur_gpd_dma);
 
         if (le16_to_cpu(gpd_current->buf_len) != 0) {
                 dev_err(mtu->dev, "TX EP%d buffer length error(!=0)\n", epnum);
@@ -408,12 +463,13 @@ static void qmu_done_tx(struct mtu3 *mtu, u8 epnum)
         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;
+        dma_addr_t cur_gpd_dma;
 
         /*transfer phy address got from QMU register to virtual address */
-        gpd_current = gpd_dma_to_virt(ring, gpd_dma);
+        cur_gpd_dma = read_txq_cur_addr(mbase, epnum);
+        gpd_current = gpd_dma_to_virt(ring, cur_gpd_dma);
 
         dev_dbg(mtu->dev, "%s EP%d, last=%p, current=%p, enq=%p\n",
                 __func__, epnum, gpd, gpd_current, ring->enqueue);
@@ -446,11 +502,12 @@ static void qmu_done_rx(struct mtu3 *mtu, u8 epnum)
         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;
+        dma_addr_t cur_gpd_dma;
 
-        gpd_current = gpd_dma_to_virt(ring, gpd_dma);
+        cur_gpd_dma = read_rxq_cur_addr(mbase, epnum);
+        gpd_current = gpd_dma_to_virt(ring, cur_gpd_dma);
 
         dev_dbg(mtu->dev, "%s EP%d, last=%p, current=%p, enq=%p\n",
                 __func__, epnum, gpd, gpd_current, ring->enqueue);
diff --git a/drivers/usb/mtu3/mtu3_qmu.h b/drivers/usb/mtu3/mtu3_qmu.h
index 4dafa16bf120..81f5151a55ed 100644
--- a/drivers/usb/mtu3/mtu3_qmu.h
+++ b/drivers/usb/mtu3/mtu3_qmu.h
@@ -1,19 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * 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__
diff --git a/drivers/usb/musb/am35x.c b/drivers/usb/musb/am35x.c
index 02fbb4fe3745..0ad664efda6b 100644
--- a/drivers/usb/musb/am35x.c
+++ b/drivers/usb/musb/am35x.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 
 /*
  * Texas Instruments AM35x "glue layer"
@@ -8,23 +9,6 @@
  * Copyright (c) 2008-2009, MontaVista Software, Inc. <source@mvista.com>
  *
  * This file is part of the Inventra Controller Driver for Linux.
- *
- * The Inventra Controller Driver for Linux 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.
- *
- * The Inventra Controller Driver for Linux is distributed in
- * the hope that it will be useful, but WITHOUT ANY WARRANTY;
- * without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public
- * License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with The Inventra Controller Driver for Linux ; if not,
- * write to the Free Software Foundation, Inc., 59 Temple Place,
- * Suite 330, Boston, MA  02111-1307  USA
- *
  */
 
 #include <linux/module.h>
@@ -133,11 +117,9 @@ static void am35x_musb_set_vbus(struct musb *musb, int is_on)
 
 #define POLL_SECONDS    2
 
-static struct timer_list otg_workaround;
-
-static void otg_timer(unsigned long _musb)
+static void otg_timer(struct timer_list *t)
 {
-        struct musb             *musb = (void *)_musb;
+        struct musb             *musb = from_timer(musb, t, dev_timer);
         void __iomem            *mregs = musb->mregs;
         u8                      devctl;
         unsigned long           flags;
@@ -173,7 +155,7 @@ static void otg_timer(unsigned long _musb)
         case OTG_STATE_B_IDLE:
                 devctl = musb_readb(mregs, MUSB_DEVCTL);
                 if (devctl & MUSB_DEVCTL_BDEVICE)
-                        mod_timer(&otg_workaround, jiffies + POLL_SECONDS * HZ);
+                        mod_timer(&musb->dev_timer, jiffies + POLL_SECONDS * HZ);
                 else
                         musb->xceiv->otg->state = OTG_STATE_A_IDLE;
                 break;
@@ -195,12 +177,12 @@ static void am35x_musb_try_idle(struct musb *musb, unsigned long timeout)
                                 musb->xceiv->otg->state == OTG_STATE_A_WAIT_BCON)) {
                 dev_dbg(musb->controller, "%s active, deleting timer\n",
                         usb_otg_state_string(musb->xceiv->otg->state));
-                del_timer(&otg_workaround);
+                del_timer(&musb->dev_timer);
                 last_timer = jiffies;
                 return;
         }
 
-        if (time_after(last_timer, timeout) && timer_pending(&otg_workaround)) {
+        if (time_after(last_timer, timeout) && timer_pending(&musb->dev_timer)) {
                 dev_dbg(musb->controller, "Longer idle timer already pending, ignoring...\n");
                 return;
         }
@@ -209,7 +191,7 @@ static void am35x_musb_try_idle(struct musb *musb, unsigned long timeout)
         dev_dbg(musb->controller, "%s inactive, starting idle timer for %u ms\n",
                 usb_otg_state_string(musb->xceiv->otg->state),
                 jiffies_to_msecs(timeout - jiffies));
-        mod_timer(&otg_workaround, timeout);
+        mod_timer(&musb->dev_timer, timeout);
 }
 
 static irqreturn_t am35x_musb_interrupt(int irq, void *hci)
@@ -278,14 +260,14 @@ static irqreturn_t am35x_musb_interrupt(int irq, void *hci)
                          */
                         musb->int_usb &= ~MUSB_INTR_VBUSERROR;
                         musb->xceiv->otg->state = OTG_STATE_A_WAIT_VFALL;
-                        mod_timer(&otg_workaround, jiffies + POLL_SECONDS * HZ);
+                        mod_timer(&musb->dev_timer, jiffies + POLL_SECONDS * HZ);
                         WARNING("VBUS error workaround (delay coming)\n");
                 } else if (drvvbus) {
                         MUSB_HST_MODE(musb);
                         otg->default_a = 1;
                         musb->xceiv->otg->state = OTG_STATE_A_WAIT_VRISE;
                         portstate(musb->port1_status |= USB_PORT_STAT_POWER);
-                        del_timer(&otg_workaround);
+                        del_timer(&musb->dev_timer);
                 } else {
                         musb->is_active = 0;
                         MUSB_DEV_MODE(musb);
@@ -324,7 +306,7 @@ eoi:
 
         /* Poll for ID change */
         if (musb->xceiv->otg->state == OTG_STATE_B_IDLE)
-                mod_timer(&otg_workaround, jiffies + POLL_SECONDS * HZ);
+                mod_timer(&musb->dev_timer, jiffies + POLL_SECONDS * HZ);
 
         spin_unlock_irqrestore(&musb->lock, flags);
 
@@ -365,7 +347,7 @@ static int am35x_musb_init(struct musb *musb)
         if (IS_ERR_OR_NULL(musb->xceiv))
                 return -EPROBE_DEFER;
 
-        setup_timer(&otg_workaround, otg_timer, (unsigned long) musb);
+        timer_setup(&musb->dev_timer, otg_timer, 0);
 
         /* Reset the musb */
         if (data->reset)
@@ -395,7 +377,7 @@ static int am35x_musb_exit(struct musb *musb)
         struct musb_hdrc_platform_data *plat = dev_get_platdata(dev);
         struct omap_musb_board_data *data = plat->board_data;
 
-        del_timer_sync(&otg_workaround);
+        del_timer_sync(&musb->dev_timer);
 
         /* Shutdown the on-chip PHY and its PLL. */
         if (data->set_phy_power)
diff --git a/drivers/usb/musb/blackfin.c b/drivers/usb/musb/blackfin.c
index 4418574a36a1..0a98dcd66d19 100644
--- a/drivers/usb/musb/blackfin.c
+++ b/drivers/usb/musb/blackfin.c
@@ -1,11 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * MUSB OTG controller driver for Blackfin Processors
  *
  * Copyright 2006-2008 Analog Devices Inc.
  *
  * Enter bugs at http://blackfin.uclinux.org/
- *
- * Licensed under the GPL-2 or later.
  */
 
 #include <linux/module.h>
@@ -223,7 +222,7 @@ static irqreturn_t blackfin_interrupt(int irq, void *__hci)
         if ((musb->xceiv->otg->state == OTG_STATE_B_IDLE
                 || musb->xceiv->otg->state == OTG_STATE_A_WAIT_BCON) ||
                 (musb->int_usb & MUSB_INTR_DISCONNECT && is_host_active(musb))) {
-                mod_timer(&musb_conn_timer, jiffies + TIMER_DELAY);
+                mod_timer(&musb->dev_timer, jiffies + TIMER_DELAY);
                 musb->a_wait_bcon = TIMER_DELAY;
         }
 
@@ -232,9 +231,9 @@ static irqreturn_t blackfin_interrupt(int irq, void *__hci)
         return retval;
 }
 
-static void musb_conn_timer_handler(unsigned long _musb)
+static void musb_conn_timer_handler(struct timer_list *t)
 {
-        struct musb *musb = (void *)_musb;
+        struct musb *musb = from_timer(musb, t, dev_timer);
         unsigned long flags;
         u16 val;
         static u8 toggle;
@@ -266,7 +265,7 @@ static void musb_conn_timer_handler(unsigned long _musb)
                         musb_writeb(musb->mregs, MUSB_INTRUSB, val);
                         musb->xceiv->otg->state = OTG_STATE_B_IDLE;
                 }
-                mod_timer(&musb_conn_timer, jiffies + TIMER_DELAY);
+                mod_timer(&musb->dev_timer, jiffies + TIMER_DELAY);
                 break;
         case OTG_STATE_B_IDLE:
                 /*
@@ -310,7 +309,7 @@ static void musb_conn_timer_handler(unsigned long _musb)
                          * shortening it, if accelerating A-plug detection
                          * is needed in OTG mode.
                          */
-                        mod_timer(&musb_conn_timer, jiffies + TIMER_DELAY / 4);
+                        mod_timer(&musb->dev_timer, jiffies + TIMER_DELAY / 4);
                 }
                 break;
         default:
@@ -445,8 +444,7 @@ static int bfin_musb_init(struct musb *musb)
 
         bfin_musb_reg_init(musb);
 
-        setup_timer(&musb_conn_timer, musb_conn_timer_handler,
-                        (unsigned long) musb);
+        timer_setup(&musb->dev_timer, musb_conn_timer_handler, 0);
 
         musb->xceiv->set_power = bfin_musb_set_power;
 
diff --git a/drivers/usb/musb/blackfin.h b/drivers/usb/musb/blackfin.h
index c84dae546dc6..5b149915b0f8 100644
--- a/drivers/usb/musb/blackfin.h
+++ b/drivers/usb/musb/blackfin.h
@@ -1,10 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Copyright (C) 2007 by Analog Devices, Inc.
- *
- * The Inventra Controller Driver for Linux 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.
  */
 
 #ifndef __MUSB_BLACKFIN_H__
@@ -82,6 +78,4 @@ static void dump_fifo_data(u8 *buf, u16 len)
 /* Almost 1 second */
 #define TIMER_DELAY     (1 * HZ)
 
-static struct timer_list musb_conn_timer;
-
 #endif  /* __MUSB_BLACKFIN_H__ */
diff --git a/drivers/usb/musb/cppi_dma.c b/drivers/usb/musb/cppi_dma.c
index a13bd3625043..b4d6d9bb3239 100644
--- a/drivers/usb/musb/cppi_dma.c
+++ b/drivers/usb/musb/cppi_dma.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Copyright (C) 2005-2006 by Texas Instruments
  *
diff --git a/drivers/usb/musb/da8xx.c b/drivers/usb/musb/da8xx.c
index df88123274ca..0397606a211b 100644
--- a/drivers/usb/musb/da8xx.c
+++ b/drivers/usb/musb/da8xx.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Texas Instruments DA8xx/OMAP-L1x "glue layer"
  *
@@ -10,23 +11,6 @@
  * 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
- * 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.
- *
- * The Inventra Controller Driver for Linux is distributed in
- * the hope that it will be useful, but WITHOUT ANY WARRANTY;
- * without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public
- * License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with The Inventra Controller Driver for Linux ; if not,
- * write to the Free Software Foundation, Inc., 59 Temple Place,
- * Suite 330, Boston, MA  02111-1307  USA
- *
  */
 
 #include <linux/module.h>
@@ -50,10 +34,7 @@
 #define DA8XX_USB_CTRL_REG      0x04
 #define DA8XX_USB_STAT_REG      0x08
 #define DA8XX_USB_EMULATION_REG 0x0c
-#define DA8XX_USB_MODE_REG      0x10    /* Transparent, CDC, [Generic] RNDIS */
-#define DA8XX_USB_AUTOREQ_REG   0x14
 #define DA8XX_USB_SRP_FIX_TIME_REG 0x18
-#define DA8XX_USB_TEARDOWN_REG  0x1c
 #define DA8XX_USB_INTR_SRC_REG  0x20
 #define DA8XX_USB_INTR_SRC_SET_REG 0x24
 #define DA8XX_USB_INTR_SRC_CLEAR_REG 0x28
@@ -138,11 +119,9 @@ static void da8xx_musb_set_vbus(struct musb *musb, int is_on)
 
 #define POLL_SECONDS    2
 
-static struct timer_list otg_workaround;
-
-static void otg_timer(unsigned long _musb)
+static void otg_timer(struct timer_list *t)
 {
-        struct musb             *musb = (void *)_musb;
+        struct musb             *musb = from_timer(musb, t, dev_timer);
         void __iomem            *mregs = musb->mregs;
         u8                      devctl;
         unsigned long           flags;
@@ -178,7 +157,7 @@ static void otg_timer(unsigned long _musb)
                  * VBUSERR got reported during enumeration" cases.
                  */
                 if (devctl & MUSB_DEVCTL_VBUS) {
-                        mod_timer(&otg_workaround, jiffies + POLL_SECONDS * HZ);
+                        mod_timer(&musb->dev_timer, jiffies + POLL_SECONDS * HZ);
                         break;
                 }
                 musb->xceiv->otg->state = OTG_STATE_A_WAIT_VRISE;
@@ -201,7 +180,7 @@ static void otg_timer(unsigned long _musb)
                 musb_writeb(mregs, MUSB_DEVCTL, devctl | MUSB_DEVCTL_SESSION);
                 devctl = musb_readb(mregs, MUSB_DEVCTL);
                 if (devctl & MUSB_DEVCTL_BDEVICE)
-                        mod_timer(&otg_workaround, jiffies + POLL_SECONDS * HZ);
+                        mod_timer(&musb->dev_timer, jiffies + POLL_SECONDS * HZ);
                 else
                         musb->xceiv->otg->state = OTG_STATE_A_IDLE;
                 break;
@@ -223,12 +202,12 @@ static void da8xx_musb_try_idle(struct musb *musb, unsigned long timeout)
                                 musb->xceiv->otg->state == OTG_STATE_A_WAIT_BCON)) {
                 dev_dbg(musb->controller, "%s active, deleting timer\n",
                         usb_otg_state_string(musb->xceiv->otg->state));
-                del_timer(&otg_workaround);
+                del_timer(&musb->dev_timer);
                 last_timer = jiffies;
                 return;
         }
 
-        if (time_after(last_timer, timeout) && timer_pending(&otg_workaround)) {
+        if (time_after(last_timer, timeout) && timer_pending(&musb->dev_timer)) {
                 dev_dbg(musb->controller, "Longer idle timer already pending, ignoring...\n");
                 return;
         }
@@ -237,7 +216,7 @@ static void da8xx_musb_try_idle(struct musb *musb, unsigned long timeout)
         dev_dbg(musb->controller, "%s inactive, starting idle timer for %u ms\n",
                 usb_otg_state_string(musb->xceiv->otg->state),
                 jiffies_to_msecs(timeout - jiffies));
-        mod_timer(&otg_workaround, timeout);
+        mod_timer(&musb->dev_timer, timeout);
 }
 
 static irqreturn_t da8xx_musb_interrupt(int irq, void *hci)
@@ -297,14 +276,14 @@ static irqreturn_t da8xx_musb_interrupt(int irq, void *hci)
                          */
                         musb->int_usb &= ~MUSB_INTR_VBUSERROR;
                         musb->xceiv->otg->state = OTG_STATE_A_WAIT_VFALL;
-                        mod_timer(&otg_workaround, jiffies + POLL_SECONDS * HZ);
+                        mod_timer(&musb->dev_timer, jiffies + POLL_SECONDS * HZ);
                         WARNING("VBUS error workaround (delay coming)\n");
                 } else if (drvvbus) {
                         MUSB_HST_MODE(musb);
                         otg->default_a = 1;
                         musb->xceiv->otg->state = OTG_STATE_A_WAIT_VRISE;
                         portstate(musb->port1_status |= USB_PORT_STAT_POWER);
-                        del_timer(&otg_workaround);
+                        del_timer(&musb->dev_timer);
                 } else {
                         musb->is_active = 0;
                         MUSB_DEV_MODE(musb);
@@ -331,7 +310,7 @@ static irqreturn_t da8xx_musb_interrupt(int irq, void *hci)
 
         /* Poll for ID change */
         if (musb->xceiv->otg->state == OTG_STATE_B_IDLE)
-                mod_timer(&otg_workaround, jiffies + POLL_SECONDS * HZ);
+                mod_timer(&musb->dev_timer, jiffies + POLL_SECONDS * HZ);
 
         spin_unlock_irqrestore(&musb->lock, flags);
 
@@ -393,7 +372,7 @@ static int da8xx_musb_init(struct musb *musb)
                 goto fail;
         }
 
-        setup_timer(&otg_workaround, otg_timer, (unsigned long)musb);
+        timer_setup(&musb->dev_timer, otg_timer, 0);
 
         /* Reset the controller */
         musb_writel(reg_base, DA8XX_USB_CTRL_REG, DA8XX_SOFT_RESET_MASK);
@@ -431,7 +410,7 @@ static int da8xx_musb_exit(struct musb *musb)
 {
         struct da8xx_glue *glue = dev_get_drvdata(musb->controller->parent);
 
-        del_timer_sync(&otg_workaround);
+        del_timer_sync(&musb->dev_timer);
 
         phy_power_off(glue->phy);
         phy_exit(glue->phy);
diff --git a/drivers/usb/musb/davinci.c b/drivers/usb/musb/davinci.c
index 52b491d3d5d8..2ad39dcd2f4c 100644
--- a/drivers/usb/musb/davinci.c
+++ b/drivers/usb/musb/davinci.c
@@ -1,24 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Copyright (C) 2005-2006 by Texas Instruments
  *
  * This file is part of the Inventra Controller Driver for Linux.
- *
- * The Inventra Controller Driver for Linux 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.
- *
- * The Inventra Controller Driver for Linux is distributed in
- * the hope that it will be useful, but WITHOUT ANY WARRANTY;
- * without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public
- * License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with The Inventra Controller Driver for Linux ; if not,
- * write to the Free Software Foundation, Inc., 59 Temple Place,
- * Suite 330, Boston, MA  02111-1307  USA
- *
  */
 
 #include <linux/module.h>
@@ -199,11 +183,9 @@ static void davinci_musb_set_vbus(struct musb *musb, int is_on)
 
 #define POLL_SECONDS    2
 
-static struct timer_list otg_workaround;
-
-static void otg_timer(unsigned long _musb)
+static void otg_timer(struct timer_list *t)
 {
-        struct musb             *musb = (void *)_musb;
+        struct musb             *musb = from_timer(musb, t, dev_timer);
         void __iomem            *mregs = musb->mregs;
         u8                      devctl;
         unsigned long           flags;
@@ -224,7 +206,7 @@ static void otg_timer(unsigned long _musb)
                  * VBUSERR got reported during enumeration" cases.
                  */
                 if (devctl & MUSB_DEVCTL_VBUS) {
-                        mod_timer(&otg_workaround, jiffies + POLL_SECONDS * HZ);
+                        mod_timer(&musb->dev_timer, jiffies + POLL_SECONDS * HZ);
                         break;
                 }
                 musb->xceiv->otg->state = OTG_STATE_A_WAIT_VRISE;
@@ -248,7 +230,7 @@ static void otg_timer(unsigned long _musb)
                                 devctl | MUSB_DEVCTL_SESSION);
                 devctl = musb_readb(mregs, MUSB_DEVCTL);
                 if (devctl & MUSB_DEVCTL_BDEVICE)
-                        mod_timer(&otg_workaround, jiffies + POLL_SECONDS * HZ);
+                        mod_timer(&musb->dev_timer, jiffies + POLL_SECONDS * HZ);
                 else
                         musb->xceiv->otg->state = OTG_STATE_A_IDLE;
                 break;
@@ -325,14 +307,14 @@ static irqreturn_t davinci_musb_interrupt(int irq, void *__hci)
                          */
                         musb->int_usb &= ~MUSB_INTR_VBUSERROR;
                         musb->xceiv->otg->state = OTG_STATE_A_WAIT_VFALL;
-                        mod_timer(&otg_workaround, jiffies + POLL_SECONDS * HZ);
+                        mod_timer(&musb->dev_timer, jiffies + POLL_SECONDS * HZ);
                         WARNING("VBUS error workaround (delay coming)\n");
                 } else if (drvvbus) {
                         MUSB_HST_MODE(musb);
                         otg->default_a = 1;
                         musb->xceiv->otg->state = OTG_STATE_A_WAIT_VRISE;
                         portstate(musb->port1_status |= USB_PORT_STAT_POWER);
-                        del_timer(&otg_workaround);
+                        del_timer(&musb->dev_timer);
                 } else {
                         musb->is_active = 0;
                         MUSB_DEV_MODE(musb);
@@ -361,7 +343,7 @@ static irqreturn_t davinci_musb_interrupt(int irq, void *__hci)
 
         /* poll for ID change */
         if (musb->xceiv->otg->state == OTG_STATE_B_IDLE)
-                mod_timer(&otg_workaround, jiffies + POLL_SECONDS * HZ);
+                mod_timer(&musb->dev_timer, jiffies + POLL_SECONDS * HZ);
 
         spin_unlock_irqrestore(&musb->lock, flags);
 
@@ -393,7 +375,7 @@ static int davinci_musb_init(struct musb *musb)
         if (revision == 0)
                 goto fail;
 
-        setup_timer(&otg_workaround, otg_timer, (unsigned long) musb);
+        timer_setup(&musb->dev_timer, otg_timer, 0);
 
         davinci_musb_source_power(musb, 0, 1);
 
@@ -443,7 +425,7 @@ unregister:
 
 static int davinci_musb_exit(struct musb *musb)
 {
-        del_timer_sync(&otg_workaround);
+        del_timer_sync(&musb->dev_timer);
 
         /* force VBUS off */
         if (cpu_is_davinci_dm355()) {
diff --git a/drivers/usb/musb/davinci.h b/drivers/usb/musb/davinci.h
index 371baa0ee509..e021485c83ae 100644
--- a/drivers/usb/musb/davinci.h
+++ b/drivers/usb/musb/davinci.h
@@ -1,10 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Copyright (C) 2005-2006 by Texas Instruments
- *
- * The Inventra Controller Driver for Linux 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.
  */
 
 #ifndef __MUSB_HDRDF_H__
diff --git a/drivers/usb/musb/jz4740.c b/drivers/usb/musb/jz4740.c
index 40c68c23d553..04d8b2bc205a 100644
--- a/drivers/usb/musb/jz4740.c
+++ b/drivers/usb/musb/jz4740.c
@@ -1,16 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Ingenic JZ4740 "glue layer"
  *
  * Copyright (C) 2013, Apelete Seketeli <apelete@seketeli.net>
- *
- * 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.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
 #include <linux/clk.h>
diff --git a/drivers/usb/musb/musb_am335x.c b/drivers/usb/musb/musb_am335x.c
index 1e58ed2361cc..5f04f8e3a640 100644
--- a/drivers/usb/musb/musb_am335x.c
+++ b/drivers/usb/musb/musb_am335x.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/platform_device.h>
 #include <linux/pm_runtime.h>
 #include <linux/module.h>
diff --git a/drivers/usb/musb/musb_core.c b/drivers/usb/musb/musb_core.c
index ff5a1a8989d5..ea5013aa69e2 100644
--- a/drivers/usb/musb/musb_core.c
+++ b/drivers/usb/musb/musb_core.c
@@ -1,35 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * MUSB OTG driver core code
  *
  * Copyright 2005 Mentor Graphics Corporation
  * Copyright (C) 2005-2006 by Texas Instruments
  * Copyright (C) 2006-2007 Nokia Corporation
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * version 2 as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA
- *
- * THIS SOFTWARE IS PROVIDED "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 AUTHORS 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.
- *
  */
 
 /*
@@ -485,9 +460,9 @@ void musb_load_testpacket(struct musb *musb)
 /*
  * Handles OTG hnp timeouts, such as b_ase0_brst
  */
-static void musb_otg_timer_func(unsigned long data)
+static void musb_otg_timer_func(struct timer_list *t)
 {
-        struct musb     *musb = (struct musb *)data;
+        struct musb     *musb = from_timer(musb, t, otg_timer);
         unsigned long   flags;
 
         spin_lock_irqsave(&musb->lock, flags);
@@ -767,6 +742,7 @@ static irqreturn_t musb_stage0_irq(struct musb *musb, u8 int_usb,
                 case OTG_STATE_B_IDLE:
                         if (!musb->is_active)
                                 break;
+                        /* fall through */
                 case OTG_STATE_B_PERIPHERAL:
                         musb_g_suspend(musb);
                         musb->is_active = musb->g.b_hnp_enable;
@@ -2330,7 +2306,7 @@ musb_init_controller(struct device *dev, int nIrq, void __iomem *ctrl)
         if (status < 0)
                 goto fail3;
 
-        setup_timer(&musb->otg_timer, musb_otg_timer_func, (unsigned long) musb);
+        timer_setup(&musb->otg_timer, musb_otg_timer_func, 0);
 
         /* attach to the IRQ */
         if (request_irq(nIrq, musb->isr, IRQF_SHARED, dev_name(dev), musb)) {
diff --git a/drivers/usb/musb/musb_core.h b/drivers/usb/musb/musb_core.h
index 20f4614178d9..385841ee6f46 100644
--- a/drivers/usb/musb/musb_core.h
+++ b/drivers/usb/musb/musb_core.h
@@ -1,35 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * MUSB OTG driver defines
  *
  * Copyright 2005 Mentor Graphics Corporation
  * Copyright (C) 2005-2006 by Texas Instruments
  * Copyright (C) 2006-2007 Nokia Corporation
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * version 2 as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA
- *
- * THIS SOFTWARE IS PROVIDED "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 AUTHORS 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.
- *
  */
 
 #ifndef __MUSB_CORE_H__
@@ -345,6 +320,7 @@ struct musb {
         struct list_head        pending_list;   /* pending work list */
 
         struct timer_list       otg_timer;
+        struct timer_list       dev_timer;
         struct notifier_block   nb;
 
         struct dma_controller   *dma_controller;
diff --git a/drivers/usb/musb/musb_cppi41.c b/drivers/usb/musb/musb_cppi41.c
index 1ec0a4947b6b..d0dd4f470bbe 100644
--- a/drivers/usb/musb/musb_cppi41.c
+++ b/drivers/usb/musb/musb_cppi41.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/device.h>
 #include <linux/dma-mapping.h>
 #include <linux/dmaengine.h>
diff --git a/drivers/usb/musb/musb_debug.h b/drivers/usb/musb/musb_debug.h
index 9a78877a8afe..5e0f079dde21 100644
--- a/drivers/usb/musb/musb_debug.h
+++ b/drivers/usb/musb/musb_debug.h
@@ -1,35 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * MUSB OTG driver debug defines
  *
  * Copyright 2005 Mentor Graphics Corporation
  * Copyright (C) 2005-2006 by Texas Instruments
  * Copyright (C) 2006-2007 Nokia Corporation
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * version 2 as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA
- *
- * THIS SOFTWARE IS PROVIDED "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 AUTHORS 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.
- *
  */
 
 #ifndef __MUSB_LINUX_DEBUG_H__
diff --git a/drivers/usb/musb/musb_debugfs.c b/drivers/usb/musb/musb_debugfs.c
index 952733ceaac8..7cf5a1bbdaff 100644
--- a/drivers/usb/musb/musb_debugfs.c
+++ b/drivers/usb/musb/musb_debugfs.c
@@ -1,34 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * MUSB OTG driver debugfs support
  *
  * Copyright 2010 Nokia Corporation
  * Contact: Felipe Balbi <felipe.balbi@nokia.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.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA
- *
- * THIS SOFTWARE IS PROVIDED "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 AUTHORS 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/module.h>
diff --git a/drivers/usb/musb/musb_dma.h b/drivers/usb/musb/musb_dma.h
index 04c3bd86bd62..a4241f4d430e 100644
--- a/drivers/usb/musb/musb_dma.h
+++ b/drivers/usb/musb/musb_dma.h
@@ -1,35 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * MUSB OTG driver DMA controller abstraction
  *
  * Copyright 2005 Mentor Graphics Corporation
  * Copyright (C) 2005-2006 by Texas Instruments
  * Copyright (C) 2006-2007 Nokia Corporation
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * version 2 as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA
- *
- * THIS SOFTWARE IS PROVIDED "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 AUTHORS 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.
- *
  */
 
 #ifndef __MUSB_DMA_H__
diff --git a/drivers/usb/musb/musb_dsps.c b/drivers/usb/musb/musb_dsps.c
index f6b526606ad1..05a679d5e3a2 100644
--- a/drivers/usb/musb/musb_dsps.c
+++ b/drivers/usb/musb/musb_dsps.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Texas Instruments DSPS platforms "glue layer"
  *
@@ -7,22 +8,6 @@
  *
  * This file is part of the Inventra Controller Driver for Linux.
  *
- * The Inventra Controller Driver for Linux 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.
- *
- * The Inventra Controller Driver for Linux is distributed in
- * the hope that it will be useful, but WITHOUT ANY WARRANTY;
- * without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public
- * License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with The Inventra Controller Driver for Linux ; if not,
- * write to the Free Software Foundation, Inc., 59 Temple Place,
- * Suite 330, Boston, MA  02111-1307  USA
- *
  * musb_dsps.c will be a common file for all the TI DSPS platforms
  * such as dm64x, dm36x, dm35x, da8x, am35x and ti81x.
  * For now only ti81x is using this and in future davinci.c, am35x.c
@@ -119,7 +104,6 @@ struct dsps_glue {
         struct platform_device *musb;   /* child musb pdev */
         const struct dsps_musb_wrapper *wrp; /* wrapper register offsets */
         int vbus_irq;                   /* optional vbus irq */
-        struct timer_list timer;        /* otg_workaround timer */
         unsigned long last_timer;    /* last timer data for each instance */
         bool sw_babble_enabled;
         void __iomem *usbss_base;
@@ -149,6 +133,7 @@ static const struct debugfs_reg32 dsps_musb_regs[] = {
 
 static void dsps_mod_timer(struct dsps_glue *glue, int wait_ms)
 {
+        struct musb *musb = platform_get_drvdata(glue->musb);
         int wait;
 
         if (wait_ms < 0)
@@ -156,7 +141,7 @@ static void dsps_mod_timer(struct dsps_glue *glue, int wait_ms)
         else
                 wait = msecs_to_jiffies(wait_ms);
 
-        mod_timer(&glue->timer, jiffies + wait);
+        mod_timer(&musb->dev_timer, jiffies + wait);
 }
 
 /*
@@ -216,7 +201,7 @@ static void dsps_musb_disable(struct musb *musb)
         musb_writel(reg_base, wrp->coreintr_clear, wrp->usb_bitmap);
         musb_writel(reg_base, wrp->epintr_clear,
                          wrp->txep_bitmap | wrp->rxep_bitmap);
-        del_timer_sync(&glue->timer);
+        del_timer_sync(&musb->dev_timer);
 }
 
 /* Caller must take musb->lock */
@@ -230,7 +215,7 @@ static int dsps_check_status(struct musb *musb, void *unused)
         int skip_session = 0;
 
         if (glue->vbus_irq)
-                del_timer(&glue->timer);
+                del_timer(&musb->dev_timer);
 
         /*
          * We poll because DSPS IP's won't expose several OTG-critical
@@ -282,9 +267,9 @@ static int dsps_check_status(struct musb *musb, void *unused)
         return 0;
 }
 
-static void otg_timer(unsigned long _musb)
+static void otg_timer(struct timer_list *t)
 {
-        struct musb *musb = (void *)_musb;
+        struct musb *musb = from_timer(musb, t, dev_timer);
         struct device *dev = musb->controller;
         unsigned long flags;
         int err;
@@ -480,7 +465,7 @@ static int dsps_musb_init(struct musb *musb)
                 }
         }
 
-        setup_timer(&glue->timer, otg_timer, (unsigned long) musb);
+        timer_setup(&musb->dev_timer, otg_timer, 0);
 
         /* Reset the musb */
         musb_writel(reg_base, wrp->control, (1 << wrp->reset));
@@ -515,7 +500,7 @@ static int dsps_musb_exit(struct musb *musb)
         struct device *dev = musb->controller;
         struct dsps_glue *glue = dev_get_drvdata(dev->parent);
 
-        del_timer_sync(&glue->timer);
+        del_timer_sync(&musb->dev_timer);
         usb_phy_shutdown(musb->xceiv);
         phy_power_off(musb->phy);
         phy_exit(musb->phy);
@@ -1027,7 +1012,7 @@ static int dsps_suspend(struct device *dev)
                 return ret;
         }
 
-        del_timer_sync(&glue->timer);
+        del_timer_sync(&musb->dev_timer);
 
         mbase = musb->ctrl_base;
         glue->context.control = musb_readl(mbase, wrp->control);
diff --git a/drivers/usb/musb/musb_gadget.c b/drivers/usb/musb/musb_gadget.c
index bc6d1717c9ec..293e5b8da565 100644
--- a/drivers/usb/musb/musb_gadget.c
+++ b/drivers/usb/musb/musb_gadget.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * MUSB OTG driver peripheral support
  *
@@ -5,32 +6,6 @@
  * Copyright (C) 2005-2006 by Texas Instruments
  * Copyright (C) 2006-2007 Nokia Corporation
  * Copyright (C) 2009 MontaVista Software, Inc. <source@mvista.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.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA
- *
- * THIS SOFTWARE IS PROVIDED "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 AUTHORS 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>
diff --git a/drivers/usb/musb/musb_gadget.h b/drivers/usb/musb/musb_gadget.h
index 0314dfc770c7..9c34aca06db6 100644
--- a/drivers/usb/musb/musb_gadget.h
+++ b/drivers/usb/musb/musb_gadget.h
@@ -1,35 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * MUSB OTG driver peripheral defines
  *
  * Copyright 2005 Mentor Graphics Corporation
  * Copyright (C) 2005-2006 by Texas Instruments
  * Copyright (C) 2006-2007 Nokia Corporation
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * version 2 as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA
- *
- * THIS SOFTWARE IS PROVIDED "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 AUTHORS 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.
- *
  */
 
 #ifndef __MUSB_GADGET_H
diff --git a/drivers/usb/musb/musb_gadget_ep0.c b/drivers/usb/musb/musb_gadget_ep0.c
index 844a309fe895..18da4873e52e 100644
--- a/drivers/usb/musb/musb_gadget_ep0.c
+++ b/drivers/usb/musb/musb_gadget_ep0.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * MUSB OTG peripheral driver ep0 handling
  *
@@ -5,32 +6,6 @@
  * Copyright (C) 2005-2006 by Texas Instruments
  * Copyright (C) 2006-2007 Nokia Corporation
  * Copyright (C) 2008-2009 MontaVista Software, Inc. <source@mvista.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.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA
- *
- * THIS SOFTWARE IS PROVIDED "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 AUTHORS 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>
diff --git a/drivers/usb/musb/musb_host.c b/drivers/usb/musb/musb_host.c
index b17450a59882..2627363fb4fe 100644
--- a/drivers/usb/musb/musb_host.c
+++ b/drivers/usb/musb/musb_host.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * MUSB OTG driver host support
  *
@@ -5,32 +6,6 @@
  * Copyright (C) 2005-2006 by Texas Instruments
  * Copyright (C) 2006-2007 Nokia Corporation
  * Copyright (C) 2008-2009 MontaVista Software, Inc. <source@mvista.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.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA
- *
- * THIS SOFTWARE IS PROVIDED "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 AUTHORS 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/module.h>
diff --git a/drivers/usb/musb/musb_host.h b/drivers/usb/musb/musb_host.h
index 7bbf01bf4bb0..72392bbcd0a4 100644
--- a/drivers/usb/musb/musb_host.h
+++ b/drivers/usb/musb/musb_host.h
@@ -1,35 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * MUSB OTG driver host defines
  *
  * Copyright 2005 Mentor Graphics Corporation
  * Copyright (C) 2005-2006 by Texas Instruments
  * Copyright (C) 2006-2007 Nokia Corporation
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * version 2 as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA
- *
- * THIS SOFTWARE IS PROVIDED "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 AUTHORS 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.
- *
  */
 
 #ifndef _MUSB_HOST_H
diff --git a/drivers/usb/musb/musb_io.h b/drivers/usb/musb/musb_io.h
index 17a80ae20674..b7025b2e6e00 100644
--- a/drivers/usb/musb/musb_io.h
+++ b/drivers/usb/musb/musb_io.h
@@ -1,35 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * MUSB OTG driver register I/O
  *
  * Copyright 2005 Mentor Graphics Corporation
  * Copyright (C) 2005-2006 by Texas Instruments
  * Copyright (C) 2006-2007 Nokia Corporation
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * version 2 as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA
- *
- * THIS SOFTWARE IS PROVIDED "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 AUTHORS 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.
- *
  */
 
 #ifndef __MUSB_LINUX_PLATFORM_ARCH_H__
diff --git a/drivers/usb/musb/musb_regs.h b/drivers/usb/musb/musb_regs.h
index cff5bcf0d00f..a4beba184798 100644
--- a/drivers/usb/musb/musb_regs.h
+++ b/drivers/usb/musb/musb_regs.h
@@ -1,35 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * MUSB OTG driver register defines
  *
  * Copyright 2005 Mentor Graphics Corporation
  * Copyright (C) 2005-2006 by Texas Instruments
  * Copyright (C) 2006-2007 Nokia Corporation
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * version 2 as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA
- *
- * THIS SOFTWARE IS PROVIDED "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 AUTHORS 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.
- *
  */
 
 #ifndef __MUSB_REGS_H__
diff --git a/drivers/usb/musb/musb_trace.c b/drivers/usb/musb/musb_trace.c
index 70973d901a21..476872adce80 100644
--- a/drivers/usb/musb/musb_trace.c
+++ b/drivers/usb/musb/musb_trace.c
@@ -1,18 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * musb_trace.c - MUSB Controller Trace Support
  *
  * Copyright (C) 2015 Texas Instruments Incorporated - http://www.ti.com
  *
  * Author: Bin Liu <b-liu@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.
  */
 
 #define CREATE_TRACE_POINTS
diff --git a/drivers/usb/musb/musb_trace.h b/drivers/usb/musb/musb_trace.h
index f031c9e74322..a97d618fe8ff 100644
--- a/drivers/usb/musb/musb_trace.h
+++ b/drivers/usb/musb/musb_trace.h
@@ -1,18 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * musb_trace.h - MUSB Controller Trace Support
  *
  * Copyright (C) 2015 Texas Instruments Incorporated - http://www.ti.com
  *
  * Author: Bin Liu <b-liu@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.
  */
 
 #undef TRACE_SYSTEM
diff --git a/drivers/usb/musb/musb_virthub.c b/drivers/usb/musb/musb_virthub.c
index 0b4595439d51..5165d2b07ade 100644
--- a/drivers/usb/musb/musb_virthub.c
+++ b/drivers/usb/musb/musb_virthub.c
@@ -1,35 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * MUSB OTG driver virtual root hub support
  *
  * Copyright 2005 Mentor Graphics Corporation
  * Copyright (C) 2005-2006 by Texas Instruments
  * Copyright (C) 2006-2007 Nokia Corporation
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * version 2 as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA
- *
- * THIS SOFTWARE IS PROVIDED "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 AUTHORS 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/module.h>
diff --git a/drivers/usb/musb/musbhsdma.c b/drivers/usb/musb/musbhsdma.c
index 3620073da58c..21fb9e6622f3 100644
--- a/drivers/usb/musb/musbhsdma.c
+++ b/drivers/usb/musb/musbhsdma.c
@@ -1,34 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * MUSB OTG driver - support for Mentor's DMA controller
  *
  * Copyright 2005 Mentor Graphics Corporation
  * Copyright (C) 2005-2007 by Texas Instruments
- *
- * 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.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA
- *
- * THIS SOFTWARE IS PROVIDED "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 AUTHORS 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/device.h>
 #include <linux/interrupt.h>
diff --git a/drivers/usb/musb/musbhsdma.h b/drivers/usb/musb/musbhsdma.h
index a3dcbd55e436..44f7983df0a1 100644
--- a/drivers/usb/musb/musbhsdma.h
+++ b/drivers/usb/musb/musbhsdma.h
@@ -1,34 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * MUSB OTG driver - support for Mentor's DMA controller
  *
  * Copyright 2005 Mentor Graphics Corporation
  * Copyright (C) 2005-2007 by Texas Instruments
- *
- * 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.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA
- *
- * THIS SOFTWARE IS PROVIDED "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 AUTHORS 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.
- *
  */
 
 #ifndef CONFIG_BLACKFIN
diff --git a/drivers/usb/musb/omap2430.c b/drivers/usb/musb/omap2430.c
index 456f3e6ecf03..5d705930ef47 100644
--- a/drivers/usb/musb/omap2430.c
+++ b/drivers/usb/musb/omap2430.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Copyright (C) 2005-2007 by Texas Instruments
  * Some code has been taken from tusb6010.c
@@ -6,23 +7,6 @@
  * Tony Lindgren <tony@atomide.com>
  *
  * This file is part of the Inventra Controller Driver for Linux.
- *
- * The Inventra Controller Driver for Linux 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.
- *
- * The Inventra Controller Driver for Linux is distributed in
- * the hope that it will be useful, but WITHOUT ANY WARRANTY;
- * without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public
- * License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with The Inventra Controller Driver for Linux ; if not,
- * write to the Free Software Foundation, Inc., 59 Temple Place,
- * Suite 330, Boston, MA  02111-1307  USA
- *
  */
 #include <linux/module.h>
 #include <linux/kernel.h>
diff --git a/drivers/usb/musb/omap2430.h b/drivers/usb/musb/omap2430.h
index 1b5e83a9840e..859008fa0e3c 100644
--- a/drivers/usb/musb/omap2430.h
+++ b/drivers/usb/musb/omap2430.h
@@ -1,10 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Copyright (C) 2005-2006 by Texas Instruments
- *
- * The Inventra Controller Driver for Linux 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.
  */
 
 #ifndef __MUSB_OMAP243X_H__
diff --git a/drivers/usb/musb/sunxi.c b/drivers/usb/musb/sunxi.c
index dc353e24d53c..2d201219ecff 100644
--- a/drivers/usb/musb/sunxi.c
+++ b/drivers/usb/musb/sunxi.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Allwinner sun4i MUSB Glue Layer
  *
@@ -5,16 +6,6 @@
  *
  * Based on code from
  * Allwinner Technology Co., Ltd. <www.allwinnertech.com>
- *
- * 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.
- *
- * 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>
diff --git a/drivers/usb/musb/tusb6010.c b/drivers/usb/musb/tusb6010.c
index 4eb640c54f2c..39453287b5c3 100644
--- a/drivers/usb/musb/tusb6010.c
+++ b/drivers/usb/musb/tusb6010.c
@@ -1,13 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * TUSB6010 USB 2.0 OTG Dual Role controller
  *
  * Copyright (C) 2006 Nokia Corporation
  * Tony Lindgren <tony@atomide.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.
- *
  * Notes:
  * - Driver assumes that interface to external host (main CPU) is
  *   configured for NOR FLASH interface instead of VLYNQ serial
@@ -452,11 +449,9 @@ static int tusb_musb_vbus_status(struct musb *musb)
         return ret;
 }
 
-static struct timer_list musb_idle_timer;
-
-static void musb_do_idle(unsigned long _musb)
+static void musb_do_idle(struct timer_list *t)
 {
-        struct musb     *musb = (void *)_musb;
+        struct musb     *musb = from_timer(musb, t, dev_timer);
         unsigned long   flags;
 
         spin_lock_irqsave(&musb->lock, flags);
@@ -523,13 +518,13 @@ static void tusb_musb_try_idle(struct musb *musb, unsigned long timeout)
                         && (musb->xceiv->otg->state == OTG_STATE_A_WAIT_BCON))) {
                 dev_dbg(musb->controller, "%s active, deleting timer\n",
                         usb_otg_state_string(musb->xceiv->otg->state));
-                del_timer(&musb_idle_timer);
+                del_timer(&musb->dev_timer);
                 last_timer = jiffies;
                 return;
         }
 
         if (time_after(last_timer, timeout)) {
-                if (!timer_pending(&musb_idle_timer))
+                if (!timer_pending(&musb->dev_timer))
                         last_timer = timeout;
                 else {
                         dev_dbg(musb->controller, "Longer idle timer already pending, ignoring\n");
@@ -541,7 +536,7 @@ static void tusb_musb_try_idle(struct musb *musb, unsigned long timeout)
         dev_dbg(musb->controller, "%s inactive, for idle timer for %lu ms\n",
                 usb_otg_state_string(musb->xceiv->otg->state),
                 (unsigned long)jiffies_to_msecs(timeout - jiffies));
-        mod_timer(&musb_idle_timer, timeout);
+        mod_timer(&musb->dev_timer, timeout);
 }
 
 /* ticks of 60 MHz clock */
@@ -873,7 +868,7 @@ static irqreturn_t tusb_musb_interrupt(int irq, void *__hci)
         }
 
         if (int_src & TUSB_INT_SRC_USB_IP_CONN)
-                del_timer(&musb_idle_timer);
+                del_timer(&musb->dev_timer);
 
         /* OTG state change reports (annoyingly) not issued by Mentor core */
         if (int_src & (TUSB_INT_SRC_VBUS_SENSE_CHNG
@@ -982,7 +977,7 @@ static void tusb_musb_disable(struct musb *musb)
         musb_writel(tbase, TUSB_DMA_INT_MASK, 0x7fffffff);
         musb_writel(tbase, TUSB_GPIO_INT_MASK, 0x1ff);
 
-        del_timer(&musb_idle_timer);
+        del_timer(&musb->dev_timer);
 
         if (is_dma_capable() && !dma_off) {
                 printk(KERN_WARNING "%s %s: dma still active\n",
@@ -1142,7 +1137,7 @@ static int tusb_musb_init(struct musb *musb)
         musb->xceiv->set_power = tusb_draw_power;
         the_musb = musb;
 
-        setup_timer(&musb_idle_timer, musb_do_idle, (unsigned long) musb);
+        timer_setup(&musb->dev_timer, musb_do_idle, 0);
 
 done:
         if (ret < 0) {
@@ -1156,7 +1151,7 @@ done:
 
 static int tusb_musb_exit(struct musb *musb)
 {
-        del_timer_sync(&musb_idle_timer);
+        del_timer_sync(&musb->dev_timer);
         the_musb = NULL;
 
         if (musb->board_set_power)
diff --git a/drivers/usb/musb/tusb6010.h b/drivers/usb/musb/tusb6010.h
index 72cdad23ced9..fd8025bbece7 100644
--- a/drivers/usb/musb/tusb6010.h
+++ b/drivers/usb/musb/tusb6010.h
@@ -1,12 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Definitions for TUSB6010 USB 2.0 OTG Dual Role controller
  *
  * Copyright (C) 2006 Nokia Corporation
  * Tony Lindgren <tony@atomide.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.
  */
 
 #ifndef __TUSB6010_H__
diff --git a/drivers/usb/musb/tusb6010_omap.c b/drivers/usb/musb/tusb6010_omap.c
index e8060e49b0f4..60a93b8bbe3c 100644
--- a/drivers/usb/musb/tusb6010_omap.c
+++ b/drivers/usb/musb/tusb6010_omap.c
@@ -1,12 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * TUSB6010 USB 2.0 OTG Dual Role controller OMAP DMA interface
  *
  * Copyright (C) 2006 Nokia Corporation
  * Tony Lindgren <tony@atomide.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/module.h>
 #include <linux/kernel.h>
diff --git a/drivers/usb/musb/ux500.c b/drivers/usb/musb/ux500.c
index 5a572500c418..27b4a77a9e23 100644
--- a/drivers/usb/musb/ux500.c
+++ b/drivers/usb/musb/ux500.c
@@ -1,22 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright (C) 2010 ST-Ericsson AB
  * Mian Yousaf Kaukab <mian.yousaf.kaukab@stericsson.com>
  *
  * Based on omap2430.c
- *
- * 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.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
 #include <linux/module.h>
diff --git a/drivers/usb/musb/ux500_dma.c b/drivers/usb/musb/ux500_dma.c
index c92a295049ad..d19bb3e89da6 100644
--- a/drivers/usb/musb/ux500_dma.c
+++ b/drivers/usb/musb/ux500_dma.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * drivers/usb/musb/ux500_dma.c
  *
@@ -9,19 +10,6 @@
  *      Mian Yousaf Kaukab <mian.yousaf.kaukab@stericsson.com>
  *      Praveena Nadahally <praveen.nadahally@stericsson.com>
  *      Rajaram Regupathy <ragupathy.rajaram@stericsson.com>
- *
- * 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.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <linux/device.h>
diff --git a/drivers/usb/phy/Kconfig b/drivers/usb/phy/Kconfig
index aff702c0eb9f..0f8ab981d572 100644
--- a/drivers/usb/phy/Kconfig
+++ b/drivers/usb/phy/Kconfig
@@ -137,35 +137,6 @@ config USB_ISP1301
           To compile this driver as a module, choose M here: the
           module will be called phy-isp1301.
 
-config USB_MSM_OTG
-        tristate "Qualcomm on-chip USB OTG controller support"
-        depends on (USB || USB_GADGET) && (ARCH_QCOM || COMPILE_TEST)
-        depends on USB_GADGET || !USB_GADGET # if USB_GADGET=m, this can't be 'y'
-        depends on RESET_CONTROLLER
-        select USB_PHY
-        help
-          Enable this to support the USB OTG transceiver on Qualcomm chips. It
-          handles PHY initialization, clock management, and workarounds
-          required after resetting the hardware and power management.
-          This driver is required even for peripheral only or host only
-          mode configurations.
-          This driver is not supported on boards like trout which
-          has an external PHY.
-
-config USB_QCOM_8X16_PHY
-        tristate "Qualcomm APQ8016/MSM8916 on-chip USB PHY controller support"
-        depends on ARCH_QCOM || COMPILE_TEST
-        depends on RESET_CONTROLLER
-        select USB_PHY
-        select USB_ULPI_VIEWPORT
-        help
-          Enable this to support the USB transceiver on Qualcomm 8x16 chipsets.
-          It handles PHY initialization, clock management, power management,
-          and workarounds required after resetting the hardware.
-
-          To compile this driver as a module, choose M here: the
-          module will be called phy-qcom-8x16-usb.
-
 config USB_MV_OTG
         tristate "Marvell USB OTG support"
         depends on USB_EHCI_MV && USB_MV_UDC && PM && USB_OTG
diff --git a/drivers/usb/phy/Makefile b/drivers/usb/phy/Makefile
index 0c40ccc90631..25e579fb92b8 100644
--- a/drivers/usb/phy/Makefile
+++ b/drivers/usb/phy/Makefile
@@ -19,8 +19,6 @@ obj-$(CONFIG_TWL6030_USB)		+= phy-twl6030-usb.o
 obj-$(CONFIG_USB_EHCI_TEGRA)            += phy-tegra-usb.o
 obj-$(CONFIG_USB_GPIO_VBUS)             += phy-gpio-vbus-usb.o
 obj-$(CONFIG_USB_ISP1301)               += phy-isp1301.o
-obj-$(CONFIG_USB_MSM_OTG)               += phy-msm-usb.o
-obj-$(CONFIG_USB_QCOM_8X16_PHY) += phy-qcom-8x16-usb.o
 obj-$(CONFIG_USB_MV_OTG)                += phy-mv-usb.o
 obj-$(CONFIG_USB_MXS_PHY)               += phy-mxs-usb.o
 obj-$(CONFIG_USB_ULPI)                  += phy-ulpi.o
diff --git a/drivers/usb/phy/of.c b/drivers/usb/phy/of.c
index 66ffa82457a8..1ab134f45d67 100644
--- a/drivers/usb/phy/of.c
+++ b/drivers/usb/phy/of.c
@@ -1,10 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * USB of helper code
- *
- * 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.
  */
 
 #include <linux/kernel.h>
diff --git a/drivers/usb/phy/phy-ab8500-usb.c b/drivers/usb/phy/phy-ab8500-usb.c
index 61bf2285d5b1..87295313a10c 100644
--- a/drivers/usb/phy/phy-ab8500-usb.c
+++ b/drivers/usb/phy/phy-ab8500-usb.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * USB transceiver driver for AB8500 family chips
  *
@@ -5,21 +6,6 @@
  * Mian Yousaf Kaukab <mian.yousaf.kaukab@stericsson.com>
  * Avinash Kumar <avinash.kumar@stericsson.com>
  * Thirupathi Chippakurthy <thirupathi.chippakurthy@stericsson.com>
- *
- * 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.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
  */
 
 #include <linux/module.h>
diff --git a/drivers/usb/phy/phy-am335x-control.c b/drivers/usb/phy/phy-am335x-control.c
index 5f5f19813fde..a3cb25cb74f8 100644
--- a/drivers/usb/phy/phy-am335x-control.c
+++ b/drivers/usb/phy/phy-am335x-control.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/err.h>
diff --git a/drivers/usb/phy/phy-am335x.c b/drivers/usb/phy/phy-am335x.c
index 7e5aece769da..b36fa8b953d0 100644
--- a/drivers/usb/phy/phy-am335x.c
+++ b/drivers/usb/phy/phy-am335x.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/dma-mapping.h>
diff --git a/drivers/usb/phy/phy-fsl-usb.c b/drivers/usb/phy/phy-fsl-usb.c
index cf8f40ae6e01..900875f326d7 100644
--- a/drivers/usb/phy/phy-fsl-usb.c
+++ b/drivers/usb/phy/phy-fsl-usb.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright (C) 2007,2008 Freescale semiconductor, Inc.
  *
@@ -5,20 +6,6 @@
  *         Jerry Huang <Chang-Ming.Huang@freescale.com>
  *
  * Initialization based on code from Shlomi Gridish.
- *
- * 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.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the  GNU General Public License along
- * with this program; if not, write  to the Free Software Foundation, Inc.,
- * 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
 #include <linux/module.h>
diff --git a/drivers/usb/phy/phy-fsl-usb.h b/drivers/usb/phy/phy-fsl-usb.h
index 23149954a09c..43d410f6641b 100644
--- a/drivers/usb/phy/phy-fsl-usb.h
+++ b/drivers/usb/phy/phy-fsl-usb.h
@@ -1,19 +1,5 @@
-/* Copyright (C) 2007,2008 Freescale Semiconductor, Inc.
- *
- * 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.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the  GNU General Public License along
- * with this program; if not, write  to the Free Software Foundation, Inc.,
- * 675 Mass Ave, Cambridge, MA 02139, USA.
- */
+// SPDX-License-Identifier: GPL-2.0+
+/* Copyright (C) 2007,2008 Freescale Semiconductor, Inc. */
 
 #include <linux/usb/otg-fsm.h>
 #include <linux/usb/otg.h>
diff --git a/drivers/usb/phy/phy-generic.c b/drivers/usb/phy/phy-generic.c
index 89d6e7a5fdb7..74ba88297991 100644
--- a/drivers/usb/phy/phy-generic.c
+++ b/drivers/usb/phy/phy-generic.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * NOP USB transceiver for all USB transceiver which are either built-in
  * into USB IP or which are mostly autonomous.
@@ -5,20 +6,6 @@
  * Copyright (C) 2009 Texas Instruments Inc
  * Author: Ajay Kumar Gupta <ajay.gupta@ti.com>
  *
- * 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.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
  * Current status:
  *      This provides a "nop" transceiver for PHYs which are
  *      autonomous such as isp1504, isp1707, etc.
@@ -224,7 +211,7 @@ int usb_phy_gen_create_phy(struct device *dev, struct usb_phy_generic *nop,
         int err = 0;
 
         u32 clk_rate = 0;
-        bool needs_vcc = false;
+        bool needs_vcc = false, needs_clk = false;
 
         if (dev->of_node) {
                 struct device_node *node = dev->of_node;
@@ -233,6 +220,7 @@ int usb_phy_gen_create_phy(struct device *dev, struct usb_phy_generic *nop,
                         clk_rate = 0;
 
                 needs_vcc = of_property_read_bool(node, "vcc-supply");
+                needs_clk = of_property_read_bool(node, "clocks");
                 nop->gpiod_reset = devm_gpiod_get_optional(dev, "reset",
                                                            GPIOD_ASIS);
                 err = PTR_ERR_OR_ZERO(nop->gpiod_reset);
@@ -275,6 +263,8 @@ int usb_phy_gen_create_phy(struct device *dev, struct usb_phy_generic *nop,
         if (IS_ERR(nop->clk)) {
                 dev_dbg(dev, "Can't get phy clock: %ld\n",
                                         PTR_ERR(nop->clk));
+                if (needs_clk)
+                        return PTR_ERR(nop->clk);
         }
 
         if (!IS_ERR(nop->clk) && clk_rate) {
diff --git a/drivers/usb/phy/phy-gpio-vbus-usb.c b/drivers/usb/phy/phy-gpio-vbus-usb.c
index f66120db8a41..553e2573c74f 100644
--- a/drivers/usb/phy/phy-gpio-vbus-usb.c
+++ b/drivers/usb/phy/phy-gpio-vbus-usb.c
@@ -1,11 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * gpio-vbus.c - simple GPIO VBUS sensing driver for B peripheral devices
  *
  * Copyright (c) 2008 Philipp Zabel <philipp.zabel@gmail.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/kernel.h>
diff --git a/drivers/usb/phy/phy-isp1301-omap.c b/drivers/usb/phy/phy-isp1301-omap.c
index c6052c814bcc..7041ba030052 100644
--- a/drivers/usb/phy/phy-isp1301-omap.c
+++ b/drivers/usb/phy/phy-isp1301-omap.c
@@ -1,22 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * isp1301_omap - ISP 1301 USB transceiver, talking to OMAP OTG controller
  *
  * Copyright (C) 2004 Texas Instruments
  * Copyright (C) 2004 David Brownell
- *
- * 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.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
 #include <linux/kernel.h>
@@ -1183,9 +1170,11 @@ static irqreturn_t isp1301_irq(int irq, void *isp)
         return IRQ_HANDLED;
 }
 
-static void isp1301_timer(unsigned long _isp)
+static void isp1301_timer(struct timer_list *t)
 {
-        isp1301_defer_work((void *)_isp, WORK_TIMER);
+        struct isp1301 *isp = from_timer(isp, t, timer);
+
+        isp1301_defer_work(isp, WORK_TIMER);
 }
 
 /*-------------------------------------------------------------------------*/
@@ -1222,7 +1211,6 @@ static int isp1301_remove(struct i2c_client *i2c)
         if (machine_is_omap_h2())
                 gpio_free(2);
 
-        isp->timer.data = 0;
         set_bit(WORK_STOP, &isp->todo);
         del_timer_sync(&isp->timer);
         flush_work(&isp->work);
@@ -1507,9 +1495,7 @@ isp1301_probe(struct i2c_client *i2c, const struct i2c_device_id *id)
         }
 
         INIT_WORK(&isp->work, isp1301_work);
-        init_timer(&isp->timer);
-        isp->timer.function = isp1301_timer;
-        isp->timer.data = (unsigned long) isp;
+        timer_setup(&isp->timer, isp1301_timer, 0);
 
         i2c_set_clientdata(i2c, isp);
         isp->client = i2c;
diff --git a/drivers/usb/phy/phy-isp1301.c b/drivers/usb/phy/phy-isp1301.c
index f333024660b4..93b7d6a30aad 100644
--- a/drivers/usb/phy/phy-isp1301.c
+++ b/drivers/usb/phy/phy-isp1301.c
@@ -1,13 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * NXP ISP1301 USB transceiver driver
  *
  * Copyright (C) 2012 Roland Stigge
  *
  * Author: Roland Stigge <stigge@antcom.de>
- *
- * 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/module.h>
diff --git a/drivers/usb/phy/phy-keystone.c b/drivers/usb/phy/phy-keystone.c
index 01d4e4cdbc79..19871266312d 100644
--- a/drivers/usb/phy/phy-keystone.c
+++ b/drivers/usb/phy/phy-keystone.c
@@ -1,19 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * phy-keystone - USB PHY, talking to dwc3 controller in Keystone.
  *
  * Copyright (C) 2013 Texas Instruments Incorporated - http://www.ti.com
- * 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.
  *
  * Author: WingMan Kwok <w-kwok2@ti.com>
- *
- * 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/module.h>
diff --git a/drivers/usb/phy/phy-msm-usb.c b/drivers/usb/phy/phy-msm-usb.c
deleted file mode 100644
index 3d0dd2f97415..000000000000
--- a/drivers/usb/phy/phy-msm-usb.c
+++ /dev/null
@@ -1,2085 +0,0 @@
-/* Copyright (c) 2009-2011, Code Aurora Forum. All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 and
- * only version 2 as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301, USA.
- *
- */
-
-#include <linux/module.h>
-#include <linux/device.h>
-#include <linux/extcon.h>
-#include <linux/gpio/consumer.h>
-#include <linux/platform_device.h>
-#include <linux/clk.h>
-#include <linux/slab.h>
-#include <linux/interrupt.h>
-#include <linux/err.h>
-#include <linux/delay.h>
-#include <linux/io.h>
-#include <linux/ioport.h>
-#include <linux/uaccess.h>
-#include <linux/debugfs.h>
-#include <linux/seq_file.h>
-#include <linux/pm_runtime.h>
-#include <linux/of.h>
-#include <linux/of_device.h>
-#include <linux/reboot.h>
-#include <linux/reset.h>
-#include <linux/types.h>
-#include <linux/usb/otg.h>
-
-#include <linux/usb.h>
-#include <linux/usb/otg.h>
-#include <linux/usb/of.h>
-#include <linux/usb/ulpi.h>
-#include <linux/usb/gadget.h>
-#include <linux/usb/hcd.h>
-#include <linux/usb/msm_hsusb_hw.h>
-#include <linux/regulator/consumer.h>
-
-/**
- * OTG control
- *
- * OTG_NO_CONTROL       Id/VBUS notifications not required. Useful in host
- *                      only configuration.
- * OTG_PHY_CONTROL      Id/VBUS notifications comes form USB PHY.
- * OTG_PMIC_CONTROL     Id/VBUS notifications comes from PMIC hardware.
- * OTG_USER_CONTROL     Id/VBUS notifcations comes from User via sysfs.
- *
- */
-enum otg_control_type {
-        OTG_NO_CONTROL = 0,
-        OTG_PHY_CONTROL,
-        OTG_PMIC_CONTROL,
-        OTG_USER_CONTROL,
-};
-
-/**
- * PHY used in
- *
- * INVALID_PHY                  Unsupported PHY
- * CI_45NM_INTEGRATED_PHY       Chipidea 45nm integrated PHY
- * SNPS_28NM_INTEGRATED_PHY     Synopsis 28nm integrated PHY
- *
- */
-enum msm_usb_phy_type {
-        INVALID_PHY = 0,
-        CI_45NM_INTEGRATED_PHY,
-        SNPS_28NM_INTEGRATED_PHY,
-};
-
-#define IDEV_CHG_MAX    1500
-#define IUNIT           100
-
-/**
- * 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,
-};
-
-/**
- * USB charger types
- *
- * USB_INVALID_CHARGER  Invalid USB charger.
- * USB_SDP_CHARGER      Standard downstream port. Refers to a downstream port
- *                      on USB2.0 compliant host/hub.
- * USB_DCP_CHARGER      Dedicated charger port (AC charger/ Wall charger).
- * USB_CDP_CHARGER      Charging downstream port. Enumeration can happen and
- *                      IDEV_CHG_MAX can be drawn irrespective of USB state.
- *
- */
-enum usb_chg_type {
-        USB_INVALID_CHARGER = 0,
-        USB_SDP_CHARGER,
-        USB_DCP_CHARGER,
-        USB_CDP_CHARGER,
-};
-
-/**
- * struct msm_otg_platform_data - platform device data
- *              for msm_otg driver.
- * @phy_init_seq: PHY configuration sequence values. Value of -1 is reserved as
- *              "do not overwrite default vaule at this address".
- * @phy_init_sz: PHY configuration sequence size.
- * @vbus_power: VBUS power on/off routine.
- * @power_budget: VBUS power budget in mA (0 will be treated as 500mA).
- * @mode: Supported mode (OTG/peripheral/host).
- * @otg_control: OTG switch controlled by user/Id pin
- */
-struct msm_otg_platform_data {
-        int *phy_init_seq;
-        int phy_init_sz;
-        void (*vbus_power)(bool on);
-        unsigned power_budget;
-        enum usb_dr_mode mode;
-        enum otg_control_type otg_control;
-        enum msm_usb_phy_type phy_type;
-        void (*setup_gpio)(enum usb_otg_state state);
-};
-
-/**
- * struct msm_otg: OTG driver data. Shared by HCD and DCD.
- * @otg: USB OTG Transceiver structure.
- * @pdata: otg device platform data.
- * @irq: IRQ number assigned for HSUSB controller.
- * @clk: clock struct of usb_hs_clk.
- * @pclk: clock struct of usb_hs_pclk.
- * @core_clk: clock struct of usb_hs_core_clk.
- * @regs: ioremapped register base address.
- * @inputs: OTG state machine inputs(Id, SessValid etc).
- * @sm_work: OTG state machine work.
- * @in_lpm: indicates low power mode (LPM) state.
- * @async_int: Async interrupt arrived.
- * @cur_power: The amount of mA available from downstream port.
- * @chg_work: Charger detection work.
- * @chg_state: The state of charger detection process.
- * @chg_type: The type of charger attached.
- * @dcd_retires: The retry count used to track Data contact
- *               detection process.
- * @manual_pullup: true if VBUS is not routed to USB controller/phy
- *      and controller driver therefore enables pull-up explicitly before
- *      starting controller using usbcmd run/stop bit.
- * @vbus: VBUS signal state trakining, using extcon framework
- * @id: ID signal state trakining, using extcon framework
- * @switch_gpio: Descriptor for GPIO used to control external Dual
- *               SPDT USB Switch.
- * @reboot: Used to inform the driver to route USB D+/D- line to Device
- *          connector
- */
-struct msm_otg {
-        struct usb_phy phy;
-        struct msm_otg_platform_data *pdata;
-        int irq;
-        struct clk *clk;
-        struct clk *pclk;
-        struct clk *core_clk;
-        void __iomem *regs;
-#define ID              0
-#define B_SESS_VLD      1
-        unsigned long inputs;
-        struct work_struct sm_work;
-        atomic_t in_lpm;
-        int async_int;
-        unsigned cur_power;
-        int phy_number;
-        struct delayed_work chg_work;
-        enum usb_chg_state chg_state;
-        enum usb_chg_type chg_type;
-        u8 dcd_retries;
-        struct regulator *v3p3;
-        struct regulator *v1p8;
-        struct regulator *vddcx;
-        struct regulator_bulk_data supplies[3];
-
-        struct reset_control *phy_rst;
-        struct reset_control *link_rst;
-        int vdd_levels[3];
-
-        bool manual_pullup;
-
-        struct gpio_desc *switch_gpio;
-        struct notifier_block reboot;
-};
-
-#define MSM_USB_BASE    (motg->regs)
-#define DRIVER_NAME     "msm_otg"
-
-#define ULPI_IO_TIMEOUT_USEC    (10 * 1000)
-#define LINK_RESET_TIMEOUT_USEC (250 * 1000)
-
-#define USB_PHY_3P3_VOL_MIN     3050000 /* uV */
-#define USB_PHY_3P3_VOL_MAX     3300000 /* uV */
-#define USB_PHY_3P3_HPM_LOAD    50000   /* uA */
-#define USB_PHY_3P3_LPM_LOAD    4000    /* uA */
-
-#define USB_PHY_1P8_VOL_MIN     1800000 /* uV */
-#define USB_PHY_1P8_VOL_MAX     1800000 /* uV */
-#define USB_PHY_1P8_HPM_LOAD    50000   /* uA */
-#define USB_PHY_1P8_LPM_LOAD    4000    /* uA */
-
-#define USB_PHY_VDD_DIG_VOL_MIN 1000000 /* uV */
-#define USB_PHY_VDD_DIG_VOL_MAX 1320000 /* uV */
-#define USB_PHY_SUSP_DIG_VOL    500000  /* uV */
-
-enum vdd_levels {
-        VDD_LEVEL_NONE = 0,
-        VDD_LEVEL_MIN,
-        VDD_LEVEL_MAX,
-};
-
-static int msm_hsusb_init_vddcx(struct msm_otg *motg, int init)
-{
-        int ret = 0;
-
-        if (init) {
-                ret = regulator_set_voltage(motg->vddcx,
-                                motg->vdd_levels[VDD_LEVEL_MIN],
-                                motg->vdd_levels[VDD_LEVEL_MAX]);
-                if (ret) {
-                        dev_err(motg->phy.dev, "Cannot set vddcx voltage\n");
-                        return ret;
-                }
-
-                ret = regulator_enable(motg->vddcx);
-                if (ret)
-                        dev_err(motg->phy.dev, "unable to enable hsusb vddcx\n");
-        } else {
-                ret = regulator_set_voltage(motg->vddcx, 0,
-                                motg->vdd_levels[VDD_LEVEL_MAX]);
-                if (ret)
-                        dev_err(motg->phy.dev, "Cannot set vddcx voltage\n");
-                ret = regulator_disable(motg->vddcx);
-                if (ret)
-                        dev_err(motg->phy.dev, "unable to disable hsusb vddcx\n");
-        }
-
-        return ret;
-}
-
-static int msm_hsusb_ldo_init(struct msm_otg *motg, int init)
-{
-        int rc = 0;
-
-        if (init) {
-                rc = regulator_set_voltage(motg->v3p3, USB_PHY_3P3_VOL_MIN,
-                                USB_PHY_3P3_VOL_MAX);
-                if (rc) {
-                        dev_err(motg->phy.dev, "Cannot set v3p3 voltage\n");
-                        goto exit;
-                }
-                rc = regulator_enable(motg->v3p3);
-                if (rc) {
-                        dev_err(motg->phy.dev, "unable to enable the hsusb 3p3\n");
-                        goto exit;
-                }
-                rc = regulator_set_voltage(motg->v1p8, USB_PHY_1P8_VOL_MIN,
-                                USB_PHY_1P8_VOL_MAX);
-                if (rc) {
-                        dev_err(motg->phy.dev, "Cannot set v1p8 voltage\n");
-                        goto disable_3p3;
-                }
-                rc = regulator_enable(motg->v1p8);
-                if (rc) {
-                        dev_err(motg->phy.dev, "unable to enable the hsusb 1p8\n");
-                        goto disable_3p3;
-                }
-
-                return 0;
-        }
-
-        regulator_disable(motg->v1p8);
-disable_3p3:
-        regulator_disable(motg->v3p3);
-exit:
-        return rc;
-}
-
-static int msm_hsusb_ldo_set_mode(struct msm_otg *motg, int on)
-{
-        int ret = 0;
-
-        if (on) {
-                ret = regulator_set_load(motg->v1p8, USB_PHY_1P8_HPM_LOAD);
-                if (ret < 0) {
-                        pr_err("Could not set HPM for v1p8\n");
-                        return ret;
-                }
-                ret = regulator_set_load(motg->v3p3, USB_PHY_3P3_HPM_LOAD);
-                if (ret < 0) {
-                        pr_err("Could not set HPM for v3p3\n");
-                        regulator_set_load(motg->v1p8, USB_PHY_1P8_LPM_LOAD);
-                        return ret;
-                }
-        } else {
-                ret = regulator_set_load(motg->v1p8, USB_PHY_1P8_LPM_LOAD);
-                if (ret < 0)
-                        pr_err("Could not set LPM for v1p8\n");
-                ret = regulator_set_load(motg->v3p3, USB_PHY_3P3_LPM_LOAD);
-                if (ret < 0)
-                        pr_err("Could not set LPM for v3p3\n");
-        }
-
-        pr_debug("reg (%s)\n", on ? "HPM" : "LPM");
-        return ret < 0 ? ret : 0;
-}
-
-static int ulpi_read(struct usb_phy *phy, u32 reg)
-{
-        struct msm_otg *motg = container_of(phy, struct msm_otg, phy);
-        int cnt = 0;
-
-        /* initiate read operation */
-        writel(ULPI_RUN | ULPI_READ | ULPI_ADDR(reg),
-               USB_ULPI_VIEWPORT);
-
-        /* wait for completion */
-        while (cnt < ULPI_IO_TIMEOUT_USEC) {
-                if (!(readl(USB_ULPI_VIEWPORT) & ULPI_RUN))
-                        break;
-                udelay(1);
-                cnt++;
-        }
-
-        if (cnt >= ULPI_IO_TIMEOUT_USEC) {
-                dev_err(phy->dev, "ulpi_read: timeout %08x\n",
-                        readl(USB_ULPI_VIEWPORT));
-                return -ETIMEDOUT;
-        }
-        return ULPI_DATA_READ(readl(USB_ULPI_VIEWPORT));
-}
-
-static int ulpi_write(struct usb_phy *phy, u32 val, u32 reg)
-{
-        struct msm_otg *motg = container_of(phy, struct msm_otg, phy);
-        int cnt = 0;
-
-        /* initiate write operation */
-        writel(ULPI_RUN | ULPI_WRITE |
-               ULPI_ADDR(reg) | ULPI_DATA(val),
-               USB_ULPI_VIEWPORT);
-
-        /* wait for completion */
-        while (cnt < ULPI_IO_TIMEOUT_USEC) {
-                if (!(readl(USB_ULPI_VIEWPORT) & ULPI_RUN))
-                        break;
-                udelay(1);
-                cnt++;
-        }
-
-        if (cnt >= ULPI_IO_TIMEOUT_USEC) {
-                dev_err(phy->dev, "ulpi_write: timeout\n");
-                return -ETIMEDOUT;
-        }
-        return 0;
-}
-
-static struct usb_phy_io_ops msm_otg_io_ops = {
-        .read = ulpi_read,
-        .write = ulpi_write,
-};
-
-static void ulpi_init(struct msm_otg *motg)
-{
-        struct msm_otg_platform_data *pdata = motg->pdata;
-        int *seq = pdata->phy_init_seq, idx;
-        u32 addr = ULPI_EXT_VENDOR_SPECIFIC;
-
-        for (idx = 0; idx < pdata->phy_init_sz; idx++) {
-                if (seq[idx] == -1)
-                        continue;
-
-                dev_vdbg(motg->phy.dev, "ulpi: write 0x%02x to 0x%02x\n",
-                                seq[idx], addr + idx);
-                ulpi_write(&motg->phy, seq[idx], addr + idx);
-        }
-}
-
-static int msm_phy_notify_disconnect(struct usb_phy *phy,
-                                   enum usb_device_speed speed)
-{
-        struct msm_otg *motg = container_of(phy, struct msm_otg, phy);
-        int val;
-
-        if (motg->manual_pullup) {
-                val = ULPI_MISC_A_VBUSVLDEXT | ULPI_MISC_A_VBUSVLDEXTSEL;
-                usb_phy_io_write(phy, val, ULPI_CLR(ULPI_MISC_A));
-        }
-
-        /*
-         * Put the transceiver in non-driving mode. Otherwise host
-         * may not detect soft-disconnection.
-         */
-        val = ulpi_read(phy, ULPI_FUNC_CTRL);
-        val &= ~ULPI_FUNC_CTRL_OPMODE_MASK;
-        val |= ULPI_FUNC_CTRL_OPMODE_NONDRIVING;
-        ulpi_write(phy, val, ULPI_FUNC_CTRL);
-
-        return 0;
-}
-
-static int msm_otg_link_clk_reset(struct msm_otg *motg, bool assert)
-{
-        int ret;
-
-        if (assert)
-                ret = reset_control_assert(motg->link_rst);
-        else
-                ret = reset_control_deassert(motg->link_rst);
-
-        if (ret)
-                dev_err(motg->phy.dev, "usb link clk reset %s failed\n",
-                        assert ? "assert" : "deassert");
-
-        return ret;
-}
-
-static int msm_otg_phy_clk_reset(struct msm_otg *motg)
-{
-        int ret = 0;
-
-        if (motg->phy_rst)
-                ret = reset_control_reset(motg->phy_rst);
-
-        if (ret)
-                dev_err(motg->phy.dev, "usb phy clk reset failed\n");
-
-        return ret;
-}
-
-static int msm_link_reset(struct msm_otg *motg)
-{
-        u32 val;
-        int ret;
-
-        ret = msm_otg_link_clk_reset(motg, 1);
-        if (ret)
-                return ret;
-
-        /* wait for 1ms delay as suggested in HPG. */
-        usleep_range(1000, 1200);
-
-        ret = msm_otg_link_clk_reset(motg, 0);
-        if (ret)
-                return ret;
-
-        if (motg->phy_number)
-                writel(readl(USB_PHY_CTRL2) | BIT(16), USB_PHY_CTRL2);
-
-        /* put transceiver in serial mode as part of reset */
-        val = readl(USB_PORTSC) & ~PORTSC_PTS_MASK;
-        writel(val | PORTSC_PTS_SERIAL, USB_PORTSC);
-
-        return 0;
-}
-
-static int msm_otg_reset(struct usb_phy *phy)
-{
-        struct msm_otg *motg = container_of(phy, struct msm_otg, phy);
-        int cnt = 0;
-
-        writel(USBCMD_RESET, USB_USBCMD);
-        while (cnt < LINK_RESET_TIMEOUT_USEC) {
-                if (!(readl(USB_USBCMD) & USBCMD_RESET))
-                        break;
-                udelay(1);
-                cnt++;
-        }
-        if (cnt >= LINK_RESET_TIMEOUT_USEC)
-                return -ETIMEDOUT;
-
-        /* select ULPI phy and clear other status/control bits in PORTSC */
-        writel(PORTSC_PTS_ULPI, USB_PORTSC);
-
-        writel(0x0, USB_AHBBURST);
-        writel(0x08, USB_AHBMODE);
-
-        if (motg->phy_number)
-                writel(readl(USB_PHY_CTRL2) | BIT(16), USB_PHY_CTRL2);
-        return 0;
-}
-
-static void msm_phy_reset(struct msm_otg *motg)
-{
-        void __iomem *addr;
-
-        if (motg->pdata->phy_type != SNPS_28NM_INTEGRATED_PHY) {
-                msm_otg_phy_clk_reset(motg);
-                return;
-        }
-
-        addr = USB_PHY_CTRL;
-        if (motg->phy_number)
-                addr = USB_PHY_CTRL2;
-
-        /* Assert USB PHY_POR */
-        writel(readl(addr) | PHY_POR_ASSERT, addr);
-
-        /*
-         * wait for minimum 10 microseconds as suggested in HPG.
-         * Use a slightly larger value since the exact value didn't
-         * work 100% of the time.
-         */
-        udelay(12);
-
-        /* Deassert USB PHY_POR */
-        writel(readl(addr) & ~PHY_POR_ASSERT, addr);
-}
-
-static int msm_usb_reset(struct usb_phy *phy)
-{
-        struct msm_otg *motg = container_of(phy, struct msm_otg, phy);
-        int ret;
-
-        if (!IS_ERR(motg->core_clk))
-                clk_prepare_enable(motg->core_clk);
-
-        ret = msm_link_reset(motg);
-        if (ret) {
-                dev_err(phy->dev, "phy_reset failed\n");
-                return ret;
-        }
-
-        ret = msm_otg_reset(&motg->phy);
-        if (ret) {
-                dev_err(phy->dev, "link reset failed\n");
-                return ret;
-        }
-
-        msleep(100);
-
-        /* Reset USB PHY after performing USB Link RESET */
-        msm_phy_reset(motg);
-
-        if (!IS_ERR(motg->core_clk))
-                clk_disable_unprepare(motg->core_clk);
-
-        return 0;
-}
-
-static int msm_phy_init(struct usb_phy *phy)
-{
-        struct msm_otg *motg = container_of(phy, struct msm_otg, phy);
-        struct msm_otg_platform_data *pdata = motg->pdata;
-        u32 val, ulpi_val = 0;
-
-        /* Program USB PHY Override registers. */
-        ulpi_init(motg);
-
-        /*
-         * It is recommended in HPG to reset USB PHY after programming
-         * USB PHY Override registers.
-         */
-        msm_phy_reset(motg);
-
-        if (pdata->otg_control == OTG_PHY_CONTROL) {
-                val = readl(USB_OTGSC);
-                if (pdata->mode == USB_DR_MODE_OTG) {
-                        ulpi_val = ULPI_INT_IDGRD | ULPI_INT_SESS_VALID;
-                        val |= OTGSC_IDIE | OTGSC_BSVIE;
-                } else if (pdata->mode == USB_DR_MODE_PERIPHERAL) {
-                        ulpi_val = ULPI_INT_SESS_VALID;
-                        val |= OTGSC_BSVIE;
-                }
-                writel(val, USB_OTGSC);
-                ulpi_write(phy, ulpi_val, ULPI_USB_INT_EN_RISE);
-                ulpi_write(phy, ulpi_val, ULPI_USB_INT_EN_FALL);
-        }
-
-        if (motg->manual_pullup) {
-                val = ULPI_MISC_A_VBUSVLDEXTSEL | ULPI_MISC_A_VBUSVLDEXT;
-                ulpi_write(phy, val, ULPI_SET(ULPI_MISC_A));
-
-                val = readl(USB_GENCONFIG_2);
-                val |= GENCONFIG_2_SESS_VLD_CTRL_EN;
-                writel(val, USB_GENCONFIG_2);
-
-                val = readl(USB_USBCMD);
-                val |= USBCMD_SESS_VLD_CTRL;
-                writel(val, USB_USBCMD);
-
-                val = ulpi_read(phy, ULPI_FUNC_CTRL);
-                val &= ~ULPI_FUNC_CTRL_OPMODE_MASK;
-                val |= ULPI_FUNC_CTRL_OPMODE_NORMAL;
-                ulpi_write(phy, val, ULPI_FUNC_CTRL);
-        }
-
-        if (motg->phy_number)
-                writel(readl(USB_PHY_CTRL2) | BIT(16), USB_PHY_CTRL2);
-
-        return 0;
-}
-
-#define PHY_SUSPEND_TIMEOUT_USEC        (500 * 1000)
-#define PHY_RESUME_TIMEOUT_USEC (100 * 1000)
-
-#ifdef CONFIG_PM
-
-static int msm_hsusb_config_vddcx(struct msm_otg *motg, int high)
-{
-        int max_vol = motg->vdd_levels[VDD_LEVEL_MAX];
-        int min_vol;
-        int ret;
-
-        if (high)
-                min_vol = motg->vdd_levels[VDD_LEVEL_MIN];
-        else
-                min_vol = motg->vdd_levels[VDD_LEVEL_NONE];
-
-        ret = regulator_set_voltage(motg->vddcx, min_vol, max_vol);
-        if (ret) {
-                pr_err("Cannot set vddcx voltage\n");
-                return ret;
-        }
-
-        pr_debug("%s: min_vol:%d max_vol:%d\n", __func__, min_vol, max_vol);
-
-        return ret;
-}
-
-static int msm_otg_suspend(struct msm_otg *motg)
-{
-        struct usb_phy *phy = &motg->phy;
-        struct usb_bus *bus = phy->otg->host;
-        struct msm_otg_platform_data *pdata = motg->pdata;
-        void __iomem *addr;
-        int cnt = 0;
-
-        if (atomic_read(&motg->in_lpm))
-                return 0;
-
-        disable_irq(motg->irq);
-        /*
-         * Chipidea 45-nm PHY suspend sequence:
-         *
-         * Interrupt Latch Register auto-clear feature is not present
-         * in all PHY versions. Latch register is clear on read type.
-         * Clear latch register to avoid spurious wakeup from
-         * low power mode (LPM).
-         *
-         * PHY comparators are disabled when PHY enters into low power
-         * mode (LPM). Keep PHY comparators ON in LPM only when we expect
-         * VBUS/Id notifications from USB PHY. Otherwise turn off USB
-         * PHY comparators. This save significant amount of power.
-         *
-         * PLL is not turned off when PHY enters into low power mode (LPM).
-         * Disable PLL for maximum power savings.
-         */
-
-        if (motg->pdata->phy_type == CI_45NM_INTEGRATED_PHY) {
-                ulpi_read(phy, 0x14);
-                if (pdata->otg_control == OTG_PHY_CONTROL)
-                        ulpi_write(phy, 0x01, 0x30);
-                ulpi_write(phy, 0x08, 0x09);
-        }
-
-        /*
-         * PHY may take some time or even fail to enter into low power
-         * mode (LPM). Hence poll for 500 msec and reset the PHY and link
-         * in failure case.
-         */
-        writel(readl(USB_PORTSC) | PORTSC_PHCD, USB_PORTSC);
-        while (cnt < PHY_SUSPEND_TIMEOUT_USEC) {
-                if (readl(USB_PORTSC) & PORTSC_PHCD)
-                        break;
-                udelay(1);
-                cnt++;
-        }
-
-        if (cnt >= PHY_SUSPEND_TIMEOUT_USEC) {
-                dev_err(phy->dev, "Unable to suspend PHY\n");
-                msm_otg_reset(phy);
-                enable_irq(motg->irq);
-                return -ETIMEDOUT;
-        }
-
-        /*
-         * PHY has capability to generate interrupt asynchronously in low
-         * power mode (LPM). This interrupt is level triggered. So USB IRQ
-         * line must be disabled till async interrupt enable bit is cleared
-         * in USBCMD register. Assert STP (ULPI interface STOP signal) to
-         * block data communication from PHY.
-         */
-        writel(readl(USB_USBCMD) | ASYNC_INTR_CTRL | ULPI_STP_CTRL, USB_USBCMD);
-
-        addr = USB_PHY_CTRL;
-        if (motg->phy_number)
-                addr = USB_PHY_CTRL2;
-
-        if (motg->pdata->phy_type == SNPS_28NM_INTEGRATED_PHY &&
-                        motg->pdata->otg_control == OTG_PMIC_CONTROL)
-                writel(readl(addr) | PHY_RETEN, addr);
-
-        clk_disable_unprepare(motg->pclk);
-        clk_disable_unprepare(motg->clk);
-        if (!IS_ERR(motg->core_clk))
-                clk_disable_unprepare(motg->core_clk);
-
-        if (motg->pdata->phy_type == SNPS_28NM_INTEGRATED_PHY &&
-                        motg->pdata->otg_control == OTG_PMIC_CONTROL) {
-                msm_hsusb_ldo_set_mode(motg, 0);
-                msm_hsusb_config_vddcx(motg, 0);
-        }
-
-        if (device_may_wakeup(phy->dev))
-                enable_irq_wake(motg->irq);
-        if (bus)
-                clear_bit(HCD_FLAG_HW_ACCESSIBLE, &(bus_to_hcd(bus))->flags);
-
-        atomic_set(&motg->in_lpm, 1);
-        enable_irq(motg->irq);
-
-        dev_info(phy->dev, "USB in low power mode\n");
-
-        return 0;
-}
-
-static int msm_otg_resume(struct msm_otg *motg)
-{
-        struct usb_phy *phy = &motg->phy;
-        struct usb_bus *bus = phy->otg->host;
-        void __iomem *addr;
-        int cnt = 0;
-        unsigned temp;
-
-        if (!atomic_read(&motg->in_lpm))
-                return 0;
-
-        clk_prepare_enable(motg->pclk);
-        clk_prepare_enable(motg->clk);
-        if (!IS_ERR(motg->core_clk))
-                clk_prepare_enable(motg->core_clk);
-
-        if (motg->pdata->phy_type == SNPS_28NM_INTEGRATED_PHY &&
-                        motg->pdata->otg_control == OTG_PMIC_CONTROL) {
-
-                addr = USB_PHY_CTRL;
-                if (motg->phy_number)
-                        addr = USB_PHY_CTRL2;
-
-                msm_hsusb_ldo_set_mode(motg, 1);
-                msm_hsusb_config_vddcx(motg, 1);
-                writel(readl(addr) & ~PHY_RETEN, addr);
-        }
-
-        temp = readl(USB_USBCMD);
-        temp &= ~ASYNC_INTR_CTRL;
-        temp &= ~ULPI_STP_CTRL;
-        writel(temp, USB_USBCMD);
-
-        /*
-         * PHY comes out of low power mode (LPM) in case of wakeup
-         * from asynchronous interrupt.
-         */
-        if (!(readl(USB_PORTSC) & PORTSC_PHCD))
-                goto skip_phy_resume;
-
-        writel(readl(USB_PORTSC) & ~PORTSC_PHCD, USB_PORTSC);
-        while (cnt < PHY_RESUME_TIMEOUT_USEC) {
-                if (!(readl(USB_PORTSC) & PORTSC_PHCD))
-                        break;
-                udelay(1);
-                cnt++;
-        }
-
-        if (cnt >= PHY_RESUME_TIMEOUT_USEC) {
-                /*
-                 * This is a fatal error. Reset the link and
-                 * PHY. USB state can not be restored. Re-insertion
-                 * of USB cable is the only way to get USB working.
-                 */
-                dev_err(phy->dev, "Unable to resume USB. Re-plugin the cable\n");
-                msm_otg_reset(phy);
-        }
-
-skip_phy_resume:
-        if (device_may_wakeup(phy->dev))
-                disable_irq_wake(motg->irq);
-        if (bus)
-                set_bit(HCD_FLAG_HW_ACCESSIBLE, &(bus_to_hcd(bus))->flags);
-
-        atomic_set(&motg->in_lpm, 0);
-
-        if (motg->async_int) {
-                motg->async_int = 0;
-                pm_runtime_put(phy->dev);
-                enable_irq(motg->irq);
-        }
-
-        dev_info(phy->dev, "USB exited from low power mode\n");
-
-        return 0;
-}
-#endif
-
-static void msm_otg_notify_charger(struct msm_otg *motg, unsigned mA)
-{
-        if (motg->cur_power == mA)
-                return;
-
-        /* TODO: Notify PMIC about available current */
-        dev_info(motg->phy.dev, "Avail curr from USB = %u\n", mA);
-        motg->cur_power = mA;
-}
-
-static void msm_otg_start_host(struct usb_phy *phy, int on)
-{
-        struct msm_otg *motg = container_of(phy, struct msm_otg, phy);
-        struct msm_otg_platform_data *pdata = motg->pdata;
-        struct usb_hcd *hcd;
-
-        if (!phy->otg->host)
-                return;
-
-        hcd = bus_to_hcd(phy->otg->host);
-
-        if (on) {
-                dev_dbg(phy->dev, "host on\n");
-
-                if (pdata->vbus_power)
-                        pdata->vbus_power(1);
-                /*
-                 * Some boards have a switch cotrolled by gpio
-                 * to enable/disable internal HUB. Enable internal
-                 * HUB before kicking the host.
-                 */
-                if (pdata->setup_gpio)
-                        pdata->setup_gpio(OTG_STATE_A_HOST);
-#ifdef CONFIG_USB
-                usb_add_hcd(hcd, hcd->irq, IRQF_SHARED);
-                device_wakeup_enable(hcd->self.controller);
-#endif
-        } else {
-                dev_dbg(phy->dev, "host off\n");
-
-#ifdef CONFIG_USB
-                usb_remove_hcd(hcd);
-#endif
-                if (pdata->setup_gpio)
-                        pdata->setup_gpio(OTG_STATE_UNDEFINED);
-                if (pdata->vbus_power)
-                        pdata->vbus_power(0);
-        }
-}
-
-static int msm_otg_set_host(struct usb_otg *otg, struct usb_bus *host)
-{
-        struct msm_otg *motg = container_of(otg->usb_phy, struct msm_otg, phy);
-        struct usb_hcd *hcd;
-
-        /*
-         * Fail host registration if this board can support
-         * only peripheral configuration.
-         */
-        if (motg->pdata->mode == USB_DR_MODE_PERIPHERAL) {
-                dev_info(otg->usb_phy->dev, "Host mode is not supported\n");
-                return -ENODEV;
-        }
-
-        if (!host) {
-                if (otg->state == OTG_STATE_A_HOST) {
-                        pm_runtime_get_sync(otg->usb_phy->dev);
-                        msm_otg_start_host(otg->usb_phy, 0);
-                        otg->host = NULL;
-                        otg->state = OTG_STATE_UNDEFINED;
-                        schedule_work(&motg->sm_work);
-                } else {
-                        otg->host = NULL;
-                }
-
-                return 0;
-        }
-
-        hcd = bus_to_hcd(host);
-        hcd->power_budget = motg->pdata->power_budget;
-
-        otg->host = host;
-        dev_dbg(otg->usb_phy->dev, "host driver registered w/ tranceiver\n");
-
-        pm_runtime_get_sync(otg->usb_phy->dev);
-        schedule_work(&motg->sm_work);
-
-        return 0;
-}
-
-static void msm_otg_start_peripheral(struct usb_phy *phy, int on)
-{
-        struct msm_otg *motg = container_of(phy, struct msm_otg, phy);
-        struct msm_otg_platform_data *pdata = motg->pdata;
-
-        if (!phy->otg->gadget)
-                return;
-
-        if (on) {
-                dev_dbg(phy->dev, "gadget on\n");
-                /*
-                 * Some boards have a switch cotrolled by gpio
-                 * to enable/disable internal HUB. Disable internal
-                 * HUB before kicking the gadget.
-                 */
-                if (pdata->setup_gpio)
-                        pdata->setup_gpio(OTG_STATE_B_PERIPHERAL);
-                usb_gadget_vbus_connect(phy->otg->gadget);
-        } else {
-                dev_dbg(phy->dev, "gadget off\n");
-                usb_gadget_vbus_disconnect(phy->otg->gadget);
-                if (pdata->setup_gpio)
-                        pdata->setup_gpio(OTG_STATE_UNDEFINED);
-        }
-
-}
-
-static int msm_otg_set_peripheral(struct usb_otg *otg,
-                                        struct usb_gadget *gadget)
-{
-        struct msm_otg *motg = container_of(otg->usb_phy, struct msm_otg, phy);
-
-        /*
-         * Fail peripheral registration if this board can support
-         * only host configuration.
-         */
-        if (motg->pdata->mode == USB_DR_MODE_HOST) {
-                dev_info(otg->usb_phy->dev, "Peripheral mode is not supported\n");
-                return -ENODEV;
-        }
-
-        if (!gadget) {
-                if (otg->state == OTG_STATE_B_PERIPHERAL) {
-                        pm_runtime_get_sync(otg->usb_phy->dev);
-                        msm_otg_start_peripheral(otg->usb_phy, 0);
-                        otg->gadget = NULL;
-                        otg->state = OTG_STATE_UNDEFINED;
-                        schedule_work(&motg->sm_work);
-                } else {
-                        otg->gadget = NULL;
-                }
-
-                return 0;
-        }
-        otg->gadget = gadget;
-        dev_dbg(otg->usb_phy->dev,
-                "peripheral driver registered w/ tranceiver\n");
-
-        pm_runtime_get_sync(otg->usb_phy->dev);
-        schedule_work(&motg->sm_work);
-
-        return 0;
-}
-
-static bool msm_chg_check_secondary_det(struct msm_otg *motg)
-{
-        struct usb_phy *phy = &motg->phy;
-        u32 chg_det;
-        bool ret = false;
-
-        switch (motg->pdata->phy_type) {
-        case CI_45NM_INTEGRATED_PHY:
-                chg_det = ulpi_read(phy, 0x34);
-                ret = chg_det & (1 << 4);
-                break;
-        case SNPS_28NM_INTEGRATED_PHY:
-                chg_det = ulpi_read(phy, 0x87);
-                ret = chg_det & 1;
-                break;
-        default:
-                break;
-        }
-        return ret;
-}
-
-static void msm_chg_enable_secondary_det(struct msm_otg *motg)
-{
-        struct usb_phy *phy = &motg->phy;
-        u32 chg_det;
-
-        switch (motg->pdata->phy_type) {
-        case CI_45NM_INTEGRATED_PHY:
-                chg_det = ulpi_read(phy, 0x34);
-                /* Turn off charger block */
-                chg_det |= ~(1 << 1);
-                ulpi_write(phy, chg_det, 0x34);
-                udelay(20);
-                /* control chg block via ULPI */
-                chg_det &= ~(1 << 3);
-                ulpi_write(phy, chg_det, 0x34);
-                /* put it in host mode for enabling D- source */
-                chg_det &= ~(1 << 2);
-                ulpi_write(phy, chg_det, 0x34);
-                /* Turn on chg detect block */
-                chg_det &= ~(1 << 1);
-                ulpi_write(phy, chg_det, 0x34);
-                udelay(20);
-                /* enable chg detection */
-                chg_det &= ~(1 << 0);
-                ulpi_write(phy, chg_det, 0x34);
-                break;
-        case SNPS_28NM_INTEGRATED_PHY:
-                /*
-                 * Configure DM as current source, DP as current sink
-                 * and enable battery charging comparators.
-                 */
-                ulpi_write(phy, 0x8, 0x85);
-                ulpi_write(phy, 0x2, 0x85);
-                ulpi_write(phy, 0x1, 0x85);
-                break;
-        default:
-                break;
-        }
-}
-
-static bool msm_chg_check_primary_det(struct msm_otg *motg)
-{
-        struct usb_phy *phy = &motg->phy;
-        u32 chg_det;
-        bool ret = false;
-
-        switch (motg->pdata->phy_type) {
-        case CI_45NM_INTEGRATED_PHY:
-                chg_det = ulpi_read(phy, 0x34);
-                ret = chg_det & (1 << 4);
-                break;
-        case SNPS_28NM_INTEGRATED_PHY:
-                chg_det = ulpi_read(phy, 0x87);
-                ret = chg_det & 1;
-                break;
-        default:
-                break;
-        }
-        return ret;
-}
-
-static void msm_chg_enable_primary_det(struct msm_otg *motg)
-{
-        struct usb_phy *phy = &motg->phy;
-        u32 chg_det;
-
-        switch (motg->pdata->phy_type) {
-        case CI_45NM_INTEGRATED_PHY:
-                chg_det = ulpi_read(phy, 0x34);
-                /* enable chg detection */
-                chg_det &= ~(1 << 0);
-                ulpi_write(phy, chg_det, 0x34);
-                break;
-        case SNPS_28NM_INTEGRATED_PHY:
-                /*
-                 * Configure DP as current source, DM as current sink
-                 * and enable battery charging comparators.
-                 */
-                ulpi_write(phy, 0x2, 0x85);
-                ulpi_write(phy, 0x1, 0x85);
-                break;
-        default:
-                break;
-        }
-}
-
-static bool msm_chg_check_dcd(struct msm_otg *motg)
-{
-        struct usb_phy *phy = &motg->phy;
-        u32 line_state;
-        bool ret = false;
-
-        switch (motg->pdata->phy_type) {
-        case CI_45NM_INTEGRATED_PHY:
-                line_state = ulpi_read(phy, 0x15);
-                ret = !(line_state & 1);
-                break;
-        case SNPS_28NM_INTEGRATED_PHY:
-                line_state = ulpi_read(phy, 0x87);
-                ret = line_state & 2;
-                break;
-        default:
-                break;
-        }
-        return ret;
-}
-
-static void msm_chg_disable_dcd(struct msm_otg *motg)
-{
-        struct usb_phy *phy = &motg->phy;
-        u32 chg_det;
-
-        switch (motg->pdata->phy_type) {
-        case CI_45NM_INTEGRATED_PHY:
-                chg_det = ulpi_read(phy, 0x34);
-                chg_det &= ~(1 << 5);
-                ulpi_write(phy, chg_det, 0x34);
-                break;
-        case SNPS_28NM_INTEGRATED_PHY:
-                ulpi_write(phy, 0x10, 0x86);
-                break;
-        default:
-                break;
-        }
-}
-
-static void msm_chg_enable_dcd(struct msm_otg *motg)
-{
-        struct usb_phy *phy = &motg->phy;
-        u32 chg_det;
-
-        switch (motg->pdata->phy_type) {
-        case CI_45NM_INTEGRATED_PHY:
-                chg_det = ulpi_read(phy, 0x34);
-                /* Turn on D+ current source */
-                chg_det |= (1 << 5);
-                ulpi_write(phy, chg_det, 0x34);
-                break;
-        case SNPS_28NM_INTEGRATED_PHY:
-                /* Data contact detection enable */
-                ulpi_write(phy, 0x10, 0x85);
-                break;
-        default:
-                break;
-        }
-}
-
-static void msm_chg_block_on(struct msm_otg *motg)
-{
-        struct usb_phy *phy = &motg->phy;
-        u32 func_ctrl, chg_det;
-
-        /* put the controller in non-driving mode */
-        func_ctrl = ulpi_read(phy, ULPI_FUNC_CTRL);
-        func_ctrl &= ~ULPI_FUNC_CTRL_OPMODE_MASK;
-        func_ctrl |= ULPI_FUNC_CTRL_OPMODE_NONDRIVING;
-        ulpi_write(phy, func_ctrl, ULPI_FUNC_CTRL);
-
-        switch (motg->pdata->phy_type) {
-        case CI_45NM_INTEGRATED_PHY:
-                chg_det = ulpi_read(phy, 0x34);
-                /* control chg block via ULPI */
-                chg_det &= ~(1 << 3);
-                ulpi_write(phy, chg_det, 0x34);
-                /* Turn on chg detect block */
-                chg_det &= ~(1 << 1);
-                ulpi_write(phy, chg_det, 0x34);
-                udelay(20);
-                break;
-        case SNPS_28NM_INTEGRATED_PHY:
-                /* Clear charger detecting control bits */
-                ulpi_write(phy, 0x3F, 0x86);
-                /* Clear alt interrupt latch and enable bits */
-                ulpi_write(phy, 0x1F, 0x92);
-                ulpi_write(phy, 0x1F, 0x95);
-                udelay(100);
-                break;
-        default:
-                break;
-        }
-}
-
-static void msm_chg_block_off(struct msm_otg *motg)
-{
-        struct usb_phy *phy = &motg->phy;
-        u32 func_ctrl, chg_det;
-
-        switch (motg->pdata->phy_type) {
-        case CI_45NM_INTEGRATED_PHY:
-                chg_det = ulpi_read(phy, 0x34);
-                /* Turn off charger block */
-                chg_det |= ~(1 << 1);
-                ulpi_write(phy, chg_det, 0x34);
-                break;
-        case SNPS_28NM_INTEGRATED_PHY:
-                /* Clear charger detecting control bits */
-                ulpi_write(phy, 0x3F, 0x86);
-                /* Clear alt interrupt latch and enable bits */
-                ulpi_write(phy, 0x1F, 0x92);
-                ulpi_write(phy, 0x1F, 0x95);
-                break;
-        default:
-                break;
-        }
-
-        /* put the controller in normal mode */
-        func_ctrl = ulpi_read(phy, ULPI_FUNC_CTRL);
-        func_ctrl &= ~ULPI_FUNC_CTRL_OPMODE_MASK;
-        func_ctrl |= ULPI_FUNC_CTRL_OPMODE_NORMAL;
-        ulpi_write(phy, func_ctrl, ULPI_FUNC_CTRL);
-}
-
-#define MSM_CHG_DCD_POLL_TIME           (100 * HZ/1000) /* 100 msec */
-#define MSM_CHG_DCD_MAX_RETRIES         6 /* Tdcd_tmout = 6 * 100 msec */
-#define MSM_CHG_PRIMARY_DET_TIME        (40 * HZ/1000) /* TVDPSRC_ON */
-#define MSM_CHG_SECONDARY_DET_TIME      (40 * HZ/1000) /* TVDMSRC_ON */
-static void msm_chg_detect_work(struct work_struct *w)
-{
-        struct msm_otg *motg = container_of(w, struct msm_otg, chg_work.work);
-        struct usb_phy *phy = &motg->phy;
-        bool is_dcd, tmout, vout;
-        unsigned long delay;
-
-        dev_dbg(phy->dev, "chg detection work\n");
-        switch (motg->chg_state) {
-        case USB_CHG_STATE_UNDEFINED:
-                pm_runtime_get_sync(phy->dev);
-                msm_chg_block_on(motg);
-                msm_chg_enable_dcd(motg);
-                motg->chg_state = USB_CHG_STATE_WAIT_FOR_DCD;
-                motg->dcd_retries = 0;
-                delay = MSM_CHG_DCD_POLL_TIME;
-                break;
-        case USB_CHG_STATE_WAIT_FOR_DCD:
-                is_dcd = msm_chg_check_dcd(motg);
-                tmout = ++motg->dcd_retries == MSM_CHG_DCD_MAX_RETRIES;
-                if (is_dcd || tmout) {
-                        msm_chg_disable_dcd(motg);
-                        msm_chg_enable_primary_det(motg);
-                        delay = MSM_CHG_PRIMARY_DET_TIME;
-                        motg->chg_state = USB_CHG_STATE_DCD_DONE;
-                } else {
-                        delay = MSM_CHG_DCD_POLL_TIME;
-                }
-                break;
-        case USB_CHG_STATE_DCD_DONE:
-                vout = msm_chg_check_primary_det(motg);
-                if (vout) {
-                        msm_chg_enable_secondary_det(motg);
-                        delay = MSM_CHG_SECONDARY_DET_TIME;
-                        motg->chg_state = USB_CHG_STATE_PRIMARY_DONE;
-                } else {
-                        motg->chg_type = USB_SDP_CHARGER;
-                        motg->chg_state = USB_CHG_STATE_DETECTED;
-                        delay = 0;
-                }
-                break;
-        case USB_CHG_STATE_PRIMARY_DONE:
-                vout = msm_chg_check_secondary_det(motg);
-                if (vout)
-                        motg->chg_type = USB_DCP_CHARGER;
-                else
-                        motg->chg_type = USB_CDP_CHARGER;
-                motg->chg_state = USB_CHG_STATE_SECONDARY_DONE;
-                /* fall through */
-        case USB_CHG_STATE_SECONDARY_DONE:
-                motg->chg_state = USB_CHG_STATE_DETECTED;
-        case USB_CHG_STATE_DETECTED:
-                msm_chg_block_off(motg);
-                dev_dbg(phy->dev, "charger = %d\n", motg->chg_type);
-                schedule_work(&motg->sm_work);
-                return;
-        default:
-                return;
-        }
-
-        schedule_delayed_work(&motg->chg_work, delay);
-}
-
-/*
- * We support OTG, Peripheral only and Host only configurations. In case
- * of OTG, mode switch (host-->peripheral/peripheral-->host) can happen
- * via Id pin status or user request (debugfs). Id/BSV interrupts are not
- * enabled when switch is controlled by user and default mode is supplied
- * by board file, which can be changed by userspace later.
- */
-static void msm_otg_init_sm(struct msm_otg *motg)
-{
-        struct msm_otg_platform_data *pdata = motg->pdata;
-        u32 otgsc = readl(USB_OTGSC);
-
-        switch (pdata->mode) {
-        case USB_DR_MODE_OTG:
-                if (pdata->otg_control == OTG_PHY_CONTROL) {
-                        if (otgsc & OTGSC_ID)
-                                set_bit(ID, &motg->inputs);
-                        else
-                                clear_bit(ID, &motg->inputs);
-
-                        if (otgsc & OTGSC_BSV)
-                                set_bit(B_SESS_VLD, &motg->inputs);
-                        else
-                                clear_bit(B_SESS_VLD, &motg->inputs);
-                } else if (pdata->otg_control == OTG_USER_CONTROL) {
-                                set_bit(ID, &motg->inputs);
-                                clear_bit(B_SESS_VLD, &motg->inputs);
-                }
-                break;
-        case USB_DR_MODE_HOST:
-                clear_bit(ID, &motg->inputs);
-                break;
-        case USB_DR_MODE_PERIPHERAL:
-                set_bit(ID, &motg->inputs);
-                if (otgsc & OTGSC_BSV)
-                        set_bit(B_SESS_VLD, &motg->inputs);
-                else
-                        clear_bit(B_SESS_VLD, &motg->inputs);
-                break;
-        default:
-                break;
-        }
-}
-
-static void msm_otg_sm_work(struct work_struct *w)
-{
-        struct msm_otg *motg = container_of(w, struct msm_otg, sm_work);
-        struct usb_otg *otg = motg->phy.otg;
-
-        switch (otg->state) {
-        case OTG_STATE_UNDEFINED:
-                dev_dbg(otg->usb_phy->dev, "OTG_STATE_UNDEFINED state\n");
-                msm_otg_reset(otg->usb_phy);
-                msm_otg_init_sm(motg);
-                otg->state = OTG_STATE_B_IDLE;
-                /* FALL THROUGH */
-        case OTG_STATE_B_IDLE:
-                dev_dbg(otg->usb_phy->dev, "OTG_STATE_B_IDLE state\n");
-                if (!test_bit(ID, &motg->inputs) && otg->host) {
-                        /* disable BSV bit */
-                        writel(readl(USB_OTGSC) & ~OTGSC_BSVIE, USB_OTGSC);
-                        msm_otg_start_host(otg->usb_phy, 1);
-                        otg->state = OTG_STATE_A_HOST;
-                } else if (test_bit(B_SESS_VLD, &motg->inputs)) {
-                        switch (motg->chg_state) {
-                        case USB_CHG_STATE_UNDEFINED:
-                                msm_chg_detect_work(&motg->chg_work.work);
-                                break;
-                        case USB_CHG_STATE_DETECTED:
-                                switch (motg->chg_type) {
-                                case USB_DCP_CHARGER:
-                                        msm_otg_notify_charger(motg,
-                                                        IDEV_CHG_MAX);
-                                        break;
-                                case USB_CDP_CHARGER:
-                                        msm_otg_notify_charger(motg,
-                                                        IDEV_CHG_MAX);
-                                        msm_otg_start_peripheral(otg->usb_phy,
-                                                                 1);
-                                        otg->state
-                                                = OTG_STATE_B_PERIPHERAL;
-                                        break;
-                                case USB_SDP_CHARGER:
-                                        msm_otg_notify_charger(motg, IUNIT);
-                                        msm_otg_start_peripheral(otg->usb_phy,
-                                                                 1);
-                                        otg->state
-                                                = OTG_STATE_B_PERIPHERAL;
-                                        break;
-                                default:
-                                        break;
-                                }
-                                break;
-                        default:
-                                break;
-                        }
-                } else {
-                        /*
-                         * If charger detection work is pending, decrement
-                         * the pm usage counter to balance with the one that
-                         * is incremented in charger detection work.
-                         */
-                        if (cancel_delayed_work_sync(&motg->chg_work)) {
-                                pm_runtime_put_sync(otg->usb_phy->dev);
-                                msm_otg_reset(otg->usb_phy);
-                        }
-                        msm_otg_notify_charger(motg, 0);
-                        motg->chg_state = USB_CHG_STATE_UNDEFINED;
-                        motg->chg_type = USB_INVALID_CHARGER;
-                }
-
-                if (otg->state == OTG_STATE_B_IDLE)
-                        pm_runtime_put_sync(otg->usb_phy->dev);
-                break;
-        case OTG_STATE_B_PERIPHERAL:
-                dev_dbg(otg->usb_phy->dev, "OTG_STATE_B_PERIPHERAL state\n");
-                if (!test_bit(B_SESS_VLD, &motg->inputs) ||
-                                !test_bit(ID, &motg->inputs)) {
-                        msm_otg_notify_charger(motg, 0);
-                        msm_otg_start_peripheral(otg->usb_phy, 0);
-                        motg->chg_state = USB_CHG_STATE_UNDEFINED;
-                        motg->chg_type = USB_INVALID_CHARGER;
-                        otg->state = OTG_STATE_B_IDLE;
-                        msm_otg_reset(otg->usb_phy);
-                        schedule_work(w);
-                }
-                break;
-        case OTG_STATE_A_HOST:
-                dev_dbg(otg->usb_phy->dev, "OTG_STATE_A_HOST state\n");
-                if (test_bit(ID, &motg->inputs)) {
-                        msm_otg_start_host(otg->usb_phy, 0);
-                        otg->state = OTG_STATE_B_IDLE;
-                        msm_otg_reset(otg->usb_phy);
-                        schedule_work(w);
-                }
-                break;
-        default:
-                break;
-        }
-}
-
-static irqreturn_t msm_otg_irq(int irq, void *data)
-{
-        struct msm_otg *motg = data;
-        struct usb_phy *phy = &motg->phy;
-        u32 otgsc = 0;
-
-        if (atomic_read(&motg->in_lpm)) {
-                disable_irq_nosync(irq);
-                motg->async_int = 1;
-                pm_runtime_get(phy->dev);
-                return IRQ_HANDLED;
-        }
-
-        otgsc = readl(USB_OTGSC);
-        if (!(otgsc & (OTGSC_IDIS | OTGSC_BSVIS)))
-                return IRQ_NONE;
-
-        if ((otgsc & OTGSC_IDIS) && (otgsc & OTGSC_IDIE)) {
-                if (otgsc & OTGSC_ID)
-                        set_bit(ID, &motg->inputs);
-                else
-                        clear_bit(ID, &motg->inputs);
-                dev_dbg(phy->dev, "ID set/clear\n");
-                pm_runtime_get_noresume(phy->dev);
-        } else if ((otgsc & OTGSC_BSVIS) && (otgsc & OTGSC_BSVIE)) {
-                if (otgsc & OTGSC_BSV)
-                        set_bit(B_SESS_VLD, &motg->inputs);
-                else
-                        clear_bit(B_SESS_VLD, &motg->inputs);
-                dev_dbg(phy->dev, "BSV set/clear\n");
-                pm_runtime_get_noresume(phy->dev);
-        }
-
-        writel(otgsc, USB_OTGSC);
-        schedule_work(&motg->sm_work);
-        return IRQ_HANDLED;
-}
-
-static int msm_otg_mode_show(struct seq_file *s, void *unused)
-{
-        struct msm_otg *motg = s->private;
-        struct usb_otg *otg = motg->phy.otg;
-
-        switch (otg->state) {
-        case OTG_STATE_A_HOST:
-                seq_puts(s, "host\n");
-                break;
-        case OTG_STATE_B_PERIPHERAL:
-                seq_puts(s, "peripheral\n");
-                break;
-        default:
-                seq_puts(s, "none\n");
-                break;
-        }
-
-        return 0;
-}
-
-static int msm_otg_mode_open(struct inode *inode, struct file *file)
-{
-        return single_open(file, msm_otg_mode_show, inode->i_private);
-}
-
-static ssize_t msm_otg_mode_write(struct file *file, const char __user *ubuf,
-                                size_t count, loff_t *ppos)
-{
-        struct seq_file *s = file->private_data;
-        struct msm_otg *motg = s->private;
-        char buf[16];
-        struct usb_otg *otg = motg->phy.otg;
-        int status = count;
-        enum usb_dr_mode req_mode;
-
-        memset(buf, 0x00, sizeof(buf));
-
-        if (copy_from_user(&buf, ubuf, min_t(size_t, sizeof(buf) - 1, count))) {
-                status = -EFAULT;
-                goto out;
-        }
-
-        if (!strncmp(buf, "host", 4)) {
-                req_mode = USB_DR_MODE_HOST;
-        } else if (!strncmp(buf, "peripheral", 10)) {
-                req_mode = USB_DR_MODE_PERIPHERAL;
-        } else if (!strncmp(buf, "none", 4)) {
-                req_mode = USB_DR_MODE_UNKNOWN;
-        } else {
-                status = -EINVAL;
-                goto out;
-        }
-
-        switch (req_mode) {
-        case USB_DR_MODE_UNKNOWN:
-                switch (otg->state) {
-                case OTG_STATE_A_HOST:
-                case OTG_STATE_B_PERIPHERAL:
-                        set_bit(ID, &motg->inputs);
-                        clear_bit(B_SESS_VLD, &motg->inputs);
-                        break;
-                default:
-                        goto out;
-                }
-                break;
-        case USB_DR_MODE_PERIPHERAL:
-                switch (otg->state) {
-                case OTG_STATE_B_IDLE:
-                case OTG_STATE_A_HOST:
-                        set_bit(ID, &motg->inputs);
-                        set_bit(B_SESS_VLD, &motg->inputs);
-                        break;
-                default:
-                        goto out;
-                }
-                break;
-        case USB_DR_MODE_HOST:
-                switch (otg->state) {
-                case OTG_STATE_B_IDLE:
-                case OTG_STATE_B_PERIPHERAL:
-                        clear_bit(ID, &motg->inputs);
-                        break;
-                default:
-                        goto out;
-                }
-                break;
-        default:
-                goto out;
-        }
-
-        pm_runtime_get_sync(otg->usb_phy->dev);
-        schedule_work(&motg->sm_work);
-out:
-        return status;
-}
-
-static const struct file_operations msm_otg_mode_fops = {
-        .open = msm_otg_mode_open,
-        .read = seq_read,
-        .write = msm_otg_mode_write,
-        .llseek = seq_lseek,
-        .release = single_release,
-};
-
-static struct dentry *msm_otg_dbg_root;
-static struct dentry *msm_otg_dbg_mode;
-
-static int msm_otg_debugfs_init(struct msm_otg *motg)
-{
-        msm_otg_dbg_root = debugfs_create_dir("msm_otg", NULL);
-
-        if (!msm_otg_dbg_root || IS_ERR(msm_otg_dbg_root))
-                return -ENODEV;
-
-        msm_otg_dbg_mode = debugfs_create_file("mode", S_IRUGO | S_IWUSR,
-                                msm_otg_dbg_root, motg, &msm_otg_mode_fops);
-        if (!msm_otg_dbg_mode) {
-                debugfs_remove(msm_otg_dbg_root);
-                msm_otg_dbg_root = NULL;
-                return -ENODEV;
-        }
-
-        return 0;
-}
-
-static void msm_otg_debugfs_cleanup(void)
-{
-        debugfs_remove(msm_otg_dbg_mode);
-        debugfs_remove(msm_otg_dbg_root);
-}
-
-static const struct of_device_id msm_otg_dt_match[] = {
-        {
-                .compatible = "qcom,usb-otg-ci",
-                .data = (void *) CI_45NM_INTEGRATED_PHY
-        },
-        {
-                .compatible = "qcom,usb-otg-snps",
-                .data = (void *) SNPS_28NM_INTEGRATED_PHY
-        },
-        { }
-};
-MODULE_DEVICE_TABLE(of, msm_otg_dt_match);
-
-static int msm_otg_vbus_notifier(struct notifier_block *nb, unsigned long event,
-                                void *ptr)
-{
-        struct usb_phy *usb_phy = container_of(nb, struct usb_phy, vbus_nb);
-        struct msm_otg *motg = container_of(usb_phy, struct msm_otg, phy);
-
-        if (event)
-                set_bit(B_SESS_VLD, &motg->inputs);
-        else
-                clear_bit(B_SESS_VLD, &motg->inputs);
-
-        if (test_bit(B_SESS_VLD, &motg->inputs)) {
-                /* Switch D+/D- lines to Device connector */
-                gpiod_set_value_cansleep(motg->switch_gpio, 0);
-        } else {
-                /* Switch D+/D- lines to Hub */
-                gpiod_set_value_cansleep(motg->switch_gpio, 1);
-        }
-
-        schedule_work(&motg->sm_work);
-
-        return NOTIFY_DONE;
-}
-
-static int msm_otg_id_notifier(struct notifier_block *nb, unsigned long event,
-                                void *ptr)
-{
-        struct usb_phy *usb_phy = container_of(nb, struct usb_phy, id_nb);
-        struct msm_otg *motg = container_of(usb_phy, struct msm_otg, phy);
-
-        if (event)
-                clear_bit(ID, &motg->inputs);
-        else
-                set_bit(ID, &motg->inputs);
-
-        schedule_work(&motg->sm_work);
-
-        return NOTIFY_DONE;
-}
-
-static int msm_otg_read_dt(struct platform_device *pdev, struct msm_otg *motg)
-{
-        struct msm_otg_platform_data *pdata;
-        struct device_node *node = pdev->dev.of_node;
-        struct property *prop;
-        int len, ret, words;
-        u32 val, tmp[3];
-
-        pdata = devm_kzalloc(&pdev->dev, sizeof(*pdata), GFP_KERNEL);
-        if (!pdata)
-                return -ENOMEM;
-
-        motg->pdata = pdata;
-
-        pdata->phy_type = (enum msm_usb_phy_type)of_device_get_match_data(&pdev->dev);
-        if (!pdata->phy_type)
-                return 1;
-
-        motg->link_rst = devm_reset_control_get(&pdev->dev, "link");
-        if (IS_ERR(motg->link_rst))
-                return PTR_ERR(motg->link_rst);
-
-        motg->phy_rst = devm_reset_control_get(&pdev->dev, "phy");
-        if (IS_ERR(motg->phy_rst))
-                motg->phy_rst = NULL;
-
-        pdata->mode = usb_get_dr_mode(&pdev->dev);
-        if (pdata->mode == USB_DR_MODE_UNKNOWN)
-                pdata->mode = USB_DR_MODE_OTG;
-
-        pdata->otg_control = OTG_PHY_CONTROL;
-        if (!of_property_read_u32(node, "qcom,otg-control", &val))
-                if (val == OTG_PMIC_CONTROL)
-                        pdata->otg_control = val;
-
-        if (!of_property_read_u32(node, "qcom,phy-num", &val) && val < 2)
-                motg->phy_number = val;
-
-        motg->vdd_levels[VDD_LEVEL_NONE] = USB_PHY_SUSP_DIG_VOL;
-        motg->vdd_levels[VDD_LEVEL_MIN] = USB_PHY_VDD_DIG_VOL_MIN;
-        motg->vdd_levels[VDD_LEVEL_MAX] = USB_PHY_VDD_DIG_VOL_MAX;
-
-        if (of_get_property(node, "qcom,vdd-levels", &len) &&
-            len == sizeof(tmp)) {
-                of_property_read_u32_array(node, "qcom,vdd-levels",
-                                           tmp, len / sizeof(*tmp));
-                motg->vdd_levels[VDD_LEVEL_NONE] = tmp[VDD_LEVEL_NONE];
-                motg->vdd_levels[VDD_LEVEL_MIN] = tmp[VDD_LEVEL_MIN];
-                motg->vdd_levels[VDD_LEVEL_MAX] = tmp[VDD_LEVEL_MAX];
-        }
-
-        motg->manual_pullup = of_property_read_bool(node, "qcom,manual-pullup");
-
-        motg->switch_gpio = devm_gpiod_get_optional(&pdev->dev, "switch",
-                                                    GPIOD_OUT_LOW);
-        if (IS_ERR(motg->switch_gpio))
-                return PTR_ERR(motg->switch_gpio);
-
-        prop = of_find_property(node, "qcom,phy-init-sequence", &len);
-        if (!prop || !len)
-                return 0;
-
-        words = len / sizeof(u32);
-
-        if (words >= ULPI_EXT_VENDOR_SPECIFIC) {
-                dev_warn(&pdev->dev, "Too big PHY init sequence %d\n", words);
-                return 0;
-        }
-
-        pdata->phy_init_seq = devm_kzalloc(&pdev->dev, len, GFP_KERNEL);
-        if (!pdata->phy_init_seq)
-                return 0;
-
-        ret = of_property_read_u32_array(node, "qcom,phy-init-sequence",
-                                         pdata->phy_init_seq, words);
-        if (!ret)
-                pdata->phy_init_sz = words;
-
-        return 0;
-}
-
-static int msm_otg_reboot_notify(struct notifier_block *this,
-                                 unsigned long code, void *unused)
-{
-        struct msm_otg *motg = container_of(this, struct msm_otg, reboot);
-
-        /*
-         * Ensure that D+/D- lines are routed to uB connector, so
-         * we could load bootloader/kernel at next reboot
-         */
-        gpiod_set_value_cansleep(motg->switch_gpio, 0);
-        return NOTIFY_DONE;
-}
-
-static int msm_otg_probe(struct platform_device *pdev)
-{
-        int ret = 0;
-        struct device_node *np = pdev->dev.of_node;
-        struct msm_otg_platform_data *pdata;
-        struct resource *res;
-        struct msm_otg *motg;
-        struct usb_phy *phy;
-        void __iomem *phy_select;
-
-        motg = devm_kzalloc(&pdev->dev, sizeof(struct msm_otg), GFP_KERNEL);
-        if (!motg)
-                return -ENOMEM;
-
-        motg->phy.otg = devm_kzalloc(&pdev->dev, sizeof(struct usb_otg),
-                                     GFP_KERNEL);
-        if (!motg->phy.otg)
-                return -ENOMEM;
-
-        phy = &motg->phy;
-        phy->dev = &pdev->dev;
-
-        motg->clk = devm_clk_get(&pdev->dev, np ? "core" : "usb_hs_clk");
-        if (IS_ERR(motg->clk)) {
-                dev_err(&pdev->dev, "failed to get usb_hs_clk\n");
-                return PTR_ERR(motg->clk);
-        }
-
-        /*
-         * If USB Core is running its protocol engine based on CORE CLK,
-         * CORE CLK  must be running at >55Mhz for correct HSUSB
-         * operation and USB core cannot tolerate frequency changes on
-         * CORE CLK.
-         */
-        motg->pclk = devm_clk_get(&pdev->dev, np ? "iface" : "usb_hs_pclk");
-        if (IS_ERR(motg->pclk)) {
-                dev_err(&pdev->dev, "failed to get usb_hs_pclk\n");
-                return PTR_ERR(motg->pclk);
-        }
-
-        /*
-         * USB core clock is not present on all MSM chips. This
-         * clock is introduced to remove the dependency on AXI
-         * bus frequency.
-         */
-        motg->core_clk = devm_clk_get(&pdev->dev,
-                                      np ? "alt_core" : "usb_hs_core_clk");
-
-        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-        if (!res)
-                return -EINVAL;
-        motg->regs = devm_ioremap(&pdev->dev, res->start, resource_size(res));
-        if (!motg->regs)
-                return -ENOMEM;
-
-        pdata = dev_get_platdata(&pdev->dev);
-        if (!pdata) {
-                if (!np)
-                        return -ENXIO;
-                ret = msm_otg_read_dt(pdev, motg);
-                if (ret)
-                        return ret;
-        }
-
-        /*
-         * NOTE: The PHYs can be multiplexed between the chipidea controller
-         * and the dwc3 controller, using a single bit. It is important that
-         * the dwc3 driver does not set this bit in an incompatible way.
-         */
-        if (motg->phy_number) {
-                phy_select = devm_ioremap_nocache(&pdev->dev, USB2_PHY_SEL, 4);
-                if (!phy_select)
-                        return -ENOMEM;
-
-                /* Enable second PHY with the OTG port */
-                writel(0x1, phy_select);
-        }
-
-        dev_info(&pdev->dev, "OTG regs = %p\n", motg->regs);
-
-        motg->irq = platform_get_irq(pdev, 0);
-        if (motg->irq < 0) {
-                dev_err(&pdev->dev, "platform_get_irq failed\n");
-                ret = motg->irq;
-                return motg->irq;
-        }
-
-        motg->supplies[0].supply = "vddcx";
-        motg->supplies[1].supply = "v3p3";
-        motg->supplies[2].supply = "v1p8";
-
-        ret = devm_regulator_bulk_get(motg->phy.dev, ARRAY_SIZE(motg->supplies),
-                                      motg->supplies);
-        if (ret)
-                return ret;
-
-        motg->vddcx = motg->supplies[0].consumer;
-        motg->v3p3  = motg->supplies[1].consumer;
-        motg->v1p8  = motg->supplies[2].consumer;
-
-        clk_set_rate(motg->clk, 60000000);
-
-        clk_prepare_enable(motg->clk);
-        clk_prepare_enable(motg->pclk);
-
-        if (!IS_ERR(motg->core_clk))
-                clk_prepare_enable(motg->core_clk);
-
-        ret = msm_hsusb_init_vddcx(motg, 1);
-        if (ret) {
-                dev_err(&pdev->dev, "hsusb vddcx configuration failed\n");
-                goto disable_clks;
-        }
-
-        ret = msm_hsusb_ldo_init(motg, 1);
-        if (ret) {
-                dev_err(&pdev->dev, "hsusb vreg configuration failed\n");
-                goto disable_vddcx;
-        }
-        ret = msm_hsusb_ldo_set_mode(motg, 1);
-        if (ret) {
-                dev_err(&pdev->dev, "hsusb vreg enable failed\n");
-                goto disable_ldo;
-        }
-
-        writel(0, USB_USBINTR);
-        writel(0, USB_OTGSC);
-
-        INIT_WORK(&motg->sm_work, msm_otg_sm_work);
-        INIT_DELAYED_WORK(&motg->chg_work, msm_chg_detect_work);
-        ret = devm_request_irq(&pdev->dev, motg->irq, msm_otg_irq, IRQF_SHARED,
-                                        "msm_otg", motg);
-        if (ret) {
-                dev_err(&pdev->dev, "request irq failed\n");
-                goto disable_ldo;
-        }
-
-        phy->init = msm_phy_init;
-        phy->notify_disconnect = msm_phy_notify_disconnect;
-        phy->type = USB_PHY_TYPE_USB2;
-        phy->vbus_nb.notifier_call = msm_otg_vbus_notifier;
-        phy->id_nb.notifier_call = msm_otg_id_notifier;
-
-        phy->io_ops = &msm_otg_io_ops;
-
-        phy->otg->usb_phy = &motg->phy;
-        phy->otg->set_host = msm_otg_set_host;
-        phy->otg->set_peripheral = msm_otg_set_peripheral;
-
-        msm_usb_reset(phy);
-
-        ret = usb_add_phy_dev(&motg->phy);
-        if (ret) {
-                dev_err(&pdev->dev, "usb_add_phy failed\n");
-                goto disable_ldo;
-        }
-
-        ret = extcon_get_state(phy->edev, EXTCON_USB);
-        if (ret)
-                set_bit(B_SESS_VLD, &motg->inputs);
-        else
-                clear_bit(B_SESS_VLD, &motg->inputs);
-
-        ret = extcon_get_state(phy->id_edev, EXTCON_USB_HOST);
-        if (ret)
-                clear_bit(ID, &motg->inputs);
-        else
-                set_bit(ID, &motg->inputs);
-
-        platform_set_drvdata(pdev, motg);
-        device_init_wakeup(&pdev->dev, 1);
-
-        if (motg->pdata->mode == USB_DR_MODE_OTG &&
-                motg->pdata->otg_control == OTG_USER_CONTROL) {
-                ret = msm_otg_debugfs_init(motg);
-                if (ret)
-                        dev_dbg(&pdev->dev, "Can not create mode change file\n");
-        }
-
-        if (test_bit(B_SESS_VLD, &motg->inputs)) {
-                /* Switch D+/D- lines to Device connector */
-                gpiod_set_value_cansleep(motg->switch_gpio, 0);
-        } else {
-                /* Switch D+/D- lines to Hub */
-                gpiod_set_value_cansleep(motg->switch_gpio, 1);
-        }
-
-        motg->reboot.notifier_call = msm_otg_reboot_notify;
-        register_reboot_notifier(&motg->reboot);
-
-        pm_runtime_set_active(&pdev->dev);
-        pm_runtime_enable(&pdev->dev);
-
-        return 0;
-
-disable_ldo:
-        msm_hsusb_ldo_init(motg, 0);
-disable_vddcx:
-        msm_hsusb_init_vddcx(motg, 0);
-disable_clks:
-        clk_disable_unprepare(motg->pclk);
-        clk_disable_unprepare(motg->clk);
-        if (!IS_ERR(motg->core_clk))
-                clk_disable_unprepare(motg->core_clk);
-
-        return ret;
-}
-
-static int msm_otg_remove(struct platform_device *pdev)
-{
-        struct msm_otg *motg = platform_get_drvdata(pdev);
-        struct usb_phy *phy = &motg->phy;
-        int cnt = 0;
-
-        if (phy->otg->host || phy->otg->gadget)
-                return -EBUSY;
-
-        unregister_reboot_notifier(&motg->reboot);
-
-        /*
-         * Ensure that D+/D- lines are routed to uB connector, so
-         * we could load bootloader/kernel at next reboot
-         */
-        gpiod_set_value_cansleep(motg->switch_gpio, 0);
-
-        msm_otg_debugfs_cleanup();
-        cancel_delayed_work_sync(&motg->chg_work);
-        cancel_work_sync(&motg->sm_work);
-
-        pm_runtime_resume(&pdev->dev);
-
-        device_init_wakeup(&pdev->dev, 0);
-        pm_runtime_disable(&pdev->dev);
-
-        usb_remove_phy(phy);
-        disable_irq(motg->irq);
-
-        /*
-         * Put PHY in low power mode.
-         */
-        ulpi_read(phy, 0x14);
-        ulpi_write(phy, 0x08, 0x09);
-
-        writel(readl(USB_PORTSC) | PORTSC_PHCD, USB_PORTSC);
-        while (cnt < PHY_SUSPEND_TIMEOUT_USEC) {
-                if (readl(USB_PORTSC) & PORTSC_PHCD)
-                        break;
-                udelay(1);
-                cnt++;
-        }
-        if (cnt >= PHY_SUSPEND_TIMEOUT_USEC)
-                dev_err(phy->dev, "Unable to suspend PHY\n");
-
-        clk_disable_unprepare(motg->pclk);
-        clk_disable_unprepare(motg->clk);
-        if (!IS_ERR(motg->core_clk))
-                clk_disable_unprepare(motg->core_clk);
-        msm_hsusb_ldo_init(motg, 0);
-
-        pm_runtime_set_suspended(&pdev->dev);
-
-        return 0;
-}
-
-#ifdef CONFIG_PM
-static int msm_otg_runtime_idle(struct device *dev)
-{
-        struct msm_otg *motg = dev_get_drvdata(dev);
-        struct usb_otg *otg = motg->phy.otg;
-
-        dev_dbg(dev, "OTG runtime idle\n");
-
-        /*
-         * It is observed some times that a spurious interrupt
-         * comes when PHY is put into LPM immediately after PHY reset.
-         * This 1 sec delay also prevents entering into LPM immediately
-         * after asynchronous interrupt.
-         */
-        if (otg->state != OTG_STATE_UNDEFINED)
-                pm_schedule_suspend(dev, 1000);
-
-        return -EAGAIN;
-}
-
-static int msm_otg_runtime_suspend(struct device *dev)
-{
-        struct msm_otg *motg = dev_get_drvdata(dev);
-
-        dev_dbg(dev, "OTG runtime suspend\n");
-        return msm_otg_suspend(motg);
-}
-
-static int msm_otg_runtime_resume(struct device *dev)
-{
-        struct msm_otg *motg = dev_get_drvdata(dev);
-
-        dev_dbg(dev, "OTG runtime resume\n");
-        return msm_otg_resume(motg);
-}
-#endif
-
-#ifdef CONFIG_PM_SLEEP
-static int msm_otg_pm_suspend(struct device *dev)
-{
-        struct msm_otg *motg = dev_get_drvdata(dev);
-
-        dev_dbg(dev, "OTG PM suspend\n");
-        return msm_otg_suspend(motg);
-}
-
-static int msm_otg_pm_resume(struct device *dev)
-{
-        struct msm_otg *motg = dev_get_drvdata(dev);
-        int ret;
-
-        dev_dbg(dev, "OTG PM resume\n");
-
-        ret = msm_otg_resume(motg);
-        if (ret)
-                return ret;
-
-        /*
-         * Runtime PM Documentation recommends bringing the
-         * device to full powered state upon resume.
-         */
-        pm_runtime_disable(dev);
-        pm_runtime_set_active(dev);
-        pm_runtime_enable(dev);
-
-        return 0;
-}
-#endif
-
-static const struct dev_pm_ops msm_otg_dev_pm_ops = {
-        SET_SYSTEM_SLEEP_PM_OPS(msm_otg_pm_suspend, msm_otg_pm_resume)
-        SET_RUNTIME_PM_OPS(msm_otg_runtime_suspend, msm_otg_runtime_resume,
-                                msm_otg_runtime_idle)
-};
-
-static struct platform_driver msm_otg_driver = {
-        .probe = msm_otg_probe,
-        .remove = msm_otg_remove,
-        .driver = {
-                .name = DRIVER_NAME,
-                .pm = &msm_otg_dev_pm_ops,
-                .of_match_table = msm_otg_dt_match,
-        },
-};
-
-module_platform_driver(msm_otg_driver);
-
-MODULE_LICENSE("GPL v2");
-MODULE_DESCRIPTION("MSM USB transceiver driver");
diff --git a/drivers/usb/phy/phy-mv-usb.c b/drivers/usb/phy/phy-mv-usb.c
index 0e315694adc9..554b72282276 100644
--- a/drivers/usb/phy/phy-mv-usb.c
+++ b/drivers/usb/phy/phy-mv-usb.c
@@ -1,12 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright (C) 2011 Marvell International Ltd. All rights reserved.
  * Author: Chao Xie <chao.xie@marvell.com>
  *         Neil Zhang <zhangwm@marvell.com>
- *
- * 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.
  */
 
 #include <linux/module.h>
@@ -87,9 +83,10 @@ static void mv_otg_run_state_machine(struct mv_otg *mvotg,
         queue_delayed_work(mvotg->qwork, &mvotg->work, delay);
 }
 
-static void mv_otg_timer_await_bcon(unsigned long data)
+static void mv_otg_timer_await_bcon(struct timer_list *t)
 {
-        struct mv_otg *mvotg = (struct mv_otg *) data;
+        struct mv_otg *mvotg = from_timer(mvotg, t,
+                                          otg_ctrl.timer[A_WAIT_BCON_TIMER]);
 
         mvotg->otg_ctrl.a_wait_bcon_timeout = 1;
 
@@ -117,8 +114,7 @@ static int mv_otg_cancel_timer(struct mv_otg *mvotg, unsigned int id)
 }
 
 static int mv_otg_set_timer(struct mv_otg *mvotg, unsigned int id,
-                            unsigned long interval,
-                            void (*callback) (unsigned long))
+                            unsigned long interval)
 {
         struct timer_list *timer;
 
@@ -131,9 +127,6 @@ static int mv_otg_set_timer(struct mv_otg *mvotg, unsigned int id,
                 return -EBUSY;
         }
 
-        init_timer(timer);
-        timer->data = (unsigned long) mvotg;
-        timer->function = callback;
         timer->expires = jiffies + interval;
         add_timer(timer);
 
@@ -459,8 +452,7 @@ run:
                         if (old_state != OTG_STATE_A_HOST)
                                 mv_otg_start_host(mvotg, 1);
                         mv_otg_set_timer(mvotg, A_WAIT_BCON_TIMER,
-                                         T_A_WAIT_BCON,
-                                         mv_otg_timer_await_bcon);
+                                         T_A_WAIT_BCON);
                         /*
                          * Now, we directly enter A_HOST. So set b_conn = 1
                          * here. In fact, it need host driver to notify us.
@@ -722,7 +714,8 @@ static int mv_otg_probe(struct platform_device *pdev)
         otg->set_vbus = mv_otg_set_vbus;
 
         for (i = 0; i < OTG_TIMER_NUM; i++)
-                init_timer(&mvotg->otg_ctrl.timer[i]);
+                timer_setup(&mvotg->otg_ctrl.timer[i],
+                            mv_otg_timer_await_bcon, 0);
 
         r = platform_get_resource_byname(mvotg->pdev,
                                          IORESOURCE_MEM, "phyregs");
diff --git a/drivers/usb/phy/phy-mv-usb.h b/drivers/usb/phy/phy-mv-usb.h
index 551da6eb0ba8..96701a1229ad 100644
--- a/drivers/usb/phy/phy-mv-usb.h
+++ b/drivers/usb/phy/phy-mv-usb.h
@@ -1,10 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright (C) 2011 Marvell International Ltd. All rights reserved.
- *
- * This program is free software; you can redistribute  it and/or modify it
- * under  the terms of  the GNU General  Public License as published by the
- * Free Software Foundation;  either version 2 of the  License, or (at your
- * option) any later version.
  */
 
 #ifndef __MV_USB_OTG_CONTROLLER__
diff --git a/drivers/usb/phy/phy-mxs-usb.c b/drivers/usb/phy/phy-mxs-usb.c
index 0e2f1a36d315..da031c45395a 100644
--- a/drivers/usb/phy/phy-mxs-usb.c
+++ b/drivers/usb/phy/phy-mxs-usb.c
@@ -1,14 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright 2012-2014 Freescale Semiconductor, Inc.
  * Copyright (C) 2012 Marek Vasut <marex@denx.de>
  * on behalf of DENX Software Engineering GmbH
- *
- * The code contained herein is licensed under the GNU General Public
- * License. You may obtain a copy of the GNU General Public License
- * Version 2 or later at the following locations:
- *
- * http://www.opensource.org/licenses/gpl-license.html
- * http://www.gnu.org/copyleft/gpl.html
  */
 
 #include <linux/module.h>
@@ -67,11 +61,26 @@
 #define ANADIG_ANA_MISC0_SET                    0x154
 #define ANADIG_ANA_MISC0_CLR                    0x158
 
+#define ANADIG_USB1_CHRG_DETECT_SET             0x1b4
+#define ANADIG_USB1_CHRG_DETECT_CLR             0x1b8
+#define ANADIG_USB1_CHRG_DETECT_EN_B            BIT(20)
+#define ANADIG_USB1_CHRG_DETECT_CHK_CHRG_B      BIT(19)
+#define ANADIG_USB1_CHRG_DETECT_CHK_CONTACT     BIT(18)
+
 #define ANADIG_USB1_VBUS_DET_STAT               0x1c0
+#define ANADIG_USB1_VBUS_DET_STAT_VBUS_VALID    BIT(3)
+
+#define ANADIG_USB1_CHRG_DET_STAT               0x1d0
+#define ANADIG_USB1_CHRG_DET_STAT_DM_STATE      BIT(2)
+#define ANADIG_USB1_CHRG_DET_STAT_CHRG_DETECTED BIT(1)
+#define ANADIG_USB1_CHRG_DET_STAT_PLUG_CONTACT  BIT(0)
+
 #define ANADIG_USB2_VBUS_DET_STAT               0x220
 
 #define ANADIG_USB1_LOOPBACK_SET                0x1e4
 #define ANADIG_USB1_LOOPBACK_CLR                0x1e8
+#define ANADIG_USB1_LOOPBACK_UTMI_TESTSTART     BIT(0)
+
 #define ANADIG_USB2_LOOPBACK_SET                0x244
 #define ANADIG_USB2_LOOPBACK_CLR                0x248
 
@@ -479,6 +488,144 @@ static int mxs_phy_on_disconnect(struct usb_phy *phy,
         return 0;
 }
 
+#define MXS_USB_CHARGER_DATA_CONTACT_TIMEOUT    100
+static int mxs_charger_data_contact_detect(struct mxs_phy *x)
+{
+        struct regmap *regmap = x->regmap_anatop;
+        int i, stable_contact_count = 0;
+        u32 val;
+
+        /* Check if vbus is valid */
+        regmap_read(regmap, ANADIG_USB1_VBUS_DET_STAT, &val);
+        if (!(val & ANADIG_USB1_VBUS_DET_STAT_VBUS_VALID)) {
+                dev_err(x->phy.dev, "vbus is not valid\n");
+                return -EINVAL;
+        }
+
+        /* Enable charger detector */
+        regmap_write(regmap, ANADIG_USB1_CHRG_DETECT_CLR,
+                                ANADIG_USB1_CHRG_DETECT_EN_B);
+        /*
+         * - Do not check whether a charger is connected to the USB port
+         * - Check whether the USB plug has been in contact with each other
+         */
+        regmap_write(regmap, ANADIG_USB1_CHRG_DETECT_SET,
+                        ANADIG_USB1_CHRG_DETECT_CHK_CONTACT |
+                        ANADIG_USB1_CHRG_DETECT_CHK_CHRG_B);
+
+        /* Check if plug is connected */
+        for (i = 0; i < MXS_USB_CHARGER_DATA_CONTACT_TIMEOUT; i++) {
+                regmap_read(regmap, ANADIG_USB1_CHRG_DET_STAT, &val);
+                if (val & ANADIG_USB1_CHRG_DET_STAT_PLUG_CONTACT) {
+                        stable_contact_count++;
+                        if (stable_contact_count > 5)
+                                /* Data pin makes contact */
+                                break;
+                        else
+                                usleep_range(5000, 10000);
+                } else {
+                        stable_contact_count = 0;
+                        usleep_range(5000, 6000);
+                }
+        }
+
+        if (i == MXS_USB_CHARGER_DATA_CONTACT_TIMEOUT) {
+                dev_err(x->phy.dev,
+                        "Data pin can't make good contact.\n");
+                /* Disable charger detector */
+                regmap_write(regmap, ANADIG_USB1_CHRG_DETECT_SET,
+                                ANADIG_USB1_CHRG_DETECT_EN_B |
+                                ANADIG_USB1_CHRG_DETECT_CHK_CHRG_B);
+                return -ENXIO;
+        }
+
+        return 0;
+}
+
+static enum usb_charger_type mxs_charger_primary_detection(struct mxs_phy *x)
+{
+        struct regmap *regmap = x->regmap_anatop;
+        enum usb_charger_type chgr_type = UNKNOWN_TYPE;
+        u32 val;
+
+        /*
+         * - Do check whether a charger is connected to the USB port
+         * - Do not Check whether the USB plug has been in contact with
+         *   each other
+         */
+        regmap_write(regmap, ANADIG_USB1_CHRG_DETECT_CLR,
+                        ANADIG_USB1_CHRG_DETECT_CHK_CONTACT |
+                        ANADIG_USB1_CHRG_DETECT_CHK_CHRG_B);
+
+        msleep(100);
+
+        /* Check if it is a charger */
+        regmap_read(regmap, ANADIG_USB1_CHRG_DET_STAT, &val);
+        if (!(val & ANADIG_USB1_CHRG_DET_STAT_CHRG_DETECTED)) {
+                chgr_type = SDP_TYPE;
+                dev_dbg(x->phy.dev, "It is a stardard downstream port\n");
+        }
+
+        /* Disable charger detector */
+        regmap_write(regmap, ANADIG_USB1_CHRG_DETECT_SET,
+                        ANADIG_USB1_CHRG_DETECT_EN_B |
+                        ANADIG_USB1_CHRG_DETECT_CHK_CHRG_B);
+
+        return chgr_type;
+}
+
+/*
+ * It must be called after DP is pulled up, which is used to
+ * differentiate DCP and CDP.
+ */
+enum usb_charger_type mxs_charger_secondary_detection(struct mxs_phy *x)
+{
+        struct regmap *regmap = x->regmap_anatop;
+        int val;
+
+        msleep(80);
+
+        regmap_read(regmap, ANADIG_USB1_CHRG_DET_STAT, &val);
+        if (val & ANADIG_USB1_CHRG_DET_STAT_DM_STATE) {
+                dev_dbg(x->phy.dev, "It is a dedicate charging port\n");
+                return DCP_TYPE;
+        } else {
+                dev_dbg(x->phy.dev, "It is a charging downstream port\n");
+                return CDP_TYPE;
+        }
+}
+
+static enum usb_charger_type mxs_phy_charger_detect(struct usb_phy *phy)
+{
+        struct mxs_phy *mxs_phy = to_mxs_phy(phy);
+        struct regmap *regmap = mxs_phy->regmap_anatop;
+        void __iomem *base = phy->io_priv;
+        enum usb_charger_type chgr_type = UNKNOWN_TYPE;
+
+        if (mxs_charger_data_contact_detect(mxs_phy))
+                return chgr_type;
+
+        chgr_type = mxs_charger_primary_detection(mxs_phy);
+
+        if (chgr_type != SDP_TYPE) {
+                /* Pull up DP via test */
+                writel_relaxed(BM_USBPHY_DEBUG_CLKGATE,
+                                base + HW_USBPHY_DEBUG_CLR);
+                regmap_write(regmap, ANADIG_USB1_LOOPBACK_SET,
+                                ANADIG_USB1_LOOPBACK_UTMI_TESTSTART);
+
+                chgr_type = mxs_charger_secondary_detection(mxs_phy);
+
+                /* Stop the test */
+                regmap_write(regmap, ANADIG_USB1_LOOPBACK_CLR,
+                                ANADIG_USB1_LOOPBACK_UTMI_TESTSTART);
+                writel_relaxed(BM_USBPHY_DEBUG_CLKGATE,
+                                base + HW_USBPHY_DEBUG_SET);
+        }
+
+        return chgr_type;
+}
+
 static int mxs_phy_probe(struct platform_device *pdev)
 {
         struct resource *res;
@@ -567,6 +714,7 @@ static int mxs_phy_probe(struct platform_device *pdev)
         mxs_phy->phy.notify_disconnect  = mxs_phy_on_disconnect;
         mxs_phy->phy.type               = USB_PHY_TYPE_USB2;
         mxs_phy->phy.set_wakeup         = mxs_phy_set_wakeup;
+        mxs_phy->phy.charger_detect     = mxs_phy_charger_detect;
 
         mxs_phy->clk = clk;
         mxs_phy->data = of_id->data;
diff --git a/drivers/usb/phy/phy-omap-otg.c b/drivers/usb/phy/phy-omap-otg.c
index 800d1d90753d..ee0863c6553e 100644
--- a/drivers/usb/phy/phy-omap-otg.c
+++ b/drivers/usb/phy/phy-omap-otg.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * OMAP OTG controller driver
  *
@@ -6,15 +7,6 @@
  * Copyright (C) 2005-2006 Nokia Corporation
  * Copyright (C) 2004 Texas Instruments
  * Copyright (C) 2004 David Brownell
- *
- * This file is subject to the terms and conditions of the GNU General
- * Public License. See the file "COPYING" in the main directory of this
- * archive for more details.
- *
- * 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/io.h>
diff --git a/drivers/usb/phy/phy-qcom-8x16-usb.c b/drivers/usb/phy/phy-qcom-8x16-usb.c
deleted file mode 100644
index 679afeaaa9a8..000000000000
--- a/drivers/usb/phy/phy-qcom-8x16-usb.c
+++ /dev/null
@@ -1,366 +0,0 @@
-/*
- * Copyright (c) 2015, Linaro Limited
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 and
- * only version 2 as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- */
-
-#include <linux/clk.h>
-#include <linux/delay.h>
-#include <linux/device.h>
-#include <linux/err.h>
-#include <linux/extcon.h>
-#include <linux/gpio/consumer.h>
-#include <linux/io.h>
-#include <linux/module.h>
-#include <linux/of.h>
-#include <linux/platform_device.h>
-#include <linux/reboot.h>
-#include <linux/regulator/consumer.h>
-#include <linux/reset.h>
-#include <linux/slab.h>
-#include <linux/usb.h>
-#include <linux/usb/ulpi.h>
-
-#define HSPHY_AHBBURST                  0x0090
-#define HSPHY_AHBMODE                   0x0098
-#define HSPHY_GENCONFIG                 0x009c
-#define HSPHY_GENCONFIG_2               0x00a0
-
-#define HSPHY_USBCMD                    0x0140
-#define HSPHY_ULPI_VIEWPORT             0x0170
-#define HSPHY_CTRL                      0x0240
-
-#define HSPHY_TXFIFO_IDLE_FORCE_DIS     BIT(4)
-#define HSPHY_SESS_VLD_CTRL_EN          BIT(7)
-#define HSPHY_POR_ASSERT                BIT(0)
-#define HSPHY_RETEN                     BIT(1)
-
-#define HSPHY_SESS_VLD_CTRL             BIT(25)
-
-#define ULPI_PWR_CLK_MNG_REG            0x88
-#define ULPI_PWR_OTG_COMP_DISABLE       BIT(0)
-
-#define ULPI_MISC_A                     0x96
-#define ULPI_MISC_A_VBUSVLDEXTSEL       BIT(1)
-#define ULPI_MISC_A_VBUSVLDEXT          BIT(0)
-
-#define HSPHY_3P3_MIN                   3050000 /* uV */
-#define HSPHY_3P3_MAX                   3300000 /* uV */
-
-#define HSPHY_1P8_MIN                   1800000 /* uV */
-#define HSPHY_1P8_MAX                   1800000 /* uV */
-
-#define HSPHY_VDD_MIN                   5
-#define HSPHY_VDD_MAX                   7
-
-struct phy_8x16 {
-        struct usb_phy                  phy;
-        void __iomem                    *regs;
-        struct clk                      *core_clk;
-        struct clk                      *iface_clk;
-        struct regulator_bulk_data      regulator[3];
-
-        struct reset_control            *phy_reset;
-
-        struct gpio_desc                *switch_gpio;
-        struct notifier_block           reboot_notify;
-};
-
-static int phy_8x16_notify_connect(struct usb_phy *phy,
-                                   enum usb_device_speed speed)
-{
-        struct phy_8x16 *qphy = container_of(phy, struct phy_8x16, phy);
-        u32 val;
-
-        val = ULPI_MISC_A_VBUSVLDEXTSEL | ULPI_MISC_A_VBUSVLDEXT;
-        usb_phy_io_write(&qphy->phy, val, ULPI_SET(ULPI_MISC_A));
-
-        val = readl(qphy->regs + HSPHY_USBCMD);
-        val |= HSPHY_SESS_VLD_CTRL;
-        writel(val, qphy->regs + HSPHY_USBCMD);
-
-        return 0;
-}
-
-static int phy_8x16_notify_disconnect(struct usb_phy *phy,
-                                      enum usb_device_speed speed)
-{
-        struct phy_8x16 *qphy = container_of(phy, struct phy_8x16, phy);
-        u32 val;
-
-        val = ULPI_MISC_A_VBUSVLDEXT | ULPI_MISC_A_VBUSVLDEXTSEL;
-        usb_phy_io_write(&qphy->phy, val, ULPI_CLR(ULPI_MISC_A));
-
-        val = readl(qphy->regs + HSPHY_USBCMD);
-        val &= ~HSPHY_SESS_VLD_CTRL;
-        writel(val, qphy->regs + HSPHY_USBCMD);
-
-        return 0;
-}
-
-static int phy_8x16_vbus_on(struct phy_8x16 *qphy)
-{
-        phy_8x16_notify_connect(&qphy->phy, USB_SPEED_UNKNOWN);
-
-        /* Switch D+/D- lines to Device connector */
-        gpiod_set_value_cansleep(qphy->switch_gpio, 0);
-
-        return 0;
-}
-
-static int phy_8x16_vbus_off(struct phy_8x16 *qphy)
-{
-        phy_8x16_notify_disconnect(&qphy->phy, USB_SPEED_UNKNOWN);
-
-        /* Switch D+/D- lines to USB HUB */
-        gpiod_set_value_cansleep(qphy->switch_gpio, 1);
-
-        return 0;
-}
-
-static int phy_8x16_vbus_notify(struct notifier_block *nb, unsigned long event,
-                                void *ptr)
-{
-        struct usb_phy *usb_phy = container_of(nb, struct usb_phy, vbus_nb);
-        struct phy_8x16 *qphy = container_of(usb_phy, struct phy_8x16, phy);
-
-        if (event)
-                phy_8x16_vbus_on(qphy);
-        else
-                phy_8x16_vbus_off(qphy);
-
-        return NOTIFY_DONE;
-}
-
-static int phy_8x16_init(struct usb_phy *phy)
-{
-        struct phy_8x16 *qphy = container_of(phy, struct phy_8x16, phy);
-        u32 val, init[] = {0x44, 0x6B, 0x24, 0x13};
-        u32 addr = ULPI_EXT_VENDOR_SPECIFIC;
-        int idx, state;
-
-        for (idx = 0; idx < ARRAY_SIZE(init); idx++)
-                usb_phy_io_write(phy, init[idx], addr + idx);
-
-        reset_control_reset(qphy->phy_reset);
-
-        /* Assert USB HSPHY_POR */
-        val = readl(qphy->regs + HSPHY_CTRL);
-        val |= HSPHY_POR_ASSERT;
-        writel(val, qphy->regs + HSPHY_CTRL);
-
-        /*
-         * wait for minimum 10 microseconds as suggested in HPG.
-         * Use a slightly larger value since the exact value didn't
-         * work 100% of the time.
-         */
-        usleep_range(12, 15);
-
-        /* Deassert USB HSPHY_POR */
-        val = readl(qphy->regs + HSPHY_CTRL);
-        val &= ~HSPHY_POR_ASSERT;
-        writel(val, qphy->regs + HSPHY_CTRL);
-
-        usleep_range(10, 15);
-
-        writel(0x00, qphy->regs + HSPHY_AHBBURST);
-        writel(0x08, qphy->regs + HSPHY_AHBMODE);
-
-        /* workaround for rx buffer collision issue */
-        val = readl(qphy->regs + HSPHY_GENCONFIG);
-        val &= ~HSPHY_TXFIFO_IDLE_FORCE_DIS;
-        writel(val, qphy->regs + HSPHY_GENCONFIG);
-
-        val = readl(qphy->regs + HSPHY_GENCONFIG_2);
-        val |= HSPHY_SESS_VLD_CTRL_EN;
-        writel(val, qphy->regs + HSPHY_GENCONFIG_2);
-
-        val = ULPI_PWR_OTG_COMP_DISABLE;
-        usb_phy_io_write(phy, val, ULPI_SET(ULPI_PWR_CLK_MNG_REG));
-
-        state = extcon_get_state(qphy->phy.edev, EXTCON_USB);
-        if (state)
-                phy_8x16_vbus_on(qphy);
-        else
-                phy_8x16_vbus_off(qphy);
-
-        val = usb_phy_io_read(&qphy->phy, ULPI_FUNC_CTRL);
-        val &= ~ULPI_FUNC_CTRL_OPMODE_MASK;
-        val |= ULPI_FUNC_CTRL_OPMODE_NORMAL;
-        usb_phy_io_write(&qphy->phy, val, ULPI_FUNC_CTRL);
-
-        return 0;
-}
-
-static void phy_8x16_shutdown(struct usb_phy *phy)
-{
-        u32 val;
-
-        /* Put the controller in non-driving mode */
-        val = usb_phy_io_read(phy, ULPI_FUNC_CTRL);
-        val &= ~ULPI_FUNC_CTRL_OPMODE_MASK;
-        val |= ULPI_FUNC_CTRL_OPMODE_NONDRIVING;
-        usb_phy_io_write(phy, val, ULPI_FUNC_CTRL);
-}
-
-static int phy_8x16_read_devicetree(struct phy_8x16 *qphy)
-{
-        struct device *dev = qphy->phy.dev;
-        int ret;
-
-        qphy->core_clk = devm_clk_get(dev, "core");
-        if (IS_ERR(qphy->core_clk))
-                return PTR_ERR(qphy->core_clk);
-
-        qphy->iface_clk = devm_clk_get(dev, "iface");
-        if (IS_ERR(qphy->iface_clk))
-                return PTR_ERR(qphy->iface_clk);
-
-        qphy->regulator[0].supply = "v3p3";
-        qphy->regulator[1].supply = "v1p8";
-        qphy->regulator[2].supply = "vddcx";
-
-        ret = devm_regulator_bulk_get(dev, ARRAY_SIZE(qphy->regulator),
-                                      qphy->regulator);
-        if (ret)
-                return ret;
-
-        qphy->phy_reset = devm_reset_control_get(dev, "phy");
-        if (IS_ERR(qphy->phy_reset))
-                return PTR_ERR(qphy->phy_reset);
-
-        qphy->switch_gpio = devm_gpiod_get_optional(dev, "switch",
-                                                   GPIOD_OUT_LOW);
-        return PTR_ERR_OR_ZERO(qphy->switch_gpio);
-}
-
-static int phy_8x16_reboot_notify(struct notifier_block *this,
-                                  unsigned long code, void *unused)
-{
-        struct phy_8x16 *qphy;
-
-        qphy = container_of(this, struct phy_8x16, reboot_notify);
-
-        /*
-         * Ensure that D+/D- lines are routed to uB connector, so
-         * we could load bootloader/kernel at next reboot_notify
-         */
-        gpiod_set_value_cansleep(qphy->switch_gpio, 0);
-        return NOTIFY_DONE;
-}
-
-static int phy_8x16_probe(struct platform_device *pdev)
-{
-        struct phy_8x16 *qphy;
-        struct resource *res;
-        struct usb_phy *phy;
-        int ret;
-
-        qphy = devm_kzalloc(&pdev->dev, sizeof(*qphy), GFP_KERNEL);
-        if (!qphy)
-                return -ENOMEM;
-
-        platform_set_drvdata(pdev, qphy);
-
-        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-        qphy->regs = devm_ioremap_resource(&pdev->dev, res);
-        if (IS_ERR(qphy->regs))
-                return PTR_ERR(qphy->regs);
-
-        phy                     = &qphy->phy;
-        phy->dev                = &pdev->dev;
-        phy->label              = dev_name(&pdev->dev);
-        phy->init               = phy_8x16_init;
-        phy->shutdown           = phy_8x16_shutdown;
-        phy->notify_connect     = phy_8x16_notify_connect;
-        phy->notify_disconnect  = phy_8x16_notify_disconnect;
-        phy->io_priv            = qphy->regs + HSPHY_ULPI_VIEWPORT;
-        phy->io_ops             = &ulpi_viewport_access_ops;
-        phy->type               = USB_PHY_TYPE_USB2;
-        phy->vbus_nb.notifier_call = phy_8x16_vbus_notify;
-        phy->id_nb.notifier_call = NULL;
-
-        ret = phy_8x16_read_devicetree(qphy);
-        if (ret < 0)
-                return ret;
-
-        ret = clk_set_rate(qphy->core_clk, INT_MAX);
-        if (ret < 0)
-                dev_dbg(phy->dev, "Can't boost core clock\n");
-
-        ret = clk_prepare_enable(qphy->core_clk);
-        if (ret < 0)
-                return ret;
-
-        ret = clk_prepare_enable(qphy->iface_clk);
-        if (ret < 0)
-                goto off_core;
-
-        ret = regulator_bulk_enable(ARRAY_SIZE(qphy->regulator),
-                                    qphy->regulator);
-        if (WARN_ON(ret))
-                goto off_clks;
-
-        ret = usb_add_phy_dev(&qphy->phy);
-        if (ret)
-                goto off_power;
-
-        qphy->reboot_notify.notifier_call = phy_8x16_reboot_notify;
-        register_reboot_notifier(&qphy->reboot_notify);
-
-        return 0;
-
-off_power:
-        regulator_bulk_disable(ARRAY_SIZE(qphy->regulator), qphy->regulator);
-off_clks:
-        clk_disable_unprepare(qphy->iface_clk);
-off_core:
-        clk_disable_unprepare(qphy->core_clk);
-        return ret;
-}
-
-static int phy_8x16_remove(struct platform_device *pdev)
-{
-        struct phy_8x16 *qphy = platform_get_drvdata(pdev);
-
-        unregister_reboot_notifier(&qphy->reboot_notify);
-
-        /*
-         * Ensure that D+/D- lines are routed to uB connector, so
-         * we could load bootloader/kernel at next reboot_notify
-         */
-        gpiod_set_value_cansleep(qphy->switch_gpio, 0);
-
-        usb_remove_phy(&qphy->phy);
-
-        clk_disable_unprepare(qphy->iface_clk);
-        clk_disable_unprepare(qphy->core_clk);
-        regulator_bulk_disable(ARRAY_SIZE(qphy->regulator), qphy->regulator);
-        return 0;
-}
-
-static const struct of_device_id phy_8x16_dt_match[] = {
-        { .compatible = "qcom,usb-8x16-phy" },
-        { }
-};
-MODULE_DEVICE_TABLE(of, phy_8x16_dt_match);
-
-static struct platform_driver phy_8x16_driver = {
-        .probe  = phy_8x16_probe,
-        .remove = phy_8x16_remove,
-        .driver = {
-                .name = "phy-qcom-8x16-usb",
-                .of_match_table = phy_8x16_dt_match,
-        },
-};
-module_platform_driver(phy_8x16_driver);
-
-MODULE_LICENSE("GPL v2");
-MODULE_DESCRIPTION("Qualcomm APQ8016/MSM8916 chipsets USB transceiver driver");
diff --git a/drivers/usb/phy/phy-tahvo.c b/drivers/usb/phy/phy-tahvo.c
index 8babd318c0ed..b3ce42edb373 100644
--- a/drivers/usb/phy/phy-tahvo.c
+++ b/drivers/usb/phy/phy-tahvo.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Tahvo USB transceiver driver
  *
@@ -9,21 +10,12 @@
  *
  * Original driver written by Juha Yrjölä, Tony Lindgren and Timo Teräs.
  * Modified for Retu/Tahvo MFD by Aaro Koskinen.
- *
- * This file is subject to the terms and conditions of the GNU General
- * Public License. See the file "COPYING" in the main directory of this
- * archive for more details.
- *
- * 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/io.h>
 #include <linux/clk.h>
 #include <linux/usb.h>
-#include <linux/extcon.h>
+#include <linux/extcon-provider.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/usb/otg.h>
@@ -368,7 +360,8 @@ static int tahvo_usb_probe(struct platform_device *pdev)
         tu->extcon = devm_extcon_dev_allocate(&pdev->dev, tahvo_cable);
         if (IS_ERR(tu->extcon)) {
                 dev_err(&pdev->dev, "failed to allocate memory for extcon\n");
-                return -ENOMEM;
+                ret = PTR_ERR(tu->extcon);
+                goto err_disable_clk;
         }
 
         ret = devm_extcon_dev_register(&pdev->dev, tu->extcon);
diff --git a/drivers/usb/phy/phy-tegra-usb.c b/drivers/usb/phy/phy-tegra-usb.c
index ccc2bf5274b4..f668bfb708d3 100644
--- a/drivers/usb/phy/phy-tegra-usb.c
+++ b/drivers/usb/phy/phy-tegra-usb.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Copyright (C) 2010 Google, Inc.
  * Copyright (C) 2013 NVIDIA Corporation
@@ -6,16 +7,6 @@
  *      Erik Gilling <konkers@google.com>
  *      Benoit Goby <benoit@android.com>
  *      Venu Byravarasu <vbyravarasu@nvidia.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/resource.h>
diff --git a/drivers/usb/phy/phy-twl6030-usb.c b/drivers/usb/phy/phy-twl6030-usb.c
index b5dc077ed7d3..e78ed52339e6 100644
--- a/drivers/usb/phy/phy-twl6030-usb.c
+++ b/drivers/usb/phy/phy-twl6030-usb.c
@@ -1,23 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * twl6030_usb - TWL6030 USB transceiver, talking to OMAP OTG driver.
  *
  * Copyright (C) 2010 Texas Instruments Incorporated - http://www.ti.com
- * 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.
  *
  * Author: Hema HK <hemahk@ti.com>
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
  */
 
 #include <linux/module.h>
diff --git a/drivers/usb/phy/phy-ulpi-viewport.c b/drivers/usb/phy/phy-ulpi-viewport.c
index 18bb8264b5a0..7a14e0e3b635 100644
--- a/drivers/usb/phy/phy-ulpi-viewport.c
+++ b/drivers/usb/phy/phy-ulpi-viewport.c
@@ -1,15 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Copyright (C) 2011 Google, Inc.
- *
- * 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/export.h>
diff --git a/drivers/usb/phy/phy-ulpi.c b/drivers/usb/phy/phy-ulpi.c
index f48a7a21e3c2..a43c49369a60 100644
--- a/drivers/usb/phy/phy-ulpi.c
+++ b/drivers/usb/phy/phy-ulpi.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Generic ULPI USB transceiver support
  *
@@ -7,20 +8,6 @@
  *
  *   Sascha Hauer <s.hauer@pengutronix.de>
  *   Freescale Semiconductors
- *
- * 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.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
 #include <linux/kernel.h>
diff --git a/drivers/usb/phy/phy.c b/drivers/usb/phy/phy.c
index 89f4ac4cd93e..f97cb47577fc 100644
--- a/drivers/usb/phy/phy.c
+++ b/drivers/usb/phy/phy.c
@@ -1,12 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * phy.c -- USB phy handling
  *
  * Copyright (C) 2004-2013 Texas Instruments
- *
- * 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.
  */
 #include <linux/kernel.h>
 #include <linux/export.h>
diff --git a/drivers/usb/renesas_usbhs/common.c b/drivers/usb/renesas_usbhs/common.c
index f0ce304c5aaf..56079bb6759a 100644
--- a/drivers/usb/renesas_usbhs/common.c
+++ b/drivers/usb/renesas_usbhs/common.c
@@ -1,18 +1,9 @@
+// SPDX-License-Identifier: GPL-1.0+
 /*
  * Renesas USB driver
  *
  * Copyright (C) 2011 Renesas Solutions Corp.
  * Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- *
  */
 #include <linux/err.h>
 #include <linux/gpio.h>
@@ -486,6 +477,10 @@ static const struct of_device_id usbhs_of_match[] = {
                 .data = (void *)USBHS_TYPE_RCAR_GEN3,
         },
         {
+                .compatible = "renesas,usbhs-r8a77995",
+                .data = (void *)USBHS_TYPE_RCAR_GEN3_WITH_PLL,
+        },
+        {
                 .compatible = "renesas,rcar-gen2-usbhs",
                 .data = (void *)USBHS_TYPE_RCAR_GEN2,
         },
@@ -501,7 +496,6 @@ static struct renesas_usbhs_platform_info *usbhs_parse_dt(struct device *dev)
 {
         struct renesas_usbhs_platform_info *info;
         struct renesas_usbhs_driver_param *dparam;
-        const struct of_device_id *of_id = of_match_device(usbhs_of_match, dev);
         u32 tmp;
         int gpio;
 
@@ -510,7 +504,7 @@ static struct renesas_usbhs_platform_info *usbhs_parse_dt(struct device *dev)
                 return NULL;
 
         dparam = &info->driver_param;
-        dparam->type = of_id ? (uintptr_t)of_id->data : 0;
+        dparam->type = (uintptr_t)of_device_get_match_data(dev);
         if (!of_property_read_u32(dev->of_node, "renesas,buswait", &tmp))
                 dparam->buswait_bwait = tmp;
         gpio = of_get_named_gpio_flags(dev->of_node, "renesas,enable-gpio", 0,
@@ -519,15 +513,19 @@ static struct renesas_usbhs_platform_info *usbhs_parse_dt(struct device *dev)
                 dparam->enable_gpio = gpio;
 
         if (dparam->type == USBHS_TYPE_RCAR_GEN2 ||
-            dparam->type == USBHS_TYPE_RCAR_GEN3)
+            dparam->type == USBHS_TYPE_RCAR_GEN3 ||
+            dparam->type == USBHS_TYPE_RCAR_GEN3_WITH_PLL) {
                 dparam->has_usb_dmac = 1;
+                dparam->pipe_configs = usbhsc_new_pipe;
+                dparam->pipe_size = ARRAY_SIZE(usbhsc_new_pipe);
+        }
 
         return info;
 }
 
 static int usbhs_probe(struct platform_device *pdev)
 {
-        struct renesas_usbhs_platform_info *info = dev_get_platdata(&pdev->dev);
+        struct renesas_usbhs_platform_info *info = renesas_usbhs_get_info(pdev);
         struct renesas_usbhs_driver_callback *dfunc;
         struct usbhs_priv *priv;
         struct resource *res, *irq_res;
@@ -577,17 +575,12 @@ static int usbhs_probe(struct platform_device *pdev)
         switch (priv->dparam.type) {
         case USBHS_TYPE_RCAR_GEN2:
                 priv->pfunc = usbhs_rcar2_ops;
-                if (!priv->dparam.pipe_configs) {
-                        priv->dparam.pipe_configs = usbhsc_new_pipe;
-                        priv->dparam.pipe_size = ARRAY_SIZE(usbhsc_new_pipe);
-                }
                 break;
         case USBHS_TYPE_RCAR_GEN3:
                 priv->pfunc = usbhs_rcar3_ops;
-                if (!priv->dparam.pipe_configs) {
-                        priv->dparam.pipe_configs = usbhsc_new_pipe;
-                        priv->dparam.pipe_size = ARRAY_SIZE(usbhsc_new_pipe);
-                }
+                break;
+        case USBHS_TYPE_RCAR_GEN3_WITH_PLL:
+                priv->pfunc = usbhs_rcar3_with_pll_ops;
                 break;
         default:
                 if (!info->platform_callback.get_id) {
@@ -710,7 +703,7 @@ probe_end_pipe_exit:
 static int usbhs_remove(struct platform_device *pdev)
 {
         struct usbhs_priv *priv = usbhs_pdev_to_priv(pdev);
-        struct renesas_usbhs_platform_info *info = dev_get_platdata(&pdev->dev);
+        struct renesas_usbhs_platform_info *info = renesas_usbhs_get_info(pdev);
         struct renesas_usbhs_driver_callback *dfunc = &info->driver_callback;
 
         dev_dbg(&pdev->dev, "usb remove\n");
diff --git a/drivers/usb/renesas_usbhs/common.h b/drivers/usb/renesas_usbhs/common.h
index 8c5fc12ad778..64797784a6df 100644
--- a/drivers/usb/renesas_usbhs/common.h
+++ b/drivers/usb/renesas_usbhs/common.h
@@ -1,18 +1,9 @@
+// SPDX-License-Identifier: GPL-1.0+
 /*
  * Renesas USB driver
  *
  * Copyright (C) 2011 Renesas Solutions Corp.
  * Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- *
  */
 #ifndef RENESAS_USB_DRIVER_H
 #define RENESAS_USB_DRIVER_H
diff --git a/drivers/usb/renesas_usbhs/fifo.c b/drivers/usb/renesas_usbhs/fifo.c
index 50285b01da92..2d24ef3076ef 100644
--- a/drivers/usb/renesas_usbhs/fifo.c
+++ b/drivers/usb/renesas_usbhs/fifo.c
@@ -1,18 +1,9 @@
+// SPDX-License-Identifier: GPL-1.0+
 /*
  * Renesas USB driver
  *
  * Copyright (C) 2011 Renesas Solutions Corp.
  * Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- *
  */
 #include <linux/delay.h>
 #include <linux/io.h>
diff --git a/drivers/usb/renesas_usbhs/fifo.h b/drivers/usb/renesas_usbhs/fifo.h
index 8b98507d7abc..88d1816bcda2 100644
--- a/drivers/usb/renesas_usbhs/fifo.h
+++ b/drivers/usb/renesas_usbhs/fifo.h
@@ -1,18 +1,9 @@
+// SPDX-License-Identifier: GPL-1.0+
 /*
  * Renesas USB driver
  *
  * Copyright (C) 2011 Renesas Solutions Corp.
  * Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- *
  */
 #ifndef RENESAS_USB_FIFO_H
 #define RENESAS_USB_FIFO_H
diff --git a/drivers/usb/renesas_usbhs/mod.c b/drivers/usb/renesas_usbhs/mod.c
index 28965ef4f824..7475c4f64724 100644
--- a/drivers/usb/renesas_usbhs/mod.c
+++ b/drivers/usb/renesas_usbhs/mod.c
@@ -1,18 +1,9 @@
+// SPDX-License-Identifier: GPL-1.0+
 /*
  * Renesas USB driver
  *
  * Copyright (C) 2011 Renesas Solutions Corp.
  * Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- *
  */
 #include <linux/interrupt.h>
 
diff --git a/drivers/usb/renesas_usbhs/mod.h b/drivers/usb/renesas_usbhs/mod.h
index 1ef5bf604070..a4a61d6b82a1 100644
--- a/drivers/usb/renesas_usbhs/mod.h
+++ b/drivers/usb/renesas_usbhs/mod.h
@@ -1,18 +1,9 @@
+// SPDX-License-Identifier: GPL-1.0+
 /*
  * Renesas USB driver
  *
  * Copyright (C) 2011 Renesas Solutions Corp.
  * Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- *
  */
 #ifndef RENESAS_USB_MOD_H
 #define RENESAS_USB_MOD_H
diff --git a/drivers/usb/renesas_usbhs/mod_gadget.c b/drivers/usb/renesas_usbhs/mod_gadget.c
index c068b673420b..34ee9ebe12a3 100644
--- a/drivers/usb/renesas_usbhs/mod_gadget.c
+++ b/drivers/usb/renesas_usbhs/mod_gadget.c
@@ -1,18 +1,9 @@
+// SPDX-License-Identifier: GPL-1.0+
 /*
  * Renesas USB driver
  *
  * Copyright (C) 2011 Renesas Solutions Corp.
  * Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- *
  */
 #include <linux/delay.h>
 #include <linux/dma-mapping.h>
diff --git a/drivers/usb/renesas_usbhs/mod_host.c b/drivers/usb/renesas_usbhs/mod_host.c
index e256351cb72d..4e59c649db81 100644
--- a/drivers/usb/renesas_usbhs/mod_host.c
+++ b/drivers/usb/renesas_usbhs/mod_host.c
@@ -1,18 +1,9 @@
+// SPDX-License-Identifier: GPL-1.0+
 /*
  * Renesas USB driver
  *
  * Copyright (C) 2011 Renesas Solutions Corp.
  * Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- *
  */
 #include <linux/io.h>
 #include <linux/list.h>
diff --git a/drivers/usb/renesas_usbhs/pipe.c b/drivers/usb/renesas_usbhs/pipe.c
index d811f0550c04..093cd8e87335 100644
--- a/drivers/usb/renesas_usbhs/pipe.c
+++ b/drivers/usb/renesas_usbhs/pipe.c
@@ -1,18 +1,9 @@
+// SPDX-License-Identifier: GPL-1.0+
 /*
  * Renesas USB driver
  *
  * Copyright (C) 2011 Renesas Solutions Corp.
  * Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- *
  */
 #include <linux/delay.h>
 #include <linux/slab.h>
diff --git a/drivers/usb/renesas_usbhs/pipe.h b/drivers/usb/renesas_usbhs/pipe.h
index 95185fdb29b1..d3d002244891 100644
--- a/drivers/usb/renesas_usbhs/pipe.h
+++ b/drivers/usb/renesas_usbhs/pipe.h
@@ -1,18 +1,9 @@
+// SPDX-License-Identifier: GPL-1.0+
 /*
  * Renesas USB driver
  *
  * Copyright (C) 2011 Renesas Solutions Corp.
  * Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- *
  */
 #ifndef RENESAS_USB_PIPE_H
 #define RENESAS_USB_PIPE_H
diff --git a/drivers/usb/renesas_usbhs/rcar2.c b/drivers/usb/renesas_usbhs/rcar2.c
index 277160bc6f25..85a0e0933917 100644
--- a/drivers/usb/renesas_usbhs/rcar2.c
+++ b/drivers/usb/renesas_usbhs/rcar2.c
@@ -1,13 +1,8 @@
+// SPDX-License-Identifier: GPL-1.0+
 /*
  * Renesas USB driver R-Car Gen. 2 initialization and power control
  *
  * Copyright (C) 2014 Ulrich Hecht
- *
- * 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/gpio.h>
diff --git a/drivers/usb/renesas_usbhs/rcar2.h b/drivers/usb/renesas_usbhs/rcar2.h
index f07f10d9b3b2..45e3526cedeb 100644
--- a/drivers/usb/renesas_usbhs/rcar2.h
+++ b/drivers/usb/renesas_usbhs/rcar2.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include "common.h"
 
 extern const struct renesas_usbhs_platform_callback
diff --git a/drivers/usb/renesas_usbhs/rcar3.c b/drivers/usb/renesas_usbhs/rcar3.c
index 02b67abfc2a1..c929d296c77b 100644
--- a/drivers/usb/renesas_usbhs/rcar3.c
+++ b/drivers/usb/renesas_usbhs/rcar3.c
@@ -1,12 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Renesas USB driver R-Car Gen. 3 initialization and power control
  *
  * Copyright (C) 2016 Renesas Electronics Corporation
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- *
  */
 
 #include <linux/delay.h>
@@ -15,24 +11,39 @@
 #include "rcar3.h"
 
 #define LPSTS           0x102
+#define UGCTRL          0x180   /* 32-bit register */
 #define UGCTRL2         0x184   /* 32-bit register */
+#define UGSTS           0x188   /* 32-bit register */
 
 /* Low Power Status register (LPSTS) */
 #define LPSTS_SUSPM     0x4000
 
+/* R-Car D3 only: USB General control register (UGCTRL) */
+#define UGCTRL_PLLRESET         0x00000001
+#define UGCTRL_CONNECT          0x00000004
+
 /*
  * USB General control register 2 (UGCTRL2)
  * Remarks: bit[31:11] and bit[9:6] should be 0
  */
 #define UGCTRL2_RESERVED_3      0x00000001      /* bit[3:0] should be B'0001 */
+#define UGCTRL2_USB0SEL_HSUSB   0x00000020
 #define UGCTRL2_USB0SEL_OTG     0x00000030
 #define UGCTRL2_VBUSSEL         0x00000400
 
+/* R-Car D3 only: USB General status register (UGSTS) */
+#define UGSTS_LOCK              0x00000100
+
 static void usbhs_write32(struct usbhs_priv *priv, u32 reg, u32 data)
 {
         iowrite32(data, priv->base + reg);
 }
 
+static u32 usbhs_read32(struct usbhs_priv *priv, u32 reg)
+{
+        return ioread32(priv->base + reg);
+}
+
 static int usbhs_rcar3_power_ctrl(struct platform_device *pdev,
                                 void __iomem *base, int enable)
 {
@@ -52,6 +63,34 @@ static int usbhs_rcar3_power_ctrl(struct platform_device *pdev,
         return 0;
 }
 
+/* R-Car D3 needs to release UGCTRL.PLLRESET */
+static int usbhs_rcar3_power_and_pll_ctrl(struct platform_device *pdev,
+                                          void __iomem *base, int enable)
+{
+        struct usbhs_priv *priv = usbhs_pdev_to_priv(pdev);
+        u32 val;
+        int timeout = 1000;
+
+        if (enable) {
+                usbhs_write32(priv, UGCTRL, 0); /* release PLLRESET */
+                usbhs_write32(priv, UGCTRL2, UGCTRL2_RESERVED_3 |
+                              UGCTRL2_USB0SEL_HSUSB);
+
+                usbhs_bset(priv, LPSTS, LPSTS_SUSPM, LPSTS_SUSPM);
+                do {
+                        val = usbhs_read32(priv, UGSTS);
+                        udelay(1);
+                } while (!(val & UGSTS_LOCK) && timeout--);
+                usbhs_write32(priv, UGCTRL, UGCTRL_CONNECT);
+        } else {
+                usbhs_write32(priv, UGCTRL, 0);
+                usbhs_bset(priv, LPSTS, LPSTS_SUSPM, 0);
+                usbhs_write32(priv, UGCTRL, UGCTRL_PLLRESET);
+        }
+
+        return 0;
+}
+
 static int usbhs_rcar3_get_id(struct platform_device *pdev)
 {
         return USBHS_GADGET;
@@ -61,3 +100,8 @@ const struct renesas_usbhs_platform_callback usbhs_rcar3_ops = {
         .power_ctrl = usbhs_rcar3_power_ctrl,
         .get_id = usbhs_rcar3_get_id,
 };
+
+const struct renesas_usbhs_platform_callback usbhs_rcar3_with_pll_ops = {
+        .power_ctrl = usbhs_rcar3_power_and_pll_ctrl,
+        .get_id = usbhs_rcar3_get_id,
+};
diff --git a/drivers/usb/renesas_usbhs/rcar3.h b/drivers/usb/renesas_usbhs/rcar3.h
index 5f850b23ff18..49e535a31771 100644
--- a/drivers/usb/renesas_usbhs/rcar3.h
+++ b/drivers/usb/renesas_usbhs/rcar3.h
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: GPL-2.0
 #include "common.h"
 
 extern const struct renesas_usbhs_platform_callback usbhs_rcar3_ops;
+extern const struct renesas_usbhs_platform_callback usbhs_rcar3_with_pll_ops;
diff --git a/drivers/usb/serial/Makefile-keyspan_pda_fw b/drivers/usb/serial/Makefile-keyspan_pda_fw
index c20baf728011..503b472d85f2 100644
--- a/drivers/usb/serial/Makefile-keyspan_pda_fw
+++ b/drivers/usb/serial/Makefile-keyspan_pda_fw
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 
 # some rules to handle the quirks of the 'as31' assembler, like
 # insisting upon fixed suffixes for the input and output files,
diff --git a/drivers/usb/serial/aircable.c b/drivers/usb/serial/aircable.c
index 569c2200ba42..84d52953dd0a 100644
--- a/drivers/usb/serial/aircable.c
+++ b/drivers/usb/serial/aircable.c
@@ -1,13 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * AIRcable USB Bluetooth Dongle Driver.
  *
  * Copyright (C) 2010 Johan Hovold <jhovold@gmail.com>
  * Copyright (C) 2006 Manuel Francisco Naranjo (naranjo.manuel@gmail.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.
- *
  * The device works as an standard CDC device, it has 2 interfaces, the first
  * one is for firmware access and the second is the serial one.
  * The protocol is very simply, there are two possibilities reading or writing.
@@ -161,4 +158,4 @@ module_usb_serial_driver(serial_drivers, id_table);
 
 MODULE_AUTHOR(DRIVER_AUTHOR);
 MODULE_DESCRIPTION(DRIVER_DESC);
-MODULE_LICENSE("GPL");
+MODULE_LICENSE("GPL v2");
diff --git a/drivers/usb/serial/ark3116.c b/drivers/usb/serial/ark3116.c
index 0adbd38b4eea..3c544782f60b 100644
--- a/drivers/usb/serial/ark3116.c
+++ b/drivers/usb/serial/ark3116.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright (C) 2009 by Bart Hartgers (bart.hartgers+ark3116@gmail.com)
  * Original version:
@@ -15,11 +16,6 @@
  * into the old ark3116.c driver and suddenly realized the ark3116 is
  * a 16450 with a USB interface glued to it. See comments at the
  * bottom of this file.
- *
- * 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.
  */
 
 #include <linux/kernel.h>
diff --git a/drivers/usb/serial/belkin_sa.c b/drivers/usb/serial/belkin_sa.c
index 15bc71853db5..c1235d5b9fba 100644
--- a/drivers/usb/serial/belkin_sa.c
+++ b/drivers/usb/serial/belkin_sa.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Belkin USB Serial Adapter Driver
  *
@@ -9,11 +10,6 @@
  *  and associated source files.  Please see the usb/serial files for
  *  individual credits and copyrights.
  *
- *      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.
- *
  * See Documentation/usb/usb-serial.txt for more information on using this
  * driver
  *
diff --git a/drivers/usb/serial/belkin_sa.h b/drivers/usb/serial/belkin_sa.h
index c74b58ab56f9..51bc06287603 100644
--- a/drivers/usb/serial/belkin_sa.h
+++ b/drivers/usb/serial/belkin_sa.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Definitions for Belkin USB Serial Adapter Driver
  *
@@ -8,11 +9,6 @@
  *  and associated source files.  Please see the usb/serial files for
  *  individual credits and copyrights.
  *
- *      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.
- *
  * See Documentation/usb/usb-serial.txt for more information on using this
  * driver
  *
diff --git a/drivers/usb/serial/bus.c b/drivers/usb/serial/bus.c
index 8936a83c96cd..9e265eb92611 100644
--- a/drivers/usb/serial/bus.c
+++ b/drivers/usb/serial/bus.c
@@ -1,11 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * USB Serial Converter Bus specific functions
  *
  * Copyright (C) 2002 Greg Kroah-Hartman (greg@kroah.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/kernel.h>
diff --git a/drivers/usb/serial/ch341.c b/drivers/usb/serial/ch341.c
index 351745aec0e1..bdd7a5ad3bf1 100644
--- a/drivers/usb/serial/ch341.c
+++ b/drivers/usb/serial/ch341.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Copyright 2007, Frank A Kingswood <frank@kingswood-consulting.co.uk>
  * Copyright 2007, Werner Cornelius <werner@cornelius-consult.de>
@@ -9,10 +10,6 @@
  * serial port, an IEEE-1284 parallel printer port or a memory-like
  * interface. In all cases the CH341 supports an I2C interface as well.
  * This driver only supports the asynchronous serial interface.
- *
- * 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/kernel.h>
@@ -644,4 +641,4 @@ static struct usb_serial_driver * const serial_drivers[] = {
 
 module_usb_serial_driver(serial_drivers, id_table);
 
-MODULE_LICENSE("GPL");
+MODULE_LICENSE("GPL v2");
diff --git a/drivers/usb/serial/console.c b/drivers/usb/serial/console.c
index 43a862a90a77..17940589c647 100644
--- a/drivers/usb/serial/console.c
+++ b/drivers/usb/serial/console.c
@@ -1,12 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * USB Serial Console driver
  *
  * Copyright (C) 2001 - 2002 Greg Kroah-Hartman (greg@kroah.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.
- *
  * Thanks to Randy Dunlap for the original version of this code.
  *
  */
diff --git a/drivers/usb/serial/cp210x.c b/drivers/usb/serial/cp210x.c
index 412f812522ee..7c6273bf5beb 100644
--- a/drivers/usb/serial/cp210x.c
+++ b/drivers/usb/serial/cp210x.c
@@ -1,12 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Silicon Laboratories CP210x USB to RS232 serial adaptor driver
  *
  * Copyright (C) 2005 Craig Shelley (craig@microtron.org.uk)
  *
- *      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.
- *
  * Support to set flow control line levels using TIOCMGET and TIOCMSET
  * thanks to Karl Hiramoto karl@hiramoto.org. RTSCTS hardware flow
  * control thanks to Munir Nassar nassarmu@real-time.com
@@ -1529,4 +1526,4 @@ static void cp210x_release(struct usb_serial *serial)
 module_usb_serial_driver(serial_drivers, id_table);
 
 MODULE_DESCRIPTION(DRIVER_DESC);
-MODULE_LICENSE("GPL");
+MODULE_LICENSE("GPL v2");
diff --git a/drivers/usb/serial/cyberjack.c b/drivers/usb/serial/cyberjack.c
index 47fbd9f0c0c7..dc67a2eb98d7 100644
--- a/drivers/usb/serial/cyberjack.c
+++ b/drivers/usb/serial/cyberjack.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  *  REINER SCT cyberJack pinpad/e-com USB Chipcard Reader Driver
  *
@@ -10,11 +11,6 @@
  *  and associated source files.  Please see the usb/serial files for
  *  individual credits and copyrights.
  *
- *  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.
- *
  *  Thanks to Greg Kroah-Hartman (greg@kroah.com) for his help and
  *  patience.
  *
diff --git a/drivers/usb/serial/cypress_m8.c b/drivers/usb/serial/cypress_m8.c
index 90110de715e0..e0035c023120 100644
--- a/drivers/usb/serial/cypress_m8.c
+++ b/drivers/usb/serial/cypress_m8.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * USB Cypress M8 driver
  *
@@ -6,11 +7,6 @@
  *      Copyright (C) 2003,2004
  *          Neil Whelchel (koyama@firstlight.net)
  *
- *      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.
- *
  * See Documentation/usb/usb-serial.txt for more information on using this
  * driver
  *
diff --git a/drivers/usb/serial/digi_acceleport.c b/drivers/usb/serial/digi_acceleport.c
index 2ce39af32cfa..b0526786fb02 100644
--- a/drivers/usb/serial/digi_acceleport.c
+++ b/drivers/usb/serial/digi_acceleport.c
@@ -1,13 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
 *  Digi AccelePort USB-4 and USB-2 Serial Converters
 *
 *  Copyright 2000 by Digi International
 *
-*  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.
-*
 *  Shamelessly based on Brian Warner's keyspan_pda.c and Greg Kroah-Hartman's
 *  usb-serial driver.
 *
diff --git a/drivers/usb/serial/empeg.c b/drivers/usb/serial/empeg.c
index 90e603d5f660..d680bec62547 100644
--- a/drivers/usb/serial/empeg.c
+++ b/drivers/usb/serial/empeg.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * USB Empeg empeg-car player driver
  *
@@ -7,10 +8,6 @@
  *      Copyright (C) 1999 - 2001
  *          Greg Kroah-Hartman (greg@kroah.com)
  *
- *      This program is free software; you can redistribute it and/or modify
- *      it under the terms of the GNU General Public License, as published by
- *      the Free Software Foundation, version 2.
- *
  * See Documentation/usb/usb-serial.txt for more information on using this
  * driver
  */
@@ -126,4 +123,4 @@ module_usb_serial_driver(serial_drivers, id_table);
 
 MODULE_AUTHOR(DRIVER_AUTHOR);
 MODULE_DESCRIPTION(DRIVER_DESC);
-MODULE_LICENSE("GPL");
+MODULE_LICENSE("GPL v2");
diff --git a/drivers/usb/serial/f81232.c b/drivers/usb/serial/f81232.c
index 972f5a5fe577..96036f87b1de 100644
--- a/drivers/usb/serial/f81232.c
+++ b/drivers/usb/serial/f81232.c
@@ -1,13 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Fintek F81232 USB to serial adaptor driver
  *
  * Copyright (C) 2012 Greg Kroah-Hartman (gregkh@linuxfoundation.org)
  * Copyright (C) 2012 Linux Foundation
- *
- * 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/kernel.h>
diff --git a/drivers/usb/serial/f81534.c b/drivers/usb/serial/f81534.c
index 3d616a2a9f96..e4573b4c8935 100644
--- a/drivers/usb/serial/f81534.c
+++ b/drivers/usb/serial/f81534.c
@@ -1,14 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * 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)
@@ -39,9 +35,11 @@
 #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_INTERRUPT_ENABLE_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_LINE_STATUS_REG          (0x05 + F81534_UART_BASE_ADDRESS)
 #define F81534_MODEM_STATUS_REG         (0x06 + F81534_UART_BASE_ADDRESS)
 #define F81534_CONFIG1_REG              (0x09 + F81534_UART_BASE_ADDRESS)
 
@@ -126,9 +124,13 @@ struct f81534_serial_private {
 
 struct f81534_port_private {
         struct mutex mcr_mutex;
+        struct mutex lcr_mutex;
+        struct work_struct lsr_work;
+        struct usb_serial_port *port;
         unsigned long tx_empty;
         spinlock_t msr_lock;
         u8 shadow_mcr;
+        u8 shadow_lcr;
         u8 shadow_msr;
         u8 phy_num;
 };
@@ -461,6 +463,7 @@ static u32 f81534_calc_baud_divisor(u32 baudrate, u32 clockrate)
 static int f81534_set_port_config(struct usb_serial_port *port, u32 baudrate,
                                         u8 lcr)
 {
+        struct f81534_port_private *port_priv = usb_get_serial_port_data(port);
         u32 divisor;
         int status;
         u8 value;
@@ -489,35 +492,65 @@ static int f81534_set_port_config(struct usb_serial_port *port, u32 baudrate,
         }
 
         divisor = f81534_calc_baud_divisor(baudrate, F81534_MAX_BAUDRATE);
+
+        mutex_lock(&port_priv->lcr_mutex);
+
         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;
+                goto out_unlock;
         }
 
         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;
+                goto out_unlock;
         }
 
         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;
+                goto out_unlock;
         }
 
-        status = f81534_set_port_register(port, F81534_LINE_CONTROL_REG, lcr);
+        value = lcr | (port_priv->shadow_lcr & UART_LCR_SBC);
+        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;
+                goto out_unlock;
         }
 
-        return 0;
+        port_priv->shadow_lcr = value;
+out_unlock:
+        mutex_unlock(&port_priv->lcr_mutex);
+
+        return status;
+}
+
+static void f81534_break_ctl(struct tty_struct *tty, int break_state)
+{
+        struct usb_serial_port *port = tty->driver_data;
+        struct f81534_port_private *port_priv = usb_get_serial_port_data(port);
+        int status;
+
+        mutex_lock(&port_priv->lcr_mutex);
+
+        if (break_state)
+                port_priv->shadow_lcr |= UART_LCR_SBC;
+        else
+                port_priv->shadow_lcr &= ~UART_LCR_SBC;
+
+        status = f81534_set_port_register(port, F81534_LINE_CONTROL_REG,
+                                        port_priv->shadow_lcr);
+        if (status)
+                dev_err(&port->dev, "set break failed: %d\n", status);
+
+        mutex_unlock(&port_priv->lcr_mutex);
 }
 
 static int f81534_update_mctrl(struct usb_serial_port *port, unsigned int set,
@@ -1015,6 +1048,8 @@ static void f81534_process_per_serial_block(struct usb_serial_port *port,
                                 tty_insert_flip_char(&port->port, 0,
                                                 TTY_OVERRUN);
                         }
+
+                        schedule_work(&port_priv->lsr_work);
                 }
 
                 if (port->port.console && port->sysrq) {
@@ -1162,6 +1197,21 @@ static int f81534_attach(struct usb_serial *serial)
         return 0;
 }
 
+static void f81534_lsr_worker(struct work_struct *work)
+{
+        struct f81534_port_private *port_priv;
+        struct usb_serial_port *port;
+        int status;
+        u8 tmp;
+
+        port_priv = container_of(work, struct f81534_port_private, lsr_work);
+        port = port_priv->port;
+
+        status = f81534_get_port_register(port, F81534_LINE_STATUS_REG, &tmp);
+        if (status)
+                dev_warn(&port->dev, "read LSR failed: %d\n", status);
+}
+
 static int f81534_port_probe(struct usb_serial_port *port)
 {
         struct f81534_port_private *port_priv;
@@ -1173,6 +1223,8 @@ static int f81534_port_probe(struct usb_serial_port *port)
 
         spin_lock_init(&port_priv->msr_lock);
         mutex_init(&port_priv->mcr_mutex);
+        mutex_init(&port_priv->lcr_mutex);
+        INIT_WORK(&port_priv->lsr_work, f81534_lsr_worker);
 
         /* Assign logic-to-phy mapping */
         ret = f81534_logic_to_phy_port(port->serial, port);
@@ -1180,10 +1232,30 @@ static int f81534_port_probe(struct usb_serial_port *port)
                 return ret;
 
         port_priv->phy_num = ret;
+        port_priv->port = port;
         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);
 
+        /*
+         * The F81532/534 will hang-up when enable LSR interrupt in IER and
+         * occur data overrun. So we'll disable the LSR interrupt in probe()
+         * and submit the LSR worker to clear LSR state when reported LSR error
+         * bit with bulk-in data in f81534_process_per_serial_block().
+         */
+        ret = f81534_set_port_register(port, F81534_INTERRUPT_ENABLE_REG,
+                        UART_IER_RDI | UART_IER_THRI | UART_IER_MSI);
+        if (ret)
+                return ret;
+
+        return 0;
+}
+
+static int f81534_port_remove(struct usb_serial_port *port)
+{
+        struct f81534_port_private *port_priv = usb_get_serial_port_data(port);
+
+        flush_work(&port_priv->lsr_work);
         return 0;
 }
 
@@ -1317,6 +1389,8 @@ static struct usb_serial_driver f81534_device = {
         .calc_num_ports =       f81534_calc_num_ports,
         .attach =               f81534_attach,
         .port_probe =           f81534_port_probe,
+        .port_remove =          f81534_port_remove,
+        .break_ctl =            f81534_break_ctl,
         .dtr_rts =              f81534_dtr_rts,
         .process_read_urb =     f81534_process_read_urb,
         .ioctl =                f81534_ioctl,
diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c
index 49d1b2d4606d..1aba9105b369 100644
--- a/drivers/usb/serial/ftdi_sio.c
+++ b/drivers/usb/serial/ftdi_sio.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * USB FTDI SIO driver
  *
@@ -9,11 +10,6 @@
  *      Copyright (C) 2002
  *          Kuba Ober (kuba@mareimbrium.org)
  *
- *      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.
- *
  * See Documentation/usb/usb-serial.txt for more information on using this
  * driver
  *
diff --git a/drivers/usb/serial/garmin_gps.c b/drivers/usb/serial/garmin_gps.c
index b2f2e87aed94..633550ec3025 100644
--- a/drivers/usb/serial/garmin_gps.c
+++ b/drivers/usb/serial/garmin_gps.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Garmin GPS driver
  *
@@ -7,20 +8,6 @@
  * http://sourceforge.net/projects/garmin-gps/
  *
  * This driver has been derived from v2.1 of the visor driver.
- *
- * 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.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111 USA
  */
 
 #include <linux/kernel.h>
@@ -138,6 +125,7 @@ struct garmin_data {
         __u8   privpkt[4*6];
         spinlock_t lock;
         struct list_head pktlist;
+        struct usb_anchor write_urbs;
 };
 
 
@@ -875,42 +863,38 @@ static int garmin_clear(struct garmin_data *garmin_data_p)
 
 static int garmin_init_session(struct usb_serial_port *port)
 {
-        struct usb_serial *serial = port->serial;
         struct garmin_data *garmin_data_p = usb_get_serial_port_data(port);
-        int status = 0;
-        int i = 0;
+        int status;
+        int i;
 
-        if (status == 0) {
-                usb_kill_urb(port->interrupt_in_urb);
+        usb_kill_urb(port->interrupt_in_urb);
 
-                dev_dbg(&serial->dev->dev, "%s - adding interrupt input\n", __func__);
-                status = usb_submit_urb(port->interrupt_in_urb, GFP_KERNEL);
-                if (status)
-                        dev_err(&serial->dev->dev,
-                          "%s - failed submitting interrupt urb, error %d\n",
-                                                        __func__, status);
+        status = usb_submit_urb(port->interrupt_in_urb, GFP_KERNEL);
+        if (status) {
+                dev_err(&port->dev, "failed to submit interrupt urb: %d\n",
+                                status);
+                return status;
         }
 
         /*
          * using the initialization method from gpsbabel. See comments in
          * gpsbabel/jeeps/gpslibusb.c gusb_reset_toggles()
          */
-        if (status == 0) {
-                dev_dbg(&serial->dev->dev, "%s - starting session ...\n", __func__);
-                garmin_data_p->state = STATE_ACTIVE;
+        dev_dbg(&port->dev, "%s - starting session ...\n", __func__);
+        garmin_data_p->state = STATE_ACTIVE;
 
-                for (i = 0; i < 3; i++) {
-                        status = garmin_write_bulk(port,
-                                        GARMIN_START_SESSION_REQ,
-                                        sizeof(GARMIN_START_SESSION_REQ), 0);
+        for (i = 0; i < 3; i++) {
+                status = garmin_write_bulk(port, GARMIN_START_SESSION_REQ,
+                                sizeof(GARMIN_START_SESSION_REQ), 0);
+                if (status < 0)
+                        goto err_kill_urbs;
+        }
 
-                        if (status < 0)
-                                break;
-                }
+        return 0;
 
-                if (status > 0)
-                        status = 0;
-        }
+err_kill_urbs:
+        usb_kill_anchored_urbs(&garmin_data_p->write_urbs);
+        usb_kill_urb(port->interrupt_in_urb);
 
         return status;
 }
@@ -930,7 +914,6 @@ static int garmin_open(struct tty_struct *tty, struct usb_serial_port *port)
         spin_unlock_irqrestore(&garmin_data_p->lock, flags);
 
         /* shutdown any bulk reads that might be going on */
-        usb_kill_urb(port->write_urb);
         usb_kill_urb(port->read_urb);
 
         if (garmin_data_p->state == STATE_RESET)
@@ -953,7 +936,7 @@ static void garmin_close(struct usb_serial_port *port)
 
         /* shutdown our urbs */
         usb_kill_urb(port->read_urb);
-        usb_kill_urb(port->write_urb);
+        usb_kill_anchored_urbs(&garmin_data_p->write_urbs);
 
         /* keep reset state so we know that we must start a new session */
         if (garmin_data_p->state != STATE_RESET)
@@ -1037,12 +1020,14 @@ static int garmin_write_bulk(struct usb_serial_port *port,
         }
 
         /* send it down the pipe */
+        usb_anchor_urb(urb, &garmin_data_p->write_urbs);
         status = usb_submit_urb(urb, GFP_ATOMIC);
         if (status) {
                 dev_err(&port->dev,
                    "%s - usb_submit_urb(write bulk) failed with status = %d\n",
                                 __func__, status);
                 count = status;
+                usb_unanchor_urb(urb);
                 kfree(buffer);
         }
 
@@ -1370,9 +1355,9 @@ static void garmin_unthrottle(struct tty_struct *tty)
  * the tty in cases where the protocol provides no own handshaking
  * to initiate the transfer.
  */
-static void timeout_handler(unsigned long data)
+static void timeout_handler(struct timer_list *t)
 {
-        struct garmin_data *garmin_data_p = (struct garmin_data *) data;
+        struct garmin_data *garmin_data_p = from_timer(garmin_data_p, t, timer);
 
         /* send the next queued packet to the tty port */
         if (garmin_data_p->mode == MODE_NATIVE)
@@ -1391,19 +1376,23 @@ static int garmin_port_probe(struct usb_serial_port *port)
         if (!garmin_data_p)
                 return -ENOMEM;
 
-        init_timer(&garmin_data_p->timer);
+        timer_setup(&garmin_data_p->timer, timeout_handler, 0);
         spin_lock_init(&garmin_data_p->lock);
         INIT_LIST_HEAD(&garmin_data_p->pktlist);
-        /* garmin_data_p->timer.expires = jiffies + session_timeout; */
-        garmin_data_p->timer.data = (unsigned long)garmin_data_p;
-        garmin_data_p->timer.function = timeout_handler;
         garmin_data_p->port = port;
         garmin_data_p->state = 0;
         garmin_data_p->flags = 0;
         garmin_data_p->count = 0;
+        init_usb_anchor(&garmin_data_p->write_urbs);
         usb_set_serial_port_data(port, garmin_data_p);
 
         status = garmin_init_session(port);
+        if (status)
+                goto err_free;
+
+        return 0;
+err_free:
+        kfree(garmin_data_p);
 
         return status;
 }
@@ -1413,6 +1402,7 @@ static int garmin_port_remove(struct usb_serial_port *port)
 {
         struct garmin_data *garmin_data_p = usb_get_serial_port_data(port);
 
+        usb_kill_anchored_urbs(&garmin_data_p->write_urbs);
         usb_kill_urb(port->interrupt_in_urb);
         del_timer_sync(&garmin_data_p->timer);
         kfree(garmin_data_p);
diff --git a/drivers/usb/serial/generic.c b/drivers/usb/serial/generic.c
index 35cb8c0e584f..2274d9625f63 100644
--- a/drivers/usb/serial/generic.c
+++ b/drivers/usb/serial/generic.c
@@ -1,12 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * USB Serial Converter Generic functions
  *
  * Copyright (C) 2010 - 2013 Johan Hovold (jhovold@gmail.com)
  * Copyright (C) 1999 - 2002 Greg Kroah-Hartman (greg@kroah.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/kernel.h>
diff --git a/drivers/usb/serial/io_16654.h b/drivers/usb/serial/io_16654.h
index a53abc9530ff..4980f72dc56f 100644
--- a/drivers/usb/serial/io_16654.h
+++ b/drivers/usb/serial/io_16654.h
@@ -1,12 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0+
 /************************************************************************
  *
  *      16654.H         Definitions for 16C654 UART used on EdgePorts
  *
  *      Copyright (C) 1998 Inside Out Networks, Inc.
- *      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.
  *
  ************************************************************************/
 
diff --git a/drivers/usb/serial/io_edgeport.c b/drivers/usb/serial/io_edgeport.c
index bdf8bd814a9a..219265ce3711 100644
--- a/drivers/usb/serial/io_edgeport.c
+++ b/drivers/usb/serial/io_edgeport.c
@@ -1,14 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Edgeport USB Serial Converter driver
  *
  * Copyright (C) 2000 Inside Out Networks, All rights reserved.
  * Copyright (C) 2001-2002 Greg Kroah-Hartman <greg@kroah.com>
  *
- *      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.
- *
  * Supports the following devices:
  *      Edgeport/4
  *      Edgeport/4t
diff --git a/drivers/usb/serial/io_edgeport.h b/drivers/usb/serial/io_edgeport.h
index ad9c1d47a619..2e7fedbaf2ff 100644
--- a/drivers/usb/serial/io_edgeport.h
+++ b/drivers/usb/serial/io_edgeport.h
@@ -1,15 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0+
 /************************************************************************
  *
  *      io_edgeport.h   Edgeport Linux Interface definitions
  *
  *      Copyright (C) 2000 Inside Out Networks, Inc.
  *
- *      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.
- *
- *
  ************************************************************************/
 
 #if !defined(_IO_EDGEPORT_H_)
diff --git a/drivers/usb/serial/io_ionsp.h b/drivers/usb/serial/io_ionsp.h
index 5cc591bae54d..4b8e4823bd45 100644
--- a/drivers/usb/serial/io_ionsp.h
+++ b/drivers/usb/serial/io_ionsp.h
@@ -1,14 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0+
 /************************************************************************
  *
  *      IONSP.H         Definitions for I/O Networks Serial Protocol
  *
  *      Copyright (C) 1997-1998 Inside Out Networks, Inc.
  *
- *      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.
- *
  *      These definitions are used by both kernel-mode driver and the
  *      peripheral firmware and MUST be kept in sync.
  *
diff --git a/drivers/usb/serial/io_ti.c b/drivers/usb/serial/io_ti.c
index 6cefb9cb133d..0fbadb37c104 100644
--- a/drivers/usb/serial/io_ti.c
+++ b/drivers/usb/serial/io_ti.c
@@ -1,14 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Edgeport USB Serial Converter driver
  *
  * Copyright (C) 2000-2002 Inside Out Networks, All rights reserved.
  * Copyright (C) 2001-2002 Greg Kroah-Hartman <greg@kroah.com>
  *
- *      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.
- *
  * Supports the following devices:
  *      EP/1 EP/2 EP/4 EP/21 EP/22 EP/221 EP/42 EP/421 WATCHPORT
  *
diff --git a/drivers/usb/serial/io_ti.h b/drivers/usb/serial/io_ti.h
index 1bd67b24f916..e53c68261017 100644
--- a/drivers/usb/serial/io_ti.h
+++ b/drivers/usb/serial/io_ti.h
@@ -1,13 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*****************************************************************************
  *
  *      Copyright (C) 1997-2002 Inside Out Networks, Inc.
  *
- *      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.
- *
- *
  *      Feb-16-2001     DMI     Added I2C structure definitions
  *      May-29-2002     gkh     Ported to Linux
  *
diff --git a/drivers/usb/serial/io_usbvend.h b/drivers/usb/serial/io_usbvend.h
index 6f6a856bc37c..c38e87ac5ea9 100644
--- a/drivers/usb/serial/io_usbvend.h
+++ b/drivers/usb/serial/io_usbvend.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0+
 /************************************************************************
  *
  *      USBVEND.H               Vendor-specific USB definitions
@@ -8,10 +9,6 @@
  ************************************************************************
  *
  *      Copyright (C) 1998 Inside Out Networks, Inc.
- *      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.
  *
  ************************************************************************/
 
diff --git a/drivers/usb/serial/ipaq.c b/drivers/usb/serial/ipaq.c
index cde0dcdce9c4..f81746c3c26c 100644
--- a/drivers/usb/serial/ipaq.c
+++ b/drivers/usb/serial/ipaq.c
@@ -1,13 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * USB Compaq iPAQ driver
  *
  *      Copyright (C) 2001 - 2002
  *          Ganesh Varadarajan <ganesh@veritas.com>
- *
- *      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.
  */
 
 #include <linux/kernel.h>
diff --git a/drivers/usb/serial/ipw.c b/drivers/usb/serial/ipw.c
index 8b1cf18a668b..d04c7cc5c1c2 100644
--- a/drivers/usb/serial/ipw.c
+++ b/drivers/usb/serial/ipw.c
@@ -1,14 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * IPWireless 3G UMTS TDD Modem driver (USB connected)
  *
  *   Copyright (C) 2004 Roelf Diedericks <roelfd@inet.co.za>
  *   Copyright (C) 2004 Greg Kroah-Hartman <greg@kroah.com>
  *
- *   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.
- *
  * All information about the device was acquired using SnoopyPro
  * on MSFT's O/S, and examing the MSFT drivers' debug output
  * (insanely left _on_ in the enduser version)
diff --git a/drivers/usb/serial/ir-usb.c b/drivers/usb/serial/ir-usb.c
index f9734a96d516..24b06c7e5e2d 100644
--- a/drivers/usb/serial/ir-usb.c
+++ b/drivers/usb/serial/ir-usb.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * USB IR Dongle driver
  *
@@ -5,11 +6,6 @@
  *      Copyright (C) 2002      Gary Brubaker (xavyer@ix.netcom.com)
  *      Copyright (C) 2010      Johan Hovold (jhovold@gmail.com)
  *
- *      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.
- *
  * This driver allows a USB IrDA device to be used as a "dumb" serial device.
  * This can be useful if you do not have access to a full IrDA stack on the
  * other side of the connection.  If you do have an IrDA stack on both devices,
diff --git a/drivers/usb/serial/iuu_phoenix.c b/drivers/usb/serial/iuu_phoenix.c
index 18fc992a245f..397a8012ffa3 100644
--- a/drivers/usb/serial/iuu_phoenix.c
+++ b/drivers/usb/serial/iuu_phoenix.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Infinity Unlimited USB Phoenix driver
  *
@@ -7,13 +8,7 @@
  *
  * Original code taken from iuutool (Copyright (C) 2006 Juan Carlos Borrás)
  *
- *      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.
- *
  *  And tested with help of WB Electronics
- *
  */
 #include <linux/kernel.h>
 #include <linux/errno.h>
diff --git a/drivers/usb/serial/iuu_phoenix.h b/drivers/usb/serial/iuu_phoenix.h
index b82630a3b8fd..b400b262f72e 100644
--- a/drivers/usb/serial/iuu_phoenix.h
+++ b/drivers/usb/serial/iuu_phoenix.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Infinity Unlimited USB Phoenix driver
  *
@@ -6,13 +7,7 @@
  *
  * Original code taken from iuutool ( Copyright (C) 2006 Juan Carlos Borrás )
  *
- *      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.
- *
  *  And tested with help of WB Electronics
- *
  */
 
 #define   IUU_USB_VENDOR_ID  0x104f
diff --git a/drivers/usb/serial/keyspan.c b/drivers/usb/serial/keyspan.c
index 5662d324edd2..d34779fe4a8d 100644
--- a/drivers/usb/serial/keyspan.c
+++ b/drivers/usb/serial/keyspan.c
@@ -1,14 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
   Keyspan USB to Serial Converter driver
 
   (C) Copyright (C) 2000-2001   Hugh Blemings <hugh@blemings.org>
   (C) Copyright (C) 2002        Greg Kroah-Hartman <greg@kroah.com>
 
-  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.
-
   See http://blemings.org/hugh/keyspan.html for more information.
 
   Code in this driver inspired by and in a number of places taken
diff --git a/drivers/usb/serial/keyspan_pda.c b/drivers/usb/serial/keyspan_pda.c
index 196908dd25a1..5169624d8b11 100644
--- a/drivers/usb/serial/keyspan_pda.c
+++ b/drivers/usb/serial/keyspan_pda.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * USB Keyspan PDA / Xircom / Entrega Converter driver
  *
@@ -5,11 +6,6 @@
  * Copyright (C) 1999, 2000 Brian Warner        <warner@lothar.com>
  * Copyright (C) 2000 Al Borchers               <borchers@steinerpoint.com>
  *
- *      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.
- *
  * See Documentation/usb/usb-serial.txt for more information on using this
  * driver
  */
diff --git a/drivers/usb/serial/kl5kusb105.c b/drivers/usb/serial/kl5kusb105.c
index 595415e59d5d..5046ffd53cde 100644
--- a/drivers/usb/serial/kl5kusb105.c
+++ b/drivers/usb/serial/kl5kusb105.c
@@ -1,14 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * KLSI KL5KUSB105 chip RS232 converter driver
  *
  *   Copyright (C) 2010 Johan Hovold <jhovold@gmail.com>
  *   Copyright (C) 2001 Utz-Uwe Haus <haus@uuhaus.de>
  *
- *   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.
- *
  * All information about the device was acquired using SniffUSB ans snoopUSB
  * on Windows98.
  * It was written out of frustration with the PalmConnect USB Serial adapter
diff --git a/drivers/usb/serial/kobil_sct.c b/drivers/usb/serial/kobil_sct.c
index 3024b9b25360..a31ea7e194dd 100644
--- a/drivers/usb/serial/kobil_sct.c
+++ b/drivers/usb/serial/kobil_sct.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  *  KOBIL USB Smart Card Terminal Driver
  *
@@ -10,11 +11,6 @@
  *  and associated source files.  Please see the usb/serial files for
  *  individual credits and copyrights.
  *
- *  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.
- *
  *  Thanks to Greg Kroah-Hartman (greg@kroah.com) for his help and
  *  patience.
  *
@@ -491,6 +487,7 @@ static void kobil_set_termios(struct tty_struct *tty,
                 break;
         default:
                 speed = 9600;
+                /* fall through */
         case 9600:
                 urb_val = SUSBCR_SBR_9600;
                 break;
diff --git a/drivers/usb/serial/mct_u232.c b/drivers/usb/serial/mct_u232.c
index 70f346f1aa86..7887c312d9a9 100644
--- a/drivers/usb/serial/mct_u232.c
+++ b/drivers/usb/serial/mct_u232.c
@@ -1,13 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * MCT (Magic Control Technology Corp.) USB RS232 Converter Driver
  *
  *   Copyright (C) 2000 Wolfgang Grandegger (wolfgang@ces.ch)
  *
- *   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.
- *
  * This program is largely derived from the Belkin USB Serial Adapter Driver
  * (see belkin_sa.[ch]). All of the information about the device was acquired
  * by using SniffUSB on Windows98. For technical details see mct_u232.h.
diff --git a/drivers/usb/serial/mct_u232.h b/drivers/usb/serial/mct_u232.h
index d325bb8cb583..0084edf518e8 100644
--- a/drivers/usb/serial/mct_u232.h
+++ b/drivers/usb/serial/mct_u232.h
@@ -1,13 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Definitions for MCT (Magic Control Technology) USB-RS232 Converter Driver
  *
  *   Copyright (C) 2000 Wolfgang Grandegger (wolfgang@ces.ch)
  *
- *   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.
- *
  * This driver is for the device MCT USB-RS232 Converter (25 pin, Model No.
  * U232-P25) from Magic Control Technology Corp. (there is also a 9 pin
  * Model No. U232-P9). See http://www.mct.com.tw/products/product_us232.html 
diff --git a/drivers/usb/serial/metro-usb.c b/drivers/usb/serial/metro-usb.c
index 14511d6a7d44..e63cea02cfd8 100644
--- a/drivers/usb/serial/metro-usb.c
+++ b/drivers/usb/serial/metro-usb.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
   Some of this code is credited to Linux USB open source files that are
   distributed with Linux.
@@ -54,21 +55,33 @@ MODULE_DEVICE_TABLE(usb, id_table);
 #define UNI_CMD_OPEN    0x80
 #define UNI_CMD_CLOSE   0xFF
 
-static inline int metrousb_is_unidirectional_mode(struct usb_serial_port *port)
+static int metrousb_is_unidirectional_mode(struct usb_serial *serial)
 {
-        __u16 product_id = le16_to_cpu(
-                port->serial->dev->descriptor.idProduct);
+        u16 product_id = le16_to_cpu(serial->dev->descriptor.idProduct);
 
         return product_id == FOCUS_PRODUCT_ID_UNI;
 }
 
+static int metrousb_calc_num_ports(struct usb_serial *serial,
+                                   struct usb_serial_endpoints *epds)
+{
+        if (metrousb_is_unidirectional_mode(serial)) {
+                if (epds->num_interrupt_out == 0) {
+                        dev_err(&serial->interface->dev, "interrupt-out endpoint missing\n");
+                        return -ENODEV;
+                }
+        }
+
+        return 1;
+}
+
 static int metrousb_send_unidirectional_cmd(u8 cmd, struct usb_serial_port *port)
 {
         int ret;
         int actual_len;
         u8 *buffer_cmd = NULL;
 
-        if (!metrousb_is_unidirectional_mode(port))
+        if (!metrousb_is_unidirectional_mode(port->serial))
                 return 0;
 
         buffer_cmd = kzalloc(sizeof(cmd), GFP_KERNEL);
@@ -161,13 +174,6 @@ static int metrousb_open(struct tty_struct *tty, struct usb_serial_port *port)
         unsigned long flags = 0;
         int result = 0;
 
-        /* Make sure the urb is initialized. */
-        if (!port->interrupt_in_urb) {
-                dev_err(&port->dev, "%s - interrupt urb not initialized\n",
-                        __func__);
-                return -ENODEV;
-        }
-
         /* Set the private data information for the port. */
         spin_lock_irqsave(&metro_priv->lock, flags);
         metro_priv->control_state = 0;
@@ -189,7 +195,7 @@ static int metrousb_open(struct tty_struct *tty, struct usb_serial_port *port)
                 dev_err(&port->dev,
                         "%s - failed submitting interrupt in urb, error code=%d\n",
                         __func__, result);
-                goto exit;
+                return result;
         }
 
         /* Send activate cmd to device */
@@ -198,9 +204,14 @@ static int metrousb_open(struct tty_struct *tty, struct usb_serial_port *port)
                 dev_err(&port->dev,
                         "%s - failed to configure device, error code=%d\n",
                         __func__, result);
-                goto exit;
+                goto err_kill_urb;
         }
-exit:
+
+        return 0;
+
+err_kill_urb:
+        usb_kill_urb(port->interrupt_in_urb);
+
         return result;
 }
 
@@ -337,7 +348,8 @@ static struct usb_serial_driver metrousb_device = {
         },
         .description            = "Metrologic USB to Serial",
         .id_table               = id_table,
-        .num_ports              = 1,
+        .num_interrupt_in       = 1,
+        .calc_num_ports         = metrousb_calc_num_ports,
         .open                   = metrousb_open,
         .close                  = metrousb_cleanup,
         .read_int_callback      = metrousb_read_int_callback,
@@ -356,7 +368,7 @@ static struct usb_serial_driver * const serial_drivers[] = {
 
 module_usb_serial_driver(serial_drivers, id_table);
 
-MODULE_LICENSE("GPL");
+MODULE_LICENSE("GPL v2");
 MODULE_AUTHOR("Philip Nicastro");
 MODULE_AUTHOR("Aleksey Babahin <tamerlan311@gmail.com>");
 MODULE_DESCRIPTION(DRIVER_DESC);
diff --git a/drivers/usb/serial/mos7720.c b/drivers/usb/serial/mos7720.c
index a453965f9e9a..f4df3d5bf69c 100644
--- a/drivers/usb/serial/mos7720.c
+++ b/drivers/usb/serial/mos7720.c
@@ -1,13 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * mos7720.c
  *   Controls the Moschip 7720 usb to dual port serial converter
  *
  * Copyright 2006 Moschip Semiconductor Tech. Ltd.
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, version 2 of the License.
- *
  * Developed by:
  *      Vijaya Kumar <vijaykumar.gn@gmail.com>
  *      Ajay Kumar <naanuajay@yahoo.com>
@@ -2043,4 +2040,4 @@ module_usb_serial_driver(serial_drivers, id_table);
 
 MODULE_AUTHOR(DRIVER_AUTHOR);
 MODULE_DESCRIPTION(DRIVER_DESC);
-MODULE_LICENSE("GPL");
+MODULE_LICENSE("GPL v2");
diff --git a/drivers/usb/serial/mos7840.c b/drivers/usb/serial/mos7840.c
index e8669aae14b3..a859c2d33c29 100644
--- a/drivers/usb/serial/mos7840.c
+++ b/drivers/usb/serial/mos7840.c
@@ -1,18 +1,5 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
- * 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.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
  * Clean ups from Moschip version and a few ioctl implementations by:
  *      Paul B Schroeder <pschroeder "at" uplogix "dot" com>
  *
diff --git a/drivers/usb/serial/mxuport.c b/drivers/usb/serial/mxuport.c
index 3aef091fe88b..2513ee902779 100644
--- a/drivers/usb/serial/mxuport.c
+++ b/drivers/usb/serial/mxuport.c
@@ -1,14 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  *      mxuport.c - MOXA UPort series driver
  *
  *      Copyright (c) 2006 Moxa Technologies Co., Ltd.
  *      Copyright (c) 2013 Andrew Lunn <andrew@lunn.ch>
  *
- *      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.
- *
  *      Supports the following Moxa USB to serial converters:
  *       2 ports : UPort 1250, UPort 1250I
  *       4 ports : UPort 1410, UPort 1450, UPort 1450I
diff --git a/drivers/usb/serial/navman.c b/drivers/usb/serial/navman.c
index 2a97cdc078d5..20277c52dded 100644
--- a/drivers/usb/serial/navman.c
+++ b/drivers/usb/serial/navman.c
@@ -1,12 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Navman Serial USB driver
  *
  * Copyright (C) 2006 Greg Kroah-Hartman <gregkh@suse.de>
  *
- *      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.
- *
  * TODO:
  *      Add termios method that uses copy_hw but also kills all echo
  *      flags as the navman is rx only so cannot echo.
@@ -115,4 +112,4 @@ static struct usb_serial_driver * const serial_drivers[] = {
 
 module_usb_serial_driver(serial_drivers, id_table);
 
-MODULE_LICENSE("GPL");
+MODULE_LICENSE("GPL v2");
diff --git a/drivers/usb/serial/omninet.c b/drivers/usb/serial/omninet.c
index efcd7feed6f4..e51c9464ea42 100644
--- a/drivers/usb/serial/omninet.c
+++ b/drivers/usb/serial/omninet.c
@@ -1,12 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * USB ZyXEL omni.net LCD PLUS driver
  *
  * Copyright (C) 2013,2017 Johan Hovold <johan@kernel.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.
- *
  * See Documentation/usb/usb-serial.txt for more information on using this
  * driver
  *
@@ -179,4 +176,4 @@ module_usb_serial_driver(serial_drivers, id_table);
 
 MODULE_AUTHOR(DRIVER_AUTHOR);
 MODULE_DESCRIPTION(DRIVER_DESC);
-MODULE_LICENSE("GPL");
+MODULE_LICENSE("GPL v2");
diff --git a/drivers/usb/serial/opticon.c b/drivers/usb/serial/opticon.c
index 58657d64678b..caa0746326fd 100644
--- a/drivers/usb/serial/opticon.c
+++ b/drivers/usb/serial/opticon.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Opticon USB barcode to serial driver
  *
@@ -5,10 +6,6 @@
  * Copyright (C) 2011 Martin Jansen <martin.jansen@opticon.com>
  * Copyright (C) 2008 - 2009 Greg Kroah-Hartman <gregkh@suse.de>
  * Copyright (C) 2008 - 2009 Novell Inc.
- *
- *      This program is free software; you can redistribute it and/or
- *      modify it under the terms of the GNU General Public License version
- *      2 as published by the Free Software Foundation.
  */
 
 #include <linux/kernel.h>
@@ -420,4 +417,4 @@ static struct usb_serial_driver * const serial_drivers[] = {
 module_usb_serial_driver(serial_drivers, id_table);
 
 MODULE_DESCRIPTION(DRIVER_DESC);
-MODULE_LICENSE("GPL");
+MODULE_LICENSE("GPL v2");
diff --git a/drivers/usb/serial/option.c b/drivers/usb/serial/option.c
index ba672cf4e888..aaa7d901a06d 100644
--- a/drivers/usb/serial/option.c
+++ b/drivers/usb/serial/option.c
@@ -1,12 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
   USB Driver for GSM modems
 
   Copyright (C) 2005  Matthias Urlichs <smurf@smurf.noris.de>
 
-  This driver is free software; you can redistribute it and/or modify
-  it under the terms of Version 2 of the GNU General Public License as
-  published by the Free Software Foundation.
-
   Portions copied from the Keyspan driver by Hugh Blemings <hugh@blemings.org>
 
   History: see the git log.
@@ -2206,4 +2203,4 @@ static void option_instat_callback(struct urb *urb)
 
 MODULE_AUTHOR(DRIVER_AUTHOR);
 MODULE_DESCRIPTION(DRIVER_DESC);
-MODULE_LICENSE("GPL");
+MODULE_LICENSE("GPL v2");
diff --git a/drivers/usb/serial/oti6858.c b/drivers/usb/serial/oti6858.c
index b11eead469ee..ae9cb15ee02d 100644
--- a/drivers/usb/serial/oti6858.c
+++ b/drivers/usb/serial/oti6858.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Ours Technology Inc. OTi-6858 USB to serial adapter driver.
  *
@@ -21,10 +22,6 @@
  * So, THIS CODE CAN DESTROY OTi-6858 AND ANY OTHER DEVICES, THAT ARE
  * CONNECTED TO IT!
  *
- * 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.
- *
  * See Documentation/usb/usb-serial.txt for more information on using this
  * driver
  *
@@ -847,4 +844,4 @@ module_usb_serial_driver(serial_drivers, id_table);
 
 MODULE_DESCRIPTION(OTI6858_DESCRIPTION);
 MODULE_AUTHOR(OTI6858_AUTHOR);
-MODULE_LICENSE("GPL");
+MODULE_LICENSE("GPL v2");
diff --git a/drivers/usb/serial/oti6858.h b/drivers/usb/serial/oti6858.h
index 704ac3a532b3..1226bf2347eb 100644
--- a/drivers/usb/serial/oti6858.h
+++ b/drivers/usb/serial/oti6858.h
@@ -1,10 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Ours Technology Inc. OTi-6858 USB to serial adapter driver.
- *
- * 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.
  */
 #ifndef __LINUX_USB_SERIAL_OTI6858_H
 #define __LINUX_USB_SERIAL_OTI6858_H
diff --git a/drivers/usb/serial/pl2303.c b/drivers/usb/serial/pl2303.c
index a585b477415d..57ae832a49ff 100644
--- a/drivers/usb/serial/pl2303.c
+++ b/drivers/usb/serial/pl2303.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Prolific PL2303 USB to serial adaptor driver
  *
@@ -6,10 +7,6 @@
  *
  * Original driver for 2.2.x by anonymous
  *
- *      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.
- *
  * See Documentation/usb/usb-serial.txt for more information on using this
  * driver
  */
@@ -1025,4 +1022,4 @@ static struct usb_serial_driver * const serial_drivers[] = {
 module_usb_serial_driver(serial_drivers, id_table);
 
 MODULE_DESCRIPTION("Prolific PL2303 USB to serial adaptor driver");
-MODULE_LICENSE("GPL");
+MODULE_LICENSE("GPL v2");
diff --git a/drivers/usb/serial/pl2303.h b/drivers/usb/serial/pl2303.h
index 3b5a15d1dc0d..f98fd84890de 100644
--- a/drivers/usb/serial/pl2303.h
+++ b/drivers/usb/serial/pl2303.h
@@ -1,11 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Prolific PL2303 USB to serial adaptor driver header file
- *
- *      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.
- *
  */
 
 #define BENQ_VENDOR_ID                  0x04a5
diff --git a/drivers/usb/serial/qcaux.c b/drivers/usb/serial/qcaux.c
index 6e9f8af96959..929ffba663f2 100644
--- a/drivers/usb/serial/qcaux.c
+++ b/drivers/usb/serial/qcaux.c
@@ -1,13 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Qualcomm USB Auxiliary Serial Port driver
  *
  * Copyright (C) 2008 Greg Kroah-Hartman <greg@kroah.com>
  * Copyright (C) 2010 Dan Williams <dcbw@redhat.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.
- *
  * Devices listed here usually provide a CDC ACM port on which normal modem
  * AT commands and PPP can be used.  But when that port is in-use by PPP it
  * cannot be used simultaneously for status or signal strength.  Instead, the
@@ -87,4 +84,4 @@ static struct usb_serial_driver * const serial_drivers[] = {
 };
 
 module_usb_serial_driver(serial_drivers, id_table);
-MODULE_LICENSE("GPL");
+MODULE_LICENSE("GPL v2");
diff --git a/drivers/usb/serial/qcserial.c b/drivers/usb/serial/qcserial.c
index eb9928963a53..e3892541a489 100644
--- a/drivers/usb/serial/qcserial.c
+++ b/drivers/usb/serial/qcserial.c
@@ -1,14 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Qualcomm Serial USB driver
  *
  *      Copyright (c) 2008 QUALCOMM Incorporated.
  *      Copyright (c) 2009 Greg Kroah-Hartman <gregkh@suse.de>
  *      Copyright (c) 2009 Novell Inc.
- *
- *      This program is free software; you can redistribute it and/or
- *      modify it under the terms of the GNU General Public License version
- *      2 as published by the Free Software Foundation.
- *
  */
 
 #include <linux/tty.h>
@@ -148,6 +144,7 @@ static const struct usb_device_id id_table[] = {
         {DEVICE_SWI(0x1199, 0x68a2)},   /* Sierra Wireless MC7710 */
         {DEVICE_SWI(0x1199, 0x68c0)},   /* Sierra Wireless MC7304/MC7354 */
         {DEVICE_SWI(0x1199, 0x901c)},   /* Sierra Wireless EM7700 */
+        {DEVICE_SWI(0x1199, 0x901e)},   /* Sierra Wireless EM7355 QDL */
         {DEVICE_SWI(0x1199, 0x901f)},   /* Sierra Wireless EM7355 */
         {DEVICE_SWI(0x1199, 0x9040)},   /* Sierra Wireless Modem */
         {DEVICE_SWI(0x1199, 0x9041)},   /* Sierra Wireless MC7305/MC7355 */
diff --git a/drivers/usb/serial/quatech2.c b/drivers/usb/serial/quatech2.c
index 60e17d1444c3..958e12e1e7c7 100644
--- a/drivers/usb/serial/quatech2.c
+++ b/drivers/usb/serial/quatech2.c
@@ -1,13 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * usb-serial driver for Quatech USB 2 devices
  *
  * Copyright (C) 2012 Bill Pemberton (wfp5p@virginia.edu)
  *
- * 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.
- *
- *
  *  These devices all have only 1 bulk in and 1 bulk out that is shared
  *  for all serial ports.
  *
@@ -1027,4 +1023,4 @@ static struct usb_serial_driver *const serial_drivers[] = {
 module_usb_serial_driver(serial_drivers, id_table);
 
 MODULE_DESCRIPTION(DRIVER_DESC);
-MODULE_LICENSE("GPL");
+MODULE_LICENSE("GPL v2");
diff --git a/drivers/usb/serial/safe_serial.c b/drivers/usb/serial/safe_serial.c
index 27d7a7016298..6accbecb6318 100644
--- a/drivers/usb/serial/safe_serial.c
+++ b/drivers/usb/serial/safe_serial.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Safe Encapsulated USB Serial Driver
  *
@@ -5,11 +6,6 @@
  *      Copyright (C) 2001 Lineo
  *      Copyright (C) 2001 Hewlett-Packard
  *
- *      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.
- *
  * By:
  *      Stuart Lynne <sl@lineo.com>, Tom Rushworth <tbr@lineo.com>
  */
diff --git a/drivers/usb/serial/sierra.c b/drivers/usb/serial/sierra.c
index 4c4ac4705ac0..d189f953c891 100644
--- a/drivers/usb/serial/sierra.c
+++ b/drivers/usb/serial/sierra.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
   USB Driver for Sierra Wireless
 
@@ -9,10 +10,6 @@
   IMPORTANT DISCLAIMER: This driver is not commercially supported by
   Sierra Wireless. Use at your own risk.
 
-  This driver is free software; you can redistribute it and/or modify
-  it under the terms of Version 2 of the GNU General Public License as
-  published by the Free Software Foundation.
-
   Portions based on the option driver by Matthias Urlichs <smurf@smurf.noris.de>
   Whom based his on the Keyspan driver by Hugh Blemings <hugh@blemings.org>
 */
@@ -1078,7 +1075,7 @@ module_usb_serial_driver(serial_drivers, id_table);
 
 MODULE_AUTHOR(DRIVER_AUTHOR);
 MODULE_DESCRIPTION(DRIVER_DESC);
-MODULE_LICENSE("GPL");
+MODULE_LICENSE("GPL v2");
 
 module_param(nmea, bool, S_IRUGO | S_IWUSR);
 MODULE_PARM_DESC(nmea, "NMEA streaming");
diff --git a/drivers/usb/serial/spcp8x5.c b/drivers/usb/serial/spcp8x5.c
index 5167b6564c8b..b42714855364 100644
--- a/drivers/usb/serial/spcp8x5.c
+++ b/drivers/usb/serial/spcp8x5.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * spcp8x5 USB to serial adaptor driver
  *
@@ -8,11 +9,6 @@
  * Original driver for 2.6.10 pl2303 driver by
  *   Greg Kroah-Hartman (greg@kroah.com)
  * Changes for 2.6.20 by Harald Klein <hari@vt100.at>
- *
- *      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.
  */
 #include <linux/kernel.h>
 #include <linux/errno.h>
diff --git a/drivers/usb/serial/ssu100.c b/drivers/usb/serial/ssu100.c
index 5aa7bbbeba3d..2083c267787b 100644
--- a/drivers/usb/serial/ssu100.c
+++ b/drivers/usb/serial/ssu100.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * usb-serial driver for Quatech SSU-100
  *
@@ -576,4 +577,4 @@ static struct usb_serial_driver * const serial_drivers[] = {
 module_usb_serial_driver(serial_drivers, id_table);
 
 MODULE_DESCRIPTION(DRIVER_DESC);
-MODULE_LICENSE("GPL");
+MODULE_LICENSE("GPL v2");
diff --git a/drivers/usb/serial/symbolserial.c b/drivers/usb/serial/symbolserial.c
index 0d1727232d0c..cd2f8dc8b58c 100644
--- a/drivers/usb/serial/symbolserial.c
+++ b/drivers/usb/serial/symbolserial.c
@@ -1,13 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Symbol USB barcode to serial driver
  *
  * Copyright (C) 2013 Johan Hovold <jhovold@gmail.com>
  * Copyright (C) 2009 Greg Kroah-Hartman <gregkh@suse.de>
  * Copyright (C) 2009 Novell Inc.
- *
- *      This program is free software; you can redistribute it and/or
- *      modify it under the terms of the GNU General Public License version
- *      2 as published by the Free Software Foundation.
  */
 
 #include <linux/kernel.h>
@@ -194,4 +191,4 @@ static struct usb_serial_driver * const serial_drivers[] = {
 
 module_usb_serial_driver(serial_drivers, id_table);
 
-MODULE_LICENSE("GPL");
+MODULE_LICENSE("GPL v2");
diff --git a/drivers/usb/serial/ti_usb_3410_5052.c b/drivers/usb/serial/ti_usb_3410_5052.c
index 8fc3854e5e69..6b22857f6e52 100644
--- a/drivers/usb/serial/ti_usb_3410_5052.c
+++ b/drivers/usb/serial/ti_usb_3410_5052.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * TI 3410/5052 USB Serial Driver
  *
@@ -7,11 +8,6 @@
  *   Copyright (C) 2000-2002 Inside Out Networks
  *   Copyright (C) 2001-2002 Greg Kroah-Hartman
  *
- * 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.
- *
  * For questions or problems with this driver, contact Texas Instruments
  * technical support, or Al Borchers <alborchers@steinerpoint.com>, or
  * Peter Berger <pberger@brimson.com>.
diff --git a/drivers/usb/serial/upd78f0730.c b/drivers/usb/serial/upd78f0730.c
index 6819a3486e5d..1ba1401d27d7 100644
--- a/drivers/usb/serial/upd78f0730.c
+++ b/drivers/usb/serial/upd78f0730.c
@@ -1,12 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Renesas Electronics uPD78F0730 USB to serial converter driver
  *
  * Copyright (C) 2014,2016 Maksim Salau <maksim.salau@gmail.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.
- *
  * Protocol of the adaptor is described in the application note U19660EJ1V0AN00
  * μPD78F0730 8-bit Single-Chip Microcontroller
  * USB-to-Serial Conversion Software
diff --git a/drivers/usb/serial/usb-serial-simple.c b/drivers/usb/serial/usb-serial-simple.c
index e98b6e57b703..74172fe158df 100644
--- a/drivers/usb/serial/usb-serial-simple.c
+++ b/drivers/usb/serial/usb-serial-simple.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * USB Serial "Simple" driver
  *
@@ -8,10 +9,6 @@
  * Copyright (C) 2010 Zilogic Systems <code@zilogic.com>
  * Copyright (C) 2013 Wei Shuai <cpuwolf@gmail.com>
  * Copyright (C) 2013 Linux Foundation
- *
- *      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/kernel.h>
@@ -134,4 +131,4 @@ static const struct usb_device_id id_table[] = {
 MODULE_DEVICE_TABLE(usb, id_table);
 
 module_usb_serial_driver(serial_drivers, id_table);
-MODULE_LICENSE("GPL");
+MODULE_LICENSE("GPL v2");
diff --git a/drivers/usb/serial/usb-serial.c b/drivers/usb/serial/usb-serial.c
index bb34f9f7eaf4..790e0cbe3da9 100644
--- a/drivers/usb/serial/usb-serial.c
+++ b/drivers/usb/serial/usb-serial.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * USB Serial Converter driver
  *
@@ -6,10 +7,6 @@
  * Copyright (C) 2000 Peter Berger (pberger@brimson.com)
  * Copyright (C) 2000 Al Borchers (borchers@steinerpoint.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.
- *
  * This driver was originally based on the ACM driver by Armin Fuerst (which was
  * based on a driver by Brad Keryan)
  *
@@ -1201,17 +1198,6 @@ static const struct tty_operations serial_ops = {
 
 struct tty_driver *usb_serial_tty_driver;
 
-/* Driver structure we register with the USB core */
-static struct usb_driver usb_serial_driver = {
-        .name =         "usbserial",
-        .probe =        usb_serial_probe,
-        .disconnect =   usb_serial_disconnect,
-        .suspend =      usb_serial_suspend,
-        .resume =       usb_serial_resume,
-        .no_dynamic_id =        1,
-        .supports_autosuspend = 1,
-};
-
 static int __init usb_serial_init(void)
 {
         int result;
@@ -1247,13 +1233,6 @@ static int __init usb_serial_init(void)
                 goto exit_reg_driver;
         }
 
-        /* register the USB driver */
-        result = usb_register(&usb_serial_driver);
-        if (result < 0) {
-                pr_err("%s - usb_register failed\n", __func__);
-                goto exit_tty;
-        }
-
         /* register the generic driver, if we should */
         result = usb_serial_generic_register();
         if (result < 0) {
@@ -1264,9 +1243,6 @@ static int __init usb_serial_init(void)
         return result;
 
 exit_generic:
-        usb_deregister(&usb_serial_driver);
-
-exit_tty:
         tty_unregister_driver(usb_serial_tty_driver);
 
 exit_reg_driver:
@@ -1285,7 +1261,6 @@ static void __exit usb_serial_exit(void)
 
         usb_serial_generic_deregister();
 
-        usb_deregister(&usb_serial_driver);
         tty_unregister_driver(usb_serial_tty_driver);
         put_tty_driver(usb_serial_tty_driver);
         bus_unregister(&usb_serial_bus_type);
@@ -1460,4 +1435,4 @@ EXPORT_SYMBOL_GPL(usb_serial_deregister_drivers);
 
 MODULE_AUTHOR(DRIVER_AUTHOR);
 MODULE_DESCRIPTION(DRIVER_DESC);
-MODULE_LICENSE("GPL");
+MODULE_LICENSE("GPL v2");
diff --git a/drivers/usb/serial/usb_debug.c b/drivers/usb/serial/usb_debug.c
index 12f4c5a91e62..ab5a2ac4993a 100644
--- a/drivers/usb/serial/usb_debug.c
+++ b/drivers/usb/serial/usb_debug.c
@@ -1,11 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * USB Debug cable driver
  *
  * Copyright (C) 2006 Greg Kroah-Hartman <greg@kroah.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/gfp.h>
@@ -34,13 +31,13 @@ static const struct usb_device_id id_table[] = {
 };
 
 static const struct usb_device_id dbc_id_table[] = {
-        { USB_DEVICE(0x1d6b, 0x0004) },
+        { USB_DEVICE(0x1d6b, 0x0011) },
         { },
 };
 
 static const struct usb_device_id id_table_combined[] = {
         { USB_DEVICE(0x0525, 0x127a) },
-        { USB_DEVICE(0x1d6b, 0x0004) },
+        { USB_DEVICE(0x1d6b, 0x0011) },
         { },
 };
 MODULE_DEVICE_TABLE(usb, id_table_combined);
@@ -98,4 +95,4 @@ static struct usb_serial_driver * const serial_drivers[] = {
 };
 
 module_usb_serial_driver(serial_drivers, id_table_combined);
-MODULE_LICENSE("GPL");
+MODULE_LICENSE("GPL v2");
diff --git a/drivers/usb/serial/usb_wwan.c b/drivers/usb/serial/usb_wwan.c
index 59bfcb3da116..107e64c42e94 100644
--- a/drivers/usb/serial/usb_wwan.c
+++ b/drivers/usb/serial/usb_wwan.c
@@ -1,12 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
   USB Driver layer for GSM modems
 
   Copyright (C) 2005  Matthias Urlichs <smurf@smurf.noris.de>
 
-  This driver is free software; you can redistribute it and/or modify
-  it under the terms of Version 2 of the GNU General Public License as
-  published by the Free Software Foundation.
-
   Portions copied from the Keyspan driver by Hugh Blemings <hugh@blemings.org>
 
   History: see the git log.
@@ -723,4 +720,4 @@ EXPORT_SYMBOL(usb_wwan_resume);
 
 MODULE_AUTHOR(DRIVER_AUTHOR);
 MODULE_DESCRIPTION(DRIVER_DESC);
-MODULE_LICENSE("GPL");
+MODULE_LICENSE("GPL v2");
diff --git a/drivers/usb/serial/visor.c b/drivers/usb/serial/visor.c
index 9f3317a940ef..f5373ed2cd45 100644
--- a/drivers/usb/serial/visor.c
+++ b/drivers/usb/serial/visor.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * USB HandSpring Visor, Palm m50x, and Sony Clie driver
  * (supports all of the Palm OS USB devices)
@@ -5,10 +6,6 @@
  *      Copyright (C) 1999 - 2004
  *          Greg Kroah-Hartman (greg@kroah.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.
- *
  * See Documentation/usb/usb-serial.txt for more information on using this
  * driver
  *
@@ -579,4 +576,4 @@ module_usb_serial_driver(serial_drivers, id_table_combined);
 
 MODULE_AUTHOR(DRIVER_AUTHOR);
 MODULE_DESCRIPTION(DRIVER_DESC);
-MODULE_LICENSE("GPL");
+MODULE_LICENSE("GPL v2");
diff --git a/drivers/usb/serial/visor.h b/drivers/usb/serial/visor.h
index 4c456dd69ce5..fe290243f1ce 100644
--- a/drivers/usb/serial/visor.h
+++ b/drivers/usb/serial/visor.h
@@ -1,14 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * USB HandSpring Visor driver
  *
  *      Copyright (C) 1999 - 2003
  *          Greg Kroah-Hartman (greg@kroah.com)
  *
- *      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.
- *
  * See Documentation/usb/usb-serial.txt for more information on using this
  * driver.
  *
diff --git a/drivers/usb/serial/whiteheat.c b/drivers/usb/serial/whiteheat.c
index 55cebc1e6fec..1c7b46a8620c 100644
--- a/drivers/usb/serial/whiteheat.c
+++ b/drivers/usb/serial/whiteheat.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * USB ConnectTech WhiteHEAT driver
  *
@@ -7,11 +8,6 @@
  *      Copyright (C) 1999 - 2001
  *          Greg Kroah-Hartman (greg@kroah.com)
  *
- *      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.
- *
  * See Documentation/usb/usb-serial.txt for more information on using this
  * driver
  */
diff --git a/drivers/usb/serial/whiteheat.h b/drivers/usb/serial/whiteheat.h
index 38065df4d2d8..72c1b0cf4063 100644
--- a/drivers/usb/serial/whiteheat.h
+++ b/drivers/usb/serial/whiteheat.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * USB ConnectTech WhiteHEAT driver
  *
@@ -7,11 +8,6 @@
  *      Copyright (C) 1999, 2000
  *          Greg Kroah-Hartman (greg@kroah.com)
  *
- *      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.
- *
  * See Documentation/usb/usb-serial.txt for more information on using this
  * driver
  *
diff --git a/drivers/usb/serial/wishbone-serial.c b/drivers/usb/serial/wishbone-serial.c
index 4fed4a0bd702..ff4092f9b33c 100644
--- a/drivers/usb/serial/wishbone-serial.c
+++ b/drivers/usb/serial/wishbone-serial.c
@@ -1,13 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * USB Wishbone-Serial adapter driver
  *
  * Copyright (C) 2013 Wesley W. Terpstra <w.terpstra@gsi.de>
  * Copyright (C) 2013 GSI Helmholtz Centre for Heavy Ion Research GmbH
- *
- * 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.
  */
 
 #include <linux/kernel.h>
diff --git a/drivers/usb/serial/xsens_mt.c b/drivers/usb/serial/xsens_mt.c
index 3837d5113bb2..cf262c9a9638 100644
--- a/drivers/usb/serial/xsens_mt.c
+++ b/drivers/usb/serial/xsens_mt.c
@@ -1,11 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Xsens MT USB driver
  *
  * Copyright (C) 2013 Xsens <info@xsens.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/kernel.h>
@@ -69,4 +66,4 @@ module_usb_serial_driver(serial_drivers, id_table);
 
 MODULE_AUTHOR("Frans Klaver <frans.klaver@xsens.com>");
 MODULE_DESCRIPTION("USB-serial driver for Xsens motion trackers");
-MODULE_LICENSE("GPL");
+MODULE_LICENSE("GPL v2");
diff --git a/drivers/usb/storage/alauda.c b/drivers/usb/storage/alauda.c
index 878b4b8761f5..900591df8bb2 100644
--- a/drivers/usb/storage/alauda.c
+++ b/drivers/usb/storage/alauda.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Driver for Alauda-based card readers
  *
@@ -15,20 +16,6 @@
  * (very old) vendor-supplied GPL sma03 driver.
  *
  * For protocol info, see http://alauda.sourceforge.net
- *
- * 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, or (at your option) any
- * later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
 #include <linux/module.h>
diff --git a/drivers/usb/storage/cypress_atacb.c b/drivers/usb/storage/cypress_atacb.c
index 5e4af44d7d9f..4825902377eb 100644
--- a/drivers/usb/storage/cypress_atacb.c
+++ b/drivers/usb/storage/cypress_atacb.c
@@ -1,22 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Support for emulating SAT (ata pass through) on devices based
  *       on the Cypress USB/ATA bridge supporting ATACB.
  *
  * Copyright (c) 2008 Matthieu Castet (castet.matthieu@free.fr)
- *
- * 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, or (at your option) any
- * later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
 #include <linux/module.h>
diff --git a/drivers/usb/storage/datafab.c b/drivers/usb/storage/datafab.c
index 723197af6ec5..09353be199be 100644
--- a/drivers/usb/storage/datafab.c
+++ b/drivers/usb/storage/datafab.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Driver for Datafab USB Compact Flash reader
  *
@@ -18,20 +19,6 @@
  *
  * Other contributors:
  *   (c) 2002 Alan Stern <stern@rowland.org>
- *
- * 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, or (at your option) any
- * later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
 /*
diff --git a/drivers/usb/storage/debug.c b/drivers/usb/storage/debug.c
index 8d20804a59e6..e5a4969d15ae 100644
--- a/drivers/usb/storage/debug.c
+++ b/drivers/usb/storage/debug.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Driver for USB Mass Storage compliant devices
  * Debugging Functions Source Code File
@@ -27,20 +28,6 @@
  *
  * Please see http://www.one-eyed-alien.net/~mdharm/linux-usb for more
  * information about this driver.
- *
- * 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, or (at your option) any
- * later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
 #include <linux/device.h>
diff --git a/drivers/usb/storage/debug.h b/drivers/usb/storage/debug.h
index 8ab73299b650..8833cd4f78b6 100644
--- a/drivers/usb/storage/debug.h
+++ b/drivers/usb/storage/debug.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Driver for USB Mass Storage compliant devices
  * Debugging Functions Header File
@@ -24,20 +25,6 @@
  *
  * Please see http://www.one-eyed-alien.net/~mdharm/linux-usb for more
  * information about this driver.
- *
- * 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, or (at your option) any
- * later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
 #ifndef _DEBUG_H_
diff --git a/drivers/usb/storage/ene_ub6250.c b/drivers/usb/storage/ene_ub6250.c
index 28100374f7bd..93cf57ac47d6 100644
--- a/drivers/usb/storage/ene_ub6250.c
+++ b/drivers/usb/storage/ene_ub6250.c
@@ -1,19 +1,4 @@
-/*
- *
- * 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, or (at your option) any
- * later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 675 Mass Ave, Cambridge, MA 02139, USA.
- */
+// SPDX-License-Identifier: GPL-2.0+
 #include <linux/jiffies.h>
 #include <linux/errno.h>
 #include <linux/module.h>
diff --git a/drivers/usb/storage/freecom.c b/drivers/usb/storage/freecom.c
index c0a5d954414b..ec4d92c92762 100644
--- a/drivers/usb/storage/freecom.c
+++ b/drivers/usb/storage/freecom.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Driver for Freecom USB/IDE adaptor
  *
@@ -8,20 +9,6 @@
  * Current development and maintenance by:
  *   (C) 2000 David Brown <usb-storage@davidb.org>
  *
- * 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, or (at your option) any
- * later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 675 Mass Ave, Cambridge, MA 02139, USA.
- *
  * This driver was developed with information provided in FREECOM's USB
  * Programmers Reference Guide.  For further information contact Freecom
  * (http://www.freecom.de/)
diff --git a/drivers/usb/storage/initializers.c b/drivers/usb/storage/initializers.c
index d9d8c17e05d1..93a6bcf77806 100644
--- a/drivers/usb/storage/initializers.c
+++ b/drivers/usb/storage/initializers.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Special Initializers for certain USB Mass Storage devices
  *
@@ -20,20 +21,6 @@
  *
  * Please see http://www.one-eyed-alien.net/~mdharm/linux-usb for more
  * information about this driver.
- *
- * 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, or (at your option) any
- * later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
 #include <linux/errno.h>
diff --git a/drivers/usb/storage/initializers.h b/drivers/usb/storage/initializers.h
index 039abf4d1cb7..e4cf28efb4a7 100644
--- a/drivers/usb/storage/initializers.h
+++ b/drivers/usb/storage/initializers.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Header file for Special Initializers for certain USB Mass Storage devices
  *
@@ -20,20 +21,6 @@
  *
  * Please see http://www.one-eyed-alien.net/~mdharm/linux-usb for more
  * information about this driver.
- *
- * 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, or (at your option) any
- * later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
 #include "usb.h"
diff --git a/drivers/usb/storage/isd200.c b/drivers/usb/storage/isd200.c
index 6a7720e66595..f5e4500d9970 100644
--- a/drivers/usb/storage/isd200.c
+++ b/drivers/usb/storage/isd200.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Transport & Protocol Driver for In-System Design, Inc. ISD200 ASIC
  *
@@ -14,20 +15,6 @@
  * does implement an interface, the ATA Command Block (ATACB) which provides
  * a means of passing ATA commands and ATA register accesses to a device.
  *
- * 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, or (at your option) any
- * later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 675 Mass Ave, Cambridge, MA 02139, USA.
- *
  * History:
  *
  *  2002-10-19: Removed the specialized transfer routines.
diff --git a/drivers/usb/storage/jumpshot.c b/drivers/usb/storage/jumpshot.c
index 011e5270690a..917f170c4124 100644
--- a/drivers/usb/storage/jumpshot.c
+++ b/drivers/usb/storage/jumpshot.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Driver for Lexar "Jumpshot" Compact Flash reader
  *
@@ -19,20 +20,6 @@
  * Developed with the assistance of:
  *
  *   (C) 2002 Alan Stern <stern@rowland.org>
- *
- * 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, or (at your option) any
- * later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 675 Mass Ave, Cambridge, MA 02139, USA.
  */
  
  /*
diff --git a/drivers/usb/storage/karma.c b/drivers/usb/storage/karma.c
index b05ba4929f00..edcf2be0e0eb 100644
--- a/drivers/usb/storage/karma.c
+++ b/drivers/usb/storage/karma.c
@@ -1,22 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Driver for Rio Karma
  *
  *   (c) 2006 Bob Copeland <me@bobcopeland.com>
  *   (c) 2006 Keith Bennett <keith@mcs.st-and.ac.uk>
- *
- * 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, or (at your option) any
- * later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
 #include <linux/module.h>
diff --git a/drivers/usb/storage/onetouch.c b/drivers/usb/storage/onetouch.c
index acc3d03d8c1e..39a5009a41a6 100644
--- a/drivers/usb/storage/onetouch.c
+++ b/drivers/usb/storage/onetouch.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Support for the Maxtor OneTouch USB hard drive's button
  *
@@ -10,24 +11,6 @@
  * Based on usbmouse.c (Vojtech Pavlik) and xpad.c (Marko Friedemann)
  *
  */
-
-/*
- * 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.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- *
- */
-
 #include <linux/kernel.h>
 #include <linux/input.h>
 #include <linux/slab.h>
diff --git a/drivers/usb/storage/option_ms.c b/drivers/usb/storage/option_ms.c
index 57282f12317b..7c0b05a36554 100644
--- a/drivers/usb/storage/option_ms.c
+++ b/drivers/usb/storage/option_ms.c
@@ -1,23 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Driver for Option High Speed Mobile Devices.
  *
  *   (c) 2008 Dan Williams <dcbw@redhat.com>
  *
  * Inspiration taken from sierra_ms.c by Kevin Lloyd <klloyd@sierrawireless.com>
- *
- * 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.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
 #include <linux/usb.h>
@@ -41,7 +28,7 @@ MODULE_PARM_DESC(option_zero_cd, "ZeroCD mode (1=Force Modem (default),"
 
 static int option_rezero(struct us_data *us)
 {
-        const unsigned char rezero_msg[] = {
+        static const unsigned char rezero_msg[] = {
           0x55, 0x53, 0x42, 0x43, 0x78, 0x56, 0x34, 0x12,
           0x01, 0x00, 0x00, 0x00, 0x80, 0x00, 0x06, 0x01,
           0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -87,7 +74,7 @@ out:
 
 static int option_inquiry(struct us_data *us)
 {
-        const unsigned char inquiry_msg[] = {
+        static const unsigned char inquiry_msg[] = {
           0x55, 0x53, 0x42, 0x43, 0x12, 0x34, 0x56, 0x78,
           0x24, 0x00, 0x00, 0x00, 0x80, 0x00, 0x06, 0x12,
           0x00, 0x00, 0x00, 0x24, 0x00, 0x00, 0x00, 0x00,
diff --git a/drivers/usb/storage/protocol.c b/drivers/usb/storage/protocol.c
index 74c38870a17e..f3f2a93f52e1 100644
--- a/drivers/usb/storage/protocol.c
+++ b/drivers/usb/storage/protocol.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Driver for USB Mass Storage compliant devices
  *
@@ -27,20 +28,6 @@
  *
  * Please see http://www.one-eyed-alien.net/~mdharm/linux-usb for more
  * information about this driver.
- *
- * 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, or (at your option) any
- * later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
 #include <linux/highmem.h>
diff --git a/drivers/usb/storage/protocol.h b/drivers/usb/storage/protocol.h
index a55666880b7b..9198396e8c6e 100644
--- a/drivers/usb/storage/protocol.h
+++ b/drivers/usb/storage/protocol.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Driver for USB Mass Storage compliant devices
  * Protocol Functions Header File
@@ -21,20 +22,6 @@
  *
  * Please see http://www.one-eyed-alien.net/~mdharm/linux-usb for more
  * information about this driver.
- *
- * 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, or (at your option) any
- * later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
 #ifndef _PROTOCOL_H_
diff --git a/drivers/usb/storage/realtek_cr.c b/drivers/usb/storage/realtek_cr.c
index ec83b3b5efa9..48e2e32c97e8 100644
--- a/drivers/usb/storage/realtek_cr.c
+++ b/drivers/usb/storage/realtek_cr.c
@@ -1,21 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Driver for Realtek RTS51xx USB card reader
  *
  * Copyright(c) 2009 Realtek Semiconductor Corp. All rights reserved.
  *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the
- * Free Software Foundation; either version 2, or (at your option) any
- * later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, see <http://www.gnu.org/licenses/>.
- *
  * Author:
  *   wwang (wei_wang@realsil.com.cn)
  *   No. 450, Shenhu Road, Suzhou Industry Park, Suzhou, China
diff --git a/drivers/usb/storage/scsiglue.c b/drivers/usb/storage/scsiglue.c
index 8cd2926fb1fe..585efd120193 100644
--- a/drivers/usb/storage/scsiglue.c
+++ b/drivers/usb/storage/scsiglue.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Driver for USB Mass Storage compliant devices
  * SCSI layer glue code
@@ -28,20 +29,6 @@
  *
  * Please see http://www.one-eyed-alien.net/~mdharm/linux-usb for more
  * information about this driver.
- *
- * 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, or (at your option) any
- * later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
 #include <linux/module.h>
diff --git a/drivers/usb/storage/scsiglue.h b/drivers/usb/storage/scsiglue.h
index d0a331dd9bc5..bf99c6201331 100644
--- a/drivers/usb/storage/scsiglue.h
+++ b/drivers/usb/storage/scsiglue.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Driver for USB Mass Storage compliant devices
  * SCSI Connecting Glue Header File
@@ -21,20 +22,6 @@
  *
  * Please see http://www.one-eyed-alien.net/~mdharm/linux-usb for more
  * information about this driver.
- *
- * 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, or (at your option) any
- * later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
 #ifndef _SCSIGLUE_H_
diff --git a/drivers/usb/storage/sddr09.c b/drivers/usb/storage/sddr09.c
index 44f8ffccd031..1cf7dbfe277c 100644
--- a/drivers/usb/storage/sddr09.c
+++ b/drivers/usb/storage/sddr09.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Driver for SanDisk SDDR-09 SmartMedia reader
  *
@@ -11,20 +12,6 @@
  * been programmed to obey a certain limited set of SCSI commands.
  * This driver translates the "real" SCSI commands to the SDDR-09 SCSI
  * commands.
- *
- * 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, or (at your option) any
- * later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
 /*
diff --git a/drivers/usb/storage/sddr55.c b/drivers/usb/storage/sddr55.c
index 147c50b3e00f..8c814b2ec9b2 100644
--- a/drivers/usb/storage/sddr55.c
+++ b/drivers/usb/storage/sddr55.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Driver for SanDisk SDDR-55 SmartMedia reader
  *
@@ -7,20 +8,6 @@
  *
  * Current development and maintenance by:
  *   (c) 2002 Simon Munton
- *
- * 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, or (at your option) any
- * later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
 #include <linux/jiffies.h>
@@ -604,6 +591,7 @@ static unsigned long sddr55_get_capacity(struct us_data *us) {
         case 0x64:
                 info->pageshift = 8;
                 info->smallpageshift = 1;
+                /* fall through */
         case 0x5d: // 5d is a ROM card with pagesize 512.
                 return 0x00200000;
 
diff --git a/drivers/usb/storage/shuttle_usbat.c b/drivers/usb/storage/shuttle_usbat.c
index 3b0294e4df93..854498e1012c 100644
--- a/drivers/usb/storage/shuttle_usbat.c
+++ b/drivers/usb/storage/shuttle_usbat.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Driver for SCM Microsystems (a.k.a. Shuttle) USB-ATAPI cable
  *
@@ -26,20 +27,6 @@
  *
  * See the Kconfig help text for a list of devices known to be supported by
  * this driver.
- *
- * 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, or (at your option) any
- * later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
 #include <linux/errno.h>
diff --git a/drivers/usb/storage/transport.c b/drivers/usb/storage/transport.c
index a3ccb899df60..d947957f3635 100644
--- a/drivers/usb/storage/transport.c
+++ b/drivers/usb/storage/transport.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Driver for USB Mass Storage compliant devices
  *
@@ -28,20 +29,6 @@
  *
  * Please see http://www.one-eyed-alien.net/~mdharm/linux-usb for more
  * information about this driver.
- *
- * 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, or (at your option) any
- * later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
 #include <linux/sched.h>
diff --git a/drivers/usb/storage/transport.h b/drivers/usb/storage/transport.h
index dae3ecd2e6cf..f559dc575f4f 100644
--- a/drivers/usb/storage/transport.h
+++ b/drivers/usb/storage/transport.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Driver for USB Mass Storage compliant devices
  * Transport Functions Header File
@@ -21,20 +22,6 @@
  *
  * Please see http://www.one-eyed-alien.net/~mdharm/linux-usb for more
  * information about this driver.
- *
- * 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, or (at your option) any
- * later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
 #ifndef _TRANSPORT_H_
diff --git a/drivers/usb/storage/uas.c b/drivers/usb/storage/uas.c
index 63cf981ed81c..5d04c40ee40a 100644
--- a/drivers/usb/storage/uas.c
+++ b/drivers/usb/storage/uas.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * USB Attached SCSI
  * Note that this is not the same as the USB Mass Storage driver
@@ -5,8 +6,6 @@
  * Copyright Hans de Goede <hdegoede@redhat.com> for Red Hat, Inc. 2013 - 2016
  * Copyright Matthew Wilcox for Intel Corp, 2010
  * Copyright Sarah Sharp for Intel Corp, 2010
- *
- * Distributed under the terms of the GNU GPL, version two.
  */
 
 #include <linux/blkdev.h>
@@ -668,6 +667,7 @@ static int uas_queuecommand_lck(struct scsi_cmnd *cmnd,
                 break;
         case DMA_BIDIRECTIONAL:
                 cmdinfo->state |= ALLOC_DATA_IN_URB | SUBMIT_DATA_IN_URB;
+                /* fall through */
         case DMA_TO_DEVICE:
                 cmdinfo->state |= ALLOC_DATA_OUT_URB | SUBMIT_DATA_OUT_URB;
         case DMA_NONE:
diff --git a/drivers/usb/storage/unusual_alauda.h b/drivers/usb/storage/unusual_alauda.h
index 763bc03032a1..0ec8c99a4976 100644
--- a/drivers/usb/storage/unusual_alauda.h
+++ b/drivers/usb/storage/unusual_alauda.h
@@ -1,19 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Unusual Devices File for the Alauda-based card readers
- *
- * 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, or (at your option) any
- * later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
 #if defined(CONFIG_USB_STORAGE_ALAUDA) || \
diff --git a/drivers/usb/storage/unusual_cypress.h b/drivers/usb/storage/unusual_cypress.h
index e9a2eb88869a..fb99e526cd48 100644
--- a/drivers/usb/storage/unusual_cypress.h
+++ b/drivers/usb/storage/unusual_cypress.h
@@ -1,20 +1,7 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Unusual Devices File for devices based on the Cypress USB/ATA bridge
  *      with support for ATACB
- *
- * 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, or (at your option) any
- * later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
 #if defined(CONFIG_USB_STORAGE_CYPRESS_ATACB) || \
diff --git a/drivers/usb/storage/unusual_datafab.h b/drivers/usb/storage/unusual_datafab.h
index 5049b6bbe5d5..fdab5e7d68ca 100644
--- a/drivers/usb/storage/unusual_datafab.h
+++ b/drivers/usb/storage/unusual_datafab.h
@@ -1,19 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Unusual Devices File for the Datafab USB Compact Flash reader
- *
- * 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, or (at your option) any
- * later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
 #if defined(CONFIG_USB_STORAGE_DATAFAB) || \
diff --git a/drivers/usb/storage/unusual_devs.h b/drivers/usb/storage/unusual_devs.h
index eb06d88b41d6..2968046e7c05 100644
--- a/drivers/usb/storage/unusual_devs.h
+++ b/drivers/usb/storage/unusual_devs.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Driver for USB Mass Storage compliant devices
  * Unusual Devices File
@@ -10,20 +11,6 @@
  *
  * Please see http://www.one-eyed-alien.net/~mdharm/linux-usb for more
  * information about this driver.
- *
- * 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, or (at your option) any
- * later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
 /*
diff --git a/drivers/usb/storage/unusual_ene_ub6250.h b/drivers/usb/storage/unusual_ene_ub6250.h
index 5667f5d365c6..9134b91fbd73 100644
--- a/drivers/usb/storage/unusual_ene_ub6250.h
+++ b/drivers/usb/storage/unusual_ene_ub6250.h
@@ -1,20 +1,4 @@
-/*
- *
- * 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, or (at your option) any
- * later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
+// SPDX-License-Identifier: GPL-2.0+
 #if defined(CONFIG_USB_STORAGE_ENE_UB6250) || \
                 defined(CONFIG_USB_STORAGE_ENE_UB6250_MODULE)
 
diff --git a/drivers/usb/storage/unusual_freecom.h b/drivers/usb/storage/unusual_freecom.h
index 1f5aab42ece2..949231c7a36b 100644
--- a/drivers/usb/storage/unusual_freecom.h
+++ b/drivers/usb/storage/unusual_freecom.h
@@ -1,19 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Unusual Devices File for the Freecom USB/IDE adaptor
- *
- * 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, or (at your option) any
- * later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
 #if defined(CONFIG_USB_STORAGE_FREECOM) || \
diff --git a/drivers/usb/storage/unusual_isd200.h b/drivers/usb/storage/unusual_isd200.h
index 9b6862ec3d4f..d03a02cc904e 100644
--- a/drivers/usb/storage/unusual_isd200.h
+++ b/drivers/usb/storage/unusual_isd200.h
@@ -1,19 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Unusual Devices File for In-System Design, Inc. ISD200 ASIC
- *
- * 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, or (at your option) any
- * later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
 #if defined(CONFIG_USB_STORAGE_ISD200) || \
diff --git a/drivers/usb/storage/unusual_jumpshot.h b/drivers/usb/storage/unusual_jumpshot.h
index 413e64fa6b95..c323338881ef 100644
--- a/drivers/usb/storage/unusual_jumpshot.h
+++ b/drivers/usb/storage/unusual_jumpshot.h
@@ -1,19 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Unusual Devices File for the Lexar "Jumpshot" Compact Flash reader
- *
- * 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, or (at your option) any
- * later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
 #if defined(CONFIG_USB_STORAGE_JUMPSHOT) || \
diff --git a/drivers/usb/storage/unusual_karma.h b/drivers/usb/storage/unusual_karma.h
index e6fad3aeae20..8f1eebd71d2c 100644
--- a/drivers/usb/storage/unusual_karma.h
+++ b/drivers/usb/storage/unusual_karma.h
@@ -1,19 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Unusual Devices File for the Rio Karma
- *
- * 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, or (at your option) any
- * later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
 #if defined(CONFIG_USB_STORAGE_KARMA) || \
diff --git a/drivers/usb/storage/unusual_onetouch.h b/drivers/usb/storage/unusual_onetouch.h
index 425dc22f345a..c76d4e990f7b 100644
--- a/drivers/usb/storage/unusual_onetouch.h
+++ b/drivers/usb/storage/unusual_onetouch.h
@@ -1,19 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Unusual Devices File for the Maxtor OneTouch USB hard drive's button
- *
- * 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, or (at your option) any
- * later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
 #if defined(CONFIG_USB_STORAGE_ONETOUCH) || \
diff --git a/drivers/usb/storage/unusual_realtek.h b/drivers/usb/storage/unusual_realtek.h
index 8fe624ad302a..d17cd95b55bb 100644
--- a/drivers/usb/storage/unusual_realtek.h
+++ b/drivers/usb/storage/unusual_realtek.h
@@ -1,21 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Driver for Realtek RTS51xx USB card reader
  *
  * Copyright(c) 2009 Realtek Semiconductor Corp. All rights reserved.
  *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the
- * Free Software Foundation; either version 2, or (at your option) any
- * later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, see <http://www.gnu.org/licenses/>.
- *
  * Author:
  *   wwang (wei_wang@realsil.com.cn)
  *   No. 450, Shenhu Road, Suzhou Industry Park, Suzhou, China
diff --git a/drivers/usb/storage/unusual_sddr09.h b/drivers/usb/storage/unusual_sddr09.h
index d9d38ac4abf9..650cf2862754 100644
--- a/drivers/usb/storage/unusual_sddr09.h
+++ b/drivers/usb/storage/unusual_sddr09.h
@@ -1,19 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Unusual Devices File for SanDisk SDDR-09 SmartMedia reader
- *
- * 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, or (at your option) any
- * later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
 #if defined(CONFIG_USB_STORAGE_SDDR09) || \
diff --git a/drivers/usb/storage/unusual_sddr55.h b/drivers/usb/storage/unusual_sddr55.h
index ebb1d1c6c467..e89df2cea7bd 100644
--- a/drivers/usb/storage/unusual_sddr55.h
+++ b/drivers/usb/storage/unusual_sddr55.h
@@ -1,19 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Unusual Devices File for SanDisk SDDR-55 SmartMedia reader
- *
- * 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, or (at your option) any
- * later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
 #if defined(CONFIG_USB_STORAGE_SDDR55) || \
diff --git a/drivers/usb/storage/unusual_uas.h b/drivers/usb/storage/unusual_uas.h
index cde115359793..d520374a824e 100644
--- a/drivers/usb/storage/unusual_uas.h
+++ b/drivers/usb/storage/unusual_uas.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Driver for USB Attached SCSI devices - Unusual Devices File
  *
@@ -6,20 +7,6 @@
  * Based on the same file for the usb-storage driver, which is:
  *   (c) 2000-2002 Matthew Dharm (mdharm-usb@one-eyed-alien.net)
  *   (c) 2000 Adam J. Richter (adam@yggdrasil.com), Yggdrasil Computing, Inc.
- *
- * 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, or (at your option) any
- * later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
 /*
diff --git a/drivers/usb/storage/unusual_usbat.h b/drivers/usb/storage/unusual_usbat.h
index 2044ad5ef5e4..05abf6870b8f 100644
--- a/drivers/usb/storage/unusual_usbat.h
+++ b/drivers/usb/storage/unusual_usbat.h
@@ -1,19 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Unusual Devices File for SCM Microsystems (a.k.a. Shuttle) USB-ATAPI cable
- *
- * 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, or (at your option) any
- * later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
 #if defined(CONFIG_USB_STORAGE_USBAT) || \
diff --git a/drivers/usb/storage/usb.c b/drivers/usb/storage/usb.c
index 0dceb9fa3a06..a0c07e05a8f1 100644
--- a/drivers/usb/storage/usb.c
+++ b/drivers/usb/storage/usb.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Driver for USB Mass Storage compliant devices
  *
@@ -30,20 +31,6 @@
  *
  * Please see http://www.one-eyed-alien.net/~mdharm/linux-usb for more
  * information about this driver.
- *
- * 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, or (at your option) any
- * later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
 #ifdef CONFIG_USB_STORAGE_DEBUG
@@ -332,7 +319,7 @@ static int usb_stor_control_thread(void * __us)
 
                 /* When we are called with no command pending, we're done */
                 srb = us->srb;
-                if (us->srb == NULL) {
+                if (srb == NULL) {
                         scsi_unlock(host);
                         mutex_unlock(&us->dev_mutex);
                         usb_stor_dbg(us, "-- exiting\n");
@@ -341,7 +328,7 @@ static int usb_stor_control_thread(void * __us)
 
                 /* has the command timed out *already* ? */
                 if (test_bit(US_FLIDX_TIMED_OUT, &us->dflags)) {
-                        us->srb->result = DID_ABORT << 16;
+                        srb->result = DID_ABORT << 16;
                         goto SkipForAbort;
                 }
 
@@ -351,35 +338,35 @@ static int usb_stor_control_thread(void * __us)
                  * reject the command if the direction indicator
                  * is UNKNOWN
                  */
-                if (us->srb->sc_data_direction == DMA_BIDIRECTIONAL) {
+                if (srb->sc_data_direction == DMA_BIDIRECTIONAL) {
                         usb_stor_dbg(us, "UNKNOWN data direction\n");
-                        us->srb->result = DID_ERROR << 16;
+                        srb->result = DID_ERROR << 16;
                 }
 
                 /*
                  * reject if target != 0 or if LUN is higher than
                  * the maximum known LUN
                  */
-                else if (us->srb->device->id &&
+                else if (srb->device->id &&
                                 !(us->fflags & US_FL_SCM_MULT_TARG)) {
                         usb_stor_dbg(us, "Bad target number (%d:%llu)\n",
-                                     us->srb->device->id,
-                                     us->srb->device->lun);
-                        us->srb->result = DID_BAD_TARGET << 16;
+                                     srb->device->id,
+                                     srb->device->lun);
+                        srb->result = DID_BAD_TARGET << 16;
                 }
 
-                else if (us->srb->device->lun > us->max_lun) {
+                else if (srb->device->lun > us->max_lun) {
                         usb_stor_dbg(us, "Bad LUN (%d:%llu)\n",
-                                     us->srb->device->id,
-                                     us->srb->device->lun);
-                        us->srb->result = DID_BAD_TARGET << 16;
+                                     srb->device->id,
+                                     srb->device->lun);
+                        srb->result = DID_BAD_TARGET << 16;
                 }
 
                 /*
                  * Handle those devices which need us to fake
                  * their inquiry data
                  */
-                else if ((us->srb->cmnd[0] == INQUIRY) &&
+                else if ((srb->cmnd[0] == INQUIRY) &&
                             (us->fflags & US_FL_FIX_INQUIRY)) {
                         unsigned char data_ptr[36] = {
                             0x00, 0x80, 0x02, 0x02,
@@ -387,13 +374,13 @@ static int usb_stor_control_thread(void * __us)
 
                         usb_stor_dbg(us, "Faking INQUIRY command\n");
                         fill_inquiry_response(us, data_ptr, 36);
-                        us->srb->result = SAM_STAT_GOOD;
+                        srb->result = SAM_STAT_GOOD;
                 }
 
                 /* we've got a command, let's do it! */
                 else {
-                        US_DEBUG(usb_stor_show_command(us, us->srb));
-                        us->proto_handler(us->srb, us);
+                        US_DEBUG(usb_stor_show_command(us, srb));
+                        us->proto_handler(srb, us);
                         usb_mark_last_busy(us->pusb_dev);
                 }
 
@@ -401,7 +388,7 @@ static int usb_stor_control_thread(void * __us)
                 scsi_lock(host);
 
                 /* was the command aborted? */
-                if (us->srb->result == DID_ABORT << 16) {
+                if (srb->result == DID_ABORT << 16) {
 SkipForAbort:
                         usb_stor_dbg(us, "scsi command aborted\n");
                         srb = NULL;     /* Don't call srb->scsi_done() */
diff --git a/drivers/usb/storage/usb.h b/drivers/usb/storage/usb.h
index 8fae28b40bb4..90133e16bec5 100644
--- a/drivers/usb/storage/usb.h
+++ b/drivers/usb/storage/usb.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Driver for USB Mass Storage compliant devices
  * Main Header File
@@ -24,20 +25,6 @@
  *
  * Please see http://www.one-eyed-alien.net/~mdharm/linux-usb for more
  * information about this driver.
- *
- * 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, or (at your option) any
- * later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
 #ifndef _USB_H_
diff --git a/drivers/usb/storage/usual-tables.c b/drivers/usb/storage/usual-tables.c
index 499669bcf700..83ad01747eed 100644
--- a/drivers/usb/storage/usual-tables.c
+++ b/drivers/usb/storage/usual-tables.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Driver for USB Mass Storage devices
  * Usual Tables File for usb-storage and libusual
@@ -6,20 +7,6 @@
  *
  * Please see http://www.one-eyed-alien.net/~mdharm/linux-usb for more
  * information about this driver.
- *
- * 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, or (at your option) any
- * later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
 #include <linux/kernel.h>
diff --git a/drivers/usb/typec/Kconfig b/drivers/usb/typec/Kconfig
index 819c0ed2b200..465d7da849c3 100644
--- a/drivers/usb/typec/Kconfig
+++ b/drivers/usb/typec/Kconfig
@@ -16,8 +16,6 @@ if TYPEC_TCPM
 
 source "drivers/usb/typec/fusb302/Kconfig"
 
-endif
-
 config TYPEC_WCOVE
         tristate "Intel WhiskeyCove PMIC USB Type-C PHY driver"
         depends on ACPI
@@ -33,6 +31,19 @@ config TYPEC_WCOVE
           To compile this driver as module, choose M here: the module will be
           called typec_wcove
 
+endif
+
 source "drivers/usb/typec/ucsi/Kconfig"
 
+config TYPEC_TPS6598X
+        tristate "TI TPS6598x USB Power Delivery controller driver"
+        depends on I2C
+        select TYPEC
+        help
+          Say Y or M here if your system has TI TPS65982 or TPS65983 USB Power
+          Delivery controller.
+
+          If you choose to build this driver as a dynamically linked module, the
+          module will be called tps6598x.ko.
+
 endmenu
diff --git a/drivers/usb/typec/Makefile b/drivers/usb/typec/Makefile
index b77688ce1f16..bb3138a6eaac 100644
--- a/drivers/usb/typec/Makefile
+++ b/drivers/usb/typec/Makefile
@@ -1,5 +1,7 @@
+# SPDX-License-Identifier: GPL-2.0
 obj-$(CONFIG_TYPEC)             += typec.o
 obj-$(CONFIG_TYPEC_TCPM)        += tcpm.o
 obj-y                           += fusb302/
 obj-$(CONFIG_TYPEC_WCOVE)       += typec_wcove.o
 obj-$(CONFIG_TYPEC_UCSI)        += ucsi/
+obj-$(CONFIG_TYPEC_TPS6598X)    += tps6598x.o
diff --git a/drivers/usb/typec/fusb302/Makefile b/drivers/usb/typec/fusb302/Makefile
index 207efa5fbab8..3b51b33631a0 100644
--- a/drivers/usb/typec/fusb302/Makefile
+++ b/drivers/usb/typec/fusb302/Makefile
@@ -1 +1,2 @@
+# SPDX-License-Identifier: GPL-2.0
 obj-$(CONFIG_TYPEC_FUSB302)     += fusb302.o
diff --git a/drivers/usb/typec/fusb302/fusb302.c b/drivers/usb/typec/fusb302/fusb302.c
index e790b67d4953..72cb060b3fca 100644
--- a/drivers/usb/typec/fusb302/fusb302.c
+++ b/drivers/usb/typec/fusb302/fusb302.c
@@ -1,16 +1,7 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright 2016-2017 Google, Inc
  *
- * 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.
- *
- * 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.
- *
  * Fairchild FUSB302 Type-C Chip Driver
  */
 
diff --git a/drivers/usb/typec/fusb302/fusb302_reg.h b/drivers/usb/typec/fusb302/fusb302_reg.h
index 0682e63de773..00b39d365478 100644
--- a/drivers/usb/typec/fusb302/fusb302_reg.h
+++ b/drivers/usb/typec/fusb302/fusb302_reg.h
@@ -1,16 +1,7 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright 2016-2017 Google, Inc
  *
- * 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.
- *
- * 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.
- *
  * Fairchild FUSB302 Type-C Chip Driver
  */
 
diff --git a/drivers/usb/typec/tcpm.c b/drivers/usb/typec/tcpm.c
index f557c479fdc2..c166fc77dfb8 100644
--- a/drivers/usb/typec/tcpm.c
+++ b/drivers/usb/typec/tcpm.c
@@ -1,16 +1,7 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright 2015-2017 Google, Inc
  *
- * 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.
- *
- * 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.
- *
  * USB Power Delivery protocol stack.
  */
 
@@ -986,7 +977,7 @@ static void svdm_consume_modes(struct tcpm_port *port, const __le32 *payload,
         }
         port->partner_altmode[pmdata->altmodes] =
                 typec_partner_register_altmode(port->partner, paltmode);
-        if (port->partner_altmode[pmdata->altmodes] == NULL) {
+        if (!port->partner_altmode[pmdata->altmodes]) {
                 tcpm_log(port,
                          "Failed to register alternate modes for SVID 0x%04x",
                          paltmode->svid);
@@ -3602,6 +3593,7 @@ void tcpm_unregister_port(struct tcpm_port *port)
 {
         int i;
 
+        tcpm_reset_port(port);
         for (i = 0; i < ARRAY_SIZE(port->port_altmode); i++)
                 typec_unregister_altmode(port->port_altmode[i]);
         typec_unregister_port(port->typec_port);
diff --git a/drivers/usb/typec/tps6598x.c b/drivers/usb/typec/tps6598x.c
new file mode 100644
index 000000000000..2719f5d382f7
--- /dev/null
+++ b/drivers/usb/typec/tps6598x.c
@@ -0,0 +1,473 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * Driver for TI TPS6598x USB Power Delivery controller family
+ *
+ * Copyright (C) 2017, Intel Corporation
+ * Author: Heikki Krogerus <heikki.krogerus@linux.intel.com>
+ */
+
+#include <linux/i2c.h>
+#include <linux/acpi.h>
+#include <linux/module.h>
+#include <linux/regmap.h>
+#include <linux/interrupt.h>
+#include <linux/usb/typec.h>
+
+/* Register offsets */
+#define TPS_REG_CMD1                    0x08
+#define TPS_REG_DATA1                   0x09
+#define TPS_REG_INT_EVENT1              0x14
+#define TPS_REG_INT_EVENT2              0x15
+#define TPS_REG_INT_MASK1               0x16
+#define TPS_REG_INT_MASK2               0x17
+#define TPS_REG_INT_CLEAR1              0x18
+#define TPS_REG_INT_CLEAR2              0x19
+#define TPS_REG_STATUS                  0x1a
+#define TPS_REG_SYSTEM_CONF             0x28
+#define TPS_REG_CTRL_CONF               0x29
+#define TPS_REG_POWER_STATUS            0x3f
+#define TPS_REG_RX_IDENTITY_SOP         0x48
+
+/* TPS_REG_INT_* bits */
+#define TPS_REG_INT_PLUG_EVENT          BIT(3)
+
+/* TPS_REG_STATUS bits */
+#define TPS_STATUS_PLUG_PRESENT         BIT(0)
+#define TPS_STATUS_ORIENTATION          BIT(4)
+#define TPS_STATUS_PORTROLE(s)          (!!((s) & BIT(5)))
+#define TPS_STATUS_DATAROLE(s)          (!!((s) & BIT(6)))
+#define TPS_STATUS_VCONN(s)             (!!((s) & BIT(7)))
+
+/* TPS_REG_SYSTEM_CONF bits */
+#define TPS_SYSCONF_PORTINFO(c)         ((c) & 3)
+
+enum {
+        TPS_PORTINFO_SINK,
+        TPS_PORTINFO_SINK_ACCESSORY,
+        TPS_PORTINFO_DRP_UFP,
+        TPS_PORTINFO_DRP_UFP_DRD,
+        TPS_PORTINFO_DRP_DFP,
+        TPS_PORTINFO_DRP_DFP_DRD,
+        TPS_PORTINFO_SOURCE,
+};
+
+/* TPS_REG_POWER_STATUS bits */
+#define TPS_POWER_STATUS_SOURCESINK     BIT(1)
+#define TPS_POWER_STATUS_PWROPMODE(p)   (((p) & GENMASK(3, 2)) >> 2)
+
+/* TPS_REG_RX_IDENTITY_SOP */
+struct tps6598x_rx_identity_reg {
+        u8 status;
+        struct usb_pd_identity identity;
+        u32 vdo[3];
+} __packed;
+
+/* Standard Task return codes */
+#define TPS_TASK_TIMEOUT                1
+#define TPS_TASK_REJECTED               3
+
+/* Unrecognized commands will be replaced with "!CMD" */
+#define INVALID_CMD(_cmd_)              (_cmd_ == 0x444d4321)
+
+struct tps6598x {
+        struct device *dev;
+        struct regmap *regmap;
+        struct mutex lock; /* device lock */
+
+        struct typec_port *port;
+        struct typec_partner *partner;
+        struct usb_pd_identity partner_identity;
+        struct typec_capability typec_cap;
+};
+
+static inline int tps6598x_read16(struct tps6598x *tps, u8 reg, u16 *val)
+{
+        return regmap_raw_read(tps->regmap, reg, val, sizeof(u16));
+}
+
+static inline int tps6598x_read32(struct tps6598x *tps, u8 reg, u32 *val)
+{
+        return regmap_raw_read(tps->regmap, reg, val, sizeof(u32));
+}
+
+static inline int tps6598x_read64(struct tps6598x *tps, u8 reg, u64 *val)
+{
+        return regmap_raw_read(tps->regmap, reg, val, sizeof(u64));
+}
+
+static inline int tps6598x_write16(struct tps6598x *tps, u8 reg, u16 val)
+{
+        return regmap_raw_write(tps->regmap, reg, &val, sizeof(u16));
+}
+
+static inline int tps6598x_write32(struct tps6598x *tps, u8 reg, u32 val)
+{
+        return regmap_raw_write(tps->regmap, reg, &val, sizeof(u32));
+}
+
+static inline int tps6598x_write64(struct tps6598x *tps, u8 reg, u64 val)
+{
+        return regmap_raw_write(tps->regmap, reg, &val, sizeof(u64));
+}
+
+static inline int
+tps6598x_write_4cc(struct tps6598x *tps, u8 reg, const char *val)
+{
+        return regmap_raw_write(tps->regmap, reg, &val, sizeof(u32));
+}
+
+static int tps6598x_read_partner_identity(struct tps6598x *tps)
+{
+        struct tps6598x_rx_identity_reg id;
+        int ret;
+
+        ret = regmap_raw_read(tps->regmap, TPS_REG_RX_IDENTITY_SOP,
+                              &id, sizeof(id));
+        if (ret)
+                return ret;
+
+        tps->partner_identity = id.identity;
+
+        return 0;
+}
+
+static int tps6598x_connect(struct tps6598x *tps, u32 status)
+{
+        struct typec_partner_desc desc;
+        enum typec_pwr_opmode mode;
+        u16 pwr_status;
+        int ret;
+
+        if (tps->partner)
+                return 0;
+
+        ret = tps6598x_read16(tps, TPS_REG_POWER_STATUS, &pwr_status);
+        if (ret < 0)
+                return ret;
+
+        mode = TPS_POWER_STATUS_PWROPMODE(pwr_status);
+
+        desc.usb_pd = mode == TYPEC_PWR_MODE_PD;
+        desc.accessory = TYPEC_ACCESSORY_NONE; /* XXX: handle accessories */
+        desc.identity = NULL;
+
+        if (desc.usb_pd) {
+                ret = tps6598x_read_partner_identity(tps);
+                if (ret)
+                        return ret;
+                desc.identity = &tps->partner_identity;
+        }
+
+        tps->partner = typec_register_partner(tps->port, &desc);
+        if (!tps->partner)
+                return -ENODEV;
+
+        typec_set_pwr_opmode(tps->port, mode);
+        typec_set_pwr_role(tps->port, TPS_STATUS_PORTROLE(status));
+        typec_set_vconn_role(tps->port, TPS_STATUS_VCONN(status));
+        typec_set_data_role(tps->port, TPS_STATUS_DATAROLE(status));
+
+        if (desc.identity)
+                typec_partner_set_identity(tps->partner);
+
+        return 0;
+}
+
+static void tps6598x_disconnect(struct tps6598x *tps, u32 status)
+{
+        typec_unregister_partner(tps->partner);
+        tps->partner = NULL;
+        typec_set_pwr_opmode(tps->port, TYPEC_PWR_MODE_USB);
+        typec_set_pwr_role(tps->port, TPS_STATUS_PORTROLE(status));
+        typec_set_vconn_role(tps->port, TPS_STATUS_VCONN(status));
+        typec_set_data_role(tps->port, TPS_STATUS_DATAROLE(status));
+}
+
+static int tps6598x_exec_cmd(struct tps6598x *tps, const char *cmd,
+                             size_t in_len, u8 *in_data,
+                             size_t out_len, u8 *out_data)
+{
+        unsigned long timeout;
+        u32 val;
+        int ret;
+
+        ret = tps6598x_read32(tps, TPS_REG_CMD1, &val);
+        if (ret)
+                return ret;
+        if (val && !INVALID_CMD(val))
+                return -EBUSY;
+
+        if (in_len) {
+                ret = regmap_raw_write(tps->regmap, TPS_REG_DATA1,
+                                       in_data, in_len);
+                if (ret)
+                        return ret;
+        }
+
+        ret = tps6598x_write_4cc(tps, TPS_REG_CMD1, cmd);
+        if (ret < 0)
+                return ret;
+
+        /* XXX: Using 1s for now, but it may not be enough for every command. */
+        timeout = jiffies + msecs_to_jiffies(1000);
+
+        do {
+                ret = tps6598x_read32(tps, TPS_REG_CMD1, &val);
+                if (ret)
+                        return ret;
+                if (INVALID_CMD(val))
+                        return -EINVAL;
+
+                if (time_is_before_jiffies(timeout))
+                        return -ETIMEDOUT;
+        } while (val);
+
+        if (out_len) {
+                ret = regmap_raw_read(tps->regmap, TPS_REG_DATA1,
+                                      out_data, out_len);
+                if (ret)
+                        return ret;
+                val = out_data[0];
+        } else {
+                ret = regmap_read(tps->regmap, TPS_REG_DATA1, &val);
+                if (ret)
+                        return ret;
+        }
+
+        switch (val) {
+        case TPS_TASK_TIMEOUT:
+                return -ETIMEDOUT;
+        case TPS_TASK_REJECTED:
+                return -EPERM;
+        default:
+                break;
+        }
+
+        return 0;
+}
+
+static int
+tps6598x_dr_set(const struct typec_capability *cap, enum typec_data_role role)
+{
+        struct tps6598x *tps = container_of(cap, struct tps6598x, typec_cap);
+        const char *cmd = (role == TYPEC_DEVICE) ? "SWUF" : "SWDF";
+        u32 status;
+        int ret;
+
+        mutex_lock(&tps->lock);
+
+        ret = tps6598x_exec_cmd(tps, cmd, 0, NULL, 0, NULL);
+        if (ret)
+                goto out_unlock;
+
+        ret = tps6598x_read32(tps, TPS_REG_STATUS, &status);
+        if (ret)
+                goto out_unlock;
+
+        if (role != TPS_STATUS_DATAROLE(status)) {
+                ret = -EPROTO;
+                goto out_unlock;
+        }
+
+        typec_set_data_role(tps->port, role);
+
+out_unlock:
+        mutex_unlock(&tps->lock);
+
+        return ret;
+}
+
+static int
+tps6598x_pr_set(const struct typec_capability *cap, enum typec_role role)
+{
+        struct tps6598x *tps = container_of(cap, struct tps6598x, typec_cap);
+        const char *cmd = (role == TYPEC_SINK) ? "SWSk" : "SWSr";
+        u32 status;
+        int ret;
+
+        mutex_lock(&tps->lock);
+
+        ret = tps6598x_exec_cmd(tps, cmd, 0, NULL, 0, NULL);
+        if (ret)
+                goto out_unlock;
+
+        ret = tps6598x_read32(tps, TPS_REG_STATUS, &status);
+        if (ret)
+                goto out_unlock;
+
+        if (role != TPS_STATUS_PORTROLE(status)) {
+                ret = -EPROTO;
+                goto out_unlock;
+        }
+
+        typec_set_pwr_role(tps->port, role);
+
+out_unlock:
+        mutex_unlock(&tps->lock);
+
+        return ret;
+}
+
+static irqreturn_t tps6598x_interrupt(int irq, void *data)
+{
+        struct tps6598x *tps = data;
+        u64 event1;
+        u64 event2;
+        u32 status;
+        int ret;
+
+        mutex_lock(&tps->lock);
+
+        ret = tps6598x_read64(tps, TPS_REG_INT_EVENT1, &event1);
+        ret |= tps6598x_read64(tps, TPS_REG_INT_EVENT2, &event2);
+        if (ret) {
+                dev_err(tps->dev, "%s: failed to read events\n", __func__);
+                goto err_unlock;
+        }
+
+        ret = tps6598x_read32(tps, TPS_REG_STATUS, &status);
+        if (ret) {
+                dev_err(tps->dev, "%s: failed to read status\n", __func__);
+                goto err_clear_ints;
+        }
+
+        /* Handle plug insert or removal */
+        if ((event1 | event2) & TPS_REG_INT_PLUG_EVENT) {
+                if (status & TPS_STATUS_PLUG_PRESENT) {
+                        ret = tps6598x_connect(tps, status);
+                        if (ret)
+                                dev_err(tps->dev,
+                                        "failed to register partner\n");
+                } else {
+                        tps6598x_disconnect(tps, status);
+                }
+        }
+
+err_clear_ints:
+        tps6598x_write64(tps, TPS_REG_INT_CLEAR1, event1);
+        tps6598x_write64(tps, TPS_REG_INT_CLEAR2, event2);
+
+err_unlock:
+        mutex_unlock(&tps->lock);
+
+        return IRQ_HANDLED;
+}
+
+static const struct regmap_config tps6598x_regmap_config = {
+        .reg_bits = 8,
+        .val_bits = 8,
+        .max_register = 0x7F,
+};
+
+static int tps6598x_probe(struct i2c_client *client)
+{
+        struct tps6598x *tps;
+        u32 status;
+        u32 conf;
+        u32 vid;
+        int ret;
+
+        tps = devm_kzalloc(&client->dev, sizeof(*tps), GFP_KERNEL);
+        if (!tps)
+                return -ENOMEM;
+
+        mutex_init(&tps->lock);
+        tps->dev = &client->dev;
+
+        tps->regmap = devm_regmap_init_i2c(client, &tps6598x_regmap_config);
+        if (IS_ERR(tps->regmap))
+                return PTR_ERR(tps->regmap);
+
+        ret = tps6598x_read32(tps, 0, &vid);
+        if (ret < 0)
+                return ret;
+        if (!vid)
+                return -ENODEV;
+
+        ret = tps6598x_read32(tps, TPS_REG_STATUS, &status);
+        if (ret < 0)
+                return ret;
+
+        ret = tps6598x_read32(tps, TPS_REG_SYSTEM_CONF, &conf);
+        if (ret < 0)
+                return ret;
+
+        switch (TPS_SYSCONF_PORTINFO(conf)) {
+        case TPS_PORTINFO_SINK_ACCESSORY:
+        case TPS_PORTINFO_SINK:
+                tps->typec_cap.type = TYPEC_PORT_UFP;
+                break;
+        case TPS_PORTINFO_DRP_UFP_DRD:
+        case TPS_PORTINFO_DRP_DFP_DRD:
+                tps->typec_cap.dr_set = tps6598x_dr_set;
+                /* fall through */
+        case TPS_PORTINFO_DRP_UFP:
+        case TPS_PORTINFO_DRP_DFP:
+                tps->typec_cap.pr_set = tps6598x_pr_set;
+                tps->typec_cap.type = TYPEC_PORT_DRP;
+                break;
+        case TPS_PORTINFO_SOURCE:
+                tps->typec_cap.type = TYPEC_PORT_DFP;
+                break;
+        default:
+                return -ENODEV;
+        }
+
+        tps->typec_cap.revision = USB_TYPEC_REV_1_2;
+        tps->typec_cap.pd_revision = 0x200;
+        tps->typec_cap.prefer_role = TYPEC_NO_PREFERRED_ROLE;
+
+        tps->port = typec_register_port(&client->dev, &tps->typec_cap);
+        if (!tps->port)
+                return -ENODEV;
+
+        if (status & TPS_STATUS_PLUG_PRESENT) {
+                ret = tps6598x_connect(tps, status);
+                if (ret)
+                        dev_err(&client->dev, "failed to register partner\n");
+        }
+
+        ret = devm_request_threaded_irq(&client->dev, client->irq, NULL,
+                                        tps6598x_interrupt,
+                                        IRQF_SHARED | IRQF_ONESHOT,
+                                        dev_name(&client->dev), tps);
+        if (ret) {
+                tps6598x_disconnect(tps, 0);
+                typec_unregister_port(tps->port);
+                return ret;
+        }
+
+        i2c_set_clientdata(client, tps);
+
+        return 0;
+}
+
+static int tps6598x_remove(struct i2c_client *client)
+{
+        struct tps6598x *tps = i2c_get_clientdata(client);
+
+        tps6598x_disconnect(tps, 0);
+        typec_unregister_port(tps->port);
+
+        return 0;
+}
+
+static const struct acpi_device_id tps6598x_acpi_match[] = {
+        { "INT3515", 0 },
+        { }
+};
+MODULE_DEVICE_TABLE(acpi, tps6598x_acpi_match);
+
+static struct i2c_driver tps6598x_i2c_driver = {
+        .driver = {
+                .name = "tps6598x",
+                .acpi_match_table = tps6598x_acpi_match,
+        },
+        .probe_new = tps6598x_probe,
+        .remove = tps6598x_remove,
+};
+module_i2c_driver(tps6598x_i2c_driver);
+
+MODULE_AUTHOR("Heikki Krogerus <heikki.krogerus@linux.intel.com>");
+MODULE_LICENSE("GPL v2");
+MODULE_DESCRIPTION("TI TPS6598x USB Power Delivery Controller Driver");
diff --git a/drivers/usb/typec/typec.c b/drivers/usb/typec/typec.c
index 24e355ba109d..735726ced602 100644
--- a/drivers/usb/typec/typec.c
+++ b/drivers/usb/typec/typec.c
@@ -1,12 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * USB Type-C Connector Class
  *
  * Copyright (C) 2017, Intel Corporation
  * Author: Heikki Krogerus <heikki.krogerus@linux.intel.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/device.h>
diff --git a/drivers/usb/typec/typec_wcove.c b/drivers/usb/typec/typec_wcove.c
index e9c4e784a9cb..a8d479eb221a 100644
--- a/drivers/usb/typec/typec_wcove.c
+++ b/drivers/usb/typec/typec_wcove.c
@@ -1,24 +1,20 @@
+// SPDX-License-Identifier: GPL-2.0
 /**
  * typec_wcove.c - WhiskeyCove PMIC USB Type-C PHY driver
  *
  * Copyright (C) 2017 Intel Corporation
  * Author: Heikki Krogerus <heikki.krogerus@linux.intel.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/acpi.h>
 #include <linux/module.h>
+#include <linux/usb/tcpm.h>
 #include <linux/interrupt.h>
-#include <linux/usb/typec.h>
 #include <linux/platform_device.h>
 #include <linux/mfd/intel_soc_pmic.h>
 
 /* Register offsets */
 #define WCOVE_CHGRIRQ0          0x4e09
-#define WCOVE_PHYCTRL           0x5e07
 
 #define USBC_CONTROL1           0x7001
 #define USBC_CONTROL2           0x7002
@@ -28,22 +24,57 @@
 #define USBC_STATUS1            0x7007
 #define USBC_STATUS2            0x7008
 #define USBC_STATUS3            0x7009
+#define USBC_CC1                0x700a
+#define USBC_CC2                0x700b
+#define USBC_CC1_STATUS         0x700c
+#define USBC_CC2_STATUS         0x700d
 #define USBC_IRQ1               0x7015
 #define USBC_IRQ2               0x7016
 #define USBC_IRQMASK1           0x7017
 #define USBC_IRQMASK2           0x7018
+#define USBC_PDCFG2             0x701a
+#define USBC_PDCFG3             0x701b
+#define USBC_PDSTATUS           0x701c
+#define USBC_RXSTATUS           0x701d
+#define USBC_RXINFO             0x701e
+#define USBC_TXCMD              0x701f
+#define USBC_TXINFO             0x7020
+#define USBC_RX_DATA            0x7028
+#define USBC_TX_DATA            0x7047
 
 /* Register bits */
 
-#define USBC_CONTROL1_MODE_DRP(r)       (((r) & ~0x7) | 4)
+#define USBC_CONTROL1_MODE_MASK         0x3
+#define   USBC_CONTROL1_MODE_SNK        0
+#define   USBC_CONTROL1_MODE_SNKACC     1
+#define   USBC_CONTROL1_MODE_SRC        2
+#define   USBC_CONTROL1_MODE_SRCACC     3
+#define   USBC_CONTROL1_MODE_DRP        4
+#define   USBC_CONTROL1_MODE_DRPACC     5
+#define   USBC_CONTROL1_MODE_TEST       7
+#define USBC_CONTROL1_CURSRC_MASK       0xc
+#define   USBC_CONTROL1_CURSRC_UA_0     (0 << 3)
+#define   USBC_CONTROL1_CURSRC_UA_80    (1 << 3)
+#define   USBC_CONTROL1_CURSRC_UA_180   (2 << 3)
+#define   USBC_CONTROL1_CURSRC_UA_330   (3 << 3)
+#define USBC_CONTROL1_DRPTOGGLE_RANDOM  0xe0
 
 #define USBC_CONTROL2_UNATT_SNK         BIT(0)
 #define USBC_CONTROL2_UNATT_SRC         BIT(1)
 #define USBC_CONTROL2_DIS_ST            BIT(2)
 
+#define USBC_CONTROL3_DET_DIS           BIT(0)
 #define USBC_CONTROL3_PD_DIS            BIT(1)
+#define USBC_CONTROL3_RESETPHY          BIT(2)
 
+#define USBC_CC_CTRL_PU_EN              BIT(0)
 #define USBC_CC_CTRL_VCONN_EN           BIT(1)
+#define USBC_CC_CTRL_TX_EN              BIT(2)
+#define USBC_CC_CTRL_PD_EN              BIT(3)
+#define USBC_CC_CTRL_CDET_EN            BIT(4)
+#define USBC_CC_CTRL_RDET_EN            BIT(5)
+#define USBC_CC_CTRL_ADC_EN             BIT(6)
+#define USBC_CC_CTRL_VBUSOK             BIT(7)
 
 #define USBC_STATUS1_DET_ONGOING        BIT(6)
 #define USBC_STATUS1_RSLT(r)            ((r) & 0xf)
@@ -61,6 +92,15 @@
 
 #define USBC_STATUS2_VBUS_REQ           BIT(5)
 
+#define UCSC_CC_STATUS_SNK_RP           BIT(0)
+#define UCSC_CC_STATUS_PWRDEFSNK        BIT(1)
+#define UCSC_CC_STATUS_PWR_1P5A_SNK     BIT(2)
+#define UCSC_CC_STATUS_PWR_3A_SNK       BIT(3)
+#define UCSC_CC_STATUS_SRC_RP           BIT(4)
+#define UCSC_CC_STATUS_RX(r)            (((r) >> 5) & 0x3)
+#define   USBC_CC_STATUS_RD             1
+#define   USBC_CC_STATUS_RA             2
+
 #define USBC_IRQ1_ADCDONE1              BIT(2)
 #define USBC_IRQ1_OVERTEMP              BIT(1)
 #define USBC_IRQ1_SHORT                 BIT(0)
@@ -79,15 +119,44 @@
                                  USBC_IRQ2_RX_HR | USBC_IRQ2_RX_CR | \
                                  USBC_IRQ2_TX_SUCCESS | USBC_IRQ2_TX_FAIL)
 
+#define USBC_PDCFG2_SOP                 BIT(0)
+#define USBC_PDCFG2_SOP_P               BIT(1)
+#define USBC_PDCFG2_SOP_PP              BIT(2)
+#define USBC_PDCFG2_SOP_P_DEBUG         BIT(3)
+#define USBC_PDCFG2_SOP_PP_DEBUG        BIT(4)
+
+#define USBC_PDCFG3_DATAROLE_SHIFT      1
+#define USBC_PDCFG3_SOP_SHIFT           2
+
+#define USBC_RXSTATUS_RXCLEAR           BIT(0)
+#define USBC_RXSTATUS_RXDATA            BIT(7)
+
+#define USBC_RXINFO_RXBYTES(i)          (((i) >> 3) & 0x1f)
+
+#define USBC_TXCMD_BUF_RDY              BIT(0)
+#define USBC_TXCMD_START                BIT(1)
+#define USBC_TXCMD_NOP                  (0 << 5)
+#define USBC_TXCMD_MSG                  (1 << 5)
+#define USBC_TXCMD_CR                   (2 << 5)
+#define USBC_TXCMD_HR                   (3 << 5)
+#define USBC_TXCMD_BIST                 (4 << 5)
+
+#define USBC_TXINFO_RETRIES(d)          (d << 3)
+
 struct wcove_typec {
         struct mutex lock; /* device lock */
         struct device *dev;
         struct regmap *regmap;
-        struct typec_port *port;
-        struct typec_capability cap;
-        struct typec_partner *partner;
+        guid_t guid;
+
+        bool vbus;
+
+        struct tcpc_dev tcpc;
+        struct tcpm_port *tcpm;
 };
 
+#define tcpc_to_wcove(_tcpc_) container_of(_tcpc_, struct wcove_typec, tcpc)
+
 enum wcove_typec_func {
         WCOVE_FUNC_DRIVE_VBUS = 1,
         WCOVE_FUNC_ORIENTATION,
@@ -105,8 +174,7 @@ enum wcove_typec_role {
         WCOVE_ROLE_DEVICE,
 };
 
-static guid_t guid = GUID_INIT(0x482383f0, 0x2876, 0x4e49,
-                               0x86, 0x85, 0xdb, 0x66, 0x21, 0x1a, 0xf0, 0x37);
+#define WCOVE_DSM_UUID          "482383f0-2876-4e49-8685-db66211af037"
 
 static int wcove_typec_func(struct wcove_typec *wcove,
                             enum wcove_typec_func func, int param)
@@ -118,7 +186,7 @@ static int wcove_typec_func(struct wcove_typec *wcove,
         tmp.type = ACPI_TYPE_INTEGER;
         tmp.integer.value = param;
 
-        obj = acpi_evaluate_dsm(ACPI_HANDLE(wcove->dev), &guid, 1, func,
+        obj = acpi_evaluate_dsm(ACPI_HANDLE(wcove->dev), &wcove->guid, 1, func,
                                 &argv4);
         if (!obj) {
                 dev_err(wcove->dev, "%s: failed to evaluate _DSM\n", __func__);
@@ -129,158 +197,349 @@ static int wcove_typec_func(struct wcove_typec *wcove,
         return 0;
 }
 
-static irqreturn_t wcove_typec_irq(int irq, void *data)
+static int wcove_init(struct tcpc_dev *tcpc)
 {
-        enum typec_role role = TYPEC_SINK;
-        struct typec_partner_desc partner;
-        struct wcove_typec *wcove = data;
-        unsigned int cc1_ctrl;
-        unsigned int cc2_ctrl;
-        unsigned int cc_irq1;
-        unsigned int cc_irq2;
-        unsigned int status1;
-        unsigned int status2;
+        struct wcove_typec *wcove = tcpc_to_wcove(tcpc);
         int ret;
 
-        mutex_lock(&wcove->lock);
-
-        ret = regmap_read(wcove->regmap, USBC_IRQ1, &cc_irq1);
+        /* Unmask everything */
+        ret = regmap_write(wcove->regmap, USBC_IRQMASK1, 0);
         if (ret)
-                goto err;
+                return ret;
 
-        ret = regmap_read(wcove->regmap, USBC_IRQ2, &cc_irq2);
-        if (ret)
-                goto err;
+        return regmap_write(wcove->regmap, USBC_IRQMASK2, 0);
+}
 
-        ret = regmap_read(wcove->regmap, USBC_STATUS1, &status1);
-        if (ret)
-                goto err;
+static int wcove_get_vbus(struct tcpc_dev *tcpc)
+{
+        struct wcove_typec *wcove = tcpc_to_wcove(tcpc);
+        unsigned int cc1ctrl;
+        int ret;
 
-        ret = regmap_read(wcove->regmap, USBC_STATUS2, &status2);
+        ret = regmap_read(wcove->regmap, USBC_CC1_CTRL, &cc1ctrl);
         if (ret)
-                goto err;
+                return ret;
 
-        ret = regmap_read(wcove->regmap, USBC_CC1_CTRL, &cc1_ctrl);
-        if (ret)
-                goto err;
+        wcove->vbus = !!(cc1ctrl & USBC_CC_CTRL_VBUSOK);
 
-        ret = regmap_read(wcove->regmap, USBC_CC2_CTRL, &cc2_ctrl);
-        if (ret)
-                goto err;
+        return wcove->vbus;
+}
 
-        if (cc_irq1) {
-                if (cc_irq1 & USBC_IRQ1_OVERTEMP)
-                        dev_err(wcove->dev, "VCONN Switch Over Temperature!\n");
-                if (cc_irq1 & USBC_IRQ1_SHORT)
-                        dev_err(wcove->dev, "VCONN Switch Short Circuit!\n");
-                ret = regmap_write(wcove->regmap, USBC_IRQ1, cc_irq1);
-                if (ret)
-                        goto err;
-        }
+static int wcove_set_vbus(struct tcpc_dev *tcpc, bool on, bool sink)
+{
+        struct wcove_typec *wcove = tcpc_to_wcove(tcpc);
 
-        if (cc_irq2) {
-                ret = regmap_write(wcove->regmap, USBC_IRQ2, cc_irq2);
-                if (ret)
-                        goto err;
-                /*
-                 * Ignoring any PD communication interrupts until the PD support
-                 * is available
-                 */
-                if (cc_irq2 & ~USBC_IRQ2_CC_CHANGE) {
-                        dev_WARN(wcove->dev, "USB PD handling missing\n");
-                        goto err;
+        return wcove_typec_func(wcove, WCOVE_FUNC_DRIVE_VBUS, on);
+}
+
+static int wcove_set_vconn(struct tcpc_dev *tcpc, bool on)
+{
+        struct wcove_typec *wcove = tcpc_to_wcove(tcpc);
+
+        return wcove_typec_func(wcove, WCOVE_FUNC_DRIVE_VCONN, on);
+}
+
+static enum typec_cc_status wcove_to_typec_cc(unsigned int cc)
+{
+        if (cc & UCSC_CC_STATUS_SNK_RP) {
+                if (cc & UCSC_CC_STATUS_PWRDEFSNK)
+                        return TYPEC_CC_RP_DEF;
+                else if (cc & UCSC_CC_STATUS_PWR_1P5A_SNK)
+                        return TYPEC_CC_RP_1_5;
+                else if (cc & UCSC_CC_STATUS_PWR_3A_SNK)
+                        return TYPEC_CC_RP_3_0;
+        } else {
+                switch (UCSC_CC_STATUS_RX(cc)) {
+                case USBC_CC_STATUS_RD:
+                        return TYPEC_CC_RD;
+                case USBC_CC_STATUS_RA:
+                        return TYPEC_CC_RA;
+                default:
+                        break;
                 }
         }
+        return TYPEC_CC_OPEN;
+}
 
-        if (status1 & USBC_STATUS1_DET_ONGOING)
-                goto out;
+static int wcove_get_cc(struct tcpc_dev *tcpc, enum typec_cc_status *cc1,
+                        enum typec_cc_status *cc2)
+{
+        struct wcove_typec *wcove = tcpc_to_wcove(tcpc);
+        unsigned int cc1_status;
+        unsigned int cc2_status;
+        int ret;
 
-        if (USBC_STATUS1_RSLT(status1) == USBC_RSLT_NOTHING) {
-                if (wcove->partner) {
-                        typec_unregister_partner(wcove->partner);
-                        wcove->partner = NULL;
-                }
+        ret = regmap_read(wcove->regmap, USBC_CC1_STATUS, &cc1_status);
+        if (ret)
+                return ret;
 
-                wcove_typec_func(wcove, WCOVE_FUNC_ORIENTATION,
-                                 WCOVE_ORIENTATION_NORMAL);
+        ret = regmap_read(wcove->regmap, USBC_CC2_STATUS, &cc2_status);
+        if (ret)
+                return ret;
 
-                /* This makes sure the device controller is disconnected */
-                wcove_typec_func(wcove, WCOVE_FUNC_ROLE, WCOVE_ROLE_HOST);
+        *cc1 = wcove_to_typec_cc(cc1_status);
+        *cc2 = wcove_to_typec_cc(cc2_status);
 
-                /* Port to default role */
-                typec_set_data_role(wcove->port, TYPEC_DEVICE);
-                typec_set_pwr_role(wcove->port, TYPEC_SINK);
-                typec_set_pwr_opmode(wcove->port, TYPEC_PWR_MODE_USB);
+        return 0;
+}
 
-                goto out;
-        }
+static int wcove_set_cc(struct tcpc_dev *tcpc, enum typec_cc_status cc)
+{
+        /* XXX: Relying on the HW FSM to configure things correctly for now */
+        return 0;
+}
 
-        if (wcove->partner)
-                goto out;
+static int wcove_set_polarity(struct tcpc_dev *tcpc, enum typec_cc_polarity pol)
+{
+        struct wcove_typec *wcove = tcpc_to_wcove(tcpc);
 
-        switch (USBC_STATUS1_ORIENT(status1)) {
-        case USBC_ORIENT_NORMAL:
-                wcove_typec_func(wcove, WCOVE_FUNC_ORIENTATION,
-                                 WCOVE_ORIENTATION_NORMAL);
-                break;
-        case USBC_ORIENT_REVERSE:
-                wcove_typec_func(wcove, WCOVE_FUNC_ORIENTATION,
-                                 WCOVE_ORIENTATION_REVERSE);
-        default:
-                break;
+        return wcove_typec_func(wcove, WCOVE_FUNC_ORIENTATION, pol);
+}
+
+static int wcove_set_current_limit(struct tcpc_dev *tcpc, u32 max_ma, u32 mv)
+{
+        return 0;
+}
+
+static int wcove_set_roles(struct tcpc_dev *tcpc, bool attached,
+                           enum typec_role role, enum typec_data_role data)
+{
+        struct wcove_typec *wcove = tcpc_to_wcove(tcpc);
+        unsigned int val;
+        int ret;
+
+        ret = wcove_typec_func(wcove, WCOVE_FUNC_ROLE, data == TYPEC_HOST ?
+                               WCOVE_ROLE_HOST : WCOVE_ROLE_DEVICE);
+        if (ret)
+                return ret;
+
+        val = role;
+        val |= data << USBC_PDCFG3_DATAROLE_SHIFT;
+        val |= PD_REV20 << USBC_PDCFG3_SOP_SHIFT;
+
+        return regmap_write(wcove->regmap, USBC_PDCFG3, val);
+}
+
+static int wcove_set_pd_rx(struct tcpc_dev *tcpc, bool on)
+{
+        struct wcove_typec *wcove = tcpc_to_wcove(tcpc);
+
+        return regmap_write(wcove->regmap, USBC_PDCFG2,
+                            on ? USBC_PDCFG2_SOP : 0);
+}
+
+static int wcove_pd_transmit(struct tcpc_dev *tcpc,
+                             enum tcpm_transmit_type type,
+                             const struct pd_message *msg)
+{
+        struct wcove_typec *wcove = tcpc_to_wcove(tcpc);
+        unsigned int info = 0;
+        unsigned int cmd;
+        int ret;
+
+        ret = regmap_read(wcove->regmap, USBC_TXCMD, &cmd);
+        if (ret)
+                return ret;
+
+        if (!(cmd & USBC_TXCMD_BUF_RDY)) {
+                dev_warn(wcove->dev, "%s: Last transmission still ongoing!",
+                         __func__);
+                return -EBUSY;
         }
 
-        memset(&partner, 0, sizeof(partner));
+        if (msg) {
+                const u8 *data = (void *)msg;
+                int i;
+
+                for (i = 0; i < pd_header_cnt(msg->header) * 4 + 2; i++) {
+                        ret = regmap_write(wcove->regmap, USBC_TX_DATA + i,
+                                           data[i]);
+                        if (ret)
+                                return ret;
+                }
+        }
 
-        switch (USBC_STATUS1_RSLT(status1)) {
-        case USBC_RSLT_SRC_DEFAULT:
-                typec_set_pwr_opmode(wcove->port, TYPEC_PWR_MODE_USB);
+        switch (type) {
+        case TCPC_TX_SOP:
+        case TCPC_TX_SOP_PRIME:
+        case TCPC_TX_SOP_PRIME_PRIME:
+        case TCPC_TX_SOP_DEBUG_PRIME:
+        case TCPC_TX_SOP_DEBUG_PRIME_PRIME:
+                info = type + 1;
+                cmd = USBC_TXCMD_MSG;
                 break;
-        case USBC_RSLT_SRC_1_5A:
-                typec_set_pwr_opmode(wcove->port, TYPEC_PWR_MODE_1_5A);
+        case TCPC_TX_HARD_RESET:
+                cmd = USBC_TXCMD_HR;
                 break;
-        case USBC_RSLT_SRC_3_0A:
-                typec_set_pwr_opmode(wcove->port, TYPEC_PWR_MODE_3_0A);
+        case TCPC_TX_CABLE_RESET:
+                cmd = USBC_TXCMD_CR;
                 break;
-        case USBC_RSLT_SNK:
-                role = TYPEC_SOURCE;
+        case TCPC_TX_BIST_MODE_2:
+                cmd = USBC_TXCMD_BIST;
                 break;
-        case USBC_RSLT_DEBUG_ACC:
-                partner.accessory = TYPEC_ACCESSORY_DEBUG;
+        default:
+                return -EINVAL;
+        }
+
+        /* NOTE Setting maximum number of retries (7) */
+        ret = regmap_write(wcove->regmap, USBC_TXINFO,
+                           info | USBC_TXINFO_RETRIES(7));
+        if (ret)
+                return ret;
+
+        return regmap_write(wcove->regmap, USBC_TXCMD, cmd | USBC_TXCMD_START);
+}
+
+static int wcove_start_drp_toggling(struct tcpc_dev *tcpc,
+                                    enum typec_cc_status cc)
+{
+        struct wcove_typec *wcove = tcpc_to_wcove(tcpc);
+        unsigned int usbc_ctrl;
+
+        usbc_ctrl = USBC_CONTROL1_MODE_DRP | USBC_CONTROL1_DRPTOGGLE_RANDOM;
+
+        switch (cc) {
+        case TYPEC_CC_RP_1_5:
+                usbc_ctrl |= USBC_CONTROL1_CURSRC_UA_180;
                 break;
-        case USBC_RSLT_AUDIO_ACC:
-                partner.accessory = TYPEC_ACCESSORY_AUDIO;
+        case TYPEC_CC_RP_3_0:
+                usbc_ctrl |= USBC_CONTROL1_CURSRC_UA_330;
                 break;
         default:
-                dev_WARN(wcove->dev, "%s Undefined result\n", __func__);
-                goto err;
+                usbc_ctrl |= USBC_CONTROL1_CURSRC_UA_80;
+                break;
         }
 
-        if (role == TYPEC_SINK) {
-                wcove_typec_func(wcove, WCOVE_FUNC_ROLE, WCOVE_ROLE_DEVICE);
-                typec_set_data_role(wcove->port, TYPEC_DEVICE);
-                typec_set_pwr_role(wcove->port, TYPEC_SINK);
-        } else {
-                wcove_typec_func(wcove, WCOVE_FUNC_ROLE, WCOVE_ROLE_HOST);
-                typec_set_pwr_role(wcove->port, TYPEC_SOURCE);
-                typec_set_data_role(wcove->port, TYPEC_HOST);
+        return regmap_write(wcove->regmap, USBC_CONTROL1, usbc_ctrl);
+}
+
+static int wcove_read_rx_buffer(struct wcove_typec *wcove, void *msg)
+{
+        unsigned int info;
+        int ret;
+        int i;
+
+        ret = regmap_read(wcove->regmap, USBC_RXINFO, &info);
+        if (ret)
+                return ret;
+
+        /* FIXME: Check that USBC_RXINFO_RXBYTES(info) matches the header */
+
+        for (i = 0; i < USBC_RXINFO_RXBYTES(info); i++) {
+                ret = regmap_read(wcove->regmap, USBC_RX_DATA + i, msg + i);
+                if (ret)
+                        return ret;
         }
 
-        wcove->partner = typec_register_partner(wcove->port, &partner);
-        if (!wcove->partner)
-                dev_err(wcove->dev, "failed register partner\n");
-out:
-        /* If either CC pins is requesting VCONN, we turn it on */
-        if ((cc1_ctrl & USBC_CC_CTRL_VCONN_EN) ||
-            (cc2_ctrl & USBC_CC_CTRL_VCONN_EN))
-                wcove_typec_func(wcove, WCOVE_FUNC_DRIVE_VCONN, true);
-        else
+        return regmap_write(wcove->regmap, USBC_RXSTATUS,
+                            USBC_RXSTATUS_RXCLEAR);
+}
+
+static irqreturn_t wcove_typec_irq(int irq, void *data)
+{
+        struct wcove_typec *wcove = data;
+        unsigned int usbc_irq1 = 0;
+        unsigned int usbc_irq2 = 0;
+        unsigned int cc1ctrl;
+        int ret;
+
+        mutex_lock(&wcove->lock);
+
+        /* Read.. */
+        ret = regmap_read(wcove->regmap, USBC_IRQ1, &usbc_irq1);
+        if (ret)
+                goto err;
+
+        ret = regmap_read(wcove->regmap, USBC_IRQ2, &usbc_irq2);
+        if (ret)
+                goto err;
+
+        ret = regmap_read(wcove->regmap, USBC_CC1_CTRL, &cc1ctrl);
+        if (ret)
+                goto err;
+
+        if (!wcove->tcpm)
+                goto err;
+
+        /* ..check.. */
+        if (usbc_irq1 & USBC_IRQ1_OVERTEMP) {
+                dev_err(wcove->dev, "VCONN Switch Over Temperature!\n");
+                wcove_typec_func(wcove, WCOVE_FUNC_DRIVE_VCONN, false);
+                /* REVISIT: Report an error? */
+        }
+
+        if (usbc_irq1 & USBC_IRQ1_SHORT) {
+                dev_err(wcove->dev, "VCONN Switch Short Circuit!\n");
                 wcove_typec_func(wcove, WCOVE_FUNC_DRIVE_VCONN, false);
+                /* REVISIT: Report an error? */
+        }
+
+        if (wcove->vbus != !!(cc1ctrl & USBC_CC_CTRL_VBUSOK))
+                tcpm_vbus_change(wcove->tcpm);
+
+        /* REVISIT: See if tcpm code can be made to consider Type-C HW FSMs */
+        if (usbc_irq2 & USBC_IRQ2_CC_CHANGE)
+                tcpm_cc_change(wcove->tcpm);
+
+        if (usbc_irq2 & USBC_IRQ2_RX_PD) {
+                unsigned int status;
+
+                /*
+                 * FIXME: Need to check if TX is ongoing and report
+                 * TX_DIREGARDED if needed?
+                 */
+
+                ret = regmap_read(wcove->regmap, USBC_RXSTATUS, &status);
+                if (ret)
+                        goto err;
+
+                /* Flush all buffers */
+                while (status & USBC_RXSTATUS_RXDATA) {
+                        struct pd_message msg;
+
+                        ret = wcove_read_rx_buffer(wcove, &msg);
+                        if (ret) {
+                                dev_err(wcove->dev, "%s: RX read failed\n",
+                                        __func__);
+                                goto err;
+                        }
+
+                        tcpm_pd_receive(wcove->tcpm, &msg);
+
+                        ret = regmap_read(wcove->regmap, USBC_RXSTATUS,
+                                          &status);
+                        if (ret)
+                                goto err;
+                }
+        }
+
+        if (usbc_irq2 & USBC_IRQ2_RX_HR)
+                tcpm_pd_hard_reset(wcove->tcpm);
+
+        /* REVISIT: if (usbc_irq2 & USBC_IRQ2_RX_CR) */
+
+        if (usbc_irq2 & USBC_IRQ2_TX_SUCCESS)
+                tcpm_pd_transmit_complete(wcove->tcpm, TCPC_TX_SUCCESS);
+
+        if (usbc_irq2 & USBC_IRQ2_TX_FAIL)
+                tcpm_pd_transmit_complete(wcove->tcpm, TCPC_TX_FAILED);
 
-        /* Relying on the FSM to know when we need to drive VBUS. */
-        wcove_typec_func(wcove, WCOVE_FUNC_DRIVE_VBUS,
-                         !!(status2 & USBC_STATUS2_VBUS_REQ));
 err:
+        /* ..and clear. */
+        if (usbc_irq1) {
+                ret = regmap_write(wcove->regmap, USBC_IRQ1, usbc_irq1);
+                if (ret)
+                        dev_WARN(wcove->dev, "%s failed to clear IRQ1\n",
+                                 __func__);
+        }
+
+        if (usbc_irq2) {
+                ret = regmap_write(wcove->regmap, USBC_IRQ2, usbc_irq2);
+                if (ret)
+                        dev_WARN(wcove->dev, "%s failed to clear IRQ2\n",
+                                 __func__);
+        }
+
         /* REVISIT: Clear WhiskeyCove CHGR Type-C interrupt */
         regmap_write(wcove->regmap, WCOVE_CHGRIRQ0, BIT(5));
 
@@ -288,11 +547,41 @@ err:
         return IRQ_HANDLED;
 }
 
+/*
+ * The following power levels should be safe to use with Joule board.
+ */
+static const u32 src_pdo[] = {
+        PDO_FIXED(5000, 1500, PDO_FIXED_DUAL_ROLE | PDO_FIXED_DATA_SWAP |
+                  PDO_FIXED_USB_COMM),
+};
+
+static const u32 snk_pdo[] = {
+        PDO_FIXED(12000, 3000, PDO_FIXED_DUAL_ROLE | PDO_FIXED_DATA_SWAP |
+                  PDO_FIXED_USB_COMM),
+        PDO_BATT(4750, 12000, 15000),
+        PDO_VAR(4750, 12000, 3000),
+};
+
+static struct tcpc_config wcove_typec_config = {
+        .src_pdo = src_pdo,
+        .nr_src_pdo = ARRAY_SIZE(src_pdo),
+        .snk_pdo = snk_pdo,
+        .nr_snk_pdo = ARRAY_SIZE(snk_pdo),
+
+        .max_snk_mv = 12000,
+        .max_snk_ma = 3000,
+        .max_snk_mw = 36000,
+        .operating_snk_mw = 15000,
+
+        .type = TYPEC_PORT_DRP,
+        .default_role = TYPEC_SINK,
+};
+
 static int wcove_typec_probe(struct platform_device *pdev)
 {
         struct intel_soc_pmic *pmic = dev_get_drvdata(pdev->dev.parent);
         struct wcove_typec *wcove;
-        unsigned int val;
+        int irq;
         int ret;
 
         wcove = devm_kzalloc(&pdev->dev, sizeof(*wcove), GFP_KERNEL);
@@ -303,43 +592,47 @@ static int wcove_typec_probe(struct platform_device *pdev)
         wcove->dev = &pdev->dev;
         wcove->regmap = pmic->regmap;
 
-        ret = regmap_irq_get_virq(pmic->irq_chip_data_chgr,
+        irq = regmap_irq_get_virq(pmic->irq_chip_data_chgr,
                                   platform_get_irq(pdev, 0));
-        if (ret < 0)
-                return ret;
+        if (irq < 0)
+                return irq;
 
-        ret = devm_request_threaded_irq(&pdev->dev, ret, NULL,
-                                        wcove_typec_irq, IRQF_ONESHOT,
-                                        "wcove_typec", wcove);
+        ret = guid_parse(WCOVE_DSM_UUID, &wcove->guid);
         if (ret)
                 return ret;
 
-        if (!acpi_check_dsm(ACPI_HANDLE(&pdev->dev), &guid, 0, 0x1f)) {
+        if (!acpi_check_dsm(ACPI_HANDLE(&pdev->dev), &wcove->guid, 0, 0x1f)) {
                 dev_err(&pdev->dev, "Missing _DSM functions\n");
                 return -ENODEV;
         }
 
-        wcove->cap.type = TYPEC_PORT_DRP;
-        wcove->cap.revision = USB_TYPEC_REV_1_1;
-        wcove->cap.prefer_role = TYPEC_NO_PREFERRED_ROLE;
+        wcove->tcpc.init = wcove_init;
+        wcove->tcpc.get_vbus = wcove_get_vbus;
+        wcove->tcpc.set_vbus = wcove_set_vbus;
+        wcove->tcpc.set_cc = wcove_set_cc;
+        wcove->tcpc.get_cc = wcove_get_cc;
+        wcove->tcpc.set_polarity = wcove_set_polarity;
+        wcove->tcpc.set_vconn = wcove_set_vconn;
+        wcove->tcpc.set_current_limit = wcove_set_current_limit;
+        wcove->tcpc.start_drp_toggling = wcove_start_drp_toggling;
 
-        /* Make sure the PD PHY is disabled until USB PD is available */
-        regmap_read(wcove->regmap, USBC_CONTROL3, &val);
-        regmap_write(wcove->regmap, USBC_CONTROL3, val | USBC_CONTROL3_PD_DIS);
+        wcove->tcpc.set_pd_rx = wcove_set_pd_rx;
+        wcove->tcpc.set_roles = wcove_set_roles;
+        wcove->tcpc.pd_transmit = wcove_pd_transmit;
 
-        /* DRP mode without accessory support */
-        regmap_read(wcove->regmap, USBC_CONTROL1, &val);
-        regmap_write(wcove->regmap, USBC_CONTROL1, USBC_CONTROL1_MODE_DRP(val));
+        wcove->tcpc.config = &wcove_typec_config;
 
-        wcove->port = typec_register_port(&pdev->dev, &wcove->cap);
-        if (!wcove->port)
-                return -ENODEV;
+        wcove->tcpm = tcpm_register_port(wcove->dev, &wcove->tcpc);
+        if (IS_ERR(wcove->tcpm))
+                return PTR_ERR(wcove->tcpm);
 
-        /* Unmask everything */
-        regmap_read(wcove->regmap, USBC_IRQMASK1, &val);
-        regmap_write(wcove->regmap, USBC_IRQMASK1, val & ~USBC_IRQMASK1_ALL);
-        regmap_read(wcove->regmap, USBC_IRQMASK2, &val);
-        regmap_write(wcove->regmap, USBC_IRQMASK2, val & ~USBC_IRQMASK2_ALL);
+        ret = devm_request_threaded_irq(&pdev->dev, irq, NULL,
+                                        wcove_typec_irq, IRQF_ONESHOT,
+                                        "wcove_typec", wcove);
+        if (ret) {
+                tcpm_unregister_port(wcove->tcpm);
+                return ret;
+        }
 
         platform_set_drvdata(pdev, wcove);
         return 0;
@@ -356,8 +649,8 @@ static int wcove_typec_remove(struct platform_device *pdev)
         regmap_read(wcove->regmap, USBC_IRQMASK2, &val);
         regmap_write(wcove->regmap, USBC_IRQMASK2, val | USBC_IRQMASK2_ALL);
 
-        typec_unregister_partner(wcove->partner);
-        typec_unregister_port(wcove->port);
+        tcpm_unregister_port(wcove->tcpm);
+
         return 0;
 }
 
diff --git a/drivers/usb/typec/ucsi/trace.c b/drivers/usb/typec/ucsi/trace.c
index 006f65c72a34..d9a6ff6e673c 100644
--- a/drivers/usb/typec/ucsi/trace.c
+++ b/drivers/usb/typec/ucsi/trace.c
@@ -1,2 +1,3 @@
+// SPDX-License-Identifier: GPL-2.0
 #define CREATE_TRACE_POINTS
 #include "trace.h"
diff --git a/drivers/usb/typec/ucsi/ucsi.c b/drivers/usb/typec/ucsi/ucsi.c
index 714c5bcedf2b..79046fe66426 100644
--- a/drivers/usb/typec/ucsi/ucsi.c
+++ b/drivers/usb/typec/ucsi/ucsi.c
@@ -1,12 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * USB Type-C Connector System Software Interface driver
  *
  * Copyright (C) 2017, Intel Corporation
  * Author: Heikki Krogerus <heikki.krogerus@linux.intel.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/completion.h>
diff --git a/drivers/usb/typec/ucsi/ucsi_acpi.c b/drivers/usb/typec/ucsi/ucsi_acpi.c
index cabd47612b0a..44eb4e1ea817 100644
--- a/drivers/usb/typec/ucsi/ucsi_acpi.c
+++ b/drivers/usb/typec/ucsi/ucsi_acpi.c
@@ -1,12 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * UCSI ACPI driver
  *
  * Copyright (C) 2017, Intel Corporation
  * Author: Heikki Krogerus <heikki.krogerus@linux.intel.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>
diff --git a/drivers/usb/usb-skeleton.c b/drivers/usb/usb-skeleton.c
index bb0bd732e29a..26ca0ec01fd5 100644
--- a/drivers/usb/usb-skeleton.c
+++ b/drivers/usb/usb-skeleton.c
@@ -1,15 +1,11 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * USB Skeleton driver - 2.2
  *
  * Copyright (C) 2001-2004 Greg Kroah-Hartman (greg@kroah.com)
  *
- *      This program is free software; you can redistribute it and/or
- *      modify it under the terms of the GNU General Public License as
- *      published by the Free Software Foundation, version 2.
- *
  * This driver is based on the 2.6.3 version of drivers/usb/usb-skeleton.c
  * but has been rewritten to be easier to read and use.
- *
  */
 
 #include <linux/kernel.h>
diff --git a/drivers/usb/usbip/stub.h b/drivers/usb/usbip/stub.h
index 910f027773aa..14a72357800a 100644
--- a/drivers/usb/usbip/stub.h
+++ b/drivers/usb/usbip/stub.h
@@ -1,20 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright (C) 2003-2008 Takahiro Hirofuchi
- *
- * This 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.
- *
- * This is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
- * USA.
  */
 
 #ifndef __USBIP_STUB_H
diff --git a/drivers/usb/usbip/stub_dev.c b/drivers/usb/usbip/stub_dev.c
index c653ce533430..a3df8ee82faf 100644
--- a/drivers/usb/usbip/stub_dev.c
+++ b/drivers/usb/usbip/stub_dev.c
@@ -1,20 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright (C) 2003-2008 Takahiro Hirofuchi
- *
- * This 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.
- *
- * This is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
- * USA.
  */
 
 #include <linux/device.h>
diff --git a/drivers/usb/usbip/stub_main.c b/drivers/usb/usbip/stub_main.c
index 7170404e8979..4f48b306713f 100644
--- a/drivers/usb/usbip/stub_main.c
+++ b/drivers/usb/usbip/stub_main.c
@@ -1,20 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright (C) 2003-2008 Takahiro Hirofuchi
- *
- * This 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.
- *
- * This is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
- * USA.
  */
 
 #include <linux/string.h>
diff --git a/drivers/usb/usbip/stub_rx.c b/drivers/usb/usbip/stub_rx.c
index 191b176ffedf..536e037f541f 100644
--- a/drivers/usb/usbip/stub_rx.c
+++ b/drivers/usb/usbip/stub_rx.c
@@ -1,20 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright (C) 2003-2008 Takahiro Hirofuchi
- *
- * This 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.
- *
- * This is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
- * USA.
  */
 
 #include <asm/byteorder.h>
diff --git a/drivers/usb/usbip/stub_tx.c b/drivers/usb/usbip/stub_tx.c
index be50cef645d8..b18bce96c212 100644
--- a/drivers/usb/usbip/stub_tx.c
+++ b/drivers/usb/usbip/stub_tx.c
@@ -1,20 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright (C) 2003-2008 Takahiro Hirofuchi
- *
- * This 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.
- *
- * This is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
- * USA.
  */
 
 #include <linux/kthread.h>
diff --git a/drivers/usb/usbip/usbip_common.c b/drivers/usb/usbip/usbip_common.c
index 2281f3562870..f7978933b402 100644
--- a/drivers/usb/usbip/usbip_common.c
+++ b/drivers/usb/usbip/usbip_common.c
@@ -1,22 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright (C) 2003-2008 Takahiro Hirofuchi
  * Copyright (C) 2015-2016 Samsung Electronics
  *               Krzysztof Opasiak <k.opasiak@samsung.com>
- *
- * This 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.
- *
- * This is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
- * USA.
  */
 
 #include <asm/byteorder.h>
diff --git a/drivers/usb/usbip/usbip_common.h b/drivers/usb/usbip/usbip_common.h
index 3050fc99a417..e5de35c8c505 100644
--- a/drivers/usb/usbip/usbip_common.h
+++ b/drivers/usb/usbip/usbip_common.h
@@ -1,22 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright (C) 2003-2008 Takahiro Hirofuchi
  * Copyright (C) 2015-2016 Samsung Electronics
  *               Krzysztof Opasiak <k.opasiak@samsung.com>
- *
- * This 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.
- *
- * This is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
- * USA.
  */
 
 #ifndef __USBIP_COMMON_H
diff --git a/drivers/usb/usbip/usbip_event.c b/drivers/usb/usbip/usbip_event.c
index f1635662c299..5b4c0864ad92 100644
--- a/drivers/usb/usbip/usbip_event.c
+++ b/drivers/usb/usbip/usbip_event.c
@@ -1,21 +1,7 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright (C) 2003-2008 Takahiro Hirofuchi
  * Copyright (C) 2015 Nobuo Iwata
- *
- * This 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.
- *
- * This is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
- * USA.
  */
 
 #include <linux/kthread.h>
diff --git a/drivers/usb/usbip/vhci.h b/drivers/usb/usbip/vhci.h
index 5cfb59e98e44..5659dce1526e 100644
--- a/drivers/usb/usbip/vhci.h
+++ b/drivers/usb/usbip/vhci.h
@@ -1,12 +1,7 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright (C) 2003-2008 Takahiro Hirofuchi
  * Copyright (C) 2015 Nobuo Iwata
- *
- * This 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.
- *
  */
 
 #ifndef __USBIP_VHCI_H
diff --git a/drivers/usb/usbip/vhci_hcd.c b/drivers/usb/usbip/vhci_hcd.c
index 11b9a22799cc..713e94170963 100644
--- a/drivers/usb/usbip/vhci_hcd.c
+++ b/drivers/usb/usbip/vhci_hcd.c
@@ -1,21 +1,7 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright (C) 2003-2008 Takahiro Hirofuchi
  * Copyright (C) 2015-2016 Nobuo Iwata
- *
- * This 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.
- *
- * This is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
- * USA.
  */
 
 #include <linux/init.h>
diff --git a/drivers/usb/usbip/vhci_rx.c b/drivers/usb/usbip/vhci_rx.c
index ef2f2d5ca6b2..90577e8b2282 100644
--- a/drivers/usb/usbip/vhci_rx.c
+++ b/drivers/usb/usbip/vhci_rx.c
@@ -1,20 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright (C) 2003-2008 Takahiro Hirofuchi
- *
- * This 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.
- *
- * This is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
- * USA.
  */
 
 #include <linux/kthread.h>
diff --git a/drivers/usb/usbip/vhci_sysfs.c b/drivers/usb/usbip/vhci_sysfs.c
index 1b9f60a22e0b..e78f7472cac4 100644
--- a/drivers/usb/usbip/vhci_sysfs.c
+++ b/drivers/usb/usbip/vhci_sysfs.c
@@ -1,21 +1,7 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright (C) 2003-2008 Takahiro Hirofuchi
  * Copyright (C) 2015-2016 Nobuo Iwata
- *
- * This 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.
- *
- * This is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
- * USA.
  */
 
 #include <linux/kthread.h>
diff --git a/drivers/usb/usbip/vhci_tx.c b/drivers/usb/usbip/vhci_tx.c
index 3e7878fe2fd4..d625a2ff4b71 100644
--- a/drivers/usb/usbip/vhci_tx.c
+++ b/drivers/usb/usbip/vhci_tx.c
@@ -1,20 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright (C) 2003-2008 Takahiro Hirofuchi
- *
- * This 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.
- *
- * This is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
- * USA.
  */
 
 #include <linux/kthread.h>
diff --git a/drivers/usb/usbip/vudc.h b/drivers/usb/usbip/vudc.h
index 25e01b09c4c3..cf968192e59f 100644
--- a/drivers/usb/usbip/vudc.h
+++ b/drivers/usb/usbip/vudc.h
@@ -1,21 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright (C) 2015 Karol Kosik <karo9@interia.eu>
  * Copyright (C) 2015-2016 Samsung Electronics
  *               Igor Kotrasinski <i.kotrasinsk@samsung.com>
  *               Krzysztof Opasiak <k.opasiak@samsung.com>
- *
- * 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.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __USBIP_VUDC_H
@@ -104,7 +92,7 @@ struct vudc {
 
         struct usbip_device ud;
         struct transfer_timer tr_timer;
-        struct timeval start_time;
+        struct timespec64 start_time;
 
         struct list_head urb_queue;
 
diff --git a/drivers/usb/usbip/vudc_dev.c b/drivers/usb/usbip/vudc_dev.c
index 968471b62cbc..1b9a4f87db59 100644
--- a/drivers/usb/usbip/vudc_dev.c
+++ b/drivers/usb/usbip/vudc_dev.c
@@ -1,21 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright (C) 2015 Karol Kosik <karo9@interia.eu>
  * Copyright (C) 2015-2016 Samsung Electronics
  *               Igor Kotrasinski <i.kotrasinsk@samsung.com>
  *               Krzysztof Opasiak <k.opasiak@samsung.com>
- *
- * 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.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <linux/device.h>
@@ -135,16 +123,15 @@ struct vep *vudc_find_endpoint(struct vudc *udc, u8 address)
 
 /* gadget ops */
 
-/* FIXME - this will probably misbehave when suspend/resume is added */
 static int vgadget_get_frame(struct usb_gadget *_gadget)
 {
-        struct timeval now;
+        struct timespec64 now;
         struct vudc *udc = usb_gadget_to_vudc(_gadget);
 
-        do_gettimeofday(&now);
+        ktime_get_ts64(&now);
         return ((now.tv_sec - udc->start_time.tv_sec) * 1000 +
-                        (now.tv_usec - udc->start_time.tv_usec) / 1000)
-                        % 0x7FF;
+                (now.tv_nsec - udc->start_time.tv_nsec) / NSEC_PER_MSEC)
+                        & 0x7FF;
 }
 
 static int vgadget_set_selfpowered(struct usb_gadget *_gadget, int value)
diff --git a/drivers/usb/usbip/vudc_main.c b/drivers/usb/usbip/vudc_main.c
index 9e655714e389..3fc22037a82f 100644
--- a/drivers/usb/usbip/vudc_main.c
+++ b/drivers/usb/usbip/vudc_main.c
@@ -1,21 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright (C) 2015 Karol Kosik <karo9@interia.eu>
  * Copyright (C) 2015-2016 Samsung Electronics
  *               Igor Kotrasinski <i.kotrasinsk@samsung.com>
  *               Krzysztof Opasiak <k.opasiak@samsung.com>
- *
- * 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.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <linux/device.h>
diff --git a/drivers/usb/usbip/vudc_rx.c b/drivers/usb/usbip/vudc_rx.c
index e429b59f6f8a..df1e30989148 100644
--- a/drivers/usb/usbip/vudc_rx.c
+++ b/drivers/usb/usbip/vudc_rx.c
@@ -1,20 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright (C) 2015 Karol Kosik <karo9@interia.eu>
  * Copyright (C) 2015-2016 Samsung Electronics
  *               Igor Kotrasinski <i.kotrasinsk@samsung.com>
- *
- * 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.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <net/sock.h>
diff --git a/drivers/usb/usbip/vudc_sysfs.c b/drivers/usb/usbip/vudc_sysfs.c
index 0f98f2c7475f..1adc8af292ec 100644
--- a/drivers/usb/usbip/vudc_sysfs.c
+++ b/drivers/usb/usbip/vudc_sysfs.c
@@ -1,21 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright (C) 2015 Karol Kosik <karo9@interia.eu>
  * Copyright (C) 2015-2016 Samsung Electronics
  *               Igor Kotrasinski <i.kotrasinsk@samsung.com>
  *               Krzysztof Opasiak <k.opasiak@samsung.com>
- *
- * 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.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <linux/device.h>
@@ -161,7 +149,7 @@ static ssize_t store_sockfd(struct device *dev, struct device_attribute *attr,
                 udc->ud.status = SDEV_ST_USED;
                 spin_unlock_irq(&udc->ud.lock);
 
-                do_gettimeofday(&udc->start_time);
+                ktime_get_ts64(&udc->start_time);
                 v_start_timer(udc);
                 udc->connected = 1;
         } else {
diff --git a/drivers/usb/usbip/vudc_transfer.c b/drivers/usb/usbip/vudc_transfer.c
index 4cfd475ee865..c9db846ee4f6 100644
--- a/drivers/usb/usbip/vudc_transfer.c
+++ b/drivers/usb/usbip/vudc_transfer.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright (C) 2015 Karol Kosik <karo9@interia.eu>
  * Copyright (C) 2015-2016 Samsung Electronics
@@ -6,19 +7,6 @@
  * Based on dummy_hcd.c, which is:
  * Copyright (C) 2003 David Brownell
  * Copyright (C) 2003-2005 Alan Stern
- *
- * 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.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <linux/usb.h>
@@ -311,9 +299,9 @@ top:
         return sent;
 }
 
-static void v_timer(unsigned long _vudc)
+static void v_timer(struct timer_list *t)
 {
-        struct vudc *udc = (struct vudc *) _vudc;
+        struct vudc *udc = from_timer(udc, t, tr_timer.timer);
         struct transfer_timer *timer = &udc->tr_timer;
         struct urbp *urb_p, *tmp;
         unsigned long flags;
@@ -459,7 +447,7 @@ void v_init_timer(struct vudc *udc)
 {
         struct transfer_timer *t = &udc->tr_timer;
 
-        setup_timer(&t->timer, v_timer, (unsigned long) udc);
+        timer_setup(&t->timer, v_timer, 0);
         t->state = VUDC_TR_STOPPED;
 }
 
diff --git a/drivers/usb/usbip/vudc_tx.c b/drivers/usb/usbip/vudc_tx.c
index 234661782fa0..1440ae0919ec 100644
--- a/drivers/usb/usbip/vudc_tx.c
+++ b/drivers/usb/usbip/vudc_tx.c
@@ -1,20 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright (C) 2015 Karol Kosik <karo9@interia.eu>
  * Copyright (C) 2015-2016 Samsung Electronics
  *               Igor Kotrasinski <i.kotrasinsk@samsung.com>
- *
- * 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.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <net/sock.h>
diff --git a/drivers/usb/wusbcore/cbaf.c b/drivers/usb/wusbcore/cbaf.c
index aa4e440e9975..222228c5c1e1 100644
--- a/drivers/usb/wusbcore/cbaf.c
+++ b/drivers/usb/wusbcore/cbaf.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Wireless USB - Cable Based Association
  *
@@ -6,21 +7,6 @@
  * Inaky Perez-Gonzalez <inaky.perez-gonzalez@intel.com>
  * Copyright (C) 2008 Cambridge Silicon Radio Ltd.
  *
- * 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.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301, USA.
- *
- *
  * WUSB devices have to be paired (associated in WUSB lingo) so
  * that they can connect to the system.
  *
diff --git a/drivers/usb/wusbcore/crypto.c b/drivers/usb/wusbcore/crypto.c
index 062c205f0046..4c00be2d1993 100644
--- a/drivers/usb/wusbcore/crypto.c
+++ b/drivers/usb/wusbcore/crypto.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Ultra Wide Band
  * AES-128 CCM Encryption
@@ -5,21 +6,6 @@
  * Copyright (C) 2007 Intel Corporation
  * Inaky Perez-Gonzalez <inaky.perez-gonzalez@intel.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.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301, USA.
- *
- *
  * We don't do any encryption here; we use the Linux Kernel's AES-128
  * crypto modules to construct keys and payload blocks in a way
  * defined by WUSB1.0[6]. Check the erratas, as typos are are patched
diff --git a/drivers/usb/wusbcore/dev-sysfs.c b/drivers/usb/wusbcore/dev-sysfs.c
index 78212f8180ce..85a1acf3a729 100644
--- a/drivers/usb/wusbcore/dev-sysfs.c
+++ b/drivers/usb/wusbcore/dev-sysfs.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * WUSB devices
  * sysfs bindings
@@ -5,21 +6,6 @@
  * Copyright (C) 2007 Intel Corporation
  * Inaky Perez-Gonzalez <inaky.perez-gonzalez@intel.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.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301, USA.
- *
- *
  * Get them out of the way...
  */
 
diff --git a/drivers/usb/wusbcore/devconnect.c b/drivers/usb/wusbcore/devconnect.c
index bf9551735938..fcb06aef2675 100644
--- a/drivers/usb/wusbcore/devconnect.c
+++ b/drivers/usb/wusbcore/devconnect.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * WUSB Wire Adapter: Control/Data Streaming Interface (WUSB[8])
  * Device Connect handling
@@ -5,21 +6,6 @@
  * Copyright (C) 2006 Intel Corporation
  * Inaky Perez-Gonzalez <inaky.perez-gonzalez@intel.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.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301, USA.
- *
- *
  * FIXME: docs
  * FIXME: this file needs to be broken up, it's grown too big
  *
diff --git a/drivers/usb/wusbcore/mmc.c b/drivers/usb/wusbcore/mmc.c
index 3f485df96226..acce0d551eb2 100644
--- a/drivers/usb/wusbcore/mmc.c
+++ b/drivers/usb/wusbcore/mmc.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * WUSB Wire Adapter: Control/Data Streaming Interface (WUSB[8])
  * MMC (Microscheduled Management Command) handling
@@ -5,21 +6,6 @@
  * Copyright (C) 2005-2006 Intel Corporation
  * Inaky Perez-Gonzalez <inaky.perez-gonzalez@intel.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.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301, USA.
- *
- *
  * WUIEs and MMC IEs...well, they are almost the same at the end. MMC
  * IEs are Wireless USB IEs that go into the MMC period...[what is
  * that? look in Design-overview.txt].
diff --git a/drivers/usb/wusbcore/pal.c b/drivers/usb/wusbcore/pal.c
index 090f27371a8f..30f569131471 100644
--- a/drivers/usb/wusbcore/pal.c
+++ b/drivers/usb/wusbcore/pal.c
@@ -1,20 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Wireless USB Host Controller
  * UWB Protocol Adaptation Layer (PAL) glue.
  *
  * Copyright (C) 2008 Cambridge Silicon Radio Ltd.
- *
- * 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.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include "wusbhc.h"
 
diff --git a/drivers/usb/wusbcore/reservation.c b/drivers/usb/wusbcore/reservation.c
index 7b1b2e2fb673..6dcfc6825f55 100644
--- a/drivers/usb/wusbcore/reservation.c
+++ b/drivers/usb/wusbcore/reservation.c
@@ -1,19 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * WUSB cluster reservation management
  *
  * Copyright (C) 2007 Cambridge Silicon Radio Ltd.
- *
- * 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.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include <linux/kernel.h>
 #include <linux/uwb.h>
diff --git a/drivers/usb/wusbcore/rh.c b/drivers/usb/wusbcore/rh.c
index a082fe62b1f0..20c08cd9dcbf 100644
--- a/drivers/usb/wusbcore/rh.c
+++ b/drivers/usb/wusbcore/rh.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Wireless USB Host Controller
  * Root Hub operations
@@ -6,21 +7,6 @@
  * Copyright (C) 2005-2006 Intel Corporation
  * Inaky Perez-Gonzalez <inaky.perez-gonzalez@intel.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.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301, USA.
- *
- *
  * We fake a root hub that has fake ports (as many as simultaneous
  * devices the Wireless USB Host Controller can deal with). For each
  * port we keep an state in @wusbhc->port[index] identical to the one
diff --git a/drivers/usb/wusbcore/security.c b/drivers/usb/wusbcore/security.c
index 170f2c38de9b..33d2f5d7f33b 100644
--- a/drivers/usb/wusbcore/security.c
+++ b/drivers/usb/wusbcore/security.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Wireless USB Host Controller
  * Security support: encryption enablement, etc
@@ -5,21 +6,6 @@
  * Copyright (C) 2006 Intel Corporation
  * Inaky Perez-Gonzalez <inaky.perez-gonzalez@intel.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.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301, USA.
- *
- *
  * FIXME: docs
  */
 #include <linux/types.h>
@@ -28,6 +14,7 @@
 #include <linux/random.h>
 #include <linux/export.h>
 #include "wusbhc.h"
+#include <asm/unaligned.h>
 
 static void wusbhc_gtk_rekey_work(struct work_struct *work);
 
@@ -367,7 +354,6 @@ int wusb_dev_4way_handshake(struct wusbhc *wusbhc, struct wusb_dev *wusb_dev,
         struct usb_device *usb_dev = wusb_dev->usb_dev;
         struct device *dev = &usb_dev->dev;
         u32 tkid;
-        __le32 tkid_le;
         struct usb_handshake *hs;
         struct aes_ccm_nonce ccm_n;
         u8 mic[8];
@@ -385,11 +371,10 @@ int wusb_dev_4way_handshake(struct wusbhc *wusbhc, struct wusb_dev *wusb_dev,
                 goto error_dev_set_encryption;
 
         tkid = wusbhc_next_tkid(wusbhc, wusb_dev);
-        tkid_le = cpu_to_le32(tkid);
 
         hs[0].bMessageNumber = 1;
         hs[0].bStatus = 0;
-        memcpy(hs[0].tTKID, &tkid_le, sizeof(hs[0].tTKID));
+        put_unaligned_le32(tkid, hs[0].tTKID);
         hs[0].bReserved = 0;
         memcpy(hs[0].CDID, &wusb_dev->cdid, sizeof(hs[0].CDID));
         get_random_bytes(&hs[0].nonce, sizeof(hs[0].nonce));
@@ -441,7 +426,7 @@ int wusb_dev_4way_handshake(struct wusbhc *wusbhc, struct wusb_dev *wusb_dev,
 
         /* Setup the CCM nonce */
         memset(&ccm_n.sfn, 0, sizeof(ccm_n.sfn)); /* Per WUSB1.0[6.5.2] */
-        memcpy(ccm_n.tkid, &tkid_le, sizeof(ccm_n.tkid));
+        put_unaligned_le32(tkid, ccm_n.tkid);
         ccm_n.src_addr = wusbhc->uwb_rc->uwb_dev.dev_addr;
         ccm_n.dest_addr.data[0] = wusb_dev->addr;
         ccm_n.dest_addr.data[1] = 0;
@@ -472,7 +457,7 @@ int wusb_dev_4way_handshake(struct wusbhc *wusbhc, struct wusb_dev *wusb_dev,
         /* Send Handshake3 */
         hs[2].bMessageNumber = 3;
         hs[2].bStatus = 0;
-        memcpy(hs[2].tTKID, &tkid_le, sizeof(hs[2].tTKID));
+        put_unaligned_le32(tkid, hs[2].tTKID);
         hs[2].bReserved = 0;
         memcpy(hs[2].CDID, &wusb_dev->cdid, sizeof(hs[2].CDID));
         memcpy(hs[2].nonce, hs[0].nonce, sizeof(hs[2].nonce));
diff --git a/drivers/usb/wusbcore/wa-hc.c b/drivers/usb/wusbcore/wa-hc.c
index d01496fd27fe..6827075fb8a1 100644
--- a/drivers/usb/wusbcore/wa-hc.c
+++ b/drivers/usb/wusbcore/wa-hc.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Wire Adapter Host Controller Driver
  * Common items to HWA and DWA based HCDs
@@ -5,21 +6,6 @@
  * Copyright (C) 2005-2006 Intel Corporation
  * Inaky Perez-Gonzalez <inaky.perez-gonzalez@intel.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.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301, USA.
- *
- *
  * FIXME: docs
  */
 #include <linux/slab.h>
diff --git a/drivers/usb/wusbcore/wa-hc.h b/drivers/usb/wusbcore/wa-hc.h
index edc7267157f3..ec90fff21deb 100644
--- a/drivers/usb/wusbcore/wa-hc.h
+++ b/drivers/usb/wusbcore/wa-hc.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * HWA Host Controller Driver
  * Wire Adapter Control/Data Streaming Iface (WUSB1.0[8])
@@ -5,21 +6,6 @@
  * Copyright (C) 2005-2006 Intel Corporation
  * Inaky Perez-Gonzalez <inaky.perez-gonzalez@intel.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.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301, USA.
- *
- *
  * This driver implements a USB Host Controller (struct usb_hcd) for a
  * Wireless USB Host Controller based on the Wireless USB 1.0
  * Host-Wire-Adapter specification (in layman terms, a USB-dongle that
diff --git a/drivers/usb/wusbcore/wa-nep.c b/drivers/usb/wusbcore/wa-nep.c
index e3819fc182b0..9fdcb6b84abf 100644
--- a/drivers/usb/wusbcore/wa-nep.c
+++ b/drivers/usb/wusbcore/wa-nep.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * WUSB Wire Adapter: Control/Data Streaming Interface (WUSB[8])
  * Notification EndPoint support
@@ -5,21 +6,6 @@
  * Copyright (C) 2006 Intel Corporation
  * Inaky Perez-Gonzalez <inaky.perez-gonzalez@intel.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.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301, USA.
- *
- *
  * This part takes care of getting the notification from the hw
  * only and dispatching through wusbwad into
  * wa_notif_dispatch. Handling is done there.
diff --git a/drivers/usb/wusbcore/wa-rpipe.c b/drivers/usb/wusbcore/wa-rpipe.c
index c7ecdbe19a32..d0f1a6698460 100644
--- a/drivers/usb/wusbcore/wa-rpipe.c
+++ b/drivers/usb/wusbcore/wa-rpipe.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * WUSB Wire Adapter
  * rpipe management
@@ -5,21 +6,6 @@
  * Copyright (C) 2005-2006 Intel Corporation
  * Inaky Perez-Gonzalez <inaky.perez-gonzalez@intel.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.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301, USA.
- *
- *
  * FIXME: docs
  *
  * RPIPE
diff --git a/drivers/usb/wusbcore/wa-xfer.c b/drivers/usb/wusbcore/wa-xfer.c
index e70322b1dd02..7fca4e7e556d 100644
--- a/drivers/usb/wusbcore/wa-xfer.c
+++ b/drivers/usb/wusbcore/wa-xfer.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * WUSB Wire Adapter
  * Data transfer and URB enqueing
@@ -5,21 +6,6 @@
  * Copyright (C) 2005-2006 Intel Corporation
  * Inaky Perez-Gonzalez <inaky.perez-gonzalez@intel.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.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301, USA.
- *
- *
  * How transfers work: get a buffer, break it up in segments (segment
  * size is a multiple of the maxpacket size). For each segment issue a
  * segment request (struct wa_xfer_*), then send the data buffer if
@@ -2156,6 +2142,7 @@ static void wa_complete_remaining_xfer_segs(struct wa_xfer *xfer,
                  * do not increment RPIPE avail for the WA_SEG_DELAYED case
                  * since it has not been submitted to the RPIPE.
                  */
+                /* fall through */
                 case WA_SEG_DELAYED:
                         xfer->segs_done++;
                         current_seg->status = status;
diff --git a/drivers/usb/wusbcore/wusbhc.c b/drivers/usb/wusbcore/wusbhc.c
index 5338e42533c8..e5ba6140c1ba 100644
--- a/drivers/usb/wusbcore/wusbhc.c
+++ b/drivers/usb/wusbcore/wusbhc.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Wireless USB Host Controller
  * sysfs glue, wusbcore module support and life cycle management
@@ -6,21 +7,6 @@
  * Copyright (C) 2005-2006 Intel Corporation
  * Inaky Perez-Gonzalez <inaky.perez-gonzalez@intel.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.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301, USA.
- *
- *
  * Creation/destruction of wusbhc is split in two parts; that that
  * doesn't require the HCD to be added (wusbhc_{create,destroy}) and
  * the one that requires (phase B, wusbhc_b_{create,destroy}).
diff --git a/drivers/usb/wusbcore/wusbhc.h b/drivers/usb/wusbcore/wusbhc.h
index 8c5bd000739b..7681d796ca5b 100644
--- a/drivers/usb/wusbcore/wusbhc.h
+++ b/drivers/usb/wusbcore/wusbhc.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Wireless USB Host Controller
  * Common infrastructure for WHCI and HWA WUSB-HC drivers
@@ -6,21 +7,6 @@
  * Copyright (C) 2005-2006 Intel Corporation
  * Inaky Perez-Gonzalez <inaky.perez-gonzalez@intel.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.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301, USA.
- *
- *
  * This driver implements parts common to all Wireless USB Host
  * Controllers (struct wusbhc, embedding a struct usb_hcd) and is used
  * by:
diff --git a/include/dt-bindings/phy/phy.h b/include/dt-bindings/phy/phy.h
index 6c901930eb3e..d16e8755f6a9 100644
--- a/include/dt-bindings/phy/phy.h
+++ b/include/dt-bindings/phy/phy.h
@@ -15,5 +15,6 @@
 #define PHY_TYPE_PCIE           2
 #define PHY_TYPE_USB2           3
 #define PHY_TYPE_USB3           4
+#define PHY_TYPE_UFS            5
 
 #endif /* _DT_BINDINGS_PHY */
diff --git a/include/linux/extcon-provider.h b/include/linux/extcon-provider.h
new file mode 100644
index 000000000000..2feca5881fa7
--- /dev/null
+++ b/include/linux/extcon-provider.h
@@ -0,0 +1,142 @@
+/*
+ * External Connector (extcon) framework
+ * - linux/include/linux/extcon-provider.h for extcon provider device driver.
+ *
+ * Copyright (C) 2017 Samsung Electronics
+ * Author: Chanwoo Choi <cw00.choi@samsung.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 __LINUX_EXTCON_PROVIDER_H__
+#define __LINUX_EXTCON_PROVIDER_H__
+
+#include <linux/extcon.h>
+
+struct extcon_dev;
+
+#if IS_ENABLED(CONFIG_EXTCON)
+
+/* Following APIs register/unregister the extcon device. */
+extern int extcon_dev_register(struct extcon_dev *edev);
+extern void extcon_dev_unregister(struct extcon_dev *edev);
+extern int devm_extcon_dev_register(struct device *dev,
+                                struct extcon_dev *edev);
+extern void devm_extcon_dev_unregister(struct device *dev,
+                                struct extcon_dev *edev);
+
+/* Following APIs allocate/free the memory of the extcon device. */
+extern struct extcon_dev *extcon_dev_allocate(const unsigned int *cable);
+extern void extcon_dev_free(struct extcon_dev *edev);
+extern struct extcon_dev *devm_extcon_dev_allocate(struct device *dev,
+                                const unsigned int *cable);
+extern void devm_extcon_dev_free(struct device *dev, struct extcon_dev *edev);
+
+/* Synchronize the state and property value for each external connector. */
+extern int extcon_sync(struct extcon_dev *edev, unsigned int id);
+
+/*
+ * Following APIs set the connected state of each external connector.
+ * The 'id' argument indicates the defined external connector.
+ */
+extern int extcon_set_state(struct extcon_dev *edev, unsigned int id,
+                                bool state);
+extern int extcon_set_state_sync(struct extcon_dev *edev, unsigned int id,
+                                bool state);
+
+/*
+ * Following APIs set the property of each external connector.
+ * The 'id' argument indicates the defined external connector
+ * and the 'prop' indicates the extcon property.
+ *
+ * And extcon_set_property_capability() set the capability of the property
+ * for each external connector. They are used to set the capability of the
+ * property of each external connector based on the id and property.
+ */
+extern int extcon_set_property(struct extcon_dev *edev, unsigned int id,
+                                unsigned int prop,
+                                union extcon_property_value prop_val);
+extern int extcon_set_property_sync(struct extcon_dev *edev, unsigned int id,
+                                unsigned int prop,
+                                union extcon_property_value prop_val);
+extern int extcon_set_property_capability(struct extcon_dev *edev,
+                                unsigned int id, unsigned int prop);
+
+#else /* CONFIG_EXTCON */
+static inline int extcon_dev_register(struct extcon_dev *edev)
+{
+        return 0;
+}
+
+static inline void extcon_dev_unregister(struct extcon_dev *edev) { }
+
+static inline int devm_extcon_dev_register(struct device *dev,
+                                struct extcon_dev *edev)
+{
+        return -EINVAL;
+}
+
+static inline void devm_extcon_dev_unregister(struct device *dev,
+                                struct extcon_dev *edev) { }
+
+static inline struct extcon_dev *extcon_dev_allocate(const unsigned int *cable)
+{
+        return ERR_PTR(-ENOSYS);
+}
+
+static inline void extcon_dev_free(struct extcon_dev *edev) { }
+
+static inline struct extcon_dev *devm_extcon_dev_allocate(struct device *dev,
+                                const unsigned int *cable)
+{
+        return ERR_PTR(-ENOSYS);
+}
+
+static inline void devm_extcon_dev_free(struct extcon_dev *edev) { }
+
+
+static inline int extcon_set_state(struct extcon_dev *edev, unsigned int id,
+                                bool state)
+{
+        return 0;
+}
+
+static inline int extcon_set_state_sync(struct extcon_dev *edev, unsigned int id,
+                                bool state)
+{
+        return 0;
+}
+
+static inline int extcon_sync(struct extcon_dev *edev, unsigned int id)
+{
+        return 0;
+}
+
+static inline int extcon_set_property(struct extcon_dev *edev, unsigned int id,
+                                unsigned int prop,
+                                union extcon_property_value prop_val)
+{
+        return 0;
+}
+
+static inline int extcon_set_property_sync(struct extcon_dev *edev,
+                                unsigned int id, unsigned int prop,
+                                union extcon_property_value prop_val)
+{
+        return 0;
+}
+
+static inline int extcon_set_property_capability(struct extcon_dev *edev,
+                                unsigned int id, unsigned int prop)
+{
+        return 0;
+}
+#endif /* CONFIG_EXTCON */
+#endif /* __LINUX_EXTCON_PROVIDER_H__ */
diff --git a/include/linux/extcon.h b/include/linux/extcon.h
index 744d60ca80c3..6d94e82c8ad9 100644
--- a/include/linux/extcon.h
+++ b/include/linux/extcon.h
@@ -1,5 +1,6 @@
 /*
  * External Connector (extcon) framework
+ * - linux/include/linux/extcon.h for extcon consumer device driver.
  *
  * Copyright (C) 2015 Samsung Electronics
  * Author: Chanwoo Choi <cw00.choi@samsung.com>
@@ -170,61 +171,29 @@ union extcon_property_value {
         int intval;     /* type : integer (intval) */
 };
 
-struct extcon_cable;
 struct extcon_dev;
 
 #if IS_ENABLED(CONFIG_EXTCON)
-
-/* Following APIs register/unregister the extcon device. */
-extern int extcon_dev_register(struct extcon_dev *edev);
-extern void extcon_dev_unregister(struct extcon_dev *edev);
-extern int devm_extcon_dev_register(struct device *dev,
-                                struct extcon_dev *edev);
-extern void devm_extcon_dev_unregister(struct device *dev,
-                                struct extcon_dev *edev);
-
-/* Following APIs allocate/free the memory of the extcon device. */
-extern struct extcon_dev *extcon_dev_allocate(const unsigned int *cable);
-extern void extcon_dev_free(struct extcon_dev *edev);
-extern struct extcon_dev *devm_extcon_dev_allocate(struct device *dev,
-                                const unsigned int *cable);
-extern void devm_extcon_dev_free(struct device *dev, struct extcon_dev *edev);
-
-/* Synchronize the state and property value for each external connector. */
-extern int extcon_sync(struct extcon_dev *edev, unsigned int id);
-
 /*
- * Following APIs get/set the connected state of each external connector.
+ * Following APIs get the connected state of each external connector.
  * The 'id' argument indicates the defined external connector.
  */
 extern int extcon_get_state(struct extcon_dev *edev, unsigned int id);
-extern int extcon_set_state(struct extcon_dev *edev, unsigned int id,
-                                bool state);
-extern int extcon_set_state_sync(struct extcon_dev *edev, unsigned int id,
-                                bool state);
 
 /*
- * Following APIs get/set the property of each external connector.
+ * Following APIs get the property of each external connector.
  * The 'id' argument indicates the defined external connector
  * and the 'prop' indicates the extcon property.
  *
- * And extcon_get/set_property_capability() set the capability of the property
- * for each external connector. They are used to set the capability of the
+ * And extcon_get_property_capability() get the capability of the property
+ * for each external connector. They are used to get the capability of the
  * property of each external connector based on the id and property.
  */
 extern int extcon_get_property(struct extcon_dev *edev, unsigned int id,
                                 unsigned int prop,
                                 union extcon_property_value *prop_val);
-extern int extcon_set_property(struct extcon_dev *edev, unsigned int id,
-                                unsigned int prop,
-                                union extcon_property_value prop_val);
-extern int extcon_set_property_sync(struct extcon_dev *edev, unsigned int id,
-                                unsigned int prop,
-                                union extcon_property_value prop_val);
 extern int extcon_get_property_capability(struct extcon_dev *edev,
                                 unsigned int id, unsigned int prop);
-extern int extcon_set_property_capability(struct extcon_dev *edev,
-                                unsigned int id, unsigned int prop);
 
 /*
  * Following APIs register the notifier block in order to detect
@@ -268,79 +237,17 @@ extern struct extcon_dev *extcon_get_edev_by_phandle(struct device *dev,
 extern const char *extcon_get_edev_name(struct extcon_dev *edev);
 
 #else /* CONFIG_EXTCON */
-static inline int extcon_dev_register(struct extcon_dev *edev)
-{
-        return 0;
-}
-
-static inline void extcon_dev_unregister(struct extcon_dev *edev) { }
-
-static inline int devm_extcon_dev_register(struct device *dev,
-                                struct extcon_dev *edev)
-{
-        return -EINVAL;
-}
-
-static inline void devm_extcon_dev_unregister(struct device *dev,
-                                struct extcon_dev *edev) { }
-
-static inline struct extcon_dev *extcon_dev_allocate(const unsigned int *cable)
-{
-        return ERR_PTR(-ENOSYS);
-}
-
-static inline void extcon_dev_free(struct extcon_dev *edev) { }
-
-static inline struct extcon_dev *devm_extcon_dev_allocate(struct device *dev,
-                                const unsigned int *cable)
-{
-        return ERR_PTR(-ENOSYS);
-}
-
-static inline void devm_extcon_dev_free(struct extcon_dev *edev) { }
-
-
 static inline int extcon_get_state(struct extcon_dev *edev, unsigned int id)
 {
         return 0;
 }
 
-static inline int extcon_set_state(struct extcon_dev *edev, unsigned int id,
-                                bool state)
-{
-        return 0;
-}
-
-static inline int extcon_set_state_sync(struct extcon_dev *edev, unsigned int id,
-                                bool state)
-{
-        return 0;
-}
-
-static inline int extcon_sync(struct extcon_dev *edev, unsigned int id)
-{
-        return 0;
-}
-
 static inline int extcon_get_property(struct extcon_dev *edev, unsigned int id,
                                 unsigned int prop,
                                 union extcon_property_value *prop_val)
 {
         return 0;
 }
-static inline int extcon_set_property(struct extcon_dev *edev, unsigned int id,
-                                unsigned int prop,
-                                union extcon_property_value prop_val)
-{
-        return 0;
-}
-
-static inline int extcon_set_property_sync(struct extcon_dev *edev,
-                                unsigned int id, unsigned int prop,
-                                union extcon_property_value prop_val)
-{
-        return 0;
-}
 
 static inline int extcon_get_property_capability(struct extcon_dev *edev,
                                 unsigned int id, unsigned int prop)
@@ -348,12 +255,6 @@ static inline int extcon_get_property_capability(struct extcon_dev *edev,
         return 0;
 }
 
-static inline int extcon_set_property_capability(struct extcon_dev *edev,
-                                unsigned int id, unsigned int prop)
-{
-        return 0;
-}
-
 static inline int extcon_register_notifier(struct extcon_dev *edev,
                                 unsigned int id, struct notifier_block *nb)
 {
diff --git a/include/linux/mfd/max77843-private.h b/include/linux/mfd/max77843-private.h
index c19303b0ccfd..b8908bf8d315 100644
--- a/include/linux/mfd/max77843-private.h
+++ b/include/linux/mfd/max77843-private.h
@@ -245,10 +245,13 @@ enum max77843_irq_muic {
 #define MAX77843_CHG_OVER_CURRENT_BAT           (0x06 << 4)
 
 /* MAX77843 CHG_CNFG_00 register */
+#define MAX77843_CHG_MODE_MASK                  0x0f
 #define MAX77843_CHG_DISABLE                    0x00
 #define MAX77843_CHG_ENABLE                     0x05
 #define MAX77843_CHG_MASK                       0x01
+#define MAX77843_CHG_OTG_MASK                   0x02
 #define MAX77843_CHG_BUCK_MASK                  0x04
+#define MAX77843_CHG_BOOST_MASK                 0x08
 
 /* MAX77843 CHG_CNFG_01 register */
 #define MAX77843_CHG_RESTART_THRESHOLD_100      0x00
@@ -347,6 +350,7 @@ enum max77843_irq_muic {
 /* MAX77843 CONTROL register */
 #define MAX77843_MUIC_CONTROL1_COMP1SW_SHIFT    0
 #define MAX77843_MUIC_CONTROL1_COMP2SW_SHIFT    3
+#define MAX77843_MUIC_CONTROL1_NOBCCOMP_SHIFT   6
 #define MAX77843_MUIC_CONTROL1_IDBEN_SHIFT      7
 #define MAX77843_MUIC_CONTROL2_LOWPWR_SHIFT     0
 #define MAX77843_MUIC_CONTROL2_ADCEN_SHIFT      1
@@ -363,6 +367,7 @@ enum max77843_irq_muic {
 #define MAX77843_MUIC_CONTROL1_COMP1SW_MASK     (0x7 << MAX77843_MUIC_CONTROL1_COMP1SW_SHIFT)
 #define MAX77843_MUIC_CONTROL1_COMP2SW_MASK     (0x7 << MAX77843_MUIC_CONTROL1_COMP2SW_SHIFT)
 #define MAX77843_MUIC_CONTROL1_IDBEN_MASK       BIT(MAX77843_MUIC_CONTROL1_IDBEN_SHIFT)
+#define MAX77843_MUIC_CONTROL1_NOBCCOMP_MASK    BIT(MAX77843_MUIC_CONTROL1_NOBCCOMP_SHIFT)
 #define MAX77843_MUIC_CONTROL2_LOWPWR_MASK      BIT(MAX77843_MUIC_CONTROL2_LOWPWR_SHIFT)
 #define MAX77843_MUIC_CONTROL2_ADCEN_MASK       BIT(MAX77843_MUIC_CONTROL2_ADCEN_SHIFT)
 #define MAX77843_MUIC_CONTROL2_CPEN_MASK        BIT(MAX77843_MUIC_CONTROL2_CPEN_SHIFT)
diff --git a/include/linux/mfd/palmas.h b/include/linux/mfd/palmas.h
index 6dec43826303..3c8568aa82a5 100644
--- a/include/linux/mfd/palmas.h
+++ b/include/linux/mfd/palmas.h
@@ -20,7 +20,7 @@
 #include <linux/leds.h>
 #include <linux/regmap.h>
 #include <linux/regulator/driver.h>
-#include <linux/extcon.h>
+#include <linux/extcon-provider.h>
 #include <linux/of_gpio.h>
 #include <linux/usb/phy_companion.h>
 
diff --git a/include/linux/phy/phy-qcom-ufs.h b/include/linux/phy/phy-qcom-ufs.h
index 35c070ea6ea3..0a2c18a9771d 100644
--- a/include/linux/phy/phy-qcom-ufs.h
+++ b/include/linux/phy/phy-qcom-ufs.h
@@ -31,10 +31,7 @@ void ufs_qcom_phy_enable_dev_ref_clk(struct phy *phy);
  */
 void ufs_qcom_phy_disable_dev_ref_clk(struct phy *phy);
 
-int ufs_qcom_phy_start_serdes(struct phy *phy);
 int ufs_qcom_phy_set_tx_lane_enable(struct phy *phy, u32 tx_lanes);
-int ufs_qcom_phy_calibrate_phy(struct phy *phy, bool is_rate_B);
-int ufs_qcom_phy_is_pcs_ready(struct phy *phy);
 void ufs_qcom_phy_save_controller_version(struct phy *phy,
                         u8 major, u16 minor, u16 step);
 
diff --git a/include/linux/phy/phy.h b/include/linux/phy/phy.h
index e694d4008c4a..4f8423a948d5 100644
--- a/include/linux/phy/phy.h
+++ b/include/linux/phy/phy.h
@@ -29,6 +29,8 @@ enum phy_mode {
         PHY_MODE_USB_OTG,
         PHY_MODE_SGMII,
         PHY_MODE_10GKR,
+        PHY_MODE_UFS_HS_A,
+        PHY_MODE_UFS_HS_B,
 };
 
 /**
@@ -39,6 +41,7 @@ enum phy_mode {
  * @power_off: powering off the phy
  * @set_mode: set the mode of the phy
  * @reset: resetting the phy
+ * @calibrate: calibrate the phy
  * @owner: the module owner containing the ops
  */
 struct phy_ops {
@@ -48,6 +51,7 @@ struct phy_ops {
         int     (*power_off)(struct phy *phy);
         int     (*set_mode)(struct phy *phy, enum phy_mode mode);
         int     (*reset)(struct phy *phy);
+        int     (*calibrate)(struct phy *phy);
         struct module *owner;
 };
 
@@ -141,6 +145,7 @@ int phy_power_on(struct phy *phy);
 int phy_power_off(struct phy *phy);
 int phy_set_mode(struct phy *phy, enum phy_mode mode);
 int phy_reset(struct phy *phy);
+int phy_calibrate(struct phy *phy);
 static inline int phy_get_bus_width(struct phy *phy)
 {
         return phy->attrs.bus_width;
@@ -262,6 +267,13 @@ static inline int phy_reset(struct phy *phy)
         return -ENOSYS;
 }
 
+static inline int phy_calibrate(struct phy *phy)
+{
+        if (!phy)
+                return 0;
+        return -ENOSYS;
+}
+
 static inline int phy_get_bus_width(struct phy *phy)
 {
         return -ENOSYS;
@@ -291,7 +303,7 @@ static inline struct phy *devm_phy_get(struct device *dev, const char *string)
 static inline struct phy *devm_phy_optional_get(struct device *dev,
                                                 const char *string)
 {
-        return ERR_PTR(-ENOSYS);
+        return NULL;
 }
 
 static inline struct phy *devm_of_phy_get(struct device *dev,
diff --git a/include/linux/soc/brcmstb/brcmstb.h b/include/linux/soc/brcmstb/brcmstb.h
index 003f3dd5b192..12e548938bbb 100644
--- a/include/linux/soc/brcmstb/brcmstb.h
+++ b/include/linux/soc/brcmstb/brcmstb.h
@@ -2,10 +2,27 @@
 #ifndef __BRCMSTB_SOC_H
 #define __BRCMSTB_SOC_H
 
+static inline u32 BRCM_ID(u32 reg)
+{
+        return reg >> 28 ? reg >> 16 : reg >> 8;
+}
+
+static inline u32 BRCM_REV(u32 reg)
+{
+        return reg & 0xff;
+}
+
 /*
  * Bus Interface Unit control register setup, must happen early during boot,
  * before SMP is brought up, called by machine entry point.
  */
 void brcmstb_biuctrl_init(void);
 
+/*
+ * Helper functions for getting family or product id from the
+ * SoC driver.
+ */
+u32 brcmstb_get_family_id(void);
+u32 brcmstb_get_product_id(void);
+
 #endif /* __BRCMSTB_SOC_H */
diff --git a/include/linux/usb.h b/include/linux/usb.h
index 9c63792a8134..f019b0397599 100644
--- a/include/linux/usb.h
+++ b/include/linux/usb.h
@@ -1767,7 +1767,21 @@ extern int usb_bulk_msg(struct usb_device *usb_dev, unsigned int pipe,
 extern int usb_get_descriptor(struct usb_device *dev, unsigned char desctype,
         unsigned char descindex, void *buf, int size);
 extern int usb_get_status(struct usb_device *dev,
-        int type, int target, void *data);
+        int recip, int type, int target, void *data);
+
+static inline int usb_get_std_status(struct usb_device *dev,
+        int recip, int target, void *data)
+{
+        return usb_get_status(dev, recip, USB_STATUS_TYPE_STANDARD, target,
+                data);
+}
+
+static inline int usb_get_ptm_status(struct usb_device *dev, void *data)
+{
+        return usb_get_status(dev, USB_RECIP_DEVICE, USB_STATUS_TYPE_PTM,
+                0, data);
+}
+
 extern int usb_string(struct usb_device *dev, int index,
         char *buf, size_t size);
 
diff --git a/include/linux/usb/association.h b/include/linux/usb/association.h
index 0a4a18b3c1bb..d7f3cb9b9db5 100644
--- a/include/linux/usb/association.h
+++ b/include/linux/usb/association.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Wireless USB - Cable Based Association
  *
diff --git a/include/linux/usb/audio-v2.h b/include/linux/usb/audio-v2.h
index fd73bc0e9027..3119d0ace7aa 100644
--- a/include/linux/usb/audio-v2.h
+++ b/include/linux/usb/audio-v2.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Copyright (c) 2010 Daniel Mack <daniel@caiaq.de>
  *
diff --git a/include/linux/usb/audio.h b/include/linux/usb/audio.h
index 3d84619110a4..170acd500ea1 100644
--- a/include/linux/usb/audio.h
+++ b/include/linux/usb/audio.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * <linux/usb/audio.h> -- USB Audio definitions.
  *
diff --git a/include/linux/usb/c67x00.h b/include/linux/usb/c67x00.h
index 83c6b45470ca..2fc39e3b7281 100644
--- a/include/linux/usb/c67x00.h
+++ b/include/linux/usb/c67x00.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * usb_c67x00.h: platform definitions for the Cypress C67X00 USB chip
  *
diff --git a/include/linux/usb/cdc-wdm.h b/include/linux/usb/cdc-wdm.h
index 0b3f4295c025..9b895f93d8de 100644
--- a/include/linux/usb/cdc-wdm.h
+++ b/include/linux/usb/cdc-wdm.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * USB CDC Device Management subdriver
  *
diff --git a/include/linux/usb/cdc.h b/include/linux/usb/cdc.h
index b5706f94ee9e..35d784cf32a4 100644
--- a/include/linux/usb/cdc.h
+++ b/include/linux/usb/cdc.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * USB CDC common helpers
  *
diff --git a/include/linux/usb/cdc_ncm.h b/include/linux/usb/cdc_ncm.h
index 1a59699cf82a..1646c06989df 100644
--- a/include/linux/usb/cdc_ncm.h
+++ b/include/linux/usb/cdc_ncm.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause)
 /*
  * Copyright (C) ST-Ericsson 2010-2012
  * Contact: Alexey Orishko <alexey.orishko@stericsson.com>
diff --git a/include/linux/usb/composite.h b/include/linux/usb/composite.h
index f665d2ceac20..cef0e44601f8 100644
--- a/include/linux/usb/composite.h
+++ b/include/linux/usb/composite.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * composite.h -- framework for usb gadgets which are composite devices
  *
diff --git a/include/linux/usb/ehci_def.h b/include/linux/usb/ehci_def.h
index e479033bd782..a15ce99dfc2d 100644
--- a/include/linux/usb/ehci_def.h
+++ b/include/linux/usb/ehci_def.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright (c) 2001-2002 by David Brownell
  *
diff --git a/include/linux/usb/ehci_pdriver.h b/include/linux/usb/ehci_pdriver.h
index db0431b39a63..dd742afdc03f 100644
--- a/include/linux/usb/ehci_pdriver.h
+++ b/include/linux/usb/ehci_pdriver.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright (C) 2012 Hauke Mehrtens <hauke@hauke-m.de>
  *
diff --git a/include/linux/usb/g_hid.h b/include/linux/usb/g_hid.h
index 50f5745df28c..7581e488c237 100644
--- a/include/linux/usb/g_hid.h
+++ b/include/linux/usb/g_hid.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * g_hid.h -- Header file for USB HID gadget driver
  *
diff --git a/include/linux/usb/gadget.h b/include/linux/usb/gadget.h
index 21468a722c4a..0142f3af0da6 100644
--- a/include/linux/usb/gadget.h
+++ b/include/linux/usb/gadget.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * <linux/usb/gadget.h>
  *
@@ -188,6 +189,8 @@ struct usb_ep_caps {
  * @ops: Function pointers used to access hardware-specific operations.
  * @ep_list:the gadget's ep_list holds all of its endpoints
  * @caps:The structure describing types and directions supported by endoint.
+ * @enabled: The current endpoint enabled/disabled state.
+ * @claimed: True if this endpoint is claimed by a function.
  * @maxpacket:The maximum packet size used on this endpoint.  The initial
  *      value can sometimes be reduced (hardware allowing), according to
  *      the endpoint descriptor used to configure the endpoint.
@@ -349,6 +352,9 @@ struct usb_gadget_ops {
  *      or B-Peripheral wants to take host role.
  * @quirk_ep_out_aligned_size: epout requires buffer size to be aligned to
  *      MaxPacketSize.
+ * @quirk_altset_not_supp: UDC controller doesn't support alt settings.
+ * @quirk_stall_not_supp: UDC controller doesn't support stalling.
+ * @quirk_zlp_not_supp: UDC controller doesn't support ZLP.
  * @quirk_avoids_skb_reserve: udc/platform wants to avoid skb_reserve() in
  *      u_ether.c to improve performance.
  * @is_selfpowered: if the gadget is self-powered.
diff --git a/include/linux/usb/gpio_vbus.h b/include/linux/usb/gpio_vbus.h
index 837bba604a0b..804fb06cf6d6 100644
--- a/include/linux/usb/gpio_vbus.h
+++ b/include/linux/usb/gpio_vbus.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * A simple GPIO VBUS sensing driver for B peripheral only devices
  * with internal transceivers.
diff --git a/include/linux/usb/hcd.h b/include/linux/usb/hcd.h
index a1f03ebfde47..176900528822 100644
--- a/include/linux/usb/hcd.h
+++ b/include/linux/usb/hcd.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright (c) 2001-2002 by David Brownell
  *
diff --git a/include/linux/usb/input.h b/include/linux/usb/input.h
index 0e010b220e85..974befa72ac0 100644
--- a/include/linux/usb/input.h
+++ b/include/linux/usb/input.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Copyright (C) 2005 Dmitry Torokhov
  *
diff --git a/include/linux/usb/isp1301.h b/include/linux/usb/isp1301.h
index d3a851c28b6a..dedb3b2473e8 100644
--- a/include/linux/usb/isp1301.h
+++ b/include/linux/usb/isp1301.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * NXP ISP1301 USB transceiver driver
  *
diff --git a/include/linux/usb/m66592.h b/include/linux/usb/m66592.h
index a4ba31ab2fed..2dfe68183495 100644
--- a/include/linux/usb/m66592.h
+++ b/include/linux/usb/m66592.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * M66592 driver platform data
  *
diff --git a/include/linux/usb/msm_hsusb_hw.h b/include/linux/usb/msm_hsusb_hw.h
deleted file mode 100644
index 974c3796a23f..000000000000
--- a/include/linux/usb/msm_hsusb_hw.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * Copyright (C) 2007 Google, Inc.
- * Author: Brian Swetland <swetland@google.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 __LINUX_USB_GADGET_MSM72K_UDC_H__
-#define __LINUX_USB_GADGET_MSM72K_UDC_H__
-
-/* USB phy selector - in TCSR address range */
-#define USB2_PHY_SEL         0xfd4ab000
-
-#define USB_AHBBURST         (MSM_USB_BASE + 0x0090)
-#define USB_AHBMODE          (MSM_USB_BASE + 0x0098)
-#define USB_GENCONFIG_2      (MSM_USB_BASE + 0x00a0)
-#define ULPI_TX_PKT_EN_CLR_FIX  BIT(19)
-
-#define USB_CAPLENGTH        (MSM_USB_BASE + 0x0100) /* 8 bit */
-
-#define USB_USBCMD           (MSM_USB_BASE + 0x0140)
-#define USB_PORTSC           (MSM_USB_BASE + 0x0184)
-#define USB_OTGSC            (MSM_USB_BASE + 0x01A4)
-#define USB_USBMODE          (MSM_USB_BASE + 0x01A8)
-#define USB_PHY_CTRL         (MSM_USB_BASE + 0x0240)
-#define USB_PHY_CTRL2        (MSM_USB_BASE + 0x0278)
-
-#define GENCONFIG_2_SESS_VLD_CTRL_EN    BIT(7)
-#define USBCMD_SESS_VLD_CTRL            BIT(25)
-
-#define USBCMD_RESET   2
-#define USB_USBINTR          (MSM_USB_BASE + 0x0148)
-
-#define PORTSC_PHCD            (1 << 23) /* phy suspend mode */
-#define PORTSC_PTS_MASK        (3 << 30)
-#define PORTSC_PTS_ULPI        (2 << 30)
-#define PORTSC_PTS_SERIAL      (3 << 30)
-
-#define USB_ULPI_VIEWPORT    (MSM_USB_BASE + 0x0170)
-#define ULPI_RUN              (1 << 30)
-#define ULPI_WRITE            (1 << 29)
-#define ULPI_READ             (0 << 29)
-#define ULPI_ADDR(n)          (((n) & 255) << 16)
-#define ULPI_DATA(n)          ((n) & 255)
-#define ULPI_DATA_READ(n)     (((n) >> 8) & 255)
-
-/* synopsys 28nm phy registers */
-#define ULPI_PWR_CLK_MNG_REG    0x88
-#define OTG_COMP_DISABLE        BIT(0)
-
-#define ULPI_MISC_A                     0x96
-#define ULPI_MISC_A_VBUSVLDEXTSEL       BIT(1)
-#define ULPI_MISC_A_VBUSVLDEXT          BIT(0)
-
-#define ASYNC_INTR_CTRL         (1 << 29) /* Enable async interrupt */
-#define ULPI_STP_CTRL           (1 << 30) /* Block communication with PHY */
-#define PHY_RETEN               (1 << 1) /* PHY retention enable/disable */
-#define PHY_POR_ASSERT          (1 << 0) /* USB2 28nm PHY POR ASSERT */
-
-/* OTG definitions */
-#define OTGSC_INTSTS_MASK       (0x7f << 16)
-#define OTGSC_ID                (1 << 8)
-#define OTGSC_BSV               (1 << 11)
-#define OTGSC_IDIS              (1 << 16)
-#define OTGSC_BSVIS             (1 << 19)
-#define OTGSC_IDIE              (1 << 24)
-#define OTGSC_BSVIE             (1 << 27)
-
-#endif /* __LINUX_USB_GADGET_MSM72K_UDC_H__ */
diff --git a/include/linux/usb/musb-ux500.h b/include/linux/usb/musb-ux500.h
index 1e2c7130f6e1..c4b7ad9850ca 100644
--- a/include/linux/usb/musb-ux500.h
+++ b/include/linux/usb/musb-ux500.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright (C) 2013 ST-Ericsson AB
  *
diff --git a/include/linux/usb/net2280.h b/include/linux/usb/net2280.h
index 725120224472..08b85caecfaf 100644
--- a/include/linux/usb/net2280.h
+++ b/include/linux/usb/net2280.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * NetChip 2280 high/full speed USB device controller.
  * Unlike many such controllers, this one talks PCI.
diff --git a/include/linux/usb/of.h b/include/linux/usb/of.h
index 4031f47629ec..6cbe7a5c2b57 100644
--- a/include/linux/usb/of.h
+++ b/include/linux/usb/of.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * OF helpers for usb devices.
  *
diff --git a/include/linux/usb/ohci_pdriver.h b/include/linux/usb/ohci_pdriver.h
index 012f2b7eb2b6..7eb16cf587ee 100644
--- a/include/linux/usb/ohci_pdriver.h
+++ b/include/linux/usb/ohci_pdriver.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright (C) 2012 Hauke Mehrtens <hauke@hauke-m.de>
  *
diff --git a/include/linux/usb/otg-fsm.h b/include/linux/usb/otg-fsm.h
index a0a8f878503c..e78eb577d0fa 100644
--- a/include/linux/usb/otg-fsm.h
+++ b/include/linux/usb/otg-fsm.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0+
 /* Copyright (C) 2007,2008 Freescale Semiconductor, Inc.
  *
  * This program is free software; you can redistribute  it and/or modify it
diff --git a/include/linux/usb/phy_companion.h b/include/linux/usb/phy_companion.h
index edd2ec23d282..407f530061cd 100644
--- a/include/linux/usb/phy_companion.h
+++ b/include/linux/usb/phy_companion.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * phy-companion.h -- phy companion to indicate the comparator part of PHY
  *
diff --git a/include/linux/usb/quirks.h b/include/linux/usb/quirks.h
index 7cd553a3ce05..f1fcec2fd5f8 100644
--- a/include/linux/usb/quirks.h
+++ b/include/linux/usb/quirks.h
@@ -57,4 +57,10 @@
  */
 #define USB_QUIRK_LINEAR_FRAME_INTR_BINTERVAL   BIT(11)
 
+/*
+ * Device needs to be disconnected before suspend to prevent spurious
+ * wakeup.
+ */
+#define USB_QUIRK_DISCONNECT_SUSPEND            BIT(12)
+
 #endif /* __LINUX_USB_QUIRKS_H */
diff --git a/include/linux/usb/r8a66597.h b/include/linux/usb/r8a66597.h
index 55805f9dcf21..c0753d026bbf 100644
--- a/include/linux/usb/r8a66597.h
+++ b/include/linux/usb/r8a66597.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * R8A66597 driver platform data
  *
diff --git a/include/linux/usb/renesas_usbhs.h b/include/linux/usb/renesas_usbhs.h
index 00a47d058d83..67102f3d59d4 100644
--- a/include/linux/usb/renesas_usbhs.h
+++ b/include/linux/usb/renesas_usbhs.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-1.0+
 /*
  * Renesas USB
  *
@@ -183,8 +184,9 @@ struct renesas_usbhs_driver_param {
 #define USBHS_USB_DMAC_XFER_SIZE        32      /* hardcode the xfer size */
 };
 
-#define USBHS_TYPE_RCAR_GEN2    1
-#define USBHS_TYPE_RCAR_GEN3    2
+#define USBHS_TYPE_RCAR_GEN2            1
+#define USBHS_TYPE_RCAR_GEN3            2
+#define USBHS_TYPE_RCAR_GEN3_WITH_PLL   3
 
 /*
  * option:
diff --git a/include/linux/usb/rndis_host.h b/include/linux/usb/rndis_host.h
index d44ef85db177..809bccd08455 100644
--- a/include/linux/usb/rndis_host.h
+++ b/include/linux/usb/rndis_host.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Host Side support for RNDIS Networking Links
  * Copyright (C) 2005 by David Brownell
diff --git a/include/linux/usb/samsung_usb_phy.h b/include/linux/usb/samsung_usb_phy.h
index 916782699f1c..dc0071741695 100644
--- a/include/linux/usb/samsung_usb_phy.h
+++ b/include/linux/usb/samsung_usb_phy.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright (C) 2012 Samsung Electronics Co.Ltd
  *              http://www.samsung.com/
diff --git a/include/linux/usb/serial.h b/include/linux/usb/serial.h
index e2f0ab07eea5..106551a5616e 100644
--- a/include/linux/usb/serial.h
+++ b/include/linux/usb/serial.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * USB Serial Converter stuff
  *
diff --git a/include/linux/usb/storage.h b/include/linux/usb/storage.h
index 305ee8db7faf..e0240f864548 100644
--- a/include/linux/usb/storage.h
+++ b/include/linux/usb/storage.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #ifndef __LINUX_USB_STORAGE_H
 #define __LINUX_USB_STORAGE_H
 
diff --git a/include/linux/usb/tegra_usb_phy.h b/include/linux/usb/tegra_usb_phy.h
index 1de16c324ec8..d641ea1660b7 100644
--- a/include/linux/usb/tegra_usb_phy.h
+++ b/include/linux/usb/tegra_usb_phy.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Copyright (C) 2010 Google, Inc.
  *
diff --git a/include/linux/usb/tilegx.h b/include/linux/usb/tilegx.h
index 2d65e3435680..817908573fe8 100644
--- a/include/linux/usb/tilegx.h
+++ b/include/linux/usb/tilegx.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Copyright 2012 Tilera Corporation. All Rights Reserved.
  *
diff --git a/include/linux/usb/ulpi.h b/include/linux/usb/ulpi.h
index 5f07407a367a..c515765adab7 100644
--- a/include/linux/usb/ulpi.h
+++ b/include/linux/usb/ulpi.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * ulpi.h -- ULPI defines and function prorotypes
  *
diff --git a/include/linux/usb/usb338x.h b/include/linux/usb/usb338x.h
index 11525d8d89a7..7189e3387bf9 100644
--- a/include/linux/usb/usb338x.h
+++ b/include/linux/usb/usb338x.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * USB 338x super/high/full speed USB device controller.
  * Unlike many such controllers, this one talks PCI.
diff --git a/include/linux/usb/usbnet.h b/include/linux/usb/usbnet.h
index 97116379db5f..a69877734c4e 100644
--- a/include/linux/usb/usbnet.h
+++ b/include/linux/usb/usbnet.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * USB Networking Link Interface
  *
diff --git a/include/linux/usb/wusb-wa.h b/include/linux/usb/wusb-wa.h
index c1257130769b..64a840b5106e 100644
--- a/include/linux/usb/wusb-wa.h
+++ b/include/linux/usb/wusb-wa.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Wireless USB Wire Adapter constants and structures.
  *
diff --git a/include/linux/usb/wusb.h b/include/linux/usb/wusb.h
index eeb28329fa3c..9e4a3213f2c2 100644
--- a/include/linux/usb/wusb.h
+++ b/include/linux/usb/wusb.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Wireless USB Standard Definitions
  * Event Size Tables
diff --git a/include/linux/usb/xhci-dbgp.h b/include/linux/usb/xhci-dbgp.h
index 80c1cca1f529..0a37f1283bf0 100644
--- a/include/linux/usb/xhci-dbgp.h
+++ b/include/linux/usb/xhci-dbgp.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Standalone xHCI debug capability driver
  *
diff --git a/include/linux/usbdevice_fs.h b/include/linux/usbdevice_fs.h
index 04a26285416c..79aab0065ec8 100644
--- a/include/linux/usbdevice_fs.h
+++ b/include/linux/usbdevice_fs.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*****************************************************************************/
 
 /*
diff --git a/include/uapi/linux/usb/ch9.h b/include/uapi/linux/usb/ch9.h
index cec06625f407..41a0a81b01e6 100644
--- a/include/uapi/linux/usb/ch9.h
+++ b/include/uapi/linux/usb/ch9.h
@@ -144,6 +144,10 @@
 #define TEST_PACKET     4
 #define TEST_FORCE_EN   5
 
+/* Status Type */
+#define USB_STATUS_TYPE_STANDARD        0
+#define USB_STATUS_TYPE_PTM             1
+
 /*
  * New Feature Selectors as added by USB 3.0
  * See USB 3.0 spec Table 9-7
diff --git a/tools/usb/usbip/Makefile.am b/tools/usb/usbip/Makefile.am
index da3a430849a8..5961e9c18812 100644
--- a/tools/usb/usbip/Makefile.am
+++ b/tools/usb/usbip/Makefile.am
@@ -2,6 +2,7 @@
 SUBDIRS := libsrc src
 includedir = @includedir@/usbip
 include_HEADERS := $(addprefix libsrc/, \
-                     usbip_common.h vhci_driver.h usbip_host_driver.h)
+                     usbip_common.h vhci_driver.h usbip_host_driver.h \
+                     list.h sysfs_utils.h usbip_host_common.h)
 
 dist_man_MANS := $(addprefix doc/, usbip.8 usbipd.8)