diff options
| author | Sivaram Nair <sivaramn@nvidia.com> | 2012-12-17 17:59:30 +0200 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@nvidia.com> | 2013-09-14 01:32:15 -0700 |
| commit | 66a78968bff1eaa4eb2cb741b15b1735c351e9e6 (patch) | |
| tree | 20c6d4de46456914c6f2af6692fedc0573314c1f | |
| parent | cd68bbdeaca60f4a395323475eeb5b2f71fa6352 (diff) | |
mtd: tegra_nor: 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: I4265a5ffe2e63bee62e8b1cc0c20c0a75da1de36
Signed-off-by: Sivaram Nair <sivaramn@nvidia.com>
Reviewed-on: http://git-master/r/172213
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: Manoj Chourasia <mchourasia@nvidia.com>
Reviewed-by: Juha Tukkinen <jtukkinen@nvidia.com>
| -rw-r--r-- | drivers/mtd/maps/tegra_nor.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/mtd/maps/tegra_nor.c b/drivers/mtd/maps/tegra_nor.c index d275b3c48070..cb93b116bbb7 100644 --- a/drivers/mtd/maps/tegra_nor.c +++ b/drivers/mtd/maps/tegra_nor.c @@ -434,7 +434,7 @@ static int tegra_nor_probe(struct platform_device *pdev) goto fail; } - err = clk_enable(info->clk); + err = clk_prepare_enable(info->clk); if (err != 0) goto out_clk_put; @@ -491,7 +491,7 @@ out_dma_free_coherent: dma_free_coherent(dev, TEGRA_SNOR_DMA_LIMIT, info->dma_virt_buffer, info->dma_phys_buffer); out_clk_disable: - clk_disable(info->clk); + clk_disable_unprepare(info->clk); out_clk_put: clk_put(info->clk); fail: @@ -509,7 +509,7 @@ static int tegra_nor_remove(struct platform_device *pdev) dma_free_coherent(&pdev->dev, TEGRA_SNOR_DMA_LIMIT, info->dma_virt_buffer, info->dma_phys_buffer); map_destroy(info->mtd); - clk_disable(info->clk); + clk_disable_unprepare(info->clk); clk_put(info->clk); return 0; |