aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-s3c64xx
diff options
context:
space:
mode:
authorAndrey Gusakov <dron_gus@mail.ru>2012-11-11 23:08:11 -0500
committerKukjin Kim <kgene.kim@samsung.com>2012-11-11 23:08:11 -0500
commit9ffb571cb1b9dd103bf8d47f8527cd37163d7e12 (patch)
treef4055704f3a544d938ee175d85c1fd6a7d7cdc12 /arch/arm/mach-s3c64xx
parentcbd40b38f739a2db956bf2bdd663fed3ec86277e (diff)
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>
Diffstat (limited to 'arch/arm/mach-s3c64xx')
-rw-r--r--arch/arm/mach-s3c64xx/clock.c4
1 files changed, 0 insertions, 4 deletions
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
@@ -315,10 +315,6 @@ static struct clk init_clocks_off[] = {
315 .enable = s3c64xx_sclk_ctrl, 315 .enable = s3c64xx_sclk_ctrl,
316 .ctrlbit = S3C_CLKCON_SCLK_MFC, 316 .ctrlbit = S3C_CLKCON_SCLK_MFC,
317 }, { 317 }, {
318 .name = "cam",
319 .enable = s3c64xx_sclk_ctrl,
320 .ctrlbit = S3C_CLKCON_SCLK_CAM,
321 }, {
322 .name = "sclk_jpeg", 318 .name = "sclk_jpeg",
323 .enable = s3c64xx_sclk_ctrl, 319 .enable = s3c64xx_sclk_ctrl,
324 .ctrlbit = S3C_CLKCON_SCLK_JPEG, 320 .ctrlbit = S3C_CLKCON_SCLK_JPEG,