lkml.org 
[lkml]   [2016]   [Apr]   [11]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v6 05/10] usb: dwc3: core: cleanup IRQ resources
    Date
    Implementations might use different IRQs for
    host, gadget and OTG so use named interrupt resources
    to allow Device tree to specify the 3 interrupts.

    Following are the interrupt names

    Peripheral Interrupt - peripheral
    HOST Interrupt - host
    OTG Interrupt - otg

    We still maintain backward compatibility for a single named
    interrupt for all 3 interrupts (e.g. for dwc3-pci) and
    single unnamed interrupt for all 3 interrupts (e.g. old DT).

    Signed-off-by: Roger Quadros <rogerq@ti.com>
    ---
    drivers/usb/dwc3/core.c | 26 ++++++++++++++++----------
    drivers/usb/dwc3/core.h | 5 +++++
    drivers/usb/dwc3/gadget.c | 19 ++++++++++++++++++-
    drivers/usb/dwc3/host.c | 19 +++++++++++++++++++
    4 files changed, 58 insertions(+), 11 deletions(-)

    diff --git a/drivers/usb/dwc3/core.c b/drivers/usb/dwc3/core.c
    index 17fd8144..1c754749 100644
    --- a/drivers/usb/dwc3/core.c
    +++ b/drivers/usb/dwc3/core.c
    @@ -746,6 +746,8 @@ static int dwc3_core_init_mode(struct dwc3 *dwc)
    {
    struct device *dev = dwc->dev;
    int ret;
    + struct resource *res;
    + struct platform_device *dwc3_pdev = to_platform_device(dwc->dev);

    switch (dwc->dr_mode) {
    case USB_DR_MODE_PERIPHERAL:
    @@ -765,6 +767,20 @@ static int dwc3_core_init_mode(struct dwc3 *dwc)
    }
    break;
    case USB_DR_MODE_OTG:
    + dwc->otg_irq = platform_get_irq_byname(dwc3_pdev, "otg");
    + if (dwc->otg_irq <= 0) {
    + dwc->otg_irq = platform_get_irq_byname(dwc3_pdev,
    + "dwc_usb3");
    + if (dwc->otg_irq <= 0) {
    + res = platform_get_resource(dwc3_pdev,
    + IORESOURCE_IRQ, 0);
    + if (!res) {
    + dev_err(dwc->dev, "missing otg IRQ\n");
    + return -ENODEV;
    + }
    + dwc->otg_irq = res->start;
    + }
    + }
    dwc3_set_mode(dwc, DWC3_GCTL_PRTCAP_OTG);
    ret = dwc3_host_init(dwc);
    if (ret) {
    @@ -831,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");
    diff --git a/drivers/usb/dwc3/core.h b/drivers/usb/dwc3/core.h
    index 81039f7..79422dd 100644
    --- a/drivers/usb/dwc3/core.h
    +++ b/drivers/usb/dwc3/core.h
    @@ -754,6 +754,8 @@ struct dwc3_scratchpad_array {
    * @maximum_speed: maximum speed requested (mainly for testing purposes)
    * @revision: revision register contents
    * @dr_mode: requested mode of operation
    + * @gadget_irq: IRQ number for Peripheral IRQs
    + * @otg_irq: IRQ number for OTG IRQs
    * @usb2_phy: pointer to USB2 PHY
    * @usb3_phy: pointer to USB3 PHY
    * @usb2_generic_phy: pointer to USB2 PHY
    @@ -857,6 +859,9 @@ struct dwc3 {

    enum usb_dr_mode dr_mode;

    + int gadget_irq;
    + int otg_irq;
    +
    /* used for suspend/resume */
    u32 dcfg;
    u32 gctl;
    diff --git a/drivers/usb/dwc3/gadget.c b/drivers/usb/dwc3/gadget.c
    index 3ac170f..90f514c 100644
    --- a/drivers/usb/dwc3/gadget.c
    +++ b/drivers/usb/dwc3/gadget.c
    @@ -1617,7 +1617,7 @@ static int dwc3_gadget_start(struct usb_gadget *g,
    int irq;
    u32 reg;

    - irq = platform_get_irq(to_platform_device(dwc->dev), 0);
    + irq = dwc->gadget_irq;
    ret = request_threaded_irq(irq, dwc3_interrupt, dwc3_thread_interrupt,
    IRQF_SHARED, "dwc3", dwc);
    if (ret) {
    @@ -2795,6 +2795,23 @@ static irqreturn_t dwc3_interrupt(int irq, void *_dwc)
    int dwc3_gadget_init(struct dwc3 *dwc)
    {
    int ret;
    + struct resource *res;
    + struct platform_device *dwc3_pdev = to_platform_device(dwc->dev);
    +
    + dwc->gadget_irq = platform_get_irq_byname(dwc3_pdev, "peripheral");
    + if (dwc->gadget_irq <= 0) {
    + dwc->gadget_irq = platform_get_irq_byname(dwc3_pdev,
    + "dwc_usb3");
    + if (dwc->gadget_irq <= 0) {
    + res = platform_get_resource(dwc3_pdev, IORESOURCE_IRQ,
    + 0);
    + if (!res) {
    + dev_err(dwc->dev, "missing peripheral IRQ\n");
    + return -ENODEV;
    + }
    + dwc->gadget_irq = res->start;
    + }
    + }

    dwc->ctrl_req = dma_alloc_coherent(dwc->dev, sizeof(*dwc->ctrl_req),
    &dwc->ctrl_req_addr, GFP_KERNEL);
    diff --git a/drivers/usb/dwc3/host.c b/drivers/usb/dwc3/host.c
    index c679f63..f2b60a4 100644
    --- a/drivers/usb/dwc3/host.c
    +++ b/drivers/usb/dwc3/host.c
    @@ -25,6 +25,25 @@ int dwc3_host_init(struct dwc3 *dwc)
    struct platform_device *xhci;
    struct usb_xhci_pdata pdata;
    int ret;
    + struct resource *res;
    + struct platform_device *dwc3_pdev = to_platform_device(dwc->dev);
    +
    + res = platform_get_resource_byname(dwc3_pdev, IORESOURCE_IRQ, "host");
    + if (!res) {
    + res = platform_get_resource_byname(dwc3_pdev, IORESOURCE_IRQ,
    + "dwc_usb3");
    + if (!res) {
    + res = platform_get_resource(dwc3_pdev, IORESOURCE_IRQ,
    + 0);
    + if (!res)
    + return -ENOMEM;
    + }
    + }
    +
    + 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;

    xhci = platform_device_alloc("xhci-hcd", PLATFORM_DEVID_AUTO);
    if (!xhci) {
    --
    2.5.0
    \
     
     \ /
      Last update: 2016-04-11 14:01    [W:4.063 / U:0.612 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site