Skip to content

Commit

Permalink
ARM: S5P: Fix DMA coherent mask for FIMC
Browse files Browse the repository at this point in the history
FIMC driver uses DMA_coherent allocator, which requires proper dma mask
to be set.

Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
[kgene.kim@samsung.com: minor title fix]
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
  • Loading branch information
Marek Szyprowski authored and Kukjin Kim committed Sep 14, 2010
1 parent 49553c2 commit 0fe7f88
Show file tree
Hide file tree
Showing 3 changed files with 21 additions and 0 deletions.
7 changes: 7 additions & 0 deletions arch/arm/plat-s5p/dev-fimc0.c
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
*/

#include <linux/kernel.h>
#include <linux/dma-mapping.h>
#include <linux/platform_device.h>
#include <linux/interrupt.h>
#include <linux/ioport.h>
Expand All @@ -28,9 +29,15 @@ static struct resource s5p_fimc0_resource[] = {
},
};

static u64 s5p_fimc0_dma_mask = DMA_BIT_MASK(32);

struct platform_device s5p_device_fimc0 = {
.name = "s5p-fimc",
.id = 0,
.num_resources = ARRAY_SIZE(s5p_fimc0_resource),
.resource = s5p_fimc0_resource,
.dev = {
.dma_mask = &s5p_fimc0_dma_mask,
.coherent_dma_mask = DMA_BIT_MASK(32),
},
};
7 changes: 7 additions & 0 deletions arch/arm/plat-s5p/dev-fimc1.c
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
*/

#include <linux/kernel.h>
#include <linux/dma-mapping.h>
#include <linux/platform_device.h>
#include <linux/interrupt.h>
#include <linux/ioport.h>
Expand All @@ -28,9 +29,15 @@ static struct resource s5p_fimc1_resource[] = {
},
};

static u64 s5p_fimc1_dma_mask = DMA_BIT_MASK(32);

struct platform_device s5p_device_fimc1 = {
.name = "s5p-fimc",
.id = 1,
.num_resources = ARRAY_SIZE(s5p_fimc1_resource),
.resource = s5p_fimc1_resource,
.dev = {
.dma_mask = &s5p_fimc1_dma_mask,
.coherent_dma_mask = DMA_BIT_MASK(32),
},
};
7 changes: 7 additions & 0 deletions arch/arm/plat-s5p/dev-fimc2.c
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
*/

#include <linux/kernel.h>
#include <linux/dma-mapping.h>
#include <linux/platform_device.h>
#include <linux/interrupt.h>
#include <linux/ioport.h>
Expand All @@ -28,9 +29,15 @@ static struct resource s5p_fimc2_resource[] = {
},
};

static u64 s5p_fimc2_dma_mask = DMA_BIT_MASK(32);

struct platform_device s5p_device_fimc2 = {
.name = "s5p-fimc",
.id = 2,
.num_resources = ARRAY_SIZE(s5p_fimc2_resource),
.resource = s5p_fimc2_resource,
.dev = {
.dma_mask = &s5p_fimc2_dma_mask,
.coherent_dma_mask = DMA_BIT_MASK(32),
},
};

0 comments on commit 0fe7f88

Please sign in to comment.