summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHeiko Stuebner2012-03-07 11:00:04 +0100
committerKukjin Kim2012-03-07 11:00:04 +0100
commit7d9811f11f823f28d8d04fbb6aafebb909a4cd15 (patch)
treee31fdb32db0a6d8949713bbe340f61acc6b4d7c5
parentARM: S3C24XX: remove obsolete S3C2416_DMA option (diff)
downloadkernel-qcow2-linux-7d9811f11f823f28d8d04fbb6aafebb909a4cd15.tar.gz
kernel-qcow2-linux-7d9811f11f823f28d8d04fbb6aafebb909a4cd15.tar.xz
kernel-qcow2-linux-7d9811f11f823f28d8d04fbb6aafebb909a4cd15.zip
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>
-rw-r--r--arch/arm/mach-s3c24xx/clock-s3c2443.c7
-rw-r--r--arch/arm/plat-samsung/include/plat/clock.h1
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 6dde2696f8f0..efb3ac359566 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 = {
&clk_hsmmc,
};
-void __init_or_cpufreq s3c2443_setup_clocks(void)
-{
- s3c2443_common_setup_clocks(s3c2443_get_mpll);
-}
-
void __init s3c2443_init_clocks(int xtal)
{
unsigned long epllcon = __raw_readl(S3C2443_EPLLCON);
@@ -196,8 +191,6 @@ void __init s3c2443_init_clocks(int xtal)
armdiv, ARRAY_SIZE(armdiv),
S3C2443_CLKDIV0_ARMDIV_MASK);
- s3c2443_setup_clocks();
-
s3c24xx_register_clocks(clks, ARRAY_SIZE(clks));
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 3b5a9dcc29c5..a62753dc15ba 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,
extern void s3c2410_setup_clocks(void);
extern void s3c2412_setup_clocks(void);
extern void s3c244x_setup_clocks(void);
-extern void s3c2443_setup_clocks(void);
/* S3C2410 specific clock functions */