raspi/linux
1
0
Fork 1
mirror of https://github.com/raspberrypi/linux.git synced 2025-12-06 18:09:56 +00:00
Code Issues Projects Releases Wiki Activity

media: i2c: imx258: Make V4L2_CID_VBLANK configurable.

Browse Source 
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>
This commit is contained in:
Dave Stevenson
2021-06-15 18:56:33 +01:00
committed by Dom Cobley
parent 0d154d20f1
commit 0639c1ceb6
1 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/media/i2c/imx258.c
View File

@@ -30,6 +30,8 @@
#define IMX258_VTS_30FPS_VGA 0x034c #define IMX258_VTS_30FPS_VGA 0x034c
#define IMX258_VTS_MAX 0xffff #define IMX258_VTS_MAX 0xffff
#define IMX258_REG_VTS 0x0340
/* HBLANK control - read only */ /* HBLANK control - read only */
#define IMX258_PPL_DEFAULT 5352 #define IMX258_PPL_DEFAULT 5352
@@ -202,8 +204,6 @@ static const struct imx258_reg mode_4208x3120_regs[] = {
{ 0x0114, 0x03 }, { 0x0114, 0x03 },
{ 0x0342, 0x14 }, { 0x0342, 0x14 },
{ 0x0343, 0xE8 }, { 0x0343, 0xE8 },
{ 0x0340, 0x0C },
{ 0x0341, 0x50 },
{ 0x0344, 0x00 }, { 0x0344, 0x00 },
{ 0x0345, 0x00 }, { 0x0345, 0x00 },
{ 0x0346, 0x00 }, { 0x0346, 0x00 },
@@ -319,8 +319,6 @@ static const struct imx258_reg mode_2104_1560_regs[] = {
{ 0x0114, 0x03 }, { 0x0114, 0x03 },
{ 0x0342, 0x14 }, { 0x0342, 0x14 },
{ 0x0343, 0xE8 }, { 0x0343, 0xE8 },
{ 0x0340, 0x06 },
{ 0x0341, 0x38 },
{ 0x0344, 0x00 }, { 0x0344, 0x00 },
{ 0x0345, 0x00 }, { 0x0345, 0x00 },
{ 0x0346, 0x00 }, { 0x0346, 0x00 },
@@ -436,8 +434,6 @@ static const struct imx258_reg mode_1048_780_regs[] = {
{ 0x0114, 0x03 }, { 0x0114, 0x03 },
{ 0x0342, 0x14 }, { 0x0342, 0x14 },
{ 0x0343, 0xE8 }, { 0x0343, 0xE8 },
{ 0x0340, 0x03 },
{ 0x0341, 0x4C },
{ 0x0344, 0x00 }, { 0x0344, 0x00 },
{ 0x0345, 0x00 }, { 0x0345, 0x00 },
{ 0x0346, 0x00 }, { 0x0346, 0x00 },
@@ -800,6 +796,11 @@ static int imx258_set_ctrl(struct v4l2_ctrl *ctrl)
BIT(IMX258_HDR_RATIO_MAX)); BIT(IMX258_HDR_RATIO_MAX));
} }
break; break;
case V4L2_CID_VBLANK:
ret = imx258_write_reg(imx258, IMX258_REG_VTS,
IMX258_REG_VALUE_16BIT,
imx258->cur_mode->height + ctrl->val);
break;
default: default:
dev_info(&client->dev, dev_info(&client->dev,
"ctrl(id:0x%x,val:0x%x) is not handled\n", "ctrl(id:0x%x,val:0x%x) is not handled\n",
@@ -1174,9 +1175,6 @@ static int imx258_init_controls(struct imx258 *imx258)
IMX258_VTS_MAX - imx258->cur_mode->height, 1, IMX258_VTS_MAX - imx258->cur_mode->height, 1,
vblank_def); vblank_def);
if (imx258->vblank)
imx258->vblank->flags |= V4L2_CTRL_FLAG_READ_ONLY;
imx258->hblank = v4l2_ctrl_new_std( imx258->hblank = v4l2_ctrl_new_std(
ctrl_hdlr, &imx258_ctrl_ops, V4L2_CID_HBLANK, ctrl_hdlr, &imx258_ctrl_ops, V4L2_CID_HBLANK,
IMX258_PPL_DEFAULT - imx258->cur_mode->width, IMX258_PPL_DEFAULT - imx258->cur_mode->width,