diff options
| author | Sivaram Nair <sivaramn@nvidia.com> | 2012-10-23 10:07:18 +0300 |
|---|---|---|
| committer | Simone Willett <swillett@nvidia.com> | 2012-11-14 16:05:14 -0800 |
| commit | 9146ef94115f3a1df136756f5189c765ccbac6b9 (patch) | |
| tree | fb00012b2801f1a8751ed10f60fa266ad7dea307 /arch/arm/mach-tegra/kfuse.c | |
| parent | d46570f84a264cf150048bca001b711f9479876e (diff) | |
ARM: tegra: kfuse: moving to clk prepare APIs
The clk_enable/clk_disable pair of APIs are replaced with
clk_prepare_enable and clk_disable_unprepare.
This is needed for the migration to common clk framework.
Bug 920915
Change-Id: I6d5e96e3ce452df0ae84eecba01a8b98f10c74db
Signed-off-by: Sivaram Nair <sivaramn@nvidia.com>
Reviewed-on: http://git-master/r/146789
Reviewed-by: Automatic_Commit_Validation_User
GVS: Gerrit_Virtual_Submit
Reviewed-by: Aleksandr Frid <afrid@nvidia.com>
Reviewed-by: Juha Tukkinen <jtukkinen@nvidia.com>
Diffstat (limited to 'arch/arm/mach-tegra/kfuse.c')
| -rw-r--r-- | arch/arm/mach-tegra/kfuse.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/mach-tegra/kfuse.c b/arch/arm/mach-tegra/kfuse.c index 9e4b482e4691..735c90b38adb 100644 --- a/arch/arm/mach-tegra/kfuse.c +++ b/arch/arm/mach-tegra/kfuse.c @@ -84,7 +84,7 @@ int tegra_kfuse_read(void *dest, size_t len) } } - err = clk_enable(kfuse_clk); + err = clk_prepare_enable(kfuse_clk); if (err) return err; @@ -93,13 +93,13 @@ int tegra_kfuse_read(void *dest, size_t len) err = wait_for_done(); if (err) { pr_err("kfuse: read timeout\n"); - clk_disable(kfuse_clk); + clk_disable_unprepare(kfuse_clk); return err; } if ((tegra_kfuse_readl(KFUSE_STATE) & KFUSE_STATE_CRCPASS) == 0) { pr_err("kfuse: crc failed\n"); - clk_disable(kfuse_clk); + clk_disable_unprepare(kfuse_clk); return -EIO; } @@ -108,7 +108,7 @@ int tegra_kfuse_read(void *dest, size_t len) memcpy(dest + cnt, &v, sizeof v); } - clk_disable(kfuse_clk); + clk_disable_unprepare(kfuse_clk); return 0; } |