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>
49 lines
1.5 KiB
Diff
49 lines
1.5 KiB
Diff
From 500db93808fcfa78292fe877f5120186f32df841 Mon Sep 17 00:00:00 2001
|
|
From: Dave Stevenson <dave.stevenson@raspberrypi.com>
|
|
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 <dave.stevenson@raspberrypi.com>
|
|
---
|
|
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
|
|
@@ -1239,6 +1239,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: */
|
|
@@ -1360,7 +1361,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);
|
|
@@ -1408,6 +1409,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) {
|