RE: [PATCH 1/8] usb: musb: Adding names for IRQs in resource structure
Hi, >-Original Message- >From: Kevin Hilman [mailto:khil...@deeprootsystems.com] >Sent: Tuesday, August 10, 2010 2:24 AM >To: Kalliguddi, Hema >Cc: linux-omap@vger.kernel.org; linux-...@vger.kernel.org; >Felipe Balbi; Tony Lindgren >Subject: Re: [PATCH 1/8] usb: musb: Adding names for IRQs in >resource structure > >Hema HK writes: > >> From: Hema HK >> >> 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 >> Cc: Felipe Balbi >> Cc: Tony Lindgren >> Cc: Kevin Hilman >> --- >> >> 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. It is a mistake. I will correct it. > >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_
Re: [PATCH 1/8] usb: musb: Adding names for IRQs in resource structure
Hema HK writes: > From: Hema HK > > 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 > Cc: Felipe Balbi > Cc: Tony Lindgren > Cc: Kevin Hilman > --- > > 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.c2010-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" > }
[PATCH 1/8] usb: musb: Adding names for IRQs in resource structure
From: Hema HK 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 Cc: Felipe Balbi Cc: Tony Lindgren Cc: Kevin Hilman --- Based off omap4-next branch. 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.c2010-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.c2010-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.c2010-08-06 09:01:25.