diff options
Diffstat (limited to 'arch/arm/mach-highbank')
-rw-r--r-- | arch/arm/mach-highbank/core.h | 1 | ||||
-rw-r--r-- | arch/arm/mach-highbank/highbank.c | 3 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-highbank/core.h b/arch/arm/mach-highbank/core.h index 80235b46cb58..3f65206a9b92 100644 --- a/arch/arm/mach-highbank/core.h +++ b/arch/arm/mach-highbank/core.h | |||
@@ -2,7 +2,6 @@ | |||
2 | #define __HIGHBANK_CORE_H | 2 | #define __HIGHBANK_CORE_H |
3 | 3 | ||
4 | extern void highbank_set_cpu_jump(int cpu, void *jump_addr); | 4 | extern void highbank_set_cpu_jump(int cpu, void *jump_addr); |
5 | extern void highbank_clocks_init(void); | ||
6 | extern void highbank_restart(char, const char *); | 5 | extern void highbank_restart(char, const char *); |
7 | extern void __iomem *scu_base_addr; | 6 | extern void __iomem *scu_base_addr; |
8 | 7 | ||
diff --git a/arch/arm/mach-highbank/highbank.c b/arch/arm/mach-highbank/highbank.c index e6c061282939..65656ff0eb33 100644 --- a/arch/arm/mach-highbank/highbank.c +++ b/arch/arm/mach-highbank/highbank.c | |||
@@ -25,6 +25,7 @@ | |||
25 | #include <linux/of_address.h> | 25 | #include <linux/of_address.h> |
26 | #include <linux/smp.h> | 26 | #include <linux/smp.h> |
27 | #include <linux/amba/bus.h> | 27 | #include <linux/amba/bus.h> |
28 | #include <linux/clk-provider.h> | ||
28 | 29 | ||
29 | #include <asm/arch_timer.h> | 30 | #include <asm/arch_timer.h> |
30 | #include <asm/cacheflush.h> | 31 | #include <asm/cacheflush.h> |
@@ -117,7 +118,7 @@ static void __init highbank_timer_init(void) | |||
117 | WARN_ON(!timer_base); | 118 | WARN_ON(!timer_base); |
118 | irq = irq_of_parse_and_map(np, 0); | 119 | irq = irq_of_parse_and_map(np, 0); |
119 | 120 | ||
120 | highbank_clocks_init(); | 121 | of_clk_init(NULL); |
121 | lookup.clk = of_clk_get(np, 0); | 122 | lookup.clk = of_clk_get(np, 0); |
122 | clkdev_add(&lookup); | 123 | clkdev_add(&lookup); |
123 | 124 | ||