summaryrefslogtreecommitdiff
path: root/arch/arm/mach-s3c24xx/s3c2442.c
diff options
context:
space:
mode:
authorHeiko Stuebner <heiko@sntech.de>2014-05-09 05:49:14 +0900
committerKukjin Kim <kgene.kim@samsung.com>2014-05-13 08:00:42 +0900
commit4659c534834c33c698c9400e0aedd1e1aa48e9b6 (patch)
treebef32de3643870153f26f89b616b19fc69af0e02 /arch/arm/mach-s3c24xx/s3c2442.c
parent3f7c01ade226e7006d76e42f8c9b99ada7085312 (diff)
ARM: S3C24XX: add platform code for conversion to the common clock framework
This adds the necessary init functions to init the clocks from the common clock framework and necessary CONFIG_SAMSUNG_CLOCK ifdefs around the legacy clock code. This also includes empty stubs for the *_setup_clocks functions that are called from the cpufreq driver on resume. Signed-off-by: Heiko Stuebner <heiko@sntech.de> Reviewed-by: Tomasz Figa <t.figa@samsung.com> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
Diffstat (limited to 'arch/arm/mach-s3c24xx/s3c2442.c')
-rw-r--r--arch/arm/mach-s3c24xx/s3c2442.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-s3c24xx/s3c2442.c b/arch/arm/mach-s3c24xx/s3c2442.c
index 2c8adc028538..564c65037ff2 100644
--- a/arch/arm/mach-s3c24xx/s3c2442.c
+++ b/arch/arm/mach-s3c24xx/s3c2442.c
@@ -53,6 +53,7 @@
#include "common.h"
+#ifdef CONFIG_SAMSUNG_CLOCK
/* S3C2442 extended clock support */
static unsigned long s3c2442_camif_upll_round(struct clk *clk,
@@ -162,7 +163,7 @@ static __init int s3c2442_clk_init(void)
}
arch_initcall(s3c2442_clk_init);
-
+#endif
static struct device s3c2442_dev = {
.bus = &s3c2442_subsys,