57 lines
1.7 KiB
Diff
57 lines
1.7 KiB
Diff
From dfaa98b5db1b6ec5f73b18f997cf18c18099d571 Mon Sep 17 00:00:00 2001
|
|
From: Dave Stevenson <dave.stevenson@raspberrypi.com>
|
|
Date: Tue, 3 Aug 2021 11:30:58 +0100
|
|
Subject: [PATCH] media: i2c: ov9281: 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/ov9281.c | 13 ++++++++++++-
|
|
1 file changed, 12 insertions(+), 1 deletion(-)
|
|
|
|
--- a/drivers/media/i2c/ov9281.c
|
|
+++ b/drivers/media/i2c/ov9281.c
|
|
@@ -25,6 +25,7 @@
|
|
#include <media/media-entity.h>
|
|
#include <media/v4l2-async.h>
|
|
#include <media/v4l2-ctrls.h>
|
|
+#include <media/v4l2-fwnode.h>
|
|
#include <media/v4l2-subdev.h>
|
|
|
|
#define OV9281_LINK_FREQ_400MHZ 400000000
|
|
@@ -1023,6 +1024,7 @@ static const struct v4l2_ctrl_ops ov9281
|
|
|
|
static int ov9281_initialize_controls(struct ov9281 *ov9281)
|
|
{
|
|
+ struct v4l2_fwnode_device_properties props;
|
|
const struct ov9281_mode *mode;
|
|
struct v4l2_ctrl_handler *handler;
|
|
struct v4l2_ctrl *ctrl;
|
|
@@ -1032,7 +1034,7 @@ static int ov9281_initialize_controls(st
|
|
|
|
handler = &ov9281->ctrl_handler;
|
|
mode = ov9281->cur_mode;
|
|
- ret = v4l2_ctrl_handler_init(handler, 9);
|
|
+ ret = v4l2_ctrl_handler_init(handler, 11);
|
|
if (ret)
|
|
return ret;
|
|
handler->lock = &ov9281->mutex;
|
|
@@ -1094,6 +1096,15 @@ static int ov9281_initialize_controls(st
|
|
goto err_free_handler;
|
|
}
|
|
|
|
+ ret = v4l2_fwnode_device_parse(&ov9281->client->dev, &props);
|
|
+ if (ret)
|
|
+ goto err_free_handler;
|
|
+
|
|
+ ret = v4l2_ctrl_new_fwnode_properties(handler, &ov9281_ctrl_ops,
|
|
+ &props);
|
|
+ if (ret)
|
|
+ goto err_free_handler;
|
|
+
|
|
ov9281->subdev.ctrl_handler = handler;
|
|
|
|
return 0;
|