20ea6adbf1
Build system: x86_64 Build-tested: bcm2708, bcm2709, bcm2710, bcm2711 Run-tested: bcm2708/RPiB+, bcm2709/RPi3B, bcm2710/RPi3B, bcm2711/RPi4B Signed-off-by: Marty Jones <mj8263788@gmail.com> Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
46 lines
1.3 KiB
Diff
46 lines
1.3 KiB
Diff
From b2334a401dd6d38b2fd38e1168480dc3ec7d704e Mon Sep 17 00:00:00 2001
|
|
From: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
|
|
Date: Sat, 4 Jul 2020 01:45:08 +0300
|
|
Subject: [PATCH] media: i2c: imx477: Parse and register properties
|
|
|
|
Parse device properties and register controls for them using the V4L2
|
|
fwnode properties helpers.
|
|
|
|
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
|
|
---
|
|
drivers/media/i2c/imx477.c | 12 +++++++++++-
|
|
1 file changed, 11 insertions(+), 1 deletion(-)
|
|
|
|
--- a/drivers/media/i2c/imx477.c
|
|
+++ b/drivers/media/i2c/imx477.c
|
|
@@ -1957,11 +1957,12 @@ static int imx477_init_controls(struct i
|
|
{
|
|
struct v4l2_ctrl_handler *ctrl_hdlr;
|
|
struct i2c_client *client = v4l2_get_subdevdata(&imx477->sd);
|
|
+ struct v4l2_fwnode_device_properties props;
|
|
unsigned int i;
|
|
int ret;
|
|
|
|
ctrl_hdlr = &imx477->ctrl_handler;
|
|
- ret = v4l2_ctrl_handler_init(ctrl_hdlr, 14);
|
|
+ ret = v4l2_ctrl_handler_init(ctrl_hdlr, 16);
|
|
if (ret)
|
|
return ret;
|
|
|
|
@@ -2045,6 +2046,15 @@ static int imx477_init_controls(struct i
|
|
goto error;
|
|
}
|
|
|
|
+ ret = v4l2_fwnode_device_parse(&client->dev, &props);
|
|
+ if (ret)
|
|
+ goto error;
|
|
+
|
|
+ ret = v4l2_ctrl_new_fwnode_properties(ctrl_hdlr, &imx477_ctrl_ops,
|
|
+ &props);
|
|
+ if (ret)
|
|
+ goto error;
|
|
+
|
|
imx477->sd.ctrl_handler = ctrl_hdlr;
|
|
|
|
/* Setup exposure and frame/line length limits. */
|