diff options
author | Prashant Gaikwad <pgaikwad@nvidia.com> | 2013-01-04 02:00:55 -0500 |
---|---|---|
committer | Mike Turquette <mturquette@linaro.org> | 2013-01-24 14:12:46 -0500 |
commit | d34bcdeb43331f87acf21423df26a8567c07de67 (patch) | |
tree | 3d0a07ea86ad739e87941fdc9ad5c30b5a8f8187 /arch/arm/mach-highbank | |
parent | 85a181986c9cf8bbd2c4f2fb6f2add7ac5db1f76 (diff) |
clk: highbank: Use common of_clk_init() function
Use common of_clk_init() function for clocks initialization.
Signed-off-by: Prashant Gaikwad <pgaikwad@nvidia.com>
Tested-by: Rob Herring <rob.herring@calxeda.com>
Signed-off-by: Mike Turquette <mturquette@linaro.org>
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 981dc1e1da51..f710f163fb50 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> |
@@ -116,7 +117,7 @@ static void __init highbank_timer_init(void) | |||
116 | WARN_ON(!timer_base); | 117 | WARN_ON(!timer_base); |
117 | irq = irq_of_parse_and_map(np, 0); | 118 | irq = irq_of_parse_and_map(np, 0); |
118 | 119 | ||
119 | highbank_clocks_init(); | 120 | of_clk_init(NULL); |
120 | lookup.clk = of_clk_get(np, 0); | 121 | lookup.clk = of_clk_get(np, 0); |
121 | clkdev_add(&lookup); | 122 | clkdev_add(&lookup); |
122 | 123 | ||