From 10e17de0a56f3c9af7c6a700bd4860fcd145626c Mon Sep 17 00:00:00 2001
From: Sylwester Nawrocki <s.nawrocki@samsung.com>
Date: Fri, 10 Jun 2011 15:36:45 -0300
Subject: [PATCH] --- yaml --- r: 271775 b: refs/heads/master c:
 ebdfea810ec21744840f647341a1e74b8c762586 h: refs/heads/master i:   271773:
 6a7e67faf612258de8526131b2b51df330e035af   271771:
 d60b62e088414662a03c81702f9d1b02d22046d2   271767:
 f51fb7d05c8dfc88063ca0da6a41f753b252c2fe   271759:
 8300c568bf6dc61bcdb8767675dc2ece1d2437fa   271743:
 02ff0f03bc248259c692f36b3d161216da2ac604 v: v3

---
 [refs]                                         |  2 +-
 trunk/drivers/media/video/s5p-fimc/fimc-core.c | 12 ++----------
 trunk/drivers/media/video/s5p-fimc/fimc-core.h |  3 +--
 3 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/[refs] b/[refs]
index ee30b2459a0e..16b06465d868 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 96a857421a9d212696364d210bd85a2162e73966
+refs/heads/master: ebdfea810ec21744840f647341a1e74b8c762586
diff --git a/trunk/drivers/media/video/s5p-fimc/fimc-core.c b/trunk/drivers/media/video/s5p-fimc/fimc-core.c
index 93c4e1a02f90..9809764b5388 100644
--- a/trunk/drivers/media/video/s5p-fimc/fimc-core.c
+++ b/trunk/drivers/media/video/s5p-fimc/fimc-core.c
@@ -30,7 +30,7 @@
 #include "fimc-core.h"
 
 static char *fimc_clocks[MAX_FIMC_CLOCKS] = {
-	"sclk_fimc", "fimc", "sclk_cam"
+	"sclk_fimc", "fimc"
 };
 
 static struct fimc_fmt fimc_formats[] = {
@@ -1636,7 +1636,6 @@ static int fimc_probe(struct platform_device *pdev)
 	struct samsung_fimc_driverdata *drv_data;
 	struct s5p_platform_fimc *pdata;
 	int ret = 0;
-	int cap_input_index = -1;
 
 	dev_dbg(&pdev->dev, "%s():\n", __func__);
 
@@ -1689,14 +1688,6 @@ static int fimc_probe(struct platform_device *pdev)
 		goto err_req_region;
 	}
 
-	fimc->num_clocks = MAX_FIMC_CLOCKS - 1;
-
-	/* Check if a video capture node needs to be registered. */
-	if (pdata && pdata->num_clients > 0) {
-		cap_input_index = 0;
-		fimc->num_clocks++;
-	}
-
 	res = platform_get_resource(pdev, IORESOURCE_IRQ, 0);
 	if (!res) {
 		dev_err(&pdev->dev, "failed to get IRQ resource\n");
@@ -1705,6 +1696,7 @@ static int fimc_probe(struct platform_device *pdev)
 	}
 	fimc->irq = res->start;
 
+	fimc->num_clocks = MAX_FIMC_CLOCKS;
 	ret = fimc_clk_get(fimc);
 	if (ret)
 		goto err_regs_unmap;
diff --git a/trunk/drivers/media/video/s5p-fimc/fimc-core.h b/trunk/drivers/media/video/s5p-fimc/fimc-core.h
index c8a2bab9a6f6..d82bff8c4d16 100644
--- a/trunk/drivers/media/video/s5p-fimc/fimc-core.h
+++ b/trunk/drivers/media/video/s5p-fimc/fimc-core.h
@@ -34,7 +34,7 @@
 
 /* Time to wait for next frame VSYNC interrupt while stopping operation. */
 #define FIMC_SHUTDOWN_TIMEOUT	((100*HZ)/1000)
-#define MAX_FIMC_CLOCKS		3
+#define MAX_FIMC_CLOCKS		2
 #define MODULE_NAME		"s5p-fimc"
 #define FIMC_MAX_DEVS		4
 #define FIMC_MAX_OUT_BUFS	4
@@ -46,7 +46,6 @@
 enum {
 	CLK_BUS,
 	CLK_GATE,
-	CLK_CAM,
 };
 
 enum fimc_dev_flags {