From 5aeffc428adfd3a97014056e36fd5496119da743 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Tue, 3 Aug 2021 11:25:59 +0100 Subject: [PATCH] media: i2c: imx290: Add fwnode properties controls Add call to v4l2_ctrl_new_fwnode_properties to read and create the fwnode based controls. Signed-off-by: Dave Stevenson --- drivers/media/i2c/imx290.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) --- a/drivers/media/i2c/imx290.c +++ b/drivers/media/i2c/imx290.c @@ -1242,6 +1242,7 @@ static const struct of_device_id imx290_ 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: */ @@ -1363,7 +1364,7 @@ static int imx290_probe(struct i2c_clien */ 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); @@ -1411,6 +1412,15 @@ static int imx290_probe(struct i2c_clien 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) {