Kernel/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-01-12 08:09:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

dmaengine i.MX ipu: clk_prepare/unprepare clock

Browse Source 
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
This commit is contained in:
Sascha Hauer 2012-03-18 23:48:13 +01:00
parent fdf7748b9f
commit 4fa030a43d
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/dma/ipu/ipu_idmac.c
View File

@ -1715,7 +1715,7 @@ static int __init ipu_probe(struct platform_device *pdev)
} }
/* Make sure IPU HSP clock is running */ /* Make sure IPU HSP clock is running */
clk_enable(ipu_data.ipu_clk); clk_prepare_enable(ipu_data.ipu_clk);
/* Disable all interrupts */ /* Disable all interrupts */
idmac_write_ipureg(&ipu_data, 0, IPU_INT_CTRL_1); 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_idmac_init:
err_attach_irq: err_attach_irq:
ipu_irq_detach_irq(&ipu_data, pdev); 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); clk_put(ipu_data.ipu_clk);
err_clk_get: err_clk_get:
iounmap(ipu_data.reg_ic); iounmap(ipu_data.reg_ic);
@ -1765,7 +1765,7 @@ static int __exit ipu_remove(struct platform_device *pdev)
ipu_idmac_exit(ipu); ipu_idmac_exit(ipu);
ipu_irq_detach_irq(ipu, pdev); ipu_irq_detach_irq(ipu, pdev);
clk_disable(ipu->ipu_clk); clk_disable_unprepare(ipu->ipu_clk);
clk_put(ipu->ipu_clk); clk_put(ipu->ipu_clk);
iounmap(ipu->reg_ic); iounmap(ipu->reg_ic);
iounmap(ipu->reg_ipu); iounmap(ipu->reg_ipu);