diff options
| author | Prashant Gaikwad <pgaikwad@nvidia.com> | 2011-11-08 11:30:54 +0530 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@nvidia.com> | 2011-11-30 21:49:54 -0800 |
| commit | fba3d4b20e16b2d7052a693cc07daf0c32c988bd (patch) | |
| tree | fcba1d527fc85a3e27ca33c8b5c5ab13e8bb0908 /drivers/media/video/tegra/nvavp/nvavp_dev.c | |
| parent | 74492e93192504bd410b26a61ae73eb68492e7d0 (diff) | |
media: video: nvavp: Fix clock disable warnings
sclk and emc clock is disabled from nvavp_halt_avp. nvavp_halt_avp
is called from probe where clocks are not enabled.
Disable sclk and emc clock from nvavp_uninit instead of
nvavp_halt_avp.
Change-Id: Idc4a1b629d9fc8048b97d41bc5463db6efa97eab
Reviewed-on: http://git-master/r/62862
Reviewed-by: Varun Colbert <vcolbert@nvidia.com>
Tested-by: Varun Colbert <vcolbert@nvidia.com>
Rebase-Id: R2ed9e3e77cd188e52912d3d2e808398233644e6a
Diffstat (limited to 'drivers/media/video/tegra/nvavp/nvavp_dev.c')
| -rw-r--r-- | drivers/media/video/tegra/nvavp/nvavp_dev.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/media/video/tegra/nvavp/nvavp_dev.c b/drivers/media/video/tegra/nvavp/nvavp_dev.c index e59e73c153e3..1c150dbd1c8b 100644 --- a/drivers/media/video/tegra/nvavp/nvavp_dev.c +++ b/drivers/media/video/tegra/nvavp/nvavp_dev.c @@ -189,9 +189,6 @@ static void nvavp_halt_avp(struct nvavp_info *nvavp) writel(FLOW_MODE_STOP, FLOW_CTRL_HALT_COP_EVENTS); tegra_periph_reset_assert(nvavp->cop_clk); - clk_disable(nvavp->sclk); - clk_disable(nvavp->emc_clk); - writel(0, NVAVP_OS_OUTBOX); writel(0, NVAVP_OS_INBOX); } @@ -694,6 +691,9 @@ static void nvavp_uninit(struct nvavp_info *nvavp) nvavp_halt_vde(nvavp); nvavp_halt_avp(nvavp); + + clk_disable(nvavp->sclk); + clk_disable(nvavp->emc_clk); } static int nvavp_set_clock_ioctl(struct file *filp, unsigned int cmd, |