ARM: tegra3: actmon: moving to clk prepre APIs
Sivaram Nair [Tue, 23 Oct 2012 06:35:52 +0000 (09:35 +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: Ia0c8072f673a924ca39b878e8f63475cbef5dcbf
Signed-off-by: Sivaram Nair <sivaramn@nvidia.com>
Reviewed-on: http://git-master/r/146779
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: Aleksandr Frid <afrid@nvidia.com>
Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com>

Rebase-Id: R75c1b378798c5f13726ba35395d895b8f71164ab

arch/arm/mach-tegra/tegra3_actmon.c

index cf60111..e7f48ab 100644 (file)
@@ -481,7 +481,7 @@ static int __init actmon_dev_init(struct actmon_dev *dev)
 
        dev->state = ACTMON_OFF;
        actmon_dev_enable(dev);
-       clk_enable(dev->clk);
+       tegra_clk_prepare_enable(dev->clk);
        return 0;
 }
 
@@ -843,7 +843,7 @@ static int __init tegra_actmon_init(void)
                return 0;
        }
        actmon_clk_freq = clk_get_rate(c) / 1000;
-       ret = clk_enable(c);
+       ret = tegra_clk_prepare_enable(c);
        if (ret) {
                pr_err("%s: Failed to enable actmon clock\n", __func__);
                return 0;