Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions arch/arm/boot/dts/overlays/README
Original file line number Diff line number Diff line change
Expand Up @@ -2873,6 +2873,9 @@ Params: addr Set I2C address of sensor. Valid values are
cam0 Adopt the default configuration for CAM0 on a
Compute Module (CSI0, i2c_vc, and cam0_reg).
vcm Enable ad5398 VCM associated with the sensor.
clk-37125 Alternative to clock-frequency=37125000 and
link-frequency=445500000 for Waveshare modules
with 37.125MHz clock sources.


Name: imx462
Expand Down
2 changes: 2 additions & 0 deletions arch/arm/boot/dts/overlays/imx415-overlay.dts
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,8 @@
<&cam_node>,"lens-focus:0=", <&vcm>;
clock-frequency = <&cam_clk>, "clock-frequency:0";
link-frequency = <&cam_endpoint>,"link-frequencies#0";
clk-37125 = <&cam_endpoint>,"link-frequencies#0=445500000",
<&cam_clk>, "clock-frequency:0=37125000";
4lane = <0>, "+201+202";
};
};
Expand Down
8 changes: 5 additions & 3 deletions drivers/media/i2c/imx415.c
Original file line number Diff line number Diff line change
Expand Up @@ -522,7 +522,7 @@ static const struct imx415_mode supported_modes[] = {
},
{
.lane_rate = 891000000,
.hmax_min = { 1100, 550 },
.hmax_min = { 2200, 1100 },
.reg_list = {
.num_of_regs = ARRAY_SIZE(imx415_linkrate_891mbps),
.regs = imx415_linkrate_891mbps,
Expand Down Expand Up @@ -725,6 +725,7 @@ static int imx415_s_ctrl(struct v4l2_ctrl *ctrl)
* Deliberately fall through as exposure is set based on VMAX
* which has just changed.
*/
ctrl = sensor->exposure;
fallthrough;
case V4L2_CID_EXPOSURE:
/* clamp the exposure value to VMAX. */
Expand Down Expand Up @@ -752,10 +753,11 @@ static int imx415_s_ctrl(struct v4l2_ctrl *ctrl)
break;

case V4L2_CID_HBLANK:
return cci_write(sensor->regmap, IMX415_HMAX,
(format->width + ctrl->val) /
ret = cci_write(sensor->regmap, IMX415_HMAX,
(format->width + ctrl->val) /
IMX415_HMAX_MULTIPLIER,
NULL);
break;

default:
ret = -EINVAL;
Expand Down
Loading