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

Pull USB/PHY updates from Greg KH:
 "Here is the big set of USB and PHY driver patches for 5.2-rc1

  There is the usual set of:

   - USB gadget updates

   - PHY driver updates and additions

   - USB serial driver updates and fixes

   - typec updates and new chips supported

   - mtu3 driver updates

   - xhci driver updates

   - other tiny driver updates

  Nothing really interesting, just constant forward progress.

  All of these have been in linux-next for a while with no reported
  issues. The usb-gadget and usb-serial trees were merged a bit "late",
  but both of them had been in linux-next before they got merged here
  last Friday"

* tag 'usb-5.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb: (206 commits)
  USB: serial: f81232: implement break control
  USB: serial: f81232: add high baud rate support
  USB: serial: f81232: clear overrun flag
  USB: serial: f81232: fix interrupt worker not stop
  usb: dwc3: Rename DWC3_DCTL_LPM_ERRATA
  usb: dwc3: Fix default lpm_nyet_threshold value
  usb: dwc3: debug: Print GET_STATUS(device) tracepoint
  usb: dwc3: Do core validation early on probe
  usb: dwc3: gadget: Set lpm_capable
  usb: gadget: atmel: tie wake lock to running clock
  usb: gadget: atmel: support USB suspend
  usb: gadget: atmel_usba_udc: simplify setting of interrupt-enabled mask
  dwc2: gadget: Fix completed transfer size calculation in DDMA
  usb: dwc2: Set lpm mode parameters depend on HW configuration
  usb: dwc2: Fix channel disable flow
  usb: dwc2: Set actual frame number for completed ISOC transfer
  usb: gadget: do not use __constant_cpu_to_le16
  usb: dwc2: gadget: Increase descriptors count for ISOC's
  usb: introduce usb_ep_type_string() function
  usb: dwc3: move synchronize_irq() out of the spinlock protected block
  ...

1 files changed, 13 insertions, 7 deletions

diff --git a/drivers/usb/dwc2/platform.c b/drivers/usb/dwc2/platform.c
index c0b64d483552..d10a7f8daec3 100644
--- a/drivers/usb/dwc2/platform.c
+++ b/drivers/usb/dwc2/platform.c
@@ -230,9 +230,6 @@ static int dwc2_lowlevel_hw_init(struct dwc2_hsotg *hsotg)
 
         reset_control_deassert(hsotg->reset_ecc);
 
-        /* Set default UTMI width */
-        hsotg->phyif = GUSBCFG_PHYIF16;
-
         /*
          * Attempt to find a generic PHY, then look for an old style
          * USB PHY and then fall back to pdata
@@ -280,14 +277,14 @@ static int dwc2_lowlevel_hw_init(struct dwc2_hsotg *hsotg)
                  * width is 8-bit and set the phyif appropriately.
                  */
                 if (phy_get_bus_width(hsotg->phy) == 8)
-                        hsotg->phyif = GUSBCFG_PHYIF8;
+                        hsotg->params.phy_utmi_width = 8;
         }
 
         /* Clock */
-        hsotg->clk = devm_clk_get(hsotg->dev, "otg");
+        hsotg->clk = devm_clk_get_optional(hsotg->dev, "otg");
         if (IS_ERR(hsotg->clk)) {
-                hsotg->clk = NULL;
-                dev_dbg(hsotg->dev, "cannot get otg clock\n");
+                dev_err(hsotg->dev, "cannot get otg clock\n");
+                return PTR_ERR(hsotg->clk);
         }
 
         /* Regulators */
@@ -481,6 +478,15 @@ static int dwc2_driver_probe(struct platform_device *dev)
                 hsotg->gadget_enabled = 1;
         }
 
+        hsotg->reset_phy_on_wake =
+                of_property_read_bool(dev->dev.of_node,
+                                      "snps,reset-phy-on-wake");
+        if (hsotg->reset_phy_on_wake && !hsotg->phy) {
+                dev_warn(hsotg->dev,
+                         "Quirk reset-phy-on-wake only supports generic PHYs\n");
+                hsotg->reset_phy_on_wake = false;
+        }
+
         if (hsotg->dr_mode != USB_DR_MODE_PERIPHERAL) {
                 retval = dwc2_hcd_init(hsotg);
                 if (retval) {