media: imx355: Switch to changing pixel array clock for 2 lane mode

Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>

Author: 6by9

drivers/media/i2c/imx355.c

@@ -913,8 +913,7 @@ imx355_set_pad_format(struct v4l2_subdev *sd,
 		__v4l2_ctrl_modify_range(imx355->vblank, vblank_min, height, 1,
 					 vblank_def);
 		__v4l2_ctrl_s_ctrl(imx355->vblank, vblank_def);
-		h_blank = (imx355->hwcfg->lane_multiplier * mode->llp) -
-							imx355->cur_mode->width;
+		h_blank = mode->llp - imx355->cur_mode->width;
 		/*
 		 * Currently hblank is not changeable.
 		 * So FPS control is done only by vblank.
@@ -1003,6 +1002,10 @@ static int imx355_start_streaming(struct imx355 *imx355)
 			       imx355->clk_params->pll_op_mpy);
 	if (ret)
 		return ret;
+	ret = imx355_write_reg(imx355, 0x0303, 1,
+			       imx355->hwcfg->lane_multiplier);
+	if (ret)
+		return ret;
 
 	/* Set MIPI configuration */
 	ret = imx355_write_reg(imx355, IMX355_REG_LANE_SEL, 1,
@@ -1204,7 +1207,7 @@ static int imx355_init_controls(struct imx355 *imx355)
 		imx355->link_freq->flags |= V4L2_CTRL_FLAG_READ_ONLY;
 
 	/* pixel_rate = link_freq * 2 * nr_of_lanes / bits_per_sample */
-	pixel_rate = IMX355_LINK_FREQ_DEFAULT * 2 * 4;
+	pixel_rate = IMX355_LINK_FREQ_DEFAULT * 2 * imx355->hwcfg->num_lanes;
 	do_div(pixel_rate, 10);
 	/* By default, PIXEL_RATE is read only */
 	imx355->pixel_rate = v4l2_ctrl_new_std(ctrl_hdlr, &imx355_ctrl_ops,
@@ -1220,7 +1223,7 @@ static int imx355_init_controls(struct imx355 *imx355)
 					   IMX355_FLL_MAX - mode->height,
 					   1, vblank_def);
 
-	hblank = imx355->hwcfg->lane_multiplier * mode->llp - mode->width;
+	hblank = mode->llp - mode->width;
 	imx355->hblank = v4l2_ctrl_new_std(ctrl_hdlr, &imx355_ctrl_ops,
 					   V4L2_CID_HBLANK, hblank, hblank,
 					   1, hblank);