summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorSebastian Hesselbarth <sebastian.hesselbarth@gmail.com>2013-09-17 00:32:34 +0200
committerSebastian Hesselbarth <sebastian.hesselbarth@gmail.com>2013-09-29 21:07:06 +0200
commit74227e65f9742f559f6e243ba2c9a983e1f1221d (patch)
tree4a14ec1caaaaa84ef29d76ef617d154727ba3ed4 /arch
parentea25a900f593cd34347ec884b3acac09ffe07667 (diff)
downloadblackbird-op-linux-74227e65f9742f559f6e243ba2c9a983e1f1221d.tar.gz
blackbird-op-linux-74227e65f9742f559f6e243ba2c9a983e1f1221d.zip
clk: nomadik: declare OF clock provider
Common clock framework allows to register clock providers to get called on of_clk_init() by using CLK_OF_DECLARE. This converts nomadik clock provider to make use of it and get rid of the mach specific clk init call. As clocks require system reset controller base address to be initialized each clock driver checks src_base and calls new nomadik_src_init if required. Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com> Acked-by: Linus Walleij <linus.walleij@linaro.org> Acked-by: Mike Turquette <mturquette@linaro.org>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/mach-nomadik/cpu-8815.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/arm/mach-nomadik/cpu-8815.c b/arch/arm/mach-nomadik/cpu-8815.c
index 0fcb14966d5a..2be38a00a3d9 100644
--- a/arch/arm/mach-nomadik/cpu-8815.c
+++ b/arch/arm/mach-nomadik/cpu-8815.c
@@ -25,7 +25,7 @@
#include <linux/slab.h>
#include <linux/irq.h>
#include <linux/dma-mapping.h>
-#include <linux/platform_data/clk-nomadik.h>
+#include <linux/clk-provider.h>
#include <linux/clocksource.h>
#include <linux/of_irq.h>
#include <linux/of_gpio.h>
@@ -115,8 +115,7 @@ static void cpu8815_restart(enum reboot_mode mode, const char *cmd)
static void __init cpu8815_timer_init_of(void)
{
- /* We need this to be up now */
- nomadik_clk_init();
+ of_clk_init(NULL);
clocksource_of_init();
}
OpenPOWER on IntegriCloud