diff options
author | Heiko Stuebner <heiko@sntech.de> | 2012-03-07 05:00:04 -0500 |
---|---|---|
committer | Kukjin Kim <kgene.kim@samsung.com> | 2012-03-07 05:00:04 -0500 |
commit | 7d9811f11f823f28d8d04fbb6aafebb909a4cd15 (patch) | |
tree | e31fdb32db0a6d8949713bbe340f61acc6b4d7c5 /arch/arm | |
parent | 714cc3a574282732dbd0c4389e4f82d750d7e5f9 (diff) |
ARM: S3C24XX: remove XXX_setup_clocks method from S3C2443
s3c2443_common_setup_clocks is always called through
s3c2443_common_init_clocks, so there is no need to call it separately.
It was also called twice through this separate call.
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
Diffstat (limited to 'arch/arm')
-rw-r--r-- | arch/arm/mach-s3c24xx/clock-s3c2443.c | 7 | ||||
-rw-r--r-- | arch/arm/plat-samsung/include/plat/clock.h | 1 |
2 files changed, 0 insertions, 8 deletions
diff --git a/arch/arm/mach-s3c24xx/clock-s3c2443.c b/arch/arm/mach-s3c24xx/clock-s3c2443.c index 6dde2696f8f..efb3ac35956 100644 --- a/arch/arm/mach-s3c24xx/clock-s3c2443.c +++ b/arch/arm/mach-s3c24xx/clock-s3c2443.c | |||
@@ -179,11 +179,6 @@ static struct clk *clks[] __initdata = { | |||
179 | &clk_hsmmc, | 179 | &clk_hsmmc, |
180 | }; | 180 | }; |
181 | 181 | ||
182 | void __init_or_cpufreq s3c2443_setup_clocks(void) | ||
183 | { | ||
184 | s3c2443_common_setup_clocks(s3c2443_get_mpll); | ||
185 | } | ||
186 | |||
187 | void __init s3c2443_init_clocks(int xtal) | 182 | void __init s3c2443_init_clocks(int xtal) |
188 | { | 183 | { |
189 | unsigned long epllcon = __raw_readl(S3C2443_EPLLCON); | 184 | unsigned long epllcon = __raw_readl(S3C2443_EPLLCON); |
@@ -196,8 +191,6 @@ void __init s3c2443_init_clocks(int xtal) | |||
196 | armdiv, ARRAY_SIZE(armdiv), | 191 | armdiv, ARRAY_SIZE(armdiv), |
197 | S3C2443_CLKDIV0_ARMDIV_MASK); | 192 | S3C2443_CLKDIV0_ARMDIV_MASK); |
198 | 193 | ||
199 | s3c2443_setup_clocks(); | ||
200 | |||
201 | s3c24xx_register_clocks(clks, ARRAY_SIZE(clks)); | 194 | s3c24xx_register_clocks(clks, ARRAY_SIZE(clks)); |
202 | 195 | ||
203 | for (ptr = 0; ptr < ARRAY_SIZE(clksrcs); ptr++) | 196 | for (ptr = 0; ptr < ARRAY_SIZE(clksrcs); ptr++) |
diff --git a/arch/arm/plat-samsung/include/plat/clock.h b/arch/arm/plat-samsung/include/plat/clock.h index 3b5a9dcc29c..a62753dc15b 100644 --- a/arch/arm/plat-samsung/include/plat/clock.h +++ b/arch/arm/plat-samsung/include/plat/clock.h | |||
@@ -118,7 +118,6 @@ extern void s3c24xx_setup_clocks(unsigned long fclk, | |||
118 | extern void s3c2410_setup_clocks(void); | 118 | extern void s3c2410_setup_clocks(void); |
119 | extern void s3c2412_setup_clocks(void); | 119 | extern void s3c2412_setup_clocks(void); |
120 | extern void s3c244x_setup_clocks(void); | 120 | extern void s3c244x_setup_clocks(void); |
121 | extern void s3c2443_setup_clocks(void); | ||
122 | 121 | ||
123 | /* S3C2410 specific clock functions */ | 122 | /* S3C2410 specific clock functions */ |
124 | 123 | ||