Add support for the new V4L2_CID_FLASH_DURATION control to the v4l2
flash led class.
Signed-off-by: Richard Leitner <richard.leitner@linux.dev>
---
drivers/media/v4l2-core/v4l2-flash-led-class.c | 13 +++++++++++++
1 file changed, 13 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..963b549480f6eb3b9eb0d80696a764de7ffcc1a2 100644
--- a/drivers/media/v4l2-core/v4l2-flash-led-class.c
+++ b/drivers/media/v4l2-core/v4l2-flash-led-class.c
@@ -298,6 +298,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 +430,13 @@ 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, timeout_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,
--
2.47.2
Hi Richard,
On Tue, Apr 29, 2025 at 02:59:08PM +0200, Richard Leitner wrote:
> Add support for the new V4L2_CID_FLASH_DURATION control to the v4l2
> flash led class.
>
> Signed-off-by: Richard Leitner <richard.leitner@linux.dev>
> ---
> drivers/media/v4l2-core/v4l2-flash-led-class.c | 13 +++++++++++++
> 1 file changed, 13 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..963b549480f6eb3b9eb0d80696a764de7ffcc1a2 100644
> --- a/drivers/media/v4l2-core/v4l2-flash-led-class.c
> +++ b/drivers/media/v4l2-core/v4l2-flash-led-class.c
> @@ -298,6 +298,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 +430,13 @@ 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, timeout_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;
Has this been compile tested? :-)
> }
>
> static int v4l2_flash_init_controls(struct v4l2_flash *v4l2_flash,
>
--
Regards,
Sakari Ailus
Hi Sakari,
thanks for your quick feedback!
On Wed, Apr 30, 2025 at 08:24:00AM +0000, Sakari Ailus wrote:
> Hi Richard,
>
> On Tue, Apr 29, 2025 at 02:59:08PM +0200, Richard Leitner wrote:
> > Add support for the new V4L2_CID_FLASH_DURATION control to the v4l2
> > flash led class.
> >
> > Signed-off-by: Richard Leitner <richard.leitner@linux.dev>
> > ---
> > drivers/media/v4l2-core/v4l2-flash-led-class.c | 13 +++++++++++++
> > 1 file changed, 13 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..963b549480f6eb3b9eb0d80696a764de7ffcc1a2 100644
> > --- a/drivers/media/v4l2-core/v4l2-flash-led-class.c
> > +++ b/drivers/media/v4l2-core/v4l2-flash-led-class.c
> > @@ -298,6 +298,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 +430,13 @@ 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, timeout_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;
>
> Has this been compile tested? :-)
Oooh... Damn. That's embarrasing. SORRY! There should have been at least
another '}' in this patch.... Seems I somehow messed up my last rebase.
Will fix that in v4. Sorry again :-/
>
> > }
> >
> > static int v4l2_flash_init_controls(struct v4l2_flash *v4l2_flash,
> >
>
> --
> Regards,
>
> Sakari Ailus
regards;rl
On Wed, Apr 30, 2025 at 10:37:48AM +0200, Richard Leitner wrote:
> > > + /* Init FLASH_DURATION ctrl data */
> > > + if (has_flash_op(fled_cdev, timeout_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;
> >
> > Has this been compile tested? :-)
>
> Oooh... Damn. That's embarrasing. SORRY! There should have been at least
> another '}' in this patch.... Seems I somehow messed up my last rebase.
>
> Will fix that in v4. Sorry again :-/
No worries, it happens to everyone sometimes.
--
Sakari Ailus
© 2016 - 2026 Red Hat, Inc.