* [PATCH 1/9 v3] usb: musb: Adding names for IRQs in resource structure
@ 2010-09-23 0:27 Hema HK
[not found] ` <1285201631-26266-1-git-send-email-hemahk-l0cyMroinI0@public.gmane.org>
0 siblings, 1 reply; 14+ messages in thread
From: Hema HK @ 2010-09-23 0:27 UTC (permalink / raw)
To: linux-omap-u79uwXL29TY76Z2rM5mHXA,
linux-usb-u79uwXL29TY76Z2rM5mHXA
Cc: Hema HK, Felipe Balbi, Tony Lindgren, Kevin Hilman,
Cousson, Benoit, Paul Walmsley
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 <balbi-l0cyMroinI0@public.gmane.org>
Cc: Tony Lindgren <tony-4v6yS6AI5VpBDgjK7y7TUQ@public.gmane.org>
Cc: Kevin Hilman <khilman-1D3HCaltpLuhEniVeURVKkEOCMrvLtNR@public.gmane.org>
Cc: Cousson, Benoit <b-cousson-l0cyMroinI0@public.gmane.org>
Cc: Paul Walmsley <paul-DWxLp4Yu+b8AvxtiuMwx3w@public.gmane.org>
---
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
+++ linux-omap-pm/arch/arm/mach-davinci/usb.c
@@ -64,10 +64,12 @@ static struct resource usb_resources[] =
{
.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
+++ linux-omap-pm/arch/arm/mach-omap2/usb-musb.c
@@ -39,10 +39,12 @@ static struct resource musb_resources[]
[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
+++ linux-omap-pm/arch/blackfin/mach-bf527/boards/cm_bf527.c
@@ -82,11 +82,13 @@ static struct resource musb_resources[]
.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
+++ linux-omap-pm/arch/blackfin/mach-bf527/boards/ezbrd.c
@@ -46,11 +46,13 @@ static struct resource musb_resources[]
.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
+++ linux-omap-pm/arch/blackfin/mach-bf527/boards/ezkit.c
@@ -86,11 +86,13 @@ static struct resource musb_resources[]
.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
+++ linux-omap-pm/arch/blackfin/mach-bf548/boards/cm_bf548.c
@@ -482,11 +482,13 @@ static struct resource musb_resources[]
.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
+++ linux-omap-pm/arch/blackfin/mach-bf548/boards/ezkit.c
@@ -587,11 +587,13 @@ static struct resource musb_resources[]
.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
+++ linux-omap-pm/drivers/usb/musb/cppi_dma.c
@@ -1307,7 +1307,7 @@ dma_controller_create(struct musb *musb,
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
+++ linux-omap-pm/drivers/usb/musb/musb_core.c
@@ -2203,7 +2203,7 @@ static u64 *orig_dma_mask;
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
+++ linux-omap-pm/drivers/usb/musb/musbhsdma.c
@@ -363,7 +363,7 @@ dma_controller_create(struct musb *musb,
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
^ permalink raw reply [flat|nested] 14+ messages in thread[parent not found: <1285201631-26266-1-git-send-email-hemahk-l0cyMroinI0@public.gmane.org>]
* Re: [PATCH 1/9 v3] usb: musb: Adding names for IRQs in resource structure [not found] ` <1285201631-26266-1-git-send-email-hemahk-l0cyMroinI0@public.gmane.org> @ 2010-09-23 6:10 ` Felipe Balbi [not found] ` <20100923061022.GA2563-UiBtZHVXSwEVvW8u9ZQWYwjfymiNCTlR@public.gmane.org> 2010-09-23 6:32 ` Kalliguddi, Hema 1 sibling, 1 reply; 14+ messages in thread From: Felipe Balbi @ 2010-09-23 6:10 UTC (permalink / raw) To: Kalliguddi, Hema Cc: linux-omap-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-usb-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, Balbi, Felipe, Tony Lindgren, Kevin Hilman, Cousson, Benoit, Paul Walmsley On Wed, Sep 22, 2010 at 07:27:11PM -0500, Kalliguddi, Hema wrote: >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 <balbi-l0cyMroinI0@public.gmane.org> >Cc: Tony Lindgren <tony-4v6yS6AI5VpBDgjK7y7TUQ@public.gmane.org> >Cc: Kevin Hilman <khilman-1D3HCaltpLuhEniVeURVKkEOCMrvLtNR@public.gmane.org> >Cc: Cousson, Benoit <b-cousson-l0cyMroinI0@public.gmane.org> >Cc: Paul Walmsley <paul-DWxLp4Yu+b8AvxtiuMwx3w@public.gmane.org> this is fine by me, but you need to Cc the other ARCH maintainers, Tony can answer for OMAP and Kevin for DaVinci, but where's Blackfin's maintainer ? Without all theirs ACKs for the arch-specific part, I can't queue this to .37 and it's already quite late. If we don't get all needed Acks by tomorrow, I doubt Greg will accept these for .37 merge window. -- balbi -- 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 ^ permalink raw reply [flat|nested] 14+ messages in thread
[parent not found: <20100923061022.GA2563-UiBtZHVXSwEVvW8u9ZQWYwjfymiNCTlR@public.gmane.org>]
* RE: [PATCH 1/9 v3] usb: musb: Adding names for IRQs in resource structure [not found] ` <20100923061022.GA2563-UiBtZHVXSwEVvW8u9ZQWYwjfymiNCTlR@public.gmane.org> @ 2010-09-23 6:24 ` Kalliguddi, Hema [not found] ` <E0D41E29EB0DAC4E9F3FF173962E9E94027863D94D-/tLxBxkBPtCIQmiDNMet8wC/G2K4zDHf@public.gmane.org> 0 siblings, 1 reply; 14+ messages in thread From: Kalliguddi, Hema @ 2010-09-23 6:24 UTC (permalink / raw) To: Balbi, Felipe Cc: linux-omap-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-usb-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, Tony Lindgren, Kevin Hilman, Cousson, Benoit, Paul Walmsley Hi, >-----Original Message----- >From: Balbi, Felipe >Sent: Thursday, September 23, 2010 11:40 AM >To: Kalliguddi, Hema >Cc: linux-omap-u79uwXL29TY76Z2rM5mHXA@public.gmane.org; linux-usb-u79uwXL29TY76Z2rM5mHXA@public.gmane.org; >Balbi, Felipe; Tony Lindgren; Kevin Hilman; Cousson, Benoit; >Paul Walmsley >Subject: Re: [PATCH 1/9 v3] usb: musb: Adding names for IRQs >in resource structure > >On Wed, Sep 22, 2010 at 07:27:11PM -0500, Kalliguddi, Hema wrote: >>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 <balbi-l0cyMroinI0@public.gmane.org> >>Cc: Tony Lindgren <tony-4v6yS6AI5VpBDgjK7y7TUQ@public.gmane.org> >>Cc: Kevin Hilman <khilman-1D3HCaltpLuhEniVeURVKkEOCMrvLtNR@public.gmane.org> >>Cc: Cousson, Benoit <b-cousson-l0cyMroinI0@public.gmane.org> >>Cc: Paul Walmsley <paul-DWxLp4Yu+b8AvxtiuMwx3w@public.gmane.org> > >this is fine by me, but you need to Cc the other ARCH maintainers, Tony >can answer for OMAP and Kevin for DaVinci, but where's Blackfin's >maintainer ? Without all theirs ACKs for the arch-specific >part, I can't >queue this to .37 and it's already quite late. If we don't get all >needed Acks by tomorrow, I doubt Greg will accept these for .37 merge >window. > I understand that. I forgot to Cc Mike for blackfin arch files change. I will post it again today Cc ing him and try my luck :-) ~Hema >-- >balbi >-- 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 ^ permalink raw reply [flat|nested] 14+ messages in thread
[parent not found: <E0D41E29EB0DAC4E9F3FF173962E9E94027863D94D-/tLxBxkBPtCIQmiDNMet8wC/G2K4zDHf@public.gmane.org>]
* Re: [PATCH 1/9 v3] usb: musb: Adding names for IRQs in resource structure [not found] ` <E0D41E29EB0DAC4E9F3FF173962E9E94027863D94D-/tLxBxkBPtCIQmiDNMet8wC/G2K4zDHf@public.gmane.org> @ 2010-09-23 6:50 ` Felipe Balbi 2010-09-23 6:53 ` Kalliguddi, Hema 0 siblings, 1 reply; 14+ messages in thread From: Felipe Balbi @ 2010-09-23 6:50 UTC (permalink / raw) To: Kalliguddi, Hema Cc: Balbi, Felipe, linux-omap-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-usb-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, Tony Lindgren, Kevin Hilman, Cousson, Benoit, Paul Walmsley Hi, On Thu, Sep 23, 2010 at 01:24:19AM -0500, Kalliguddi, Hema wrote: >I understand that. I forgot to Cc Mike for blackfin arch files change. >I will post it again today Cc ing him and try my luck :-) let's hope for the best, but while at that, would you take care of the comments on the other patches ? -- balbi -- 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 ^ permalink raw reply [flat|nested] 14+ messages in thread
* RE: [PATCH 1/9 v3] usb: musb: Adding names for IRQs in resource structure 2010-09-23 6:50 ` Felipe Balbi @ 2010-09-23 6:53 ` Kalliguddi, Hema 0 siblings, 0 replies; 14+ messages in thread From: Kalliguddi, Hema @ 2010-09-23 6:53 UTC (permalink / raw) To: Balbi, Felipe Cc: linux-omap@vger.kernel.org, linux-usb@vger.kernel.org, Tony Lindgren, Kevin Hilman, Cousson, Benoit, Paul Walmsley Hi, >-----Original Message----- >From: Balbi, Felipe >Sent: Thursday, September 23, 2010 12:21 PM >To: Kalliguddi, Hema >Cc: Balbi, Felipe; linux-omap@vger.kernel.org; >linux-usb@vger.kernel.org; Tony Lindgren; Kevin Hilman; >Cousson, Benoit; Paul Walmsley >Subject: Re: [PATCH 1/9 v3] usb: musb: Adding names for IRQs >in resource structure > >Hi, > >On Thu, Sep 23, 2010 at 01:24:19AM -0500, Kalliguddi, Hema wrote: >>I understand that. I forgot to Cc Mike for blackfin arch files change. >>I will post it again today Cc ing him and try my luck :-) > >let's hope for the best, but while at that, would you take care of the >comments on the other patches ? I am trying my level best to incorporate all the comments today and post them. > >-- >balbi > ^ permalink raw reply [flat|nested] 14+ messages in thread
* RE: [PATCH 1/9 v3] usb: musb: Adding names for IRQs in resource structure [not found] ` <1285201631-26266-1-git-send-email-hemahk-l0cyMroinI0@public.gmane.org> 2010-09-23 6:10 ` Felipe Balbi @ 2010-09-23 6:32 ` Kalliguddi, Hema 2010-09-28 15:45 ` Mike Frysinger 1 sibling, 1 reply; 14+ messages in thread From: Kalliguddi, Hema @ 2010-09-23 6:32 UTC (permalink / raw) To: linux-omap-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-usb-u79uwXL29TY76Z2rM5mHXA@public.gmane.org Cc: Balbi, Felipe, Tony Lindgren, Kevin Hilman, Cousson, Benoit, Paul Walmsley, Mike Frysinger Hi Mike, >-----Original Message----- >From: Kalliguddi, Hema >Sent: Thursday, September 23, 2010 5:57 AM >To: linux-omap-u79uwXL29TY76Z2rM5mHXA@public.gmane.org; linux-usb-u79uwXL29TY76Z2rM5mHXA@public.gmane.org >Cc: Kalliguddi, Hema; Balbi, Felipe; Tony Lindgren; Kevin >Hilman; Cousson, Benoit; Paul Walmsley >Subject: [PATCH 1/9 v3] usb: musb: Adding names for IRQs in >resource structure > >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 <balbi-l0cyMroinI0@public.gmane.org> >Cc: Tony Lindgren <tony-4v6yS6AI5VpBDgjK7y7TUQ@public.gmane.org> >Cc: Kevin Hilman <khilman-1D3HCaltpLuhEniVeURVKkEOCMrvLtNR@public.gmane.org> >Cc: Cousson, Benoit <b-cousson-l0cyMroinI0@public.gmane.org> >Cc: Paul Walmsley <paul-DWxLp4Yu+b8AvxtiuMwx3w@public.gmane.org> > >--- > 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 >+++ linux-omap-pm/arch/arm/mach-davinci/usb.c >@@ -64,10 +64,12 @@ static struct resource usb_resources[] = > { > .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 >+++ linux-omap-pm/arch/arm/mach-omap2/usb-musb.c >@@ -39,10 +39,12 @@ static struct resource musb_resources[] > [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 >+++ linux-omap-pm/arch/blackfin/mach-bf527/boards/cm_bf527.c >@@ -82,11 +82,13 @@ static struct resource musb_resources[] > .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 >+++ linux-omap-pm/arch/blackfin/mach-bf527/boards/ezbrd.c >@@ -46,11 +46,13 @@ static struct resource musb_resources[] > .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 >+++ linux-omap-pm/arch/blackfin/mach-bf527/boards/ezkit.c >@@ -86,11 +86,13 @@ static struct resource musb_resources[] > .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 >+++ linux-omap-pm/arch/blackfin/mach-bf548/boards/cm_bf548.c >@@ -482,11 +482,13 @@ static struct resource musb_resources[] > .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 >+++ linux-omap-pm/arch/blackfin/mach-bf548/boards/ezkit.c >@@ -587,11 +587,13 @@ static struct resource musb_resources[] > .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 >+++ linux-omap-pm/drivers/usb/musb/cppi_dma.c >@@ -1307,7 +1307,7 @@ dma_controller_create(struct musb *musb, > 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 >+++ linux-omap-pm/drivers/usb/musb/musb_core.c >@@ -2203,7 +2203,7 @@ static u64 *orig_dma_mask; > 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 >+++ linux-omap-pm/drivers/usb/musb/musbhsdma.c >@@ -363,7 +363,7 @@ dma_controller_create(struct musb *musb, > 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"); > I am sorry I forgot to Cc you when I posted the patch. Please provide your comments on the changes. Regards, Hema -- 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 ^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH 1/9 v3] usb: musb: Adding names for IRQs in resource structure 2010-09-23 6:32 ` Kalliguddi, Hema @ 2010-09-28 15:45 ` Mike Frysinger [not found] ` <AANLkTim=ARtDA99XWP+RuB5nBh5FNAJHfSV34fiwtAk8-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org> 0 siblings, 1 reply; 14+ messages in thread From: Mike Frysinger @ 2010-09-28 15:45 UTC (permalink / raw) To: Kalliguddi, Hema Cc: linux-omap@vger.kernel.org, linux-usb@vger.kernel.org, Balbi, Felipe, Tony Lindgren, Kevin Hilman, Cousson, Benoit, Paul Walmsley On Thu, Sep 23, 2010 at 02:32, Kalliguddi, Hema wrote: >From: Kalliguddi, Hema >>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 i dont see a problem with the existing code (going by index #), but i dont really care either way >>resource definition need not be always in order of device interrupt and >>then dma interrupt well, currently, your resource definition must always be in the order of dev int and then dma int. if it isnt, then i dont think musb is going to work. not sure why you wouldnt simply change your platform resources to match the what the driver expects ... -mike ^ permalink raw reply [flat|nested] 14+ messages in thread
[parent not found: <AANLkTim=ARtDA99XWP+RuB5nBh5FNAJHfSV34fiwtAk8-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>]
* Re: [PATCH 1/9 v3] usb: musb: Adding names for IRQs in resource structure [not found] ` <AANLkTim=ARtDA99XWP+RuB5nBh5FNAJHfSV34fiwtAk8-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org> @ 2010-09-28 21:18 ` Paul Walmsley 2010-09-28 21:42 ` Mike Frysinger 0 siblings, 1 reply; 14+ messages in thread From: Paul Walmsley @ 2010-09-28 21:18 UTC (permalink / raw) To: Mike Frysinger Cc: Kalliguddi, Hema, linux-omap-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-usb-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, Balbi, Felipe, Tony Lindgren, Kevin Hilman, Cousson, Benoit Hello Mike, On Tue, 28 Sep 2010, Mike Frysinger wrote: > well, currently, your resource definition must always be in the order > of dev int and then dma int. if it isnt, then i dont think musb is > going to work. > > not sure why you wouldnt simply change your platform resources to > match the what the driver expects ... The resource data is getting automatically populated from a set of data generated from TI's hardware database for the OMAP platform, at least. While we could hack in some exceptions to that tool to generate resources in a specific order, it seems less fragile to use the resource name instead. That way, no matter what order the resources are generated, the driver should still work. - Paul -- 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 ^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH 1/9 v3] usb: musb: Adding names for IRQs in resource structure 2010-09-28 21:18 ` Paul Walmsley @ 2010-09-28 21:42 ` Mike Frysinger 2010-09-28 21:44 ` Paul Walmsley 0 siblings, 1 reply; 14+ messages in thread From: Mike Frysinger @ 2010-09-28 21:42 UTC (permalink / raw) To: Paul Walmsley Cc: Kalliguddi, Hema, linux-omap@vger.kernel.org, linux-usb@vger.kernel.org, Balbi, Felipe, Tony Lindgren, Kevin Hilman, Cousson, Benoit On Tue, Sep 28, 2010 at 17:18, Paul Walmsley wrote: > On Tue, 28 Sep 2010, Mike Frysinger wrote: >> well, currently, your resource definition must always be in the order >> of dev int and then dma int. if it isnt, then i dont think musb is >> going to work. >> >> not sure why you wouldnt simply change your platform resources to >> match the what the driver expects ... > > The resource data is getting automatically populated from a set of data > generated from TI's hardware database for the OMAP platform, at least. > While we could hack in some exceptions to that tool to generate resources > in a specific order, it seems less fragile to use the resource name > instead. That way, no matter what order the resources are generated, the > driver should still work. guessing you're not referring to a device tree setup, but something even more convoluted ? i'd highly suggest that this patch be resent with the info you've just provided in its changelog so people can get a better understanding of the "why" ... i'm not against the patch, it just seemed to be lacking any background info -mike -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html ^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH 1/9 v3] usb: musb: Adding names for IRQs in resource structure 2010-09-28 21:42 ` Mike Frysinger @ 2010-09-28 21:44 ` Paul Walmsley [not found] ` <alpine.DEB.2.00.1009281543290.5439-rwI8Ez+7Ko+d5PgPZx9QOdBPR1lH4CV8@public.gmane.org> 0 siblings, 1 reply; 14+ messages in thread From: Paul Walmsley @ 2010-09-28 21:44 UTC (permalink / raw) To: Mike Frysinger, Kalliguddi, Hema Cc: linux-omap@vger.kernel.org, linux-usb@vger.kernel.org, Balbi, Felipe, Tony Lindgren, Kevin Hilman, Cousson, Benoit [-- Attachment #1: Type: TEXT/PLAIN, Size: 1340 bytes --] On Tue, 28 Sep 2010, Mike Frysinger wrote: > On Tue, Sep 28, 2010 at 17:18, Paul Walmsley wrote: > > On Tue, 28 Sep 2010, Mike Frysinger wrote: > >> well, currently, your resource definition must always be in the order > >> of dev int and then dma int. if it isnt, then i dont think musb is > >> going to work. > >> > >> not sure why you wouldnt simply change your platform resources to > >> match the what the driver expects ... > > > > The resource data is getting automatically populated from a set of data > > generated from TI's hardware database for the OMAP platform, at least. > > While we could hack in some exceptions to that tool to generate resources > > in a specific order, it seems less fragile to use the resource name > > instead. That way, no matter what order the resources are generated, the > > driver should still work. > > guessing you're not referring to a device tree setup, but something > even more convoluted ? No need to disparage it before you've seen it :-) > i'd highly suggest that this patch be resent with the info you've just > provided in its changelog so people can get a better understanding of > the "why" ... i'm not against the patch, it just seemed to be lacking > any background info Hema, would you care to update the patch changelog accordingly? - Paul ^ permalink raw reply [flat|nested] 14+ messages in thread
[parent not found: <alpine.DEB.2.00.1009281543290.5439-rwI8Ez+7Ko+d5PgPZx9QOdBPR1lH4CV8@public.gmane.org>]
* Re: [PATCH 1/9 v3] usb: musb: Adding names for IRQs in resource structure [not found] ` <alpine.DEB.2.00.1009281543290.5439-rwI8Ez+7Ko+d5PgPZx9QOdBPR1lH4CV8@public.gmane.org> @ 2010-09-28 21:48 ` Mike Frysinger [not found] ` <AANLkTi=77B2ntuJG7=J-g9GrcrJsWKUy6YbW0gm=MUQJ-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org> 0 siblings, 1 reply; 14+ messages in thread From: Mike Frysinger @ 2010-09-28 21:48 UTC (permalink / raw) To: Paul Walmsley Cc: Kalliguddi, Hema, linux-omap-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-usb-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, Balbi, Felipe, Tony Lindgren, Kevin Hilman, Cousson, Benoit On Tue, Sep 28, 2010 at 17:44, Paul Walmsley wrote: > On Tue, 28 Sep 2010, Mike Frysinger wrote: >> On Tue, Sep 28, 2010 at 17:18, Paul Walmsley wrote: >> > On Tue, 28 Sep 2010, Mike Frysinger wrote: >> >> well, currently, your resource definition must always be in the order >> >> of dev int and then dma int. if it isnt, then i dont think musb is >> >> going to work. >> >> >> >> not sure why you wouldnt simply change your platform resources to >> >> match the what the driver expects ... >> > >> > The resource data is getting automatically populated from a set of data >> > generated from TI's hardware database for the OMAP platform, at least. >> > While we could hack in some exceptions to that tool to generate resources >> > in a specific order, it seems less fragile to use the resource name >> > instead. That way, no matter what order the resources are generated, the >> > driver should still work. >> >> guessing you're not referring to a device tree setup, but something >> even more convoluted ? > > No need to disparage it before you've seen it :-) ah, but that's when i do my best work >> i'd highly suggest that this patch be resent with the info you've just >> provided in its changelog so people can get a better understanding of >> the "why" ... i'm not against the patch, it just seemed to be lacking >> any background info > > Hema, would you care to update the patch changelog accordingly? i'll pre-ack that for the Blackfin changes ... or, if you split those out, i can merge it separately for 2.6.37. -mike -- 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 ^ permalink raw reply [flat|nested] 14+ messages in thread
[parent not found: <AANLkTi=77B2ntuJG7=J-g9GrcrJsWKUy6YbW0gm=MUQJ-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>]
* RE: [PATCH 1/9 v3] usb: musb: Adding names for IRQs in resource structure [not found] ` <AANLkTi=77B2ntuJG7=J-g9GrcrJsWKUy6YbW0gm=MUQJ-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org> @ 2010-09-29 3:32 ` Kalliguddi, Hema [not found] ` <E0D41E29EB0DAC4E9F3FF173962E9E9402DB7FE166-/tLxBxkBPtCIQmiDNMet8wC/G2K4zDHf@public.gmane.org> 0 siblings, 1 reply; 14+ messages in thread From: Kalliguddi, Hema @ 2010-09-29 3:32 UTC (permalink / raw) To: Mike Frysinger, Paul Walmsley Cc: linux-omap-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-usb-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, Balbi, Felipe, Tony Lindgren, Kevin Hilman, Cousson, Benoit Hi, >-----Original Message----- >From: vapier.adi-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org [mailto:vapier.adi-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org] On >Behalf Of Mike Frysinger >Sent: Wednesday, September 29, 2010 3:18 AM >To: Paul Walmsley >Cc: Kalliguddi, Hema; linux-omap-u79uwXL29TY76Z2rM5mHXA@public.gmane.org; >linux-usb-u79uwXL29TY76Z2rM5mHXA@public.gmane.org; Balbi, Felipe; Tony Lindgren; Kevin >Hilman; Cousson, Benoit >Subject: Re: [PATCH 1/9 v3] usb: musb: Adding names for IRQs >in resource structure > >On Tue, Sep 28, 2010 at 17:44, Paul Walmsley wrote: >> On Tue, 28 Sep 2010, Mike Frysinger wrote: >>> On Tue, Sep 28, 2010 at 17:18, Paul Walmsley wrote: >>> > On Tue, 28 Sep 2010, Mike Frysinger wrote: >>> >> well, currently, your resource definition must always be >in the order >>> >> of dev int and then dma int. if it isnt, then i dont >think musb is >>> >> going to work. >>> >> >>> >> not sure why you wouldnt simply change your platform resources to >>> >> match the what the driver expects ... >>> > >>> > The resource data is getting automatically populated from >a set of data >>> > generated from TI's hardware database for the OMAP >platform, at least. >>> > While we could hack in some exceptions to that tool to >generate resources >>> > in a specific order, it seems less fragile to use the >resource name >>> > instead. That way, no matter what order the resources >are generated, the >>> > driver should still work. >>> >>> guessing you're not referring to a device tree setup, but something >>> even more convoluted ? >> >> No need to disparage it before you've seen it :-) > >ah, but that's when i do my best work > >>> i'd highly suggest that this patch be resent with the info >you've just >>> provided in its changelog so people can get a better >understanding of >>> the "why" ... i'm not against the patch, it just seemed to >be lacking >>> any background info >> >> Hema, would you care to update the patch changelog accordingly? > >i'll pre-ack that for the Blackfin changes ... or, if you split those >out, i can merge it separately for 2.6.37. I will repost the patches today for blackfin and omap changes with the changelog updated accordingly. >-mike >-- 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 ^ permalink raw reply [flat|nested] 14+ messages in thread
[parent not found: <E0D41E29EB0DAC4E9F3FF173962E9E9402DB7FE166-/tLxBxkBPtCIQmiDNMet8wC/G2K4zDHf@public.gmane.org>]
* Re: [PATCH 1/9 v3] usb: musb: Adding names for IRQs in resource structure [not found] ` <E0D41E29EB0DAC4E9F3FF173962E9E9402DB7FE166-/tLxBxkBPtCIQmiDNMet8wC/G2K4zDHf@public.gmane.org> @ 2010-09-29 6:30 ` Felipe Balbi 2010-09-29 6:35 ` Kalliguddi, Hema 0 siblings, 1 reply; 14+ messages in thread From: Felipe Balbi @ 2010-09-29 6:30 UTC (permalink / raw) To: Kalliguddi, Hema Cc: Mike Frysinger, Paul Walmsley, linux-omap-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-usb-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, Balbi, Felipe, Tony Lindgren, Kevin Hilman, Cousson, Benoit Hi, On Tue, Sep 28, 2010 at 10:32:07PM -0500, Kalliguddi, Hema wrote: >I will repost the patches today for blackfin and omap changes with the changelog >updated accordingly. Have you re-sent the patches ? I just want to know if we're gonna merge it through Greg or the patch will be split and merged through ARCH trees. Each way if fine by me, but 2.6.37 is getting really close. -- balbi -- 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 ^ permalink raw reply [flat|nested] 14+ messages in thread
* RE: [PATCH 1/9 v3] usb: musb: Adding names for IRQs in resource structure 2010-09-29 6:30 ` Felipe Balbi @ 2010-09-29 6:35 ` Kalliguddi, Hema 0 siblings, 0 replies; 14+ messages in thread From: Kalliguddi, Hema @ 2010-09-29 6:35 UTC (permalink / raw) To: Balbi, Felipe Cc: Mike Frysinger, Paul Walmsley, linux-omap@vger.kernel.org, linux-usb@vger.kernel.org, Tony Lindgren, Kevin Hilman, Cousson, Benoit Felipe, >-----Original Message----- >From: Balbi, Felipe >Sent: Wednesday, September 29, 2010 12:01 PM >To: Kalliguddi, Hema >Cc: Mike Frysinger; Paul Walmsley; linux-omap@vger.kernel.org; >linux-usb@vger.kernel.org; Balbi, Felipe; Tony Lindgren; Kevin >Hilman; Cousson, Benoit >Subject: Re: [PATCH 1/9 v3] usb: musb: Adding names for IRQs >in resource structure > >Hi, > >On Tue, Sep 28, 2010 at 10:32:07PM -0500, Kalliguddi, Hema wrote: >>I will repost the patches today for blackfin and omap changes >with the changelog >>updated accordingly. > >Have you re-sent the patches ? I just want to know if we're gonna merge >it through Greg or the patch will be split and merged through ARCH >trees. > >Each way if fine by me, but 2.6.37 is getting really close. > Then I will send a patch with changelog updated soon. >-- >balbi > ^ permalink raw reply [flat|nested] 14+ messages in thread
end of thread, other threads:[~2010-09-29 6:35 UTC | newest]
Thread overview: 14+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-09-23 0:27 [PATCH 1/9 v3] usb: musb: Adding names for IRQs in resource structure Hema HK
[not found] ` <1285201631-26266-1-git-send-email-hemahk-l0cyMroinI0@public.gmane.org>
2010-09-23 6:10 ` Felipe Balbi
[not found] ` <20100923061022.GA2563-UiBtZHVXSwEVvW8u9ZQWYwjfymiNCTlR@public.gmane.org>
2010-09-23 6:24 ` Kalliguddi, Hema
[not found] ` <E0D41E29EB0DAC4E9F3FF173962E9E94027863D94D-/tLxBxkBPtCIQmiDNMet8wC/G2K4zDHf@public.gmane.org>
2010-09-23 6:50 ` Felipe Balbi
2010-09-23 6:53 ` Kalliguddi, Hema
2010-09-23 6:32 ` Kalliguddi, Hema
2010-09-28 15:45 ` Mike Frysinger
[not found] ` <AANLkTim=ARtDA99XWP+RuB5nBh5FNAJHfSV34fiwtAk8-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2010-09-28 21:18 ` Paul Walmsley
2010-09-28 21:42 ` Mike Frysinger
2010-09-28 21:44 ` Paul Walmsley
[not found] ` <alpine.DEB.2.00.1009281543290.5439-rwI8Ez+7Ko+d5PgPZx9QOdBPR1lH4CV8@public.gmane.org>
2010-09-28 21:48 ` Mike Frysinger
[not found] ` <AANLkTi=77B2ntuJG7=J-g9GrcrJsWKUy6YbW0gm=MUQJ-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2010-09-29 3:32 ` Kalliguddi, Hema
[not found] ` <E0D41E29EB0DAC4E9F3FF173962E9E9402DB7FE166-/tLxBxkBPtCIQmiDNMet8wC/G2K4zDHf@public.gmane.org>
2010-09-29 6:30 ` Felipe Balbi
2010-09-29 6:35 ` Kalliguddi, Hema
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox