korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-12-15 15:04:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

media: imx335: Use v4l2_link_freq_to_bitmap helper

Browse Source 
Use the v4l2_link_freq_to_bitmap() helper to figure out which
driver-supported link frequencies can be used on a given system.

Signed-off-by: Umang Jain <umang.jain@ideasonboard.com>
Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
This commit is contained in:
Umang Jain 2024-02-20 14:58:18 +05:30 committed by Hans Verkuil
parent 14a60786d7
commit 0862582b52
1 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
drivers/media/i2c/imx335.c
View File

@ -49,7 +49,7 @@
#define IMX335_INCLK_RATE 24000000 #define IMX335_INCLK_RATE 24000000
/* CSI2 HW configuration */ /* CSI2 HW configuration */
#define IMX335_LINK_FREQ 594000000 #define IMX335_LINK_FREQ 594000000LL
#define IMX335_NUM_DATA_LANES 4 #define IMX335_NUM_DATA_LANES 4
#define IMX335_REG_MIN 0x00 #define IMX335_REG_MIN 0x00
@ -134,6 +134,7 @@ struct imx335_mode {
* @vblank: Vertical blanking in lines * @vblank: Vertical blanking in lines
* @cur_mode: Pointer to current selected sensor mode * @cur_mode: Pointer to current selected sensor mode
* @mutex: Mutex for serializing sensor controls * @mutex: Mutex for serializing sensor controls
* @link_freq_bitmap: Menu bitmap for link_freq_ctrl
* @cur_mbus_code: Currently selected media bus format code * @cur_mbus_code: Currently selected media bus format code
*/ */
struct imx335 { struct imx335 {
@ -157,6 +158,7 @@ struct imx335 {
u32 vblank; u32 vblank;
const struct imx335_mode *cur_mode; const struct imx335_mode *cur_mode;
struct mutex mutex; struct mutex mutex;
unsigned long link_freq_bitmap;
u32 cur_mbus_code; u32 cur_mbus_code;
}; };
@ -405,7 +407,8 @@ static int imx335_update_controls(struct imx335 *imx335,
{ {
int ret; int ret;
ret = __v4l2_ctrl_s_ctrl(imx335->link_freq_ctrl, mode->link_freq_idx); ret = __v4l2_ctrl_s_ctrl(imx335->link_freq_ctrl,
__ffs(imx335->link_freq_bitmap));
if (ret) if (ret)
return ret; return ret;
@ -691,6 +694,13 @@ static int imx335_init_state(struct v4l2_subdev *sd,
fmt.which = sd_state ? V4L2_SUBDEV_FORMAT_TRY : V4L2_SUBDEV_FORMAT_ACTIVE; fmt.which = sd_state ? V4L2_SUBDEV_FORMAT_TRY : V4L2_SUBDEV_FORMAT_ACTIVE;
imx335_fill_pad_format(imx335, &supported_mode, &fmt); imx335_fill_pad_format(imx335, &supported_mode, &fmt);
mutex_lock(&imx335->mutex);
__v4l2_ctrl_modify_range(imx335->link_freq_ctrl, 0,
__fls(imx335->link_freq_bitmap),
~(imx335->link_freq_bitmap),
__ffs(imx335->link_freq_bitmap));
mutex_unlock(&imx335->mutex);
return imx335_set_pad_format(sd, sd_state, &fmt); return imx335_set_pad_format(sd, sd_state, &fmt);
} }
@ -939,19 +949,10 @@ static int imx335_parse_hw_config(struct imx335 *imx335)
goto done_endpoint_free; goto done_endpoint_free;
} }
if (!bus_cfg.nr_of_link_frequencies) { ret = v4l2_link_freq_to_bitmap(imx335->dev, bus_cfg.link_frequencies,
dev_err(imx335->dev, "no link frequencies defined\n"); bus_cfg.nr_of_link_frequencies,
ret = -EINVAL; link_freq, ARRAY_SIZE(link_freq),
goto done_endpoint_free; &imx335->link_freq_bitmap);
}
for (i = 0; i < bus_cfg.nr_of_link_frequencies; i++)
if (bus_cfg.link_frequencies[i] == IMX335_LINK_FREQ)
goto done_endpoint_free;
dev_err(imx335->dev, "no compatible link frequencies found\n");
ret = -EINVAL;
done_endpoint_free: done_endpoint_free:
v4l2_fwnode_endpoint_free(&bus_cfg); v4l2_fwnode_endpoint_free(&bus_cfg);
@ -1099,9 +1100,8 @@ static int imx335_init_controls(struct imx335 *imx335)
imx335->link_freq_ctrl = v4l2_ctrl_new_int_menu(ctrl_hdlr, imx335->link_freq_ctrl = v4l2_ctrl_new_int_menu(ctrl_hdlr,
&imx335_ctrl_ops, &imx335_ctrl_ops,
V4L2_CID_LINK_FREQ, V4L2_CID_LINK_FREQ,
ARRAY_SIZE(link_freq) - __fls(imx335->link_freq_bitmap),
1, __ffs(imx335->link_freq_bitmap),
mode->link_freq_idx,
link_freq); link_freq);
if (imx335->link_freq_ctrl) if (imx335->link_freq_ctrl)
imx335->link_freq_ctrl->flags |= V4L2_CTRL_FLAG_READ_ONLY; imx335->link_freq_ctrl->flags |= V4L2_CTRL_FLAG_READ_ONLY;