From patchwork Mon Mar 3 22:58:57 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Leitner X-Patchwork-Id: 870315 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 1CC10239597; Mon, 3 Mar 2025 22:59:03 +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=1741042744; cv=none; b=d8WV5QowwZTySUYqGbJrG0lT7N3IVB7m+/NdUDZPRP7EfCO/4PKlZfw9qhK/j8CmvkhZ98+kvpc5uTUInyTWuV8hxDNRPgj5xxqO3egPnsaMrQDIYmNA3pTnhzTYuuU9PHmqWQohbFADbZojsZDPDbjg+Sw6Hx+GVI3ZhzJU5DM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741042744; c=relaxed/simple; bh=bij9SxWMYtvl2rre7/fyncZBihepIAhKYE49jozzAMA=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=mtGPokCIxxtixoTTfe5fOK6VGaoxj1Xt6GGzgk+XuiYFRxnevJuuSKRM0IHRScQNCXqcnD8q1OxMzsWIXQy46rjZRUZP//cs/0eYsnEEgZR2b0SnH5eelIjx0CVxBC0NclqDDAuomYKTULKvFYfk6BZeJeJKR0kte76K5PcaV9o= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b=Scfcxidq; 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="Scfcxidq" Received: by smtp.kernel.org (Postfix) with ESMTPS id C30B1C4CEE8; Mon, 3 Mar 2025 22:59:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linux.dev; s=korg; t=1741042743; bh=bij9SxWMYtvl2rre7/fyncZBihepIAhKYE49jozzAMA=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=ScfcxidqLGne0o1+UFd6vVtYFBL3mv+d5lKu5ngTJ8Rm/tMpueJ8yt7FVwxatjYCS An2moYkazDdh4a2YFRLfzvNOAn9xPOH7t6IXZauaOkkinq4KuWl0DTnQLZMw9o1Wrj +KGmzHFvNnh2iyUpEQGBjZeuD6qm5FOz4WxSghj8= 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 AF18CC282D2; Mon, 3 Mar 2025 22:59:03 +0000 (UTC) From: Richard Leitner Date: Mon, 03 Mar 2025 23:58:57 +0100 Subject: [PATCH 1/3] 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: <20250303-ov9282-flash-strobe-v1-1-0fd57a1564ba@linux.dev> References: <20250303-ov9282-flash-strobe-v1-0-0fd57a1564ba@linux.dev> In-Reply-To: <20250303-ov9282-flash-strobe-v1-0-0fd57a1564ba@linux.dev> To: Sakari Ailus , Dave Stevenson , Mauro Carvalho Chehab Cc: Laurent Pinchart , linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, Richard Leitner X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1741042742; l=2129; i=richard.leitner@linux.dev; s=20250225; h=from:subject:message-id; bh=bij9SxWMYtvl2rre7/fyncZBihepIAhKYE49jozzAMA=; b=+CwZzpD5YBCKhOr8OVZQ6dM1FYgX1RZ1DNqCCbodH2N+LUAcGl9o8vA+0LIbk8Bt2ToZ2+nfo djwHxPNhhNpDx/PeVkq0eELZw/2t0jXw6azmniOX71WxUBzxw9hF1ig 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). 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 Mon Mar 3 22:58:58 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Leitner X-Patchwork-Id: 869995 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 803CE23A9BA; Mon, 3 Mar 2025 22:59:04 +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=1741042744; cv=none; b=gHYY4L/SB0Cl6/g2B47c/Bqkj+aZHo+HWGYlXBw5jGii2X4QYRqthq91eRWHDnSJj/nNP3SRSwBKCTi2zOKsKhMfUpHBjw+JCkezQyWbhvcMiuSsnIjO6iYRey48gG0DdlG+wztAp0oI2uXcNGcNH8upg4ZwulyQ3Qh8k8FL+6o= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741042744; c=relaxed/simple; bh=ynf1rL1Z7qhjQlA4BOwr3bmt/GjH86WcpFJlKbCIiM8=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=FkKDQdeSc+ray5/nZPEEIcVzU/xNbLwog2dAEke9jwZcuIrCBTuel4ii2HaX4wGLA5HgTSPMrYDUqPW36fh8MRYbxaAG+V+fB7Q2DJkASW9syKtTE2B/+tdxDCMzvnuI4VfJJcUqvV1VbxeQ83H+G2sgnp2p8wtIIwsm2BvefjI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b=uorGpzqi; 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="uorGpzqi" Received: by smtp.kernel.org (Postfix) with ESMTPS id D09E7C4CEEC; Mon, 3 Mar 2025 22:59:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linux.dev; s=korg; t=1741042743; bh=ynf1rL1Z7qhjQlA4BOwr3bmt/GjH86WcpFJlKbCIiM8=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=uorGpzqiFinOi9rHV5hHv29VN/UfHep+DuttZ5ouZDYPWqT59/6REOyxTdW79+Xx4 ClJnXnlfDxb7MoKM1oTMbtrzvycZELlkKtRG1DN60oKTDq3sxokUcOk3pw9PpayeI8 Kk9jb5cV0nX5yUpEnQwnqCXezLl7p49g9l3o5E3E= 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 BF17EC282C6; Mon, 3 Mar 2025 22:59:03 +0000 (UTC) From: Richard Leitner Date: Mon, 03 Mar 2025 23:58:58 +0100 Subject: [PATCH 2/3] media: i2c: ov9282: add led_mode v4l2 control Precedence: bulk X-Mailing-List: linux-media@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250303-ov9282-flash-strobe-v1-2-0fd57a1564ba@linux.dev> References: <20250303-ov9282-flash-strobe-v1-0-0fd57a1564ba@linux.dev> In-Reply-To: <20250303-ov9282-flash-strobe-v1-0-0fd57a1564ba@linux.dev> To: Sakari Ailus , Dave Stevenson , Mauro Carvalho Chehab Cc: Laurent Pinchart , linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, Richard Leitner X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1741042742; l=3064; i=richard.leitner@linux.dev; s=20250225; h=from:subject:message-id; bh=ynf1rL1Z7qhjQlA4BOwr3bmt/GjH86WcpFJlKbCIiM8=; b=PjiFIB/iECjcZdDzTZSyCqUFxMc/SIfwtkPj0A54hSgIe71p1U8gKUV9jb03YpY1v2clbP6WZ FvnzHodHwOGARn6/4KIfqkaFXJt88GM98susWYSb9ObIohdCWUWfdnZ 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 V4L2_CID_FLASH_LED_MODE support using the "strobe output enable" feature of the sensor. This implements following modes: - V4L2_FLASH_LED_MODE_NONE, which disables the strobe output - V4L2_FLASH_LED_MODE_FLASH, which enables the strobe output All values are based on the OV9281 datasheet v1.53 (january 2019) and tested using an ov9281 VisionComponents module. Signed-off-by: Richard Leitner --- drivers/media/i2c/ov9282.c | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/drivers/media/i2c/ov9282.c b/drivers/media/i2c/ov9282.c index f42e0d439753e74d14e3a3592029e48f49234927..c98ba466e9aea29baff0b13578d760bf69c958c5 100644 --- a/drivers/media/i2c/ov9282.c +++ b/drivers/media/i2c/ov9282.c @@ -192,6 +192,7 @@ struct ov9282_mode { * @exp_ctrl: Pointer to exposure control * @again_ctrl: Pointer to analog gain control * @pixel_rate: Pointer to pixel rate control + * @flash_led_mode: Pointer to flash led mode control * @vblank: Vertical blanking in lines * @noncontinuous_clock: Selection of CSI2 noncontinuous clock mode * @cur_mode: Pointer to current selected sensor mode @@ -214,6 +215,7 @@ struct ov9282 { struct v4l2_ctrl *again_ctrl; }; struct v4l2_ctrl *pixel_rate; + struct v4l2_ctrl *flash_led_mode; u32 vblank; bool noncontinuous_clock; const struct ov9282_mode *cur_mode; @@ -670,6 +672,23 @@ static int ov9282_set_ctrl_vflip(struct ov9282 *ov9282, int value) current_val); } +static int ov9282_set_ctrl_flash_led_mode(struct ov9282 *ov9282, int mode) +{ + u32 current_val; + int ret = ov9282_read_reg(ov9282, OV9282_REG_OUTPUT_ENABLE6, 1, + ¤t_val); + if (ret) + return ret; + + if (mode == V4L2_FLASH_LED_MODE_FLASH) + current_val |= OV9282_OUTPUT_ENABLE6_STROBE; + else + current_val &= ~OV9282_OUTPUT_ENABLE6_STROBE; + + return ov9282_write_reg(ov9282, OV9282_REG_OUTPUT_ENABLE6, 1, + current_val); +} + /** * ov9282_set_ctrl() - Set subdevice control * @ctrl: pointer to v4l2_ctrl structure @@ -736,6 +755,9 @@ static int ov9282_set_ctrl(struct v4l2_ctrl *ctrl) ret = ov9282_write_reg(ov9282, OV9282_REG_TIMING_HTS, 2, (ctrl->val + ov9282->cur_mode->width) >> 1); break; + case V4L2_CID_FLASH_LED_MODE: + ret = ov9282_set_ctrl_flash_led_mode(ov9282, ctrl->val); + break; default: dev_err(ov9282->dev, "Invalid control %d", ctrl->id); ret = -EINVAL; @@ -1391,6 +1413,13 @@ static int ov9282_init_controls(struct ov9282 *ov9282) OV9282_TIMING_HTS_MAX - mode->width, 1, hblank_min); + /* Flash/Strobe controls */ + ov9282->flash_led_mode = v4l2_ctrl_new_std_menu(ctrl_hdlr, &ov9282_ctrl_ops, + V4L2_CID_FLASH_LED_MODE, + V4L2_FLASH_LED_MODE_TORCH, + (1 << V4L2_FLASH_LED_MODE_TORCH), + V4L2_FLASH_LED_MODE_NONE); + ret = v4l2_fwnode_device_parse(ov9282->dev, &props); if (!ret) { /* Failure sets ctrl_hdlr->error, which we check afterwards anyway */ From patchwork Mon Mar 3 22:58:59 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Leitner X-Patchwork-Id: 870314 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 38F6123959B; Mon, 3 Mar 2025 22:59:04 +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=1741042744; cv=none; b=C7AR5kzVL3wd6bBr3BUS+TRdnnsyV9jAyLkG+FzSUQKDahdM0ZCA9bUZr55pLwsqpnbxaVlhHtVyu8OvdvLoDkUUyPqLCPvHykY7G4QXbBm2CrkZ2hRQ9jhgTjFamBzUjmB3SlnttFRNREAFeCYkHntRQmb25OKNbugHfrKnqb8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741042744; c=relaxed/simple; bh=2qBIlc61Bz0jLXzWYXDw1jJCbwLUdYBGjPC1XgOpVUc=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=hObh992n5hRjUkJBRK8c8N19cQl3QVWhKp5r29GRnuCz+cGDcJuyBIxoX/gDWklHrzKh0pL0PfDVbH+MX1pG68D72XSKIblk0QqaeORk9e2Eq8cXNaWhHiGjiYQkvbGIawnWur6YrgtAQwZCdLC++9nSRh1kiBG/LvDXIPFnEH0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b=X9Xwto2l; 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="X9Xwto2l" Received: by smtp.kernel.org (Postfix) with ESMTPS id D999BC4CEEB; Mon, 3 Mar 2025 22:59:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linux.dev; s=korg; t=1741042743; bh=2qBIlc61Bz0jLXzWYXDw1jJCbwLUdYBGjPC1XgOpVUc=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=X9Xwto2leAXjKRjdW1eoxgRqC843CRbjMbyf7JsGQGz95it15ExlPNDfaAR6dSgMJ njxquyAcTPb0x1hyPQTK/gg5ADz+b0+ZvfT103I2Doy3iXgiefRjrDTHpWnudgSQzD Gz5DVCnhqe6QgvMQGAPtAOYjPkGev6FtKauqSlKA= 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 CDC34C282D6; Mon, 3 Mar 2025 22:59:03 +0000 (UTC) From: Richard Leitner Date: Mon, 03 Mar 2025 23:58:59 +0100 Subject: [PATCH 3/3] media: i2c: ov9282: add strobe_timeout v4l2 control Precedence: bulk X-Mailing-List: linux-media@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250303-ov9282-flash-strobe-v1-3-0fd57a1564ba@linux.dev> References: <20250303-ov9282-flash-strobe-v1-0-0fd57a1564ba@linux.dev> In-Reply-To: <20250303-ov9282-flash-strobe-v1-0-0fd57a1564ba@linux.dev> To: Sakari Ailus , Dave Stevenson , Mauro Carvalho Chehab Cc: Laurent Pinchart , linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, Richard Leitner X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1741042742; l=3993; i=richard.leitner@linux.dev; s=20250225; h=from:subject:message-id; bh=2qBIlc61Bz0jLXzWYXDw1jJCbwLUdYBGjPC1XgOpVUc=; b=j8FXv3/aOnxHqzyRM0RPHz9QmI2mC4+6onIZX4C0TQL+YMCjlVdVkVd7gWomBgJaN13tzgcCR ZvKCC3Ef+JzDTPOoYFUQPDkRcYMuEzTLCuyo4z4BlJvom4QFXhRCxMl 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 V4L2_CID_FLASH_TIMEOUT support using the "strobe_frame_span" feature of the sensor. This is implemented by transforming the given µs value by an interpolated formula to a "span step width" value and writing it to register PWM_CTRL_25, PWM_CTRL_26, PWM_CTRL_27, PWM_CTRL_28 (0x3925, 0x3926, 0x3927, 0x3928). The maximum control value is set to the period of the current framerate. This must be changed to a dynamic range as soon as this driver implements the set_frame_interval() pad operation. All register values are based on the OV9281 datasheet v1.53 (jan 2019) and tested using an ov9281 VisionComponents module. Signed-off-by: Richard Leitner --- drivers/media/i2c/ov9282.c | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/drivers/media/i2c/ov9282.c b/drivers/media/i2c/ov9282.c index c98ba466e9aea29baff0b13578d760bf69c958c5..f7dfe8987e524b73af7e16e12567e96627b4f89a 100644 --- a/drivers/media/i2c/ov9282.c +++ b/drivers/media/i2c/ov9282.c @@ -97,6 +97,10 @@ #define OV9282_REG_MIPI_CTRL00 0x4800 #define OV9282_GATED_CLOCK BIT(5) +/* Flash/Strobe control registers */ +#define OV9282_REG_FLASH_DURATION 0x3925 +#define OV9282_FLASH_DURATION_DEFAULT 0x0000001A + /* Input clock rate */ #define OV9282_INCLK_RATE 24000000 @@ -193,6 +197,7 @@ struct ov9282_mode { * @again_ctrl: Pointer to analog gain control * @pixel_rate: Pointer to pixel rate control * @flash_led_mode: Pointer to flash led mode control + * @flash_timeout: Pointer to flash timeout control * @vblank: Vertical blanking in lines * @noncontinuous_clock: Selection of CSI2 noncontinuous clock mode * @cur_mode: Pointer to current selected sensor mode @@ -216,6 +221,7 @@ struct ov9282 { }; struct v4l2_ctrl *pixel_rate; struct v4l2_ctrl *flash_led_mode; + struct v4l2_ctrl *flash_timeout; u32 vblank; bool noncontinuous_clock; const struct ov9282_mode *cur_mode; @@ -689,6 +695,24 @@ static int ov9282_set_ctrl_flash_led_mode(struct ov9282 *ov9282, int mode) current_val); } +static int ov9282_set_ctrl_flash_timeout(struct ov9282 *ov9282, int value) +{ + /* Calculate "strobe_frame_span" increments from a given value (µs). + * This is quite tricky as "The step width of shift and span is + * programmable under system clock domain.", but it's not documented + * how to program this step width (at least in the datasheet available + * to the author at time of writing). + * The formula below is interpolated from different modes/framerates + * and should work quite well for most settings. + */ + u32 val = value * 192 / (ov9282->cur_mode->width + ov9282->hblank_ctrl->val); + + ov9282_write_reg(ov9282, OV9282_REG_FLASH_DURATION, 1, (val >> 24) & 0xff); + ov9282_write_reg(ov9282, OV9282_REG_FLASH_DURATION + 1, 1, (val >> 16) & 0xff); + ov9282_write_reg(ov9282, OV9282_REG_FLASH_DURATION + 2, 1, (val >> 8) & 0xff); + return ov9282_write_reg(ov9282, OV9282_REG_FLASH_DURATION + 3, 1, val & 0xff); +} + /** * ov9282_set_ctrl() - Set subdevice control * @ctrl: pointer to v4l2_ctrl structure @@ -758,6 +782,9 @@ static int ov9282_set_ctrl(struct v4l2_ctrl *ctrl) case V4L2_CID_FLASH_LED_MODE: ret = ov9282_set_ctrl_flash_led_mode(ov9282, ctrl->val); break; + case V4L2_CID_FLASH_TIMEOUT: + ret = ov9282_set_ctrl_flash_timeout(ov9282, ctrl->val); + break; default: dev_err(ov9282->dev, "Invalid control %d", ctrl->id); ret = -EINVAL; @@ -1420,6 +1447,10 @@ static int ov9282_init_controls(struct ov9282 *ov9282) (1 << V4L2_FLASH_LED_MODE_TORCH), V4L2_FLASH_LED_MODE_NONE); + ov9282->flash_timeout = v4l2_ctrl_new_std(ctrl_hdlr, &ov9282_ctrl_ops, + V4L2_CID_FLASH_TIMEOUT, + 0, 13900, 1, 8); + ret = v4l2_fwnode_device_parse(ov9282->dev, &props); if (!ret) { /* Failure sets ctrl_hdlr->error, which we check afterwards anyway */