From patchwork Wed May 7 07:51:32 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Leitner X-Patchwork-Id: 888413 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 1A15E22128E; Wed, 7 May 2025 07:52:21 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746604342; cv=none; b=ubHUzdcHlWSrgGDeggxKf3A01upnyBcM0LXfZyoKWRrSpOTBdIshiwrmDlk4Ci8cEUCWbrS69DjXJQ7fRUNBCRb6JhOWysiJNWLRu4BrHzLant9jfHFni8zQtKNRwMkkb1lEtpFyXT3r6fPcjFfDipZx0RXAMK6lEEw9qjW5rxY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746604342; c=relaxed/simple; bh=FrCl/fSGFBnOk0+MAcM+KHDO4zcSf1DpGTy1y8P+ack=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=dJNSISG2F7fptSSoe12Fjmo6EN/vVtveaOd062YtRQa7SRv9YEIFUX7wo3SgN6zEkWCAyvf0IZTJXvCVsGCo6/x9QmW4WkUBIpoI+zLSx+4mD0xB5gXpdVb6Ku3akIdz4iDOCbuIfQZSDvywzN/Ny+Y7mb2AlfjCtYrmJOfMfJA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b=q+URzq/s; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b="q+URzq/s" Received: by smtp.kernel.org (Postfix) with ESMTPS id AE1A3C4CEF3; Wed, 7 May 2025 07:52:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linux.dev; s=korg; t=1746604341; bh=FrCl/fSGFBnOk0+MAcM+KHDO4zcSf1DpGTy1y8P+ack=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=q+URzq/sbJMHpQqdlTTWPoGx7zGSLFLXb62D/DlmPT/JlIP4sZePZwBVpiivcIaZu 1JQEVBVYr2yPHb8wSQ5pKPjDbki4pufGXvexc4AEohV4fD5yHVQGwj8F6A/KpM944Z vgB3fUwUeWaPqtZIZEZaKB9URx7tTPi7Or/MzFaE= Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id A32BFC3ABC7; Wed, 7 May 2025 07:52:21 +0000 (UTC) From: Richard Leitner Date: Wed, 07 May 2025 09:51:32 +0200 Subject: [PATCH v4 03/10] media: v4l2-flash: add support for flash/strobe duration Precedence: bulk X-Mailing-List: linux-media@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250507-ov9282-flash-strobe-v4-3-72b299c1b7c9@linux.dev> References: <20250507-ov9282-flash-strobe-v4-0-72b299c1b7c9@linux.dev> In-Reply-To: <20250507-ov9282-flash-strobe-v4-0-72b299c1b7c9@linux.dev> To: Sakari Ailus , Dave Stevenson , Mauro Carvalho Chehab , Lee Jones , Pavel Machek , Laurent Pinchart Cc: Hans Verkuil , linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, linux-leds@vger.kernel.org, Richard Leitner X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1746604340; l=2303; i=richard.leitner@linux.dev; s=20250225; h=from:subject:message-id; bh=FrCl/fSGFBnOk0+MAcM+KHDO4zcSf1DpGTy1y8P+ack=; b=LFm6jfHw/aS94xmb1iqQDZ/pOyYg2GDZlwq24FcY8iKN5HTpl3F3nH3MhreBtkYeZHtBpElL0 mCum4SwegdSAk84ivRqh2Lu8bIgT6Ud7qg6e0ENe+jDVyAywfGp5BOa X-Developer-Key: i=richard.leitner@linux.dev; a=ed25519; pk=8hZNyyyQFqZ5ruVJsSGBSPIrmJpfDm5HwHU4QVOP1Pk= X-Endpoint-Received: by B4 Relay for richard.leitner@linux.dev/20250225 with auth_id=350 Add support for the new V4L2_CID_FLASH_DURATION control to the v4l2 flash led class. Signed-off-by: Richard Leitner --- drivers/media/v4l2-core/v4l2-flash-led-class.c | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/drivers/media/v4l2-core/v4l2-flash-led-class.c b/drivers/media/v4l2-core/v4l2-flash-led-class.c index 355595a0fefac72c2f6941a30fa430d37dbdccfe..69b6c2026e0ad905aaebcdabe1e7002fc48f9e2c 100644 --- a/drivers/media/v4l2-core/v4l2-flash-led-class.c +++ b/drivers/media/v4l2-core/v4l2-flash-led-class.c @@ -29,6 +29,7 @@ enum ctrl_init_data_id { INDICATOR_INTENSITY, FLASH_TIMEOUT, STROBE_SOURCE, + FLASH_DURATION, /* * Only above values are applicable to * the 'ctrls' array in the struct v4l2_flash. @@ -298,6 +299,12 @@ static int v4l2_flash_s_ctrl(struct v4l2_ctrl *c) * microamperes for flash intensity units. */ return led_set_flash_brightness(fled_cdev, c->val); + case V4L2_CID_FLASH_DURATION: + /* + * No conversion is needed as LED Flash class also uses + * microseconds for flash duration units. + */ + return led_set_flash_duration(fled_cdev, c->val); } return -EINVAL; @@ -424,6 +431,14 @@ static void __fill_ctrl_init_data(struct v4l2_flash *v4l2_flash, ctrl_cfg->flags = V4L2_CTRL_FLAG_VOLATILE | V4L2_CTRL_FLAG_EXECUTE_ON_WRITE; } + + /* Init FLASH_DURATION ctrl data */ + if (has_flash_op(fled_cdev, duration_set)) { + ctrl_init_data[FLASH_DURATION].cid = V4L2_CID_FLASH_DURATION; + ctrl_cfg = &ctrl_init_data[FLASH_DURATION].config; + __lfs_to_v4l2_ctrl_config(&fled_cdev->duration, ctrl_cfg); + ctrl_cfg->id = V4L2_CID_FLASH_DURATION; + } } static int v4l2_flash_init_controls(struct v4l2_flash *v4l2_flash, @@ -543,6 +558,16 @@ static int __sync_device_with_v4l2_controls(struct v4l2_flash *v4l2_flash) return ret; } + if (ctrls[FLASH_DURATION]) { + if (WARN_ON_ONCE(!fled_cdev)) + return -EINVAL; + + ret = led_set_flash_duration(fled_cdev, + ctrls[FLASH_DURATION]->val); + if (ret < 0) + return ret; + } + /* * For some hardware arrangements setting strobe source may affect * torch mode. Synchronize strobe source setting only if not in torch From patchwork Wed May 7 07:51:33 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Leitner X-Patchwork-Id: 888412 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2D167221291; Wed, 7 May 2025 07:52:21 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746604342; cv=none; b=mIEy2SQb0/Y6CVYjq4rlXnARp2/JoiX/pbFIUaf6tBTkCyNy5yquf/g5n4OAh62rD99G3oWHqIW09oveBxcVDfAPK0p0xS62sG4+pcf5zvSmIY4J9WcMQx2llGKp1rXW1HYiLU2H7tIpFM1QM+AvfR3lyQan5+MNGsX/eyrAzEA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746604342; c=relaxed/simple; bh=8XoXfLI3glbsttjIv49MTkNU8w73Ts/XjbKrGmMzkd0=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=ut+k9vFeI3iTtaIvpxzXAaeoqHeLq3XsLNIzH7+uUbjfPqgAPmt6rGoi+sFr749gBA0maDwvNZkvZE1FgQAlFKoF96t5zbvB1aRrxwfqT3tk8m74SQyU+nGFhQ8Tvln+UAYsXOg/Kp0G3eJ2GLYLL52QlMui4FBubMlnhT8H1NQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b=B1vmsQRK; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b="B1vmsQRK" Received: by smtp.kernel.org (Postfix) with ESMTPS id B7EA8C4CEF1; Wed, 7 May 2025 07:52:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linux.dev; s=korg; t=1746604341; bh=8XoXfLI3glbsttjIv49MTkNU8w73Ts/XjbKrGmMzkd0=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=B1vmsQRKT5UJb1lRFC1PRFDgDduKUgj9imFffCj9TTmmrFXPfUlehLJC0z8VStTcC HRsh2EBLX90MQCJHmOTjIysEOwR3KSO5oT9Nmk/XAwAgC5EY4B5C0ATyLLOg/cc2xX 9gSTG6Usd+KkgAXJzOYNdD/2scKHQHYAS8tcyKxQ= Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id AE3F5C3ABC6; Wed, 7 May 2025 07:52:21 +0000 (UTC) From: Richard Leitner Date: Wed, 07 May 2025 09:51:33 +0200 Subject: [PATCH v4 04/10] media: v4l2-flash: fix flash_timeout comment Precedence: bulk X-Mailing-List: linux-media@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250507-ov9282-flash-strobe-v4-4-72b299c1b7c9@linux.dev> References: <20250507-ov9282-flash-strobe-v4-0-72b299c1b7c9@linux.dev> In-Reply-To: <20250507-ov9282-flash-strobe-v4-0-72b299c1b7c9@linux.dev> To: Sakari Ailus , Dave Stevenson , Mauro Carvalho Chehab , Lee Jones , Pavel Machek , Laurent Pinchart Cc: Hans Verkuil , linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, linux-leds@vger.kernel.org, Richard Leitner X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1746604340; l=878; i=richard.leitner@linux.dev; s=20250225; h=from:subject:message-id; bh=8XoXfLI3glbsttjIv49MTkNU8w73Ts/XjbKrGmMzkd0=; b=b2Nu8Rc5xjROLfjqidwVk6M111UQMbP4ju6/jmlZi4aCroekRypMRf54JGKcAOzlwN4LmC0a2 R5aMxYdUac9DWdDxNqwee9VzCOlRqZlcvZpxX+OWOdpW9qrwepzz0bX X-Developer-Key: i=richard.leitner@linux.dev; a=ed25519; pk=8hZNyyyQFqZ5ruVJsSGBSPIrmJpfDm5HwHU4QVOP1Pk= X-Endpoint-Received: by B4 Relay for richard.leitner@linux.dev/20250225 with auth_id=350 The comment for the flash_timeout setter mentioned it is the "flash duration". Fix this by changing it to "flash timeout". Signed-off-by: Richard Leitner --- include/linux/led-class-flash.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/linux/led-class-flash.h b/include/linux/led-class-flash.h index 21ec856c36bc67decda46aa8ff1c040ffdcf1181..775a96217518936633541c7a5d394502dbf04f83 100644 --- a/include/linux/led-class-flash.h +++ b/include/linux/led-class-flash.h @@ -197,7 +197,7 @@ int led_update_flash_brightness(struct led_classdev_flash *fled_cdev); * @fled_cdev: the flash LED to set * @timeout: the flash timeout to set it to * - * Set the flash strobe duration. + * Set the flash strobe timeout. * * Returns: 0 on success or negative error value on failure */ From patchwork Wed May 7 07:51:34 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Leitner X-Patchwork-Id: 888411 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 7CFD6221D80; Wed, 7 May 2025 07:52:22 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746604342; cv=none; b=Cshu/PfAEeVEWMlhiASet3euo5SiT68OVBFhwRd8j/JDBPWOgzq/apMYPDOyP3PYTTvEEDTfl73oT+Z7SxjXEsOXEqmwGcdsXvhjm5R5AGVdglfb9PJEFpwn50U6uxjOAlaQfo7+BLs/oh/pa82JIYIetgb7Vlz6kGtrusBSJKA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746604342; c=relaxed/simple; bh=16N0ehkJWytFD5jx5wDbSTZhtNf5Qf6vx2SOhlkAC1Y=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=UEUDAIzNLTiZGSCZDDEna/4WJ/h2EN5jf574HHyhjwhH9fZ8XaNf1uHOfRRba+KPmfBAoiDux8CEc0BDPEb3PqEUZPQapTHSX/rLR/hehUMtIFU6BrJT2soQkSZLyuEqdH53vVYauRm8aE0azbwMwQ9k/ckTfB7rVAgKw41TAh4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b=q5cYV6Ax; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b="q5cYV6Ax" Received: by smtp.kernel.org (Postfix) with ESMTPS id C0144C4AF0E; Wed, 7 May 2025 07:52:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linux.dev; s=korg; t=1746604341; bh=16N0ehkJWytFD5jx5wDbSTZhtNf5Qf6vx2SOhlkAC1Y=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=q5cYV6AxCe9qy4dmK2YfbzIXWmoB9a0x9HrZU77jhl7VOyObGl2FfnlmKxUXwKMC3 qjmX3estUJfFhEp1vQXgAUGKhXz20SoeNaT1/kMpytGsqq/nmlvD95y8lmrH3r8rhi uIvF37jUxf2orKzbXRYvW8S3UMOHoPmFDIeh6dFU= Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id B99C3C3ABC8; Wed, 7 May 2025 07:52:21 +0000 (UTC) From: Richard Leitner Date: Wed, 07 May 2025 09:51:34 +0200 Subject: [PATCH v4 05/10] Documentation: uAPI: media: add V4L2_CID_FLASH_DURATION Precedence: bulk X-Mailing-List: linux-media@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250507-ov9282-flash-strobe-v4-5-72b299c1b7c9@linux.dev> References: <20250507-ov9282-flash-strobe-v4-0-72b299c1b7c9@linux.dev> In-Reply-To: <20250507-ov9282-flash-strobe-v4-0-72b299c1b7c9@linux.dev> To: Sakari Ailus , Dave Stevenson , Mauro Carvalho Chehab , Lee Jones , Pavel Machek , Laurent Pinchart Cc: Hans Verkuil , linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, linux-leds@vger.kernel.org, Richard Leitner X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1746604340; l=1038; i=richard.leitner@linux.dev; s=20250225; h=from:subject:message-id; bh=16N0ehkJWytFD5jx5wDbSTZhtNf5Qf6vx2SOhlkAC1Y=; b=/I5T0pCsjZEp4kUhnrtVRfvxoNLTul5W3RVOawLehNl9mE9tS/opp8ie52Nl0r6WLnDclK2yj XmuajaKLaKsDQ44H/Lyj9cFX8RR259TN4NcSLalpvo9+lRVIK8bMXcb X-Developer-Key: i=richard.leitner@linux.dev; a=ed25519; pk=8hZNyyyQFqZ5ruVJsSGBSPIrmJpfDm5HwHU4QVOP1Pk= X-Endpoint-Received: by B4 Relay for richard.leitner@linux.dev/20250225 with auth_id=350 Add the new strobe_duration control to v4l uAPI documentation. Signed-off-by: Richard Leitner --- Documentation/userspace-api/media/v4l/ext-ctrls-flash.rst | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Documentation/userspace-api/media/v4l/ext-ctrls-flash.rst b/Documentation/userspace-api/media/v4l/ext-ctrls-flash.rst index d22c5efb806a183a3ad67ec3e6550b002a51659a..03a58ef94be7c870f55d5a9bb09503995dbfb402 100644 --- a/Documentation/userspace-api/media/v4l/ext-ctrls-flash.rst +++ b/Documentation/userspace-api/media/v4l/ext-ctrls-flash.rst @@ -186,3 +186,8 @@ Flash Control IDs charged before strobing. LED flashes often require a cooldown period after strobe during which another strobe will not be possible. This is a read-only control. + +``V4L2_CID_FLASH_DURATION (integer)`` + Duration the flash should be on when the flash LED is in flash mode + (V4L2_FLASH_LED_MODE_FLASH). The unit should be microseconds (µs) + if possible. From patchwork Wed May 7 07:51:35 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Leitner X-Patchwork-Id: 888410 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 5F871221710; Wed, 7 May 2025 07:52:22 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746604342; cv=none; b=VDvXlGvmrDHr4zGEViwYVaTHMcoaamQ+BweDAWeY+VgqYfHAlZPRiLoXWBh/1HUIJtuSg02Shs8G2I6NRuUZ4hBHnFrX01gy8rwO0sQi0LRNfLRN/G7CQ2+7dAkkh0XiLRP0JFpCWWtnjzKiy3GUW421cAjOFirMe9PCsSZ5INE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746604342; c=relaxed/simple; bh=FNa/xvakH+OMufv25Oa47P8olVqt6It8kjPg/VhP/1A=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=eXAB84oGZUxKrKpLvKETuVXhII1ScQP8HWRJkIq7yHhHkzWPUYdy/RaKwuLIPjT9ZnZ2HPmteCXQx17XDQn73XY2lb0L6iuoIbJo0uBnmVZgj0dEHu8MxZwqFjbHdQueT9WPSGDZxabX+MjWpoCsL7+tq/HbKCQLAO0mW3exHRE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b=efqgVTqr; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b="efqgVTqr" Received: by smtp.kernel.org (Postfix) with ESMTPS id CC387C4CEF5; Wed, 7 May 2025 07:52:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linux.dev; s=korg; t=1746604341; bh=FNa/xvakH+OMufv25Oa47P8olVqt6It8kjPg/VhP/1A=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=efqgVTqrXtnPdwLl4uWtfPRpr2qVZBZtuGM+3fzfQx2f/QpWQgcRgFhpqMdhkd2JT 1pbpHGLjfwP3iYvfjnlgba/Hzc3qzq0wyQ/hNotuBjUetdpN21Lozqh9B8tPtubSut JZcQsRIO/PcqgjFJdzUI9ktDAE6sZQFzDWTqsKO4= Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id C3F01C3ABC5; Wed, 7 May 2025 07:52:21 +0000 (UTC) From: Richard Leitner Date: Wed, 07 May 2025 09:51:35 +0200 Subject: [PATCH v4 06/10] media: i2c: ov9282: add output enable register definitions Precedence: bulk X-Mailing-List: linux-media@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250507-ov9282-flash-strobe-v4-6-72b299c1b7c9@linux.dev> References: <20250507-ov9282-flash-strobe-v4-0-72b299c1b7c9@linux.dev> In-Reply-To: <20250507-ov9282-flash-strobe-v4-0-72b299c1b7c9@linux.dev> To: Sakari Ailus , Dave Stevenson , Mauro Carvalho Chehab , Lee Jones , Pavel Machek , Laurent Pinchart Cc: Hans Verkuil , linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, linux-leds@vger.kernel.org, Richard Leitner X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1746604340; l=2191; i=richard.leitner@linux.dev; s=20250225; h=from:subject:message-id; bh=FNa/xvakH+OMufv25Oa47P8olVqt6It8kjPg/VhP/1A=; b=SwzocbauHwPRNtcubYFHktRBBs0jHcsZ9HRKoOhf7PB0ZiEwXdDuvU43Nwtjab+iv/unURujW zlA0Bowk+aOAZ65ItVZZi5++M6M+FMSItKc/qWNl0g+OB57fr2AlcAA X-Developer-Key: i=richard.leitner@linux.dev; a=ed25519; pk=8hZNyyyQFqZ5ruVJsSGBSPIrmJpfDm5HwHU4QVOP1Pk= X-Endpoint-Received: by B4 Relay for richard.leitner@linux.dev/20250225 with auth_id=350 Add #define's for the output enable registers (0x3004, 0x3005, 0x3006), also known as SC_CTRL_04, SC_CTRL_05, SC_CTRL_04. Use those register definitions instead of the raw values in the `common_regs` struct. All values are based on the OV9281 datasheet v1.53 (january 2019). Reviewed-by: Dave Stevenson Signed-off-by: Richard Leitner --- drivers/media/i2c/ov9282.c | 29 ++++++++++++++++++++++++++--- 1 file changed, 26 insertions(+), 3 deletions(-) diff --git a/drivers/media/i2c/ov9282.c b/drivers/media/i2c/ov9282.c index c882a021cf18852237bf9b9524d3de0c5b48cbcb..f42e0d439753e74d14e3a3592029e48f49234927 100644 --- a/drivers/media/i2c/ov9282.c +++ b/drivers/media/i2c/ov9282.c @@ -37,6 +37,29 @@ #define OV9282_REG_ID 0x300a #define OV9282_ID 0x9281 +/* Output enable registers */ +#define OV9282_REG_OUTPUT_ENABLE4 0x3004 +#define OV9282_OUTPUT_ENABLE4_GPIO2 BIT(1) +#define OV9282_OUTPUT_ENABLE4_D9 BIT(0) + +#define OV9282_REG_OUTPUT_ENABLE5 0x3005 +#define OV9282_OUTPUT_ENABLE5_D8 BIT(7) +#define OV9282_OUTPUT_ENABLE5_D7 BIT(6) +#define OV9282_OUTPUT_ENABLE5_D6 BIT(5) +#define OV9282_OUTPUT_ENABLE5_D5 BIT(4) +#define OV9282_OUTPUT_ENABLE5_D4 BIT(3) +#define OV9282_OUTPUT_ENABLE5_D3 BIT(2) +#define OV9282_OUTPUT_ENABLE5_D2 BIT(1) +#define OV9282_OUTPUT_ENABLE5_D1 BIT(0) + +#define OV9282_REG_OUTPUT_ENABLE6 0x3006 +#define OV9282_OUTPUT_ENABLE6_D0 BIT(7) +#define OV9282_OUTPUT_ENABLE6_PCLK BIT(6) +#define OV9282_OUTPUT_ENABLE6_HREF BIT(5) +#define OV9282_OUTPUT_ENABLE6_STROBE BIT(3) +#define OV9282_OUTPUT_ENABLE6_ILPWM BIT(2) +#define OV9282_OUTPUT_ENABLE6_VSYNC BIT(1) + /* Exposure control */ #define OV9282_REG_EXPOSURE 0x3500 #define OV9282_EXPOSURE_MIN 1 @@ -213,9 +236,9 @@ static const struct ov9282_reg common_regs[] = { {0x0302, 0x32}, {0x030e, 0x02}, {0x3001, 0x00}, - {0x3004, 0x00}, - {0x3005, 0x00}, - {0x3006, 0x04}, + {OV9282_REG_OUTPUT_ENABLE4, 0x00}, + {OV9282_REG_OUTPUT_ENABLE5, 0x00}, + {OV9282_REG_OUTPUT_ENABLE6, OV9282_OUTPUT_ENABLE6_ILPWM}, {0x3011, 0x0a}, {0x3013, 0x18}, {0x301c, 0xf0}, From patchwork Wed May 7 07:51:38 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Leitner X-Patchwork-Id: 888409 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 661A7221714; Wed, 7 May 2025 07:52:22 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746604342; cv=none; b=RKH7OJhaW/do5tUafbalobg+oSTFb01XHOuNxSQdGnmz3IIqLCKJym3+mQyALIDHK7PMLx2IY/JyMZaHJJ8mcO6U2NiabE6ZhfCh9LVY6rIbvDRr3vbxIH+/0kfmApmXRpKHXEwdYPxTHBXTPNXKEvyUIwmhLnzrYGAydQQYBFA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746604342; c=relaxed/simple; bh=8vJtoHTUTJrvONHO5vnxfREHXCoupGjqP9LZtMbdTp8=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=Mru9ZFJupZpu6+QBdIm246g/3YNEbFtVnKqIgYEP9jtLAZdn/qHcR0vTBXqSF4i9KeHF3IfBD4Ml05Gk4ODUGWGJYOwP00gQs7gVpwZ00uvVkDTY4Qu3V5A++u5nH5glzmEUz/6RjGC8eQ75aVVa/RgDRJ4/kSqODX96zJ9ccTE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b=PGMt9oQO; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b="PGMt9oQO" Received: by smtp.kernel.org (Postfix) with ESMTPS id EEF1CC113D0; Wed, 7 May 2025 07:52:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linux.dev; s=korg; t=1746604342; bh=8vJtoHTUTJrvONHO5vnxfREHXCoupGjqP9LZtMbdTp8=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=PGMt9oQOsYotDBMsn7k486+WMP5WTS84j7pDuFbS35v3uPj8uV46xVLj2tR5m/HEv b+0exnAtZsjcAoy2RYIh3YZCJ+pFft3zIMjak4w4uSVuqV1vi77cRfz64nmwxwOYwL SzouXkWG3jIhEc82XnGlrUKrabnewuRxwSi1FkjA= Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id E8067C3ABC6; Wed, 7 May 2025 07:52:21 +0000 (UTC) From: Richard Leitner Date: Wed, 07 May 2025 09:51:38 +0200 Subject: [PATCH v4 09/10] media: i2c: ov9282: add strobe_source v4l2 control Precedence: bulk X-Mailing-List: linux-media@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250507-ov9282-flash-strobe-v4-9-72b299c1b7c9@linux.dev> References: <20250507-ov9282-flash-strobe-v4-0-72b299c1b7c9@linux.dev> In-Reply-To: <20250507-ov9282-flash-strobe-v4-0-72b299c1b7c9@linux.dev> To: Sakari Ailus , Dave Stevenson , Mauro Carvalho Chehab , Lee Jones , Pavel Machek , Laurent Pinchart Cc: Hans Verkuil , linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, linux-leds@vger.kernel.org, Richard Leitner X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1746604340; l=1686; i=richard.leitner@linux.dev; s=20250225; h=from:subject:message-id; bh=8vJtoHTUTJrvONHO5vnxfREHXCoupGjqP9LZtMbdTp8=; b=E2JTQ4G5ISf8J+ZKkw1SGv3NDaPKG+xpsxVH4/leWk99GZAKugTPnIkldfWZKDFoLfftzorYx /jPLVRjZTXrAG12ZOmNS/C2KL9YDeIDnIu8eITOyobyCMUpJsackX5D X-Developer-Key: i=richard.leitner@linux.dev; a=ed25519; pk=8hZNyyyQFqZ5ruVJsSGBSPIrmJpfDm5HwHU4QVOP1Pk= X-Endpoint-Received: by B4 Relay for richard.leitner@linux.dev/20250225 with auth_id=350 Add read-only V4L2_CID_FLASH_STROBE_SOURCE control. Its value is fixed to V4L2_FLASH_STROBE_SOURCE_EXTERNAL as the camera sensor triggers the strobe based on its register settings. Signed-off-by: Richard Leitner --- drivers/media/i2c/ov9282.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/drivers/media/i2c/ov9282.c b/drivers/media/i2c/ov9282.c index 0bbdf08d7cda8f72e05fdc292aa69a4c821e4e03..09d522d5977ec6fb82028ddb6015f05c9328191d 100644 --- a/drivers/media/i2c/ov9282.c +++ b/drivers/media/i2c/ov9282.c @@ -1368,11 +1368,12 @@ static int ov9282_init_controls(struct ov9282 *ov9282) struct v4l2_ctrl_handler *ctrl_hdlr = &ov9282->ctrl_handler; const struct ov9282_mode *mode = ov9282->cur_mode; struct v4l2_fwnode_device_properties props; + struct v4l2_ctrl *ctrl; u32 hblank_min; u32 lpfr; int ret; - ret = v4l2_ctrl_handler_init(ctrl_hdlr, 12); + ret = v4l2_ctrl_handler_init(ctrl_hdlr, 13); if (ret) return ret; @@ -1447,6 +1448,14 @@ static int ov9282_init_controls(struct ov9282 *ov9282) v4l2_ctrl_new_std(ctrl_hdlr, &ov9282_ctrl_ops, V4L2_CID_FLASH_DURATION, 0, 13900, 1, 8); + ctrl = v4l2_ctrl_new_std_menu(ctrl_hdlr, &ov9282_ctrl_ops, + V4L2_CID_FLASH_STROBE_SOURCE, + V4L2_FLASH_STROBE_SOURCE_EXTERNAL, + ~(1 << V4L2_FLASH_STROBE_SOURCE_EXTERNAL), + V4L2_FLASH_STROBE_SOURCE_EXTERNAL); + if (ctrl) + ctrl->flags |= V4L2_CTRL_FLAG_READ_ONLY; + ret = v4l2_fwnode_device_parse(ov9282->dev, &props); if (!ret) { /* Failure sets ctrl_hdlr->error, which we check afterwards anyway */