From: Roger Quadros <rogerq@ti.com> To: <balbi@ti.com> Cc: <tony@atomide.com>, <Joao.Pinto@synopsys.com>, <sergei.shtylyov@cogentembedded.com>, <peter.chen@freescale.com>, <jun.li@freescale.com>, <linux-usb@vger.kernel.org>, <linux-kernel@vger.kernel.org>, <linux-omap@vger.kernel.org>, Roger Quadros <rogerq@ti.com> Subject: [PATCH v4 4/9] usb: dwc3: core: Adapt to named interrupts Date: Wed, 2 Sep 2015 17:24:19 +0300 [thread overview] Message-ID: <1441203864-15786-5-git-send-email-rogerq@ti.com> (raw) In-Reply-To: <1441203864-15786-1-git-send-email-rogerq@ti.com> From: Felipe Balbi <balbi@ti.com> Add support to use interrupt names, Following are the interrupt names Peripheral Interrupt - peripheral HOST Interrupt - host OTG Interrupt - otg [Roger Q] - If any of these are missing we use the first available IRQ resource so that we don't break with older DTBs. - Use gadget_irq in gadget driver. Signed-off-by: Felipe Balbi <balbi@ti.com> Signed-off-by: Roger Quadros <rogerq@ti.com> --- drivers/usb/dwc3/core.c | 12 ++++++++++++ drivers/usb/dwc3/core.h | 7 +++++++ drivers/usb/dwc3/gadget.c | 2 +- 3 files changed, 20 insertions(+), 1 deletion(-) diff --git a/drivers/usb/dwc3/core.c b/drivers/usb/dwc3/core.c index 2e36a9b..38b31df 100644 --- a/drivers/usb/dwc3/core.c +++ b/drivers/usb/dwc3/core.c @@ -958,6 +958,18 @@ static int dwc3_probe(struct platform_device *pdev) dwc->xhci_resources[1].flags = res->flags; dwc->xhci_resources[1].name = res->name; + dwc->otg_irq = platform_get_irq_byname(pdev, "otg"); + if (dwc->otg_irq < 0) + dwc->otg_irq = res->start; + + dwc->gadget_irq = platform_get_irq_byname(pdev, "peripheral"); + if (dwc->gadget_irq < 0) + dwc->gadget_irq = res->start; + + dwc->xhci_irq = platform_get_irq_byname(pdev, "host"); + if (dwc->xhci_irq < 0) + dwc->xhci_irq = res->start; + 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 4b85330..bd32cb2 100644 --- a/drivers/usb/dwc3/core.h +++ b/drivers/usb/dwc3/core.h @@ -742,6 +742,9 @@ struct dwc3_scratchpad_array { * @maximum_speed: maximum speed requested (mainly for testing purposes) * @revision: revision register contents * @dr_mode: requested mode of operation + * @xhci_irq: IRQ number for XHCI IRQs + * @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 @@ -847,6 +850,10 @@ struct dwc3 { enum usb_dr_mode dr_mode; + int gadget_irq; + int xhci_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 0c25704..1148ec8 100644 --- a/drivers/usb/dwc3/gadget.c +++ b/drivers/usb/dwc3/gadget.c @@ -1533,7 +1533,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) { -- 2.1.4
WARNING: multiple messages have this Message-ID (diff)
From: Roger Quadros <rogerq@ti.com> To: balbi@ti.com Cc: tony@atomide.com, Joao.Pinto@synopsys.com, sergei.shtylyov@cogentembedded.com, peter.chen@freescale.com, jun.li@freescale.com, linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org, linux-omap@vger.kernel.org, Roger Quadros <rogerq@ti.com> Subject: [PATCH v4 4/9] usb: dwc3: core: Adapt to named interrupts Date: Wed, 2 Sep 2015 17:24:19 +0300 [thread overview] Message-ID: <1441203864-15786-5-git-send-email-rogerq@ti.com> (raw) In-Reply-To: <1441203864-15786-1-git-send-email-rogerq@ti.com> From: Felipe Balbi <balbi@ti.com> Add support to use interrupt names, Following are the interrupt names Peripheral Interrupt - peripheral HOST Interrupt - host OTG Interrupt - otg [Roger Q] - If any of these are missing we use the first available IRQ resource so that we don't break with older DTBs. - Use gadget_irq in gadget driver. Signed-off-by: Felipe Balbi <balbi@ti.com> Signed-off-by: Roger Quadros <rogerq@ti.com> --- drivers/usb/dwc3/core.c | 12 ++++++++++++ drivers/usb/dwc3/core.h | 7 +++++++ drivers/usb/dwc3/gadget.c | 2 +- 3 files changed, 20 insertions(+), 1 deletion(-) diff --git a/drivers/usb/dwc3/core.c b/drivers/usb/dwc3/core.c index 2e36a9b..38b31df 100644 --- a/drivers/usb/dwc3/core.c +++ b/drivers/usb/dwc3/core.c @@ -958,6 +958,18 @@ static int dwc3_probe(struct platform_device *pdev) dwc->xhci_resources[1].flags = res->flags; dwc->xhci_resources[1].name = res->name; + dwc->otg_irq = platform_get_irq_byname(pdev, "otg"); + if (dwc->otg_irq < 0) + dwc->otg_irq = res->start; + + dwc->gadget_irq = platform_get_irq_byname(pdev, "peripheral"); + if (dwc->gadget_irq < 0) + dwc->gadget_irq = res->start; + + dwc->xhci_irq = platform_get_irq_byname(pdev, "host"); + if (dwc->xhci_irq < 0) + dwc->xhci_irq = res->start; + 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 4b85330..bd32cb2 100644 --- a/drivers/usb/dwc3/core.h +++ b/drivers/usb/dwc3/core.h @@ -742,6 +742,9 @@ struct dwc3_scratchpad_array { * @maximum_speed: maximum speed requested (mainly for testing purposes) * @revision: revision register contents * @dr_mode: requested mode of operation + * @xhci_irq: IRQ number for XHCI IRQs + * @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 @@ -847,6 +850,10 @@ struct dwc3 { enum usb_dr_mode dr_mode; + int gadget_irq; + int xhci_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 0c25704..1148ec8 100644 --- a/drivers/usb/dwc3/gadget.c +++ b/drivers/usb/dwc3/gadget.c @@ -1533,7 +1533,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) { -- 2.1.4
next prev parent reply other threads:[~2015-09-02 14:24 UTC|newest] Thread overview: 76+ messages / expand[flat|nested] mbox.gz Atom feed top 2015-09-02 14:24 [PATCH v4 0/9] usb: dwc3: add dual-role support Roger Quadros 2015-09-02 14:24 ` Roger Quadros 2015-09-02 14:24 ` [PATCH v4 1/9] " Roger Quadros 2015-09-02 14:24 ` Roger Quadros 2015-09-02 14:31 ` Felipe Balbi 2015-09-02 14:31 ` Felipe Balbi 2015-09-03 12:21 ` Roger Quadros 2015-09-03 12:21 ` Roger Quadros 2015-09-03 15:44 ` Felipe Balbi 2015-09-03 15:44 ` Felipe Balbi 2015-09-04 9:06 ` Roger Quadros 2015-09-04 9:06 ` Roger Quadros 2015-09-07 9:42 ` Roger Quadros 2015-09-07 9:42 ` Roger Quadros 2015-09-06 2:02 ` Peter Chen 2015-09-06 2:02 ` Peter Chen 2015-09-07 9:39 ` Roger Quadros 2015-09-07 9:39 ` Roger Quadros 2015-09-02 14:24 ` [PATCH v4 2/9] usb: dwc3: core.h: add some register definitions Roger Quadros 2015-09-02 14:24 ` Roger Quadros 2015-09-02 14:24 ` [PATCH v4 3/9] usb: dwc3: dwc3-omap: Make the wrapper interrupt shared Roger Quadros 2015-09-02 14:24 ` Roger Quadros 2015-09-02 14:32 ` Felipe Balbi 2015-09-02 14:32 ` Felipe Balbi 2015-09-02 14:24 ` Roger Quadros [this message] 2015-09-02 14:24 ` [PATCH v4 4/9] usb: dwc3: core: Adapt to named interrupts Roger Quadros 2015-09-02 14:34 ` Felipe Balbi 2015-09-02 14:34 ` Felipe Balbi 2015-09-03 12:46 ` Roger Quadros 2015-09-03 12:46 ` Roger Quadros 2015-09-03 15:48 ` Felipe Balbi 2015-09-03 15:48 ` Felipe Balbi 2015-09-04 9:11 ` Roger Quadros 2015-09-04 9:11 ` Roger Quadros 2015-09-02 14:24 ` [PATCH v4 5/9] usb: dwc3: core: make dual-role work with OTG irq Roger Quadros 2015-09-02 14:24 ` Roger Quadros 2015-09-02 14:43 ` Felipe Balbi 2015-09-02 14:43 ` Felipe Balbi 2015-09-03 13:52 ` Roger Quadros 2015-09-03 13:52 ` Roger Quadros 2015-09-03 15:51 ` Felipe Balbi 2015-09-03 15:51 ` Felipe Balbi 2015-09-04 9:13 ` Roger Quadros 2015-09-04 9:13 ` Roger Quadros 2015-09-06 2:20 ` Peter Chen 2015-09-06 2:20 ` Peter Chen 2015-09-15 14:46 ` Roger Quadros 2015-09-15 14:46 ` Roger Quadros 2015-09-02 14:24 ` [PATCH v4 6/9] usb: dwc3: save/restore OTG registers during suspend/resume Roger Quadros 2015-09-02 14:24 ` Roger Quadros 2015-09-02 14:44 ` Felipe Balbi 2015-09-02 14:44 ` Felipe Balbi 2015-09-03 13:54 ` Roger Quadros 2015-09-03 13:54 ` Roger Quadros 2015-09-02 14:24 ` [PATCH v4 7/9] usb: dwc3: gadget: Fix suspend/resume during dual-role mode Roger Quadros 2015-09-02 14:24 ` Roger Quadros 2015-09-02 14:24 ` [PATCH v4 8/9] usb: dwc3: core: Prevent otg events from disabling themselves Roger Quadros 2015-09-02 14:24 ` Roger Quadros 2015-09-02 14:47 ` Felipe Balbi 2015-09-02 14:47 ` Felipe Balbi 2015-09-03 13:54 ` Roger Quadros 2015-09-03 13:54 ` Roger Quadros 2015-09-02 14:24 ` [PATCH v4 9/9] usb: dwc3: core: don't break during suspend/resume while we're dual-role Roger Quadros 2015-09-02 14:24 ` Roger Quadros 2015-09-02 14:48 ` Felipe Balbi 2015-09-02 14:48 ` Felipe Balbi 2015-09-03 14:02 ` Roger Quadros 2015-09-03 14:02 ` Roger Quadros 2015-09-02 17:22 ` Sergei Shtylyov 2015-09-03 14:01 ` Roger Quadros 2015-09-03 14:01 ` Roger Quadros 2015-09-03 14:05 ` Sergei Shtylyov 2015-09-03 14:05 ` Sergei Shtylyov 2015-09-03 14:10 ` Roger Quadros 2015-09-03 14:10 ` Roger Quadros 2015-09-03 14:13 ` Sergei Shtylyov
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1441203864-15786-5-git-send-email-rogerq@ti.com \ --to=rogerq@ti.com \ --cc=Joao.Pinto@synopsys.com \ --cc=balbi@ti.com \ --cc=jun.li@freescale.com \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-omap@vger.kernel.org \ --cc=linux-usb@vger.kernel.org \ --cc=peter.chen@freescale.com \ --cc=sergei.shtylyov@cogentembedded.com \ --cc=tony@atomide.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.