10 files changed, 17 insertions, 3 deletions

diff --git a/arch/arm/mach-davinci/usb.c b/arch/arm/mach-davinci/usb.c
index 31f0cbea0caa..b0d6b07431c0 100644
--- a/arch/arm/mach-davinci/usb.c
+++ b/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"
         },
 };
 
diff --git a/arch/arm/mach-omap2/usb-musb.c b/arch/arm/mach-omap2/usb-musb.c
index 72605584bfff..8dae0fa5905e 100644
--- a/arch/arm/mach-omap2/usb-musb.c
+++ b/arch/arm/mach-omap2/usb-musb.c
@@ -40,10 +40,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",
         },
 };
 
diff --git a/arch/blackfin/mach-bf527/boards/cm_bf527.c b/arch/blackfin/mach-bf527/boards/cm_bf527.c
index 2c31af7a320a..f714d7be35b9 100644
--- a/arch/blackfin/mach-bf527/boards/cm_bf527.c
+++ b/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"
         },
 };
 
diff --git a/arch/blackfin/mach-bf527/boards/ezbrd.c b/arch/blackfin/mach-bf527/boards/ezbrd.c
index 9a736a850c5c..315eec930604 100644
--- a/arch/blackfin/mach-bf527/boards/ezbrd.c
+++ b/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"
         },
 };
 
diff --git a/arch/blackfin/mach-bf527/boards/ezkit.c b/arch/blackfin/mach-bf527/boards/ezkit.c
index 9222bc00bbd3..273731279740 100644
--- a/arch/blackfin/mach-bf527/boards/ezkit.c
+++ b/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"
         },
 };
 
diff --git a/arch/blackfin/mach-bf548/boards/cm_bf548.c b/arch/blackfin/mach-bf548/boards/cm_bf548.c
index f0c0eef95ba8..3e3dfb23f94e 100644
--- a/arch/blackfin/mach-bf548/boards/cm_bf548.c
+++ b/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"
         },
 };
 
diff --git a/arch/blackfin/mach-bf548/boards/ezkit.c b/arch/blackfin/mach-bf548/boards/ezkit.c
index 216e26999af9..9ff166d6f00d 100644
--- a/arch/blackfin/mach-bf548/boards/ezkit.c
+++ b/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"
         },
 };
 
diff --git a/drivers/usb/musb/cppi_dma.c b/drivers/usb/musb/cppi_dma.c
index f5a65ff0ac2b..de55a3c3259a 100644
--- a/drivers/usb/musb/cppi_dma.c
+++ b/drivers/usb/musb/cppi_dma.c
@@ -1308,7 +1308,7 @@ dma_controller_create(struct musb *musb, void __iomem *mregs)
         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)
diff --git a/drivers/usb/musb/musb_core.c b/drivers/usb/musb/musb_core.c
index 4b71a1bb4187..a5ceddfe57d6 100644
--- a/drivers/usb/musb/musb_core.c
+++ b/drivers/usb/musb/musb_core.c
@@ -2206,7 +2206,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;
diff --git a/drivers/usb/musb/musbhsdma.c b/drivers/usb/musb/musbhsdma.c
index 6f771af5cbdb..4e8183589624 100644
--- a/drivers/usb/musb/musbhsdma.c
+++ b/drivers/usb/musb/musbhsdma.c
@@ -363,7 +363,7 @@ dma_controller_create(struct musb *musb, void __iomem *base)
         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");