diff options
| author | Ulf Hansson <ulf.hansson@linaro.org> | 2012-08-27 15:45:53 +0200 |
|---|---|---|
| committer | Mike Turquette <mturquette@linaro.org> | 2012-09-06 15:58:20 -0700 |
| commit | ebc96db7632f987e0b9bffcb782cf5cfb8afb0dd (patch) | |
| tree | 8b5376de9a6c5689a17f7f14060fa75cb293eaac /arch/arm/mach-ux500/cpu.c | |
| parent | 0e6dcde7288f1de8e2a5896349342de5d316d3cb (diff) | |
| download | blackbird-op-linux-ebc96db7632f987e0b9bffcb782cf5cfb8afb0dd.tar.gz blackbird-op-linux-ebc96db7632f987e0b9bffcb782cf5cfb8afb0dd.zip | |
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 @@ #include <linux/platform_device.h> #include <linux/io.h> -#include <linux/clk.h> #include <linux/mfd/db8500-prcmu.h> #include <linux/clksrc-dbx500-prcmu.h> #include <linux/sys_soc.h> @@ -17,6 +16,7 @@ #include <linux/stat.h> #include <linux/of.h> #include <linux/of_irq.h> +#include <linux/platform_data/clk-ux500.h> #include <asm/hardware/gic.h> #include <asm/mach/map.h> @@ -25,8 +25,6 @@ #include <mach/setup.h> #include <mach/devices.h> -#include "clock.h" - void __iomem *_PRCMU_BASE; /* @@ -70,13 +68,17 @@ void __init ux500_init_irq(void) */ if (cpu_is_u8500_family()) db8500_prcmu_early_init(); - clk_init(); + + if (cpu_is_u8500_family()) + u8500_clk_init(); + else if (cpu_is_u9540()) + u9540_clk_init(); + else if (cpu_is_u8540()) + u8540_clk_init(); } void __init ux500_init_late(void) { - clk_debugfs_init(); - clk_init_smp_twd_cpufreq(); } static const char * __init ux500_get_machine(void) |
