From: Andrey Gusakov <dron_gus@mail.ru>
Date: Mon, 12 Nov 2012 04:08:11 +0000 (+0900)
Subject: ARM: S3C64XX: Remove duplicated camera clock
X-Git-Tag: firefly_0821_release~3680^2~1485^2~7^2~5
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=9ffb571cb1b9dd103bf8d47f8527cd37163d7e12;p=firefly-linux-kernel-4.4.55.git

ARM: S3C64XX: Remove duplicated camera clock

Camera clock defined two times. One in init_clocks_off array with
"cam" name, second in clksrcs array with "camera" name. Leave
second definition because clock have divider.

Signed-off-by: Andrey Gusakov <dron0gus@gmail.com>
Reviewed-by: Tomasz Figa <tomasz.figa@gmail.com>
Reviewed-by: Sylwester Nawrocki <sylvester.nawrocki@gmail.com>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
---

diff --git a/arch/arm/mach-s3c64xx/clock.c b/arch/arm/mach-s3c64xx/clock.c
index 0fd7417ae3f0..6562a06b72c5 100644
--- a/arch/arm/mach-s3c64xx/clock.c
+++ b/arch/arm/mach-s3c64xx/clock.c
@@ -314,10 +314,6 @@ static struct clk init_clocks_off[] = {
 		.name		= "sclk_mfc",
 		.enable		= s3c64xx_sclk_ctrl,
 		.ctrlbit	= S3C_CLKCON_SCLK_MFC,
-	}, {
-		.name		= "cam",
-		.enable		= s3c64xx_sclk_ctrl,
-		.ctrlbit	= S3C_CLKCON_SCLK_CAM,
 	}, {
 		.name		= "sclk_jpeg",
 		.enable		= s3c64xx_sclk_ctrl,