Commit e3269ea5 authored by Shravan Chippa's avatar Shravan Chippa Committed by Hans Verkuil
Browse files

media: i2c: imx334: update pixel, hblank and link frequency 



Update pixel_rate and link frequency for 1920x1080@30
while changing mode.

Update vblank value while changing mode

Add support to handle multiple link frequencies.

Add dummy ctrl cases for pixel_rate and link frequency
to avoid error while changing the modes dynamically.

Update default link frequency from device tree max link
frequency value.

Update init_cfg() function to update the link frequency
menu_skip_mask value.

Suggested-by: default avatarSakari Ailus <sakari.ailus@iki.fi>
Signed-off-by: default avatarShravan Chippa <shravan.chippa@microchip.com>
[Sakari Ailus: Document menu_skip_mask, remove extra blank line.]
Signed-off-by: default avatarSakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
parent 25857a00

drivers/media/i2c/imx334.c

+48 −14
Original line number Diff line number Diff line
@@ -49,7 +49,8 @@ 
#define IMX334_INCLK_RATE	24000000



/* CSI2 HW configuration */

#define IMX334_LINK_FREQ	891000000

#define IMX334_LINK_FREQ_891M	891000000

#define IMX334_LINK_FREQ_445M	445500000

#define IMX334_NUM_DATA_LANES	4



#define IMX334_REG_MIN		0x00
@@ -117,6 +118,7 @@ struct imx334_mode { 
 * @vblank: Vertical blanking in lines

 * @cur_mode: Pointer to current selected sensor mode

 * @mutex: Mutex for serializing sensor controls

 * @menu_skip_mask: Menu skip mask for link_freq_ctrl

 * @cur_code: current selected format code

 * @streaming: Flag indicating streaming state

 */
@@ -139,12 +141,14 @@ struct imx334 { 
	u32 vblank;

	const struct imx334_mode *cur_mode;

	struct mutex mutex;

	unsigned long menu_skip_mask;

	u32 cur_code;

	bool streaming;

};



static const s64 link_freq[] = {

	IMX334_LINK_FREQ,

	IMX334_LINK_FREQ_891M,

	IMX334_LINK_FREQ_445M,

};



/* Sensor mode registers for 1920x1080@30fps */
@@ -468,7 +472,7 @@ static const struct imx334_mode supported_modes[] = { 
		.vblank_min = 45,

		.vblank_max = 132840,

		.pclk = 297000000,

		.link_freq_idx = 0,

		.link_freq_idx = 1,

		.reg_list = {

			.num_of_regs = ARRAY_SIZE(mode_1920x1080_regs),

			.regs = mode_1920x1080_regs,
@@ -598,13 +602,22 @@ static int imx334_update_controls(struct imx334 *imx334, 
	if (ret)

		return ret;



	ret = __v4l2_ctrl_modify_range(imx334->pclk_ctrl, mode->pclk,

				       mode->pclk, 1, mode->pclk);

	if (ret)

		return ret;



	ret = __v4l2_ctrl_modify_range(imx334->hblank_ctrl, mode->hblank,

				       mode->hblank, 1, mode->hblank);

	if (ret)

		return ret;



	return __v4l2_ctrl_modify_range(imx334->vblank_ctrl, mode->vblank_min,

	ret =  __v4l2_ctrl_modify_range(imx334->vblank_ctrl, mode->vblank_min,

					mode->vblank_max, 1, mode->vblank);

	if (ret)

		return ret;



	return __v4l2_ctrl_s_ctrl(imx334->vblank_ctrl, mode->vblank);

}



/**
@@ -698,6 +711,8 @@ static int imx334_set_ctrl(struct v4l2_ctrl *ctrl) 
		pm_runtime_put(imx334->dev);



		break;

	case V4L2_CID_PIXEL_RATE:

	case V4L2_CID_LINK_FREQ:

	case V4L2_CID_HBLANK:

		ret = 0;

		break;
@@ -885,7 +900,17 @@ static int imx334_init_pad_cfg(struct v4l2_subdev *sd, 
	struct v4l2_subdev_format fmt = { 0 };



	fmt.which = sd_state ? V4L2_SUBDEV_FORMAT_TRY : V4L2_SUBDEV_FORMAT_ACTIVE;

	imx334_fill_pad_format(imx334, &supported_modes[0], &fmt);



	mutex_lock(&imx334->mutex);



	imx334_fill_pad_format(imx334, imx334->cur_mode, &fmt);



	__v4l2_ctrl_modify_range(imx334->link_freq_ctrl, 0,

				 __fls(imx334->menu_skip_mask),

				 ~(imx334->menu_skip_mask),

				 __ffs(imx334->menu_skip_mask));



	mutex_unlock(&imx334->mutex);



	return imx334_set_pad_format(sd, sd_state, &fmt);

}
@@ -1046,8 +1071,8 @@ static int imx334_parse_hw_config(struct imx334 *imx334) 
	};

	struct fwnode_handle *ep;

	unsigned long rate;

	unsigned int i, j;

	int ret;

	int i;



	if (!fwnode)

		return -ENXIO;
@@ -1097,11 +1122,20 @@ static int imx334_parse_hw_config(struct imx334 *imx334) 
		goto done_endpoint_free;

	}



	for (i = 0; i < bus_cfg.nr_of_link_frequencies; i++)

		if (bus_cfg.link_frequencies[i] == IMX334_LINK_FREQ)

			goto done_endpoint_free;

	for (i = 0; i < bus_cfg.nr_of_link_frequencies; i++) {

		for (j = 0; j < ARRAY_SIZE(link_freq); j++) {

			if (bus_cfg.link_frequencies[i] == link_freq[j]) {

				set_bit(j, &imx334->menu_skip_mask);

				break;

			}

		}



	ret = -EINVAL;

		if (j == ARRAY_SIZE(link_freq)) {

			ret = dev_err_probe(imx334->dev, -EINVAL,

					    "no supported link freq found\n");

			goto done_endpoint_free;

		}

	}



done_endpoint_free:

	v4l2_fwnode_endpoint_free(&bus_cfg);
@@ -1232,10 +1266,10 @@ static int imx334_init_controls(struct imx334 *imx334) 
	imx334->link_freq_ctrl = v4l2_ctrl_new_int_menu(ctrl_hdlr,

							&imx334_ctrl_ops,

							V4L2_CID_LINK_FREQ,

							ARRAY_SIZE(link_freq) -

							1,

							mode->link_freq_idx,

							__fls(imx334->menu_skip_mask),

							__ffs(imx334->menu_skip_mask),

							link_freq);



	if (imx334->link_freq_ctrl)

		imx334->link_freq_ctrl->flags |= V4L2_CTRL_FLAG_READ_ONLY;
@@ -1302,7 +1336,7 @@ static int imx334_probe(struct i2c_client *client) 
	}



	/* Set default mode to max resolution */

	imx334->cur_mode = &supported_modes[0];

	imx334->cur_mode = &supported_modes[__ffs(imx334->menu_skip_mask)];

	imx334->cur_code = imx334_mbus_codes[0];

	imx334->vblank = imx334->cur_mode->vblank;