[PATCH v2 0/5] media: i2c: imx415: driver improvements and fixes

[PATCH v2 0/5] media: i2c: imx415: driver improvements and fixes

[Alexander Shiyan]

Hi folks,

This series is a rebased and improved version of the patches I sent almost
a year ago [1].
All patches have been rebased onto the latest kernel tree, commit messages
have been rewritten, and two additional fixes have been added.

Changes since v1:
- Drop patch "media: i2c: imx415: Add get_mbus_config() pad operation support".
- Reword commit messages.
- Add Fixes tag where appropriate.
- Collect Reviewed-by and Tested-by tags from the original discussion.
- Add two new patches:
  - Fix control handler initial count.
  - Cluster horizontal and vertical flip controls.

Alexander Shiyan (5):
  media: i2c: imx415: Add missing ADBIT1 register for 10/12-bit output
  media: i2c: imx415: Add missing CSI-2 timing configurations for all
    lane rates
  media: i2c: imx415: Add missing 4-lane CSI-2 timing configurations
  media: i2c: imx415: Fix control handler initial count
  media: i2c: imx415: Cluster horizontal and vertical flip controls

 drivers/media/i2c/imx415.c | 153 ++++++++++++++++++++++++++++++++-----
 1 file changed, 133 insertions(+), 20 deletions(-)

[1] https://patchwork.kernel.org/project/linux-media/cover/20250219094637.607615-1-eagle.alexander923@gmail.com/

-- 
2.52.0

[PATCH v2 1/5] media: i2c: imx415: Add missing ADBIT1 register for 10/12-bit output

[Alexander Shiyan]

Add the missing ADBIT1 register definition (0x3701) and initialise it
to 0 in the init sequence.
Set both ADBIT (0x3031) and ADBIT1 to the same value to comply with
the datasheet (Operating mode table, page 48): 0 for 10-bit mode,
1 for 12-bit mode.

Fixes: 14cd15e7a1e2 ("media: i2c: add imx415 cmos image sensor driver")
Reviewed-by: Michael Riesch <michael.riesch@wolfvision.net>
Reviewed-by: Gerald Loacker <gerald.loacker@wolfvision.net>
Tested-by: Gerald Loacker <gerald.loacker@wolfvision.net>
Signed-off-by: Alexander Shiyan <eagle.alexander923@gmail.com>
---
 drivers/media/i2c/imx415.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/drivers/media/i2c/imx415.c b/drivers/media/i2c/imx415.c
index 0b424c17e880..507a8c557ff1 100644
--- a/drivers/media/i2c/imx415.c
+++ b/drivers/media/i2c/imx415.c
@@ -77,6 +77,7 @@
 #define IMX415_INCKSEL5		  CCI_REG8(0x311e)
 #define IMX415_DIG_CLP_MODE	  CCI_REG8(0x32c8)
 #define IMX415_WRJ_OPEN		  CCI_REG8(0x3390)
+#define IMX415_ADBIT1		  CCI_REG8(0x3701)
 #define IMX415_SENSOR_INFO	  CCI_REG16_LE(0x3f12)
 #define IMX415_SENSOR_INFO_MASK	  0xfff
 #define IMX415_CHIP_ID		  0x514
@@ -581,6 +582,7 @@ static const struct cci_reg_sequence imx415_init_table[] = {
 	{ IMX415_REVERSE, 0x00 },
 	/* use RAW 10-bit mode */
 	{ IMX415_ADBIT, 0x00 },
+	{ IMX415_ADBIT1, 0x00 },
 	{ IMX415_MDBIT, 0x00 },
 	/* output VSYNC on XVS and low on XHS */
 	{ IMX415_OUTSEL, 0x22 },
-- 
2.52.0

[PATCH v2 2/5] media: i2c: imx415: Add missing CSI-2 timing configurations for all lane rates

[Alexander Shiyan]

Add CSI-2 timing register configurations for lane rates 594 Mbps,
891 Mbps, 1782 Mbps, and 2079 Mbps.
Extend link_freq_menu_items to include these rates.
Reorder the existing mode entries in supported_modes[] to follow
ascending lane rate order.
These configurations are valid for both 2-lane and 4-lane operation
according to the datasheet.

Reviewed-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
Signed-off-by: Alexander Shiyan <eagle.alexander923@gmail.com>
---
 drivers/media/i2c/imx415.c | 97 +++++++++++++++++++++++++++++++-------
 1 file changed, 80 insertions(+), 17 deletions(-)

diff --git a/drivers/media/i2c/imx415.c b/drivers/media/i2c/imx415.c
index 507a8c557ff1..b44d685360c1 100644
--- a/drivers/media/i2c/imx415.c
+++ b/drivers/media/i2c/imx415.c
@@ -109,8 +109,8 @@ static const char *const imx415_supply_names[] = {
  * and converts them to link frequencies by a factor of two when needed.
  */
 static const s64 link_freq_menu_items[] = {
-	594000000 / 2,	720000000 / 2,	891000000 / 2,
-	1440000000 / 2, 1485000000 / 2,
+	594000000 / 2,	720000000 / 2,	891000000 / 2,	1440000000 / 2,
+	1485000000 / 2,	1782000000 / 2,	2079000000 / 2,	2376000000 / 2,
 };
 
 struct imx415_clk_params {
@@ -453,6 +453,19 @@ static const struct imx415_clk_params imx415_clk_params[] = {
 	},
 };
 
+/* 594 Mbps CSI configuration */
+static const struct cci_reg_sequence imx415_linkrate_594mbps[] = {
+	{ IMX415_TCLKPOST, 0x0067 },
+	{ IMX415_TCLKPREPARE, 0x0027 },
+	{ IMX415_TCLKTRAIL, 0x0027 },
+	{ IMX415_TCLKZERO, 0x00B7 },
+	{ IMX415_THSPREPARE, 0x002F },
+	{ IMX415_THSZERO, 0x004F },
+	{ IMX415_THSTRAIL, 0x002F },
+	{ IMX415_THSEXIT, 0x0047 },
+	{ IMX415_TLPX, 0x0027 },
+};
+
 /* 720 Mbps CSI configuration */
 static const struct cci_reg_sequence imx415_linkrate_720mbps[] = {
 	{ IMX415_TCLKPOST, 0x006F },
@@ -466,6 +479,19 @@ static const struct cci_reg_sequence imx415_linkrate_720mbps[] = {
 	{ IMX415_TLPX, 0x0027 },
 };
 
+/* 891 Mbps CSI configuration */
+static const struct cci_reg_sequence imx415_linkrate_891mbps[] = {
+	{ IMX415_TCLKPOST, 0x007F },
+	{ IMX415_TCLKPREPARE, 0x0037 },
+	{ IMX415_TCLKTRAIL, 0x0037 },
+	{ IMX415_TCLKZERO, 0x00F7 },
+	{ IMX415_THSPREPARE, 0x003F },
+	{ IMX415_THSZERO, 0x006F },
+	{ IMX415_THSTRAIL, 0x003F },
+	{ IMX415_THSEXIT, 0x005F },
+	{ IMX415_TLPX, 0x002F },
+};
+
 /* 1440 Mbps CSI configuration */
 static const struct cci_reg_sequence imx415_linkrate_1440mbps[] = {
 	{ IMX415_TCLKPOST, 0x009F },
@@ -479,17 +505,30 @@ static const struct cci_reg_sequence imx415_linkrate_1440mbps[] = {
 	{ IMX415_TLPX, 0x004F },
 };
 
-/* 891 Mbps CSI configuration */
-static const struct cci_reg_sequence imx415_linkrate_891mbps[] = {
-	{ IMX415_TCLKPOST, 0x007F },
-	{ IMX415_TCLKPREPARE, 0x0037 },
-	{ IMX415_TCLKTRAIL, 0x0037 },
-	{ IMX415_TCLKZERO, 0x00F7 },
-	{ IMX415_THSPREPARE, 0x003F },
-	{ IMX415_THSZERO, 0x006F },
-	{ IMX415_THSTRAIL, 0x003F },
-	{ IMX415_THSEXIT, 0x005F },
-	{ IMX415_TLPX, 0x002F },
+/* 1782 Mbps CSI configuration */
+static const struct cci_reg_sequence imx415_linkrate_1782mbps[] = {
+	{ IMX415_TCLKPOST, 0x00B7 },
+	{ IMX415_TCLKPREPARE, 0x0067 },
+	{ IMX415_TCLKTRAIL, 0x006F },
+	{ IMX415_TCLKZERO, 0x01DF },
+	{ IMX415_THSPREPARE, 0x006F },
+	{ IMX415_THSZERO, 0x00CF },
+	{ IMX415_THSTRAIL, 0x006F },
+	{ IMX415_THSEXIT, 0x00B7 },
+	{ IMX415_TLPX, 0x005F },
+};
+
+/* 2079 Mbps CSI configuration */
+static const struct cci_reg_sequence imx415_linkrate_2079mbps[] = {
+	{ IMX415_TCLKPOST, 0x00D7 },
+	{ IMX415_TCLKPREPARE, 0x007F },
+	{ IMX415_TCLKTRAIL, 0x007F },
+	{ IMX415_TCLKZERO, 0x0237 },
+	{ IMX415_THSPREPARE, 0x0087 },
+	{ IMX415_THSZERO, 0x00EF },
+	{ IMX415_THSTRAIL, 0x0087 },
+	{ IMX415_THSEXIT, 0x00DF },
+	{ IMX415_TLPX, 0x006F },
 };
 
 struct imx415_mode_reg_list {
@@ -505,6 +544,14 @@ struct imx415_mode {
 
 /* mode configs */
 static const struct imx415_mode supported_modes[] = {
+	{
+		.lane_rate = 594000000,
+		.hmax_min = { 3300, 1320 },
+		.reg_list = {
+			.num_of_regs = ARRAY_SIZE(imx415_linkrate_594mbps),
+			.regs = imx415_linkrate_594mbps,
+		},
+	},
 	{
 		.lane_rate = 720000000,
 		.hmax_min = { 2032, 1066 },
@@ -513,6 +560,14 @@ static const struct imx415_mode supported_modes[] = {
 			.regs = imx415_linkrate_720mbps,
 		},
 	},
+	{
+		.lane_rate = 891000000,
+		.hmax_min = { 2200, 1100 },
+		.reg_list = {
+			.num_of_regs = ARRAY_SIZE(imx415_linkrate_891mbps),
+			.regs = imx415_linkrate_891mbps,
+		},
+	},
 	{
 		.lane_rate = 1440000000,
 		.hmax_min = { 1066, 533 },
@@ -522,11 +577,19 @@ static const struct imx415_mode supported_modes[] = {
 		},
 	},
 	{
-		.lane_rate = 891000000,
-		.hmax_min = { 2200, 1100 },
+		.lane_rate = 1782000000,
+		.hmax_min = { 1100, 550 },
 		.reg_list = {
-			.num_of_regs = ARRAY_SIZE(imx415_linkrate_891mbps),
-			.regs = imx415_linkrate_891mbps,
+			.num_of_regs = ARRAY_SIZE(imx415_linkrate_1782mbps),
+			.regs = imx415_linkrate_1782mbps,
+		},
+	},
+	{
+		.lane_rate = 2079000000,
+		.hmax_min = { 1100, 550 },
+		.reg_list = {
+			.num_of_regs = ARRAY_SIZE(imx415_linkrate_2079mbps),
+			.regs = imx415_linkrate_2079mbps,
 		},
 	},
 };
-- 
2.52.0

[PATCH v2 3/5] media: i2c: imx415: Add missing 4-lane CSI-2 timing configurations

[Alexander Shiyan]

Add CSI-2 timing configurations for lane rates 1485 Mbps and 2376 Mbps.
Mark configurations that are valid only for 4-lane mode by setting the
first element of hmax_min[] to zero.
Use the zero value in hmax_min[0] together with
sensor->num_data_lanes == 2 to skip unsuitable configurations during
mode selection.
This change enables proper operation for all supported lane rates in
both 2-lane and 4-lane modes.

Reviewed-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
Signed-off-by: Alexander Shiyan <eagle.alexander923@gmail.com>
---
 drivers/media/i2c/imx415.c | 45 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 45 insertions(+)

diff --git a/drivers/media/i2c/imx415.c b/drivers/media/i2c/imx415.c
index b44d685360c1..b305adec30ce 100644
--- a/drivers/media/i2c/imx415.c
+++ b/drivers/media/i2c/imx415.c
@@ -505,6 +505,19 @@ static const struct cci_reg_sequence imx415_linkrate_1440mbps[] = {
 	{ IMX415_TLPX, 0x004F },
 };
 
+/* 1485 Mbps CSI configuration */
+static const struct cci_reg_sequence imx415_linkrate_1485mbps[] = {
+	{ IMX415_TCLKPOST, 0x00A7 },
+	{ IMX415_TCLKPREPARE, 0x0057 },
+	{ IMX415_TCLKTRAIL, 0x005F },
+	{ IMX415_TCLKZERO, 0x0197 },
+	{ IMX415_THSPREPARE, 0x005F },
+	{ IMX415_THSZERO, 0x00AF },
+	{ IMX415_THSTRAIL, 0x005F },
+	{ IMX415_THSEXIT, 0x009F },
+	{ IMX415_TLPX, 0x004F },
+};
+
 /* 1782 Mbps CSI configuration */
 static const struct cci_reg_sequence imx415_linkrate_1782mbps[] = {
 	{ IMX415_TCLKPOST, 0x00B7 },
@@ -531,6 +544,19 @@ static const struct cci_reg_sequence imx415_linkrate_2079mbps[] = {
 	{ IMX415_TLPX, 0x006F },
 };
 
+/* 2376 Mbps CSI configuration */
+static const struct cci_reg_sequence imx415_linkrate_2376mbps[] = {
+	{ IMX415_TCLKPOST, 0x00E7 },
+	{ IMX415_TCLKPREPARE, 0x008F },
+	{ IMX415_TCLKTRAIL, 0x008F },
+	{ IMX415_TCLKZERO, 0x027F },
+	{ IMX415_THSPREPARE, 0x0097 },
+	{ IMX415_THSZERO, 0x010F },
+	{ IMX415_THSTRAIL, 0x0097 },
+	{ IMX415_THSEXIT, 0x00F7 },
+	{ IMX415_TLPX, 0x007F },
+};
+
 struct imx415_mode_reg_list {
 	u32 num_of_regs;
 	const struct cci_reg_sequence *regs;
@@ -576,6 +602,14 @@ static const struct imx415_mode supported_modes[] = {
 			.regs = imx415_linkrate_1440mbps,
 		},
 	},
+	{
+		.lane_rate = 1485000000,
+		.hmax_min = { 0, 550 },
+		.reg_list = {
+			.num_of_regs = ARRAY_SIZE(imx415_linkrate_1485mbps),
+			.regs = imx415_linkrate_1485mbps,
+		},
+	},
 	{
 		.lane_rate = 1782000000,
 		.hmax_min = { 1100, 550 },
@@ -592,6 +626,14 @@ static const struct imx415_mode supported_modes[] = {
 			.regs = imx415_linkrate_2079mbps,
 		},
 	},
+	{
+		.lane_rate = 2376000000,
+		.hmax_min = { 0, 366 },
+		.reg_list = {
+			.num_of_regs = ARRAY_SIZE(imx415_linkrate_2376mbps),
+			.regs = imx415_linkrate_2376mbps,
+		},
+	},
 };
 
 static const char *const imx415_test_pattern_menu[] = {
@@ -1364,6 +1406,9 @@ static int imx415_parse_hw_config(struct imx415 *sensor)
 			if (bus_cfg.link_frequencies[i] * 2 !=
 			    supported_modes[j].lane_rate)
 				continue;
+			if (!supported_modes[j].hmax_min[0] &&
+			    sensor->num_data_lanes == 2)
+				continue;
 			sensor->cur_mode = j;
 			break;
 		}
-- 
2.52.0

[PATCH v2 4/5] media: i2c: imx415: Fix control handler initial count

[Alexander Shiyan]

Replace the initial control count of 10 with 9 + 2 to correctly
account for the two controls added by v4l2_ctrl_new_fwnode_properties()
(orientation and rotation).
The driver currently adds nine explicit controls plus up to two
fwnode-based controls, totalling 11. Using a value of 10 in
v4l2_ctrl_handler_init() may cause the control handler to run out
of preallocated storage, leading to memory corruption when the 11th
control is added.

Fixes: 14cd15e7a1e2 ("media: i2c: add imx415 cmos image sensor driver")
Signed-off-by: Alexander Shiyan <eagle.alexander923@gmail.com>
---
 drivers/media/i2c/imx415.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/media/i2c/imx415.c b/drivers/media/i2c/imx415.c
index b305adec30ce..ec0239ccf5fc 100644
--- a/drivers/media/i2c/imx415.c
+++ b/drivers/media/i2c/imx415.c
@@ -897,7 +897,7 @@ static int imx415_ctrls_init(struct imx415 *sensor)
 	if (ret < 0)
 		return ret;
 
-	v4l2_ctrl_handler_init(&sensor->ctrls, 10);
+	v4l2_ctrl_handler_init(&sensor->ctrls, 9 + 2);
 
 	for (i = 0; i < ARRAY_SIZE(link_freq_menu_items); ++i) {
 		if (lane_rate == link_freq_menu_items[i] * 2)
-- 
2.52.0

[PATCH v2 5/5] media: i2c: imx415: Cluster horizontal and vertical flip controls

[Alexander Shiyan]

Wrap the hflip and vflip control pointers in an anonymous struct
and add a v4l2_ctrl_cluster(2, &sensor->hflip) call.
Clustering ensures that both controls are handled together by the
control framework, which is appropriate because changing one flip
setting does not invalidate the other, but they may need to be
applied atomically. This also prevents potential inconsistencies
when the control handler updates them.

Signed-off-by: Alexander Shiyan <eagle.alexander923@gmail.com>
---
 drivers/media/i2c/imx415.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/drivers/media/i2c/imx415.c b/drivers/media/i2c/imx415.c
index ec0239ccf5fc..d72d2cd2fd6d 100644
--- a/drivers/media/i2c/imx415.c
+++ b/drivers/media/i2c/imx415.c
@@ -668,8 +668,10 @@ struct imx415 {
 	struct v4l2_ctrl_handler ctrls;
 	struct v4l2_ctrl *vblank;
 	struct v4l2_ctrl *hblank;
-	struct v4l2_ctrl *hflip;
-	struct v4l2_ctrl *vflip;
+	struct {
+		struct v4l2_ctrl *hflip;
+		struct v4l2_ctrl *vflip;
+	};
 	struct v4l2_ctrl *exposure;
 
 	unsigned int cur_mode;
@@ -949,6 +951,7 @@ static int imx415_ctrls_init(struct imx415 *sensor)
 					  V4L2_CID_HFLIP, 0, 1, 1, 0);
 	sensor->vflip = v4l2_ctrl_new_std(&sensor->ctrls, &imx415_ctrl_ops,
 					  V4L2_CID_VFLIP, 0, 1, 1, 0);
+	v4l2_ctrl_cluster(2, &sensor->hflip);
 
 	v4l2_ctrl_new_std_menu_items(&sensor->ctrls, &imx415_ctrl_ops,
 				     V4L2_CID_TEST_PATTERN,
-- 
2.52.0

Re: [PATCH v2 0/5] media: i2c: imx415: driver improvements and fixes

[Michael Riesch]

Hi Alexander,

On 4/10/26 08:19, Alexander Shiyan wrote:
> Hi folks,
> 
> This series is a rebased and improved version of the patches I sent almost
> a year ago [1].
> All patches have been rebased onto the latest kernel tree, commit messages
> have been rewritten, and two additional fixes have been added.
> 
> Changes since v1:
> - Drop patch "media: i2c: imx415: Add get_mbus_config() pad operation support".
> - Reword commit messages.
> - Add Fixes tag where appropriate.
> - Collect Reviewed-by and Tested-by tags from the original discussion.
> - Add two new patches:
>   - Fix control handler initial count.
>   - Cluster horizontal and vertical flip controls.
> 
> Alexander Shiyan (5):
>   media: i2c: imx415: Add missing ADBIT1 register for 10/12-bit output
>   media: i2c: imx415: Add missing CSI-2 timing configurations for all
>     lane rates
>   media: i2c: imx415: Add missing 4-lane CSI-2 timing configurations
>   media: i2c: imx415: Fix control handler initial count
>   media: i2c: imx415: Cluster horizontal and vertical flip controls
> 
>  drivers/media/i2c/imx415.c | 153 ++++++++++++++++++++++++++++++++-----
>  1 file changed, 133 insertions(+), 20 deletions(-)
> 
> [1] https://patchwork.kernel.org/project/linux-media/cover/20250219094637.607615-1-eagle.alexander923@gmail.com/
> 

Thanks for your work. For the complete series:

Reviewed-by: Michael Riesch <michael.riesch@collabora.com>

(Please make sure to avoid multiple R-b tags in the first commit, which
I reviewed with my old WolfVision e-mail address.)

Best regards,
Michael