From 164e7d5ac39fc093891064918d551759f354957b Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Tue, 4 Jan 2022 13:56:42 +0000 Subject: [PATCH 0329/1085] uapi/v4l2-controls: Reset V4L2_CID_USER_BCM2835_ISP_BASE to same as 5.10 https://github.com/raspberrypi/linux/issues/4440 Upstream has added additional device specific controls, so the V4L2_CID_USER_BASE + 0x10e0 value that had been defined for use with the ISP has been taken by something else (and +0x10f0 has been used as well) Duplicate the use on V4L2_CID_USER_BASE + 0x10e0 so that userspace (libcamera) doesn't need to change. Once the driver is upstream, then we'll update libcamera to adopt the new value as it then won't change. Signed-off-by: Dave Stevenson --- include/uapi/linux/v4l2-controls.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/include/uapi/linux/v4l2-controls.h +++ b/include/uapi/linux/v4l2-controls.h @@ -205,7 +205,7 @@ enum v4l2_colorfx { /* The base for the bcm2835-isp driver controls. * We reserve 16 controls for this driver. */ -#define V4L2_CID_USER_BCM2835_ISP_BASE (V4L2_CID_USER_BASE + 0x10f0) +#define V4L2_CID_USER_BCM2835_ISP_BASE (V4L2_CID_USER_BASE + 0x10e0) /* MPEG-class control IDs */ /* The MPEG controls are applicable to all codec controls