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>

diff --git a/arch/sh/kernel/cpu/sh4a/setup-sh7722.c b/arch/sh/kernel/cpu/sh4a/setup-sh7722.c
index 278a0e572158697793d76404b6ffb87eb4c9a7c2..27af277cc63c03de1d4691f8c7208c54bf761f95 100644 (file)
--- 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 a37dd72c36719d06c938431691b48a9c56023790..8d8a5512d57da2ff0171328767bb6f39f3ce8b61 100644 (file)
--- 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 05559295d2ca8e8fa184e50bcca0a4b224e9d308..a7b2da6b3a1a359953f7043d498288de59b7df55 100644 (file)
--- 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 3d4d2075c19ad334ac40b8803b8e7ecffced0a96..d431b0052d0c87b58a75d175096068bcb2a70781 100644 (file)
--- 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 b29e6340414ab82ec54dd5f4c1c652eb50053aa5..81588ef15a6c09df110760888e33141f21633d6d 100644 (file)
--- 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 dd5e709f982163f809e8650c791dd6668ddc3264..599022d73b283237413bb0a5a3f874fad4e2affc 100644 (file)
--- 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,