All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH 1/8] usb: musb: Adding names for IRQs in resource structure
@ 2010-08-06 15:55 Hema HK
       [not found] ` <1281110124-3186-1-git-send-email-hemahk-l0cyMroinI0@public.gmane.org>
  0 siblings, 1 reply; 3+ messages in thread
From: Hema HK @ 2010-08-06 15:55 UTC (permalink / raw)
  To: linux-omap, linux-usb; +Cc: Hema HK, Felipe Balbi, Tony Lindgren, Kevin Hilman

From: Hema HK  <hemahk@ti.com>

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@ti.com>
Cc: Felipe Balbi <felipe.balbi@nokia.com>
Cc: Tony Lindgren <tony@atomide.com>
Cc: Kevin Hilman <khilman@deeprootsystems.com>
---

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.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");

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PATCH 1/8] usb: musb: Adding names for IRQs in resource structure
       [not found] ` <1281110124-3186-1-git-send-email-hemahk-l0cyMroinI0@public.gmane.org>
@ 2010-08-09 20:54   ` Kevin Hilman
  2010-08-10  5:15     ` Kalliguddi, Hema
  0 siblings, 1 reply; 3+ messages in thread
From: Kevin Hilman @ 2010-08-09 20:54 UTC (permalink / raw)
  To: Hema HK
  Cc: linux-omap-u79uwXL29TY76Z2rM5mHXA,
	linux-usb-u79uwXL29TY76Z2rM5mHXA, Felipe Balbi, Tony Lindgren

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

^ permalink raw reply	[flat|nested] 3+ messages in thread

* RE: [PATCH 1/8] usb: musb: Adding names for IRQs in resource structure
  2010-08-09 20:54   ` Kevin Hilman
@ 2010-08-10  5:15     ` Kalliguddi, Hema
  0 siblings, 0 replies; 3+ messages in thread
From: Kalliguddi, Hema @ 2010-08-10  5:15 UTC (permalink / raw)
  To: Kevin Hilman; +Cc: linux-omap, linux-usb, Felipe Balbi, Tony Lindgren

Hi, 

>-----Original Message-----
>From: Kevin Hilman [mailto:khilman@deeprootsystems.com] 
>Sent: Tuesday, August 10, 2010 2:24 AM
>To: Kalliguddi, Hema
>Cc: linux-omap@vger.kernel.org; linux-usb@vger.kernel.org; 
>Felipe Balbi; Tony Lindgren
>Subject: Re: [PATCH 1/8] usb: musb: Adding names for IRQs in 
>resource structure
>
>Hema HK <hemahk@ti.com> writes:
>
>> From: Hema HK  <hemahk@ti.com>
>>
>> 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@ti.com>
>> Cc: Felipe Balbi <felipe.balbi@nokia.com>
>> Cc: Tony Lindgren <tony@atomide.com>
>> Cc: Kevin Hilman <khilman@deeprootsystems.com>
>> ---
>>
>> 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_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");
>

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2010-08-10  5:15 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
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
2010-08-10  5:15     ` Kalliguddi, Hema

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.