---

yaml --- r: 350737 b: refs/heads/master c: 85a1819 h: refs/heads/master i: 350735: 4db73c3 v: v3
git-mirror · Jan 24, 2013 · e03a63b · e03a63b
1 parent 160d30a
commit e03a63b
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 55 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f2f6c2556dcc432e50003bc8fa4d62d95906f149
+refs/heads/master: 85a181986c9cf8bbd2c4f2fb6f2add7ac5db1f76
diff --git a/trunk/drivers/clk/clk-sunxi.c b/trunk/drivers/clk/clk-sunxi.c
diff --git a/trunk/drivers/clocksource/sunxi_timer.c b/trunk/drivers/clocksource/sunxi_timer.c
@@ -23,7 +23,7 @@
 #include <linux/of_address.h>
 #include <linux/of_irq.h>
 #include <linux/sunxi_timer.h>
-#include <linux/clk/sunxi.h>
+#include <linux/clk-provider.h>
 
 #define TIMER_CTL_REG		0x00
 #define TIMER_CTL_ENABLE		(1 << 0)
@@ -124,7 +124,7 @@ static void __init sunxi_timer_init(void)
 	if (irq <= 0)
 		panic("Can't parse IRQ");
 
-	sunxi_init_clocks();
+	of_clk_init(NULL);
 
 	clk = of_clk_get(node, 0);
 	if (IS_ERR(clk))

diff --git a/trunk/include/linux/clk/sunxi.h b/trunk/include/linux/clk/sunxi.h