aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/plat-samsung
diff options
context:
space:
mode:
authorSylwester Nawrocki <s.nawrocki@samsung.com>2011-03-11 18:58:01 -0500
committerKukjin Kim <kgene.kim@samsung.com>2011-03-11 18:58:01 -0500
commit604eefeb2308cda72325fd8754aecb55075ae866 (patch)
tree0377fa607c223a072739327ff8f7df841344ee8b /arch/arm/plat-samsung
parent9e65bbf21371ea6705acd88229c8a7439f46e25e (diff)
ARM: S5P: Add platform definitions for FIMC3
Add support for fourth FIMC platform device definition and define resources for FIMC modules on EXYNOS4 machines. Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com> Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com> Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
Diffstat (limited to 'arch/arm/plat-samsung')
-rw-r--r--arch/arm/plat-samsung/include/plat/devs.h1
-rw-r--r--arch/arm/plat-samsung/include/plat/fimc-core.h5
2 files changed, 6 insertions, 0 deletions
diff --git a/arch/arm/plat-samsung/include/plat/devs.h b/arch/arm/plat-samsung/include/plat/devs.h
index e2b3ab997cff..7231ccf89ebb 100644
--- a/arch/arm/plat-samsung/include/plat/devs.h
+++ b/arch/arm/plat-samsung/include/plat/devs.h
@@ -136,6 +136,7 @@ extern struct platform_device samsung_device_keypad;
136extern struct platform_device s5p_device_fimc0; 136extern struct platform_device s5p_device_fimc0;
137extern struct platform_device s5p_device_fimc1; 137extern struct platform_device s5p_device_fimc1;
138extern struct platform_device s5p_device_fimc2; 138extern struct platform_device s5p_device_fimc2;
139extern struct platform_device s5p_device_fimc3;
139 140
140extern struct platform_device s5p_device_mipi_csis0; 141extern struct platform_device s5p_device_mipi_csis0;
141extern struct platform_device s5p_device_mipi_csis1; 142extern struct platform_device s5p_device_mipi_csis1;
diff --git a/arch/arm/plat-samsung/include/plat/fimc-core.h b/arch/arm/plat-samsung/include/plat/fimc-core.h
index 81a3bfeeccad..945a99d59563 100644
--- a/arch/arm/plat-samsung/include/plat/fimc-core.h
+++ b/arch/arm/plat-samsung/include/plat/fimc-core.h
@@ -38,6 +38,11 @@ static inline void s3c_fimc_setname(int id, char *name)
38 s5p_device_fimc2.name = name; 38 s5p_device_fimc2.name = name;
39 break; 39 break;
40#endif 40#endif
41#ifdef CONFIG_S5P_DEV_FIMC3
42 case 3:
43 s5p_device_fimc3.name = name;
44 break;
45#endif
41 } 46 }
42} 47}
43 48