From 9fd68e6092b0e772f0079e97915ea57becaf0570 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Tue, 29 Apr 2025 15:38:06 +0100 Subject: [PATCH 1/2] media: i2c: imx296: Add OF option for vsync sink for XTRIG Copying our downstream patch for imx477 that allows configuration of external synchronisation signals via DT, add the same to imx296. Signed-off-by: Dave Stevenson --- drivers/media/i2c/imx296.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/drivers/media/i2c/imx296.c b/drivers/media/i2c/imx296.c index 7f5c198f28c0c9..fd4d53e076f4dc 100644 --- a/drivers/media/i2c/imx296.c +++ b/drivers/media/i2c/imx296.c @@ -205,6 +205,7 @@ struct imx296 { const struct imx296_clk_params *clk_params; bool mono; + int trigger_mode_of; struct v4l2_subdev subdev; struct media_pad pad; @@ -645,16 +646,17 @@ static int imx296_setup(struct imx296 *sensor, struct v4l2_subdev_state *state) static int imx296_stream_on(struct imx296 *sensor) { - int ret = 0; + int ret = 0, tm; imx296_write(sensor, IMX296_CTRL00, 0, &ret); usleep_range(2000, 5000); /* external trigger mode: 0=normal, 1=triggered */ + tm = (sensor->trigger_mode_of >= 0) ? sensor->trigger_mode_of : trigger_mode; imx296_write(sensor, IMX296_CTRL0B, - (trigger_mode == 1) ? IMX296_CTRL0B_TRIGEN : 0, &ret); + (tm == 1) ? IMX296_CTRL0B_TRIGEN : 0, &ret); imx296_write(sensor, IMX296_LOWLAGTRG, - (trigger_mode == 1) ? IMX296_LOWLAGTRG_FAST : 0, &ret); + (tm == 1) ? IMX296_LOWLAGTRG_FAST : 0, &ret); imx296_write(sensor, IMX296_CTRL0A, 0, &ret); @@ -1079,6 +1081,7 @@ static int imx296_probe(struct i2c_client *client) unsigned long clk_rate; struct imx296 *sensor; unsigned int i; + u32 tm_of; int ret; if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE_DATA)) { @@ -1145,6 +1148,10 @@ static int imx296_probe(struct i2c_client *client) if (ret < 0) goto err_power; + /* Default the trigger mode from OF to -1, which means invalid */ + ret = of_property_read_u32(client->dev.of_node, "trigger-mode", &tm_of); + sensor->trigger_mode_of = (ret == 0) ? tm_of : -1; + /* Initialize the V4L2 subdev. */ ret = imx296_subdev_init(sensor); if (ret < 0) From dcaf09ab467b1264d27bda565f689a9cff63acde Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Tue, 29 Apr 2025 15:40:58 +0100 Subject: [PATCH 2/2] dtoverlays: Add sync configuration option to imx296 overlay Signed-off-by: Dave Stevenson --- arch/arm/boot/dts/overlays/README | 1 + arch/arm/boot/dts/overlays/imx296-overlay.dts | 1 + 2 files changed, 2 insertions(+) diff --git a/arch/arm/boot/dts/overlays/README b/arch/arm/boot/dts/overlays/README index 68cdf8f255b028..02e9d6045122dd 100644 --- a/arch/arm/boot/dts/overlays/README +++ b/arch/arm/boot/dts/overlays/README @@ -2816,6 +2816,7 @@ Params: rotation Mounting rotation of the camera sensor (0 or (the default), 37125000 or 74250000. always-on Leave the regulator powered up, to stop the camera clamping I/Os such as XTRIG to 0V. + sync-sink Configure as synchronisation sink. Name: imx327 diff --git a/arch/arm/boot/dts/overlays/imx296-overlay.dts b/arch/arm/boot/dts/overlays/imx296-overlay.dts index 018beafdfbd74b..b40abb237f6f7b 100644 --- a/arch/arm/boot/dts/overlays/imx296-overlay.dts +++ b/arch/arm/boot/dts/overlays/imx296-overlay.dts @@ -116,5 +116,6 @@ <&imx296>, "avdd-supply:0=",<&cam0_reg>; clock-frequency = <&clk_over>, "clock-frequency:0"; always-on = <0>, "+99"; + sync-sink = <&imx296>,"trigger-mode:0"; }; };