Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
From:   Michael Riesch <michael.riesch@wolfvision.net>
Date:   Tue, 25 Apr 2023 11:45:14 +0200
Subject: [PATCH RFC v2 4/6] media: v4l2-ctrls: add lens group speed
 controls for zoom and focus
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 7bit
Message-Id: <20230406-feature-controls-lens-v2-4-faa8ad2bc404@wolfvision.net>
References: <20230406-feature-controls-lens-v2-0-faa8ad2bc404@wolfvision.net>
In-Reply-To: <20230406-feature-controls-lens-v2-0-faa8ad2bc404@wolfvision.net>
To:     Mauro Carvalho Chehab <mchehab@kernel.org>
Cc:     libcamera-devel@lists.libcamera.org,
        Laurent Pinchart <laurent.pinchart@ideasonboard.com>,
        Sakari Ailus <sakari.ailus@linux.intel.com>,
        Hans Verkuil <hverkuil-cisco@xs4all.nl>,
        Matthias Fend <Matthias.Fend@wolfvision.net>,
        Dave Stevenson <dave.stevenson@raspberrypi.com>,
        linux-media@vger.kernel.org, linux-kernel@vger.kernel.org,
        Michael Riesch <michael.riesch@wolfvision.net>
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?TFJJY08rTGVoU1BLUVZrS3J4OUtxemxZaGFQN3NEYnUxcHhJV0JpNERDRS9S?=
 =?utf-8?B?TEF0TkZvbzRBSXRCZTBkWGF3WjByZ0tkV21nQ2lDYUxyN0tzaHN3cnRob1l1?=
 =?utf-8?B?V3ZaaWpZMHoyMkI1cm5XQkkrcVpoQStzMmpJYTU1b1BiQVNpSmd6QnlWOE5n?=
 =?utf-8?B?NkdSQkcxUWlqQ0RCSTduM1FmVzN0NnV3YlVvakROT0FMVWh3aklpNURod1k4?=
 =?utf-8?B?QTlyb29JWllTWHNXT1hxV0dWelZiNkE4d3lrMmF0UllVY003cEtQZjFJYllX?=
 =?utf-8?B?VGVEUFNrZWJWblozQUFUMFNXZks4c0h1MkFRZSthRmd2a2VnKzV5QmhwMThG?=
 =?utf-8?B?eTArcUtDUnhpNW5nM2g3MHBxRWQ0Y3IvY0lQVmVSUG1scjg0TXYraXlmb2VV?=
 =?utf-8?B?U0tSQ3RrSWtjd0lVdHo4dVBNTnFmV0JlSHZVVHVxSkFpMkMwVEVQazBSczFR?=
 =?utf-8?B?OUw3d0FZQkVLUVNzVzNRVmZ0NGd1dmhuMEMxb3RheHBUZVNvYjVVRitvOS8v?=
 =?utf-8?B?TnU4aXhmcVRTUkMybUZmcXl4K1ZDdTI3cnoyWUF2K1lvUHJ4MUo5Z1Y4eVhq?=
 =?utf-8?B?aXg2SFByMGpvcklRVWxTdGU1Z2hUT29VQzhTeUVzTS9wUVRidTl4T0QzSG9Z?=
 =?utf-8?B?ckQza2RjWHRlZDI1UmJFdlJPSDMrTnIwTVFJYVM2SWxFellEV3RhZFU1a0o4?=
 =?utf-8?B?a0FxTTRGR3FqV3FBalNUU2hNQlVjVGxwUmIxZzYzYVAwY3phMnBVdnR5V0xh?=
 =?utf-8?B?RXBEWElYSG9LTjNrbU5pTVF3YUMwVUpvc1B4UjVUY1BDaHBta1REdk45Q3pj?=
 =?utf-8?B?RGw1MXlyVkpHUW9nMEw1SnpPUTZxK0FUWml2YkpoZU44czN3aTdLSy9OUVp2?=
 =?utf-8?B?TzUxYWpyRTZVbGFodFF2NytyclFsQXRzZkJGcmtSRTNSNGZpdkJGUHNsT0JJ?=
 =?utf-8?B?c2x1V0VaLzRUWVFKejBNd0UrMFBoRWFpSXdsOEduUEY3Unc2eVM0N0Z1ODZV?=
 =?utf-8?B?TXRJMkY2dE04OExWNk5zbC9yZzIyb2xMelhONFFTbUkxMjIvRzB6S25xQ1dl?=
 =?utf-8?B?S2NYQUlTNDAwNUZFYnBuV2x1VDdqeWtWV1lUYjEwNkZpeFk4RzhOdVpRMWJL?=
 =?utf-8?B?RmYyaDMrU1MvMnR0aUp2dEZ2U0lGcEYwcmVzeVhHckFrejh1Zm1JdGhtMUw1?=
 =?utf-8?B?NFJFWkdVREZHNzZwMEtucTVBeTAxckNMVWdoeXZaYWJzZmpYNEZHdGVWNXE0?=
 =?utf-8?B?NEEwc3NQcFZYa3IvQVkwU2xudzJiWTlpL2kvYjJXYmZzMldodFZPYlJZaFIw?=
 =?utf-8?B?bXRiZG5tVGlYZFNFQ2Q5TCtOWE9zOGV2UktNTE1xNldxSDJ1eFN0Mk9QVDUx?=
 =?utf-8?B?dlBQaWcrMkhobmprOEZ1MnVNNGJhSFZOQ2RuMzQ3RE5pclVtZDBIMUxRTzY3?=
 =?utf-8?B?UEhlM2pQVW15UERKWkJESXZZME1pU3dXZkVlR2Faa2pUQVhocmJmd0xHbkpD?=
 =?utf-8?B?Vkl1YW5pNW94MVJZR1JtSWtnWERINUFNUGVuem1LcnBBQ3RBRVdaR05WajdM?=
 =?utf-8?B?U0FCV3pNcVR2NU9yTldDUzlOSHdtSHFNdVgrWDRDUnJRelFGQ2ttK3lFSGlS?=
 =?utf-8?B?TEtxQkM4d21nWC8xa1FodTFUdHg0OTNIUncyZXdTdGpDdndDeERqZDlLS1pE?=
 =?utf-8?B?VFplRG5QYjhKRGhMTGV1Yk4xbElMNFlxOXg1djk1ZTBoUzczdElxRi8yMVVH?=
 =?utf-8?B?NFBBVXU4c1ZydFc5MnlpdG9LSmRxWDdCd29IV0V4VTVJbEdON3pQcS83QnIy?=
 =?utf-8?B?SzdpUExDei9oWFZ6MCt4eE1kcmYzU1hyQnllQ0x3YURFc1QxQjZWUnlZeHh3?=
 =?utf-8?B?dXVDRGFML3d6YTNQWVJKMVBRZ1hEaEJPVnN3N1RlY05FZ01SbmR3US9HRjMx?=
 =?utf-8?B?NzNmMGw0c3BXc0J4dDUvYkFPcHRzeCtkWTJEdHp4VmNVUTJObnlEM1pwK0RM?=
 =?utf-8?B?UmRIZzdyMHM4MnNFZmRwWndTU1AvUTJYNUxzMEVnQ1prRDd4cmUxbnZiV0xo?=
 =?utf-8?B?cnFtZWFHZ1U5ZHRjaU53ZjFTWXppK09IaDFZN2k2YkJNM3Z1bUxWUEo1Zlc0?=
 =?utf-8?B?QTFDL1BwY29sYy9KcURkdkExTTVRNzBWMVlhR2RxK3ZieHlWamFqeWVaanQ2?=
 =?utf-8?B?dXc9PQ==?=
X-OriginatorOrg: wolfvision.net
X-MS-Exchange-CrossTenant-Network-Message-Id: 977200d2-c61d-427b-c89f-08db4571cc3b
X-MS-Exchange-CrossTenant-AuthSource: GV1SPRMB0046.eurprd08.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Apr 2023 09:45:26.4582
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: e94ec9da-9183-471e-83b3-51baa8eb804f
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: ic03Ri6QJsvjZMGyqp9jYpF2ZNO+BSdAVsqESARqVlQfY/J3uSdVBezToOgCBjDcm7NPxZUD2ByBa+8mgT713uaszDJmybSoHseu8lmJeQk=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DU0PR08MB7995
X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE,
        RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS,T_SCC_BODY_TEXT_LINE,
        URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

Add the controls V4L2_CID_FOCUS_SPEED and V4L2_CID_ZOOM_SPEED that set
the speed of the zoom lens group and focus lens group, respectively.

Signed-off-by: Michael Riesch <michael.riesch@wolfvision.net>
---
 Documentation/userspace-api/media/v4l/ext-ctrls-camera.rst | 10 ++++++++++
 drivers/media/v4l2-core/v4l2-ctrls-defs.c                  |  2 ++
 include/uapi/linux/v4l2-controls.h                         |  2 ++
 3 files changed, 14 insertions(+)

diff --git a/Documentation/userspace-api/media/v4l/ext-ctrls-camera.rst b/Documentation/userspace-api/media/v4l/ext-ctrls-camera.rst
index 3ea4175f9619..a17620ab03b9 100644
--- a/Documentation/userspace-api/media/v4l/ext-ctrls-camera.rst
+++ b/Documentation/userspace-api/media/v4l/ext-ctrls-camera.rst
@@ -174,6 +174,11 @@ enum v4l2_exposure_metering -
 	will not transition from this state until another action is performed
 	by an application.
 
+``V4L2_CID_FOCUS_SPEED (integer)``
+    Set the speed with which the focus lens group of the camera is moved
+    (V4L2_CID_FOCUS_ABSOLUTE and V4L2_CID_FOCUS_RELATIVE). The unit is
+    driver-specific. The value should be a positive integer.
+
 ``V4L2_CID_FOCUS_AUTO (boolean)``
     Enables continuous automatic focus adjustments. The effect of manual
     focus adjustments while this feature is enabled is undefined,
@@ -287,6 +292,11 @@ enum v4l2_auto_focus_range -
 	not transition from this state until another action is performed by an
 	application.
 
+``V4L2_CID_ZOOM_SPEED (integer)``
+    Set the speed with which the zoom lens group of the camera is moved
+    (V4L2_CID_ZOOM_ABSOLUTE and V4L2_CID_ZOOM_RELATIVE). The unit is
+    driver-specific. The value should be a positive integer.
+
 ``V4L2_CID_IRIS_ABSOLUTE (integer)``
     This control sets the camera's aperture to the specified value. The
     unit is undefined. Larger values open the iris wider, smaller values
diff --git a/drivers/media/v4l2-core/v4l2-ctrls-defs.c b/drivers/media/v4l2-core/v4l2-ctrls-defs.c
index 794ef3ab0c02..3ef465ba73bd 100644
--- a/drivers/media/v4l2-core/v4l2-ctrls-defs.c
+++ b/drivers/media/v4l2-core/v4l2-ctrls-defs.c
@@ -1048,6 +1048,8 @@ const char *v4l2_ctrl_get_name(u32 id)
 	case V4L2_CID_FOCUS_STATUS:		return "Focus, Status";
 	case V4L2_CID_ZOOM_CURRENT:		return "Zoom, Current";
 	case V4L2_CID_ZOOM_STATUS:		return "Zoom, Status";
+	case V4L2_CID_FOCUS_SPEED:		return "Focus, Speed";
+	case V4L2_CID_ZOOM_SPEED:		return "Zoom, Speed";
 
 	/* FM Radio Modulator controls */
 	/* Keep the order of the 'case's the same as in v4l2-controls.h! */
diff --git a/include/uapi/linux/v4l2-controls.h b/include/uapi/linux/v4l2-controls.h
index 793ee8c65e87..8d84508d4db8 100644
--- a/include/uapi/linux/v4l2-controls.h
+++ b/include/uapi/linux/v4l2-controls.h
@@ -1001,6 +1001,8 @@ enum v4l2_auto_focus_range {
 #define V4L2_CID_FOCUS_STATUS			(V4L2_CID_CAMERA_CLASS_BASE+38)
 #define V4L2_CID_ZOOM_CURRENT			(V4L2_CID_CAMERA_CLASS_BASE+39)
 #define V4L2_CID_ZOOM_STATUS			(V4L2_CID_CAMERA_CLASS_BASE+40)
+#define V4L2_CID_FOCUS_SPEED			(V4L2_CID_CAMERA_CLASS_BASE+41)
+#define V4L2_CID_ZOOM_SPEED			(V4L2_CID_CAMERA_CLASS_BASE+42)
 
 /* FM Modulator class control IDs */
 

-- 
2.37.2