| From ltsi-dev-bounces@lists.linuxfoundation.org Mon May 28 02:47:24 2012 |
| From: "Shimoda, Yoshihiro" <yoshihiro.shimoda.uh@renesas.com> |
| Date: Mon, 28 May 2012 18:47:20 +0900 |
| Subject: [LTSI-dev] [PATCH 09/21] sh: add a resource name for shdma |
| To: ltsi-dev@lists.linuxfoundation.org |
| Message-ID: <4FC349A8.5020108@renesas.com> |
| |
| |
| >From 97de925e1dbf4faa708110d1441ea1d585d4a913 Mon Sep 17 00:00:00 2001 |
| From: Shimoda, Yoshihiro <yoshihiro.shimoda.uh@renesas.com> |
| Date: Tue, 10 Jan 2012 14:20:58 +0900 |
| Subject: 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> |
| (cherry picked from commit a4d5247310c993b6b30f1686be12ddacfc41142a) |
| |
| Conflicts: |
| arch/sh/kernel/cpu/sh4a/setup-sh7722.c |
| arch/sh/kernel/cpu/sh4a/setup-sh7724.c |
| arch/sh/kernel/cpu/sh4a/setup-sh7780.c |
| arch/sh/kernel/cpu/sh4a/setup-sh7785.c |
| arch/sh/kernel/cpu/sh4a/setup-sh7786.c |
| |
| Signed-off-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com> |
| --- |
| arch/sh/kernel/cpu/sh4a/setup-sh7757.c | 7 ++++--- |
| 1 files changed, 4 insertions(+), 3 deletions(-) |
| |
| diff --git a/arch/sh/kernel/cpu/sh4a/setup-sh7757.c b/arch/sh/kernel/cpu/sh4a/setup-sh7757.c |
| index 0555929..a7b2da6 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, |
| -- |
| 1.7.1 |
| _______________________________________________ |
| LTSI-dev mailing list |
| LTSI-dev@lists.linuxfoundation.org |
| https://lists.linuxfoundation.org/mailman/listinfo/ltsi-dev |
| |
