media: i2c: ov9282: Add the properties from fwnode

Use v4l2_ctrl_new_fwnode_properties to add V4L2_CID_CAMERA_ORIENTATION
and V4L2_CID_CAMERA_SENSOR_ROTATION.

Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
Reviewed-by: Jacopo Mondi <jacopo@jmondi.org>
Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>

diff --git a/drivers/media/i2c/ov9282.c b/drivers/media/i2c/ov9282.c
index 1637cf1177c572d453b58f78b508cf16402f7464..889db9d105a2cf2a06dd301c5d9287dc551f9a0a 100644 (file)
--- a/drivers/media/i2c/ov9282.c
+++ b/drivers/media/i2c/ov9282.c
@@ -959,10 +959,11 @@ static int ov9282_init_controls(struct ov9282 *ov9282)
 {
        struct v4l2_ctrl_handler *ctrl_hdlr = &ov9282->ctrl_handler;
        const struct ov9282_mode *mode = ov9282->cur_mode;
+       struct v4l2_fwnode_device_properties props;
        u32 lpfr;
        int ret;
 
-       ret = v4l2_ctrl_handler_init(ctrl_hdlr, 6);
+       ret = v4l2_ctrl_handler_init(ctrl_hdlr, 8);
        if (ret)
                return ret;
 
@@ -1020,7 +1021,14 @@ static int ov9282_init_controls(struct ov9282 *ov9282)
        if (ov9282->hblank_ctrl)
                ov9282->hblank_ctrl->flags |= V4L2_CTRL_FLAG_READ_ONLY;
 
-       if (ctrl_hdlr->error) {
+       ret = v4l2_fwnode_device_parse(ov9282->dev, &props);
+       if (!ret) {
+               /* Failure sets ctrl_hdlr->error, which we check afterwards anyway */
+               v4l2_ctrl_new_fwnode_properties(ctrl_hdlr, &ov9282_ctrl_ops,
+                                               &props);
+       }
+
+       if (ctrl_hdlr->error || ret) {
                dev_err(ov9282->dev, "control init failed: %d",
                        ctrl_hdlr->error);
                v4l2_ctrl_handler_free(ctrl_hdlr);