Skip to content

Commit

Permalink
ARM: SAMSUNG: Move fimc plat. device from board files to plat-samsung
Browse files Browse the repository at this point in the history
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: Sylwester Nawrocki <s.nawrocki@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
  • Loading branch information
Sylwester Nawrocki authored and Kukjin Kim committed Oct 13, 2011
1 parent e663cb7 commit 07e87e1
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 10 deletions.
5 changes: 0 additions & 5 deletions arch/arm/mach-exynos4/mach-universal_c210.c
Original file line number Diff line number Diff line change
Expand Up @@ -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" },
Expand Down
5 changes: 0 additions & 5 deletions arch/arm/mach-s5pv210/mach-goni.c
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
5 changes: 5 additions & 0 deletions arch/arm/plat-samsung/devs.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions arch/arm/plat-samsung/include/plat/devs.h
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit 07e87e1

Please sign in to comment.