diff options
author | Tomasz Figa <t.figa@samsung.com> | 2014-07-02 13:42:03 -0400 |
---|---|---|
committer | Kukjin Kim <kgene.kim@samsung.com> | 2014-07-18 15:24:59 -0400 |
commit | 32726d2d5502302ba5753854f5f2f12ba22681c4 (patch) | |
tree | e432c5599c79ea3bdf7304477cdebb39e3a82c26 /arch/arm/mach-s5pv210/common.c | |
parent | f73d4cb681d2ede6d31974dde3ecce7a3ae8e8ff (diff) |
ARM: SAMSUNG: Remove legacy clock code
Since S5PV210 now has a complete clock driver using Common Clock
Framework, there is no reason to keep the old code. Remove it together
with the whole legacy Samsung-specific clock framework which no longer
has any users.
Signed-off-by: Tomasz Figa <t.figa@samsung.com>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
Diffstat (limited to 'arch/arm/mach-s5pv210/common.c')
-rw-r--r-- | arch/arm/mach-s5pv210/common.c | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/arch/arm/mach-s5pv210/common.c b/arch/arm/mach-s5pv210/common.c index 2e2202ac7173..30bd5421aa79 100644 --- a/arch/arm/mach-s5pv210/common.c +++ b/arch/arm/mach-s5pv210/common.c | |||
@@ -17,6 +17,7 @@ | |||
17 | #include <linux/init.h> | 17 | #include <linux/init.h> |
18 | #include <linux/module.h> | 18 | #include <linux/module.h> |
19 | #include <linux/clk.h> | 19 | #include <linux/clk.h> |
20 | #include <linux/clk-provider.h> | ||
20 | #include <linux/io.h> | 21 | #include <linux/io.h> |
21 | #include <linux/device.h> | 22 | #include <linux/device.h> |
22 | #include <clocksource/samsung_pwm.h> | 23 | #include <clocksource/samsung_pwm.h> |
@@ -37,12 +38,6 @@ | |||
37 | 38 | ||
38 | #include <plat/cpu.h> | 39 | #include <plat/cpu.h> |
39 | 40 | ||
40 | #ifdef CONFIG_S5P_CLOCK | ||
41 | #include <plat/clock.h> | ||
42 | #else | ||
43 | #include <linux/clk-provider.h> | ||
44 | #endif | ||
45 | |||
46 | #include <plat/devs.h> | 41 | #include <plat/devs.h> |
47 | #include <plat/sdhci.h> | 42 | #include <plat/sdhci.h> |
48 | #include <plat/adc-core.h> | 43 | #include <plat/adc-core.h> |
@@ -239,16 +234,7 @@ void __init s5pv210_map_io(void) | |||
239 | 234 | ||
240 | void __init s5pv210_init_clocks(int xtal) | 235 | void __init s5pv210_init_clocks(int xtal) |
241 | { | 236 | { |
242 | #ifdef CONFIG_S5P_CLOCK | ||
243 | printk(KERN_DEBUG "%s: initializing clocks\n", __func__); | ||
244 | |||
245 | s3c24xx_register_baseclocks(xtal); | ||
246 | s5p_register_clocks(xtal); | ||
247 | s5pv210_register_clocks(); | ||
248 | s5pv210_setup_clocks(); | ||
249 | #else | ||
250 | xusbxti_f = xtal; | 237 | xusbxti_f = xtal; |
251 | #endif | ||
252 | } | 238 | } |
253 | 239 | ||
254 | void __init s5pv210_init_irq(void) | 240 | void __init s5pv210_init_irq(void) |