Skip to content

Commit bfeb930

Browse files
6by9pelwell
authored andcommitted
media: i2c: imx258: Set pixel_rate range to the same as the value
With a read only control there is limited point in advertising a minimum and maximum for the control, so change to set the value, min, and max all to the selected pixel rate. Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
1 parent 8163bee commit bfeb930

File tree

1 file changed

+7
-11
lines changed

1 file changed

+7
-11
lines changed

drivers/media/i2c/imx258.c

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1237,7 +1237,8 @@ static int imx258_set_pad_format(struct v4l2_subdev *sd,
12371237

12381238
link_freq = imx258->link_freq_menu_items[mode->link_freq_index];
12391239
pixel_rate = link_freq_to_pixel_rate(link_freq, imx258->nlanes);
1240-
__v4l2_ctrl_s_ctrl_int64(imx258->pixel_rate, pixel_rate);
1240+
__v4l2_ctrl_modify_range(imx258->pixel_rate, pixel_rate,
1241+
pixel_rate, 1, pixel_rate);
12411242
/* Update limits and set FPS to default */
12421243
vblank_def = imx258->cur_mode->vts_def -
12431244
imx258->cur_mode->height;
@@ -1546,8 +1547,7 @@ static int imx258_init_controls(struct imx258 *imx258)
15461547
struct v4l2_ctrl_handler *ctrl_hdlr;
15471548
s64 vblank_def;
15481549
s64 vblank_min;
1549-
s64 pixel_rate_min;
1550-
s64 pixel_rate_max;
1550+
s64 pixel_rate;
15511551
int ret;
15521552

15531553
ctrl_hdlr = &imx258->ctrl_handler;
@@ -1567,17 +1567,13 @@ static int imx258_init_controls(struct imx258 *imx258)
15671567
if (imx258->link_freq)
15681568
imx258->link_freq->flags |= V4L2_CTRL_FLAG_READ_ONLY;
15691569

1570-
pixel_rate_max =
1571-
link_freq_to_pixel_rate(imx258->link_freq_menu_items[0],
1572-
imx258->nlanes);
1573-
pixel_rate_min =
1574-
link_freq_to_pixel_rate(imx258->link_freq_menu_items[1],
1575-
imx258->nlanes);
1570+
pixel_rate = link_freq_to_pixel_rate(imx258->link_freq_menu_items[0],
1571+
imx258->nlanes);
15761572
/* By default, PIXEL_RATE is read only */
15771573
imx258->pixel_rate = v4l2_ctrl_new_std(ctrl_hdlr, &imx258_ctrl_ops,
15781574
V4L2_CID_PIXEL_RATE,
1579-
pixel_rate_min, pixel_rate_max,
1580-
1, pixel_rate_max);
1575+
pixel_rate, pixel_rate,
1576+
1, pixel_rate);
15811577

15821578

15831579
vblank_def = imx258->cur_mode->vts_def - imx258->cur_mode->height;

0 commit comments

Comments
 (0)