diff mbox

[v2,1/5] ep93xx: set DMA masks for the ep93xx_eth

Message ID 20110609204113.GE2857@acer (mailing list archive)
State New, archived
Headers show

Commit Message

Mika Westerberg June 9, 2011, 8:41 p.m. UTC 
On Thu, Jun 09, 2011 at 03:27:11PM -0500, H Hartley Sweeten wrote:
> On Thursday, June 02, 2011 12:00 PM, Mika Westerberg wrote:
> >
> > As the driver is now passing platform device to the DMA mapping functions,
> > we should give it valid DMA masks.
> >
> > Signed-off-by: Mika Westerberg <mika.westerberg@iki.fi>
> > Acked-by: Russell King <rmk+kernel@arm.linux.org.uk>
> 
> Since you made this patch the first in the series the commit message is not
> quite right.  Other than that:
> 
> Acked-by: H Hartley Sweeten <hsweeten@visionengravers.com>

Ah, right. I forgot to change the commit message. How about following?

From: Mika Westerberg <mika.westerberg@iki.fi>
Subject: [PATCH 1/5] ep93xx: set DMA masks for the ep93xx_eth

Since the driver uses the DMA API, we should pass it valid DMA masks.

Signed-off-by: Mika Westerberg <mika.westerberg@iki.fi>
Acked-by: Russell King <rmk+kernel@arm.linux.org.uk>
Acked-by: H Hartley Sweeten <hsweeten@visionengravers.com>
---
 arch/arm/mach-ep93xx/core.c |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

Comments

Hartley Sweeten June 9, 2011, 9:26 p.m. UTC | #1 
On Thursday, June 09, 2011 1:41 PM, Mika Westerberg wrote:
> On Thu, Jun 09, 2011 at 03:27:11PM -0500, H Hartley Sweeten wrote:
>> On Thursday, June 02, 2011 12:00 PM, Mika Westerberg wrote:
>>>
>>> As the driver is now passing platform device to the DMA mapping functions,
>>> we should give it valid DMA masks.
>>>
>>> Signed-off-by: Mika Westerberg <mika.westerberg@iki.fi>
>>> Acked-by: Russell King <rmk+kernel@arm.linux.org.uk>
>> 
>> Since you made this patch the first in the series the commit message is not
>> quite right.  Other than that:
>> 
>> Acked-by: H Hartley Sweeten <hsweeten@visionengravers.com>
>
> Ah, right. I forgot to change the commit message. How about following?
>
> From: Mika Westerberg <mika.westerberg@iki.fi>
> Subject: [PATCH 1/5] ep93xx: set DMA masks for the ep93xx_eth
>
> Since the driver uses the DMA API, we should pass it valid DMA masks.
>
> Signed-off-by: Mika Westerberg <mika.westerberg@iki.fi>
> Acked-by: Russell King <rmk+kernel@arm.linux.org.uk>
> Acked-by: H Hartley Sweeten <hsweeten@visionengravers.com>

I like that better.

Thanks,
Hartley
diff mbox

Patch

diff --git a/arch/arm/mach-ep93xx/core.c b/arch/arm/mach-ep93xx/core.c
index 8207954..1d4b65f 100644
--- a/arch/arm/mach-ep93xx/core.c
+++ b/arch/arm/mach-ep93xx/core.c
@@ -402,11 +402,15 @@  static struct resource ep93xx_eth_resource[] = {
 	}
 };
 
+static u64 ep93xx_eth_dma_mask = DMA_BIT_MASK(32);
+
 static struct platform_device ep93xx_eth_device = {
 	.name		= "ep93xx-eth",
 	.id		= -1,
 	.dev		= {
-		.platform_data	= &ep93xx_eth_data,
+		.platform_data		= &ep93xx_eth_data,
+		.coherent_dma_mask	= DMA_BIT_MASK(32),
+		.dma_mask		= &ep93xx_eth_dma_mask,
 	},
 	.num_resources	= ARRAY_SIZE(ep93xx_eth_resource),
 	.resource	= ep93xx_eth_resource,