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

Commit 07e87e15 authored by Sylwester Nawrocki's avatar Sylwester Nawrocki Committed by Kukjin Kim
Browse files

ARM: SAMSUNG: Move fimc plat. device from board files to plat-samsung 



Move the platform device definitions from boards code to plat-samsung
to avoid multiple instances when multiple board support is compiled in.
The boards should select at least S5P_DEV_FIMC0 to enable FIMC support.

Signed-off-by: default avatarSylwester Nawrocki <s.nawrocki@samsung.com>
Signed-off-by: default avatarKyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: default avatarKukjin Kim <kgene.kim@samsung.com>
parent e663cb76

arch/arm/mach-exynos4/mach-universal_c210.c

+0 −5
Original line number Diff line number Diff line
@@ -920,11 +920,6 @@ static struct s5p_platform_fimc fimc_md_platdata = { 
	.num_clients	= ARRAY_SIZE(universal_camera_sensors),

};



struct platform_device s5p_device_fimc_md = {

	.name	= "s5p-fimc-md",

	.id	= -1,

};



static struct gpio universal_camera_gpios[] = {

	{ GPIO_CAM_LEVEL_EN(1),	GPIOF_OUT_INIT_HIGH, "CAM_LVL_EN1" },

	{ GPIO_CAM_LEVEL_EN(2),	GPIOF_OUT_INIT_LOW,  "CAM_LVL_EN2" },

arch/arm/mach-s5pv210/mach-goni.c

+0 −5
Original line number Diff line number Diff line
@@ -849,11 +849,6 @@ struct s5p_platform_fimc goni_fimc_md_platdata __initdata = { 
	.num_clients	= ARRAY_SIZE(goni_camera_sensors),

};



struct platform_device s5p_device_fimc_md = {

	.name		= "s5p-fimc-md",

	.id		= -1,

};



static struct platform_device *goni_devices[] __initdata = {

	&s3c_device_fb,

	&s5p_device_onenand,

arch/arm/plat-samsung/devs.c

+5 −0
Original line number Diff line number Diff line
@@ -204,6 +204,11 @@ struct platform_device s5p_device_fimc0 = { 
		.coherent_dma_mask	= DMA_BIT_MASK(32),

	},

};



struct platform_device s5p_device_fimc_md = {

	.name	= "s5p-fimc-md",

	.id	= -1,

};

#endif /* CONFIG_S5P_DEV_FIMC0 */



#ifdef CONFIG_S5P_DEV_FIMC1

arch/arm/plat-samsung/include/plat/devs.h

+1 −0
Original line number Diff line number Diff line
@@ -77,6 +77,7 @@ extern struct platform_device s5p_device_fimc0; 
extern struct platform_device s5p_device_fimc1;

extern struct platform_device s5p_device_fimc2;

extern struct platform_device s5p_device_fimc3;

extern struct platform_device s5p_device_fimc_md;

extern struct platform_device s5p_device_fimd0;

extern struct platform_device s5p_device_hdmi;

extern struct platform_device s5p_device_i2c_hdmiphy;