Skip to content

Allow IMX477 and IMX296 to be always on, to simplify multi-camera sync #5774

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Dec 17, 2023
Merged

Allow IMX477 and IMX296 to be always on, to simplify multi-camera sync #5774

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4753721
drivers: media: i2c: imx296,imx477: Configure tigger_mode every time
njhollinghurst Dec 6, 2023
d868adf
overlays: Add "always-on" parameter to imx477 and imx296
njhollinghurst Dec 6, 2023
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
6 changes: 6 additions & 0 deletions arch/arm/boot/dts/overlays/README
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2514,6 +2514,8 @@ Params: rotation Mounting rotation of the camera sensor (0 or
clock-frequency Sets the clock frequency to match that used on
the board, which should be one of 54000000
(the default), 37125000 or 74250000.
always-on Leave the regulator powered up, to stop the
camera clamping I/Os such as XTRIG to 0V.


Name: imx327
Expand Down Expand Up @@ -2552,6 +2554,8 @@ Params: rotation Mounting rotation of the camera sensor (0 or
configuring the sensor (default on)
cam0 Adopt the default configuration for CAM0 on a
Compute Module (CSI0, i2c_vc, and cam0_reg).
always-on Leave the regulator powered up, to stop the
camera clamping I/Os such as XVS to 0V.


Name: imx462
Expand Down Expand Up @@ -2590,6 +2594,8 @@ Params: rotation Mounting rotation of the camera sensor (0 or
configuring the sensor (default on)
cam0 Adopt the default configuration for CAM0 on a
Compute Module (CSI0, i2c_vc, and cam0_reg).
always-on Leave the regulator powered up, to stop the
camera clamping I/Os such as XVS to 0V.


Name: imx519
Expand Down
9 changes: 9 additions & 0 deletions arch/arm/boot/dts/overlays/imx296-overlay.dts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,13 @@
};
};

reg_alwayson_frag: fragment@99 {
target = <&cam1_reg>;
__dormant__ {
regulator-always-on;
};
};

i2c_frag: fragment@100 {
target = <&i2c_csi_dsi>;
__overlay__ {
Expand Down Expand Up @@ -98,8 +105,10 @@
<&csi_frag>, "target:0=",<&csi0>,
<&clk_frag>, "target:0=",<&cam0_clk>,
<&reg_frag>, "target:0=",<&cam0_reg>,
<&reg_alwayson_frag>, "target:0=",<&cam0_reg>,
<&imx296>, "clocks:0=",<&cam0_clk>,
<&imx296>, "avdd-supply:0=",<&cam0_reg>;
clock-frequency = <&clk_over>, "clock-frequency:0";
always-on = <0>, "+99";
};
};
9 changes: 9 additions & 0 deletions arch/arm/boot/dts/overlays/imx477_378-overlay.dtsi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,13 @@
};
};

reg_alwayson_frag: fragment@99 {
target = <&cam1_reg>;
__dormant__ {
regulator-always-on;
};
};

i2c_frag: fragment@100 {
target = <&i2c_csi_dsi>;
__overlay__ {
Expand Down Expand Up @@ -69,8 +76,10 @@
<&csi_frag>, "target:0=",<&csi0>,
<&clk_frag>, "target:0=",<&cam0_clk>,
<&reg_frag>, "target:0=",<&cam0_reg>,
<&reg_alwayson_frag>, "target:0=",<&cam0_reg>,
<&cam_node>, "clocks:0=",<&cam0_clk>,
<&cam_node>, "VANA-supply:0=",<&cam0_reg>;
always-on = <0>, "+99";
};
};

Expand Down
9 changes: 5 additions & 4 deletions drivers/media/i2c/imx296.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -650,10 +650,11 @@ static int imx296_stream_on(struct imx296 *sensor)
imx296_write(sensor, IMX296_CTRL00, 0, &ret);
usleep_range(2000, 5000);

if (trigger_mode == 1) {
imx296_write(sensor, IMX296_CTRL0B, IMX296_CTRL0B_TRIGEN, &ret);
imx296_write(sensor, IMX296_LOWLAGTRG, IMX296_LOWLAGTRG_FAST, &ret);
}
/* external trigger mode: 0=normal, 1=triggered */
imx296_write(sensor, IMX296_CTRL0B,
(trigger_mode == 1) ? IMX296_CTRL0B_TRIGEN : 0, &ret);
imx296_write(sensor, IMX296_LOWLAGTRG,
(trigger_mode == 1) ? IMX296_LOWLAGTRG_FAST : 0, &ret);

imx296_write(sensor, IMX296_CTRL0A, 0, &ret);

Expand Down
29 changes: 14 additions & 15 deletions drivers/media/i2c/imx477.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1742,26 +1742,21 @@ static int imx477_start_streaming(struct imx477 *imx477)
imx477_write_reg(imx477, 0x0b05, IMX477_REG_VALUE_08BIT, !!dpc_enable);
imx477_write_reg(imx477, 0x0b06, IMX477_REG_VALUE_08BIT, !!dpc_enable);

/* Set vsync trigger mode */
if (trigger_mode != 0) {
/* trigger_mode == 1 for source, 2 for sink */
const u32 val = (trigger_mode == 1) ? 1 : 0;

imx477_write_reg(imx477, IMX477_REG_MC_MODE,
IMX477_REG_VALUE_08BIT, 1);
imx477_write_reg(imx477, IMX477_REG_MS_SEL,
IMX477_REG_VALUE_08BIT, val);
imx477_write_reg(imx477, IMX477_REG_XVS_IO_CTRL,
IMX477_REG_VALUE_08BIT, val);
imx477_write_reg(imx477, IMX477_REG_EXTOUT_EN,
IMX477_REG_VALUE_08BIT, val);
}

/* Apply customized values from user */
ret = __v4l2_ctrl_handler_setup(imx477->sd.ctrl_handler);
if (ret)
return ret;

/* Set vsync trigger mode: 0=standalone, 1=source, 2=sink */
imx477_write_reg(imx477, IMX477_REG_MC_MODE,
IMX477_REG_VALUE_08BIT, (trigger_mode > 0) ? 1 : 0);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

All the ? 1 : 0s look unnecessary, but they may be acceptable

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It (almost) matches the previous style, but can be removed.

imx477_write_reg(imx477, IMX477_REG_MS_SEL,
IMX477_REG_VALUE_08BIT, (trigger_mode <= 1) ? 1 : 0);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is the '<=' a typo? It doesn't fit the pattern of IMX477_REG_XVS_IO_CTRL and IMX477_REG_EXTOUT_EN, but if trigger_mode is guaranteed to only be 1 or 2 then the behaviour is the same.

Copy link
Contributor Author

@njhollinghurst njhollinghurst Dec 6, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It is to get the correct state for trigger mode 0. We want it to match the reset state (the Software Reference Manual p137 mentions only "default" which I guess is the same thing: values 0,1,0,0 respectively. The doc doesn't explain the difference between MS_SEL and EXTOUT_EN but from the names it sounds reasonable. It might be that they are ignored when MC_MODE==0).

imx477_write_reg(imx477, IMX477_REG_XVS_IO_CTRL,
IMX477_REG_VALUE_08BIT, (trigger_mode == 1) ? 1 : 0);
imx477_write_reg(imx477, IMX477_REG_EXTOUT_EN,
IMX477_REG_VALUE_08BIT, (trigger_mode == 1) ? 1 : 0);

/* set stream on register */
return imx477_write_reg(imx477, IMX477_REG_MODE_SELECT,
IMX477_REG_VALUE_08BIT, IMX477_MODE_STREAMING);
Expand All @@ -1778,6 +1773,10 @@ static void imx477_stop_streaming(struct imx477 *imx477)
IMX477_REG_VALUE_08BIT, IMX477_MODE_STANDBY);
if (ret)
dev_err(&client->dev, "%s failed to set stream\n", __func__);

/* Stop driving XVS out (there is still a weak pull-up) */
imx477_write_reg(imx477, IMX477_REG_EXTOUT_EN,
IMX477_REG_VALUE_08BIT, 0);
}

static int imx477_set_stream(struct v4l2_subdev *sd, int enable)
Expand Down