提交 01192aa1 编写于 作者: W Wenyou Yang 提交者: Mauro Carvalho Chehab

media: atmel-isc: Enable the clocks during probe

To meet the relationship, enable the HCLOCK and ispck during the
device probe, "isc_pck frequency is less than or equal to isc_ispck,
and isc_ispck is greater than or equal to HCLOCK."
Meanwhile, call the pm_runtime_enable() in the right place.
Signed-off-by: NWenyou Yang <wenyou.yang@microchip.com>
Signed-off-by: NHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: NMauro Carvalho Chehab <mchehab@osg.samsung.com>
上级 64f6306a
...@@ -389,8 +389,14 @@ static int isc_clk_is_enabled(struct clk_hw *hw) ...@@ -389,8 +389,14 @@ static int isc_clk_is_enabled(struct clk_hw *hw)
struct isc_clk *isc_clk = to_isc_clk(hw); struct isc_clk *isc_clk = to_isc_clk(hw);
u32 status; u32 status;
if (isc_clk->id == ISC_MCK)
pm_runtime_get_sync(isc_clk->dev);
regmap_read(isc_clk->regmap, ISC_CLKSR, &status); regmap_read(isc_clk->regmap, ISC_CLKSR, &status);
if (isc_clk->id == ISC_MCK)
pm_runtime_put_sync(isc_clk->dev);
return status & ISC_CLK(isc_clk->id) ? 1 : 0; return status & ISC_CLK(isc_clk->id) ? 1 : 0;
} }
...@@ -1866,25 +1872,37 @@ static int atmel_isc_probe(struct platform_device *pdev) ...@@ -1866,25 +1872,37 @@ static int atmel_isc_probe(struct platform_device *pdev)
return ret; return ret;
} }
ret = clk_prepare_enable(isc->hclock);
if (ret) {
dev_err(dev, "failed to enable hclock: %d\n", ret);
return ret;
}
ret = isc_clk_init(isc); ret = isc_clk_init(isc);
if (ret) { if (ret) {
dev_err(dev, "failed to init isc clock: %d\n", ret); dev_err(dev, "failed to init isc clock: %d\n", ret);
goto clean_isc_clk; goto unprepare_hclk;
} }
isc->ispck = isc->isc_clks[ISC_ISPCK].clk; isc->ispck = isc->isc_clks[ISC_ISPCK].clk;
ret = clk_prepare_enable(isc->ispck);
if (ret) {
dev_err(dev, "failed to enable ispck: %d\n", ret);
goto unprepare_hclk;
}
/* ispck should be greater or equal to hclock */ /* ispck should be greater or equal to hclock */
ret = clk_set_rate(isc->ispck, clk_get_rate(isc->hclock)); ret = clk_set_rate(isc->ispck, clk_get_rate(isc->hclock));
if (ret) { if (ret) {
dev_err(dev, "failed to set ispck rate: %d\n", ret); dev_err(dev, "failed to set ispck rate: %d\n", ret);
goto clean_isc_clk; goto unprepare_clk;
} }
ret = v4l2_device_register(dev, &isc->v4l2_dev); ret = v4l2_device_register(dev, &isc->v4l2_dev);
if (ret) { if (ret) {
dev_err(dev, "unable to register v4l2 device.\n"); dev_err(dev, "unable to register v4l2 device.\n");
goto clean_isc_clk; goto unprepare_clk;
} }
ret = isc_parse_dt(dev, isc); ret = isc_parse_dt(dev, isc);
...@@ -1917,7 +1935,9 @@ static int atmel_isc_probe(struct platform_device *pdev) ...@@ -1917,7 +1935,9 @@ static int atmel_isc_probe(struct platform_device *pdev)
break; break;
} }
pm_runtime_set_active(dev);
pm_runtime_enable(dev); pm_runtime_enable(dev);
pm_request_idle(dev);
return 0; return 0;
...@@ -1927,7 +1947,11 @@ static int atmel_isc_probe(struct platform_device *pdev) ...@@ -1927,7 +1947,11 @@ static int atmel_isc_probe(struct platform_device *pdev)
unregister_v4l2_device: unregister_v4l2_device:
v4l2_device_unregister(&isc->v4l2_dev); v4l2_device_unregister(&isc->v4l2_dev);
clean_isc_clk: unprepare_clk:
clk_disable_unprepare(isc->ispck);
unprepare_hclk:
clk_disable_unprepare(isc->hclock);
isc_clk_cleanup(isc); isc_clk_cleanup(isc);
return ret; return ret;
...@@ -1938,6 +1962,8 @@ static int atmel_isc_remove(struct platform_device *pdev) ...@@ -1938,6 +1962,8 @@ static int atmel_isc_remove(struct platform_device *pdev)
struct isc_device *isc = platform_get_drvdata(pdev); struct isc_device *isc = platform_get_drvdata(pdev);
pm_runtime_disable(&pdev->dev); pm_runtime_disable(&pdev->dev);
clk_disable_unprepare(isc->ispck);
clk_disable_unprepare(isc->hclock);
isc_subdev_cleanup(isc); isc_subdev_cleanup(isc);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册