Commit eba08021 authored by Jacopo Mondi's avatar Jacopo Mondi Committed by Mauro Carvalho Chehab
Browse files

media: i2c: ov5670: Parse and register properties 



Parse device properties and register controls for them using the newly
introduced helpers.

Signed-off-by: default avatarJacopo Mondi <jacopo@jmondi.org>
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+huawei@kernel.org>
parent e0a36063

drivers/media/i2c/ov5670.c

+13 −1
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ 
#include <linux/pm_runtime.h>

#include <media/v4l2-ctrls.h>

#include <media/v4l2-device.h>

#include <media/v4l2-fwnode.h>



#define OV5670_REG_CHIP_ID		0x300a

#define OV5670_CHIP_ID			0x005670
@@ -2059,6 +2060,8 @@ static const struct v4l2_ctrl_ops ov5670_ctrl_ops = { 
/* Initialize control handlers */

static int ov5670_init_controls(struct ov5670 *ov5670)

{

	struct i2c_client *client = v4l2_get_subdevdata(&ov5670->sd);

	struct v4l2_fwnode_device_properties props;

	struct v4l2_ctrl_handler *ctrl_hdlr;

	s64 vblank_max;

	s64 vblank_def;
@@ -2067,7 +2070,7 @@ static int ov5670_init_controls(struct ov5670 *ov5670) 
	int ret;



	ctrl_hdlr = &ov5670->ctrl_handler;

	ret = v4l2_ctrl_handler_init(ctrl_hdlr, 8);

	ret = v4l2_ctrl_handler_init(ctrl_hdlr, 10);

	if (ret)

		return ret;
@@ -2129,6 +2132,15 @@ static int ov5670_init_controls(struct ov5670 *ov5670) 
		goto error;

	}



	ret = v4l2_fwnode_device_parse(&client->dev, &props);

	if (ret)

		goto error;



	ret = v4l2_ctrl_new_fwnode_properties(ctrl_hdlr, &ov5670_ctrl_ops,

					      &props);

	if (ret)

		goto error;



	ov5670->sd.ctrl_handler = ctrl_hdlr;



	return 0;