aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/bcm27xx/patches-5.15/950-0810-media-i2c-imx258-Make-image-geometry-meet-sensor-req.patch
diff options
context:
space:
mode:
authorÁlvaro Fernández Rojas <noltari@gmail.com>2022-05-16 23:40:32 +0200
committerÁlvaro Fernández Rojas <noltari@gmail.com>2022-05-17 15:11:22 +0200
commit20ea6adbf199097c4f5f591ffee088340630dae4 (patch)
treed6719d95e136611a1c25bbf7789652d6d402779d /target/linux/bcm27xx/patches-5.15/950-0810-media-i2c-imx258-Make-image-geometry-meet-sensor-req.patch
parentbca05bd072180dc38ef740b37ded9572a6db1981 (diff)
downloadupstream-20ea6adbf199097c4f5f591ffee088340630dae4.tar.gz
upstream-20ea6adbf199097c4f5f591ffee088340630dae4.tar.bz2
upstream-20ea6adbf199097c4f5f591ffee088340630dae4.zip
bcm27xx: add support for linux v5.15
Build system: x86_64 Build-tested: bcm2708, bcm2709, bcm2710, bcm2711 Run-tested: bcm2708/RPiB+, bcm2709/RPi3B, bcm2710/RPi3B, bcm2711/RPi4B Signed-off-by: Marty Jones <mj8263788@gmail.com> Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
Diffstat (limited to 'target/linux/bcm27xx/patches-5.15/950-0810-media-i2c-imx258-Make-image-geometry-meet-sensor-req.patch')
-rw-r--r--target/linux/bcm27xx/patches-5.15/950-0810-media-i2c-imx258-Make-image-geometry-meet-sensor-req.patch147
1 files changed, 147 insertions, 0 deletions
diff --git a/target/linux/bcm27xx/patches-5.15/950-0810-media-i2c-imx258-Make-image-geometry-meet-sensor-req.patch b/target/linux/bcm27xx/patches-5.15/950-0810-media-i2c-imx258-Make-image-geometry-meet-sensor-req.patch
new file mode 100644
index 0000000000..07c3e15c95
--- /dev/null
+++ b/target/linux/bcm27xx/patches-5.15/950-0810-media-i2c-imx258-Make-image-geometry-meet-sensor-req.patch
@@ -0,0 +1,147 @@
+From 03c77d0b8ef969c88e00729dbbf488eba081aa7d Mon Sep 17 00:00:00 2001
+From: Dave Stevenson <dave.stevenson@raspberrypi.com>
+Date: Tue, 15 Jun 2021 18:34:38 +0100
+Subject: [PATCH] media: i2c: imx258: Make image geometry meet sensor
+ requirements
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+The output image is defined as being 4208x3118 pixels in size.
+Y_ADD_STA register was set to 0, and Y_ADD_END to 3118, giving
+3119 lines total.
+
+The datasheet lists a requirement for Y_ADD_STA to be a multiple
+of a power of 2 depending on binning/scaling mode (2 for full pixel,
+4 for x2-bin/scale, 8 for (x2-bin)+(x2-subsample) or x4-bin, or 16
+for (x4-bin)+(x2-subsample)).
+(Y_ADD_END – Y_ADD_STA + 1) also has to be a similar power of 2.
+
+The current configuration for the full res modes breaks that second
+requirement, and we can't increase Y_ADD_STA to 1 to retain exactly
+the same field of view as that then breaks the first requirement.
+For the binned modes, they are worse off as 3118 is not a multiple of
+4.
+
+Increase the main mode to 4208x3120 so that it is the same FOV as the
+binned modes, with Y_ADD_STA at 0.
+Fix Y_ADD_STA and Y_ADD_END for the binned modes so that they meet the
+sensor requirements.
+
+This does change the Bayer order as the default configuration is for
+H&V flips to be enabled, so readout is from Y_STA_END to Y_ADD_STA,
+and this patch has changed Y_STA_END.
+
+Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
+---
+ drivers/media/i2c/imx258.c | 26 +++++++++++++-------------
+ 1 file changed, 13 insertions(+), 13 deletions(-)
+
+--- a/drivers/media/i2c/imx258.c
++++ b/drivers/media/i2c/imx258.c
+@@ -110,7 +110,7 @@ struct imx258_mode {
+ struct imx258_reg_list reg_list;
+ };
+
+-/* 4208x3118 needs 1267Mbps/lane, 4 lanes */
++/* 4208x3120 needs 1267Mbps/lane, 4 lanes */
+ static const struct imx258_reg mipi_data_rate_1267mbps[] = {
+ { 0x0301, 0x05 },
+ { 0x0303, 0x02 },
+@@ -147,7 +147,7 @@ static const struct imx258_reg mipi_data
+ { 0x0823, 0x00 },
+ };
+
+-static const struct imx258_reg mode_4208x3118_regs[] = {
++static const struct imx258_reg mode_4208x3120_regs[] = {
+ { 0x0136, 0x13 },
+ { 0x0137, 0x33 },
+ { 0x3051, 0x00 },
+@@ -209,7 +209,7 @@ static const struct imx258_reg mode_4208
+ { 0x0348, 0x10 },
+ { 0x0349, 0x6F },
+ { 0x034A, 0x0C },
+- { 0x034B, 0x2E },
++ { 0x034B, 0x2F },
+ { 0x0381, 0x01 },
+ { 0x0383, 0x01 },
+ { 0x0385, 0x01 },
+@@ -328,7 +328,7 @@ static const struct imx258_reg mode_2104
+ { 0x0348, 0x10 },
+ { 0x0349, 0x6F },
+ { 0x034A, 0x0C },
+- { 0x034B, 0x2E },
++ { 0x034B, 0x2F },
+ { 0x0381, 0x01 },
+ { 0x0383, 0x01 },
+ { 0x0385, 0x01 },
+@@ -447,7 +447,7 @@ static const struct imx258_reg mode_1048
+ { 0x0348, 0x10 },
+ { 0x0349, 0x6F },
+ { 0x034A, 0x0C },
+- { 0x034B, 0x2E },
++ { 0x034B, 0x2F },
+ { 0x0381, 0x01 },
+ { 0x0383, 0x01 },
+ { 0x0385, 0x01 },
+@@ -561,12 +561,12 @@ static const struct imx258_link_freq_con
+ static const struct imx258_mode supported_modes[] = {
+ {
+ .width = 4208,
+- .height = 3118,
++ .height = 3120,
+ .vts_def = IMX258_VTS_30FPS,
+ .vts_min = IMX258_VTS_30FPS,
+ .reg_list = {
+- .num_of_regs = ARRAY_SIZE(mode_4208x3118_regs),
+- .regs = mode_4208x3118_regs,
++ .num_of_regs = ARRAY_SIZE(mode_4208x3120_regs),
++ .regs = mode_4208x3120_regs,
+ },
+ .link_freq_index = IMX258_LINK_FREQ_1267MBPS,
+ },
+@@ -709,7 +709,7 @@ static int imx258_open(struct v4l2_subde
+ /* Initialize try_fmt */
+ try_fmt->width = supported_modes[0].width;
+ try_fmt->height = supported_modes[0].height;
+- try_fmt->code = MEDIA_BUS_FMT_SGRBG10_1X10;
++ try_fmt->code = MEDIA_BUS_FMT_SBGGR10_1X10;
+ try_fmt->field = V4L2_FIELD_NONE;
+
+ return 0;
+@@ -821,7 +821,7 @@ static int imx258_enum_mbus_code(struct
+ if (code->index > 0)
+ return -EINVAL;
+
+- code->code = MEDIA_BUS_FMT_SGRBG10_1X10;
++ code->code = MEDIA_BUS_FMT_SBGGR10_1X10;
+
+ return 0;
+ }
+@@ -833,7 +833,7 @@ static int imx258_enum_frame_size(struct
+ if (fse->index >= ARRAY_SIZE(supported_modes))
+ return -EINVAL;
+
+- if (fse->code != MEDIA_BUS_FMT_SGRBG10_1X10)
++ if (fse->code != MEDIA_BUS_FMT_SBGGR10_1X10)
+ return -EINVAL;
+
+ fse->min_width = supported_modes[fse->index].width;
+@@ -849,7 +849,7 @@ static void imx258_update_pad_format(con
+ {
+ fmt->format.width = mode->width;
+ fmt->format.height = mode->height;
+- fmt->format.code = MEDIA_BUS_FMT_SGRBG10_1X10;
++ fmt->format.code = MEDIA_BUS_FMT_SBGGR10_1X10;
+ fmt->format.field = V4L2_FIELD_NONE;
+ }
+
+@@ -897,7 +897,7 @@ static int imx258_set_pad_format(struct
+ mutex_lock(&imx258->mutex);
+
+ /* Only one raw bayer(GBRG) order is supported */
+- fmt->format.code = MEDIA_BUS_FMT_SGRBG10_1X10;
++ fmt->format.code = MEDIA_BUS_FMT_SBGGR10_1X10;
+
+ mode = v4l2_find_nearest_size(supported_modes,
+ ARRAY_SIZE(supported_modes), width, height,