diff options
| author | Sylwester Nawrocki <s.nawrocki@samsung.com> | 2011-10-13 15:41:51 +0900 |
|---|---|---|
| committer | Kukjin Kim <kgene.kim@samsung.com> | 2011-10-13 15:41:51 +0900 |
| commit | 07e87e15b969a05a7943d7ff1abc2d8da287171c (patch) | |
| tree | 9c3d8fbaea4992706c5ad2354b33cfcd17c4d0c7 | |
| parent | e663cb761c1ceb628743341053a16fe72ff849c8 (diff) | |
| download | kernel_samsung_smdk4412-07e87e15b969a05a7943d7ff1abc2d8da287171c.zip kernel_samsung_smdk4412-07e87e15b969a05a7943d7ff1abc2d8da287171c.tar.gz kernel_samsung_smdk4412-07e87e15b969a05a7943d7ff1abc2d8da287171c.tar.bz2 | |
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: Sylwester Nawrocki <s.nawrocki@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
| -rw-r--r-- | arch/arm/mach-exynos4/mach-universal_c210.c | 5 | ||||
| -rw-r--r-- | arch/arm/mach-s5pv210/mach-goni.c | 5 | ||||
| -rw-r--r-- | arch/arm/plat-samsung/devs.c | 5 | ||||
| -rw-r--r-- | arch/arm/plat-samsung/include/plat/devs.h | 1 |
4 files changed, 6 insertions, 10 deletions
diff --git a/arch/arm/mach-exynos4/mach-universal_c210.c b/arch/arm/mach-exynos4/mach-universal_c210.c index 18cf5c7..2096c8b 100644 --- a/arch/arm/mach-exynos4/mach-universal_c210.c +++ b/arch/arm/mach-exynos4/mach-universal_c210.c @@ -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" }, diff --git a/arch/arm/mach-s5pv210/mach-goni.c b/arch/arm/mach-s5pv210/mach-goni.c index 01e4867..61da205 100644 --- a/arch/arm/mach-s5pv210/mach-goni.c +++ b/arch/arm/mach-s5pv210/mach-goni.c @@ -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, diff --git a/arch/arm/plat-samsung/devs.c b/arch/arm/plat-samsung/devs.c index cb6fd9e..4ca8b57 100644 --- a/arch/arm/plat-samsung/devs.c +++ b/arch/arm/plat-samsung/devs.c @@ -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 diff --git a/arch/arm/plat-samsung/include/plat/devs.h b/arch/arm/plat-samsung/include/plat/devs.h index 8f19241..ab633c9 100644 --- a/arch/arm/plat-samsung/include/plat/devs.h +++ b/arch/arm/plat-samsung/include/plat/devs.h @@ -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; |