diff options
| author | Sivaram Nair <sivaramn@nvidia.com> | 2012-11-01 11:49:03 +0200 |
|---|---|---|
| committer | Simone Willett <swillett@nvidia.com> | 2012-11-28 18:10:44 -0800 |
| commit | 798d1704ecd102807dadfadc83de93eaef59b7c6 (patch) | |
| tree | 18bd6b1533912f270953b1cbd7d22bf5ddc829a1 /drivers/media/video | |
| parent | dcfc6fe2ccb372b154af965be4c0b07926bf2bf3 (diff) | |
media: video: tegra: 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: Ib1558412057d523dc75d9cb77b99727b1bc8f497
Signed-off-by: Sivaram Nair <sivaramn@nvidia.com>
Reviewed-on: http://git-master/r/162322
Reviewed-by: Simone Willett <swillett@nvidia.com>
Tested-by: Simone Willett <swillett@nvidia.com>
Diffstat (limited to 'drivers/media/video')
| -rw-r--r-- | drivers/media/video/tegra/tegra_camera.c | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/drivers/media/video/tegra/tegra_camera.c b/drivers/media/video/tegra/tegra_camera.c index ec5697a2af3d..f72d4b3ce1ac 100644 --- a/drivers/media/video/tegra/tegra_camera.c +++ b/drivers/media/video/tegra/tegra_camera.c @@ -69,32 +69,32 @@ struct tegra_camera_block { static int tegra_camera_enable_clk(struct tegra_camera_dev *dev) { - clk_enable(dev->vi_clk); - clk_enable(dev->vi_sensor_clk); - clk_enable(dev->csus_clk); - clk_enable(dev->isp_clk); - clk_enable(dev->csi_clk); + clk_prepare_enable(dev->vi_clk); + clk_prepare_enable(dev->vi_sensor_clk); + clk_prepare_enable(dev->csus_clk); + clk_prepare_enable(dev->isp_clk); + clk_prepare_enable(dev->csi_clk); #ifdef CONFIG_ARCH_TEGRA_11x_SOC - clk_enable(dev->cilab_clk); - clk_enable(dev->cilcd_clk); - clk_enable(dev->cile_clk); + clk_prepare_enable(dev->cilab_clk); + clk_prepare_enable(dev->cilcd_clk); + clk_prepare_enable(dev->cile_clk); #endif return 0; } static int tegra_camera_disable_clk(struct tegra_camera_dev *dev) { - clk_disable(dev->csi_clk); - clk_disable(dev->isp_clk); - clk_disable(dev->csus_clk); - clk_disable(dev->vi_sensor_clk); - clk_disable(dev->vi_clk); + clk_disable_unprepare(dev->csi_clk); + clk_disable_unprepare(dev->isp_clk); + clk_disable_unprepare(dev->csus_clk); + clk_disable_unprepare(dev->vi_sensor_clk); + clk_disable_unprepare(dev->vi_clk); #ifdef CONFIG_ARCH_TEGRA_11x_SOC - clk_disable(dev->cilab_clk); - clk_disable(dev->cilcd_clk); - clk_disable(dev->cile_clk); + clk_disable_unprepare(dev->cilab_clk); + clk_disable_unprepare(dev->cilcd_clk); + clk_disable_unprepare(dev->cile_clk); #endif return 0; @@ -103,7 +103,7 @@ static int tegra_camera_disable_clk(struct tegra_camera_dev *dev) static int tegra_camera_enable_emc(struct tegra_camera_dev *dev) { int ret = tegra_emc_disable_eack(); - clk_enable(dev->emc_clk); + clk_prepare_enable(dev->emc_clk); #ifdef CONFIG_ARCH_TEGRA_2x_SOC clk_set_rate(dev->emc_clk, 300000000); #endif @@ -112,7 +112,7 @@ static int tegra_camera_enable_emc(struct tegra_camera_dev *dev) static int tegra_camera_disable_emc(struct tegra_camera_dev *dev) { - clk_disable(dev->emc_clk); + clk_disable_unprepare(dev->emc_clk); return tegra_emc_enable_eack(); } |