f07e572f64
bcm2708: boot tested on RPi B+ v1.2 bcm2709: boot tested on RPi 3B v1.2 and RPi 4B v1.1 4G bcm2710: boot tested on RPi 3B v1.2 bcm2711: boot tested on RPi 4B v1.1 4G Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
52 lines
1.5 KiB
Diff
52 lines
1.5 KiB
Diff
From db0889b08409484160a9082bc0b5f39877fe9591 Mon Sep 17 00:00:00 2001
|
|
From: Jacopo Mondi <jacopo@jmondi.org>
|
|
Date: Sat, 9 May 2020 11:04:55 +0200
|
|
Subject: [PATCH] media: i2c: imx219: Parse and register properties
|
|
|
|
Parse device properties and register controls for them using the newly
|
|
introduced helpers.
|
|
|
|
Signed-off-by: Jacopo Mondi <jacopo@jmondi.org>
|
|
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
|
|
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
|
|
|
|
Commit ad3a44cbd1b2e1559c6b93e80dc0c9c29632969a upstream
|
|
|
|
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
|
|
---
|
|
drivers/media/i2c/imx219.c | 12 +++++++++++-
|
|
1 file changed, 11 insertions(+), 1 deletion(-)
|
|
|
|
--- a/drivers/media/i2c/imx219.c
|
|
+++ b/drivers/media/i2c/imx219.c
|
|
@@ -1348,11 +1348,12 @@ static int imx219_init_controls(struct i
|
|
struct i2c_client *client = v4l2_get_subdevdata(&imx219->sd);
|
|
struct v4l2_ctrl_handler *ctrl_hdlr;
|
|
unsigned int height = imx219->mode->height;
|
|
+ struct v4l2_fwnode_device_properties props;
|
|
int exposure_max, exposure_def, hblank;
|
|
int i, ret;
|
|
|
|
ctrl_hdlr = &imx219->ctrl_handler;
|
|
- ret = v4l2_ctrl_handler_init(ctrl_hdlr, 9);
|
|
+ ret = v4l2_ctrl_handler_init(ctrl_hdlr, 11);
|
|
if (ret)
|
|
return ret;
|
|
|
|
@@ -1431,6 +1432,15 @@ static int imx219_init_controls(struct i
|
|
goto error;
|
|
}
|
|
|
|
+ ret = v4l2_fwnode_device_parse(&client->dev, &props);
|
|
+ if (ret)
|
|
+ goto error;
|
|
+
|
|
+ ret = v4l2_ctrl_new_fwnode_properties(ctrl_hdlr, &imx219_ctrl_ops,
|
|
+ &props);
|
|
+ if (ret)
|
|
+ goto error;
|
|
+
|
|
imx219->sd.ctrl_handler = ctrl_hdlr;
|
|
|
|
return 0;
|