From 50663b54f486ad0304a84c95d50896d00fae046f Mon Sep 17 00:00:00 2001
From: Hyunwoong Kim <khw0178.kim@samsung.com>
Date: Mon, 2 Aug 2010 19:39:39 +0900
Subject: S5PC110: HERRING: Modified machine file

Change-Id: If13e3e2c968f93b6dbe08325da76658709666271
Signed-off-by: Hyunwoong Kim <khw0178.kim@samsung.com>
---
 arch/arm/mach-s5pv210/mach-herring.c | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

(limited to 'arch/arm')

diff --git a/arch/arm/mach-s5pv210/mach-herring.c b/arch/arm/mach-s5pv210/mach-herring.c
index 849ec08..606d70b 100644
--- a/arch/arm/mach-s5pv210/mach-herring.c
+++ b/arch/arm/mach-s5pv210/mach-herring.c
@@ -13,6 +13,7 @@
 #include <linux/init.h>
 #include <linux/serial_core.h>
 #include <linux/gpio.h>
+#include <linux/videodev2.h>
 #include <linux/i2c.h>
 #include <linux/i2c-gpio.h>
 #include <linux/regulator/max8998.h>
@@ -44,7 +45,8 @@
 #include <plat/iic.h>
 #include <plat/s5p-time.h>
 
-#include <plat/gpio-cfg.h>
+#include <plat/fimc.h>
+#include <plat/clock.h>
 
 struct class *sec_class;
 EXPORT_SYMBOL(sec_class);
@@ -1201,7 +1203,8 @@ static struct s3c_platform_camera s5ka3dfx = {
 /* Interface setting */
 static struct s3c_platform_fimc fimc_plat = {
 	.srclk_name	= "mout_mpll",
-	.clk_name	= "sclk_fimc_lclk",
+	.clk_name	= "sclk_fimc",
+	.lclk_name	= "fimc",
 	.clk_rate	= 166750000,
 	.default_cam	= CAMERA_PAR_A,
 	.camera		= {
@@ -2749,6 +2752,13 @@ static struct platform_device *herring_devices[] __initdata = {
 #ifdef CONFIG_FB_S3C
 	&s3c_device_fb,
 #endif
+
+#ifdef CONFIG_VIDEO_FIMC
+	&s3c_device_fimc0,
+	&s3c_device_fimc1,
+	&s3c_device_fimc2,
+#endif
+
 #ifdef CONFIG_FB_S3C_TL2796
 	&s3c_device_spi_gpio,
 #endif
@@ -3057,7 +3067,6 @@ static void __init herring_machine_init(void)
 	s3c_fimc0_set_platdata(&fimc_plat);
 	s3c_fimc1_set_platdata(&fimc_plat);
 	s3c_fimc2_set_platdata(&fimc_plat);
-	s3c_csis_set_platdata(NULL);
 #endif
 
 #ifdef CONFIG_VIDEO_MFC50
-- 
cgit v1.1