From patchwork Fri Oct 16 10:50:38 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Naushir Patuck X-Patchwork-Id: 10089 Return-Path: X-Original-To: parsemail@patchwork.libcamera.org Delivered-To: parsemail@patchwork.libcamera.org Received: from lancelot.ideasonboard.com (lancelot.ideasonboard.com [92.243.16.209]) by patchwork.libcamera.org (Postfix) with ESMTPS id 272F1BDB1F for ; Fri, 16 Oct 2020 10:50:46 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 9F24761027; Fri, 16 Oct 2020 12:50:45 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=raspberrypi.com header.i=@raspberrypi.com header.b="LyLztT0t"; dkim-atps=neutral Received: from mail-wr1-x442.google.com (mail-wr1-x442.google.com [IPv6:2a00:1450:4864:20::442]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 0BE77603C1 for ; Fri, 16 Oct 2020 12:50:44 +0200 (CEST) Received: by mail-wr1-x442.google.com with SMTP id n15so2237936wrq.2 for ; Fri, 16 Oct 2020 03:50:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=raspberrypi.com; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=sXOXiDlEig7g3pAAp9uzg3jydB9dXDu070Qt8XoB8nY=; b=LyLztT0tkC1bKkeW5lsGT5B+fXYozGeQU9wzpaAL81kaYApFVJvbYm0pUKltaVpD2N /Q5InU88vsvDzUG7/th+u1haGE50wp/+HciHK6n5dbs2J074YRuiZPubuWKnLaXGfN/T bksugRS5aMwgi36IrkurdM5Jlj0+joU8DFr0pKmqdveXG4IaEkA73jX+raEEVo8h0V9Y ILfdC2NHoREruQjFKYKZY0xQk+QsYjpe6qeJIru7cGP/FXWgYbUjuPbXbLQp9xU+FzfW 7iGIiLvcKHCWjdcxx//CM+3ehoj6OfQQc3CbTHItYN9dgGksUlo/4JNTfALcU/4BbyNG X7Xw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=sXOXiDlEig7g3pAAp9uzg3jydB9dXDu070Qt8XoB8nY=; b=s6vMhqJvVZyO68S3Rpp5cLuYTq3TqN+saX1jFSr9GlpIXfJp5rlLiUgzYYH3aPZgEj TmkkLogz3vOUGhqOD5beagJ9UOlj+6Xfm51EibJpZn8otAbMYm/h9Fz5hWvn7GMQTkKO 9U9fSYtAaIk7gldPsb5r6sjtO80pWJO3QBdYJQDFpnHUXz2zVJTcrDtGpogr/hmKkyRK hg/LKqqaBNlA4CUdLL9vpPe2ZxIwDkq6A+5g1obNBgYbq1J3Fi+bJ1x6UqKxaGe1bSSM fUa0n55aj30M/aXQefiqANtHoEv3gdPcTlwtKVl/qks60ECl1Bc1hzr0PD5/JVMaooWm W6FA== X-Gm-Message-State: AOAM531rFwiKfd+Orjabi5YHVNz7catAet3Oh8eSgyyS/9QyLgd2e5q4 O6cUHCArfRwmxR3af8YCz3R1XavewCaZUA== X-Google-Smtp-Source: ABdhPJw+r9oYSSyHMp0/I5gZ1DsxqAo/Vxsi9zW0x39GpzzYnyblhv44B1JXnqX1PeEyAEeL72qteg== X-Received: by 2002:adf:e289:: with SMTP id v9mr3279669wri.14.1602845443498; Fri, 16 Oct 2020 03:50:43 -0700 (PDT) Received: from naushir-VirtualBox.pitowers.org ([2a00:1098:3142:14:a00:27ff:fe4d:f6a2]) by smtp.gmail.com with ESMTPSA id 205sm2397202wme.38.2020.10.16.03.50.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 16 Oct 2020 03:50:42 -0700 (PDT) From: Naushir Patuck To: libcamera-devel@lists.libcamera.org Date: Fri, 16 Oct 2020 11:50:38 +0100 Message-Id: <20201016105038.158774-1-naush@raspberrypi.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH] include: linux: Update V4L2_CID_USER_BCM2835_ISP_BASE to match upstream tree X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" 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 Reviewed-by: Laurent Pinchart --- include/linux/v4l2-controls.h | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) 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