media: i2c: imx219: Parse and register properties
authorJacopo Mondi <jacopo@jmondi.org>
Sat, 9 May 2020 09:04:55 +0000 (11:04 +0200)
committerMauro Carvalho Chehab <mchehab+huawei@kernel.org>
Mon, 18 May 2020 13:37:16 +0000 (15:37 +0200)
Parse device properties and register controls for them using the newly
introduced helpers.

Signed-off-by: Jacopo Mondi <jacopo@jmondi.org>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
drivers/media/i2c/imx219.c

index e63288ddd721543bd109a15b5af986271e81d0ff..adf35f9ff6a135ad17ec714fbdb7509c6119bde7 100644 (file)
@@ -1265,11 +1265,12 @@ static int imx219_init_controls(struct imx219 *imx219)
        struct i2c_client *client = v4l2_get_subdevdata(&imx219->sd);
        struct v4l2_ctrl_handler *ctrl_hdlr;
        unsigned int height = imx219->mode->height;
+       struct v4l2_fwnode_device_properties props;
        int exposure_max, exposure_def, hblank;
        int i, ret;
 
        ctrl_hdlr = &imx219->ctrl_handler;
-       ret = v4l2_ctrl_handler_init(ctrl_hdlr, 9);
+       ret = v4l2_ctrl_handler_init(ctrl_hdlr, 11);
        if (ret)
                return ret;
 
@@ -1348,6 +1349,15 @@ static int imx219_init_controls(struct imx219 *imx219)
                goto error;
        }
 
+       ret = v4l2_fwnode_device_parse(&client->dev, &props);
+       if (ret)
+               goto error;
+
+       ret = v4l2_ctrl_new_fwnode_properties(ctrl_hdlr, &imx219_ctrl_ops,
+                                             &props);
+       if (ret)
+               goto error;
+
        imx219->sd.ctrl_handler = ctrl_hdlr;
 
        return 0;