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

PATCH In review Shimoda, Yoshihiro 2 participants 5 messages Jan 10, 2012

Subsystems (4)

Arm (32-bit) Arm sub-architectures SuperH Arm/RISC-V/Renesas architecture

lore

Share & tools

lore

Shimoda, Yoshihiro

author

2012-01-10 05:21 UTC #0 lore raw

PATCH 1/1 arm: mach-shmobile: add a resource name for shdma

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

---
This patch depends on the following patch:
- dmaengine: shdma: modify the DMAC Address Error registration

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

arch/arm/mach-shmobile/setup-sh7372.c +3 -3

index 2380389..dad4d09 100644
@@ -504,7 +504,7 @@ static struct resource sh7372_dmae0_resources[] = {
 		.flags	= IORESOURCE_MEM,
 	},
 	{
-		/* DMA error IRQ */
+		.name	= "error_irq",
 		.start	= evt2irq(0x20c0),
 		.end	= evt2irq(0x20c0),
 		.flags	= IORESOURCE_IRQ,

@@ -532,7 +532,7 @@ static struct resource sh7372_dmae1_resources[] = {
 		.flags	= IORESOURCE_MEM,
 	},
 	{
-		/* DMA error IRQ */
+		.name	= "error_irq",
 		.start	= evt2irq(0x21c0),
 		.end	= evt2irq(0x21c0),
 		.flags	= IORESOURCE_IRQ,

@@ -560,7 +560,7 @@ static struct resource sh7372_dmae2_resources[] = {
 		.flags	= IORESOURCE_MEM,
 	},
 	{
-		/* DMA error IRQ */
+		.name	= "error_irq",
 		.start	= evt2irq(0x22c0),
 		.end	= evt2irq(0x22c0),
 		.flags	= IORESOURCE_IRQ,

arch/arm/mach-shmobile/setup-sh73a0.c +1 -1

index e46821c..20e71e5 100644
@@ -607,7 +607,7 @@ static struct resource sh73a0_dmae_resources[] = {
 		.flags  = IORESOURCE_MEM,
 	},
 	{
-		/* DMA error IRQ */
+		.name	= "error_irq",
 		.start  = gic_spi(129),
 		.end    = gic_spi(129),
 		.flags  = IORESOURCE_IRQ,

Signature · 1 line

1.7.1

Paul Mundt

2012-01-10 07:43 UTC #1 lore raw

Quoted 5 lines · Yoshihiro

Signed-off-by Yoshihiro Shimoda <[email protected]>
---
This patch depends on the following patch:
- dmaengine: shdma: modify the DMAC Address Error registration

What exactly does it depend on? If it's just wiring up the string, we can merge that at any time, and the earlier the better. Setting the string doesn't introduce any different behaviour in the driver as it is now without the change in registration.

Shimoda, Yoshihiro

author

2012-01-10 08:22 UTC #2 lore raw

In reply to Shimoda, Yoshihiro

Quoted 11 lines · Paul Mundt

Quoted 5 lines · Yoshihiro
Signed-off-by Yoshihiro Shimoda <[email protected]>
---
This patch depends on the following patch:
- dmaengine: shdma: modify the DMAC Address Error registration
What exactly does it depend on? If it's just wiring up the string, we can merge that at any time, and the earlier the better. Setting the string doesn't introduce any different behaviour in the driver as it is now without the change in registration.

I'm sorry for my wrong comment. Your point is correct. This patch doesn't depend on the shdma's patch.

Should I submit the patch which removed the comment again?

Best regards,
Yoshihiro Shimoda

Signature · 2 lines

Yoshihiro Shimoda <[email protected]>
EC No.

Paul Mundt

2012-01-10 08:25 UTC #3 lore raw

In reply to Shimoda, Yoshihiro

Quoted 13 lines · Yoshihiro

Quoted 11 lines · Paul Mundt
Quoted 5 lines · Yoshihiro
Signed-off-by Yoshihiro Shimoda <[email protected]>
---
This patch depends on the following patch:
- dmaengine: shdma: modify the DMAC Address Error registration
What exactly does it depend on? If it's just wiring up the string, we can merge that at any time, and the earlier the better. Setting the string doesn't introduce any different behaviour in the driver as it is now without the change in registration.

Quoted 5 lines

I'm sorry for my wrong comment. Your point is correct. This patch doesn't depend on the shdma's patch.
Should I submit the patch which removed the comment again?

No, it's fine, just wanted to make sure there wasn't something sinister going on that I wasn't aware of with regards to the driver model. I'll apply them to sh/rmobile-latest respectively.

Shimoda, Yoshihiro

author

2012-01-10 08:53 UTC #4 lore raw

In reply to Shimoda, Yoshihiro

Quoted 14 lines · Paul Mundt

Quoted 13 lines · Yoshihiro
Quoted 11 lines · Paul Mundt
Quoted 5 lines · Yoshihiro
Signed-off-by Yoshihiro Shimoda <[email protected]>
---
This patch depends on the following patch:
- dmaengine: shdma: modify the DMAC Address Error registration
What exactly does it depend on? If it's just wiring up the string, we can merge that at any time, and the earlier the better. Setting the string doesn't introduce any different behaviour in the driver as it is now without the change in registration.

Quoted 9 lines

Quoted 5 lines
I'm sorry for my wrong comment. Your point is correct. This patch doesn't depend on the shdma's patch.
Should I submit the patch which removed the comment again?
No, it's fine, just wanted to make sure there wasn't something sinister going on that I wasn't aware of with regards to the driver model. I'll apply them to sh/rmobile-latest respectively.

Thank you very much. I understood it.

Best regards,
Yoshihiro Shimoda