aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-s3c64xx
diff options
context:
space:
mode:
authorAndrey Gusakov <dron_gus@mail.ru>2012-11-12 13:19:23 +0900
committerKukjin Kim <kgene.kim@samsung.com>2012-11-12 13:19:23 +0900
commit9213c50d18a0fbf5865afa3aa0cce33c8a076f76 (patch)
treeaa8bda7fae6de6e9486bc12df597690501decc31 /arch/arm/mach-s3c64xx
parent9ffb571cb1b9dd103bf8d47f8527cd37163d7e12 (diff)
downloadkernel_goldelico_gta04-9213c50d18a0fbf5865afa3aa0cce33c8a076f76.zip
kernel_goldelico_gta04-9213c50d18a0fbf5865afa3aa0cce33c8a076f76.tar.gz
kernel_goldelico_gta04-9213c50d18a0fbf5865afa3aa0cce33c8a076f76.tar.bz2
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.c12
1 files changed, 1 insertions, 11 deletions
diff --git a/arch/arm/mach-s3c64xx/clock.c b/arch/arm/mach-s3c64xx/clock.c
index 6562a06..1a6f857 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 = {
.nr_sources = ARRAY_SIZE(clkset_audio2_list),
};
-static struct clk *clkset_camif_list[] = {
- &clk_h2,
-};
-
-static struct clksrc_sources clkset_camif = {
- .sources = clkset_camif_list,
- .nr_sources = ARRAY_SIZE(clkset_camif_list),
-};
-
static struct clksrc_clk clksrcs[] = {
{
.clk = {
@@ -736,10 +727,9 @@ static struct clksrc_clk clksrcs[] = {
.name = "camera",
.ctrlbit = S3C_CLKCON_SCLK_CAM,
.enable = s3c64xx_sclk_ctrl,
+ .parent = &clk_h2,
},
.reg_div = { .reg = S3C_CLK_DIV0, .shift = 20, .size = 4 },
- .reg_src = { .reg = NULL, .shift = 0, .size = 0 },
- .sources = &clkset_camif,
},
};