media: i2c: imx290: Add fwnode properties controls
authorDave Stevenson <dave.stevenson@raspberrypi.com>
Tue, 3 Aug 2021 10:25:59 +0000 (11:25 +0100)
committerDom Cobley <popcornmix@gmail.com>
Mon, 21 Mar 2022 16:04:20 +0000 (16:04 +0000)
Add call to v4l2_ctrl_new_fwnode_properties to read and
create the fwnode based controls.

Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
drivers/media/i2c/imx290.c

index c09b5a2..4291c77 100644 (file)
@@ -1239,6 +1239,7 @@ static const struct of_device_id imx290_of_match[] = {
 
 static int imx290_probe(struct i2c_client *client)
 {
+       struct v4l2_fwnode_device_properties props;
        struct device *dev = &client->dev;
        struct fwnode_handle *endpoint;
        /* Only CSI2 is supported for now: */
@@ -1360,7 +1361,7 @@ static int imx290_probe(struct i2c_client *client)
         */
        imx290_entity_init_cfg(&imx290->sd, NULL);
 
-       v4l2_ctrl_handler_init(&imx290->ctrls, 9);
+       v4l2_ctrl_handler_init(&imx290->ctrls, 11);
 
        v4l2_ctrl_new_std(&imx290->ctrls, &imx290_ctrl_ops,
                          V4L2_CID_ANALOGUE_GAIN, 0, 100, 1, 0);
@@ -1408,6 +1409,15 @@ static int imx290_probe(struct i2c_client *client)
                                     ARRAY_SIZE(imx290_test_pattern_menu) - 1,
                                     0, 0, imx290_test_pattern_menu);
 
+       ret = v4l2_fwnode_device_parse(&client->dev, &props);
+       if (ret)
+               goto free_ctrl;
+
+       ret = v4l2_ctrl_new_fwnode_properties(&imx290->ctrls, &imx290_ctrl_ops,
+                                             &props);
+       if (ret)
+               goto free_ctrl;
+
        imx290->sd.ctrl_handler = &imx290->ctrls;
 
        if (imx290->ctrls.error) {