提交 9ceca28e 编写于 作者: K kyrie wu 提交者: Mauro Carvalho Chehab

media: mtk-jpeg: add jpeg single core initial function

add single core initial function to init reg_base,
irq and clk.
Signed-off-by: Nkyrie wu <kyrie.wu@mediatek.com>
Signed-off-by: Nirui wang <irui.wang@mediatek.com>
Signed-off-by: NHans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: NMauro Carvalho Chehab <mchehab@kernel.org>
上级 75c38caf
...@@ -1671,28 +1671,12 @@ static void mtk_jpeg_job_timeout_work(struct work_struct *work) ...@@ -1671,28 +1671,12 @@ static void mtk_jpeg_job_timeout_work(struct work_struct *work)
v4l2_m2m_job_finish(jpeg->m2m_dev, ctx->fh.m2m_ctx); v4l2_m2m_job_finish(jpeg->m2m_dev, ctx->fh.m2m_ctx);
} }
static int mtk_jpeg_probe(struct platform_device *pdev) static int mtk_jpeg_single_core_init(struct platform_device *pdev,
struct mtk_jpeg_dev *jpeg_dev)
{ {
struct mtk_jpeg_dev *jpeg; struct mtk_jpeg_dev *jpeg = jpeg_dev;
int jpeg_irq; int jpeg_irq, ret;
int ret;
jpeg = devm_kzalloc(&pdev->dev, sizeof(*jpeg), GFP_KERNEL);
if (!jpeg)
return -ENOMEM;
mutex_init(&jpeg->lock);
spin_lock_init(&jpeg->hw_lock);
jpeg->dev = &pdev->dev;
jpeg->variant = of_device_get_match_data(jpeg->dev);
ret = devm_of_platform_populate(&pdev->dev);
if (ret) {
v4l2_err(&jpeg->v4l2_dev, "Master of platform populate failed.");
return -EINVAL;
}
if (!jpeg->variant->multi_core) {
INIT_DELAYED_WORK(&jpeg->job_timeout_work, INIT_DELAYED_WORK(&jpeg->job_timeout_work,
mtk_jpeg_job_timeout_work); mtk_jpeg_job_timeout_work);
...@@ -1724,6 +1708,36 @@ static int mtk_jpeg_probe(struct platform_device *pdev) ...@@ -1724,6 +1708,36 @@ static int mtk_jpeg_probe(struct platform_device *pdev)
dev_err(&pdev->dev, "Failed to init clk\n"); dev_err(&pdev->dev, "Failed to init clk\n");
return ret; return ret;
} }
return 0;
}
static int mtk_jpeg_probe(struct platform_device *pdev)
{
struct mtk_jpeg_dev *jpeg;
int ret;
jpeg = devm_kzalloc(&pdev->dev, sizeof(*jpeg), GFP_KERNEL);
if (!jpeg)
return -ENOMEM;
mutex_init(&jpeg->lock);
spin_lock_init(&jpeg->hw_lock);
jpeg->dev = &pdev->dev;
jpeg->variant = of_device_get_match_data(jpeg->dev);
ret = devm_of_platform_populate(&pdev->dev);
if (ret) {
v4l2_err(&jpeg->v4l2_dev, "Master of platform populate failed.");
return -EINVAL;
}
if (!jpeg->variant->multi_core) {
ret = mtk_jpeg_single_core_init(pdev, jpeg);
if (ret) {
v4l2_err(&jpeg->v4l2_dev, "mtk_jpeg_single_core_init failed.");
return -EINVAL;
}
} }
ret = v4l2_device_register(&pdev->dev, &jpeg->v4l2_dev); ret = v4l2_device_register(&pdev->dev, &jpeg->v4l2_dev);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册