Merge v5.19-rc3 into usb-next

We need the USB fixes in here as well.

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

diff --combined MAINTAINERS
index fc5d278,3cf9842..74eb606
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -1507,7 -1507,7 +1507,7 @@@ F:      drivers/clocksource/arm_arch_timer.
  ARM HDLCD DRM DRIVER
  M:    Liviu Dudau <liviu.dudau@arm.com>
  S:    Supported
- F:    Documentation/devicetree/bindings/display/arm,hdlcd.txt
+ F:    Documentation/devicetree/bindings/display/arm,hdlcd.yaml
  F:    drivers/gpu/drm/arm/hdlcd_*
  
  ARM INTEGRATOR, VERSATILE AND REALVIEW SUPPORT
@@@ -1542,7 -1542,7 +1542,7 @@@ M:      Mihail Atanassov <mihail.atanassov@a
  L:    Mali DP Maintainers <malidp@foss.arm.com>
  S:    Supported
  T:    git git://anongit.freedesktop.org/drm/drm-misc
- F:    Documentation/devicetree/bindings/display/arm,komeda.txt
+ F:    Documentation/devicetree/bindings/display/arm,komeda.yaml
  F:    Documentation/gpu/komeda-kms.rst
  F:    drivers/gpu/drm/arm/display/include/
  F:    drivers/gpu/drm/arm/display/komeda/
@@@ -1564,7 -1564,7 +1564,7 @@@ M:      Brian Starkey <brian.starkey@arm.com
  L:    Mali DP Maintainers <malidp@foss.arm.com>
  S:    Supported
  T:    git git://anongit.freedesktop.org/drm/drm-misc
- F:    Documentation/devicetree/bindings/display/arm,malidp.txt
+ F:    Documentation/devicetree/bindings/display/arm,malidp.yaml
  F:    Documentation/gpu/afbc.rst
  F:    drivers/gpu/drm/arm/
  
@@@ -2009,7 -2009,7 +2009,7 @@@ L:      linux-arm-kernel@lists.infradead.or
  S:    Maintained
  T:    git git://github.com/ulli-kroll/linux.git
  F:    Documentation/devicetree/bindings/arm/gemini.yaml
- F:    Documentation/devicetree/bindings/net/cortina,gemini-ethernet.txt
+ F:    Documentation/devicetree/bindings/net/cortina,gemini-ethernet.yaml
  F:    Documentation/devicetree/bindings/pinctrl/cortina,gemini-pinctrl.txt
  F:    Documentation/devicetree/bindings/rtc/faraday,ftrtc010.yaml
  F:    arch/arm/boot/dts/gemini*
@@@ -3136,13 -3136,6 +3136,13 @@@ S:    Maintaine
  F:    Documentation/devicetree/bindings/media/aspeed-video.txt
  F:    drivers/media/platform/aspeed/
  
 +ASPEED USB UDC DRIVER
 +M:    Neal Liu <neal_liu@aspeedtech.com>
 +L:    linux-aspeed@lists.ozlabs.org (moderated for non-subscribers)
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/usb/aspeed,udc.yaml
 +F:    drivers/usb/gadget/udc/aspeed_udc.c
 +
  ASUS NOTEBOOKS AND EEEPC ACPI/WMI EXTRAS DRIVERS
  M:    Corentin Chary <corentin.chary@gmail.com>
  L:    acpi4asus-user@lists.sourceforge.net
@@@ -3764,6 -3757,13 +3764,13 @@@ F:    include/linux/bpf_lsm.
  F:    kernel/bpf/bpf_lsm.c
  F:    security/bpf/
  
+ BPFTOOL
+ M:    Quentin Monnet <quentin@isovalent.com>
+ L:    bpf@vger.kernel.org
+ S:    Maintained
+ F:    kernel/bpf/disasm.*
+ F:    tools/bpf/bpftool/
+ 
  BROADCOM B44 10/100 ETHERNET DRIVER
  M:    Michael Chan <michael.chan@broadcom.com>
  L:    netdev@vger.kernel.org
@@@ -6085,7 -6085,7 +6092,7 @@@ M:      Sakari Ailus <sakari.ailus@linux.int
  L:    linux-media@vger.kernel.org
  S:    Maintained
  T:    git git://linuxtv.org/media_tree.git
- F:    Documentation/devicetree/bindings/media/i2c/dongwoon,dw9807-vcm.txt
+ F:    Documentation/devicetree/bindings/media/i2c/dongwoon,dw9807-vcm.yaml
  F:    drivers/media/i2c/dw9807-vcm.c
  
  DOUBLETALK DRIVER
@@@ -7654,6 -7654,7 +7661,7 @@@ F:      include/uapi/scsi/fc
  
  FILE LOCKING (flock() and fcntl()/lockf())
  M:    Jeff Layton <jlayton@kernel.org>
+ M:    Chuck Lever <chuck.lever@oracle.com>
  L:    linux-fsdevel@vger.kernel.org
  S:    Maintained
  F:    fs/fcntl.c
@@@ -9088,7 -9089,7 +9096,7 @@@ HTE SUBSYSTE
  M:    Dipen Patel <dipenp@nvidia.com>
  S:    Maintained
  F:    Documentation/devicetree/bindings/timestamp/
- F:    Documentation/hte/
+ F:    Documentation/driver-api/hte/
  F:    drivers/hte/
  F:    include/linux/hte.h
  
@@@ -9275,6 -9276,7 +9283,7 @@@ T:      git git://git.kernel.org/pub/scm/lin
  F:    Documentation/devicetree/bindings/i2c/i2c.txt
  F:    Documentation/i2c/
  F:    drivers/i2c/*
+ F:    include/dt-bindings/i2c/i2c.h
  F:    include/linux/i2c-dev.h
  F:    include/linux/i2c-smbus.h
  F:    include/linux/i2c.h
@@@ -9290,6 -9292,7 +9299,7 @@@ T:      git git://git.kernel.org/pub/scm/lin
  F:    Documentation/devicetree/bindings/i2c/
  F:    drivers/i2c/algos/
  F:    drivers/i2c/busses/
+ F:    include/dt-bindings/i2c/
  
  I2C-TAOS-EVM DRIVER
  M:    Jean Delvare <jdelvare@suse.com>
@@@ -10746,6 -10749,7 +10756,7 @@@ W:   http://kernelnewbies.org/KernelJanit
  
  KERNEL NFSD, SUNRPC, AND LOCKD SERVERS
  M:    Chuck Lever <chuck.lever@oracle.com>
+ M:    Jeff Layton <jlayton@kernel.org>
  L:    linux-nfs@vger.kernel.org
  S:    Supported
  W:    http://nfs.sourceforge.net/
@@@ -10870,7 -10874,6 +10881,6 @@@ F:   arch/riscv/include/asm/kvm
  F:    arch/riscv/include/uapi/asm/kvm*
  F:    arch/riscv/kvm/
  F:    tools/testing/selftests/kvm/*/riscv/
- F:    tools/testing/selftests/kvm/riscv/
  
  KERNEL VIRTUAL MACHINE for s390 (KVM/s390)
  M:    Christian Borntraeger <borntraeger@linux.ibm.com>
@@@ -11264,6 -11267,7 +11274,7 @@@ M:   Damien Le Moal <damien.lemoal@openso
  L:    linux-ide@vger.kernel.org
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/libata.git
+ F:    Documentation/ABI/testing/sysfs-ata
  F:    Documentation/devicetree/bindings/ata/
  F:    drivers/ata/
  F:    include/linux/ata.h
@@@ -12703,7 -12707,6 +12714,6 @@@ L:   netdev@vger.kernel.or
  S:    Supported
  W:    http://www.mellanox.com
  Q:    https://patchwork.kernel.org/project/netdevbpf/list/
- F:    drivers/net/ethernet/mellanox/mlx5/core/accel/*
  F:    drivers/net/ethernet/mellanox/mlx5/core/en_accel/*
  F:    drivers/net/ethernet/mellanox/mlx5/core/fpga/*
  F:    include/linux/mlx5/mlx5_ifc_fpga.h
@@@ -13799,6 -13802,7 +13809,7 @@@ T:   git git://git.kernel.org/pub/scm/lin
  F:    Documentation/devicetree/bindings/net/
  F:    drivers/connector/
  F:    drivers/net/
+ F:    include/dt-bindings/net/
  F:    include/linux/etherdevice.h
  F:    include/linux/fcdevice.h
  F:    include/linux/fddidevice.h
@@@ -15831,6 -15835,14 +15842,14 @@@ S: Maintaine
  F:    Documentation/devicetree/bindings/iio/chemical/plantower,pms7003.yaml
  F:    drivers/iio/chemical/pms7003.c
  
+ PLATFORM FEATURE INFRASTRUCTURE
+ M:    Juergen Gross <jgross@suse.com>
+ S:    Maintained
+ F:    arch/*/include/asm/platform-feature.h
+ F:    include/asm-generic/platform-feature.h
+ F:    include/linux/platform-feature.h
+ F:    kernel/platform-feature.c
+ 
  PLDMFW LIBRARY
  M:    Jacob Keller <jacob.e.keller@intel.com>
  S:    Maintained
@@@ -19227,7 -19239,7 +19246,7 @@@ F:   arch/arc/plat-axs10
  SYNOPSYS AXS10x RESET CONTROLLER DRIVER
  M:    Eugeniy Paltsev <Eugeniy.Paltsev@synopsys.com>
  S:    Supported
- F:    Documentation/devicetree/bindings/reset/snps,axs10x-reset.txt
+ F:    Documentation/devicetree/bindings/reset/snps,axs10x-reset.yaml
  F:    drivers/reset/reset-axs10x.c
  
  SYNOPSYS CREG GPIO DRIVER
@@@ -19295,7 -19307,7 +19314,7 @@@ R:   Andy Shevchenko <andriy.shevchenko@l
  R:    Mika Westerberg <mika.westerberg@linux.intel.com>
  R:    Jan Dabros <jsd@semihalf.com>
  L:    linux-i2c@vger.kernel.org
- S:    Maintained
+ S:    Supported
  F:    drivers/i2c/busses/i2c-designware-*
  
  SYNOPSYS DESIGNWARE MMC/SD/SDIO DRIVER

diff --combined drivers/usb/dwc3/core.c
index 2c12bbb,5734219..1bd87da
--- 1/drivers/usb/dwc3/core.c
--- 2/drivers/usb/dwc3/core.c
+++ b/drivers/usb/dwc3/core.c
@@@ -426,7 -426,7 +426,7 @@@ static void dwc3_free_one_event_buffer(
   * otherwise ERR_PTR(errno).
   */
  static struct dwc3_event_buffer *dwc3_alloc_one_event_buffer(struct dwc3 *dwc,
 -              unsigned length)
 +              unsigned int length)
  {
        struct dwc3_event_buffer        *evt;
  
@@@ -469,7 -469,7 +469,7 @@@ static void dwc3_free_event_buffers(str
   * Returns 0 on success otherwise negative errno. In the error case, dwc
   * may contain some buffers allocated but not all which were requested.
   */
 -static int dwc3_alloc_event_buffers(struct dwc3 *dwc, unsigned length)
 +static int dwc3_alloc_event_buffers(struct dwc3 *dwc, unsigned int length)
  {
        struct dwc3_event_buffer *evt;
  
@@@ -1029,37 -1029,6 +1029,37 @@@ static void dwc3_set_incr_burst_type(st
        dwc3_writel(dwc->regs, DWC3_GSBUSCFG0, cfg);
  }
  
 +static void dwc3_set_power_down_clk_scale(struct dwc3 *dwc)
 +{
 +      u32 scale;
 +      u32 reg;
 +
 +      if (!dwc->susp_clk)
 +              return;
 +
 +      /*
 +       * The power down scale field specifies how many suspend_clk
 +       * periods fit into a 16KHz clock period. When performing
 +       * the division, round up the remainder.
 +       *
 +       * The power down scale value is calculated using the fastest
 +       * frequency of the suspend_clk. If it isn't fixed (but within
 +       * the accuracy requirement), the driver may not know the max
 +       * rate of the suspend_clk, so only update the power down scale
 +       * if the default is less than the calculated value from
 +       * clk_get_rate() or if the default is questionably high
 +       * (3x or more) to be within the requirement.
 +       */
 +      scale = DIV_ROUND_UP(clk_get_rate(dwc->susp_clk), 16000);
 +      reg = dwc3_readl(dwc->regs, DWC3_GCTL);
 +      if ((reg & DWC3_GCTL_PWRDNSCALE_MASK) < DWC3_GCTL_PWRDNSCALE(scale) ||
 +          (reg & DWC3_GCTL_PWRDNSCALE_MASK) > DWC3_GCTL_PWRDNSCALE(scale*3)) {
 +              reg &= ~(DWC3_GCTL_PWRDNSCALE_MASK);
 +              reg |= DWC3_GCTL_PWRDNSCALE(scale);
 +              dwc3_writel(dwc->regs, DWC3_GCTL, reg);
 +      }
 +}
 +
  /**
   * dwc3_core_init - Low-level initialization of DWC3 Core
   * @dwc: Pointer to our controller context structure
@@@ -1136,9 -1105,6 +1136,9 @@@ static int dwc3_core_init(struct dwc3 *
        if (ret)
                goto err1;
  
 +      /* Set power down scale of suspend_clk */
 +      dwc3_set_power_down_clk_scale(dwc);
 +
        /* Adjust Frame Length */
        dwc3_frame_length_adjustment(dwc);
  
@@@ -1318,7 -1284,7 +1318,7 @@@ static int dwc3_core_get_phy(struct dwc
        dwc->usb2_generic_phy = devm_phy_get(dev, "usb2-phy");
        if (IS_ERR(dwc->usb2_generic_phy)) {
                ret = PTR_ERR(dwc->usb2_generic_phy);
 -              if (ret == -ENOSYS || ret == -ENODEV)
 +              if (ret == -ENODEV)
                        dwc->usb2_generic_phy = NULL;
                else
                        return dev_err_probe(dev, ret, "no usb2 phy configured\n");
@@@ -1327,7 -1293,7 +1327,7 @@@
        dwc->usb3_generic_phy = devm_phy_get(dev, "usb3-phy");
        if (IS_ERR(dwc->usb3_generic_phy)) {
                ret = PTR_ERR(dwc->usb3_generic_phy);
 -              if (ret == -ENOSYS || ret == -ENODEV)
 +              if (ret == -ENODEV)
                        dwc->usb3_generic_phy = NULL;
                else
                        return dev_err_probe(dev, ret, "no usb3 phy configured\n");
@@@ -1678,13 -1644,8 +1678,8 @@@ static struct extcon_dev *dwc3_get_extc
         * This device property is for kernel internal use only and
         * is expected to be set by the glue code.
         */
-       if (device_property_read_string(dev, "linux,extcon-name", &name) == 0) {
-               edev = extcon_get_extcon_dev(name);
-               if (!edev)
-                       return ERR_PTR(-EPROBE_DEFER);
- 
-               return edev;
-       }
+       if (device_property_read_string(dev, "linux,extcon-name", &name) == 0)
+               return extcon_get_extcon_dev(name);
  
        /*
         * Try to get an extcon device from the USB PHY controller's "port"