| Message ID | 20220131143245.128089-8-jacopo@jmondi.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | media: ov5640: Rework the clock tree programming for MIPI | expand |
Hi Jacopo, Thank you for the patch. On Mon, Jan 31, 2022 at 03:32:31PM +0100, Jacopo Mondi wrote: > The current definition of a sensor mode defines timings as follows: > > - hact, vact: Visible width and height > - htot, vtot: Total sizes invluding blankings s/invluding/including/ > This makes difficult to clearly separate the visible sizes from the > blankings and to make the vertical blanking programmable. > > Rework the sensor modes sizes definition to: > - Report the analog crop sizes > - Report the visible crop size > - Report the total pixels per line as HBLANK is fixed > - Report the VBLANK value to make it programmable > > Also modify the ov5640_set_timings() function to program all the > windowing registers are remove them from the per-mode register-value > tables. > > Signed-off-by: Jacopo Mondi <jacopo@jmondi.org> > --- > drivers/media/i2c/ov5640.c | 451 +++++++++++++++++++++++++------------ > 1 file changed, 304 insertions(+), 147 deletions(-) > > diff --git a/drivers/media/i2c/ov5640.c b/drivers/media/i2c/ov5640.c > index acc636500907..bd14e2ad22f6 100644 > --- a/drivers/media/i2c/ov5640.c > +++ b/drivers/media/i2c/ov5640.c > @@ -61,10 +61,16 @@ > #define OV5640_REG_AEC_PK_MANUAL 0x3503 > #define OV5640_REG_AEC_PK_REAL_GAIN 0x350a > #define OV5640_REG_AEC_PK_VTS 0x350c > +#define OV5640_REG_TIMING_HS 0x3800 > +#define OV5640_REG_TIMING_VS 0x3802 > +#define OV5640_REG_TIMING_HW 0x3804 > +#define OV5640_REG_TIMING_VH 0x3806 > #define OV5640_REG_TIMING_DVPHO 0x3808 > #define OV5640_REG_TIMING_DVPVO 0x380a > #define OV5640_REG_TIMING_HTS 0x380c > #define OV5640_REG_TIMING_VTS 0x380e > +#define OV5640_REG_TIMING_HOFFS 0x3810 > +#define OV5640_REG_TIMING_VOFFS 0x3812 > #define OV5640_REG_TIMING_TC_REG20 0x3820 > #define OV5640_REG_TIMING_TC_REG21 0x3821 > #define OV5640_REG_AEC_CTRL00 0x3a00 > @@ -242,12 +248,17 @@ struct ov5640_mode_info { > enum ov5640_mode_id id; > enum ov5640_downsize_mode dn_mode; > enum ov5640_pixel_rate_id pixel_rate; > - u32 hact; > - u32 htot; > - u32 vact; > - u32 vtot; > + /* Analog crop rectangle. */ > + struct v4l2_rect analog_crop; > + /* Visibile crop: from analog crop top-left corner. */ > + struct v4l2_rect crop; > + /* Total pixels per line: crop.width + fixed hblank. */ > + u32 ppl; ppl is a fairly uncommon term when it comes to sensor configuration. I'd rather keep hact, or use a hblank value. > + /* Total frame height = crop.height + vblank. */ > + u32 vblank_def; The comment doesn't seem to match the field. > const struct reg_value *reg_data; > u32 reg_data_size; > + /* DVP only; ignored in MIPI mode. */ > u32 max_fps; > }; > > @@ -353,11 +364,7 @@ static const struct reg_value ov5640_init_setting_30fps_VGA[] = { > {0x3c06, 0x00, 0, 0}, {0x3c07, 0x08, 0, 0}, {0x3c08, 0x00, 0, 0}, > {0x3c09, 0x1c, 0, 0}, {0x3c0a, 0x9c, 0, 0}, {0x3c0b, 0x40, 0, 0}, > {0x3820, 0x41, 0, 0}, {0x3821, 0x07, 0, 0}, {0x3814, 0x31, 0, 0}, > - {0x3815, 0x31, 0, 0}, {0x3800, 0x00, 0, 0}, {0x3801, 0x00, 0, 0}, > - {0x3802, 0x00, 0, 0}, {0x3803, 0x04, 0, 0}, {0x3804, 0x0a, 0, 0}, > - {0x3805, 0x3f, 0, 0}, {0x3806, 0x07, 0, 0}, {0x3807, 0x9b, 0, 0}, > - {0x3810, 0x00, 0, 0}, > - {0x3811, 0x10, 0, 0}, {0x3812, 0x00, 0, 0}, {0x3813, 0x06, 0, 0}, > + {0x3815, 0x31, 0, 0}, > {0x3618, 0x00, 0, 0}, {0x3612, 0x29, 0, 0}, {0x3708, 0x64, 0, 0}, > {0x3709, 0x52, 0, 0}, {0x370c, 0x03, 0, 0}, {0x3a02, 0x03, 0, 0}, > {0x3a03, 0xd8, 0, 0}, {0x3a08, 0x01, 0, 0}, {0x3a09, 0x27, 0, 0}, > @@ -425,11 +432,7 @@ static const struct reg_value ov5640_setting_VGA_640_480[] = { > {0x3c07, 0x08, 0, 0}, > {0x3c09, 0x1c, 0, 0}, {0x3c0a, 0x9c, 0, 0}, {0x3c0b, 0x40, 0, 0}, > {0x3814, 0x31, 0, 0}, > - {0x3815, 0x31, 0, 0}, {0x3800, 0x00, 0, 0}, {0x3801, 0x00, 0, 0}, > - {0x3802, 0x00, 0, 0}, {0x3803, 0x04, 0, 0}, {0x3804, 0x0a, 0, 0}, > - {0x3805, 0x3f, 0, 0}, {0x3806, 0x07, 0, 0}, {0x3807, 0x9b, 0, 0}, > - {0x3810, 0x00, 0, 0}, > - {0x3811, 0x10, 0, 0}, {0x3812, 0x00, 0, 0}, {0x3813, 0x06, 0, 0}, > + {0x3815, 0x31, 0, 0}, > {0x3618, 0x00, 0, 0}, {0x3612, 0x29, 0, 0}, {0x3708, 0x64, 0, 0}, > {0x3709, 0x52, 0, 0}, {0x370c, 0x03, 0, 0}, {0x3a02, 0x03, 0, 0}, > {0x3a03, 0xd8, 0, 0}, {0x3a08, 0x01, 0, 0}, {0x3a09, 0x27, 0, 0}, > @@ -444,11 +447,7 @@ static const struct reg_value ov5640_setting_XGA_1024_768[] = { > {0x3c07, 0x08, 0, 0}, > {0x3c09, 0x1c, 0, 0}, {0x3c0a, 0x9c, 0, 0}, {0x3c0b, 0x40, 0, 0}, > {0x3814, 0x31, 0, 0}, > - {0x3815, 0x31, 0, 0}, {0x3800, 0x00, 0, 0}, {0x3801, 0x00, 0, 0}, > - {0x3802, 0x00, 0, 0}, {0x3803, 0x04, 0, 0}, {0x3804, 0x0a, 0, 0}, > - {0x3805, 0x3f, 0, 0}, {0x3806, 0x07, 0, 0}, {0x3807, 0x9b, 0, 0}, > - {0x3810, 0x00, 0, 0}, > - {0x3811, 0x10, 0, 0}, {0x3812, 0x00, 0, 0}, {0x3813, 0x06, 0, 0}, > + {0x3815, 0x31, 0, 0}, > {0x3618, 0x00, 0, 0}, {0x3612, 0x29, 0, 0}, {0x3708, 0x64, 0, 0}, > {0x3709, 0x52, 0, 0}, {0x370c, 0x03, 0, 0}, {0x3a02, 0x03, 0, 0}, > {0x3a03, 0xd8, 0, 0}, {0x3a08, 0x01, 0, 0}, {0x3a09, 0x27, 0, 0}, > @@ -463,11 +462,7 @@ static const struct reg_value ov5640_setting_QVGA_320_240[] = { > {0x3c07, 0x08, 0, 0}, > {0x3c09, 0x1c, 0, 0}, {0x3c0a, 0x9c, 0, 0}, {0x3c0b, 0x40, 0, 0}, > {0x3814, 0x31, 0, 0}, > - {0x3815, 0x31, 0, 0}, {0x3800, 0x00, 0, 0}, {0x3801, 0x00, 0, 0}, > - {0x3802, 0x00, 0, 0}, {0x3803, 0x04, 0, 0}, {0x3804, 0x0a, 0, 0}, > - {0x3805, 0x3f, 0, 0}, {0x3806, 0x07, 0, 0}, {0x3807, 0x9b, 0, 0}, > - {0x3810, 0x00, 0, 0}, > - {0x3811, 0x10, 0, 0}, {0x3812, 0x00, 0, 0}, {0x3813, 0x06, 0, 0}, > + {0x3815, 0x31, 0, 0}, > {0x3618, 0x00, 0, 0}, {0x3612, 0x29, 0, 0}, {0x3708, 0x64, 0, 0}, > {0x3709, 0x52, 0, 0}, {0x370c, 0x03, 0, 0}, {0x3a02, 0x03, 0, 0}, > {0x3a03, 0xd8, 0, 0}, {0x3a08, 0x01, 0, 0}, {0x3a09, 0x27, 0, 0}, > @@ -482,11 +477,7 @@ static const struct reg_value ov5640_setting_QQVGA_160_120[] = { > {0x3c07, 0x08, 0, 0}, > {0x3c09, 0x1c, 0, 0}, {0x3c0a, 0x9c, 0, 0}, {0x3c0b, 0x40, 0, 0}, > {0x3814, 0x31, 0, 0}, > - {0x3815, 0x31, 0, 0}, {0x3800, 0x00, 0, 0}, {0x3801, 0x00, 0, 0}, > - {0x3802, 0x00, 0, 0}, {0x3803, 0x04, 0, 0}, {0x3804, 0x0a, 0, 0}, > - {0x3805, 0x3f, 0, 0}, {0x3806, 0x07, 0, 0}, {0x3807, 0x9b, 0, 0}, > - {0x3810, 0x00, 0, 0}, > - {0x3811, 0x10, 0, 0}, {0x3812, 0x00, 0, 0}, {0x3813, 0x06, 0, 0}, > + {0x3815, 0x31, 0, 0}, > {0x3618, 0x00, 0, 0}, {0x3612, 0x29, 0, 0}, {0x3708, 0x64, 0, 0}, > {0x3709, 0x52, 0, 0}, {0x370c, 0x03, 0, 0}, {0x3a02, 0x03, 0, 0}, > {0x3a03, 0xd8, 0, 0}, {0x3a08, 0x01, 0, 0}, {0x3a09, 0x27, 0, 0}, > @@ -500,11 +491,7 @@ static const struct reg_value ov5640_setting_QCIF_176_144[] = { > {0x3c07, 0x08, 0, 0}, > {0x3c09, 0x1c, 0, 0}, {0x3c0a, 0x9c, 0, 0}, {0x3c0b, 0x40, 0, 0}, > {0x3814, 0x31, 0, 0}, > - {0x3815, 0x31, 0, 0}, {0x3800, 0x00, 0, 0}, {0x3801, 0x00, 0, 0}, > - {0x3802, 0x00, 0, 0}, {0x3803, 0x04, 0, 0}, {0x3804, 0x0a, 0, 0}, > - {0x3805, 0x3f, 0, 0}, {0x3806, 0x07, 0, 0}, {0x3807, 0x9b, 0, 0}, > - {0x3810, 0x00, 0, 0}, > - {0x3811, 0x10, 0, 0}, {0x3812, 0x00, 0, 0}, {0x3813, 0x06, 0, 0}, > + {0x3815, 0x31, 0, 0}, > {0x3618, 0x00, 0, 0}, {0x3612, 0x29, 0, 0}, {0x3708, 0x64, 0, 0}, > {0x3709, 0x52, 0, 0}, {0x370c, 0x03, 0, 0}, {0x3a02, 0x03, 0, 0}, > {0x3a03, 0xd8, 0, 0}, {0x3a08, 0x01, 0, 0}, {0x3a09, 0x27, 0, 0}, > @@ -519,11 +506,7 @@ static const struct reg_value ov5640_setting_NTSC_720_480[] = { > {0x3c07, 0x08, 0, 0}, > {0x3c09, 0x1c, 0, 0}, {0x3c0a, 0x9c, 0, 0}, {0x3c0b, 0x40, 0, 0}, > {0x3814, 0x31, 0, 0}, > - {0x3815, 0x31, 0, 0}, {0x3800, 0x00, 0, 0}, {0x3801, 0x00, 0, 0}, > - {0x3802, 0x00, 0, 0}, {0x3803, 0x04, 0, 0}, {0x3804, 0x0a, 0, 0}, > - {0x3805, 0x3f, 0, 0}, {0x3806, 0x07, 0, 0}, {0x3807, 0x9b, 0, 0}, > - {0x3810, 0x00, 0, 0}, > - {0x3811, 0x10, 0, 0}, {0x3812, 0x00, 0, 0}, {0x3813, 0x3c, 0, 0}, > + {0x3815, 0x31, 0, 0}, > {0x3618, 0x00, 0, 0}, {0x3612, 0x29, 0, 0}, {0x3708, 0x64, 0, 0}, > {0x3709, 0x52, 0, 0}, {0x370c, 0x03, 0, 0}, {0x3a02, 0x03, 0, 0}, > {0x3a03, 0xd8, 0, 0}, {0x3a08, 0x01, 0, 0}, {0x3a09, 0x27, 0, 0}, > @@ -538,11 +521,7 @@ static const struct reg_value ov5640_setting_PAL_720_576[] = { > {0x3c07, 0x08, 0, 0}, > {0x3c09, 0x1c, 0, 0}, {0x3c0a, 0x9c, 0, 0}, {0x3c0b, 0x40, 0, 0}, > {0x3814, 0x31, 0, 0}, > - {0x3815, 0x31, 0, 0}, {0x3800, 0x00, 0, 0}, {0x3801, 0x00, 0, 0}, > - {0x3802, 0x00, 0, 0}, {0x3803, 0x04, 0, 0}, {0x3804, 0x0a, 0, 0}, > - {0x3805, 0x3f, 0, 0}, {0x3806, 0x07, 0, 0}, {0x3807, 0x9b, 0, 0}, > - {0x3810, 0x00, 0, 0}, > - {0x3811, 0x38, 0, 0}, {0x3812, 0x00, 0, 0}, {0x3813, 0x06, 0, 0}, > + {0x3815, 0x31, 0, 0}, > {0x3618, 0x00, 0, 0}, {0x3612, 0x29, 0, 0}, {0x3708, 0x64, 0, 0}, > {0x3709, 0x52, 0, 0}, {0x370c, 0x03, 0, 0}, {0x3a02, 0x03, 0, 0}, > {0x3a03, 0xd8, 0, 0}, {0x3a08, 0x01, 0, 0}, {0x3a09, 0x27, 0, 0}, > @@ -557,11 +536,7 @@ static const struct reg_value ov5640_setting_720P_1280_720[] = { > {0x3c07, 0x07, 0, 0}, > {0x3c09, 0x1c, 0, 0}, {0x3c0a, 0x9c, 0, 0}, {0x3c0b, 0x40, 0, 0}, > {0x3814, 0x31, 0, 0}, > - {0x3815, 0x31, 0, 0}, {0x3800, 0x00, 0, 0}, {0x3801, 0x00, 0, 0}, > - {0x3802, 0x00, 0, 0}, {0x3803, 0xfa, 0, 0}, {0x3804, 0x0a, 0, 0}, > - {0x3805, 0x3f, 0, 0}, {0x3806, 0x06, 0, 0}, {0x3807, 0xa9, 0, 0}, > - {0x3810, 0x00, 0, 0}, > - {0x3811, 0x10, 0, 0}, {0x3812, 0x00, 0, 0}, {0x3813, 0x04, 0, 0}, > + {0x3815, 0x31, 0, 0}, > {0x3618, 0x00, 0, 0}, {0x3612, 0x29, 0, 0}, {0x3708, 0x64, 0, 0}, > {0x3709, 0x52, 0, 0}, {0x370c, 0x03, 0, 0}, {0x3a02, 0x02, 0, 0}, > {0x3a03, 0xe4, 0, 0}, {0x3a08, 0x01, 0, 0}, {0x3a09, 0xbc, 0, 0}, > @@ -576,11 +551,7 @@ static const struct reg_value ov5640_setting_1080P_1920_1080[] = { > {0x3c07, 0x08, 0, 0}, > {0x3c09, 0x1c, 0, 0}, {0x3c0a, 0x9c, 0, 0}, {0x3c0b, 0x40, 0, 0}, > {0x3814, 0x11, 0, 0}, > - {0x3815, 0x11, 0, 0}, {0x3800, 0x00, 0, 0}, {0x3801, 0x00, 0, 0}, > - {0x3802, 0x00, 0, 0}, {0x3803, 0x00, 0, 0}, {0x3804, 0x0a, 0, 0}, > - {0x3805, 0x3f, 0, 0}, {0x3806, 0x07, 0, 0}, {0x3807, 0x9f, 0, 0}, > - {0x3810, 0x00, 0, 0}, > - {0x3811, 0x10, 0, 0}, {0x3812, 0x00, 0, 0}, {0x3813, 0x04, 0, 0}, > + {0x3815, 0x11, 0, 0}, > {0x3618, 0x04, 0, 0}, {0x3612, 0x29, 0, 0}, {0x3708, 0x21, 0, 0}, > {0x3709, 0x12, 0, 0}, {0x370c, 0x00, 0, 0}, {0x3a02, 0x03, 0, 0}, > {0x3a03, 0xd8, 0, 0}, {0x3a08, 0x01, 0, 0}, {0x3a09, 0x27, 0, 0}, > @@ -591,9 +562,6 @@ static const struct reg_value ov5640_setting_1080P_1920_1080[] = { > {0x3824, 0x02, 0, 0}, {0x5001, 0x83, 0, 0}, > {0x3c07, 0x07, 0, 0}, {0x3c08, 0x00, 0, 0}, > {0x3c09, 0x1c, 0, 0}, {0x3c0a, 0x9c, 0, 0}, {0x3c0b, 0x40, 0, 0}, > - {0x3800, 0x01, 0, 0}, {0x3801, 0x50, 0, 0}, {0x3802, 0x01, 0, 0}, > - {0x3803, 0xb2, 0, 0}, {0x3804, 0x08, 0, 0}, {0x3805, 0xef, 0, 0}, > - {0x3806, 0x05, 0, 0}, {0x3807, 0xf1, 0, 0}, > {0x3612, 0x2b, 0, 0}, {0x3708, 0x64, 0, 0}, > {0x3a02, 0x04, 0, 0}, {0x3a03, 0x60, 0, 0}, {0x3a08, 0x01, 0, 0}, > {0x3a09, 0x50, 0, 0}, {0x3a0a, 0x01, 0, 0}, {0x3a0b, 0x18, 0, 0}, > @@ -607,11 +575,7 @@ static const struct reg_value ov5640_setting_QSXGA_2592_1944[] = { > {0x3c07, 0x08, 0, 0}, > {0x3c09, 0x1c, 0, 0}, {0x3c0a, 0x9c, 0, 0}, {0x3c0b, 0x40, 0, 0}, > {0x3814, 0x11, 0, 0}, > - {0x3815, 0x11, 0, 0}, {0x3800, 0x00, 0, 0}, {0x3801, 0x00, 0, 0}, > - {0x3802, 0x00, 0, 0}, {0x3803, 0x00, 0, 0}, {0x3804, 0x0a, 0, 0}, > - {0x3805, 0x3f, 0, 0}, {0x3806, 0x07, 0, 0}, {0x3807, 0x9f, 0, 0}, > - {0x3810, 0x00, 0, 0}, > - {0x3811, 0x10, 0, 0}, {0x3812, 0x00, 0, 0}, {0x3813, 0x04, 0, 0}, > + {0x3815, 0x11, 0, 0}, > {0x3618, 0x04, 0, 0}, {0x3612, 0x29, 0, 0}, {0x3708, 0x21, 0, 0}, > {0x3709, 0x12, 0, 0}, {0x370c, 0x00, 0, 0}, {0x3a02, 0x03, 0, 0}, > {0x3a03, 0xd8, 0, 0}, {0x3a08, 0x01, 0, 0}, {0x3a09, 0x27, 0, 0}, > @@ -624,96 +588,250 @@ static const struct reg_value ov5640_setting_QSXGA_2592_1944[] = { > > /* power-on sensor init reg table */ > static const struct ov5640_mode_info ov5640_mode_init_data = { > - 0, SUBSAMPLING, > - OV5640_PIXEL_RATE_96M, > - 640, 1896, 480, 984, > - ov5640_init_setting_30fps_VGA, > - ARRAY_SIZE(ov5640_init_setting_30fps_VGA), > - OV5640_30_FPS, > + .id = 0, Ah there we go, named field initializers :-) It would be nice to move them to patch 02/21 to minimize the changes here. > + .dn_mode = SUBSAMPLING, > + .pixel_rate = OV5640_PIXEL_RATE_96M, > + .analog_crop = { > + .left = 0, > + .top = 4, > + .width = 2623, > + .height = 1947, I don't think that's right. The TIMING_HW and TIMING_VH registers store the end X and Y values respectively, so here width should be 2624 and height 1944. Same below, and you'll need to update the register writes accordingly (left + width - 1 and top + height - 1). > + }, > + .crop = { > + .left = 16, > + .top = 6, > + .width = 640, > + .height = 480, > + }, > + .ppl = 1896, > + .vblank_def = 504, > + .reg_data = ov5640_init_setting_30fps_VGA, > + .reg_data_size = ARRAY_SIZE(ov5640_init_setting_30fps_VGA), > + .max_fps = OV5640_30_FPS > }; > > static const struct ov5640_mode_info > ov5640_mode_data[OV5640_NUM_MODES] = { > { > /* 160x120 */ > - OV5640_MODE_QQVGA_160_120, SUBSAMPLING, > - OV5640_PIXEL_RATE_48M, > - 160, 1896, 120, 984, > - ov5640_setting_QQVGA_160_120, > - ARRAY_SIZE(ov5640_setting_QQVGA_160_120), > - OV5640_30_FPS > + .id = OV5640_MODE_QQVGA_160_120, > + .dn_mode = SUBSAMPLING, > + .pixel_rate = OV5640_PIXEL_RATE_48M, > + .analog_crop = { > + .left = 0, > + .top = 4, > + .width = 2623, > + .height = 1947, > + }, > + .crop = { > + .left = 16, > + .top = 6, > + .width = 160, > + .height = 120, > + }, > + .ppl = 1896, > + .vblank_def = 864, > + .reg_data = ov5640_setting_QQVGA_160_120, > + .reg_data_size = ARRAY_SIZE(ov5640_setting_QQVGA_160_120), > + .max_fps = OV5640_30_FPS > }, { > /* 176x144 */ > - OV5640_MODE_QCIF_176_144, SUBSAMPLING, > - OV5640_PIXEL_RATE_48M, > - 176, 1896, 144, 984, > - ov5640_setting_QCIF_176_144, > - ARRAY_SIZE(ov5640_setting_QCIF_176_144), > - OV5640_30_FPS > + .id = OV5640_MODE_QCIF_176_144, > + .dn_mode = SUBSAMPLING, > + .pixel_rate = OV5640_PIXEL_RATE_48M, > + .analog_crop = { > + .left = 0, > + .top = 4, > + .width = 2623, > + .height = 1947, > + }, > + .crop = { > + .left = 16, > + .top = 6, > + .width = 176, > + .height = 144, > + }, > + .ppl = 1896, > + .vblank_def = 840, > + .reg_data = ov5640_setting_QCIF_176_144, > + .reg_data_size = ARRAY_SIZE(ov5640_setting_QCIF_176_144), > + .max_fps = OV5640_30_FPS > }, { > /* 320x240 */ > - OV5640_MODE_QVGA_320_240, SUBSAMPLING, > - OV5640_PIXEL_RATE_48M, > - 320, 1896, 240, 984, > - ov5640_setting_QVGA_320_240, > - ARRAY_SIZE(ov5640_setting_QVGA_320_240), > - OV5640_30_FPS > + .id = OV5640_MODE_QVGA_320_240, > + .dn_mode = SUBSAMPLING, > + .pixel_rate = OV5640_PIXEL_RATE_48M, > + .analog_crop = { > + .left = 0, > + .top = 4, > + .width = 2623, > + .height = 1947, > + }, > + .crop = { > + .left = 16, > + .top = 6, > + .width = 320, > + .height = 240, > + }, > + .ppl = 1896, > + .vblank_def = 744, > + .reg_data = ov5640_setting_QVGA_320_240, > + .reg_data_size = ARRAY_SIZE(ov5640_setting_QVGA_320_240), > + .max_fps = OV5640_30_FPS > }, { > /* 640x480 */ > - OV5640_MODE_VGA_640_480, SUBSAMPLING, > - OV5640_PIXEL_RATE_48M, > - 640, 1896, 480, 1080, > - ov5640_setting_VGA_640_480, > - ARRAY_SIZE(ov5640_setting_VGA_640_480), > - OV5640_60_FPS > + .id = OV5640_MODE_VGA_640_480, > + .dn_mode = SUBSAMPLING, > + .pixel_rate = OV5640_PIXEL_RATE_48M, > + .analog_crop = { > + .left = 0, > + .top = 4, > + .width = 2623, > + .height = 1947, > + }, > + .crop = { > + .left = 16, > + .top = 6, > + .width = 640, > + .height = 480, > + }, > + .ppl = 1896, > + .vblank_def = 600, > + .reg_data = ov5640_setting_VGA_640_480, > + .reg_data_size = ARRAY_SIZE(ov5640_setting_VGA_640_480), > + .max_fps = OV5640_60_FPS > }, { > /* 720x480 */ > - OV5640_MODE_NTSC_720_480, SUBSAMPLING, > - OV5640_PIXEL_RATE_96M, > - 720, 1896, 480, 984, > - ov5640_setting_NTSC_720_480, > - ARRAY_SIZE(ov5640_setting_NTSC_720_480), > - OV5640_30_FPS > + .id = OV5640_MODE_NTSC_720_480, > + .dn_mode = SUBSAMPLING, > + .pixel_rate = OV5640_PIXEL_RATE_96M, > + .analog_crop = { > + .left = 0, > + .top = 4, > + .width = 2623, > + .height = 1947, > + }, > + .crop = { > + .left = 56, I think this one should be 16. > + .top = 60, > + .width = 720, > + .height = 480, > + }, > + .ppl = 1896, > + .vblank_def = 504, > + .reg_data = ov5640_setting_NTSC_720_480, > + .reg_data_size = ARRAY_SIZE(ov5640_setting_NTSC_720_480), > + .max_fps = OV5640_30_FPS > }, { > /* 720x576 */ > - OV5640_MODE_PAL_720_576, SUBSAMPLING, > - OV5640_PIXEL_RATE_96M, > - 720, 1896, 576, 984, > - ov5640_setting_PAL_720_576, > - ARRAY_SIZE(ov5640_setting_PAL_720_576), > - OV5640_30_FPS > + .id = OV5640_MODE_PAL_720_576, > + .dn_mode = SUBSAMPLING, > + .pixel_rate = OV5640_PIXEL_RATE_96M, > + .analog_crop = { > + .left = 0, > + .top = 4, > + .width = 2623, > + .height = 1947, > + }, > + .crop = { > + .left = 56, > + .top = 60, And this should be 6. > + .width = 720, > + .height = 576, > + }, > + .ppl = 1896, > + .vblank_def = 408, > + .reg_data = ov5640_setting_PAL_720_576, > + .reg_data_size = ARRAY_SIZE(ov5640_setting_PAL_720_576), > + .max_fps = OV5640_30_FPS > }, { > /* 1024x768 */ > - OV5640_MODE_XGA_1024_768, SUBSAMPLING, > - OV5640_PIXEL_RATE_96M, > - 1024, 1896, 768, 1080, > - ov5640_setting_XGA_1024_768, > - ARRAY_SIZE(ov5640_setting_XGA_1024_768), > - OV5640_30_FPS > + .id = OV5640_MODE_XGA_1024_768, > + .dn_mode = SUBSAMPLING, > + .pixel_rate = OV5640_PIXEL_RATE_96M, > + .analog_crop = { > + .left = 0, > + .top = 4, > + .width = 2623, > + .height = 1947, > + }, > + .crop = { > + .left = 16, > + .top = 6, > + .width = 1024, > + .height = 768, > + }, > + .ppl = 1896, > + .vblank_def = 312, > + .reg_data = ov5640_setting_XGA_1024_768, > + .reg_data_size = ARRAY_SIZE(ov5640_setting_XGA_1024_768), > + .max_fps = OV5640_30_FPS > }, { > /* 1280x720 */ > - OV5640_MODE_720P_1280_720, SUBSAMPLING, > - OV5640_PIXEL_RATE_124M, > - 1280, 1892, 720, 740, > - ov5640_setting_720P_1280_720, > - ARRAY_SIZE(ov5640_setting_720P_1280_720), > - OV5640_30_FPS > + .id = OV5640_MODE_720P_1280_720, > + .dn_mode = SUBSAMPLING, > + .pixel_rate = OV5640_PIXEL_RATE_124M, > + .analog_crop = { > + .left = 0, > + .top = 250, > + .width = 2623, > + .height = 1705, > + }, > + .crop = { > + .left = 16, > + .top = 4, > + .width = 1280, > + .height = 720, > + }, > + .ppl = 1896, 1892 ? > + .vblank_def = 20, > + .reg_data = ov5640_setting_720P_1280_720, > + .reg_data_size = ARRAY_SIZE(ov5640_setting_720P_1280_720), > + .max_fps = OV5640_30_FPS > }, { > /* 1920x1080 */ > - OV5640_MODE_1080P_1920_1080, SCALING, > - OV5640_PIXEL_RATE_148M, > - 1920, 2500, 1080, 1120, > - ov5640_setting_1080P_1920_1080, > - ARRAY_SIZE(ov5640_setting_1080P_1920_1080), > - OV5640_30_FPS > + .id = OV5640_MODE_1080P_1920_1080, > + .dn_mode = SCALING, > + .pixel_rate = OV5640_PIXEL_RATE_148M, > + .analog_crop = { > + .left = 336, > + .top = 434, > + .width = 2287, > + .height = 1521, > + }, > + .crop = { > + .left = 16, > + .top = 4, > + .width = 1920, > + .height = 1080, > + }, > + .ppl = 2500, > + .vblank_def = 40, > + .reg_data = ov5640_setting_1080P_1920_1080, > + .reg_data_size = ARRAY_SIZE(ov5640_setting_1080P_1920_1080), > + .max_fps = OV5640_30_FPS > }, { > /* 2592x1944 */ > - OV5640_MODE_QSXGA_2592_1944, SCALING, > - OV5640_PIXEL_RATE_168M, > - 2592, 2844, 1944, 1968, > - ov5640_setting_QSXGA_2592_1944, > - ARRAY_SIZE(ov5640_setting_QSXGA_2592_1944), > - OV5640_15_FPS > + .id = OV5640_MODE_QSXGA_2592_1944, > + .dn_mode = SCALING, > + .pixel_rate = OV5640_PIXEL_RATE_168M, > + .analog_crop = { > + .left = 0, > + .top = 0, > + .width = 2623, > + .height = 1951, > + }, > + .crop = { > + .left = 16, > + .top = 4, > + .width = 2592, > + .height = 1944, > + }, > + .ppl = 2844, > + .vblank_def = 24, > + .reg_data = ov5640_setting_QSXGA_2592_1944, > + .reg_data_size = ARRAY_SIZE(ov5640_setting_QSXGA_2592_1944), > + .max_fps = OV5640_15_FPS > }, > }; > > @@ -1136,7 +1254,8 @@ static u64 ov5640_calc_pixel_rate(struct ov5640_dev *sensor) > { > u64 rate; > > - rate = sensor->current_mode->vtot * sensor->current_mode->htot; > + rate = sensor->current_mode->ppl > + * (sensor->current_mode->crop.height + sensor->current_mode->vblank_def); > rate *= ov5640_framerates[sensor->current_fr]; > > return rate; > @@ -1220,17 +1339,21 @@ static int ov5640_set_jpeg_timings(struct ov5640_dev *sensor, > if (ret < 0) > return ret; > > - ret = ov5640_write_reg16(sensor, OV5640_REG_VFIFO_HSIZE, mode->hact); > + ret = ov5640_write_reg16(sensor, OV5640_REG_VFIFO_HSIZE, > + mode->crop.width); > if (ret < 0) > return ret; > > - return ov5640_write_reg16(sensor, OV5640_REG_VFIFO_VSIZE, mode->vact); > + return ov5640_write_reg16(sensor, OV5640_REG_VFIFO_VSIZE, > + mode->crop.height); > } > > /* download ov5640 settings to sensor through i2c */ > static int ov5640_set_timings(struct ov5640_dev *sensor, > const struct ov5640_mode_info *mode) > { > + const struct v4l2_rect *analog_crop = &mode->analog_crop; > + const struct v4l2_rect *crop = &mode->crop; > int ret; > > if (sensor->fmt.code == MEDIA_BUS_FMT_JPEG_1X8) { > @@ -1239,19 +1362,54 @@ static int ov5640_set_timings(struct ov5640_dev *sensor, > return ret; > } > > - ret = ov5640_write_reg16(sensor, OV5640_REG_TIMING_DVPHO, mode->hact); > + ret = ov5640_write_reg16(sensor, OV5640_REG_TIMING_HS, > + analog_crop->left); > + if (ret < 0) > + return ret; > + > + ret = ov5640_write_reg16(sensor, OV5640_REG_TIMING_VS, > + analog_crop->top); > + if (ret < 0) > + return ret; > + > + ret = ov5640_write_reg16(sensor, OV5640_REG_TIMING_HW, > + analog_crop->width); > + if (ret < 0) > + return ret; > + > + ret = ov5640_write_reg16(sensor, OV5640_REG_TIMING_VH, > + analog_crop->height); > + if (ret < 0) > + return ret; > + > + ret = ov5640_write_reg16(sensor, OV5640_REG_TIMING_DVPHO, crop->width); > + if (ret < 0) > + return ret; > + > + ret = ov5640_write_reg16(sensor, OV5640_REG_TIMING_DVPVO, crop->height); > + if (ret < 0) > + return ret; > + > + ret = ov5640_write_reg16(sensor, OV5640_REG_TIMING_HTS, mode->ppl); > + if (ret < 0) > + return ret; > + > + ret = ov5640_write_reg16(sensor, OV5640_REG_TIMING_VTS, > + crop->height + mode->vblank_def); > if (ret < 0) > return ret; > > - ret = ov5640_write_reg16(sensor, OV5640_REG_TIMING_DVPVO, mode->vact); > + ret = ov5640_write_reg16(sensor, OV5640_REG_TIMING_HOFFS, > + crop->left); > if (ret < 0) > return ret; > > - ret = ov5640_write_reg16(sensor, OV5640_REG_TIMING_HTS, mode->htot); > + ret = ov5640_write_reg16(sensor, OV5640_REG_TIMING_VOFFS, > + crop->top); > if (ret < 0) > return ret; Maybe you could order the crop writes as the analog crop writes, with left, top, width and height ? > > - return ov5640_write_reg16(sensor, OV5640_REG_TIMING_VTS, mode->vtot); > + return 0; > } > > static int ov5640_load_regs(struct ov5640_dev *sensor, > @@ -1679,11 +1837,11 @@ ov5640_find_mode(struct ov5640_dev *sensor, enum ov5640_frame_rate fr, > > mode = v4l2_find_nearest_size(ov5640_mode_data, > ARRAY_SIZE(ov5640_mode_data), > - hact, vact, > - width, height); > + crop.width, crop.height, width, height); > > if (!mode || > - (!nearest && (mode->hact != width || mode->vact != height))) > + (!nearest && > + (mode->crop.width != width || mode->crop.height != height))) > return NULL; > > /* Check to see if the current mode exceeds the max frame rate */ > @@ -2367,8 +2525,8 @@ static int ov5640_try_fmt_internal(struct v4l2_subdev *sd, > mode = ov5640_find_mode(sensor, fr, fmt->width, fmt->height, true); > if (!mode) > return -EINVAL; > - fmt->width = mode->hact; > - fmt->height = mode->vact; > + fmt->width = mode->crop.width; > + fmt->height = mode->crop.height; > > if (new_mode) > *new_mode = mode; > @@ -2999,11 +3157,9 @@ static int ov5640_enum_frame_size(struct v4l2_subdev *sd, > if (fse->index >= OV5640_NUM_MODES) > return -EINVAL; > > - fse->min_width = > - ov5640_mode_data[fse->index].hact; > + fse->min_width = ov5640_mode_data[fse->index].crop.width; > fse->max_width = fse->min_width; > - fse->min_height = > - ov5640_mode_data[fse->index].vact; > + fse->min_height = ov5640_mode_data[fse->index].crop.height; > fse->max_height = fse->min_height; > > return 0; > @@ -3067,15 +3223,16 @@ static int ov5640_s_frame_interval(struct v4l2_subdev *sd, > mode = sensor->current_mode; > > frame_rate = ov5640_try_frame_interval(sensor, &fi->interval, > - mode->hact, mode->vact); > + mode->crop.width, > + mode->crop.height); > if (frame_rate < 0) { > /* Always return a valid frame interval value */ > fi->interval = sensor->frame_interval; > goto out; > } > > - mode = ov5640_find_mode(sensor, frame_rate, mode->hact, > - mode->vact, true); > + mode = ov5640_find_mode(sensor, frame_rate, mode->crop.width, > + mode->crop.height, true); > if (!mode) { > ret = -EINVAL; > goto out;
Hi Laurent On Tue, Feb 01, 2022 at 09:03:25PM +0200, Laurent Pinchart wrote: > Hi Jacopo, > > Thank you for the patch. > > On Mon, Jan 31, 2022 at 03:32:31PM +0100, Jacopo Mondi wrote: > > The current definition of a sensor mode defines timings as follows: > > > > - hact, vact: Visible width and height > > - htot, vtot: Total sizes invluding blankings > > s/invluding/including/ > > > This makes difficult to clearly separate the visible sizes from the > > blankings and to make the vertical blanking programmable. > > > > Rework the sensor modes sizes definition to: > > - Report the analog crop sizes > > - Report the visible crop size > > - Report the total pixels per line as HBLANK is fixed > > - Report the VBLANK value to make it programmable > > > > Also modify the ov5640_set_timings() function to program all the > > windowing registers are remove them from the per-mode register-value > > tables. > > > > Signed-off-by: Jacopo Mondi <jacopo@jmondi.org> > > --- > > drivers/media/i2c/ov5640.c | 451 +++++++++++++++++++++++++------------ > > 1 file changed, 304 insertions(+), 147 deletions(-) > > > > diff --git a/drivers/media/i2c/ov5640.c b/drivers/media/i2c/ov5640.c > > index acc636500907..bd14e2ad22f6 100644 > > --- a/drivers/media/i2c/ov5640.c > > +++ b/drivers/media/i2c/ov5640.c > > @@ -61,10 +61,16 @@ > > #define OV5640_REG_AEC_PK_MANUAL 0x3503 > > #define OV5640_REG_AEC_PK_REAL_GAIN 0x350a > > #define OV5640_REG_AEC_PK_VTS 0x350c > > +#define OV5640_REG_TIMING_HS 0x3800 > > +#define OV5640_REG_TIMING_VS 0x3802 > > +#define OV5640_REG_TIMING_HW 0x3804 > > +#define OV5640_REG_TIMING_VH 0x3806 > > #define OV5640_REG_TIMING_DVPHO 0x3808 > > #define OV5640_REG_TIMING_DVPVO 0x380a > > #define OV5640_REG_TIMING_HTS 0x380c > > #define OV5640_REG_TIMING_VTS 0x380e > > +#define OV5640_REG_TIMING_HOFFS 0x3810 > > +#define OV5640_REG_TIMING_VOFFS 0x3812 > > #define OV5640_REG_TIMING_TC_REG20 0x3820 > > #define OV5640_REG_TIMING_TC_REG21 0x3821 > > #define OV5640_REG_AEC_CTRL00 0x3a00 > > @@ -242,12 +248,17 @@ struct ov5640_mode_info { > > enum ov5640_mode_id id; > > enum ov5640_downsize_mode dn_mode; > > enum ov5640_pixel_rate_id pixel_rate; > > - u32 hact; > > - u32 htot; > > - u32 vact; > > - u32 vtot; > > + /* Analog crop rectangle. */ > > + struct v4l2_rect analog_crop; > > + /* Visibile crop: from analog crop top-left corner. */ > > + struct v4l2_rect crop; > > + /* Total pixels per line: crop.width + fixed hblank. */ > > + u32 ppl; > > ppl is a fairly uncommon term when it comes to sensor configuration. I'd > rather keep hact, or use a hblank value. > I found ppl (pixels per line) nicer that hact (horizontal act... ?) > > + /* Total frame height = crop.height + vblank. */ > > + u32 vblank_def; > > The comment doesn't seem to match the field. > Ah yes, I meant to pair it with the above one and make clear that vblank doesn't include the visible pixels. But yes I get your comment and I'll change this > > const struct reg_value *reg_data; > > u32 reg_data_size; > > + /* DVP only; ignored in MIPI mode. */ > > u32 max_fps; > > }; > > > > @@ -353,11 +364,7 @@ static const struct reg_value ov5640_init_setting_30fps_VGA[] = { > > {0x3c06, 0x00, 0, 0}, {0x3c07, 0x08, 0, 0}, {0x3c08, 0x00, 0, 0}, > > {0x3c09, 0x1c, 0, 0}, {0x3c0a, 0x9c, 0, 0}, {0x3c0b, 0x40, 0, 0}, > > {0x3820, 0x41, 0, 0}, {0x3821, 0x07, 0, 0}, {0x3814, 0x31, 0, 0}, > > - {0x3815, 0x31, 0, 0}, {0x3800, 0x00, 0, 0}, {0x3801, 0x00, 0, 0}, > > - {0x3802, 0x00, 0, 0}, {0x3803, 0x04, 0, 0}, {0x3804, 0x0a, 0, 0}, > > - {0x3805, 0x3f, 0, 0}, {0x3806, 0x07, 0, 0}, {0x3807, 0x9b, 0, 0}, > > - {0x3810, 0x00, 0, 0}, > > - {0x3811, 0x10, 0, 0}, {0x3812, 0x00, 0, 0}, {0x3813, 0x06, 0, 0}, > > + {0x3815, 0x31, 0, 0}, > > {0x3618, 0x00, 0, 0}, {0x3612, 0x29, 0, 0}, {0x3708, 0x64, 0, 0}, > > {0x3709, 0x52, 0, 0}, {0x370c, 0x03, 0, 0}, {0x3a02, 0x03, 0, 0}, > > {0x3a03, 0xd8, 0, 0}, {0x3a08, 0x01, 0, 0}, {0x3a09, 0x27, 0, 0}, > > @@ -425,11 +432,7 @@ static const struct reg_value ov5640_setting_VGA_640_480[] = { > > {0x3c07, 0x08, 0, 0}, > > {0x3c09, 0x1c, 0, 0}, {0x3c0a, 0x9c, 0, 0}, {0x3c0b, 0x40, 0, 0}, > > {0x3814, 0x31, 0, 0}, > > - {0x3815, 0x31, 0, 0}, {0x3800, 0x00, 0, 0}, {0x3801, 0x00, 0, 0}, > > - {0x3802, 0x00, 0, 0}, {0x3803, 0x04, 0, 0}, {0x3804, 0x0a, 0, 0}, > > - {0x3805, 0x3f, 0, 0}, {0x3806, 0x07, 0, 0}, {0x3807, 0x9b, 0, 0}, > > - {0x3810, 0x00, 0, 0}, > > - {0x3811, 0x10, 0, 0}, {0x3812, 0x00, 0, 0}, {0x3813, 0x06, 0, 0}, > > + {0x3815, 0x31, 0, 0}, > > {0x3618, 0x00, 0, 0}, {0x3612, 0x29, 0, 0}, {0x3708, 0x64, 0, 0}, > > {0x3709, 0x52, 0, 0}, {0x370c, 0x03, 0, 0}, {0x3a02, 0x03, 0, 0}, > > {0x3a03, 0xd8, 0, 0}, {0x3a08, 0x01, 0, 0}, {0x3a09, 0x27, 0, 0}, > > @@ -444,11 +447,7 @@ static const struct reg_value ov5640_setting_XGA_1024_768[] = { > > {0x3c07, 0x08, 0, 0}, > > {0x3c09, 0x1c, 0, 0}, {0x3c0a, 0x9c, 0, 0}, {0x3c0b, 0x40, 0, 0}, > > {0x3814, 0x31, 0, 0}, > > - {0x3815, 0x31, 0, 0}, {0x3800, 0x00, 0, 0}, {0x3801, 0x00, 0, 0}, > > - {0x3802, 0x00, 0, 0}, {0x3803, 0x04, 0, 0}, {0x3804, 0x0a, 0, 0}, > > - {0x3805, 0x3f, 0, 0}, {0x3806, 0x07, 0, 0}, {0x3807, 0x9b, 0, 0}, > > - {0x3810, 0x00, 0, 0}, > > - {0x3811, 0x10, 0, 0}, {0x3812, 0x00, 0, 0}, {0x3813, 0x06, 0, 0}, > > + {0x3815, 0x31, 0, 0}, > > {0x3618, 0x00, 0, 0}, {0x3612, 0x29, 0, 0}, {0x3708, 0x64, 0, 0}, > > {0x3709, 0x52, 0, 0}, {0x370c, 0x03, 0, 0}, {0x3a02, 0x03, 0, 0}, > > {0x3a03, 0xd8, 0, 0}, {0x3a08, 0x01, 0, 0}, {0x3a09, 0x27, 0, 0}, > > @@ -463,11 +462,7 @@ static const struct reg_value ov5640_setting_QVGA_320_240[] = { > > {0x3c07, 0x08, 0, 0}, > > {0x3c09, 0x1c, 0, 0}, {0x3c0a, 0x9c, 0, 0}, {0x3c0b, 0x40, 0, 0}, > > {0x3814, 0x31, 0, 0}, > > - {0x3815, 0x31, 0, 0}, {0x3800, 0x00, 0, 0}, {0x3801, 0x00, 0, 0}, > > - {0x3802, 0x00, 0, 0}, {0x3803, 0x04, 0, 0}, {0x3804, 0x0a, 0, 0}, > > - {0x3805, 0x3f, 0, 0}, {0x3806, 0x07, 0, 0}, {0x3807, 0x9b, 0, 0}, > > - {0x3810, 0x00, 0, 0}, > > - {0x3811, 0x10, 0, 0}, {0x3812, 0x00, 0, 0}, {0x3813, 0x06, 0, 0}, > > + {0x3815, 0x31, 0, 0}, > > {0x3618, 0x00, 0, 0}, {0x3612, 0x29, 0, 0}, {0x3708, 0x64, 0, 0}, > > {0x3709, 0x52, 0, 0}, {0x370c, 0x03, 0, 0}, {0x3a02, 0x03, 0, 0}, > > {0x3a03, 0xd8, 0, 0}, {0x3a08, 0x01, 0, 0}, {0x3a09, 0x27, 0, 0}, > > @@ -482,11 +477,7 @@ static const struct reg_value ov5640_setting_QQVGA_160_120[] = { > > {0x3c07, 0x08, 0, 0}, > > {0x3c09, 0x1c, 0, 0}, {0x3c0a, 0x9c, 0, 0}, {0x3c0b, 0x40, 0, 0}, > > {0x3814, 0x31, 0, 0}, > > - {0x3815, 0x31, 0, 0}, {0x3800, 0x00, 0, 0}, {0x3801, 0x00, 0, 0}, > > - {0x3802, 0x00, 0, 0}, {0x3803, 0x04, 0, 0}, {0x3804, 0x0a, 0, 0}, > > - {0x3805, 0x3f, 0, 0}, {0x3806, 0x07, 0, 0}, {0x3807, 0x9b, 0, 0}, > > - {0x3810, 0x00, 0, 0}, > > - {0x3811, 0x10, 0, 0}, {0x3812, 0x00, 0, 0}, {0x3813, 0x06, 0, 0}, > > + {0x3815, 0x31, 0, 0}, > > {0x3618, 0x00, 0, 0}, {0x3612, 0x29, 0, 0}, {0x3708, 0x64, 0, 0}, > > {0x3709, 0x52, 0, 0}, {0x370c, 0x03, 0, 0}, {0x3a02, 0x03, 0, 0}, > > {0x3a03, 0xd8, 0, 0}, {0x3a08, 0x01, 0, 0}, {0x3a09, 0x27, 0, 0}, > > @@ -500,11 +491,7 @@ static const struct reg_value ov5640_setting_QCIF_176_144[] = { > > {0x3c07, 0x08, 0, 0}, > > {0x3c09, 0x1c, 0, 0}, {0x3c0a, 0x9c, 0, 0}, {0x3c0b, 0x40, 0, 0}, > > {0x3814, 0x31, 0, 0}, > > - {0x3815, 0x31, 0, 0}, {0x3800, 0x00, 0, 0}, {0x3801, 0x00, 0, 0}, > > - {0x3802, 0x00, 0, 0}, {0x3803, 0x04, 0, 0}, {0x3804, 0x0a, 0, 0}, > > - {0x3805, 0x3f, 0, 0}, {0x3806, 0x07, 0, 0}, {0x3807, 0x9b, 0, 0}, > > - {0x3810, 0x00, 0, 0}, > > - {0x3811, 0x10, 0, 0}, {0x3812, 0x00, 0, 0}, {0x3813, 0x06, 0, 0}, > > + {0x3815, 0x31, 0, 0}, > > {0x3618, 0x00, 0, 0}, {0x3612, 0x29, 0, 0}, {0x3708, 0x64, 0, 0}, > > {0x3709, 0x52, 0, 0}, {0x370c, 0x03, 0, 0}, {0x3a02, 0x03, 0, 0}, > > {0x3a03, 0xd8, 0, 0}, {0x3a08, 0x01, 0, 0}, {0x3a09, 0x27, 0, 0}, > > @@ -519,11 +506,7 @@ static const struct reg_value ov5640_setting_NTSC_720_480[] = { > > {0x3c07, 0x08, 0, 0}, > > {0x3c09, 0x1c, 0, 0}, {0x3c0a, 0x9c, 0, 0}, {0x3c0b, 0x40, 0, 0}, > > {0x3814, 0x31, 0, 0}, > > - {0x3815, 0x31, 0, 0}, {0x3800, 0x00, 0, 0}, {0x3801, 0x00, 0, 0}, > > - {0x3802, 0x00, 0, 0}, {0x3803, 0x04, 0, 0}, {0x3804, 0x0a, 0, 0}, > > - {0x3805, 0x3f, 0, 0}, {0x3806, 0x07, 0, 0}, {0x3807, 0x9b, 0, 0}, > > - {0x3810, 0x00, 0, 0}, > > - {0x3811, 0x10, 0, 0}, {0x3812, 0x00, 0, 0}, {0x3813, 0x3c, 0, 0}, > > + {0x3815, 0x31, 0, 0}, > > {0x3618, 0x00, 0, 0}, {0x3612, 0x29, 0, 0}, {0x3708, 0x64, 0, 0}, > > {0x3709, 0x52, 0, 0}, {0x370c, 0x03, 0, 0}, {0x3a02, 0x03, 0, 0}, > > {0x3a03, 0xd8, 0, 0}, {0x3a08, 0x01, 0, 0}, {0x3a09, 0x27, 0, 0}, > > @@ -538,11 +521,7 @@ static const struct reg_value ov5640_setting_PAL_720_576[] = { > > {0x3c07, 0x08, 0, 0}, > > {0x3c09, 0x1c, 0, 0}, {0x3c0a, 0x9c, 0, 0}, {0x3c0b, 0x40, 0, 0}, > > {0x3814, 0x31, 0, 0}, > > - {0x3815, 0x31, 0, 0}, {0x3800, 0x00, 0, 0}, {0x3801, 0x00, 0, 0}, > > - {0x3802, 0x00, 0, 0}, {0x3803, 0x04, 0, 0}, {0x3804, 0x0a, 0, 0}, > > - {0x3805, 0x3f, 0, 0}, {0x3806, 0x07, 0, 0}, {0x3807, 0x9b, 0, 0}, > > - {0x3810, 0x00, 0, 0}, > > - {0x3811, 0x38, 0, 0}, {0x3812, 0x00, 0, 0}, {0x3813, 0x06, 0, 0}, > > + {0x3815, 0x31, 0, 0}, > > {0x3618, 0x00, 0, 0}, {0x3612, 0x29, 0, 0}, {0x3708, 0x64, 0, 0}, > > {0x3709, 0x52, 0, 0}, {0x370c, 0x03, 0, 0}, {0x3a02, 0x03, 0, 0}, > > {0x3a03, 0xd8, 0, 0}, {0x3a08, 0x01, 0, 0}, {0x3a09, 0x27, 0, 0}, > > @@ -557,11 +536,7 @@ static const struct reg_value ov5640_setting_720P_1280_720[] = { > > {0x3c07, 0x07, 0, 0}, > > {0x3c09, 0x1c, 0, 0}, {0x3c0a, 0x9c, 0, 0}, {0x3c0b, 0x40, 0, 0}, > > {0x3814, 0x31, 0, 0}, > > - {0x3815, 0x31, 0, 0}, {0x3800, 0x00, 0, 0}, {0x3801, 0x00, 0, 0}, > > - {0x3802, 0x00, 0, 0}, {0x3803, 0xfa, 0, 0}, {0x3804, 0x0a, 0, 0}, > > - {0x3805, 0x3f, 0, 0}, {0x3806, 0x06, 0, 0}, {0x3807, 0xa9, 0, 0}, > > - {0x3810, 0x00, 0, 0}, > > - {0x3811, 0x10, 0, 0}, {0x3812, 0x00, 0, 0}, {0x3813, 0x04, 0, 0}, > > + {0x3815, 0x31, 0, 0}, > > {0x3618, 0x00, 0, 0}, {0x3612, 0x29, 0, 0}, {0x3708, 0x64, 0, 0}, > > {0x3709, 0x52, 0, 0}, {0x370c, 0x03, 0, 0}, {0x3a02, 0x02, 0, 0}, > > {0x3a03, 0xe4, 0, 0}, {0x3a08, 0x01, 0, 0}, {0x3a09, 0xbc, 0, 0}, > > @@ -576,11 +551,7 @@ static const struct reg_value ov5640_setting_1080P_1920_1080[] = { > > {0x3c07, 0x08, 0, 0}, > > {0x3c09, 0x1c, 0, 0}, {0x3c0a, 0x9c, 0, 0}, {0x3c0b, 0x40, 0, 0}, > > {0x3814, 0x11, 0, 0}, > > - {0x3815, 0x11, 0, 0}, {0x3800, 0x00, 0, 0}, {0x3801, 0x00, 0, 0}, > > - {0x3802, 0x00, 0, 0}, {0x3803, 0x00, 0, 0}, {0x3804, 0x0a, 0, 0}, > > - {0x3805, 0x3f, 0, 0}, {0x3806, 0x07, 0, 0}, {0x3807, 0x9f, 0, 0}, > > - {0x3810, 0x00, 0, 0}, > > - {0x3811, 0x10, 0, 0}, {0x3812, 0x00, 0, 0}, {0x3813, 0x04, 0, 0}, > > + {0x3815, 0x11, 0, 0}, > > {0x3618, 0x04, 0, 0}, {0x3612, 0x29, 0, 0}, {0x3708, 0x21, 0, 0}, > > {0x3709, 0x12, 0, 0}, {0x370c, 0x00, 0, 0}, {0x3a02, 0x03, 0, 0}, > > {0x3a03, 0xd8, 0, 0}, {0x3a08, 0x01, 0, 0}, {0x3a09, 0x27, 0, 0}, > > @@ -591,9 +562,6 @@ static const struct reg_value ov5640_setting_1080P_1920_1080[] = { > > {0x3824, 0x02, 0, 0}, {0x5001, 0x83, 0, 0}, > > {0x3c07, 0x07, 0, 0}, {0x3c08, 0x00, 0, 0}, > > {0x3c09, 0x1c, 0, 0}, {0x3c0a, 0x9c, 0, 0}, {0x3c0b, 0x40, 0, 0}, > > - {0x3800, 0x01, 0, 0}, {0x3801, 0x50, 0, 0}, {0x3802, 0x01, 0, 0}, > > - {0x3803, 0xb2, 0, 0}, {0x3804, 0x08, 0, 0}, {0x3805, 0xef, 0, 0}, > > - {0x3806, 0x05, 0, 0}, {0x3807, 0xf1, 0, 0}, > > {0x3612, 0x2b, 0, 0}, {0x3708, 0x64, 0, 0}, > > {0x3a02, 0x04, 0, 0}, {0x3a03, 0x60, 0, 0}, {0x3a08, 0x01, 0, 0}, > > {0x3a09, 0x50, 0, 0}, {0x3a0a, 0x01, 0, 0}, {0x3a0b, 0x18, 0, 0}, > > @@ -607,11 +575,7 @@ static const struct reg_value ov5640_setting_QSXGA_2592_1944[] = { > > {0x3c07, 0x08, 0, 0}, > > {0x3c09, 0x1c, 0, 0}, {0x3c0a, 0x9c, 0, 0}, {0x3c0b, 0x40, 0, 0}, > > {0x3814, 0x11, 0, 0}, > > - {0x3815, 0x11, 0, 0}, {0x3800, 0x00, 0, 0}, {0x3801, 0x00, 0, 0}, > > - {0x3802, 0x00, 0, 0}, {0x3803, 0x00, 0, 0}, {0x3804, 0x0a, 0, 0}, > > - {0x3805, 0x3f, 0, 0}, {0x3806, 0x07, 0, 0}, {0x3807, 0x9f, 0, 0}, > > - {0x3810, 0x00, 0, 0}, > > - {0x3811, 0x10, 0, 0}, {0x3812, 0x00, 0, 0}, {0x3813, 0x04, 0, 0}, > > + {0x3815, 0x11, 0, 0}, > > {0x3618, 0x04, 0, 0}, {0x3612, 0x29, 0, 0}, {0x3708, 0x21, 0, 0}, > > {0x3709, 0x12, 0, 0}, {0x370c, 0x00, 0, 0}, {0x3a02, 0x03, 0, 0}, > > {0x3a03, 0xd8, 0, 0}, {0x3a08, 0x01, 0, 0}, {0x3a09, 0x27, 0, 0}, > > @@ -624,96 +588,250 @@ static const struct reg_value ov5640_setting_QSXGA_2592_1944[] = { > > > > /* power-on sensor init reg table */ > > static const struct ov5640_mode_info ov5640_mode_init_data = { > > - 0, SUBSAMPLING, > > - OV5640_PIXEL_RATE_96M, > > - 640, 1896, 480, 984, > > - ov5640_init_setting_30fps_VGA, > > - ARRAY_SIZE(ov5640_init_setting_30fps_VGA), > > - OV5640_30_FPS, > > + .id = 0, > > Ah there we go, named field initializers :-) It would be nice to move > them to patch 02/21 to minimize the changes here. > Rebasing might be rather painful, but I'll see how it goes > > + .dn_mode = SUBSAMPLING, > > + .pixel_rate = OV5640_PIXEL_RATE_96M, > > + .analog_crop = { > > + .left = 0, > > + .top = 4, > > + .width = 2623, > > + .height = 1947, > > I don't think that's right. The TIMING_HW and TIMING_VH registers store > the end X and Y values respectively, so here width should be 2624 and > height 1944. Same below, and you'll need to update the register writes > accordingly (left + width - 1 and top + height - 1). > These values come from what was hardcoded in the register tables In example: {0x3804, 0x0a, 0, 0}, {0x3805, 0x3f, 0, 0} 0xa3f = 2623 {0x3806, 0x07, 0, 0}, {0x3807, 0x9b, 0, 0} 0x79b = 1947 I wouldn't change them for sake for bisectability, but I can adjust them on top as they smell fishy to me as well > > + }, > > + .crop = { > > + .left = 16, > > + .top = 6, > > + .width = 640, > > + .height = 480, > > + }, > > + .ppl = 1896, > > + .vblank_def = 504, > > + .reg_data = ov5640_init_setting_30fps_VGA, > > + .reg_data_size = ARRAY_SIZE(ov5640_init_setting_30fps_VGA), > > + .max_fps = OV5640_30_FPS > > }; > > > > static const struct ov5640_mode_info > > ov5640_mode_data[OV5640_NUM_MODES] = { > > { > > /* 160x120 */ > > - OV5640_MODE_QQVGA_160_120, SUBSAMPLING, > > - OV5640_PIXEL_RATE_48M, > > - 160, 1896, 120, 984, > > - ov5640_setting_QQVGA_160_120, > > - ARRAY_SIZE(ov5640_setting_QQVGA_160_120), > > - OV5640_30_FPS > > + .id = OV5640_MODE_QQVGA_160_120, > > + .dn_mode = SUBSAMPLING, > > + .pixel_rate = OV5640_PIXEL_RATE_48M, > > + .analog_crop = { > > + .left = 0, > > + .top = 4, > > + .width = 2623, > > + .height = 1947, > > + }, > > + .crop = { > > + .left = 16, > > + .top = 6, > > + .width = 160, > > + .height = 120, > > + }, > > + .ppl = 1896, > > + .vblank_def = 864, > > + .reg_data = ov5640_setting_QQVGA_160_120, > > + .reg_data_size = ARRAY_SIZE(ov5640_setting_QQVGA_160_120), > > + .max_fps = OV5640_30_FPS > > }, { > > /* 176x144 */ > > - OV5640_MODE_QCIF_176_144, SUBSAMPLING, > > - OV5640_PIXEL_RATE_48M, > > - 176, 1896, 144, 984, > > - ov5640_setting_QCIF_176_144, > > - ARRAY_SIZE(ov5640_setting_QCIF_176_144), > > - OV5640_30_FPS > > + .id = OV5640_MODE_QCIF_176_144, > > + .dn_mode = SUBSAMPLING, > > + .pixel_rate = OV5640_PIXEL_RATE_48M, > > + .analog_crop = { > > + .left = 0, > > + .top = 4, > > + .width = 2623, > > + .height = 1947, > > + }, > > + .crop = { > > + .left = 16, > > + .top = 6, > > + .width = 176, > > + .height = 144, > > + }, > > + .ppl = 1896, > > + .vblank_def = 840, > > + .reg_data = ov5640_setting_QCIF_176_144, > > + .reg_data_size = ARRAY_SIZE(ov5640_setting_QCIF_176_144), > > + .max_fps = OV5640_30_FPS > > }, { > > /* 320x240 */ > > - OV5640_MODE_QVGA_320_240, SUBSAMPLING, > > - OV5640_PIXEL_RATE_48M, > > - 320, 1896, 240, 984, > > - ov5640_setting_QVGA_320_240, > > - ARRAY_SIZE(ov5640_setting_QVGA_320_240), > > - OV5640_30_FPS > > + .id = OV5640_MODE_QVGA_320_240, > > + .dn_mode = SUBSAMPLING, > > + .pixel_rate = OV5640_PIXEL_RATE_48M, > > + .analog_crop = { > > + .left = 0, > > + .top = 4, > > + .width = 2623, > > + .height = 1947, > > + }, > > + .crop = { > > + .left = 16, > > + .top = 6, > > + .width = 320, > > + .height = 240, > > + }, > > + .ppl = 1896, > > + .vblank_def = 744, > > + .reg_data = ov5640_setting_QVGA_320_240, > > + .reg_data_size = ARRAY_SIZE(ov5640_setting_QVGA_320_240), > > + .max_fps = OV5640_30_FPS > > }, { > > /* 640x480 */ > > - OV5640_MODE_VGA_640_480, SUBSAMPLING, > > - OV5640_PIXEL_RATE_48M, > > - 640, 1896, 480, 1080, > > - ov5640_setting_VGA_640_480, > > - ARRAY_SIZE(ov5640_setting_VGA_640_480), > > - OV5640_60_FPS > > + .id = OV5640_MODE_VGA_640_480, > > + .dn_mode = SUBSAMPLING, > > + .pixel_rate = OV5640_PIXEL_RATE_48M, > > + .analog_crop = { > > + .left = 0, > > + .top = 4, > > + .width = 2623, > > + .height = 1947, > > + }, > > + .crop = { > > + .left = 16, > > + .top = 6, > > + .width = 640, > > + .height = 480, > > + }, > > + .ppl = 1896, > > + .vblank_def = 600, > > + .reg_data = ov5640_setting_VGA_640_480, > > + .reg_data_size = ARRAY_SIZE(ov5640_setting_VGA_640_480), > > + .max_fps = OV5640_60_FPS > > }, { > > /* 720x480 */ > > - OV5640_MODE_NTSC_720_480, SUBSAMPLING, > > - OV5640_PIXEL_RATE_96M, > > - 720, 1896, 480, 984, > > - ov5640_setting_NTSC_720_480, > > - ARRAY_SIZE(ov5640_setting_NTSC_720_480), > > - OV5640_30_FPS > > + .id = OV5640_MODE_NTSC_720_480, > > + .dn_mode = SUBSAMPLING, > > + .pixel_rate = OV5640_PIXEL_RATE_96M, > > + .analog_crop = { > > + .left = 0, > > + .top = 4, > > + .width = 2623, > > + .height = 1947, > > + }, > > + .crop = { > > + .left = 56, > > I think this one should be 16. > Uuuups > > @@ -519,11 +506,7 @@ static const struct reg_value ov5640_setting_NTSC_720_480[] = { > > - {0x3810, 0x00, 0, 0}, > > - {0x3811, 0x10, 0, 0}, {0x3812, 0x00, 0, 0}, {0x3813, 0x3c, 0, 0}, .left = 0x10 .top = 0x3c = 60d > > + .top = 60, > > + .width = 720, > > + .height = 480, > > + }, > > + .ppl = 1896, > > + .vblank_def = 504, > > + .reg_data = ov5640_setting_NTSC_720_480, > > + .reg_data_size = ARRAY_SIZE(ov5640_setting_NTSC_720_480), > > + .max_fps = OV5640_30_FPS > > }, { > > /* 720x576 */ > > - OV5640_MODE_PAL_720_576, SUBSAMPLING, > > - OV5640_PIXEL_RATE_96M, > > - 720, 1896, 576, 984, > > - ov5640_setting_PAL_720_576, > > - ARRAY_SIZE(ov5640_setting_PAL_720_576), > > - OV5640_30_FPS > > + .id = OV5640_MODE_PAL_720_576, > > + .dn_mode = SUBSAMPLING, > > + .pixel_rate = OV5640_PIXEL_RATE_96M, > > + .analog_crop = { > > + .left = 0, > > + .top = 4, > > + .width = 2623, > > + .height = 1947, > > + }, > > + .crop = { > > + .left = 56, > > + .top = 60, > > And this should be 6. > Ups x2 > > @@ -538,11 +521,7 @@ static const struct reg_value ov5640_setting_PAL_720_576[] = { > > - {0x3810, 0x00, 0, 0}, > > - {0x3811, 0x38, 0, 0}, {0x3812, 0x00, 0, 0}, {0x3813, 0x06, 0, 0}, .left = 0x38 ( = 56d) .top = 0x06 Thanks for spotting! Now I'm puzzled as I recal I tried to algin these modes to use .left = 16 .top = 6 As all the other modes and they broke, so I don't recall if I've mixed up values or changed them on purpose... I will re-test > > + .width = 720, > > + .height = 576, > > + }, > > + .ppl = 1896, > > + .vblank_def = 408, > > + .reg_data = ov5640_setting_PAL_720_576, > > + .reg_data_size = ARRAY_SIZE(ov5640_setting_PAL_720_576), > > + .max_fps = OV5640_30_FPS > > }, { > > /* 1024x768 */ > > - OV5640_MODE_XGA_1024_768, SUBSAMPLING, > > - OV5640_PIXEL_RATE_96M, > > - 1024, 1896, 768, 1080, > > - ov5640_setting_XGA_1024_768, > > - ARRAY_SIZE(ov5640_setting_XGA_1024_768), > > - OV5640_30_FPS > > + .id = OV5640_MODE_XGA_1024_768, > > + .dn_mode = SUBSAMPLING, > > + .pixel_rate = OV5640_PIXEL_RATE_96M, > > + .analog_crop = { > > + .left = 0, > > + .top = 4, > > + .width = 2623, > > + .height = 1947, > > + }, > > + .crop = { > > + .left = 16, > > + .top = 6, > > + .width = 1024, > > + .height = 768, > > + }, > > + .ppl = 1896, > > + .vblank_def = 312, > > + .reg_data = ov5640_setting_XGA_1024_768, > > + .reg_data_size = ARRAY_SIZE(ov5640_setting_XGA_1024_768), > > + .max_fps = OV5640_30_FPS > > }, { > > /* 1280x720 */ > > - OV5640_MODE_720P_1280_720, SUBSAMPLING, > > - OV5640_PIXEL_RATE_124M, > > - 1280, 1892, 720, 740, > > - ov5640_setting_720P_1280_720, > > - ARRAY_SIZE(ov5640_setting_720P_1280_720), > > - OV5640_30_FPS > > + .id = OV5640_MODE_720P_1280_720, > > + .dn_mode = SUBSAMPLING, > > + .pixel_rate = OV5640_PIXEL_RATE_124M, > > + .analog_crop = { > > + .left = 0, > > + .top = 250, > > + .width = 2623, > > + .height = 1705, > > + }, > > + .crop = { > > + .left = 16, > > + .top = 4, > > + .width = 1280, > > + .height = 720, > > + }, > > + .ppl = 1896, > > 1892 ? > > > + .vblank_def = 20, > > + .reg_data = ov5640_setting_720P_1280_720, > > + .reg_data_size = ARRAY_SIZE(ov5640_setting_720P_1280_720), > > + .max_fps = OV5640_30_FPS > > }, { > > /* 1920x1080 */ > > - OV5640_MODE_1080P_1920_1080, SCALING, > > - OV5640_PIXEL_RATE_148M, > > - 1920, 2500, 1080, 1120, > > - ov5640_setting_1080P_1920_1080, > > - ARRAY_SIZE(ov5640_setting_1080P_1920_1080), > > - OV5640_30_FPS > > + .id = OV5640_MODE_1080P_1920_1080, > > + .dn_mode = SCALING, > > + .pixel_rate = OV5640_PIXEL_RATE_148M, > > + .analog_crop = { > > + .left = 336, > > + .top = 434, > > + .width = 2287, > > + .height = 1521, > > + }, > > + .crop = { > > + .left = 16, > > + .top = 4, > > + .width = 1920, > > + .height = 1080, > > + }, > > + .ppl = 2500, > > + .vblank_def = 40, > > + .reg_data = ov5640_setting_1080P_1920_1080, > > + .reg_data_size = ARRAY_SIZE(ov5640_setting_1080P_1920_1080), > > + .max_fps = OV5640_30_FPS > > }, { > > /* 2592x1944 */ > > - OV5640_MODE_QSXGA_2592_1944, SCALING, > > - OV5640_PIXEL_RATE_168M, > > - 2592, 2844, 1944, 1968, > > - ov5640_setting_QSXGA_2592_1944, > > - ARRAY_SIZE(ov5640_setting_QSXGA_2592_1944), > > - OV5640_15_FPS > > + .id = OV5640_MODE_QSXGA_2592_1944, > > + .dn_mode = SCALING, > > + .pixel_rate = OV5640_PIXEL_RATE_168M, > > + .analog_crop = { > > + .left = 0, > > + .top = 0, > > + .width = 2623, > > + .height = 1951, > > + }, > > + .crop = { > > + .left = 16, > > + .top = 4, > > + .width = 2592, > > + .height = 1944, > > + }, > > + .ppl = 2844, > > + .vblank_def = 24, > > + .reg_data = ov5640_setting_QSXGA_2592_1944, > > + .reg_data_size = ARRAY_SIZE(ov5640_setting_QSXGA_2592_1944), > > + .max_fps = OV5640_15_FPS > > }, > > }; > > > > @@ -1136,7 +1254,8 @@ static u64 ov5640_calc_pixel_rate(struct ov5640_dev *sensor) > > { > > u64 rate; > > > > - rate = sensor->current_mode->vtot * sensor->current_mode->htot; > > + rate = sensor->current_mode->ppl > > + * (sensor->current_mode->crop.height + sensor->current_mode->vblank_def); > > rate *= ov5640_framerates[sensor->current_fr]; > > > > return rate; > > @@ -1220,17 +1339,21 @@ static int ov5640_set_jpeg_timings(struct ov5640_dev *sensor, > > if (ret < 0) > > return ret; > > > > - ret = ov5640_write_reg16(sensor, OV5640_REG_VFIFO_HSIZE, mode->hact); > > + ret = ov5640_write_reg16(sensor, OV5640_REG_VFIFO_HSIZE, > > + mode->crop.width); > > if (ret < 0) > > return ret; > > > > - return ov5640_write_reg16(sensor, OV5640_REG_VFIFO_VSIZE, mode->vact); > > + return ov5640_write_reg16(sensor, OV5640_REG_VFIFO_VSIZE, > > + mode->crop.height); > > } > > > > /* download ov5640 settings to sensor through i2c */ > > static int ov5640_set_timings(struct ov5640_dev *sensor, > > const struct ov5640_mode_info *mode) > > { > > + const struct v4l2_rect *analog_crop = &mode->analog_crop; > > + const struct v4l2_rect *crop = &mode->crop; > > int ret; > > > > if (sensor->fmt.code == MEDIA_BUS_FMT_JPEG_1X8) { > > @@ -1239,19 +1362,54 @@ static int ov5640_set_timings(struct ov5640_dev *sensor, > > return ret; > > } > > > > - ret = ov5640_write_reg16(sensor, OV5640_REG_TIMING_DVPHO, mode->hact); > > + ret = ov5640_write_reg16(sensor, OV5640_REG_TIMING_HS, > > + analog_crop->left); > > + if (ret < 0) > > + return ret; > > + > > + ret = ov5640_write_reg16(sensor, OV5640_REG_TIMING_VS, > > + analog_crop->top); > > + if (ret < 0) > > + return ret; > > + > > + ret = ov5640_write_reg16(sensor, OV5640_REG_TIMING_HW, > > + analog_crop->width); > > + if (ret < 0) > > + return ret; > > + > > + ret = ov5640_write_reg16(sensor, OV5640_REG_TIMING_VH, > > + analog_crop->height); > > + if (ret < 0) > > + return ret; > > + > > + ret = ov5640_write_reg16(sensor, OV5640_REG_TIMING_DVPHO, crop->width); > > + if (ret < 0) > > + return ret; > > + > > + ret = ov5640_write_reg16(sensor, OV5640_REG_TIMING_DVPVO, crop->height); > > + if (ret < 0) > > + return ret; > > + > > + ret = ov5640_write_reg16(sensor, OV5640_REG_TIMING_HTS, mode->ppl); > > + if (ret < 0) > > + return ret; > > + > > + ret = ov5640_write_reg16(sensor, OV5640_REG_TIMING_VTS, > > + crop->height + mode->vblank_def); > > if (ret < 0) > > return ret; > > > > - ret = ov5640_write_reg16(sensor, OV5640_REG_TIMING_DVPVO, mode->vact); > > + ret = ov5640_write_reg16(sensor, OV5640_REG_TIMING_HOFFS, > > + crop->left); > > if (ret < 0) > > return ret; > > > > - ret = ov5640_write_reg16(sensor, OV5640_REG_TIMING_HTS, mode->htot); > > + ret = ov5640_write_reg16(sensor, OV5640_REG_TIMING_VOFFS, > > + crop->top); > > if (ret < 0) > > return ret; > > Maybe you could order the crop writes as the analog crop writes, with > left, top, width and height ? > I can, yes Thanks for review > > > > - return ov5640_write_reg16(sensor, OV5640_REG_TIMING_VTS, mode->vtot); > > + return 0; > > } > > > > static int ov5640_load_regs(struct ov5640_dev *sensor, > > @@ -1679,11 +1837,11 @@ ov5640_find_mode(struct ov5640_dev *sensor, enum ov5640_frame_rate fr, > > > > mode = v4l2_find_nearest_size(ov5640_mode_data, > > ARRAY_SIZE(ov5640_mode_data), > > - hact, vact, > > - width, height); > > + crop.width, crop.height, width, height); > > > > if (!mode || > > - (!nearest && (mode->hact != width || mode->vact != height))) > > + (!nearest && > > + (mode->crop.width != width || mode->crop.height != height))) > > return NULL; > > > > /* Check to see if the current mode exceeds the max frame rate */ > > @@ -2367,8 +2525,8 @@ static int ov5640_try_fmt_internal(struct v4l2_subdev *sd, > > mode = ov5640_find_mode(sensor, fr, fmt->width, fmt->height, true); > > if (!mode) > > return -EINVAL; > > - fmt->width = mode->hact; > > - fmt->height = mode->vact; > > + fmt->width = mode->crop.width; > > + fmt->height = mode->crop.height; > > > > if (new_mode) > > *new_mode = mode; > > @@ -2999,11 +3157,9 @@ static int ov5640_enum_frame_size(struct v4l2_subdev *sd, > > if (fse->index >= OV5640_NUM_MODES) > > return -EINVAL; > > > > - fse->min_width = > > - ov5640_mode_data[fse->index].hact; > > + fse->min_width = ov5640_mode_data[fse->index].crop.width; > > fse->max_width = fse->min_width; > > - fse->min_height = > > - ov5640_mode_data[fse->index].vact; > > + fse->min_height = ov5640_mode_data[fse->index].crop.height; > > fse->max_height = fse->min_height; > > > > return 0; > > @@ -3067,15 +3223,16 @@ static int ov5640_s_frame_interval(struct v4l2_subdev *sd, > > mode = sensor->current_mode; > > > > frame_rate = ov5640_try_frame_interval(sensor, &fi->interval, > > - mode->hact, mode->vact); > > + mode->crop.width, > > + mode->crop.height); > > if (frame_rate < 0) { > > /* Always return a valid frame interval value */ > > fi->interval = sensor->frame_interval; > > goto out; > > } > > > > - mode = ov5640_find_mode(sensor, frame_rate, mode->hact, > > - mode->vact, true); > > + mode = ov5640_find_mode(sensor, frame_rate, mode->crop.width, > > + mode->crop.height, true); > > if (!mode) { > > ret = -EINVAL; > > goto out; > > -- > Regards, > > Laurent Pinchart
Hi Jacopo, On Mon, Feb 07, 2022 at 03:37:39PM +0100, Jacopo Mondi wrote: > On Tue, Feb 01, 2022 at 09:03:25PM +0200, Laurent Pinchart wrote: > > On Mon, Jan 31, 2022 at 03:32:31PM +0100, Jacopo Mondi wrote: > > > The current definition of a sensor mode defines timings as follows: > > > > > > - hact, vact: Visible width and height > > > - htot, vtot: Total sizes invluding blankings > > > > s/invluding/including/ > > > > > This makes difficult to clearly separate the visible sizes from the > > > blankings and to make the vertical blanking programmable. > > > > > > Rework the sensor modes sizes definition to: > > > - Report the analog crop sizes > > > - Report the visible crop size > > > - Report the total pixels per line as HBLANK is fixed > > > - Report the VBLANK value to make it programmable > > > > > > Also modify the ov5640_set_timings() function to program all the > > > windowing registers are remove them from the per-mode register-value > > > tables. > > > > > > Signed-off-by: Jacopo Mondi <jacopo@jmondi.org> > > > --- > > > drivers/media/i2c/ov5640.c | 451 +++++++++++++++++++++++++------------ > > > 1 file changed, 304 insertions(+), 147 deletions(-) > > > > > > diff --git a/drivers/media/i2c/ov5640.c b/drivers/media/i2c/ov5640.c > > > index acc636500907..bd14e2ad22f6 100644 > > > --- a/drivers/media/i2c/ov5640.c > > > +++ b/drivers/media/i2c/ov5640.c > > > @@ -61,10 +61,16 @@ > > > #define OV5640_REG_AEC_PK_MANUAL 0x3503 > > > #define OV5640_REG_AEC_PK_REAL_GAIN 0x350a > > > #define OV5640_REG_AEC_PK_VTS 0x350c > > > +#define OV5640_REG_TIMING_HS 0x3800 > > > +#define OV5640_REG_TIMING_VS 0x3802 > > > +#define OV5640_REG_TIMING_HW 0x3804 > > > +#define OV5640_REG_TIMING_VH 0x3806 > > > #define OV5640_REG_TIMING_DVPHO 0x3808 > > > #define OV5640_REG_TIMING_DVPVO 0x380a > > > #define OV5640_REG_TIMING_HTS 0x380c > > > #define OV5640_REG_TIMING_VTS 0x380e > > > +#define OV5640_REG_TIMING_HOFFS 0x3810 > > > +#define OV5640_REG_TIMING_VOFFS 0x3812 > > > #define OV5640_REG_TIMING_TC_REG20 0x3820 > > > #define OV5640_REG_TIMING_TC_REG21 0x3821 > > > #define OV5640_REG_AEC_CTRL00 0x3a00 > > > @@ -242,12 +248,17 @@ struct ov5640_mode_info { > > > enum ov5640_mode_id id; > > > enum ov5640_downsize_mode dn_mode; > > > enum ov5640_pixel_rate_id pixel_rate; > > > - u32 hact; > > > - u32 htot; > > > - u32 vact; > > > - u32 vtot; > > > + /* Analog crop rectangle. */ > > > + struct v4l2_rect analog_crop; > > > + /* Visibile crop: from analog crop top-left corner. */ > > > + struct v4l2_rect crop; > > > + /* Total pixels per line: crop.width + fixed hblank. */ > > > + u32 ppl; > > > > ppl is a fairly uncommon term when it comes to sensor configuration. I'd > > rather keep hact, or use a hblank value. > > I found ppl (pixels per line) nicer that hact (horizontal act... ?) > > > > + /* Total frame height = crop.height + vblank. */ > > > + u32 vblank_def; > > > > The comment doesn't seem to match the field. > > Ah yes, I meant to pair it with the above one and make clear that > vblank doesn't include the visible pixels. But yes I get your comment > and I'll change this > > > > const struct reg_value *reg_data; > > > u32 reg_data_size; > > > + /* DVP only; ignored in MIPI mode. */ > > > u32 max_fps; > > > }; > > > > > > @@ -353,11 +364,7 @@ static const struct reg_value ov5640_init_setting_30fps_VGA[] = { > > > {0x3c06, 0x00, 0, 0}, {0x3c07, 0x08, 0, 0}, {0x3c08, 0x00, 0, 0}, > > > {0x3c09, 0x1c, 0, 0}, {0x3c0a, 0x9c, 0, 0}, {0x3c0b, 0x40, 0, 0}, > > > {0x3820, 0x41, 0, 0}, {0x3821, 0x07, 0, 0}, {0x3814, 0x31, 0, 0}, > > > - {0x3815, 0x31, 0, 0}, {0x3800, 0x00, 0, 0}, {0x3801, 0x00, 0, 0}, > > > - {0x3802, 0x00, 0, 0}, {0x3803, 0x04, 0, 0}, {0x3804, 0x0a, 0, 0}, > > > - {0x3805, 0x3f, 0, 0}, {0x3806, 0x07, 0, 0}, {0x3807, 0x9b, 0, 0}, > > > - {0x3810, 0x00, 0, 0}, > > > - {0x3811, 0x10, 0, 0}, {0x3812, 0x00, 0, 0}, {0x3813, 0x06, 0, 0}, > > > + {0x3815, 0x31, 0, 0}, > > > {0x3618, 0x00, 0, 0}, {0x3612, 0x29, 0, 0}, {0x3708, 0x64, 0, 0}, > > > {0x3709, 0x52, 0, 0}, {0x370c, 0x03, 0, 0}, {0x3a02, 0x03, 0, 0}, > > > {0x3a03, 0xd8, 0, 0}, {0x3a08, 0x01, 0, 0}, {0x3a09, 0x27, 0, 0}, > > > @@ -425,11 +432,7 @@ static const struct reg_value ov5640_setting_VGA_640_480[] = { > > > {0x3c07, 0x08, 0, 0}, > > > {0x3c09, 0x1c, 0, 0}, {0x3c0a, 0x9c, 0, 0}, {0x3c0b, 0x40, 0, 0}, > > > {0x3814, 0x31, 0, 0}, > > > - {0x3815, 0x31, 0, 0}, {0x3800, 0x00, 0, 0}, {0x3801, 0x00, 0, 0}, > > > - {0x3802, 0x00, 0, 0}, {0x3803, 0x04, 0, 0}, {0x3804, 0x0a, 0, 0}, > > > - {0x3805, 0x3f, 0, 0}, {0x3806, 0x07, 0, 0}, {0x3807, 0x9b, 0, 0}, > > > - {0x3810, 0x00, 0, 0}, > > > - {0x3811, 0x10, 0, 0}, {0x3812, 0x00, 0, 0}, {0x3813, 0x06, 0, 0}, > > > + {0x3815, 0x31, 0, 0}, > > > {0x3618, 0x00, 0, 0}, {0x3612, 0x29, 0, 0}, {0x3708, 0x64, 0, 0}, > > > {0x3709, 0x52, 0, 0}, {0x370c, 0x03, 0, 0}, {0x3a02, 0x03, 0, 0}, > > > {0x3a03, 0xd8, 0, 0}, {0x3a08, 0x01, 0, 0}, {0x3a09, 0x27, 0, 0}, > > > @@ -444,11 +447,7 @@ static const struct reg_value ov5640_setting_XGA_1024_768[] = { > > > {0x3c07, 0x08, 0, 0}, > > > {0x3c09, 0x1c, 0, 0}, {0x3c0a, 0x9c, 0, 0}, {0x3c0b, 0x40, 0, 0}, > > > {0x3814, 0x31, 0, 0}, > > > - {0x3815, 0x31, 0, 0}, {0x3800, 0x00, 0, 0}, {0x3801, 0x00, 0, 0}, > > > - {0x3802, 0x00, 0, 0}, {0x3803, 0x04, 0, 0}, {0x3804, 0x0a, 0, 0}, > > > - {0x3805, 0x3f, 0, 0}, {0x3806, 0x07, 0, 0}, {0x3807, 0x9b, 0, 0}, > > > - {0x3810, 0x00, 0, 0}, > > > - {0x3811, 0x10, 0, 0}, {0x3812, 0x00, 0, 0}, {0x3813, 0x06, 0, 0}, > > > + {0x3815, 0x31, 0, 0}, > > > {0x3618, 0x00, 0, 0}, {0x3612, 0x29, 0, 0}, {0x3708, 0x64, 0, 0}, > > > {0x3709, 0x52, 0, 0}, {0x370c, 0x03, 0, 0}, {0x3a02, 0x03, 0, 0}, > > > {0x3a03, 0xd8, 0, 0}, {0x3a08, 0x01, 0, 0}, {0x3a09, 0x27, 0, 0}, > > > @@ -463,11 +462,7 @@ static const struct reg_value ov5640_setting_QVGA_320_240[] = { > > > {0x3c07, 0x08, 0, 0}, > > > {0x3c09, 0x1c, 0, 0}, {0x3c0a, 0x9c, 0, 0}, {0x3c0b, 0x40, 0, 0}, > > > {0x3814, 0x31, 0, 0}, > > > - {0x3815, 0x31, 0, 0}, {0x3800, 0x00, 0, 0}, {0x3801, 0x00, 0, 0}, > > > - {0x3802, 0x00, 0, 0}, {0x3803, 0x04, 0, 0}, {0x3804, 0x0a, 0, 0}, > > > - {0x3805, 0x3f, 0, 0}, {0x3806, 0x07, 0, 0}, {0x3807, 0x9b, 0, 0}, > > > - {0x3810, 0x00, 0, 0}, > > > - {0x3811, 0x10, 0, 0}, {0x3812, 0x00, 0, 0}, {0x3813, 0x06, 0, 0}, > > > + {0x3815, 0x31, 0, 0}, > > > {0x3618, 0x00, 0, 0}, {0x3612, 0x29, 0, 0}, {0x3708, 0x64, 0, 0}, > > > {0x3709, 0x52, 0, 0}, {0x370c, 0x03, 0, 0}, {0x3a02, 0x03, 0, 0}, > > > {0x3a03, 0xd8, 0, 0}, {0x3a08, 0x01, 0, 0}, {0x3a09, 0x27, 0, 0}, > > > @@ -482,11 +477,7 @@ static const struct reg_value ov5640_setting_QQVGA_160_120[] = { > > > {0x3c07, 0x08, 0, 0}, > > > {0x3c09, 0x1c, 0, 0}, {0x3c0a, 0x9c, 0, 0}, {0x3c0b, 0x40, 0, 0}, > > > {0x3814, 0x31, 0, 0}, > > > - {0x3815, 0x31, 0, 0}, {0x3800, 0x00, 0, 0}, {0x3801, 0x00, 0, 0}, > > > - {0x3802, 0x00, 0, 0}, {0x3803, 0x04, 0, 0}, {0x3804, 0x0a, 0, 0}, > > > - {0x3805, 0x3f, 0, 0}, {0x3806, 0x07, 0, 0}, {0x3807, 0x9b, 0, 0}, > > > - {0x3810, 0x00, 0, 0}, > > > - {0x3811, 0x10, 0, 0}, {0x3812, 0x00, 0, 0}, {0x3813, 0x06, 0, 0}, > > > + {0x3815, 0x31, 0, 0}, > > > {0x3618, 0x00, 0, 0}, {0x3612, 0x29, 0, 0}, {0x3708, 0x64, 0, 0}, > > > {0x3709, 0x52, 0, 0}, {0x370c, 0x03, 0, 0}, {0x3a02, 0x03, 0, 0}, > > > {0x3a03, 0xd8, 0, 0}, {0x3a08, 0x01, 0, 0}, {0x3a09, 0x27, 0, 0}, > > > @@ -500,11 +491,7 @@ static const struct reg_value ov5640_setting_QCIF_176_144[] = { > > > {0x3c07, 0x08, 0, 0}, > > > {0x3c09, 0x1c, 0, 0}, {0x3c0a, 0x9c, 0, 0}, {0x3c0b, 0x40, 0, 0}, > > > {0x3814, 0x31, 0, 0}, > > > - {0x3815, 0x31, 0, 0}, {0x3800, 0x00, 0, 0}, {0x3801, 0x00, 0, 0}, > > > - {0x3802, 0x00, 0, 0}, {0x3803, 0x04, 0, 0}, {0x3804, 0x0a, 0, 0}, > > > - {0x3805, 0x3f, 0, 0}, {0x3806, 0x07, 0, 0}, {0x3807, 0x9b, 0, 0}, > > > - {0x3810, 0x00, 0, 0}, > > > - {0x3811, 0x10, 0, 0}, {0x3812, 0x00, 0, 0}, {0x3813, 0x06, 0, 0}, > > > + {0x3815, 0x31, 0, 0}, > > > {0x3618, 0x00, 0, 0}, {0x3612, 0x29, 0, 0}, {0x3708, 0x64, 0, 0}, > > > {0x3709, 0x52, 0, 0}, {0x370c, 0x03, 0, 0}, {0x3a02, 0x03, 0, 0}, > > > {0x3a03, 0xd8, 0, 0}, {0x3a08, 0x01, 0, 0}, {0x3a09, 0x27, 0, 0}, > > > @@ -519,11 +506,7 @@ static const struct reg_value ov5640_setting_NTSC_720_480[] = { > > > {0x3c07, 0x08, 0, 0}, > > > {0x3c09, 0x1c, 0, 0}, {0x3c0a, 0x9c, 0, 0}, {0x3c0b, 0x40, 0, 0}, > > > {0x3814, 0x31, 0, 0}, > > > - {0x3815, 0x31, 0, 0}, {0x3800, 0x00, 0, 0}, {0x3801, 0x00, 0, 0}, > > > - {0x3802, 0x00, 0, 0}, {0x3803, 0x04, 0, 0}, {0x3804, 0x0a, 0, 0}, > > > - {0x3805, 0x3f, 0, 0}, {0x3806, 0x07, 0, 0}, {0x3807, 0x9b, 0, 0}, > > > - {0x3810, 0x00, 0, 0}, > > > - {0x3811, 0x10, 0, 0}, {0x3812, 0x00, 0, 0}, {0x3813, 0x3c, 0, 0}, > > > + {0x3815, 0x31, 0, 0}, > > > {0x3618, 0x00, 0, 0}, {0x3612, 0x29, 0, 0}, {0x3708, 0x64, 0, 0}, > > > {0x3709, 0x52, 0, 0}, {0x370c, 0x03, 0, 0}, {0x3a02, 0x03, 0, 0}, > > > {0x3a03, 0xd8, 0, 0}, {0x3a08, 0x01, 0, 0}, {0x3a09, 0x27, 0, 0}, > > > @@ -538,11 +521,7 @@ static const struct reg_value ov5640_setting_PAL_720_576[] = { > > > {0x3c07, 0x08, 0, 0}, > > > {0x3c09, 0x1c, 0, 0}, {0x3c0a, 0x9c, 0, 0}, {0x3c0b, 0x40, 0, 0}, > > > {0x3814, 0x31, 0, 0}, > > > - {0x3815, 0x31, 0, 0}, {0x3800, 0x00, 0, 0}, {0x3801, 0x00, 0, 0}, > > > - {0x3802, 0x00, 0, 0}, {0x3803, 0x04, 0, 0}, {0x3804, 0x0a, 0, 0}, > > > - {0x3805, 0x3f, 0, 0}, {0x3806, 0x07, 0, 0}, {0x3807, 0x9b, 0, 0}, > > > - {0x3810, 0x00, 0, 0}, > > > - {0x3811, 0x38, 0, 0}, {0x3812, 0x00, 0, 0}, {0x3813, 0x06, 0, 0}, > > > + {0x3815, 0x31, 0, 0}, > > > {0x3618, 0x00, 0, 0}, {0x3612, 0x29, 0, 0}, {0x3708, 0x64, 0, 0}, > > > {0x3709, 0x52, 0, 0}, {0x370c, 0x03, 0, 0}, {0x3a02, 0x03, 0, 0}, > > > {0x3a03, 0xd8, 0, 0}, {0x3a08, 0x01, 0, 0}, {0x3a09, 0x27, 0, 0}, > > > @@ -557,11 +536,7 @@ static const struct reg_value ov5640_setting_720P_1280_720[] = { > > > {0x3c07, 0x07, 0, 0}, > > > {0x3c09, 0x1c, 0, 0}, {0x3c0a, 0x9c, 0, 0}, {0x3c0b, 0x40, 0, 0}, > > > {0x3814, 0x31, 0, 0}, > > > - {0x3815, 0x31, 0, 0}, {0x3800, 0x00, 0, 0}, {0x3801, 0x00, 0, 0}, > > > - {0x3802, 0x00, 0, 0}, {0x3803, 0xfa, 0, 0}, {0x3804, 0x0a, 0, 0}, > > > - {0x3805, 0x3f, 0, 0}, {0x3806, 0x06, 0, 0}, {0x3807, 0xa9, 0, 0}, > > > - {0x3810, 0x00, 0, 0}, > > > - {0x3811, 0x10, 0, 0}, {0x3812, 0x00, 0, 0}, {0x3813, 0x04, 0, 0}, > > > + {0x3815, 0x31, 0, 0}, > > > {0x3618, 0x00, 0, 0}, {0x3612, 0x29, 0, 0}, {0x3708, 0x64, 0, 0}, > > > {0x3709, 0x52, 0, 0}, {0x370c, 0x03, 0, 0}, {0x3a02, 0x02, 0, 0}, > > > {0x3a03, 0xe4, 0, 0}, {0x3a08, 0x01, 0, 0}, {0x3a09, 0xbc, 0, 0}, > > > @@ -576,11 +551,7 @@ static const struct reg_value ov5640_setting_1080P_1920_1080[] = { > > > {0x3c07, 0x08, 0, 0}, > > > {0x3c09, 0x1c, 0, 0}, {0x3c0a, 0x9c, 0, 0}, {0x3c0b, 0x40, 0, 0}, > > > {0x3814, 0x11, 0, 0}, > > > - {0x3815, 0x11, 0, 0}, {0x3800, 0x00, 0, 0}, {0x3801, 0x00, 0, 0}, > > > - {0x3802, 0x00, 0, 0}, {0x3803, 0x00, 0, 0}, {0x3804, 0x0a, 0, 0}, > > > - {0x3805, 0x3f, 0, 0}, {0x3806, 0x07, 0, 0}, {0x3807, 0x9f, 0, 0}, > > > - {0x3810, 0x00, 0, 0}, > > > - {0x3811, 0x10, 0, 0}, {0x3812, 0x00, 0, 0}, {0x3813, 0x04, 0, 0}, > > > + {0x3815, 0x11, 0, 0}, > > > {0x3618, 0x04, 0, 0}, {0x3612, 0x29, 0, 0}, {0x3708, 0x21, 0, 0}, > > > {0x3709, 0x12, 0, 0}, {0x370c, 0x00, 0, 0}, {0x3a02, 0x03, 0, 0}, > > > {0x3a03, 0xd8, 0, 0}, {0x3a08, 0x01, 0, 0}, {0x3a09, 0x27, 0, 0}, > > > @@ -591,9 +562,6 @@ static const struct reg_value ov5640_setting_1080P_1920_1080[] = { > > > {0x3824, 0x02, 0, 0}, {0x5001, 0x83, 0, 0}, > > > {0x3c07, 0x07, 0, 0}, {0x3c08, 0x00, 0, 0}, > > > {0x3c09, 0x1c, 0, 0}, {0x3c0a, 0x9c, 0, 0}, {0x3c0b, 0x40, 0, 0}, > > > - {0x3800, 0x01, 0, 0}, {0x3801, 0x50, 0, 0}, {0x3802, 0x01, 0, 0}, > > > - {0x3803, 0xb2, 0, 0}, {0x3804, 0x08, 0, 0}, {0x3805, 0xef, 0, 0}, > > > - {0x3806, 0x05, 0, 0}, {0x3807, 0xf1, 0, 0}, > > > {0x3612, 0x2b, 0, 0}, {0x3708, 0x64, 0, 0}, > > > {0x3a02, 0x04, 0, 0}, {0x3a03, 0x60, 0, 0}, {0x3a08, 0x01, 0, 0}, > > > {0x3a09, 0x50, 0, 0}, {0x3a0a, 0x01, 0, 0}, {0x3a0b, 0x18, 0, 0}, > > > @@ -607,11 +575,7 @@ static const struct reg_value ov5640_setting_QSXGA_2592_1944[] = { > > > {0x3c07, 0x08, 0, 0}, > > > {0x3c09, 0x1c, 0, 0}, {0x3c0a, 0x9c, 0, 0}, {0x3c0b, 0x40, 0, 0}, > > > {0x3814, 0x11, 0, 0}, > > > - {0x3815, 0x11, 0, 0}, {0x3800, 0x00, 0, 0}, {0x3801, 0x00, 0, 0}, > > > - {0x3802, 0x00, 0, 0}, {0x3803, 0x00, 0, 0}, {0x3804, 0x0a, 0, 0}, > > > - {0x3805, 0x3f, 0, 0}, {0x3806, 0x07, 0, 0}, {0x3807, 0x9f, 0, 0}, > > > - {0x3810, 0x00, 0, 0}, > > > - {0x3811, 0x10, 0, 0}, {0x3812, 0x00, 0, 0}, {0x3813, 0x04, 0, 0}, > > > + {0x3815, 0x11, 0, 0}, > > > {0x3618, 0x04, 0, 0}, {0x3612, 0x29, 0, 0}, {0x3708, 0x21, 0, 0}, > > > {0x3709, 0x12, 0, 0}, {0x370c, 0x00, 0, 0}, {0x3a02, 0x03, 0, 0}, > > > {0x3a03, 0xd8, 0, 0}, {0x3a08, 0x01, 0, 0}, {0x3a09, 0x27, 0, 0}, > > > @@ -624,96 +588,250 @@ static const struct reg_value ov5640_setting_QSXGA_2592_1944[] = { > > > > > > /* power-on sensor init reg table */ > > > static const struct ov5640_mode_info ov5640_mode_init_data = { > > > - 0, SUBSAMPLING, > > > - OV5640_PIXEL_RATE_96M, > > > - 640, 1896, 480, 984, > > > - ov5640_init_setting_30fps_VGA, > > > - ARRAY_SIZE(ov5640_init_setting_30fps_VGA), > > > - OV5640_30_FPS, > > > + .id = 0, > > > > Ah there we go, named field initializers :-) It would be nice to move > > them to patch 02/21 to minimize the changes here. > > Rebasing might be rather painful, but I'll see how it goes > > > > + .dn_mode = SUBSAMPLING, > > > + .pixel_rate = OV5640_PIXEL_RATE_96M, > > > + .analog_crop = { > > > + .left = 0, > > > + .top = 4, > > > + .width = 2623, > > > + .height = 1947, > > > > I don't think that's right. The TIMING_HW and TIMING_VH registers store > > the end X and Y values respectively, so here width should be 2624 and > > height 1944. Same below, and you'll need to update the register writes > > accordingly (left + width - 1 and top + height - 1). > > > > These values come from what was hardcoded in the register tables > In example: > > {0x3804, 0x0a, 0, 0}, {0x3805, 0x3f, 0, 0} 0xa3f = 2623 > {0x3806, 0x07, 0, 0}, {0x3807, 0x9b, 0, 0} 0x79b = 1947 > > I wouldn't change them for sake for bisectability, but I can adjust > them on top as they smell fishy to me as well You're right that register 0x3806 contains 1947, but that register doesn't store the height of the analog crop rectangle, it stores the y_end coordinate. width = y_end - y_start + 1 = 1944 in this case. > > > + }, > > > + .crop = { > > > + .left = 16, > > > + .top = 6, > > > + .width = 640, > > > + .height = 480, > > > + }, > > > + .ppl = 1896, > > > + .vblank_def = 504, > > > + .reg_data = ov5640_init_setting_30fps_VGA, > > > + .reg_data_size = ARRAY_SIZE(ov5640_init_setting_30fps_VGA), > > > + .max_fps = OV5640_30_FPS > > > }; > > > > > > static const struct ov5640_mode_info > > > ov5640_mode_data[OV5640_NUM_MODES] = { > > > { > > > /* 160x120 */ > > > - OV5640_MODE_QQVGA_160_120, SUBSAMPLING, > > > - OV5640_PIXEL_RATE_48M, > > > - 160, 1896, 120, 984, > > > - ov5640_setting_QQVGA_160_120, > > > - ARRAY_SIZE(ov5640_setting_QQVGA_160_120), > > > - OV5640_30_FPS > > > + .id = OV5640_MODE_QQVGA_160_120, > > > + .dn_mode = SUBSAMPLING, > > > + .pixel_rate = OV5640_PIXEL_RATE_48M, > > > + .analog_crop = { > > > + .left = 0, > > > + .top = 4, > > > + .width = 2623, > > > + .height = 1947, > > > + }, > > > + .crop = { > > > + .left = 16, > > > + .top = 6, > > > + .width = 160, > > > + .height = 120, > > > + }, > > > + .ppl = 1896, > > > + .vblank_def = 864, > > > + .reg_data = ov5640_setting_QQVGA_160_120, > > > + .reg_data_size = ARRAY_SIZE(ov5640_setting_QQVGA_160_120), > > > + .max_fps = OV5640_30_FPS > > > }, { > > > /* 176x144 */ > > > - OV5640_MODE_QCIF_176_144, SUBSAMPLING, > > > - OV5640_PIXEL_RATE_48M, > > > - 176, 1896, 144, 984, > > > - ov5640_setting_QCIF_176_144, > > > - ARRAY_SIZE(ov5640_setting_QCIF_176_144), > > > - OV5640_30_FPS > > > + .id = OV5640_MODE_QCIF_176_144, > > > + .dn_mode = SUBSAMPLING, > > > + .pixel_rate = OV5640_PIXEL_RATE_48M, > > > + .analog_crop = { > > > + .left = 0, > > > + .top = 4, > > > + .width = 2623, > > > + .height = 1947, > > > + }, > > > + .crop = { > > > + .left = 16, > > > + .top = 6, > > > + .width = 176, > > > + .height = 144, > > > + }, > > > + .ppl = 1896, > > > + .vblank_def = 840, > > > + .reg_data = ov5640_setting_QCIF_176_144, > > > + .reg_data_size = ARRAY_SIZE(ov5640_setting_QCIF_176_144), > > > + .max_fps = OV5640_30_FPS > > > }, { > > > /* 320x240 */ > > > - OV5640_MODE_QVGA_320_240, SUBSAMPLING, > > > - OV5640_PIXEL_RATE_48M, > > > - 320, 1896, 240, 984, > > > - ov5640_setting_QVGA_320_240, > > > - ARRAY_SIZE(ov5640_setting_QVGA_320_240), > > > - OV5640_30_FPS > > > + .id = OV5640_MODE_QVGA_320_240, > > > + .dn_mode = SUBSAMPLING, > > > + .pixel_rate = OV5640_PIXEL_RATE_48M, > > > + .analog_crop = { > > > + .left = 0, > > > + .top = 4, > > > + .width = 2623, > > > + .height = 1947, > > > + }, > > > + .crop = { > > > + .left = 16, > > > + .top = 6, > > > + .width = 320, > > > + .height = 240, > > > + }, > > > + .ppl = 1896, > > > + .vblank_def = 744, > > > + .reg_data = ov5640_setting_QVGA_320_240, > > > + .reg_data_size = ARRAY_SIZE(ov5640_setting_QVGA_320_240), > > > + .max_fps = OV5640_30_FPS > > > }, { > > > /* 640x480 */ > > > - OV5640_MODE_VGA_640_480, SUBSAMPLING, > > > - OV5640_PIXEL_RATE_48M, > > > - 640, 1896, 480, 1080, > > > - ov5640_setting_VGA_640_480, > > > - ARRAY_SIZE(ov5640_setting_VGA_640_480), > > > - OV5640_60_FPS > > > + .id = OV5640_MODE_VGA_640_480, > > > + .dn_mode = SUBSAMPLING, > > > + .pixel_rate = OV5640_PIXEL_RATE_48M, > > > + .analog_crop = { > > > + .left = 0, > > > + .top = 4, > > > + .width = 2623, > > > + .height = 1947, > > > + }, > > > + .crop = { > > > + .left = 16, > > > + .top = 6, > > > + .width = 640, > > > + .height = 480, > > > + }, > > > + .ppl = 1896, > > > + .vblank_def = 600, > > > + .reg_data = ov5640_setting_VGA_640_480, > > > + .reg_data_size = ARRAY_SIZE(ov5640_setting_VGA_640_480), > > > + .max_fps = OV5640_60_FPS > > > }, { > > > /* 720x480 */ > > > - OV5640_MODE_NTSC_720_480, SUBSAMPLING, > > > - OV5640_PIXEL_RATE_96M, > > > - 720, 1896, 480, 984, > > > - ov5640_setting_NTSC_720_480, > > > - ARRAY_SIZE(ov5640_setting_NTSC_720_480), > > > - OV5640_30_FPS > > > + .id = OV5640_MODE_NTSC_720_480, > > > + .dn_mode = SUBSAMPLING, > > > + .pixel_rate = OV5640_PIXEL_RATE_96M, > > > + .analog_crop = { > > > + .left = 0, > > > + .top = 4, > > > + .width = 2623, > > > + .height = 1947, > > > + }, > > > + .crop = { > > > + .left = 56, > > > > I think this one should be 16. > > Uuuups > > > > @@ -519,11 +506,7 @@ static const struct reg_value ov5640_setting_NTSC_720_480[] = { > > > - {0x3810, 0x00, 0, 0}, > > > - {0x3811, 0x10, 0, 0}, {0x3812, 0x00, 0, 0}, {0x3813, 0x3c, 0, 0}, > > .left = 0x10 > .top = 0x3c = 60d > > > > + .top = 60, > > > + .width = 720, > > > + .height = 480, > > > + }, > > > + .ppl = 1896, > > > + .vblank_def = 504, > > > + .reg_data = ov5640_setting_NTSC_720_480, > > > + .reg_data_size = ARRAY_SIZE(ov5640_setting_NTSC_720_480), > > > + .max_fps = OV5640_30_FPS > > > }, { > > > /* 720x576 */ > > > - OV5640_MODE_PAL_720_576, SUBSAMPLING, > > > - OV5640_PIXEL_RATE_96M, > > > - 720, 1896, 576, 984, > > > - ov5640_setting_PAL_720_576, > > > - ARRAY_SIZE(ov5640_setting_PAL_720_576), > > > - OV5640_30_FPS > > > + .id = OV5640_MODE_PAL_720_576, > > > + .dn_mode = SUBSAMPLING, > > > + .pixel_rate = OV5640_PIXEL_RATE_96M, > > > + .analog_crop = { > > > + .left = 0, > > > + .top = 4, > > > + .width = 2623, > > > + .height = 1947, > > > + }, > > > + .crop = { > > > + .left = 56, > > > + .top = 60, > > > > And this should be 6. > > Ups x2 > > > > @@ -538,11 +521,7 @@ static const struct reg_value ov5640_setting_PAL_720_576[] = { > > > - {0x3810, 0x00, 0, 0}, > > > - {0x3811, 0x38, 0, 0}, {0x3812, 0x00, 0, 0}, {0x3813, 0x06, 0, 0}, > > .left = 0x38 ( = 56d) > .top = 0x06 > > Thanks for spotting! > > Now I'm puzzled as I recal I tried to algin these modes to use > .left = 16 > .top = 6 > > As all the other modes and they broke, so I don't recall if I've mixed > up values or changed them on purpose... I will re-test > > > > + .width = 720, > > > + .height = 576, > > > + }, > > > + .ppl = 1896, > > > + .vblank_def = 408, > > > + .reg_data = ov5640_setting_PAL_720_576, > > > + .reg_data_size = ARRAY_SIZE(ov5640_setting_PAL_720_576), > > > + .max_fps = OV5640_30_FPS > > > }, { > > > /* 1024x768 */ > > > - OV5640_MODE_XGA_1024_768, SUBSAMPLING, > > > - OV5640_PIXEL_RATE_96M, > > > - 1024, 1896, 768, 1080, > > > - ov5640_setting_XGA_1024_768, > > > - ARRAY_SIZE(ov5640_setting_XGA_1024_768), > > > - OV5640_30_FPS > > > + .id = OV5640_MODE_XGA_1024_768, > > > + .dn_mode = SUBSAMPLING, > > > + .pixel_rate = OV5640_PIXEL_RATE_96M, > > > + .analog_crop = { > > > + .left = 0, > > > + .top = 4, > > > + .width = 2623, > > > + .height = 1947, > > > + }, > > > + .crop = { > > > + .left = 16, > > > + .top = 6, > > > + .width = 1024, > > > + .height = 768, > > > + }, > > > + .ppl = 1896, > > > + .vblank_def = 312, > > > + .reg_data = ov5640_setting_XGA_1024_768, > > > + .reg_data_size = ARRAY_SIZE(ov5640_setting_XGA_1024_768), > > > + .max_fps = OV5640_30_FPS > > > }, { > > > /* 1280x720 */ > > > - OV5640_MODE_720P_1280_720, SUBSAMPLING, > > > - OV5640_PIXEL_RATE_124M, > > > - 1280, 1892, 720, 740, > > > - ov5640_setting_720P_1280_720, > > > - ARRAY_SIZE(ov5640_setting_720P_1280_720), > > > - OV5640_30_FPS > > > + .id = OV5640_MODE_720P_1280_720, > > > + .dn_mode = SUBSAMPLING, > > > + .pixel_rate = OV5640_PIXEL_RATE_124M, > > > + .analog_crop = { > > > + .left = 0, > > > + .top = 250, > > > + .width = 2623, > > > + .height = 1705, > > > + }, > > > + .crop = { > > > + .left = 16, > > > + .top = 4, > > > + .width = 1280, > > > + .height = 720, > > > + }, > > > + .ppl = 1896, > > > > 1892 ? > > > > > + .vblank_def = 20, > > > + .reg_data = ov5640_setting_720P_1280_720, > > > + .reg_data_size = ARRAY_SIZE(ov5640_setting_720P_1280_720), > > > + .max_fps = OV5640_30_FPS > > > }, { > > > /* 1920x1080 */ > > > - OV5640_MODE_1080P_1920_1080, SCALING, > > > - OV5640_PIXEL_RATE_148M, > > > - 1920, 2500, 1080, 1120, > > > - ov5640_setting_1080P_1920_1080, > > > - ARRAY_SIZE(ov5640_setting_1080P_1920_1080), > > > - OV5640_30_FPS > > > + .id = OV5640_MODE_1080P_1920_1080, > > > + .dn_mode = SCALING, > > > + .pixel_rate = OV5640_PIXEL_RATE_148M, > > > + .analog_crop = { > > > + .left = 336, > > > + .top = 434, > > > + .width = 2287, > > > + .height = 1521, > > > + }, > > > + .crop = { > > > + .left = 16, > > > + .top = 4, > > > + .width = 1920, > > > + .height = 1080, > > > + }, > > > + .ppl = 2500, > > > + .vblank_def = 40, > > > + .reg_data = ov5640_setting_1080P_1920_1080, > > > + .reg_data_size = ARRAY_SIZE(ov5640_setting_1080P_1920_1080), > > > + .max_fps = OV5640_30_FPS > > > }, { > > > /* 2592x1944 */ > > > - OV5640_MODE_QSXGA_2592_1944, SCALING, > > > - OV5640_PIXEL_RATE_168M, > > > - 2592, 2844, 1944, 1968, > > > - ov5640_setting_QSXGA_2592_1944, > > > - ARRAY_SIZE(ov5640_setting_QSXGA_2592_1944), > > > - OV5640_15_FPS > > > + .id = OV5640_MODE_QSXGA_2592_1944, > > > + .dn_mode = SCALING, > > > + .pixel_rate = OV5640_PIXEL_RATE_168M, > > > + .analog_crop = { > > > + .left = 0, > > > + .top = 0, > > > + .width = 2623, > > > + .height = 1951, > > > + }, > > > + .crop = { > > > + .left = 16, > > > + .top = 4, > > > + .width = 2592, > > > + .height = 1944, > > > + }, > > > + .ppl = 2844, > > > + .vblank_def = 24, > > > + .reg_data = ov5640_setting_QSXGA_2592_1944, > > > + .reg_data_size = ARRAY_SIZE(ov5640_setting_QSXGA_2592_1944), > > > + .max_fps = OV5640_15_FPS > > > }, > > > }; > > > > > > @@ -1136,7 +1254,8 @@ static u64 ov5640_calc_pixel_rate(struct ov5640_dev *sensor) > > > { > > > u64 rate; > > > > > > - rate = sensor->current_mode->vtot * sensor->current_mode->htot; > > > + rate = sensor->current_mode->ppl > > > + * (sensor->current_mode->crop.height + sensor->current_mode->vblank_def); > > > rate *= ov5640_framerates[sensor->current_fr]; > > > > > > return rate; > > > @@ -1220,17 +1339,21 @@ static int ov5640_set_jpeg_timings(struct ov5640_dev *sensor, > > > if (ret < 0) > > > return ret; > > > > > > - ret = ov5640_write_reg16(sensor, OV5640_REG_VFIFO_HSIZE, mode->hact); > > > + ret = ov5640_write_reg16(sensor, OV5640_REG_VFIFO_HSIZE, > > > + mode->crop.width); > > > if (ret < 0) > > > return ret; > > > > > > - return ov5640_write_reg16(sensor, OV5640_REG_VFIFO_VSIZE, mode->vact); > > > + return ov5640_write_reg16(sensor, OV5640_REG_VFIFO_VSIZE, > > > + mode->crop.height); > > > } > > > > > > /* download ov5640 settings to sensor through i2c */ > > > static int ov5640_set_timings(struct ov5640_dev *sensor, > > > const struct ov5640_mode_info *mode) > > > { > > > + const struct v4l2_rect *analog_crop = &mode->analog_crop; > > > + const struct v4l2_rect *crop = &mode->crop; > > > int ret; > > > > > > if (sensor->fmt.code == MEDIA_BUS_FMT_JPEG_1X8) { > > > @@ -1239,19 +1362,54 @@ static int ov5640_set_timings(struct ov5640_dev *sensor, > > > return ret; > > > } > > > > > > - ret = ov5640_write_reg16(sensor, OV5640_REG_TIMING_DVPHO, mode->hact); > > > + ret = ov5640_write_reg16(sensor, OV5640_REG_TIMING_HS, > > > + analog_crop->left); > > > + if (ret < 0) > > > + return ret; > > > + > > > + ret = ov5640_write_reg16(sensor, OV5640_REG_TIMING_VS, > > > + analog_crop->top); > > > + if (ret < 0) > > > + return ret; > > > + > > > + ret = ov5640_write_reg16(sensor, OV5640_REG_TIMING_HW, > > > + analog_crop->width); > > > + if (ret < 0) > > > + return ret; > > > + > > > + ret = ov5640_write_reg16(sensor, OV5640_REG_TIMING_VH, > > > + analog_crop->height); > > > + if (ret < 0) > > > + return ret; > > > + > > > + ret = ov5640_write_reg16(sensor, OV5640_REG_TIMING_DVPHO, crop->width); > > > + if (ret < 0) > > > + return ret; > > > + > > > + ret = ov5640_write_reg16(sensor, OV5640_REG_TIMING_DVPVO, crop->height); > > > + if (ret < 0) > > > + return ret; > > > + > > > + ret = ov5640_write_reg16(sensor, OV5640_REG_TIMING_HTS, mode->ppl); > > > + if (ret < 0) > > > + return ret; > > > + > > > + ret = ov5640_write_reg16(sensor, OV5640_REG_TIMING_VTS, > > > + crop->height + mode->vblank_def); > > > if (ret < 0) > > > return ret; > > > > > > - ret = ov5640_write_reg16(sensor, OV5640_REG_TIMING_DVPVO, mode->vact); > > > + ret = ov5640_write_reg16(sensor, OV5640_REG_TIMING_HOFFS, > > > + crop->left); > > > if (ret < 0) > > > return ret; > > > > > > - ret = ov5640_write_reg16(sensor, OV5640_REG_TIMING_HTS, mode->htot); > > > + ret = ov5640_write_reg16(sensor, OV5640_REG_TIMING_VOFFS, > > > + crop->top); > > > if (ret < 0) > > > return ret; > > > > Maybe you could order the crop writes as the analog crop writes, with > > left, top, width and height ? > > I can, yes > > Thanks for review > > > > > > > - return ov5640_write_reg16(sensor, OV5640_REG_TIMING_VTS, mode->vtot); > > > + return 0; > > > } > > > > > > static int ov5640_load_regs(struct ov5640_dev *sensor, > > > @@ -1679,11 +1837,11 @@ ov5640_find_mode(struct ov5640_dev *sensor, enum ov5640_frame_rate fr, > > > > > > mode = v4l2_find_nearest_size(ov5640_mode_data, > > > ARRAY_SIZE(ov5640_mode_data), > > > - hact, vact, > > > - width, height); > > > + crop.width, crop.height, width, height); > > > > > > if (!mode || > > > - (!nearest && (mode->hact != width || mode->vact != height))) > > > + (!nearest && > > > + (mode->crop.width != width || mode->crop.height != height))) > > > return NULL; > > > > > > /* Check to see if the current mode exceeds the max frame rate */ > > > @@ -2367,8 +2525,8 @@ static int ov5640_try_fmt_internal(struct v4l2_subdev *sd, > > > mode = ov5640_find_mode(sensor, fr, fmt->width, fmt->height, true); > > > if (!mode) > > > return -EINVAL; > > > - fmt->width = mode->hact; > > > - fmt->height = mode->vact; > > > + fmt->width = mode->crop.width; > > > + fmt->height = mode->crop.height; > > > > > > if (new_mode) > > > *new_mode = mode; > > > @@ -2999,11 +3157,9 @@ static int ov5640_enum_frame_size(struct v4l2_subdev *sd, > > > if (fse->index >= OV5640_NUM_MODES) > > > return -EINVAL; > > > > > > - fse->min_width = > > > - ov5640_mode_data[fse->index].hact; > > > + fse->min_width = ov5640_mode_data[fse->index].crop.width; > > > fse->max_width = fse->min_width; > > > - fse->min_height = > > > - ov5640_mode_data[fse->index].vact; > > > + fse->min_height = ov5640_mode_data[fse->index].crop.height; > > > fse->max_height = fse->min_height; > > > > > > return 0; > > > @@ -3067,15 +3223,16 @@ static int ov5640_s_frame_interval(struct v4l2_subdev *sd, > > > mode = sensor->current_mode; > > > > > > frame_rate = ov5640_try_frame_interval(sensor, &fi->interval, > > > - mode->hact, mode->vact); > > > + mode->crop.width, > > > + mode->crop.height); > > > if (frame_rate < 0) { > > > /* Always return a valid frame interval value */ > > > fi->interval = sensor->frame_interval; > > > goto out; > > > } > > > > > > - mode = ov5640_find_mode(sensor, frame_rate, mode->hact, > > > - mode->vact, true); > > > + mode = ov5640_find_mode(sensor, frame_rate, mode->crop.width, > > > + mode->crop.height, true); > > > if (!mode) { > > > ret = -EINVAL; > > > goto out;
diff --git a/drivers/media/i2c/ov5640.c b/drivers/media/i2c/ov5640.c index acc636500907..bd14e2ad22f6 100644 --- a/drivers/media/i2c/ov5640.c +++ b/drivers/media/i2c/ov5640.c @@ -61,10 +61,16 @@ #define OV5640_REG_AEC_PK_MANUAL 0x3503 #define OV5640_REG_AEC_PK_REAL_GAIN 0x350a #define OV5640_REG_AEC_PK_VTS 0x350c +#define OV5640_REG_TIMING_HS 0x3800 +#define OV5640_REG_TIMING_VS 0x3802 +#define OV5640_REG_TIMING_HW 0x3804 +#define OV5640_REG_TIMING_VH 0x3806 #define OV5640_REG_TIMING_DVPHO 0x3808 #define OV5640_REG_TIMING_DVPVO 0x380a #define OV5640_REG_TIMING_HTS 0x380c #define OV5640_REG_TIMING_VTS 0x380e +#define OV5640_REG_TIMING_HOFFS 0x3810 +#define OV5640_REG_TIMING_VOFFS 0x3812 #define OV5640_REG_TIMING_TC_REG20 0x3820 #define OV5640_REG_TIMING_TC_REG21 0x3821 #define OV5640_REG_AEC_CTRL00 0x3a00 @@ -242,12 +248,17 @@ struct ov5640_mode_info { enum ov5640_mode_id id; enum ov5640_downsize_mode dn_mode; enum ov5640_pixel_rate_id pixel_rate; - u32 hact; - u32 htot; - u32 vact; - u32 vtot; + /* Analog crop rectangle. */ + struct v4l2_rect analog_crop; + /* Visibile crop: from analog crop top-left corner. */ + struct v4l2_rect crop; + /* Total pixels per line: crop.width + fixed hblank. */ + u32 ppl; + /* Total frame height = crop.height + vblank. */ + u32 vblank_def; const struct reg_value *reg_data; u32 reg_data_size; + /* DVP only; ignored in MIPI mode. */ u32 max_fps; }; @@ -353,11 +364,7 @@ static const struct reg_value ov5640_init_setting_30fps_VGA[] = { {0x3c06, 0x00, 0, 0}, {0x3c07, 0x08, 0, 0}, {0x3c08, 0x00, 0, 0}, {0x3c09, 0x1c, 0, 0}, {0x3c0a, 0x9c, 0, 0}, {0x3c0b, 0x40, 0, 0}, {0x3820, 0x41, 0, 0}, {0x3821, 0x07, 0, 0}, {0x3814, 0x31, 0, 0}, - {0x3815, 0x31, 0, 0}, {0x3800, 0x00, 0, 0}, {0x3801, 0x00, 0, 0}, - {0x3802, 0x00, 0, 0}, {0x3803, 0x04, 0, 0}, {0x3804, 0x0a, 0, 0}, - {0x3805, 0x3f, 0, 0}, {0x3806, 0x07, 0, 0}, {0x3807, 0x9b, 0, 0}, - {0x3810, 0x00, 0, 0}, - {0x3811, 0x10, 0, 0}, {0x3812, 0x00, 0, 0}, {0x3813, 0x06, 0, 0}, + {0x3815, 0x31, 0, 0}, {0x3618, 0x00, 0, 0}, {0x3612, 0x29, 0, 0}, {0x3708, 0x64, 0, 0}, {0x3709, 0x52, 0, 0}, {0x370c, 0x03, 0, 0}, {0x3a02, 0x03, 0, 0}, {0x3a03, 0xd8, 0, 0}, {0x3a08, 0x01, 0, 0}, {0x3a09, 0x27, 0, 0}, @@ -425,11 +432,7 @@ static const struct reg_value ov5640_setting_VGA_640_480[] = { {0x3c07, 0x08, 0, 0}, {0x3c09, 0x1c, 0, 0}, {0x3c0a, 0x9c, 0, 0}, {0x3c0b, 0x40, 0, 0}, {0x3814, 0x31, 0, 0}, - {0x3815, 0x31, 0, 0}, {0x3800, 0x00, 0, 0}, {0x3801, 0x00, 0, 0}, - {0x3802, 0x00, 0, 0}, {0x3803, 0x04, 0, 0}, {0x3804, 0x0a, 0, 0}, - {0x3805, 0x3f, 0, 0}, {0x3806, 0x07, 0, 0}, {0x3807, 0x9b, 0, 0}, - {0x3810, 0x00, 0, 0}, - {0x3811, 0x10, 0, 0}, {0x3812, 0x00, 0, 0}, {0x3813, 0x06, 0, 0}, + {0x3815, 0x31, 0, 0}, {0x3618, 0x00, 0, 0}, {0x3612, 0x29, 0, 0}, {0x3708, 0x64, 0, 0}, {0x3709, 0x52, 0, 0}, {0x370c, 0x03, 0, 0}, {0x3a02, 0x03, 0, 0}, {0x3a03, 0xd8, 0, 0}, {0x3a08, 0x01, 0, 0}, {0x3a09, 0x27, 0, 0}, @@ -444,11 +447,7 @@ static const struct reg_value ov5640_setting_XGA_1024_768[] = { {0x3c07, 0x08, 0, 0}, {0x3c09, 0x1c, 0, 0}, {0x3c0a, 0x9c, 0, 0}, {0x3c0b, 0x40, 0, 0}, {0x3814, 0x31, 0, 0}, - {0x3815, 0x31, 0, 0}, {0x3800, 0x00, 0, 0}, {0x3801, 0x00, 0, 0}, - {0x3802, 0x00, 0, 0}, {0x3803, 0x04, 0, 0}, {0x3804, 0x0a, 0, 0}, - {0x3805, 0x3f, 0, 0}, {0x3806, 0x07, 0, 0}, {0x3807, 0x9b, 0, 0}, - {0x3810, 0x00, 0, 0}, - {0x3811, 0x10, 0, 0}, {0x3812, 0x00, 0, 0}, {0x3813, 0x06, 0, 0}, + {0x3815, 0x31, 0, 0}, {0x3618, 0x00, 0, 0}, {0x3612, 0x29, 0, 0}, {0x3708, 0x64, 0, 0}, {0x3709, 0x52, 0, 0}, {0x370c, 0x03, 0, 0}, {0x3a02, 0x03, 0, 0}, {0x3a03, 0xd8, 0, 0}, {0x3a08, 0x01, 0, 0}, {0x3a09, 0x27, 0, 0}, @@ -463,11 +462,7 @@ static const struct reg_value ov5640_setting_QVGA_320_240[] = { {0x3c07, 0x08, 0, 0}, {0x3c09, 0x1c, 0, 0}, {0x3c0a, 0x9c, 0, 0}, {0x3c0b, 0x40, 0, 0}, {0x3814, 0x31, 0, 0}, - {0x3815, 0x31, 0, 0}, {0x3800, 0x00, 0, 0}, {0x3801, 0x00, 0, 0}, - {0x3802, 0x00, 0, 0}, {0x3803, 0x04, 0, 0}, {0x3804, 0x0a, 0, 0}, - {0x3805, 0x3f, 0, 0}, {0x3806, 0x07, 0, 0}, {0x3807, 0x9b, 0, 0}, - {0x3810, 0x00, 0, 0}, - {0x3811, 0x10, 0, 0}, {0x3812, 0x00, 0, 0}, {0x3813, 0x06, 0, 0}, + {0x3815, 0x31, 0, 0}, {0x3618, 0x00, 0, 0}, {0x3612, 0x29, 0, 0}, {0x3708, 0x64, 0, 0}, {0x3709, 0x52, 0, 0}, {0x370c, 0x03, 0, 0}, {0x3a02, 0x03, 0, 0}, {0x3a03, 0xd8, 0, 0}, {0x3a08, 0x01, 0, 0}, {0x3a09, 0x27, 0, 0}, @@ -482,11 +477,7 @@ static const struct reg_value ov5640_setting_QQVGA_160_120[] = { {0x3c07, 0x08, 0, 0}, {0x3c09, 0x1c, 0, 0}, {0x3c0a, 0x9c, 0, 0}, {0x3c0b, 0x40, 0, 0}, {0x3814, 0x31, 0, 0}, - {0x3815, 0x31, 0, 0}, {0x3800, 0x00, 0, 0}, {0x3801, 0x00, 0, 0}, - {0x3802, 0x00, 0, 0}, {0x3803, 0x04, 0, 0}, {0x3804, 0x0a, 0, 0}, - {0x3805, 0x3f, 0, 0}, {0x3806, 0x07, 0, 0}, {0x3807, 0x9b, 0, 0}, - {0x3810, 0x00, 0, 0}, - {0x3811, 0x10, 0, 0}, {0x3812, 0x00, 0, 0}, {0x3813, 0x06, 0, 0}, + {0x3815, 0x31, 0, 0}, {0x3618, 0x00, 0, 0}, {0x3612, 0x29, 0, 0}, {0x3708, 0x64, 0, 0}, {0x3709, 0x52, 0, 0}, {0x370c, 0x03, 0, 0}, {0x3a02, 0x03, 0, 0}, {0x3a03, 0xd8, 0, 0}, {0x3a08, 0x01, 0, 0}, {0x3a09, 0x27, 0, 0}, @@ -500,11 +491,7 @@ static const struct reg_value ov5640_setting_QCIF_176_144[] = { {0x3c07, 0x08, 0, 0}, {0x3c09, 0x1c, 0, 0}, {0x3c0a, 0x9c, 0, 0}, {0x3c0b, 0x40, 0, 0}, {0x3814, 0x31, 0, 0}, - {0x3815, 0x31, 0, 0}, {0x3800, 0x00, 0, 0}, {0x3801, 0x00, 0, 0}, - {0x3802, 0x00, 0, 0}, {0x3803, 0x04, 0, 0}, {0x3804, 0x0a, 0, 0}, - {0x3805, 0x3f, 0, 0}, {0x3806, 0x07, 0, 0}, {0x3807, 0x9b, 0, 0}, - {0x3810, 0x00, 0, 0}, - {0x3811, 0x10, 0, 0}, {0x3812, 0x00, 0, 0}, {0x3813, 0x06, 0, 0}, + {0x3815, 0x31, 0, 0}, {0x3618, 0x00, 0, 0}, {0x3612, 0x29, 0, 0}, {0x3708, 0x64, 0, 0}, {0x3709, 0x52, 0, 0}, {0x370c, 0x03, 0, 0}, {0x3a02, 0x03, 0, 0}, {0x3a03, 0xd8, 0, 0}, {0x3a08, 0x01, 0, 0}, {0x3a09, 0x27, 0, 0}, @@ -519,11 +506,7 @@ static const struct reg_value ov5640_setting_NTSC_720_480[] = { {0x3c07, 0x08, 0, 0}, {0x3c09, 0x1c, 0, 0}, {0x3c0a, 0x9c, 0, 0}, {0x3c0b, 0x40, 0, 0}, {0x3814, 0x31, 0, 0}, - {0x3815, 0x31, 0, 0}, {0x3800, 0x00, 0, 0}, {0x3801, 0x00, 0, 0}, - {0x3802, 0x00, 0, 0}, {0x3803, 0x04, 0, 0}, {0x3804, 0x0a, 0, 0}, - {0x3805, 0x3f, 0, 0}, {0x3806, 0x07, 0, 0}, {0x3807, 0x9b, 0, 0}, - {0x3810, 0x00, 0, 0}, - {0x3811, 0x10, 0, 0}, {0x3812, 0x00, 0, 0}, {0x3813, 0x3c, 0, 0}, + {0x3815, 0x31, 0, 0}, {0x3618, 0x00, 0, 0}, {0x3612, 0x29, 0, 0}, {0x3708, 0x64, 0, 0}, {0x3709, 0x52, 0, 0}, {0x370c, 0x03, 0, 0}, {0x3a02, 0x03, 0, 0}, {0x3a03, 0xd8, 0, 0}, {0x3a08, 0x01, 0, 0}, {0x3a09, 0x27, 0, 0}, @@ -538,11 +521,7 @@ static const struct reg_value ov5640_setting_PAL_720_576[] = { {0x3c07, 0x08, 0, 0}, {0x3c09, 0x1c, 0, 0}, {0x3c0a, 0x9c, 0, 0}, {0x3c0b, 0x40, 0, 0}, {0x3814, 0x31, 0, 0}, - {0x3815, 0x31, 0, 0}, {0x3800, 0x00, 0, 0}, {0x3801, 0x00, 0, 0}, - {0x3802, 0x00, 0, 0}, {0x3803, 0x04, 0, 0}, {0x3804, 0x0a, 0, 0}, - {0x3805, 0x3f, 0, 0}, {0x3806, 0x07, 0, 0}, {0x3807, 0x9b, 0, 0}, - {0x3810, 0x00, 0, 0}, - {0x3811, 0x38, 0, 0}, {0x3812, 0x00, 0, 0}, {0x3813, 0x06, 0, 0}, + {0x3815, 0x31, 0, 0}, {0x3618, 0x00, 0, 0}, {0x3612, 0x29, 0, 0}, {0x3708, 0x64, 0, 0}, {0x3709, 0x52, 0, 0}, {0x370c, 0x03, 0, 0}, {0x3a02, 0x03, 0, 0}, {0x3a03, 0xd8, 0, 0}, {0x3a08, 0x01, 0, 0}, {0x3a09, 0x27, 0, 0}, @@ -557,11 +536,7 @@ static const struct reg_value ov5640_setting_720P_1280_720[] = { {0x3c07, 0x07, 0, 0}, {0x3c09, 0x1c, 0, 0}, {0x3c0a, 0x9c, 0, 0}, {0x3c0b, 0x40, 0, 0}, {0x3814, 0x31, 0, 0}, - {0x3815, 0x31, 0, 0}, {0x3800, 0x00, 0, 0}, {0x3801, 0x00, 0, 0}, - {0x3802, 0x00, 0, 0}, {0x3803, 0xfa, 0, 0}, {0x3804, 0x0a, 0, 0}, - {0x3805, 0x3f, 0, 0}, {0x3806, 0x06, 0, 0}, {0x3807, 0xa9, 0, 0}, - {0x3810, 0x00, 0, 0}, - {0x3811, 0x10, 0, 0}, {0x3812, 0x00, 0, 0}, {0x3813, 0x04, 0, 0}, + {0x3815, 0x31, 0, 0}, {0x3618, 0x00, 0, 0}, {0x3612, 0x29, 0, 0}, {0x3708, 0x64, 0, 0}, {0x3709, 0x52, 0, 0}, {0x370c, 0x03, 0, 0}, {0x3a02, 0x02, 0, 0}, {0x3a03, 0xe4, 0, 0}, {0x3a08, 0x01, 0, 0}, {0x3a09, 0xbc, 0, 0}, @@ -576,11 +551,7 @@ static const struct reg_value ov5640_setting_1080P_1920_1080[] = { {0x3c07, 0x08, 0, 0}, {0x3c09, 0x1c, 0, 0}, {0x3c0a, 0x9c, 0, 0}, {0x3c0b, 0x40, 0, 0}, {0x3814, 0x11, 0, 0}, - {0x3815, 0x11, 0, 0}, {0x3800, 0x00, 0, 0}, {0x3801, 0x00, 0, 0}, - {0x3802, 0x00, 0, 0}, {0x3803, 0x00, 0, 0}, {0x3804, 0x0a, 0, 0}, - {0x3805, 0x3f, 0, 0}, {0x3806, 0x07, 0, 0}, {0x3807, 0x9f, 0, 0}, - {0x3810, 0x00, 0, 0}, - {0x3811, 0x10, 0, 0}, {0x3812, 0x00, 0, 0}, {0x3813, 0x04, 0, 0}, + {0x3815, 0x11, 0, 0}, {0x3618, 0x04, 0, 0}, {0x3612, 0x29, 0, 0}, {0x3708, 0x21, 0, 0}, {0x3709, 0x12, 0, 0}, {0x370c, 0x00, 0, 0}, {0x3a02, 0x03, 0, 0}, {0x3a03, 0xd8, 0, 0}, {0x3a08, 0x01, 0, 0}, {0x3a09, 0x27, 0, 0}, @@ -591,9 +562,6 @@ static const struct reg_value ov5640_setting_1080P_1920_1080[] = { {0x3824, 0x02, 0, 0}, {0x5001, 0x83, 0, 0}, {0x3c07, 0x07, 0, 0}, {0x3c08, 0x00, 0, 0}, {0x3c09, 0x1c, 0, 0}, {0x3c0a, 0x9c, 0, 0}, {0x3c0b, 0x40, 0, 0}, - {0x3800, 0x01, 0, 0}, {0x3801, 0x50, 0, 0}, {0x3802, 0x01, 0, 0}, - {0x3803, 0xb2, 0, 0}, {0x3804, 0x08, 0, 0}, {0x3805, 0xef, 0, 0}, - {0x3806, 0x05, 0, 0}, {0x3807, 0xf1, 0, 0}, {0x3612, 0x2b, 0, 0}, {0x3708, 0x64, 0, 0}, {0x3a02, 0x04, 0, 0}, {0x3a03, 0x60, 0, 0}, {0x3a08, 0x01, 0, 0}, {0x3a09, 0x50, 0, 0}, {0x3a0a, 0x01, 0, 0}, {0x3a0b, 0x18, 0, 0}, @@ -607,11 +575,7 @@ static const struct reg_value ov5640_setting_QSXGA_2592_1944[] = { {0x3c07, 0x08, 0, 0}, {0x3c09, 0x1c, 0, 0}, {0x3c0a, 0x9c, 0, 0}, {0x3c0b, 0x40, 0, 0}, {0x3814, 0x11, 0, 0}, - {0x3815, 0x11, 0, 0}, {0x3800, 0x00, 0, 0}, {0x3801, 0x00, 0, 0}, - {0x3802, 0x00, 0, 0}, {0x3803, 0x00, 0, 0}, {0x3804, 0x0a, 0, 0}, - {0x3805, 0x3f, 0, 0}, {0x3806, 0x07, 0, 0}, {0x3807, 0x9f, 0, 0}, - {0x3810, 0x00, 0, 0}, - {0x3811, 0x10, 0, 0}, {0x3812, 0x00, 0, 0}, {0x3813, 0x04, 0, 0}, + {0x3815, 0x11, 0, 0}, {0x3618, 0x04, 0, 0}, {0x3612, 0x29, 0, 0}, {0x3708, 0x21, 0, 0}, {0x3709, 0x12, 0, 0}, {0x370c, 0x00, 0, 0}, {0x3a02, 0x03, 0, 0}, {0x3a03, 0xd8, 0, 0}, {0x3a08, 0x01, 0, 0}, {0x3a09, 0x27, 0, 0}, @@ -624,96 +588,250 @@ static const struct reg_value ov5640_setting_QSXGA_2592_1944[] = { /* power-on sensor init reg table */ static const struct ov5640_mode_info ov5640_mode_init_data = { - 0, SUBSAMPLING, - OV5640_PIXEL_RATE_96M, - 640, 1896, 480, 984, - ov5640_init_setting_30fps_VGA, - ARRAY_SIZE(ov5640_init_setting_30fps_VGA), - OV5640_30_FPS, + .id = 0, + .dn_mode = SUBSAMPLING, + .pixel_rate = OV5640_PIXEL_RATE_96M, + .analog_crop = { + .left = 0, + .top = 4, + .width = 2623, + .height = 1947, + }, + .crop = { + .left = 16, + .top = 6, + .width = 640, + .height = 480, + }, + .ppl = 1896, + .vblank_def = 504, + .reg_data = ov5640_init_setting_30fps_VGA, + .reg_data_size = ARRAY_SIZE(ov5640_init_setting_30fps_VGA), + .max_fps = OV5640_30_FPS }; static const struct ov5640_mode_info ov5640_mode_data[OV5640_NUM_MODES] = { { /* 160x120 */ - OV5640_MODE_QQVGA_160_120, SUBSAMPLING, - OV5640_PIXEL_RATE_48M, - 160, 1896, 120, 984, - ov5640_setting_QQVGA_160_120, - ARRAY_SIZE(ov5640_setting_QQVGA_160_120), - OV5640_30_FPS + .id = OV5640_MODE_QQVGA_160_120, + .dn_mode = SUBSAMPLING, + .pixel_rate = OV5640_PIXEL_RATE_48M, + .analog_crop = { + .left = 0, + .top = 4, + .width = 2623, + .height = 1947, + }, + .crop = { + .left = 16, + .top = 6, + .width = 160, + .height = 120, + }, + .ppl = 1896, + .vblank_def = 864, + .reg_data = ov5640_setting_QQVGA_160_120, + .reg_data_size = ARRAY_SIZE(ov5640_setting_QQVGA_160_120), + .max_fps = OV5640_30_FPS }, { /* 176x144 */ - OV5640_MODE_QCIF_176_144, SUBSAMPLING, - OV5640_PIXEL_RATE_48M, - 176, 1896, 144, 984, - ov5640_setting_QCIF_176_144, - ARRAY_SIZE(ov5640_setting_QCIF_176_144), - OV5640_30_FPS + .id = OV5640_MODE_QCIF_176_144, + .dn_mode = SUBSAMPLING, + .pixel_rate = OV5640_PIXEL_RATE_48M, + .analog_crop = { + .left = 0, + .top = 4, + .width = 2623, + .height = 1947, + }, + .crop = { + .left = 16, + .top = 6, + .width = 176, + .height = 144, + }, + .ppl = 1896, + .vblank_def = 840, + .reg_data = ov5640_setting_QCIF_176_144, + .reg_data_size = ARRAY_SIZE(ov5640_setting_QCIF_176_144), + .max_fps = OV5640_30_FPS }, { /* 320x240 */ - OV5640_MODE_QVGA_320_240, SUBSAMPLING, - OV5640_PIXEL_RATE_48M, - 320, 1896, 240, 984, - ov5640_setting_QVGA_320_240, - ARRAY_SIZE(ov5640_setting_QVGA_320_240), - OV5640_30_FPS + .id = OV5640_MODE_QVGA_320_240, + .dn_mode = SUBSAMPLING, + .pixel_rate = OV5640_PIXEL_RATE_48M, + .analog_crop = { + .left = 0, + .top = 4, + .width = 2623, + .height = 1947, + }, + .crop = { + .left = 16, + .top = 6, + .width = 320, + .height = 240, + }, + .ppl = 1896, + .vblank_def = 744, + .reg_data = ov5640_setting_QVGA_320_240, + .reg_data_size = ARRAY_SIZE(ov5640_setting_QVGA_320_240), + .max_fps = OV5640_30_FPS }, { /* 640x480 */ - OV5640_MODE_VGA_640_480, SUBSAMPLING, - OV5640_PIXEL_RATE_48M, - 640, 1896, 480, 1080, - ov5640_setting_VGA_640_480, - ARRAY_SIZE(ov5640_setting_VGA_640_480), - OV5640_60_FPS + .id = OV5640_MODE_VGA_640_480, + .dn_mode = SUBSAMPLING, + .pixel_rate = OV5640_PIXEL_RATE_48M, + .analog_crop = { + .left = 0, + .top = 4, + .width = 2623, + .height = 1947, + }, + .crop = { + .left = 16, + .top = 6, + .width = 640, + .height = 480, + }, + .ppl = 1896, + .vblank_def = 600, + .reg_data = ov5640_setting_VGA_640_480, + .reg_data_size = ARRAY_SIZE(ov5640_setting_VGA_640_480), + .max_fps = OV5640_60_FPS }, { /* 720x480 */ - OV5640_MODE_NTSC_720_480, SUBSAMPLING, - OV5640_PIXEL_RATE_96M, - 720, 1896, 480, 984, - ov5640_setting_NTSC_720_480, - ARRAY_SIZE(ov5640_setting_NTSC_720_480), - OV5640_30_FPS + .id = OV5640_MODE_NTSC_720_480, + .dn_mode = SUBSAMPLING, + .pixel_rate = OV5640_PIXEL_RATE_96M, + .analog_crop = { + .left = 0, + .top = 4, + .width = 2623, + .height = 1947, + }, + .crop = { + .left = 56, + .top = 60, + .width = 720, + .height = 480, + }, + .ppl = 1896, + .vblank_def = 504, + .reg_data = ov5640_setting_NTSC_720_480, + .reg_data_size = ARRAY_SIZE(ov5640_setting_NTSC_720_480), + .max_fps = OV5640_30_FPS }, { /* 720x576 */ - OV5640_MODE_PAL_720_576, SUBSAMPLING, - OV5640_PIXEL_RATE_96M, - 720, 1896, 576, 984, - ov5640_setting_PAL_720_576, - ARRAY_SIZE(ov5640_setting_PAL_720_576), - OV5640_30_FPS + .id = OV5640_MODE_PAL_720_576, + .dn_mode = SUBSAMPLING, + .pixel_rate = OV5640_PIXEL_RATE_96M, + .analog_crop = { + .left = 0, + .top = 4, + .width = 2623, + .height = 1947, + }, + .crop = { + .left = 56, + .top = 60, + .width = 720, + .height = 576, + }, + .ppl = 1896, + .vblank_def = 408, + .reg_data = ov5640_setting_PAL_720_576, + .reg_data_size = ARRAY_SIZE(ov5640_setting_PAL_720_576), + .max_fps = OV5640_30_FPS }, { /* 1024x768 */ - OV5640_MODE_XGA_1024_768, SUBSAMPLING, - OV5640_PIXEL_RATE_96M, - 1024, 1896, 768, 1080, - ov5640_setting_XGA_1024_768, - ARRAY_SIZE(ov5640_setting_XGA_1024_768), - OV5640_30_FPS + .id = OV5640_MODE_XGA_1024_768, + .dn_mode = SUBSAMPLING, + .pixel_rate = OV5640_PIXEL_RATE_96M, + .analog_crop = { + .left = 0, + .top = 4, + .width = 2623, + .height = 1947, + }, + .crop = { + .left = 16, + .top = 6, + .width = 1024, + .height = 768, + }, + .ppl = 1896, + .vblank_def = 312, + .reg_data = ov5640_setting_XGA_1024_768, + .reg_data_size = ARRAY_SIZE(ov5640_setting_XGA_1024_768), + .max_fps = OV5640_30_FPS }, { /* 1280x720 */ - OV5640_MODE_720P_1280_720, SUBSAMPLING, - OV5640_PIXEL_RATE_124M, - 1280, 1892, 720, 740, - ov5640_setting_720P_1280_720, - ARRAY_SIZE(ov5640_setting_720P_1280_720), - OV5640_30_FPS + .id = OV5640_MODE_720P_1280_720, + .dn_mode = SUBSAMPLING, + .pixel_rate = OV5640_PIXEL_RATE_124M, + .analog_crop = { + .left = 0, + .top = 250, + .width = 2623, + .height = 1705, + }, + .crop = { + .left = 16, + .top = 4, + .width = 1280, + .height = 720, + }, + .ppl = 1896, + .vblank_def = 20, + .reg_data = ov5640_setting_720P_1280_720, + .reg_data_size = ARRAY_SIZE(ov5640_setting_720P_1280_720), + .max_fps = OV5640_30_FPS }, { /* 1920x1080 */ - OV5640_MODE_1080P_1920_1080, SCALING, - OV5640_PIXEL_RATE_148M, - 1920, 2500, 1080, 1120, - ov5640_setting_1080P_1920_1080, - ARRAY_SIZE(ov5640_setting_1080P_1920_1080), - OV5640_30_FPS + .id = OV5640_MODE_1080P_1920_1080, + .dn_mode = SCALING, + .pixel_rate = OV5640_PIXEL_RATE_148M, + .analog_crop = { + .left = 336, + .top = 434, + .width = 2287, + .height = 1521, + }, + .crop = { + .left = 16, + .top = 4, + .width = 1920, + .height = 1080, + }, + .ppl = 2500, + .vblank_def = 40, + .reg_data = ov5640_setting_1080P_1920_1080, + .reg_data_size = ARRAY_SIZE(ov5640_setting_1080P_1920_1080), + .max_fps = OV5640_30_FPS }, { /* 2592x1944 */ - OV5640_MODE_QSXGA_2592_1944, SCALING, - OV5640_PIXEL_RATE_168M, - 2592, 2844, 1944, 1968, - ov5640_setting_QSXGA_2592_1944, - ARRAY_SIZE(ov5640_setting_QSXGA_2592_1944), - OV5640_15_FPS + .id = OV5640_MODE_QSXGA_2592_1944, + .dn_mode = SCALING, + .pixel_rate = OV5640_PIXEL_RATE_168M, + .analog_crop = { + .left = 0, + .top = 0, + .width = 2623, + .height = 1951, + }, + .crop = { + .left = 16, + .top = 4, + .width = 2592, + .height = 1944, + }, + .ppl = 2844, + .vblank_def = 24, + .reg_data = ov5640_setting_QSXGA_2592_1944, + .reg_data_size = ARRAY_SIZE(ov5640_setting_QSXGA_2592_1944), + .max_fps = OV5640_15_FPS }, }; @@ -1136,7 +1254,8 @@ static u64 ov5640_calc_pixel_rate(struct ov5640_dev *sensor) { u64 rate; - rate = sensor->current_mode->vtot * sensor->current_mode->htot; + rate = sensor->current_mode->ppl + * (sensor->current_mode->crop.height + sensor->current_mode->vblank_def); rate *= ov5640_framerates[sensor->current_fr]; return rate; @@ -1220,17 +1339,21 @@ static int ov5640_set_jpeg_timings(struct ov5640_dev *sensor, if (ret < 0) return ret; - ret = ov5640_write_reg16(sensor, OV5640_REG_VFIFO_HSIZE, mode->hact); + ret = ov5640_write_reg16(sensor, OV5640_REG_VFIFO_HSIZE, + mode->crop.width); if (ret < 0) return ret; - return ov5640_write_reg16(sensor, OV5640_REG_VFIFO_VSIZE, mode->vact); + return ov5640_write_reg16(sensor, OV5640_REG_VFIFO_VSIZE, + mode->crop.height); } /* download ov5640 settings to sensor through i2c */ static int ov5640_set_timings(struct ov5640_dev *sensor, const struct ov5640_mode_info *mode) { + const struct v4l2_rect *analog_crop = &mode->analog_crop; + const struct v4l2_rect *crop = &mode->crop; int ret; if (sensor->fmt.code == MEDIA_BUS_FMT_JPEG_1X8) { @@ -1239,19 +1362,54 @@ static int ov5640_set_timings(struct ov5640_dev *sensor, return ret; } - ret = ov5640_write_reg16(sensor, OV5640_REG_TIMING_DVPHO, mode->hact); + ret = ov5640_write_reg16(sensor, OV5640_REG_TIMING_HS, + analog_crop->left); + if (ret < 0) + return ret; + + ret = ov5640_write_reg16(sensor, OV5640_REG_TIMING_VS, + analog_crop->top); + if (ret < 0) + return ret; + + ret = ov5640_write_reg16(sensor, OV5640_REG_TIMING_HW, + analog_crop->width); + if (ret < 0) + return ret; + + ret = ov5640_write_reg16(sensor, OV5640_REG_TIMING_VH, + analog_crop->height); + if (ret < 0) + return ret; + + ret = ov5640_write_reg16(sensor, OV5640_REG_TIMING_DVPHO, crop->width); + if (ret < 0) + return ret; + + ret = ov5640_write_reg16(sensor, OV5640_REG_TIMING_DVPVO, crop->height); + if (ret < 0) + return ret; + + ret = ov5640_write_reg16(sensor, OV5640_REG_TIMING_HTS, mode->ppl); + if (ret < 0) + return ret; + + ret = ov5640_write_reg16(sensor, OV5640_REG_TIMING_VTS, + crop->height + mode->vblank_def); if (ret < 0) return ret; - ret = ov5640_write_reg16(sensor, OV5640_REG_TIMING_DVPVO, mode->vact); + ret = ov5640_write_reg16(sensor, OV5640_REG_TIMING_HOFFS, + crop->left); if (ret < 0) return ret; - ret = ov5640_write_reg16(sensor, OV5640_REG_TIMING_HTS, mode->htot); + ret = ov5640_write_reg16(sensor, OV5640_REG_TIMING_VOFFS, + crop->top); if (ret < 0) return ret; - return ov5640_write_reg16(sensor, OV5640_REG_TIMING_VTS, mode->vtot); + return 0; } static int ov5640_load_regs(struct ov5640_dev *sensor, @@ -1679,11 +1837,11 @@ ov5640_find_mode(struct ov5640_dev *sensor, enum ov5640_frame_rate fr, mode = v4l2_find_nearest_size(ov5640_mode_data, ARRAY_SIZE(ov5640_mode_data), - hact, vact, - width, height); + crop.width, crop.height, width, height); if (!mode || - (!nearest && (mode->hact != width || mode->vact != height))) + (!nearest && + (mode->crop.width != width || mode->crop.height != height))) return NULL; /* Check to see if the current mode exceeds the max frame rate */ @@ -2367,8 +2525,8 @@ static int ov5640_try_fmt_internal(struct v4l2_subdev *sd, mode = ov5640_find_mode(sensor, fr, fmt->width, fmt->height, true); if (!mode) return -EINVAL; - fmt->width = mode->hact; - fmt->height = mode->vact; + fmt->width = mode->crop.width; + fmt->height = mode->crop.height; if (new_mode) *new_mode = mode; @@ -2999,11 +3157,9 @@ static int ov5640_enum_frame_size(struct v4l2_subdev *sd, if (fse->index >= OV5640_NUM_MODES) return -EINVAL; - fse->min_width = - ov5640_mode_data[fse->index].hact; + fse->min_width = ov5640_mode_data[fse->index].crop.width; fse->max_width = fse->min_width; - fse->min_height = - ov5640_mode_data[fse->index].vact; + fse->min_height = ov5640_mode_data[fse->index].crop.height; fse->max_height = fse->min_height; return 0; @@ -3067,15 +3223,16 @@ static int ov5640_s_frame_interval(struct v4l2_subdev *sd, mode = sensor->current_mode; frame_rate = ov5640_try_frame_interval(sensor, &fi->interval, - mode->hact, mode->vact); + mode->crop.width, + mode->crop.height); if (frame_rate < 0) { /* Always return a valid frame interval value */ fi->interval = sensor->frame_interval; goto out; } - mode = ov5640_find_mode(sensor, frame_rate, mode->hact, - mode->vact, true); + mode = ov5640_find_mode(sensor, frame_rate, mode->crop.width, + mode->crop.height, true); if (!mode) { ret = -EINVAL; goto out;
The current definition of a sensor mode defines timings as follows: - hact, vact: Visible width and height - htot, vtot: Total sizes invluding blankings This makes difficult to clearly separate the visible sizes from the blankings and to make the vertical blanking programmable. Rework the sensor modes sizes definition to: - Report the analog crop sizes - Report the visible crop size - Report the total pixels per line as HBLANK is fixed - Report the VBLANK value to make it programmable Also modify the ov5640_set_timings() function to program all the windowing registers are remove them from the per-mode register-value tables. Signed-off-by: Jacopo Mondi <jacopo@jmondi.org> --- drivers/media/i2c/ov5640.c | 451 +++++++++++++++++++++++++------------ 1 file changed, 304 insertions(+), 147 deletions(-)