watchdog: coh901327_wdt: use clk_prepare/unprepare
Make sure we prepare/unprepare the COH901327 watchdog timer as is required by the clk API especially if you use common clock. Signed-off-by: Linus Walleij <linus.walleij@linaro.org> Reviewed-by : Pankaj Jangra <jangra.pankaj9@gmail.com> Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
This commit is contained in:
Родитель
3017020dc7
Коммит
c362cb597b
|
@ -263,6 +263,7 @@ static int __exit coh901327_remove(struct platform_device *pdev)
|
||||||
watchdog_unregister_device(&coh901327_wdt);
|
watchdog_unregister_device(&coh901327_wdt);
|
||||||
coh901327_disable();
|
coh901327_disable();
|
||||||
free_irq(irq, pdev);
|
free_irq(irq, pdev);
|
||||||
|
clk_unprepare(clk);
|
||||||
clk_put(clk);
|
clk_put(clk);
|
||||||
iounmap(virtbase);
|
iounmap(virtbase);
|
||||||
release_mem_region(phybase, physize);
|
release_mem_region(phybase, physize);
|
||||||
|
@ -300,9 +301,9 @@ static int __init coh901327_probe(struct platform_device *pdev)
|
||||||
dev_err(&pdev->dev, "could not get clock\n");
|
dev_err(&pdev->dev, "could not get clock\n");
|
||||||
goto out_no_clk;
|
goto out_no_clk;
|
||||||
}
|
}
|
||||||
ret = clk_enable(clk);
|
ret = clk_prepare_enable(clk);
|
||||||
if (ret) {
|
if (ret) {
|
||||||
dev_err(&pdev->dev, "could not enable clock\n");
|
dev_err(&pdev->dev, "could not prepare and enable clock\n");
|
||||||
goto out_no_clk_enable;
|
goto out_no_clk_enable;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -369,7 +370,7 @@ static int __init coh901327_probe(struct platform_device *pdev)
|
||||||
out_no_wdog:
|
out_no_wdog:
|
||||||
free_irq(irq, pdev);
|
free_irq(irq, pdev);
|
||||||
out_no_irq:
|
out_no_irq:
|
||||||
clk_disable(clk);
|
clk_disable_unprepare(clk);
|
||||||
out_no_clk_enable:
|
out_no_clk_enable:
|
||||||
clk_put(clk);
|
clk_put(clk);
|
||||||
out_no_clk:
|
out_no_clk:
|
||||||
|
|
Загрузка…
Ссылка в новой задаче