diff options
Diffstat (limited to 'target/linux/bcm27xx/patches-5.4/950-0991-uapi-Update-V4L2_CID_USER_BCM2835_ISP_BASE-due-to-up.patch')
-rw-r--r-- | target/linux/bcm27xx/patches-5.4/950-0991-uapi-Update-V4L2_CID_USER_BCM2835_ISP_BASE-due-to-up.patch | 41 |
1 files changed, 0 insertions, 41 deletions
diff --git a/target/linux/bcm27xx/patches-5.4/950-0991-uapi-Update-V4L2_CID_USER_BCM2835_ISP_BASE-due-to-up.patch b/target/linux/bcm27xx/patches-5.4/950-0991-uapi-Update-V4L2_CID_USER_BCM2835_ISP_BASE-due-to-up.patch deleted file mode 100644 index 71c27e168a..0000000000 --- a/target/linux/bcm27xx/patches-5.4/950-0991-uapi-Update-V4L2_CID_USER_BCM2835_ISP_BASE-due-to-up.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 90e833fddb15bbdd8aeb6285ba596b4c657383c2 Mon Sep 17 00:00:00 2001 -From: Dave Stevenson <dave.stevenson@raspberrypi.com> -Date: Thu, 15 Oct 2020 11:59:02 +0100 -Subject: [PATCH] uapi: Update V4L2_CID_USER_BCM2835_ISP_BASE due to - upstream change - -Commit "4e52889 media: atmel: atmel-isc-base: expose white -balance as v4l2 controls" in the upstream kernels reserves -(V4L2_CID_USER_BASE + 0x10c0) for use by the Atmel ISC, -therefore we have a control collision with our existing -define for V4L2_CID_USER_BCM2835_ISP_BASE. - -Update V4L2_CID_USER_BCM2835_ISP_BASE to + 0x10e0 as the -next available block. - -NB ABI breakage for libcamera (the only user of these controls). - -Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com> ---- - include/uapi/linux/v4l2-controls.h | 8 +++++++- - 1 file changed, 7 insertions(+), 1 deletion(-) - ---- a/include/uapi/linux/v4l2-controls.h -+++ b/include/uapi/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 |