diff options
| author | Sivaram Nair <sivaramn@nvidia.com> | 2012-10-23 10:00:07 +0300 |
|---|---|---|
| committer | Simone Willett <swillett@nvidia.com> | 2012-11-14 16:05:04 -0800 |
| commit | d8e2260142e799e56672e408ed700b0c415ce7a1 (patch) | |
| tree | daca9f786fa4e4f662bbb3a01f59d33a52fa723a /arch/arm/mach-tegra/tegra_odm_fuses.c | |
| parent | 73327623edecbfadba153dbc241abc4328cd63e3 (diff) | |
ARM: tegra: fuse: 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: Ib72dc1b94e87fcfc7bc9901991a9f94ac2c64a89
Signed-off-by: Sivaram Nair <sivaramn@nvidia.com>
Reviewed-on: http://git-master/r/146783
Reviewed-by: Automatic_Commit_Validation_User
GVS: Gerrit_Virtual_Submit
Reviewed-by: Juha Tukkinen <jtukkinen@nvidia.com>
Diffstat (limited to 'arch/arm/mach-tegra/tegra_odm_fuses.c')
| -rw-r--r-- | arch/arm/mach-tegra/tegra_odm_fuses.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/arch/arm/mach-tegra/tegra_odm_fuses.c b/arch/arm/mach-tegra/tegra_odm_fuses.c index 67dde2db4011..ae415d1286bc 100644 --- a/arch/arm/mach-tegra/tegra_odm_fuses.c +++ b/arch/arm/mach-tegra/tegra_odm_fuses.c @@ -338,7 +338,7 @@ int tegra_fuse_read(enum fuse_io_param io_param, u32 *data, int size) mutex_lock(&fuse_lock); - clk_enable(clk_fuse); + clk_prepare_enable(clk_fuse); fuse_cmd_sense(); if (io_param == SBK_DEVKEY_STATUS) { @@ -355,7 +355,7 @@ int tegra_fuse_read(enum fuse_io_param io_param, u32 *data, int size) get_fuse(io_param, data); } - clk_disable(clk_fuse); + clk_disable_unprepare(clk_fuse); mutex_unlock(&fuse_lock); return 0; @@ -365,9 +365,9 @@ static bool fuse_odm_prod_mode(void) { u32 odm_prod_mode = 0; - clk_enable(clk_fuse); + clk_prepare_enable(clk_fuse); get_fuse(ODM_PROD_MODE, &odm_prod_mode); - clk_disable(clk_fuse); + clk_disable_unprepare(clk_fuse); return (odm_prod_mode ? true : false); } @@ -609,7 +609,7 @@ int tegra_fuse_program(struct fuse_data *pgm_data, u32 flags) return -EPERM; } - clk_enable(clk_fuse); + clk_prepare_enable(clk_fuse); /* check that fuse options write access hasn't been disabled */ mutex_lock(&fuse_lock); @@ -617,7 +617,7 @@ int tegra_fuse_program(struct fuse_data *pgm_data, u32 flags) mutex_unlock(&fuse_lock); if (reg) { pr_err("fuse programming disabled"); - clk_disable(clk_fuse); + clk_disable_unprepare(clk_fuse); return -EACCES; } @@ -679,7 +679,7 @@ int tegra_fuse_program(struct fuse_data *pgm_data, u32 flags) reg &= (FUSE_SENSE_DONE_BIT | STATE_IDLE); } while ((reg != (FUSE_SENSE_DONE_BIT | STATE_IDLE)) && (--delay > 0)); - clk_disable(clk_fuse); + clk_disable_unprepare(clk_fuse); return ((delay > 0) ? 0 : -ETIMEDOUT); } |