ARM: tegra: timer: moving to clk prepare APIs
Sivaram Nair [Tue, 23 Oct 2012 06:31:45 +0000 (09:31 +0300)]
The clk_enable/clk_disable pair of APIs are replaced with
tegra_clk_prepare_enable and tegra_clk_disable_unprepare.

This is needed for the migration to common clk framework.

Bug 920915

Change-Id: I410e8cf8cfbf6622dc1076b22598b7fb55e4f63e
Signed-off-by: Sivaram Nair <sivaramn@nvidia.com>
Reviewed-on: http://git-master/r/146778
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: Aleksandr Frid <afrid@nvidia.com>
Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com>

arch/arm/mach-tegra/timer.c

index 4f9056e..24bae16 100644 (file)
@@ -654,7 +654,7 @@ void __init tegra_init_timer(void)
                        " Assuming 12Mhz input clock.\n");
                rate = 12000000;
        } else {
-               clk_enable(clk);
+               tegra_clk_prepare_enable(clk);
                rate = clk_get_rate(clk);
        }
 
@@ -666,7 +666,7 @@ void __init tegra_init_timer(void)
        if (IS_ERR(clk))
                pr_warn("Unable to get rtc-tegra clock\n");
        else
-               clk_enable(clk);
+               tegra_clk_prepare_enable(clk);
 
        switch (rate) {
        case 12000000: