]> git.karo-electronics.de Git - linux-beck.git/commitdiff
ARM: S3C64XX: Statically define parent clock of "camera" clock
authorAndrey Gusakov <dron_gus@mail.ru>
Mon, 12 Nov 2012 04:19:23 +0000 (13:19 +0900)
committerKukjin Kim <kgene.kim@samsung.com>
Mon, 12 Nov 2012 04:19:23 +0000 (13:19 +0900)
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>
arch/arm/mach-s3c64xx/clock.c

index 6562a06b72c50ec57485d16c1bf60efc6445a6cd..1a6f8577744926fc593ec6a2a8aea1b8c509850e 100644 (file)
@@ -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,
        },
 };