diff options
author | Ulf Hansson <ulf.hansson@linaro.org> | 2012-08-27 09:45:53 -0400 |
---|---|---|
committer | Mike Turquette <mturquette@linaro.org> | 2012-09-06 18:58:20 -0400 |
commit | ebc96db7632f987e0b9bffcb782cf5cfb8afb0dd (patch) | |
tree | 8b5376de9a6c5689a17f7f14060fa75cb293eaac /arch/arm/mach-ux500/cpu.c | |
parent | 0e6dcde7288f1de8e2a5896349342de5d316d3cb (diff) |
ARM: ux500: Switch to use common clock framework
Remove machine specific clock implementation and switch to use
new common clock framework.
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Mike Turquette <mturquette@linaro.org>
Diffstat (limited to 'arch/arm/mach-ux500/cpu.c')
-rw-r--r-- | arch/arm/mach-ux500/cpu.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/arch/arm/mach-ux500/cpu.c b/arch/arm/mach-ux500/cpu.c index e2360e7c770d..17a78ec516ff 100644 --- a/arch/arm/mach-ux500/cpu.c +++ b/arch/arm/mach-ux500/cpu.c | |||
@@ -8,7 +8,6 @@ | |||
8 | 8 | ||
9 | #include <linux/platform_device.h> | 9 | #include <linux/platform_device.h> |
10 | #include <linux/io.h> | 10 | #include <linux/io.h> |
11 | #include <linux/clk.h> | ||
12 | #include <linux/mfd/db8500-prcmu.h> | 11 | #include <linux/mfd/db8500-prcmu.h> |
13 | #include <linux/clksrc-dbx500-prcmu.h> | 12 | #include <linux/clksrc-dbx500-prcmu.h> |
14 | #include <linux/sys_soc.h> | 13 | #include <linux/sys_soc.h> |
@@ -17,6 +16,7 @@ | |||
17 | #include <linux/stat.h> | 16 | #include <linux/stat.h> |
18 | #include <linux/of.h> | 17 | #include <linux/of.h> |
19 | #include <linux/of_irq.h> | 18 | #include <linux/of_irq.h> |
19 | #include <linux/platform_data/clk-ux500.h> | ||
20 | 20 | ||
21 | #include <asm/hardware/gic.h> | 21 | #include <asm/hardware/gic.h> |
22 | #include <asm/mach/map.h> | 22 | #include <asm/mach/map.h> |
@@ -25,8 +25,6 @@ | |||
25 | #include <mach/setup.h> | 25 | #include <mach/setup.h> |
26 | #include <mach/devices.h> | 26 | #include <mach/devices.h> |
27 | 27 | ||
28 | #include "clock.h" | ||
29 | |||
30 | void __iomem *_PRCMU_BASE; | 28 | void __iomem *_PRCMU_BASE; |
31 | 29 | ||
32 | /* | 30 | /* |
@@ -70,13 +68,17 @@ void __init ux500_init_irq(void) | |||
70 | */ | 68 | */ |
71 | if (cpu_is_u8500_family()) | 69 | if (cpu_is_u8500_family()) |
72 | db8500_prcmu_early_init(); | 70 | db8500_prcmu_early_init(); |
73 | clk_init(); | 71 | |
72 | if (cpu_is_u8500_family()) | ||
73 | u8500_clk_init(); | ||
74 | else if (cpu_is_u9540()) | ||
75 | u9540_clk_init(); | ||
76 | else if (cpu_is_u8540()) | ||
77 | u8540_clk_init(); | ||
74 | } | 78 | } |
75 | 79 | ||
76 | void __init ux500_init_late(void) | 80 | void __init ux500_init_late(void) |
77 | { | 81 | { |
78 | clk_debugfs_init(); | ||
79 | clk_init_smp_twd_cpufreq(); | ||
80 | } | 82 | } |
81 | 83 | ||
82 | static const char * __init ux500_get_machine(void) | 84 | static const char * __init ux500_get_machine(void) |