sh: add a resource name for shdma

Signed-off-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>

6 files changed, 12 insertions, 7 deletions

diff --git a/arch/sh/kernel/cpu/sh4a/setup-sh7722.c b/arch/sh/kernel/cpu/sh4a/setup-sh7722.c
index 278a0e572158..27af277cc63c 100644
--- a/arch/sh/kernel/cpu/sh4a/setup-sh7722.c
+++ b/arch/sh/kernel/cpu/sh4a/setup-sh7722.c
@@ -146,7 +146,7 @@ static struct resource sh7722_dmae_resources[] = {
                 .flags  = IORESOURCE_MEM,
         },
         {
-                /* DMA error IRQ */
+                .name   = "error_irq",
                 .start  = 78,
                 .end    = 78,
                 .flags  = IORESOURCE_IRQ,
diff --git a/arch/sh/kernel/cpu/sh4a/setup-sh7724.c b/arch/sh/kernel/cpu/sh4a/setup-sh7724.c
index a37dd72c3671..8d8a5512d57d 100644
--- a/arch/sh/kernel/cpu/sh4a/setup-sh7724.c
+++ b/arch/sh/kernel/cpu/sh4a/setup-sh7724.c
@@ -214,7 +214,7 @@ static struct resource sh7724_dmae0_resources[] = {
                 .flags  = IORESOURCE_MEM,
         },
         {
-                /* DMA error IRQ */
+                .name   = "error_irq",
                 .start  = 78,
                 .end    = 78,
                 .flags  = IORESOURCE_IRQ,
@@ -248,7 +248,7 @@ static struct resource sh7724_dmae1_resources[] = {
                 .flags  = IORESOURCE_MEM,
         },
         {
-                /* DMA error IRQ */
+                .name   = "error_irq",
                 .start  = 74,
                 .end    = 74,
                 .flags  = IORESOURCE_IRQ,
diff --git a/arch/sh/kernel/cpu/sh4a/setup-sh7757.c b/arch/sh/kernel/cpu/sh4a/setup-sh7757.c
index 05559295d2ca..a7b2da6b3a1a 100644
--- a/arch/sh/kernel/cpu/sh4a/setup-sh7757.c
+++ b/arch/sh/kernel/cpu/sh4a/setup-sh7757.c
@@ -465,6 +465,7 @@ static struct resource sh7757_dmae0_resources[] = {
                 .flags  = IORESOURCE_MEM,
         },
         {
+                .name   = "error_irq",
                 .start  = 34,
                 .end    = 34,
                 .flags  = IORESOURCE_IRQ | IORESOURCE_IRQ_SHAREABLE,
@@ -486,7 +487,7 @@ static struct resource sh7757_dmae1_resources[] = {
                 .flags  = IORESOURCE_MEM,
         },
         {
-                /* DMA error */
+                .name   = "error_irq",
                 .start  = 34,
                 .end    = 34,
                 .flags  = IORESOURCE_IRQ | IORESOURCE_IRQ_SHAREABLE,
@@ -556,7 +557,7 @@ static struct resource sh7757_dmae2_resources[] = {
                 .flags  = IORESOURCE_MEM,
         },
         {
-                /* DMA error */
+                .name   = "error_irq",
                 .start  = 323,
                 .end    = 323,
                 .flags  = IORESOURCE_IRQ,
@@ -590,7 +591,7 @@ static struct resource sh7757_dmae3_resources[] = {
                 .flags  = IORESOURCE_MEM,
         },
         {
-                /* DMA error */
+                .name   = "error_irq",
                 .start  = 324,
                 .end    = 324,
                 .flags  = IORESOURCE_IRQ,
diff --git a/arch/sh/kernel/cpu/sh4a/setup-sh7780.c b/arch/sh/kernel/cpu/sh4a/setup-sh7780.c
index 3d4d2075c19a..d431b0052d0c 100644
--- a/arch/sh/kernel/cpu/sh4a/setup-sh7780.c
+++ b/arch/sh/kernel/cpu/sh4a/setup-sh7780.c
@@ -322,6 +322,7 @@ static struct resource sh7780_dmae0_resources[] = {
         },
         {
                 /* Real DMA error IRQ is 38, and channel IRQs are 34-37, 44-45 */
+                .name   = "error_irq",
                 .start  = 34,
                 .end    = 34,
                 .flags  = IORESOURCE_IRQ | IORESOURCE_IRQ_SHAREABLE,
@@ -338,6 +339,7 @@ static struct resource sh7780_dmae1_resources[] = {
         /* DMAC1 has no DMARS */
         {
                 /* Real DMA error IRQ is 38, and channel IRQs are 46-47, 92-95 */
+                .name   = "error_irq",
                 .start  = 46,
                 .end    = 46,
                 .flags  = IORESOURCE_IRQ | IORESOURCE_IRQ_SHAREABLE,
diff --git a/arch/sh/kernel/cpu/sh4a/setup-sh7785.c b/arch/sh/kernel/cpu/sh4a/setup-sh7785.c
index b29e6340414a..81588ef15a6c 100644
--- a/arch/sh/kernel/cpu/sh4a/setup-sh7785.c
+++ b/arch/sh/kernel/cpu/sh4a/setup-sh7785.c
@@ -376,6 +376,7 @@ static struct resource sh7785_dmae0_resources[] = {
         },
         {
                 /* Real DMA error IRQ is 39, and channel IRQs are 33-38 */
+                .name   = "error_irq",
                 .start  = 33,
                 .end    = 33,
                 .flags  = IORESOURCE_IRQ | IORESOURCE_IRQ_SHAREABLE,
@@ -392,6 +393,7 @@ static struct resource sh7785_dmae1_resources[] = {
         /* DMAC1 has no DMARS */
         {
                 /* Real DMA error IRQ is 58, and channel IRQs are 52-57 */
+                .name   = "error_irq",
                 .start  = 52,
                 .end    = 52,
                 .flags  = IORESOURCE_IRQ | IORESOURCE_IRQ_SHAREABLE,
diff --git a/arch/sh/kernel/cpu/sh4a/setup-sh7786.c b/arch/sh/kernel/cpu/sh4a/setup-sh7786.c
index dd5e709f9821..599022d73b28 100644
--- a/arch/sh/kernel/cpu/sh4a/setup-sh7786.c
+++ b/arch/sh/kernel/cpu/sh4a/setup-sh7786.c
@@ -518,7 +518,7 @@ static struct resource dmac0_resources[] = {
                 .end    = 0xfe00900b,
                 .flags  = IORESOURCE_MEM,
         }, {
-                /* DMA error IRQ */
+                .name   = "error_irq",
                 .start  = evt2irq(0x5c0),
                 .end    = evt2irq(0x5c0),
                 .flags  = IORESOURCE_IRQ,