git.openwrt.org Git - openwrt/staging/blogic.git/blob

   1 From f138855380867522cffdfc1cbe4977eb1c319f48 Mon Sep 17 00:00:00 2001
   2 From: Dave Stevenson <dave.stevenson@raspberrypi.com>
   3 Date: Tue, 4 Jan 2022 13:56:42 +0000
   4 Subject: [PATCH] uapi/v4l2-controls: Reset
   5  V4L2_CID_USER_BCM2835_ISP_BASE to same as 5.10
   6
   7 https://github.com/raspberrypi/linux/issues/4440
   8
   9 Upstream has added additional device specific controls, so the
  10 V4L2_CID_USER_BASE + 0x10e0 value that had been defined for use with
  11 the ISP has been taken by something else (and +0x10f0 has been used as
  12 well)
  13
  14 Duplicate the use on V4L2_CID_USER_BASE + 0x10e0 so that userspace
  15 (libcamera) doesn't need to change. Once the driver is upstream, then
  16 we'll update libcamera to adopt the new value as it then won't change.
  17
  18 Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  19 ---
  20  include/uapi/linux/v4l2-controls.h | 2 +-
  21  1 file changed, 1 insertion(+), 1 deletion(-)
  22
  23 --- a/include/uapi/linux/v4l2-controls.h
  24 +++ b/include/uapi/linux/v4l2-controls.h
  25 @@ -214,7 +214,7 @@ enum v4l2_colorfx {
  26
  27  /* The base for the bcm2835-isp driver controls.
  28   * We reserve 16 controls for this driver. */
  29 -#define V4L2_CID_USER_BCM2835_ISP_BASE         (V4L2_CID_USER_BASE + 0x10f0)
  30 +#define V4L2_CID_USER_BCM2835_ISP_BASE         (V4L2_CID_USER_BASE + 0x10e0)
  31
  32  /* MPEG-class control IDs */
  33  /* The MPEG controls are applicable to all codec controls