summaryrefslogtreecommitdiff
path: root/include/linux/v4l2-controls.h
diff options
context:
space:
mode:
authorNaushir Patuck <naush@raspberrypi.com>2020-10-16 11:50:38 +0100
committerLaurent Pinchart <laurent.pinchart@ideasonboard.com>2020-10-19 05:18:51 +0300
commit696aefe0c9ac0e07541a7dbd9334cb282743d29a (patch)
tree2d90059f8287343b971692c3e1b41394740654db /include/linux/v4l2-controls.h
parentb2b8c4dc941b979ddf5e9013530e76c67e6a12fe (diff)
include: linux: Update V4L2_CID_USER_BCM2835_ISP_BASE to match upstream tree
The V4L2_CID_USER_BCM2835_ISP_BASE has changed in the downstream Raspberry Pi 5.9 kernel to match the upstream defines, see here: https://github.com/raspberrypi/linux/pull/3897. Note, that this will cause an ABI breakage with the current downstream Raspberry Pi 5.4 kernel until both this change and the following PR has been merged: https://github.com/raspberrypi/linux/pull/3897 Signed-off-by: Naushir Patuck <naush@raspberrypi.com> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Diffstat (limited to 'include/linux/v4l2-controls.h')
-rw-r--r--include/linux/v4l2-controls.h8
1 files changed, 7 insertions, 1 deletions
diff --git a/include/linux/v4l2-controls.h b/include/linux/v4l2-controls.h
index 24eea2b6..39f4bcb5 100644
--- a/include/linux/v4l2-controls.h
+++ b/include/linux/v4l2-controls.h
@@ -192,9 +192,15 @@ enum v4l2_colorfx {
* We reserve 16 controls for this driver. */
#define V4L2_CID_USER_IMX_BASE (V4L2_CID_USER_BASE + 0x10b0)
+/*
+ * The base for the atmel isc driver controls.
+ * We reserve 32 controls for this driver.
+ */
+#define V4L2_CID_USER_ATMEL_ISC_BASE (V4L2_CID_USER_BASE + 0x10c0)
+
/* 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 + 0x10c0)
+#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