summaryrefslogtreecommitdiffstats
path: root/drivers/clocksource
diff options
context:
space:
mode:
authorPrashant Gaikwad <pgaikwad@nvidia.com>2013-01-04 08:00:54 +0100
committerMike Turquette <mturquette@linaro.org>2013-01-24 20:12:23 +0100
commit85a181986c9cf8bbd2c4f2fb6f2add7ac5db1f76 (patch)
tree3ad1e7c5fc7024134b2c02620cac1720dba7f58e /drivers/clocksource
parentclk: add common of_clk_init() function (diff)
downloadlinux-85a181986c9cf8bbd2c4f2fb6f2add7ac5db1f76.tar.xz
linux-85a181986c9cf8bbd2c4f2fb6f2add7ac5db1f76.zip
clk: sunxi: Use common of_clk_init() function
Use common of_clk_init() function to initialize clocks. Signed-off-by: Prashant Gaikwad <pgaikwad@nvidia.com> Acked-by: Maxime Ripard <maxime.ripard@anandra.org> Signed-off-by: Mike Turquette <mturquette@linaro.org>
Diffstat (limited to 'drivers/clocksource')
-rw-r--r--drivers/clocksource/sunxi_timer.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/clocksource/sunxi_timer.c b/drivers/clocksource/sunxi_timer.c
index 3cd1bd3d7aee..93d09d0e009f 100644
--- a/drivers/clocksource/sunxi_timer.c
+++ b/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))