Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0fe7f885 authored by Marek Szyprowski's avatar Marek Szyprowski Committed by Kukjin Kim
Browse files

ARM: S5P: Fix DMA coherent mask for FIMC 



FIMC driver uses DMA_coherent allocator, which requires proper dma mask
to be set.

Signed-off-by: default avatarMarek Szyprowski <m.szyprowski@samsung.com>
Signed-off-by: default avatarKyungmin Park <kyungmin.park@samsung.com>
[kgene.kim@samsung.com: minor title fix]
Signed-off-by: default avatarKukjin Kim <kgene.kim@samsung.com>
parent 49553c2e

arch/arm/plat-s5p/dev-fimc0.c

+7 −0
Original line number Original line Diff line number Diff line
@@ -10,6 +10,7 @@ 
 */

 */





#include <linux/kernel.h>

#include <linux/kernel.h>

#include <linux/dma-mapping.h>

#include <linux/platform_device.h>

#include <linux/platform_device.h>

#include <linux/interrupt.h>

#include <linux/interrupt.h>

#include <linux/ioport.h>

#include <linux/ioport.h>
@@ -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 = {

struct platform_device s5p_device_fimc0 = {

	.name		= "s5p-fimc",

	.name		= "s5p-fimc",

	.id		= 0,

	.id		= 0,

	.num_resources	= ARRAY_SIZE(s5p_fimc0_resource),

	.num_resources	= ARRAY_SIZE(s5p_fimc0_resource),

	.resource	= s5p_fimc0_resource,

	.resource	= s5p_fimc0_resource,

	.dev		= {

		.dma_mask		= &s5p_fimc0_dma_mask,

		.coherent_dma_mask	= DMA_BIT_MASK(32),

	},

};
 
};

arch/arm/plat-s5p/dev-fimc1.c

+7 −0
Original line number Original line Diff line number Diff line
@@ -10,6 +10,7 @@ 
 */

 */





#include <linux/kernel.h>

#include <linux/kernel.h>

#include <linux/dma-mapping.h>

#include <linux/platform_device.h>

#include <linux/platform_device.h>

#include <linux/interrupt.h>

#include <linux/interrupt.h>

#include <linux/ioport.h>

#include <linux/ioport.h>
@@ -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 = {

struct platform_device s5p_device_fimc1 = {

	.name		= "s5p-fimc",

	.name		= "s5p-fimc",

	.id		= 1,

	.id		= 1,

	.num_resources	= ARRAY_SIZE(s5p_fimc1_resource),

	.num_resources	= ARRAY_SIZE(s5p_fimc1_resource),

	.resource	= s5p_fimc1_resource,

	.resource	= s5p_fimc1_resource,

	.dev		= {

		.dma_mask		= &s5p_fimc1_dma_mask,

		.coherent_dma_mask	= DMA_BIT_MASK(32),

	},

};
 
};

arch/arm/plat-s5p/dev-fimc2.c

+7 −0
Original line number Original line Diff line number Diff line
@@ -10,6 +10,7 @@ 
 */

 */





#include <linux/kernel.h>

#include <linux/kernel.h>

#include <linux/dma-mapping.h>

#include <linux/platform_device.h>

#include <linux/platform_device.h>

#include <linux/interrupt.h>

#include <linux/interrupt.h>

#include <linux/ioport.h>

#include <linux/ioport.h>
@@ -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 = {

struct platform_device s5p_device_fimc2 = {

	.name		= "s5p-fimc",

	.name		= "s5p-fimc",

	.id		= 2,

	.id		= 2,

	.num_resources	= ARRAY_SIZE(s5p_fimc2_resource),

	.num_resources	= ARRAY_SIZE(s5p_fimc2_resource),

	.resource	= s5p_fimc2_resource,

	.resource	= s5p_fimc2_resource,

	.dev		= {

		.dma_mask		= &s5p_fimc2_dma_mask,

		.coherent_dma_mask	= DMA_BIT_MASK(32),

	},

};
 
};