Commit f1347132 authored by Jacek Anaszewski's avatar Jacek Anaszewski Committed by Mauro Carvalho Chehab

[media] s5p-jpeg: Fix clock resource management

Standard suspend/resume path is called after runtime resume
of the given device, so suspend/resume callbacks must do all
clock management done also by runtime pm to allow for proper
power domain shutdown. Moreover, JPEG clock is enabled from
probe function but is is not necessary. This patch also moves
control of jpeg clock to runtime_pm callbacks.
Signed-off-by: default avatarMarek Szyprowski <m.szyprowski@samsung.com>
Signed-off-by: default avatarSeung-Woo Kim <sw0312.kim@samsung.com>
Signed-off-by: default avatarJacek Anaszewski <j.anaszewski@samsung.com>
Signed-off-by: default avatarKyungmin Park <kyungmin.park@samsung.com>
Acked-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarSylwester Nawrocki <s.nawrocki@samsung.com>
Signed-off-by: default avatarMauro Carvalho Chehab <m.chehab@samsung.com>
parent 31dc0ac0
...@@ -1272,7 +1272,6 @@ static int s5p_jpeg_probe(struct platform_device *pdev) ...@@ -1272,7 +1272,6 @@ static int s5p_jpeg_probe(struct platform_device *pdev)
return ret; return ret;
} }
dev_dbg(&pdev->dev, "clock source %p\n", jpeg->clk); dev_dbg(&pdev->dev, "clock source %p\n", jpeg->clk);
clk_prepare_enable(jpeg->clk);
/* v4l2 device */ /* v4l2 device */
ret = v4l2_device_register(&pdev->dev, &jpeg->v4l2_dev); ret = v4l2_device_register(&pdev->dev, &jpeg->v4l2_dev);
...@@ -1380,7 +1379,6 @@ static int s5p_jpeg_probe(struct platform_device *pdev) ...@@ -1380,7 +1379,6 @@ static int s5p_jpeg_probe(struct platform_device *pdev)
v4l2_device_unregister(&jpeg->v4l2_dev); v4l2_device_unregister(&jpeg->v4l2_dev);
clk_get_rollback: clk_get_rollback:
clk_disable_unprepare(jpeg->clk);
clk_put(jpeg->clk); clk_put(jpeg->clk);
return ret; return ret;
...@@ -1400,7 +1398,9 @@ static int s5p_jpeg_remove(struct platform_device *pdev) ...@@ -1400,7 +1398,9 @@ static int s5p_jpeg_remove(struct platform_device *pdev)
v4l2_m2m_release(jpeg->m2m_dev); v4l2_m2m_release(jpeg->m2m_dev);
v4l2_device_unregister(&jpeg->v4l2_dev); v4l2_device_unregister(&jpeg->v4l2_dev);
clk_disable_unprepare(jpeg->clk); if (!pm_runtime_status_suspended(&pdev->dev))
clk_disable_unprepare(jpeg->clk);
clk_put(jpeg->clk); clk_put(jpeg->clk);
return 0; return 0;
...@@ -1408,12 +1408,21 @@ static int s5p_jpeg_remove(struct platform_device *pdev) ...@@ -1408,12 +1408,21 @@ static int s5p_jpeg_remove(struct platform_device *pdev)
static int s5p_jpeg_runtime_suspend(struct device *dev) static int s5p_jpeg_runtime_suspend(struct device *dev)
{ {
struct s5p_jpeg *jpeg = dev_get_drvdata(dev);
clk_disable_unprepare(jpeg->clk);
return 0; return 0;
} }
static int s5p_jpeg_runtime_resume(struct device *dev) static int s5p_jpeg_runtime_resume(struct device *dev)
{ {
struct s5p_jpeg *jpeg = dev_get_drvdata(dev); struct s5p_jpeg *jpeg = dev_get_drvdata(dev);
int ret;
ret = clk_prepare_enable(jpeg->clk);
if (ret < 0)
return ret;
/* /*
* JPEG IP allows storing two Huffman tables for each component * JPEG IP allows storing two Huffman tables for each component
...@@ -1427,9 +1436,25 @@ static int s5p_jpeg_runtime_resume(struct device *dev) ...@@ -1427,9 +1436,25 @@ static int s5p_jpeg_runtime_resume(struct device *dev)
return 0; return 0;
} }
static int s5p_jpeg_suspend(struct device *dev)
{
if (pm_runtime_suspended(dev))
return 0;
return s5p_jpeg_runtime_suspend(dev);
}
static int s5p_jpeg_resume(struct device *dev)
{
if (pm_runtime_suspended(dev))
return 0;
return s5p_jpeg_runtime_resume(dev);
}
static const struct dev_pm_ops s5p_jpeg_pm_ops = { static const struct dev_pm_ops s5p_jpeg_pm_ops = {
.runtime_suspend = s5p_jpeg_runtime_suspend, SET_SYSTEM_SLEEP_PM_OPS(s5p_jpeg_suspend, s5p_jpeg_resume)
.runtime_resume = s5p_jpeg_runtime_resume, SET_RUNTIME_PM_OPS(s5p_jpeg_runtime_suspend, s5p_jpeg_runtime_resume, NULL)
}; };
#ifdef CONFIG_OF #ifdef CONFIG_OF
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment