diff options
| author | Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> | 2013-12-16 13:16:07 -0500 |
|---|---|---|
| committer | Simon Horman <horms+renesas@verge.net.au> | 2013-12-26 00:20:53 -0500 |
| commit | dcd740b645003b866d7eb30d13d34d0729cce9db (patch) | |
| tree | 1d47ad0e40099411fe299823a5b0f6fe4f07cf4b | |
| parent | d721a15c300c5f638a11573a6dd492158e737d6a (diff) | |
ARM: shmobile: armadillo: 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>
| -rw-r--r-- | arch/arm/mach-shmobile/board-armadillo800eva.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-shmobile/board-armadillo800eva.c b/arch/arm/mach-shmobile/board-armadillo800eva.c index c18689123023..8ea87bd45c33 100644 --- a/arch/arm/mach-shmobile/board-armadillo800eva.c +++ b/arch/arm/mach-shmobile/board-armadillo800eva.c | |||
| @@ -483,7 +483,7 @@ static struct platform_device lcdc0_device = { | |||
| 483 | .id = 0, | 483 | .id = 0, |
| 484 | .dev = { | 484 | .dev = { |
| 485 | .platform_data = &lcdc0_info, | 485 | .platform_data = &lcdc0_info, |
| 486 | .coherent_dma_mask = ~0, | 486 | .coherent_dma_mask = DMA_BIT_MASK(32), |
| 487 | }, | 487 | }, |
| 488 | }; | 488 | }; |
| 489 | 489 | ||
| @@ -580,7 +580,7 @@ static struct platform_device hdmi_lcdc_device = { | |||
| 580 | .id = 1, | 580 | .id = 1, |
| 581 | .dev = { | 581 | .dev = { |
| 582 | .platform_data = &hdmi_lcdc_info, | 582 | .platform_data = &hdmi_lcdc_info, |
| 583 | .coherent_dma_mask = ~0, | 583 | .coherent_dma_mask = DMA_BIT_MASK(32), |
| 584 | }, | 584 | }, |
| 585 | }; | 585 | }; |
| 586 | 586 | ||
