50 lines
1.6 KiB
Diff
50 lines
1.6 KiB
Diff
From 4b738c3d5c0f2719642b9515cece7fbfce9dc108 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: ov5647: 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/ov5647.c | 13 ++++++++++++-
|
|
1 file changed, 12 insertions(+), 1 deletion(-)
|
|
|
|
--- a/drivers/media/i2c/ov5647.c
|
|
+++ b/drivers/media/i2c/ov5647.c
|
|
@@ -1501,6 +1501,7 @@ static int ov5647_probe(struct i2c_clien
|
|
struct device_node *np = client->dev.of_node;
|
|
u32 xclk_freq;
|
|
int hblank, exposure_max, exposure_def;
|
|
+ struct v4l2_fwnode_device_properties props;
|
|
|
|
sensor = devm_kzalloc(dev, sizeof(*sensor), GFP_KERNEL);
|
|
if (!sensor)
|
|
@@ -1534,7 +1535,7 @@ static int ov5647_probe(struct i2c_clien
|
|
mutex_init(&sensor->lock);
|
|
|
|
/* Initialise controls. */
|
|
- v4l2_ctrl_handler_init(&sensor->ctrls, 7);
|
|
+ v4l2_ctrl_handler_init(&sensor->ctrls, 9);
|
|
v4l2_ctrl_new_std(&sensor->ctrls, &ov5647_ctrl_ops,
|
|
V4L2_CID_AUTOGAIN,
|
|
0, /* min */
|
|
@@ -1598,6 +1599,16 @@ static int ov5647_probe(struct i2c_clien
|
|
__func__, ret);
|
|
goto error;
|
|
}
|
|
+
|
|
+ ret = v4l2_fwnode_device_parse(&client->dev, &props);
|
|
+ if (ret)
|
|
+ goto error;
|
|
+
|
|
+ ret = v4l2_ctrl_new_fwnode_properties(&sensor->ctrls, &ov5647_ctrl_ops,
|
|
+ &props);
|
|
+ if (ret)
|
|
+ goto error;
|
|
+
|
|
sensor->sd.ctrl_handler = &sensor->ctrls;
|
|
|
|
/* Write out the register set over I2C on stream-on. */
|