Skip to contentSkip to conversation

arm: mach-shmobile: add a resource name for shdma

PATCH In review Shimoda, Yoshihiro 2 participants 3 messages Jan 11, 2012 – Jan 12, 2012

Subsystems (4)
Arm (32-bit) Arm sub-architectures SuperH Arm/RISC-V/Renesas architecture
lore
Share & tools
lore

Shimoda, Yoshihiro

author
#0 lore raw

PATCH v4 3/6 arm: mach-shmobile: add a resource name for shdma

Signed-off-by Yoshihiro Shimoda <[email protected]>

---
about v4:
- use defination macros for IRQ resource

 arch/arm/mach-shmobile/setup-sh7372.c |    8 ++++++++
 arch/arm/mach-shmobile/setup-sh73a0.c |    2 ++
 2 files changed, 10 insertions(+), 0 deletions(-)
arch/arm/mach-shmobile/setup-sh7372.c +8 -0
index 2380389..4f74e32 100644
@@ -505,12 +505,14 @@ static struct resource sh7372_dmae0_resources[] = {
 	},
 	{
 		/* DMA error IRQ */
+		.name	= SH_DMA_IRQ_ERROR,
 		.start	= evt2irq(0x20c0),
 		.end	= evt2irq(0x20c0),
 		.flags	= IORESOURCE_IRQ,
 	},
 	{
 		/* IRQ for channels 0-5 */
+		.name	= SH_DMA_IRQ_CHANNEL,
 		.start	= evt2irq(0x2000),
 		.end	= evt2irq(0x20a0),
 		.flags	= IORESOURCE_IRQ,

@@ -533,12 +535,14 @@ static struct resource sh7372_dmae1_resources[] = {
 	},
 	{
 		/* DMA error IRQ */
+		.name	= SH_DMA_IRQ_ERROR,
 		.start	= evt2irq(0x21c0),
 		.end	= evt2irq(0x21c0),
 		.flags	= IORESOURCE_IRQ,
 	},
 	{
 		/* IRQ for channels 0-5 */
+		.name	= SH_DMA_IRQ_CHANNEL,
 		.start	= evt2irq(0x2100),
 		.end	= evt2irq(0x21a0),
 		.flags	= IORESOURCE_IRQ,

@@ -561,12 +565,14 @@ static struct resource sh7372_dmae2_resources[] = {
 	},
 	{
 		/* DMA error IRQ */
+		.name	= SH_DMA_IRQ_ERROR,
 		.start	= evt2irq(0x22c0),
 		.end	= evt2irq(0x22c0),
 		.flags	= IORESOURCE_IRQ,
 	},
 	{
 		/* IRQ for channels 0-5 */
+		.name	= SH_DMA_IRQ_CHANNEL,
 		.start	= evt2irq(0x2200),
 		.end	= evt2irq(0x22a0),
 		.flags	= IORESOURCE_IRQ,

@@ -670,6 +676,7 @@ static struct resource sh7372_usb_dmae0_resources[] = {
 	},
 	{
 		/* IRQ for channels */
+		.name	= SH_DMA_IRQ_CHANNEL,
 		.start	= evt2irq(0x0a00),
 		.end	= evt2irq(0x0a00),
 		.flags	= IORESOURCE_IRQ,

@@ -731,6 +738,7 @@ static struct resource sh7372_usb_dmae1_resources[] = {
 	},
 	{
 		/* IRQ for channels */
+		.name	= SH_DMA_IRQ_CHANNEL,
 		.start	= evt2irq(0x1d00),
 		.end	= evt2irq(0x1d00),
 		.flags	= IORESOURCE_IRQ,
arch/arm/mach-shmobile/setup-sh73a0.c +2 -0
index e46821c..5d701ac 100644
@@ -608,12 +608,14 @@ static struct resource sh73a0_dmae_resources[] = {
 	},
 	{
 		/* DMA error IRQ */
+		.name	= SH_DMA_IRQ_ERROR,
 		.start  = gic_spi(129),
 		.end    = gic_spi(129),
 		.flags  = IORESOURCE_IRQ,
 	},
 	{
 		/* IRQ for channels 0-19 */
+		.name	= SH_DMA_IRQ_CHANNEL,
 		.start  = gic_spi(109),
 		.end    = gic_spi(128),
 		.flags  = IORESOURCE_IRQ,
Signature · 1 line
1.7.1
#1 lore raw
Quoted 9 lines · Yoshihiro
Signed-off-by Yoshihiro Shimoda <[email protected]>

---
about v4:
- use defination macros for IRQ resource

 arch/arm/mach-shmobile/setup-sh7372.c |    8 ++++++++
 arch/arm/mach-shmobile/setup-sh73a0.c |    2 ++
 2 files changed, 10 insertions(+), 0 deletions(-)

I'll just be applying the original two with the strings written out, you can figure out how you want to deal with the rest of the series on top of that.

author
#2 lore raw
In reply to Shimoda, Yoshihiro
Quoted 6 lines · Paul Mundt
Quoted 5 lines · Yoshihiro
Signed-off-by Yoshihiro Shimoda <[email protected]>

---
about v4:
- use defination macros for IRQ resource

Quoted 8 lines
Quoted 4 lines
 arch/arm/mach-shmobile/setup-sh7372.c |    8 ++++++++
 arch/arm/mach-shmobile/setup-sh73a0.c |    2 ++
 2 files changed, 10 insertions(+), 0 deletions(-)

I'll just be applying the original two with the strings written out, you can figure out how you want to deal with the rest of the series on top of that.

I understood it.

Best regards,
Yoshihiro Shimoda