diff options
author | Sascha Hauer <s.hauer@pengutronix.de> | 2012-03-18 18:48:13 -0400 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2012-04-25 11:03:43 -0400 |
commit | 4fa030a43ddb0d8fe3f2530d6162c11a3b3d31de (patch) | |
tree | 3eb3dfd8d1fead497fb228ad46e6162908d6b912 /drivers/dma/ipu | |
parent | fdf7748b9f8d392a086560616bf112f0ba0c1f71 (diff) |
dmaengine i.MX ipu: clk_prepare/unprepare clock
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'drivers/dma/ipu')
-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) | |||
1715 | } | 1715 | } |
1716 | 1716 | ||
1717 | /* Make sure IPU HSP clock is running */ | 1717 | /* Make sure IPU HSP clock is running */ |
1718 | clk_enable(ipu_data.ipu_clk); | 1718 | clk_prepare_enable(ipu_data.ipu_clk); |
1719 | 1719 | ||
1720 | /* Disable all interrupts */ | 1720 | /* Disable all interrupts */ |
1721 | idmac_write_ipureg(&ipu_data, 0, IPU_INT_CTRL_1); | 1721 | idmac_write_ipureg(&ipu_data, 0, IPU_INT_CTRL_1); |
@@ -1747,7 +1747,7 @@ static int __init ipu_probe(struct platform_device *pdev) | |||
1747 | err_idmac_init: | 1747 | err_idmac_init: |
1748 | err_attach_irq: | 1748 | err_attach_irq: |
1749 | ipu_irq_detach_irq(&ipu_data, pdev); | 1749 | ipu_irq_detach_irq(&ipu_data, pdev); |
1750 | clk_disable(ipu_data.ipu_clk); | 1750 | clk_disable_unprepare(ipu_data.ipu_clk); |
1751 | clk_put(ipu_data.ipu_clk); | 1751 | clk_put(ipu_data.ipu_clk); |
1752 | err_clk_get: | 1752 | err_clk_get: |
1753 | iounmap(ipu_data.reg_ic); | 1753 | iounmap(ipu_data.reg_ic); |
@@ -1765,7 +1765,7 @@ static int __exit ipu_remove(struct platform_device *pdev) | |||
1765 | 1765 | ||
1766 | ipu_idmac_exit(ipu); | 1766 | ipu_idmac_exit(ipu); |
1767 | ipu_irq_detach_irq(ipu, pdev); | 1767 | ipu_irq_detach_irq(ipu, pdev); |
1768 | clk_disable(ipu->ipu_clk); | 1768 | clk_disable_unprepare(ipu->ipu_clk); |
1769 | clk_put(ipu->ipu_clk); | 1769 | clk_put(ipu->ipu_clk); |
1770 | iounmap(ipu->reg_ic); | 1770 | iounmap(ipu->reg_ic); |
1771 | iounmap(ipu->reg_ipu); | 1771 | iounmap(ipu->reg_ipu); |