[SRU][N:linux-xilinx][PATCH 11/14] drives: media: imx708: Put HFLIP and VFLIP controls in a cluster

[Stewart Hore]

From: Naushir Patuck <naush at raspberrypi.com>

Create a cluster for the HVLIP and VFLIP controls so they are treated
as a single composite control.

Signed-off-by: Naushir Patuck <naush at raspberrypi.com>
(cherry picked from commit 138a01efc7be8766dd08d94c8fa21ec81c5dab0d rpi-6.6.y)
Signed-off-by: Juerg Haefliger <juerg.haefliger at canonical.com>
(cherry picked from commit af6d1b761bfcef1c9e535fe286d1c98f59e3baa8 noble:linux-raspi)
Signed-off-by: Stewart Hore <stewart.hore at canonical.com>
---
 drivers/media/i2c/imx708.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/drivers/media/i2c/imx708.c b/drivers/media/i2c/imx708.c
index 36a7546951f7..cfb890104951 100644
--- a/drivers/media/i2c/imx708.c
+++ b/drivers/media/i2c/imx708.c
@@ -819,12 +819,14 @@ struct imx708 {
 	/* V4L2 Controls */
 	struct v4l2_ctrl *pixel_rate;
 	struct v4l2_ctrl *exposure;
-	struct v4l2_ctrl *vflip;
-	struct v4l2_ctrl *hflip;
 	struct v4l2_ctrl *vblank;
 	struct v4l2_ctrl *hblank;
 	struct v4l2_ctrl *hdr_mode;
 	struct v4l2_ctrl *link_freq;
+	struct {
+		struct v4l2_ctrl *hflip;
+		struct v4l2_ctrl *vflip;
+	};
 
 	/* Current mode */
 	const struct imx708_mode *mode;
@@ -1815,6 +1817,7 @@ static int imx708_init_controls(struct imx708 *imx708)
 
 	imx708->vflip = v4l2_ctrl_new_std(ctrl_hdlr, &imx708_ctrl_ops,
 					  V4L2_CID_VFLIP, 0, 1, 1, 0);
+	v4l2_ctrl_cluster(2, &imx708->hflip);
 
 	v4l2_ctrl_new_std_menu_items(ctrl_hdlr, &imx708_ctrl_ops,
 				     V4L2_CID_TEST_PATTERN,
-- 
2.48.1