From: Kevin Hilman <khilman-1D3HCaltpLuhEniVeURVKkEOCMrvLtNR@public.gmane.org>
To: Hema HK <hemahk-l0cyMroinI0@public.gmane.org>
Cc: linux-omap-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
linux-usb-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
Felipe Balbi
<felipe.balbi-xNZwKgViW5gAvxtiuMwx3w@public.gmane.org>,
Tony Lindgren <tony-4v6yS6AI5VpBDgjK7y7TUQ@public.gmane.org>
Subject: Re: [PATCH 1/8] usb: musb: Adding names for IRQs in resource structure
Date: Mon, 09 Aug 2010 13:54:29 -0700 [thread overview]
Message-ID: <87sk2nik1m.fsf@deeprootsystems.com> (raw)
In-Reply-To: <1281110124-3186-1-git-send-email-hemahk-l0cyMroinI0@public.gmane.org> (Hema HK's message of "Fri, 6 Aug 2010 21:25:24 +0530")
Hema HK <hemahk-l0cyMroinI0@public.gmane.org> writes:
> From: Hema HK <hemahk-l0cyMroinI0@public.gmane.org>
>
> Modified the Omap,Blackfin and Davinci board files to add the name of the IRQs
> in the resource structures and musb driver to use the get_irq_byname() api to
> get the mc and dma irq numbers instead of using the index as the order of
> resource definition need not be always in order of device interrupt and
> then dma interrupt
>
> Signed-off-by: Hema HK <hemahk-l0cyMroinI0@public.gmane.org>
> Cc: Felipe Balbi <felipe.balbi-xNZwKgViW5gAvxtiuMwx3w@public.gmane.org>
> Cc: Tony Lindgren <tony-4v6yS6AI5VpBDgjK7y7TUQ@public.gmane.org>
> Cc: Kevin Hilman <khilman-1D3HCaltpLuhEniVeURVKkEOCMrvLtNR@public.gmane.org>
> ---
>
> Based off omap4-next branch.
In patch 0/8 you say this is based on pm-wip/hwmods-omap4 branch. Here
you say thisis omap4-next branch (presumably in Santosh's tree.)
Otherwise, this change looks right.
Kevin
> arch/arm/mach-davinci/usb.c | 2 ++
> arch/arm/mach-omap2/usb-musb.c | 2 ++
> arch/blackfin/mach-bf527/boards/cm_bf527.c | 2 ++
> arch/blackfin/mach-bf527/boards/ezbrd.c | 2 ++
> arch/blackfin/mach-bf527/boards/ezkit.c | 2 ++
> arch/blackfin/mach-bf548/boards/cm_bf548.c | 2 ++
> arch/blackfin/mach-bf548/boards/ezkit.c | 2 ++
> drivers/usb/musb/cppi_dma.c | 2 +-
> drivers/usb/musb/musb_core.c | 2 +-
> drivers/usb/musb/musbhsdma.c | 2 +-
> 10 files changed, 17 insertions(+), 3 deletions(-)
>
> Index: linux-omap-pm/arch/arm/mach-davinci/usb.c
> ===================================================================
> --- linux-omap-pm.orig/arch/arm/mach-davinci/usb.c 2010-08-06 09:01:23.605862579 -0400
> +++ linux-omap-pm/arch/arm/mach-davinci/usb.c 2010-08-06 09:01:25.526112352 -0400
> @@ -64,10 +64,12 @@
> {
> .start = IRQ_USBINT,
> .flags = IORESOURCE_IRQ,
> + .name = "mc"
> },
> {
> /* placeholder for the dedicated CPPI IRQ */
> .flags = IORESOURCE_IRQ,
> + .name = "dma"
> },
> };
>
> Index: linux-omap-pm/arch/arm/mach-omap2/usb-musb.c
> ===================================================================
> --- linux-omap-pm.orig/arch/arm/mach-omap2/usb-musb.c 2010-08-06 09:01:23.613862415 -0400
> +++ linux-omap-pm/arch/arm/mach-omap2/usb-musb.c 2010-08-06 09:01:25.526112352 -0400
> @@ -39,10 +39,12 @@
> [1] = { /* general IRQ */
> .start = INT_243X_HS_USB_MC,
> .flags = IORESOURCE_IRQ,
> + .name = "mc",
> },
> [2] = { /* DMA IRQ */
> .start = INT_243X_HS_USB_DMA,
> .flags = IORESOURCE_IRQ,
> + .name = "dma",
> },
> };
>
> Index: linux-omap-pm/arch/blackfin/mach-bf527/boards/cm_bf527.c
> ===================================================================
> --- linux-omap-pm.orig/arch/blackfin/mach-bf527/boards/cm_bf527.c 2010-08-06 09:01:23.645862783 -0400
> +++ linux-omap-pm/arch/blackfin/mach-bf527/boards/cm_bf527.c 2010-08-06 09:01:25.526112352 -0400
> @@ -82,11 +82,13 @@
> .start = IRQ_USB_INT0,
> .end = IRQ_USB_INT0,
> .flags = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHLEVEL,
> + .name = "mc"
> },
> [2] = { /* DMA IRQ */
> .start = IRQ_USB_DMA,
> .end = IRQ_USB_DMA,
> .flags = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHLEVEL,
> + .name = "dma"
> },
> };
>
> Index: linux-omap-pm/arch/blackfin/mach-bf527/boards/ezbrd.c
> ===================================================================
> --- linux-omap-pm.orig/arch/blackfin/mach-bf527/boards/ezbrd.c 2010-08-06 09:01:23.637862922 -0400
> +++ linux-omap-pm/arch/blackfin/mach-bf527/boards/ezbrd.c 2010-08-06 09:01:25.526112352 -0400
> @@ -46,11 +46,13 @@
> .start = IRQ_USB_INT0,
> .end = IRQ_USB_INT0,
> .flags = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHLEVEL,
> + .name = "mc"
> },
> [2] = { /* DMA IRQ */
> .start = IRQ_USB_DMA,
> .end = IRQ_USB_DMA,
> .flags = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHLEVEL,
> + .name = "dma"
> },
> };
>
> Index: linux-omap-pm/arch/blackfin/mach-bf527/boards/ezkit.c
> ===================================================================
> --- linux-omap-pm.orig/arch/blackfin/mach-bf527/boards/ezkit.c 2010-08-06 09:01:23.653862977 -0400
> +++ linux-omap-pm/arch/blackfin/mach-bf527/boards/ezkit.c 2010-08-06 09:01:25.526112352 -0400
> @@ -86,11 +86,13 @@
> .start = IRQ_USB_INT0,
> .end = IRQ_USB_INT0,
> .flags = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHLEVEL,
> + .name = "mc"
> },
> [2] = { /* DMA IRQ */
> .start = IRQ_USB_DMA,
> .end = IRQ_USB_DMA,
> .flags = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHLEVEL,
> + .name = "dma"
> },
> };
>
> Index: linux-omap-pm/arch/blackfin/mach-bf548/boards/cm_bf548.c
> ===================================================================
> --- linux-omap-pm.orig/arch/blackfin/mach-bf548/boards/cm_bf548.c 2010-08-06 09:01:23.625864028 -0400
> +++ linux-omap-pm/arch/blackfin/mach-bf548/boards/cm_bf548.c 2010-08-06 09:01:25.526112352 -0400
> @@ -482,11 +482,13 @@
> .start = IRQ_USB_INT0,
> .end = IRQ_USB_INT0,
> .flags = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHLEVEL,
> + .name = "mc"
> },
> [2] = { /* DMA IRQ */
> .start = IRQ_USB_DMA,
> .end = IRQ_USB_DMA,
> .flags = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHLEVEL,
> + .name = "dma"
> },
> };
>
> Index: linux-omap-pm/arch/blackfin/mach-bf548/boards/ezkit.c
> ===================================================================
> --- linux-omap-pm.orig/arch/blackfin/mach-bf548/boards/ezkit.c 2010-08-06 09:01:23.629863856 -0400
> +++ linux-omap-pm/arch/blackfin/mach-bf548/boards/ezkit.c 2010-08-06 09:01:25.530112841 -0400
> @@ -587,11 +587,13 @@
> .start = IRQ_USB_INT0,
> .end = IRQ_USB_INT0,
> .flags = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHLEVEL,
> + .name = "mc"
> },
> [2] = { /* DMA IRQ */
> .start = IRQ_USB_DMA,
> .end = IRQ_USB_DMA,
> .flags = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHLEVEL,
> + .name = "dma"
> },
> };
>
> Index: linux-omap-pm/drivers/usb/musb/cppi_dma.c
> ===================================================================
> --- linux-omap-pm.orig/drivers/usb/musb/cppi_dma.c 2010-08-06 09:01:23.589863406 -0400
> +++ linux-omap-pm/drivers/usb/musb/cppi_dma.c 2010-08-06 09:01:25.530112841 -0400
> @@ -1307,7 +1307,7 @@
> struct cppi *controller;
> struct device *dev = musb->controller;
> struct platform_device *pdev = to_platform_device(dev);
> - int irq = platform_get_irq(pdev, 1);
> + int irq = platform_get_irq_byname(pdev, "dma");
>
> controller = kzalloc(sizeof *controller, GFP_KERNEL);
> if (!controller)
> Index: linux-omap-pm/drivers/usb/musb/musb_core.c
> ===================================================================
> --- linux-omap-pm.orig/drivers/usb/musb/musb_core.c 2010-08-06 09:01:23.585862534 -0400
> +++ linux-omap-pm/drivers/usb/musb/musb_core.c 2010-08-06 09:01:25.530112841 -0400
> @@ -2204,7 +2204,7 @@
> static int __init musb_probe(struct platform_device *pdev)
> {
> struct device *dev = &pdev->dev;
> - int irq = platform_get_irq(pdev, 0);
> + int irq = platform_get_irq_byname(pdev, "mc");
> int status;
> struct resource *iomem;
> void __iomem *base;
> Index: linux-omap-pm/drivers/usb/musb/musbhsdma.c
> ===================================================================
> --- linux-omap-pm.orig/drivers/usb/musb/musbhsdma.c 2010-08-06 09:01:23.597862505 -0400
> +++ linux-omap-pm/drivers/usb/musb/musbhsdma.c 2010-08-06 09:01:25.530112841 -0400
> @@ -366,7 +366,7 @@
> struct musb_dma_controller *controller;
> struct device *dev = musb->controller;
> struct platform_device *pdev = to_platform_device(dev);
> - int irq = platform_get_irq(pdev, 1);
> + int irq = platform_get_irq_byname(pdev, "dma");
>
> if (irq == 0) {
> dev_err(dev, "No DMA interrupt line!\n");
--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
next prev parent reply other threads:[~2010-08-09 20:54 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-08-06 15:55 [PATCH 1/8] usb: musb: Adding names for IRQs in resource structure Hema HK
[not found] ` <1281110124-3186-1-git-send-email-hemahk-l0cyMroinI0@public.gmane.org>
2010-08-09 20:54 ` Kevin Hilman [this message]
2010-08-10 5:15 ` Kalliguddi, Hema
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=87sk2nik1m.fsf@deeprootsystems.com \
--to=khilman-1d3hcaltpluheniveurvkkeocmrvltnr@public.gmane.org \
--cc=felipe.balbi-xNZwKgViW5gAvxtiuMwx3w@public.gmane.org \
--cc=hemahk-l0cyMroinI0@public.gmane.org \
--cc=linux-omap-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
--cc=linux-usb-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
--cc=tony-4v6yS6AI5VpBDgjK7y7TUQ@public.gmane.org \
/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: link
Be 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.