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

Merge tag 'usb-v5.11-rc1' of... 

Merge tag 'usb-v5.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/peter.chen/usb into usb-next

Peter writes:

Below are main changes for v5.11-rc1:

For Chipidea USB2:
- Add tracepoint support for UDC
- Some tiny improvements

For Cadence USB3
- Add some quirks for host mode, and let host work well at more use cases
	* SKIP_PHY_INIT
	* Disable BEI
	* Enable runtime PM default for i.mx platform
- Some tiny improvements

* tag 'usb-v5.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/peter.chen/usb:
  MAINTAINERS: Add myself as a reviewer for CADENCE USB3 DRD IP DRIVER
  usb: chipidea: ci_hdrc_imx: Use of_device_get_match_data()
  usb: chipidea: usbmisc_imx: Use of_device_get_match_data()
  usb: cdns3: fix NULL pointer dereference on no platform data
  usb: chipidea: trace: fix the endian issue
  usb: chipidea: add tracepoint support for udc
  doc: dt-binding: cdns,usb3: add wakeup-irq
  usb: cdns3: imx: enable runtime pm by default
  usb: cdns3: add quirk for enable runtime pm by default
  usb: cdns3: host: disable BEI support
  usb: cdns3: host: add xhci_plat_priv quirk XHCI_SKIP_PHY_INIT
  usb: cdns3: host: add .suspend_quirk for xhci-plat.c
  usb: cdns3: Rids of duplicate error message
  usb: cdns3: Add static to cdns3_gadget_exit function
parents 8010622c 8435ff0f

Documentation/devicetree/bindings/usb/cdns,usb3.yaml

+5 −0
Original line number Diff line number Diff line
@@ -26,16 +26,21 @@ properties: 
      - const: dev



  interrupts:

    minItems: 3

    items:

      - description: OTG/DRD controller interrupt

      - description: XHCI host controller interrupt

      - description: Device controller interrupt

      - description: interrupt used to wake up core, e.g when usbcmd.rs is

                     cleared by xhci core, this interrupt is optional



  interrupt-names:

    minItems: 3

    items:

      - const: host

      - const: peripheral

      - const: otg

      - const: wakeup



  dr_mode:

    enum: [host, otg, peripheral]

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -3863,6 +3863,7 @@ CADENCE USB3 DRD IP DRIVER 
M:	Peter Chen <peter.chen@nxp.com>

M:	Pawel Laszczak <pawell@cadence.com>

M:	Roger Quadros <rogerq@ti.com>

R:	Aswath Govindraju <a-govindraju@ti.com>

L:	linux-usb@vger.kernel.org

S:	Maintained

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/peter.chen/usb.git

drivers/usb/cdns3/cdns3-imx.c

+1 −1
Original line number Diff line number Diff line
@@ -151,6 +151,7 @@ static int cdns_imx_platform_suspend(struct device *dev, 
	bool suspend, bool wakeup);

static struct cdns3_platform_data cdns_imx_pdata = {

	.platform_suspend = cdns_imx_platform_suspend,

	.quirks		  = CDNS3_DEFAULT_PM_RUNTIME_ALLOW,

};



static const struct of_dev_auxdata cdns_imx_auxdata[] = {
@@ -206,7 +207,6 @@ static int cdns_imx_probe(struct platform_device *pdev) 
	device_set_wakeup_capable(dev, true);

	pm_runtime_set_active(dev);

	pm_runtime_enable(dev);

	pm_runtime_forbid(dev);



	return ret;

err:

drivers/usb/cdns3/core.c

+4 −11
Original line number Diff line number Diff line
@@ -465,11 +465,8 @@ static int cdns3_probe(struct platform_device *pdev) 
	cdns->xhci_res[1] = *res;



	cdns->dev_irq = platform_get_irq_byname(pdev, "peripheral");

	if (cdns->dev_irq == -EPROBE_DEFER)

		return cdns->dev_irq;



	if (cdns->dev_irq < 0)

		dev_err(dev, "couldn't get peripheral irq\n");

		return cdns->dev_irq;



	regs = devm_platform_ioremap_resource_byname(pdev, "dev");

	if (IS_ERR(regs))
@@ -477,14 +474,9 @@ static int cdns3_probe(struct platform_device *pdev) 
	cdns->dev_regs	= regs;



	cdns->otg_irq = platform_get_irq_byname(pdev, "otg");

	if (cdns->otg_irq == -EPROBE_DEFER)

	if (cdns->otg_irq < 0)

		return cdns->otg_irq;



	if (cdns->otg_irq < 0) {

		dev_err(dev, "couldn't get otg irq\n");

		return cdns->otg_irq;

	}



	res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "otg");

	if (!res) {

		dev_err(dev, "couldn't get otg resource\n");
@@ -569,6 +561,7 @@ static int cdns3_probe(struct platform_device *pdev) 
	device_set_wakeup_capable(dev, true);

	pm_runtime_set_active(dev);

	pm_runtime_enable(dev);

	if (!(cdns->pdata && (cdns->pdata->quirks & CDNS3_DEFAULT_PM_RUNTIME_ALLOW)))

		pm_runtime_forbid(dev);



	/*

drivers/usb/cdns3/core.h

+4 −0
Original line number Diff line number Diff line
@@ -42,6 +42,8 @@ struct cdns3_role_driver { 
struct cdns3_platform_data {

	int (*platform_suspend)(struct device *dev,

			bool suspend, bool wakeup);

	unsigned long quirks;

#define CDNS3_DEFAULT_PM_RUNTIME_ALLOW	BIT(0)

};



/**
@@ -73,6 +75,7 @@ struct cdns3_platform_data { 
 * @wakeup_pending: wakeup interrupt pending

 * @pdata: platform data from glue layer

 * @lock: spinlock structure

 * @xhci_plat_data: xhci private data structure pointer

 */

struct cdns3 {

	struct device			*dev;
@@ -106,6 +109,7 @@ struct cdns3 { 
	bool				wakeup_pending;

	struct cdns3_platform_data	*pdata;

	spinlock_t			lock;

	struct xhci_plat_priv		*xhci_plat_data;

};



int cdns3_hw_role_switch(struct cdns3 *cdns);

CRA Git | Maintained and supported by SUSTech CRA and CCSE