Merge branch 'slab/for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/penber...

[cascardo/linux.git] / arch / arm / mach-s3c64xx / clock.c

diff --git a/arch/arm/mach-s3c64xx/clock.c b/arch/arm/mach-s3c64xx/clock.c
index 28041e8..1a6f857 100644 (file)
--- a/arch/arm/mach-s3c64xx/clock.c
+++ b/arch/arm/mach-s3c64xx/clock.c
@@ -138,11 +138,7 @@ static struct clk init_clocks_off[] = {
                .ctrlbit        = S3C_CLKCON_PCLK_TSADC,
        }, {
                .name           = "i2c",
-#ifdef CONFIG_S3C_DEV_I2C1
                .devname        = "s3c2440-i2c.0",
-#else
-               .devname        = "s3c2440-i2c",
-#endif
                .parent         = &clk_p,
                .enable         = s3c64xx_pclk_ctrl,
                .ctrlbit        = S3C_CLKCON_PCLK_IIC,
@@ -318,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,
@@ -681,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    = {
@@ -744,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,
        },
 };