diff options
author | Andrey Gusakov <dron_gus@mail.ru> | 2012-11-11 23:19:23 -0500 |
---|---|---|
committer | Kukjin Kim <kgene.kim@samsung.com> | 2012-11-11 23:19:23 -0500 |
commit | 9213c50d18a0fbf5865afa3aa0cce33c8a076f76 (patch) | |
tree | aa8bda7fae6de6e9486bc12df597690501decc31 /arch/arm/mach-s3c64xx | |
parent | 9ffb571cb1b9dd103bf8d47f8527cd37163d7e12 (diff) |
ARM: S3C64XX: Statically define parent clock of "camera" clock
The "camera" clock have only one parent. Define it statically and
remove unused source clock list.
Based on patch submitted by Sylwester Nawrocki <sylvester.nawrocki@gmail.com>
(http://article.gmane.org/gmane.linux.kernel.samsung-soc/13691)
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.c | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/arch/arm/mach-s3c64xx/clock.c b/arch/arm/mach-s3c64xx/clock.c index 6562a06b72c5..1a6f85777449 100644 --- a/arch/arm/mach-s3c64xx/clock.c +++ b/arch/arm/mach-s3c64xx/clock.c | |||
@@ -673,15 +673,6 @@ static struct clksrc_sources clkset_audio2 = { | |||
673 | .nr_sources = ARRAY_SIZE(clkset_audio2_list), | 673 | .nr_sources = ARRAY_SIZE(clkset_audio2_list), |
674 | }; | 674 | }; |
675 | 675 | ||
676 | static struct clk *clkset_camif_list[] = { | ||
677 | &clk_h2, | ||
678 | }; | ||
679 | |||
680 | static struct clksrc_sources clkset_camif = { | ||
681 | .sources = clkset_camif_list, | ||
682 | .nr_sources = ARRAY_SIZE(clkset_camif_list), | ||
683 | }; | ||
684 | |||
685 | static struct clksrc_clk clksrcs[] = { | 676 | static struct clksrc_clk clksrcs[] = { |
686 | { | 677 | { |
687 | .clk = { | 678 | .clk = { |
@@ -736,10 +727,9 @@ static struct clksrc_clk clksrcs[] = { | |||
736 | .name = "camera", | 727 | .name = "camera", |
737 | .ctrlbit = S3C_CLKCON_SCLK_CAM, | 728 | .ctrlbit = S3C_CLKCON_SCLK_CAM, |
738 | .enable = s3c64xx_sclk_ctrl, | 729 | .enable = s3c64xx_sclk_ctrl, |
730 | .parent = &clk_h2, | ||
739 | }, | 731 | }, |
740 | .reg_div = { .reg = S3C_CLK_DIV0, .shift = 20, .size = 4 }, | 732 | .reg_div = { .reg = S3C_CLK_DIV0, .shift = 20, .size = 4 }, |
741 | .reg_src = { .reg = NULL, .shift = 0, .size = 0 }, | ||
742 | .sources = &clkset_camif, | ||
743 | }, | 733 | }, |
744 | }; | 734 | }; |
745 | 735 | ||