summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorLaurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>2013-12-16 19:16:08 +0100
committerSimon Horman <horms+renesas@verge.net.au>2013-12-26 14:20:57 +0900
commit4f387323853c495ac589210832fad4503f75a0e7 (patch)
treeff7c67d3e22498ba48132012c0faa8ad2f8a2da3 /arch
parentdcd740b645003b866d7eb30d13d34d0729cce9db (diff)
downloadlinux-stable-4f387323853c495ac589210832fad4503f75a0e7.tar.gz
linux-stable-4f387323853c495ac589210832fad4503f75a0e7.tar.bz2
linux-stable-4f387323853c495ac589210832fad4503f75a0e7.zip
ARM: shmobile: kzm9g: Fix coherent DMA mask
Commit 4dcfa60071b3d23f0181f27d8519f12e37cefbb9 ("ARM: DMA-API: better handing of DMA masks for coherent allocations") added an additional check to the coherent DMA mask that results in an error when the mask is larger than what dma_addr_t can address. Set the LCDC coherent DMA mask to DMA_BIT_MASK(32) instead of ~0 to fix the problem. Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/mach-shmobile/board-kzm9g.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-shmobile/board-kzm9g.c b/arch/arm/mach-shmobile/board-kzm9g.c
index fe689b7fdc9e..bc40b853ffd3 100644
--- a/arch/arm/mach-shmobile/board-kzm9g.c
+++ b/arch/arm/mach-shmobile/board-kzm9g.c
@@ -334,7 +334,7 @@ static struct platform_device lcdc_device = {
.resource = lcdc_resources,
.dev = {
.platform_data = &lcdc_info,
- .coherent_dma_mask = ~0,
+ .coherent_dma_mask = DMA_BIT_MASK(32),
},
};