[PATCHv3 12/15] ov2640: add MC support
From: Hans Verkuil <hidden>
Date: 2017-03-06 14:56:13
Also in:
linux-media
Subsystem:
media input infrastructure (v4l/dvb), the rest, v4l2 camera sensor drivers · Maintainers:
Mauro Carvalho Chehab, Linus Torvalds, Sakari Ailus
From: Hans Verkuil <redacted> The MC support is needed by the em28xx driver. Signed-off-by: Hans Verkuil <redacted> --- drivers/media/i2c/ov2640.c | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-)
diff --git a/drivers/media/i2c/ov2640.c b/drivers/media/i2c/ov2640.c
index 2f799ab4cc2b..3c187069ec26 100644
--- a/drivers/media/i2c/ov2640.c
+++ b/drivers/media/i2c/ov2640.c@@ -282,6 +282,9 @@ struct ov2640_win_size { struct ov2640_priv { struct v4l2_subdev subdev; +#if defined(CONFIG_MEDIA_CONTROLLER) + struct media_pad pad; +#endif struct v4l2_ctrl_handler hdl; u32 cfmt_code; struct clk *clk;
@@ -1073,19 +1076,30 @@ static int ov2640_probe(struct i2c_client *client, ret = priv->hdl.error; goto err_hdl; } +#if defined(CONFIG_MEDIA_CONTROLLER) + priv->pad.flags = MEDIA_PAD_FL_SOURCE; + priv->subdev.entity.function = MEDIA_ENT_F_CAM_SENSOR; + ret = media_entity_pads_init(&priv->subdev.entity, 1, &priv->pad); + if (ret < 0) + goto err_hdl; +#endif ret = ov2640_video_probe(client); if (ret < 0) - goto err_hdl; + goto err_videoprobe; ret = v4l2_async_register_subdev(&priv->subdev); if (ret < 0) - goto err_hdl; + goto err_videoprobe; dev_info(&adapter->dev, "OV2640 Probed\n"); return 0; +err_videoprobe: +#if defined(CONFIG_MEDIA_CONTROLLER) + media_entity_cleanup(&priv->subdev.entity); +#endif err_hdl: v4l2_ctrl_handler_free(&priv->hdl); return ret;
@@ -1097,6 +1111,9 @@ static int ov2640_remove(struct i2c_client *client) v4l2_async_unregister_subdev(&priv->subdev); v4l2_ctrl_handler_free(&priv->hdl); +#if defined(CONFIG_MEDIA_CONTROLLER) + media_entity_cleanup(&priv->subdev.entity); +#endif v4l2_device_unregister_subdev(&priv->subdev); return 0; }
--
2.11.0
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html