| From 4f387323853c495ac589210832fad4503f75a0e7 Mon Sep 17 00:00:00 2001 |
| From: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> |
| Date: Mon, 16 Dec 2013 19:16:08 +0100 |
| Subject: ARM: shmobile: kzm9g: Fix coherent DMA mask |
| |
| From: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> |
| |
| commit 4f387323853c495ac589210832fad4503f75a0e7 upstream. |
| |
| 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> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| arch/arm/mach-shmobile/board-kzm9g.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| --- a/arch/arm/mach-shmobile/board-kzm9g.c |
| +++ b/arch/arm/mach-shmobile/board-kzm9g.c |
| @@ -332,7 +332,7 @@ static struct platform_device lcdc_devic |
| .resource = lcdc_resources, |
| .dev = { |
| .platform_data = &lcdc_info, |
| - .coherent_dma_mask = ~0, |
| + .coherent_dma_mask = DMA_BIT_MASK(32), |
| }, |
| }; |
| |
