diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2012-03-18 23:48:13 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2012-04-25 17:03:43 +0200 |
| commit | 4fa030a43ddb0d8fe3f2530d6162c11a3b3d31de (patch) | |
| tree | 3eb3dfd8d1fead497fb228ad46e6162908d6b912 /drivers/dma | |
| parent | media mx3 camera: prepare clk before enabling it (diff) | |
| download | linux-4fa030a43ddb0d8fe3f2530d6162c11a3b3d31de.tar.xz linux-4fa030a43ddb0d8fe3f2530d6162c11a3b3d31de.zip | |
dmaengine i.MX ipu: clk_prepare/unprepare clock
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'drivers/dma')
| -rw-r--r-- | drivers/dma/ipu/ipu_idmac.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/dma/ipu/ipu_idmac.c b/drivers/dma/ipu/ipu_idmac.c index 62e3f8ec2461..5ec72044ea4c 100644 --- a/drivers/dma/ipu/ipu_idmac.c +++ b/drivers/dma/ipu/ipu_idmac.c @@ -1715,7 +1715,7 @@ static int __init ipu_probe(struct platform_device *pdev) } /* Make sure IPU HSP clock is running */ - clk_enable(ipu_data.ipu_clk); + clk_prepare_enable(ipu_data.ipu_clk); /* Disable all interrupts */ idmac_write_ipureg(&ipu_data, 0, IPU_INT_CTRL_1); @@ -1747,7 +1747,7 @@ static int __init ipu_probe(struct platform_device *pdev) err_idmac_init: err_attach_irq: ipu_irq_detach_irq(&ipu_data, pdev); - clk_disable(ipu_data.ipu_clk); + clk_disable_unprepare(ipu_data.ipu_clk); clk_put(ipu_data.ipu_clk); err_clk_get: iounmap(ipu_data.reg_ic); @@ -1765,7 +1765,7 @@ static int __exit ipu_remove(struct platform_device *pdev) ipu_idmac_exit(ipu); ipu_irq_detach_irq(ipu, pdev); - clk_disable(ipu->ipu_clk); + clk_disable_unprepare(ipu->ipu_clk); clk_put(ipu->ipu_clk); iounmap(ipu->reg_ic); iounmap(ipu->reg_ipu); |