Merge branch 'tegra/clk' into next/dt2

[karo-tx-linux.git] / drivers / clocksource / tegra20_timer.c

diff --git a/drivers/clocksource/tegra20_timer.c b/drivers/clocksource/tegra20_timer.c
index 2e4d8a666c36d6ee40db523408f34a8b5927bebf..ae877b021b54449219cef0d1f3e43fe442c54bca 100644 (file)
--- a/drivers/clocksource/tegra20_timer.c
+++ b/drivers/clocksource/tegra20_timer.c
@@ -172,7 +172,7 @@ static void __init tegra20_init_timer(struct device_node *np)
                BUG();
        }
 
-       clk = clk_get_sys("timer", NULL);
+       clk = of_clk_get(np, 0);
        if (IS_ERR(clk)) {
                pr_warn("Unable to get timer clock. Assuming 12Mhz input clock.\n");
                rate = 12000000;
@@ -235,7 +235,7 @@ static void __init tegra20_init_rtc(struct device_node *np)
         * rtc registers are used by read_persistent_clock, keep the rtc clock
         * enabled
         */
-       clk = clk_get_sys("rtc-tegra", NULL);
+       clk = of_clk_get(np, 0);
        if (IS_ERR(clk))
                pr_warn("Unable to get rtc-tegra clock\n");
        else