From 62ef4a5d7a33852b54798dd738f675ac746f0d4c Mon Sep 17 00:00:00 2001 From: Tomasz Figa Date: Thu, 8 Nov 2012 08:45:00 +0900 Subject: ARM: EXYNOS: Make s3c_device_i2c0 always use id 0 This patch removes compatibility definitions added long time ago when clock ids were used instead of devnames that were needed for platforms with only one i2c controller with id -1 (some s3c24xx's). Because currently devname field is used for matching device instances to clocks and if no devname is provided (as in clock-s3c2412.c and common-s3c2443.c for i2c clock, both in arch/arm/mach-s3c24xx) the clock is being matched only by name, so s3c_device_i2c0 can always have id 0. This patch solves the issue with i2c0 broken on boards where its the only i2c controller used, tested on Origen. Signed-off-by: Tomasz Figa Signed-off-by: Kyungmin Park Reviewed-by: Sylwester Nawrocki Signed-off-by: Kukjin Kim --- arch/arm/mach-s3c64xx/clock.c | 4 ---- 1 file changed, 4 deletions(-) (limited to 'arch/arm/mach-s3c64xx') diff --git a/arch/arm/mach-s3c64xx/clock.c b/arch/arm/mach-s3c64xx/clock.c index 28041e83dc8..0fd7417ae3f 100644 --- 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, -- cgit v1.2.3-70-g09d2 From 9ffb571cb1b9dd103bf8d47f8527cd37163d7e12 Mon Sep 17 00:00:00 2001 From: Andrey Gusakov Date: Mon, 12 Nov 2012 13:08:11 +0900 Subject: 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 Reviewed-by: Tomasz Figa Reviewed-by: Sylwester Nawrocki Signed-off-by: Kukjin Kim --- arch/arm/mach-s3c64xx/clock.c | 4 ---- 1 file changed, 4 deletions(-) (limited to 'arch/arm/mach-s3c64xx') diff --git a/arch/arm/mach-s3c64xx/clock.c b/arch/arm/mach-s3c64xx/clock.c index 0fd7417ae3f..6562a06b72c 100644 --- a/arch/arm/mach-s3c64xx/clock.c +++ b/arch/arm/mach-s3c64xx/clock.c @@ -314,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, -- cgit v1.2.3-70-g09d2 From 9213c50d18a0fbf5865afa3aa0cce33c8a076f76 Mon Sep 17 00:00:00 2001 From: Andrey Gusakov Date: Mon, 12 Nov 2012 13:19:23 +0900 Subject: 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 (http://article.gmane.org/gmane.linux.kernel.samsung-soc/13691) Signed-off-by: Andrey Gusakov Reviewed-by: Tomasz Figa Reviewed-by: Sylwester Nawrocki Signed-off-by: Kukjin Kim --- arch/arm/mach-s3c64xx/clock.c | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) (limited to 'arch/arm/mach-s3c64xx') diff --git a/arch/arm/mach-s3c64xx/clock.c b/arch/arm/mach-s3c64xx/clock.c index 6562a06b72c..1a6f8577744 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, }, }; -- cgit v1.2.3-70-g09d2