mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-20 22:23:27 +00:00
77 lines
2.2 KiB
Diff
77 lines
2.2 KiB
Diff
|
From 2df16ebeea66a589195944bd2b501783c3cab60f Mon Sep 17 00:00:00 2001
|
||
|
|
From: Dave Stevenson <dave.stevenson@raspberrypi.com>
|
||
|
|
Date: Tue, 15 Jun 2021 18:56:33 +0100
|
||
|
|
Subject: [PATCH] media: i2c: imx258: Make V4L2_CID_VBLANK
|
||
|
|
configurable.
|
||
|
|
|
||
|
|
The values and ranges of V4L2_CID_VBLANK are all computed,
|
||
|
|
so there is no reason for it to be a read only control.
|
||
|
|
Remove the register values from the mode lists, add the
|
||
|
|
handler, and remove the read only flag.
|
||
|
|
|
||
|
|
Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
|
||
|
|
---
|
||
|
|
drivers/media/i2c/imx258.c | 16 +++++++---------
|
||
|
|
1 file changed, 7 insertions(+), 9 deletions(-)
|
||
|
|
|
||
|
|
--- a/drivers/media/i2c/imx258.c
|
||
|
|
+++ b/drivers/media/i2c/imx258.c
|
||
|
|
@@ -30,6 +30,8 @@
|
||
|
|
#define IMX258_VTS_30FPS_VGA 0x034c
|
||
|
|
#define IMX258_VTS_MAX 0xffff
|
||
|
|
|
||
|
|
+#define IMX258_REG_VTS 0x0340
|
||
|
|
+
|
||
|
|
/* HBLANK control - read only */
|
||
|
|
#define IMX258_PPL_DEFAULT 5352
|
||
|
|
|
||
|
|
@@ -203,8 +205,6 @@ static const struct imx258_reg mode_4208
|
||
|
|
{ 0x0114, 0x03 },
|
||
|
|
{ 0x0342, 0x14 },
|
||
|
|
{ 0x0343, 0xE8 },
|
||
|
|
- { 0x0340, 0x0C },
|
||
|
|
- { 0x0341, 0x50 },
|
||
|
|
{ 0x0344, 0x00 },
|
||
|
|
{ 0x0345, 0x00 },
|
||
|
|
{ 0x0346, 0x00 },
|
||
|
|
@@ -320,8 +320,6 @@ static const struct imx258_reg mode_2104
|
||
|
|
{ 0x0114, 0x03 },
|
||
|
|
{ 0x0342, 0x14 },
|
||
|
|
{ 0x0343, 0xE8 },
|
||
|
|
- { 0x0340, 0x06 },
|
||
|
|
- { 0x0341, 0x38 },
|
||
|
|
{ 0x0344, 0x00 },
|
||
|
|
{ 0x0345, 0x00 },
|
||
|
|
{ 0x0346, 0x00 },
|
||
|
|
@@ -437,8 +435,6 @@ static const struct imx258_reg mode_1048
|
||
|
|
{ 0x0114, 0x03 },
|
||
|
|
{ 0x0342, 0x14 },
|
||
|
|
{ 0x0343, 0xE8 },
|
||
|
|
- { 0x0340, 0x03 },
|
||
|
|
- { 0x0341, 0x4C },
|
||
|
|
{ 0x0344, 0x00 },
|
||
|
|
{ 0x0345, 0x00 },
|
||
|
|
{ 0x0346, 0x00 },
|
||
|
|
@@ -831,6 +827,11 @@ static int imx258_set_ctrl(struct v4l2_c
|
||
|
|
BIT(IMX258_HDR_RATIO_MAX));
|
||
|
|
}
|
||
|
|
break;
|
||
|
|
+ case V4L2_CID_VBLANK:
|
||
|
|
+ ret = imx258_write_reg(imx258, IMX258_REG_VTS,
|
||
|
|
+ IMX258_REG_VALUE_16BIT,
|
||
|
|
+ imx258->cur_mode->height + ctrl->val);
|
||
|
|
+ break;
|
||
|
|
case V4L2_CID_VFLIP:
|
||
|
|
case V4L2_CID_HFLIP:
|
||
|
|
ret = imx258_write_reg(imx258, REG_MIRROR_FLIP_CONTROL,
|
||
|
|
@@ -1233,9 +1234,6 @@ static int imx258_init_controls(struct i
|
||
|
|
IMX258_VTS_MAX - imx258->cur_mode->height, 1,
|
||
|
|
vblank_def);
|
||
|
|
|
||
|
|
- if (imx258->vblank)
|
||
|
|
- imx258->vblank->flags |= V4L2_CTRL_FLAG_READ_ONLY;
|
||
|
|
-
|
||
|
|
imx258->hblank = v4l2_ctrl_new_std(
|
||
|
|
ctrl_hdlr, &imx258_ctrl_ops, V4L2_CID_HBLANK,
|
||
|
|
IMX258_PPL_DEFAULT - imx258->cur_mode->width,
|