mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-23 17:30:02 +00:00
media: i2c: imx258: Parse and register properties
Analogous to e.g. the imx219. This enables propagating V4L2_CID_CAMERA_ORIENTATION and V4L2_CID_CAMERA_SENSOR_ROTATION values. The motivation is to allow libcamera detect these values from the device tree and propagate them further to e.g. Pipewire. While at it, reserve space for 3 additional controls even if v4l2_ctrl_new_fwnode_properties() can only register 2 of them, to fix the existing implementation which reserve space for 8 controls but actually registers 9. [Sakari Ailus: Rewrapped the commit message and removed changelog] Signed-off-by: Robert Mader <robert.mader@collabora.com> Reviewed-by: Jacopo Mondi <jacopo.mondi@ideasonboard.com> Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
This commit is contained in:
parent
48c33c656c
commit
1968808dd1
1 changed files with 12 additions and 1 deletions
|
@ -9,6 +9,7 @@
|
|||
#include <linux/pm_runtime.h>
|
||||
#include <media/v4l2-ctrls.h>
|
||||
#include <media/v4l2-device.h>
|
||||
#include <media/v4l2-fwnode.h>
|
||||
#include <asm/unaligned.h>
|
||||
|
||||
#define IMX258_REG_VALUE_08BIT 1
|
||||
|
@ -1148,6 +1149,7 @@ static const struct v4l2_subdev_internal_ops imx258_internal_ops = {
|
|||
static int imx258_init_controls(struct imx258 *imx258)
|
||||
{
|
||||
struct i2c_client *client = v4l2_get_subdevdata(&imx258->sd);
|
||||
struct v4l2_fwnode_device_properties props;
|
||||
struct v4l2_ctrl_handler *ctrl_hdlr;
|
||||
s64 vblank_def;
|
||||
s64 vblank_min;
|
||||
|
@ -1156,7 +1158,7 @@ static int imx258_init_controls(struct imx258 *imx258)
|
|||
int ret;
|
||||
|
||||
ctrl_hdlr = &imx258->ctrl_handler;
|
||||
ret = v4l2_ctrl_handler_init(ctrl_hdlr, 8);
|
||||
ret = v4l2_ctrl_handler_init(ctrl_hdlr, 11);
|
||||
if (ret)
|
||||
return ret;
|
||||
|
||||
|
@ -1232,6 +1234,15 @@ static int imx258_init_controls(struct imx258 *imx258)
|
|||
goto error;
|
||||
}
|
||||
|
||||
ret = v4l2_fwnode_device_parse(&client->dev, &props);
|
||||
if (ret)
|
||||
goto error;
|
||||
|
||||
ret = v4l2_ctrl_new_fwnode_properties(ctrl_hdlr, &imx258_ctrl_ops,
|
||||
&props);
|
||||
if (ret)
|
||||
goto error;
|
||||
|
||||
imx258->sd.ctrl_handler = ctrl_hdlr;
|
||||
|
||||
return 0;
|
||||
|
|
Loading…
Reference in a new issue