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

Commit 9522def4 authored by Roger Quadros's avatar Roger Quadros Committed by Felipe Balbi
Browse files

usb: dwc3: core: cleanup IRQ resources 



Implementations might use different IRQs for
host, gadget so use named interrupt resources
to allow device tree to specify the interrupts.

Following are the interrupt names

Peripheral Interrupt - peripheral
HOST Interrupt - host

Maintain backward compatibility for a single named
interrupt ("dwc3_usb3") for all interrupts as well as
unnamed interrupt at index 0 for all interrupts.

As platform_get_irq() variants are used, tackle
the -EPROBE_DEFER case as well.

Signed-off-by: default avatarRoger Quadros <rogerq@ti.com>
Signed-off-by: default avatarFelipe Balbi <felipe.balbi@linux.intel.com>
parent ce15ed4c

drivers/usb/dwc3/core.c

+8 −14
Original line number Diff line number Diff line
@@ -766,6 +766,7 @@ static int dwc3_core_init_mode(struct dwc3 *dwc) 
		dwc3_set_mode(dwc, DWC3_GCTL_PRTCAP_DEVICE);

		ret = dwc3_gadget_init(dwc);

		if (ret) {

			if (ret != -EPROBE_DEFER)

				dev_err(dev, "failed to initialize gadget\n");

			return ret;

		}
@@ -774,6 +775,7 @@ static int dwc3_core_init_mode(struct dwc3 *dwc) 
		dwc3_set_mode(dwc, DWC3_GCTL_PRTCAP_HOST);

		ret = dwc3_host_init(dwc);

		if (ret) {

			if (ret != -EPROBE_DEFER)

				dev_err(dev, "failed to initialize host\n");

			return ret;

		}
@@ -782,12 +784,14 @@ static int dwc3_core_init_mode(struct dwc3 *dwc) 
		dwc3_set_mode(dwc, DWC3_GCTL_PRTCAP_OTG);

		ret = dwc3_host_init(dwc);

		if (ret) {

			if (ret != -EPROBE_DEFER)

				dev_err(dev, "failed to initialize host\n");

			return ret;

		}



		ret = dwc3_gadget_init(dwc);

		if (ret) {

			if (ret != -EPROBE_DEFER)

				dev_err(dev, "failed to initialize gadget\n");

			return ret;

		}
@@ -843,16 +847,6 @@ static int dwc3_probe(struct platform_device *pdev) 
	dwc->mem = mem;

	dwc->dev = dev;



	res = platform_get_resource(pdev, IORESOURCE_IRQ, 0);

	if (!res) {

		dev_err(dev, "missing IRQ\n");

		return -ENODEV;

	}

	dwc->xhci_resources[1].start = res->start;

	dwc->xhci_resources[1].end = res->end;

	dwc->xhci_resources[1].flags = res->flags;

	dwc->xhci_resources[1].name = res->name;



	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	if (!res) {

		dev_err(dev, "missing memory resource\n");

drivers/usb/dwc3/gadget.c

+28 −3
Original line number Diff line number Diff line
@@ -1765,7 +1765,7 @@ static int dwc3_gadget_start(struct usb_gadget *g, 
	int			ret = 0;

	int			irq;



	irq = platform_get_irq(to_platform_device(dwc->dev), 0);

	irq = dwc->irq_gadget;

	ret = request_threaded_irq(irq, dwc3_interrupt, dwc3_thread_interrupt,

			IRQF_SHARED, "dwc3", dwc->ev_buf);

	if (ret) {
@@ -1773,7 +1773,6 @@ static int dwc3_gadget_start(struct usb_gadget *g, 
				irq, ret);

		goto err0;

	}

	dwc->irq_gadget = irq;



	spin_lock_irqsave(&dwc->lock, flags);

	if (dwc->gadget_driver) {
@@ -2891,7 +2890,33 @@ static irqreturn_t dwc3_interrupt(int irq, void *_evt) 
 */

int dwc3_gadget_init(struct dwc3 *dwc)

{

	int					ret;

	int ret, irq;

	struct platform_device *dwc3_pdev = to_platform_device(dwc->dev);



	irq = platform_get_irq_byname(dwc3_pdev, "peripheral");

	if (irq == -EPROBE_DEFER)

		return irq;



	if (irq <= 0) {

		irq = platform_get_irq_byname(dwc3_pdev, "dwc_usb3");

		if (irq == -EPROBE_DEFER)

			return irq;



		if (irq <= 0) {

			irq = platform_get_irq(dwc3_pdev, 0);

			if (irq <= 0) {

				if (irq != -EPROBE_DEFER) {

					dev_err(dwc->dev,

						"missing peripheral IRQ\n");

				}

				if (!irq)

					irq = -EINVAL;

				return irq;

			}

		}

	}



	dwc->irq_gadget = irq;



	dwc->ctrl_req = dma_alloc_coherent(dwc->dev, sizeof(*dwc->ctrl_req),

			&dwc->ctrl_req_addr, GFP_KERNEL);

drivers/usb/dwc3/host.c

+42 −1
Original line number Diff line number Diff line
@@ -24,7 +24,48 @@ int dwc3_host_init(struct dwc3 *dwc) 
{

	struct platform_device	*xhci;

	struct usb_xhci_pdata	pdata;

	int			ret;

	int			ret, irq;

	struct resource		*res;

	struct platform_device	*dwc3_pdev = to_platform_device(dwc->dev);



	irq = platform_get_irq_byname(dwc3_pdev, "host");

	if (irq == -EPROBE_DEFER)

		return irq;



	if (irq <= 0) {

		irq = platform_get_irq_byname(dwc3_pdev, "dwc_usb3");

		if (irq == -EPROBE_DEFER)

			return irq;



		if (irq <= 0) {

			irq = platform_get_irq(dwc3_pdev, 0);

			if (irq <= 0) {

				if (irq != -EPROBE_DEFER) {

					dev_err(dwc->dev,

						"missing host IRQ\n");

				}

				if (!irq)

					irq = -EINVAL;

				return irq;

			} else {

				res = platform_get_resource(dwc3_pdev,

							    IORESOURCE_IRQ, 0);

			}

		} else {

			res = platform_get_resource_byname(dwc3_pdev,

							   IORESOURCE_IRQ,

							   "dwc_usb3");

		}



	} else {

		res = platform_get_resource_byname(dwc3_pdev, IORESOURCE_IRQ,

						   "host");

	}



	dwc->xhci_resources[1].start = irq;

	dwc->xhci_resources[1].end = irq;

	dwc->xhci_resources[1].flags = res->flags;

	dwc->xhci_resources[1].name = res->name;



	xhci = platform_device_alloc("xhci-hcd", PLATFORM_DEVID_AUTO);

	if (!xhci) {