Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4ae8beac authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge tag 'fixes-for-v5.4-rc5' of... 

Merge tag 'fixes-for-v5.4-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb

 into usb-linus

Felipe writes:

USB: fixes for v5.4-rc5

Not much here, only 14 commits in different drivers.

As for the specifics, Roger Quadros fixed an important bug in cdns3
where the driver was making decisions about data pull-up management
behind the UDC framework's back.

The Atmel UDC got a fix for interrupt storm in FIFO mode, this was done
by Cristian Brisan.

Apart from these, we have the usual set of non-critical fixes.

Signed-off-by: default avatarFelipe Balbi <balbi@kernel.org>

* tag 'fixes-for-v5.4-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb:
  usb: cdns3: gadget: Don't manage pullups
  usb: dwc3: remove the call trace of USBx_GFLADJ
  usb: gadget: configfs: fix concurrent issue between composite APIs
  usb: dwc3: pci: prevent memory leak in dwc3_pci_probe
  usb: gadget: composite: Fix possible double free memory bug
  usb: gadget: udc: atmel: Fix interrupt storm in FIFO mode.
  usb: renesas_usbhs: fix type of buf
  usb: renesas_usbhs: Fix warnings in usbhsg_recip_handler_std_set_device()
  usb: gadget: udc: renesas_usb3: Fix __le16 warnings
  usb: renesas_usbhs: fix __le16 warnings
  usb: cdns3: include host-export,h for cdns3_host_init
  usb: mtu3: fix missing include of mtu3_dr.h
  usb: fsl: Check memory resource before releasing it
  usb: dwc3: select CONFIG_REGMAP_MMIO
parents d6d5df1d f3fb802e

drivers/usb/cdns3/gadget.c

+0 −4
Original line number Diff line number Diff line
@@ -2329,8 +2329,6 @@ static void cdns3_gadget_config(struct cdns3_device *priv_dev) 
	writel(USB_CONF_CLK2OFFDS | USB_CONF_L1DS, &regs->usb_conf);



	cdns3_configure_dmult(priv_dev, NULL);



	cdns3_gadget_pullup(&priv_dev->gadget, 1);

}



/**
@@ -2713,8 +2711,6 @@ static int cdns3_gadget_suspend(struct cdns3 *cdns, bool do_wakeup) 
	/* disable interrupt for device */

	writel(0, &priv_dev->regs->usb_ien);



	cdns3_gadget_pullup(&priv_dev->gadget, 0);



	return 0;

}

drivers/usb/cdns3/host-export.h

+0 −1
Original line number Diff line number Diff line
@@ -12,7 +12,6 @@ 
#ifdef CONFIG_USB_CDNS3_HOST



int cdns3_host_init(struct cdns3 *cdns);

void cdns3_host_exit(struct cdns3 *cdns);



#else

drivers/usb/cdns3/host.c

+1 −0
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ 
#include <linux/platform_device.h>

#include "core.h"

#include "drd.h"

#include "host-export.h"



static int __cdns3_host_init(struct cdns3 *cdns)

{

drivers/usb/dwc3/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -102,6 +102,7 @@ config USB_DWC3_MESON_G12A 
       depends on ARCH_MESON || COMPILE_TEST

       default USB_DWC3

       select USB_ROLE_SWITCH

	select REGMAP_MMIO

       help

         Support USB2/3 functionality in Amlogic G12A platforms.

	 Say 'Y' or 'M' if you have one such device.

drivers/usb/dwc3/core.c

+1 −2
Original line number Diff line number Diff line
@@ -312,8 +312,7 @@ static void dwc3_frame_length_adjustment(struct dwc3 *dwc) 


	reg = dwc3_readl(dwc->regs, DWC3_GFLADJ);

	dft = reg & DWC3_GFLADJ_30MHZ_MASK;

	if (!dev_WARN_ONCE(dwc->dev, dft == dwc->fladj,

	    "request value same as default, ignoring\n")) {

	if (dft != dwc->fladj) {

		reg &= ~DWC3_GFLADJ_30MHZ_MASK;

		reg |= DWC3_GFLADJ_30MHZ_SDBND_SEL | dwc->fladj;

		dwc3_writel(dwc->regs, DWC3_GFLADJ, reg);