mirror of
https://git.openwrt.org/openwrt/openwrt.git
synced 2024-06-18 13:13:55 +02:00
f07e572f64
bcm2708: boot tested on RPi B+ v1.2 bcm2709: boot tested on RPi 3B v1.2 and RPi 4B v1.1 4G bcm2710: boot tested on RPi 3B v1.2 bcm2711: boot tested on RPi 4B v1.1 4G Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
42 lines
1.5 KiB
Diff
42 lines
1.5 KiB
Diff
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
|