From 10c8baf0844c0a75a84c7eeecc27486ef461e733 Mon Sep 17 00:00:00 2001 From: Mika Westerberg Date: Sat, 11 Jun 2011 08:39:54 +0000 Subject: [PATCH] --- yaml --- r: 253431 b: refs/heads/master c: fa70cf472c0bc3a0d7e613a418cfc1117b796c6c h: refs/heads/master i: 253429: 631bc3da50b9c977beb18c90a960f84af9d0992f 253427: e53106978b9c811741593d5ddf81c249544bac4f 253423: de7d6bc2f11ac0c25774ac444197e9424faa6018 v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-ep93xx/core.c | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index df42c103b8da..b4e225cf4fa5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0b5c9db1b11d3175bb42b80663a9f072f801edf5 +refs/heads/master: fa70cf472c0bc3a0d7e613a418cfc1117b796c6c diff --git a/trunk/arch/arm/mach-ep93xx/core.c b/trunk/arch/arm/mach-ep93xx/core.c index 82079545adc4..1d4b65fd673e 100644 --- a/trunk/arch/arm/mach-ep93xx/core.c +++ b/trunk/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,