openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

media: ov772x: add media controller support 

Create a source pad and set the media controller type to the sensor.

Cc: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Cc: Hans Verkuil <hans.verkuil@cisco.com>
Reviewed-by: Jacopo Mondi <jacopo@jmondi.org>
Signed-off-by: Akinobu Mita <akinobu.mita@gmail.com>
Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
This commit is contained in:
Akinobu Mita 2018-05-06 10:19:20 -04:00 committed by Mauro Carvalho Chehab
parent 30f3b17eaf
commit 4b610d6d03
1 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/media/i2c/ov772x.c
View File

@ -424,6 +424,9 @@ struct ov772x_priv {
/* band_filter = COM8[5] ? 256 - BDBASE : 0 */ /* band_filter = COM8[5] ? 256 - BDBASE : 0 */
unsigned short band_filter; unsigned short band_filter;
unsigned int fps; unsigned int fps;
#ifdef CONFIG_MEDIA_CONTROLLER
struct media_pad pad;
#endif
}; };
/* /*
@ -1316,16 +1319,26 @@ static int ov772x_probe(struct i2c_client *client,
if (ret < 0) if (ret < 0)
goto error_gpio_put; goto error_gpio_put;
#ifdef 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 error_gpio_put;
#endif
priv->cfmt = &ov772x_cfmts[0]; priv->cfmt = &ov772x_cfmts[0];
priv->win = &ov772x_win_sizes[0]; priv->win = &ov772x_win_sizes[0];
priv->fps = 15; priv->fps = 15;
ret = v4l2_async_register_subdev(&priv->subdev); ret = v4l2_async_register_subdev(&priv->subdev);
if (ret) if (ret)
goto error_gpio_put; goto error_entity_cleanup;
return 0; return 0;
error_entity_cleanup:
media_entity_cleanup(&priv->subdev.entity);
error_gpio_put: error_gpio_put:
if (priv->pwdn_gpio) if (priv->pwdn_gpio)
gpiod_put(priv->pwdn_gpio); gpiod_put(priv->pwdn_gpio);
@ -1341,6 +1354,7 @@ static int ov772x_remove(struct i2c_client *client)
{ {
struct ov772x_priv *priv = to_ov772x(i2c_get_clientdata(client)); struct ov772x_priv *priv = to_ov772x(i2c_get_clientdata(client));
media_entity_cleanup(&priv->subdev.entity);
clk_put(priv->clk); clk_put(priv->clk);
if (priv->pwdn_gpio) if (priv->pwdn_gpio)
gpiod_put(priv->pwdn_gpio); gpiod_put(priv->pwdn_gpio);