diff options
author | Heiko Stuebner <heiko@sntech.de> | 2014-05-08 22:49:14 +0200 |
---|---|---|
committer | Kukjin Kim <kgene.kim@samsung.com> | 2014-05-13 01:00:42 +0200 |
commit | 4659c534834c33c698c9400e0aedd1e1aa48e9b6 (patch) | |
tree | bef32de3643870153f26f89b616b19fc69af0e02 /arch/arm/mach-s3c24xx/s3c2410.c | |
parent | clk: samsung: add clock controller driver for s3c2410, s3c2440 and s3c2442 (diff) | |
download | linux-4659c534834c33c698c9400e0aedd1e1aa48e9b6.tar.xz linux-4659c534834c33c698c9400e0aedd1e1aa48e9b6.zip |
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/s3c2410.c')
-rw-r--r-- | arch/arm/mach-s3c24xx/s3c2410.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/arm/mach-s3c24xx/s3c2410.c b/arch/arm/mach-s3c24xx/s3c2410.c index 04b58cb49888..52801730ab24 100644 --- a/arch/arm/mach-s3c24xx/s3c2410.c +++ b/arch/arm/mach-s3c24xx/s3c2410.c @@ -83,6 +83,7 @@ void __init s3c2410_map_io(void) iotable_init(s3c2410_iodesc, ARRAY_SIZE(s3c2410_iodesc)); } +#ifdef CONFIG_SAMSUNG_CLOCK void __init_or_cpufreq s3c2410_setup_clocks(void) { struct clk *xtal_clk; @@ -142,6 +143,11 @@ void __init s3c2410_init_clocks(int xtal) clkdev_add_table(s3c2410_clk_lookup, ARRAY_SIZE(s3c2410_clk_lookup)); samsung_wdt_reset_init(S3C24XX_VA_WATCHDOG); } +#else +void __init_or_cpufreq s3c2410_setup_clocks(void) +{ +} +#endif struct bus_type s3c2410_subsys = { .name = "s3c2410-core", |