Merge 5.13-rc2 into usb-next

We need the USB fixes in here as well.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --combined drivers/usb/dwc3/dwc3-pci.c
index 8f43ca1,1e51460..2b37bdd
--- 1/drivers/usb/dwc3/dwc3-pci.c
--- 2/drivers/usb/dwc3/dwc3-pci.c
+++ b/drivers/usb/dwc3/dwc3-pci.c
@@@ -36,7 -36,7 +36,7 @@@
  #define PCI_DEVICE_ID_INTEL_CNPH              0xa36e
  #define PCI_DEVICE_ID_INTEL_CNPV              0xa3b0
  #define PCI_DEVICE_ID_INTEL_ICLLP             0x34ee
 -#define PCI_DEVICE_ID_INTEL_EHLLP             0x4b7e
 +#define PCI_DEVICE_ID_INTEL_EHL                       0x4b7e
  #define PCI_DEVICE_ID_INTEL_TGPLP             0xa0ee
  #define PCI_DEVICE_ID_INTEL_TGPH              0x43ee
  #define PCI_DEVICE_ID_INTEL_JSP                       0x4dee
@@@ -123,6 -123,7 +123,7 @@@ static const struct property_entry dwc3
        PROPERTY_ENTRY_STRING("linux,extcon-name", "mrfld_bcove_pwrsrc"),
        PROPERTY_ENTRY_BOOL("snps,dis_u3_susphy_quirk"),
        PROPERTY_ENTRY_BOOL("snps,dis_u2_susphy_quirk"),
+       PROPERTY_ENTRY_BOOL("snps,usb2-gadget-lpm-disable"),
        PROPERTY_ENTRY_BOOL("linux,sysdev_is_parent"),
        {}
  };
@@@ -166,7 -167,7 +167,7 @@@ static int dwc3_pci_quirks(struct dwc3_
        if (pdev->vendor == PCI_VENDOR_ID_INTEL) {
                if (pdev->device == PCI_DEVICE_ID_INTEL_BXT ||
                    pdev->device == PCI_DEVICE_ID_INTEL_BXT_M ||
 -                  pdev->device == PCI_DEVICE_ID_INTEL_EHLLP) {
 +                  pdev->device == PCI_DEVICE_ID_INTEL_EHL) {
                        guid_parse(PCI_INTEL_BXT_DSM_GUID, &dwc->guid);
                        dwc->has_dsm_for_pm = true;
                }
@@@ -374,8 -375,8 +375,8 @@@ static const struct pci_device_id dwc3_
        { PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_ICLLP),
          (kernel_ulong_t) &dwc3_pci_intel_swnode, },
  
 -      { PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_EHLLP),
 -        (kernel_ulong_t) &dwc3_pci_intel_swnode },
 +      { PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_EHL),
 +        (kernel_ulong_t) &dwc3_pci_intel_swnode, },
  
        { PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_TGPLP),
          (kernel_ulong_t) &dwc3_pci_intel_swnode, },