[media] exynos4-is: Leave FIMC clocks enabled when runtime PM is disabled
Driver should ensure a device can be also used normally when runtime PM is disabled. So enable the FIMC clock in probe() in such situation. Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com> Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
This commit is contained in:
parent
7d459937dc
commit
ea3f1a3db3
|
@ -998,36 +998,39 @@ static int fimc_probe(struct platform_device *pdev)
|
||||||
|
|
||||||
ret = devm_request_irq(dev, res->start, fimc_irq_handler,
|
ret = devm_request_irq(dev, res->start, fimc_irq_handler,
|
||||||
0, dev_name(dev), fimc);
|
0, dev_name(dev), fimc);
|
||||||
if (ret) {
|
if (ret < 0) {
|
||||||
dev_err(dev, "failed to install irq (%d)\n", ret);
|
dev_err(dev, "failed to install irq (%d)\n", ret);
|
||||||
goto err_clk;
|
goto err_sclk;
|
||||||
}
|
}
|
||||||
|
|
||||||
ret = fimc_initialize_capture_subdev(fimc);
|
ret = fimc_initialize_capture_subdev(fimc);
|
||||||
if (ret)
|
if (ret < 0)
|
||||||
goto err_clk;
|
goto err_sclk;
|
||||||
|
|
||||||
platform_set_drvdata(pdev, fimc);
|
platform_set_drvdata(pdev, fimc);
|
||||||
pm_runtime_enable(dev);
|
pm_runtime_enable(dev);
|
||||||
ret = pm_runtime_get_sync(dev);
|
|
||||||
if (ret < 0)
|
if (!pm_runtime_enabled(dev)) {
|
||||||
goto err_sd;
|
ret = clk_enable(fimc->clock[CLK_GATE]);
|
||||||
|
if (ret < 0)
|
||||||
|
goto err_sd;
|
||||||
|
}
|
||||||
|
|
||||||
/* Initialize contiguous memory allocator */
|
/* Initialize contiguous memory allocator */
|
||||||
fimc->alloc_ctx = vb2_dma_contig_init_ctx(dev);
|
fimc->alloc_ctx = vb2_dma_contig_init_ctx(dev);
|
||||||
if (IS_ERR(fimc->alloc_ctx)) {
|
if (IS_ERR(fimc->alloc_ctx)) {
|
||||||
ret = PTR_ERR(fimc->alloc_ctx);
|
ret = PTR_ERR(fimc->alloc_ctx);
|
||||||
goto err_pm;
|
goto err_gclk;
|
||||||
}
|
}
|
||||||
|
|
||||||
dev_dbg(dev, "FIMC.%d registered successfully\n", fimc->id);
|
dev_dbg(dev, "FIMC.%d registered successfully\n", fimc->id);
|
||||||
|
|
||||||
pm_runtime_put(dev);
|
|
||||||
return 0;
|
return 0;
|
||||||
err_pm:
|
|
||||||
pm_runtime_put(dev);
|
err_gclk:
|
||||||
|
clk_disable(fimc->clock[CLK_GATE]);
|
||||||
err_sd:
|
err_sd:
|
||||||
fimc_unregister_capture_subdev(fimc);
|
fimc_unregister_capture_subdev(fimc);
|
||||||
err_clk:
|
err_sclk:
|
||||||
clk_disable(fimc->clock[CLK_BUS]);
|
clk_disable(fimc->clock[CLK_BUS]);
|
||||||
fimc_clk_put(fimc);
|
fimc_clk_put(fimc);
|
||||||
return ret;
|
return ret;
|
||||||
|
|
Loading…
Reference in a new issue