summaryrefslogtreecommitdiff
path: root/include/linux/v4l2-controls.h
diff options
context:
space:
mode:
authorLaurent Pinchart <laurent.pinchart@ideasonboard.com>2024-05-05 02:25:36 +0300
committerLaurent Pinchart <laurent.pinchart@ideasonboard.com>2024-06-25 14:38:47 +0300
commit2eb9d8af3253f67fffc7eaef28977efac3bee924 (patch)
tree5807cbdbf83da267c7db884ccc41c1a17a1173e0 /include/linux/v4l2-controls.h
parent82deff87413fd75ec1b9991023d70c56a4ac5215 (diff)
[DNI] include: linux: Update kernel headers to metadata API
Update kernel headers to the rpi/v6.8/unicam/next branch at commit 1dfbc8d9a4e2. This pulls in the new V4L2 internal pads and device-specific metadata APIs that are under development, and should not be merged in libcamera until the APIs stabilize. Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Diffstat (limited to 'include/linux/v4l2-controls.h')
-rw-r--r--include/linux/v4l2-controls.h10
1 files changed, 6 insertions, 4 deletions
diff --git a/include/linux/v4l2-controls.h b/include/linux/v4l2-controls.h
index 1e6e816b..90ae4bcf 100644
--- a/include/linux/v4l2-controls.h
+++ b/include/linux/v4l2-controls.h
@@ -177,10 +177,6 @@ enum v4l2_colorfx {
* We reserve 128 controls for this driver.
*/
#define V4L2_CID_USER_CCS_BASE (V4L2_CID_USER_BASE + 0x10f0)
-
-/* 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 + 0x10e0)
/*
* The base for Allegro driver controls.
* We reserve 16 controls for this driver.
@@ -217,6 +213,12 @@ enum v4l2_colorfx {
*/
#define V4L2_CID_USER_THP7312_BASE (V4L2_CID_USER_BASE + 0x11c0)
+/*
+ * 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 + 0x11d0)
+
/* MPEG-class control IDs */
/* The MPEG controls are applicable to all codec controls
* and the 'MPEG' part of the define is historical */