commit 45a68b78bbb2f16c7047e62b36a597a4d0ec8902
author Alex Shi <alex.shi@linaro.org> Mon May 26 17:30:38 2014 +0800
committer Alex Shi <alex.shi@linaro.org> Mon May 26 17:30:38 2014 +0800
tree 7e78d7e840def3f8bd5c311b363b412c9dc0af8a
parent 064aff2f72b043adbe034f02594014613d03d80c
parent 8352d7dd08ad3a89db6c65286d2b3567ba417879

Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android

arch/arm64/kernel/setup.c

diff --git a/arch/arm64/kernel/setup.c b/arch/arm64/kernel/setup.c
index 16c8ae4..9bafffe 100644
--- a/arch/arm64/kernel/setup.c
+++ b/arch/arm64/kernel/setup.c
@@ -444,6 +444,7 @@
 
 static int __init arm64_device_init(void)
 {
+	of_clk_init(NULL);
 	of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
 	return 0;
 }

arch/arm64/kernel/time.c

diff --git a/arch/arm64/kernel/time.c b/arch/arm64/kernel/time.c
index dbe1c8d..03dc371 100644
--- a/arch/arm64/kernel/time.c
+++ b/arch/arm64/kernel/time.c
@@ -33,7 +33,6 @@
 #include <linux/irq.h>
 #include <linux/delay.h>
 #include <linux/clocksource.h>
-#include <linux/clk-provider.h>
 
 #include <clocksource/arm_arch_timer.h>
 
@@ -73,7 +72,6 @@
 {
 	u32 arch_timer_rate;
 
-	of_clk_init(NULL);
 	clocksource_of_init();
 
 	arch_timer_rate = arch_timer_get_rate();