| Message ID | 20231218174042.794012-2-mike.rudenko@gmail.com (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | Omnivision OV4689 refactoring and improvements | expand |
HiMikhail, Thank you for the patch. On Mon, Dec 18, 2023 at 08:40:22PM +0300, Mikhail Rudenko wrote: > Many values in the register table are actually power-on > defaults. Remove those and also unused HDR exposures and gains. > Annotate the remaining values using the publicly available datasheet > to facilitate further development. No functional change intended. I'll trust you on that as I can't test the patch. > Signed-off-by: Mikhail Rudenko <mike.rudenko@gmail.com> > --- > drivers/media/i2c/ov4689.c | 203 +++++++++++++++++++++---------------- > 1 file changed, 118 insertions(+), 85 deletions(-) > > diff --git a/drivers/media/i2c/ov4689.c b/drivers/media/i2c/ov4689.c > index 403091651885..ff5213862974 100644 > --- a/drivers/media/i2c/ov4689.c > +++ b/drivers/media/i2c/ov4689.c > @@ -3,7 +3,7 @@ > * ov4689 driver > * > * Copyright (C) 2017 Fuzhou Rockchip Electronics Co., Ltd. > - * Copyright (C) 2022 Mikhail Rudenko > + * Copyright (C) 2022, 2023 Mikhail Rudenko > */ > > #include <linux/clk.h> > @@ -123,90 +123,123 @@ struct ov4689_gain_range { > * mipi_datarate per lane 1008Mbps > */ > static const struct regval ov4689_2688x1520_regs[] = { > - {0x0103, 0x01}, {0x3638, 0x00}, {0x0300, 0x00}, > - {0x0302, 0x2a}, {0x0303, 0x00}, {0x0304, 0x03}, > - {0x030b, 0x00}, {0x030d, 0x1e}, {0x030e, 0x04}, > - {0x030f, 0x01}, {0x0312, 0x01}, {0x031e, 0x00}, > - {0x3000, 0x20}, {0x3002, 0x00}, {0x3018, 0x72}, > - {0x3020, 0x93}, {0x3021, 0x03}, {0x3022, 0x01}, > - {0x3031, 0x0a}, {0x303f, 0x0c}, {0x3305, 0xf1}, > - {0x3307, 0x04}, {0x3309, 0x29}, {0x3500, 0x00}, > - {0x3501, 0x60}, {0x3502, 0x00}, {0x3503, 0x04}, > - {0x3504, 0x00}, {0x3505, 0x00}, {0x3506, 0x00}, > - {0x3507, 0x00}, {0x3508, 0x00}, {0x3509, 0x80}, > - {0x350a, 0x00}, {0x350b, 0x00}, {0x350c, 0x00}, > - {0x350d, 0x00}, {0x350e, 0x00}, {0x350f, 0x80}, > - {0x3510, 0x00}, {0x3511, 0x00}, {0x3512, 0x00}, > - {0x3513, 0x00}, {0x3514, 0x00}, {0x3515, 0x80}, > - {0x3516, 0x00}, {0x3517, 0x00}, {0x3518, 0x00}, > - {0x3519, 0x00}, {0x351a, 0x00}, {0x351b, 0x80}, > - {0x351c, 0x00}, {0x351d, 0x00}, {0x351e, 0x00}, > - {0x351f, 0x00}, {0x3520, 0x00}, {0x3521, 0x80}, > - {0x3522, 0x08}, {0x3524, 0x08}, {0x3526, 0x08}, > - {0x3528, 0x08}, {0x352a, 0x08}, {0x3602, 0x00}, > - {0x3603, 0x40}, {0x3604, 0x02}, {0x3605, 0x00}, > - {0x3606, 0x00}, {0x3607, 0x00}, {0x3609, 0x12}, > - {0x360a, 0x40}, {0x360c, 0x08}, {0x360f, 0xe5}, > - {0x3608, 0x8f}, {0x3611, 0x00}, {0x3613, 0xf7}, > - {0x3616, 0x58}, {0x3619, 0x99}, {0x361b, 0x60}, > - {0x361c, 0x7a}, {0x361e, 0x79}, {0x361f, 0x02}, > - {0x3632, 0x00}, {0x3633, 0x10}, {0x3634, 0x10}, > - {0x3635, 0x10}, {0x3636, 0x15}, {0x3646, 0x86}, > - {0x364a, 0x0b}, {0x3700, 0x17}, {0x3701, 0x22}, > - {0x3703, 0x10}, {0x370a, 0x37}, {0x3705, 0x00}, > - {0x3706, 0x63}, {0x3709, 0x3c}, {0x370b, 0x01}, > - {0x370c, 0x30}, {0x3710, 0x24}, {0x3711, 0x0c}, > - {0x3716, 0x00}, {0x3720, 0x28}, {0x3729, 0x7b}, > - {0x372a, 0x84}, {0x372b, 0xbd}, {0x372c, 0xbc}, > - {0x372e, 0x52}, {0x373c, 0x0e}, {0x373e, 0x33}, > - {0x3743, 0x10}, {0x3744, 0x88}, {0x3745, 0xc0}, > - {0x374a, 0x43}, {0x374c, 0x00}, {0x374e, 0x23}, > - {0x3751, 0x7b}, {0x3752, 0x84}, {0x3753, 0xbd}, > - {0x3754, 0xbc}, {0x3756, 0x52}, {0x375c, 0x00}, > - {0x3760, 0x00}, {0x3761, 0x00}, {0x3762, 0x00}, > - {0x3763, 0x00}, {0x3764, 0x00}, {0x3767, 0x04}, > - {0x3768, 0x04}, {0x3769, 0x08}, {0x376a, 0x08}, > - {0x376b, 0x20}, {0x376c, 0x00}, {0x376d, 0x00}, > - {0x376e, 0x00}, {0x3773, 0x00}, {0x3774, 0x51}, > - {0x3776, 0xbd}, {0x3777, 0xbd}, {0x3781, 0x18}, > - {0x3783, 0x25}, {0x3798, 0x1b}, {0x3800, 0x00}, > - {0x3801, 0x08}, {0x3802, 0x00}, {0x3803, 0x04}, > - {0x3804, 0x0a}, {0x3805, 0x97}, {0x3806, 0x05}, > - {0x3807, 0xfb}, {0x3808, 0x0a}, {0x3809, 0x80}, > - {0x380a, 0x05}, {0x380b, 0xf0}, {0x380c, 0x0a}, > - {0x380d, 0x0e}, {0x380e, 0x06}, {0x380f, 0x12}, > - {0x3810, 0x00}, {0x3811, 0x08}, {0x3812, 0x00}, > - {0x3813, 0x04}, {0x3814, 0x01}, {0x3815, 0x01}, > - {0x3819, 0x01}, {0x3820, 0x00}, {0x3821, 0x06}, > - {0x3829, 0x00}, {0x382a, 0x01}, {0x382b, 0x01}, > - {0x382d, 0x7f}, {0x3830, 0x04}, {0x3836, 0x01}, > - {0x3837, 0x00}, {0x3841, 0x02}, {0x3846, 0x08}, > - {0x3847, 0x07}, {0x3d85, 0x36}, {0x3d8c, 0x71}, > - {0x3d8d, 0xcb}, {0x3f0a, 0x00}, {0x4000, 0xf1}, > - {0x4001, 0x40}, {0x4002, 0x04}, {0x4003, 0x14}, > - {0x400e, 0x00}, {0x4011, 0x00}, {0x401a, 0x00}, > - {0x401b, 0x00}, {0x401c, 0x00}, {0x401d, 0x00}, > - {0x401f, 0x00}, {0x4020, 0x00}, {0x4021, 0x10}, > - {0x4022, 0x07}, {0x4023, 0xcf}, {0x4024, 0x09}, > - {0x4025, 0x60}, {0x4026, 0x09}, {0x4027, 0x6f}, > - {0x4028, 0x00}, {0x4029, 0x02}, {0x402a, 0x06}, > - {0x402b, 0x04}, {0x402c, 0x02}, {0x402d, 0x02}, > - {0x402e, 0x0e}, {0x402f, 0x04}, {0x4302, 0xff}, > - {0x4303, 0xff}, {0x4304, 0x00}, {0x4305, 0x00}, > - {0x4306, 0x00}, {0x4308, 0x02}, {0x4500, 0x6c}, > - {0x4501, 0xc4}, {0x4502, 0x40}, {0x4503, 0x01}, > - {0x4601, 0xa7}, {0x4800, 0x04}, {0x4813, 0x08}, > - {0x481f, 0x40}, {0x4829, 0x78}, {0x4837, 0x10}, > - {0x4b00, 0x2a}, {0x4b0d, 0x00}, {0x4d00, 0x04}, > - {0x4d01, 0x42}, {0x4d02, 0xd1}, {0x4d03, 0x93}, > - {0x4d04, 0xf5}, {0x4d05, 0xc1}, {0x5000, 0xf3}, > - {0x5001, 0x11}, {0x5004, 0x00}, {0x500a, 0x00}, > - {0x500b, 0x00}, {0x5032, 0x00}, {0x5040, 0x00}, > - {0x5050, 0x0c}, {0x5500, 0x00}, {0x5501, 0x10}, > - {0x5502, 0x01}, {0x5503, 0x0f}, {0x8000, 0x00}, > - {0x8001, 0x00}, {0x8002, 0x00}, {0x8003, 0x00}, > - {0x8004, 0x00}, {0x8005, 0x00}, {0x8006, 0x00}, > - {0x8007, 0x00}, {0x8008, 0x00}, {0x3638, 0x00}, > + /* System control*/ > + {0x0103, 0x01}, /* SC_CTRL0103 software_reset = 1 */ > + {0x3000, 0x20}, /* SC_CMMN_PAD_OEN0 FSIN_output_enable = 1 */ > + {0x3021, 0x03}, /* > + * SC_CMMN_MISC_CTRL fst_stby_ctr = 0, > + * sleep_no_latch_enable = 0 > + */ > + > + /* AEC PK */ > + {0x3503, 0x04}, /* AEC_MANUAL gain_input_as_sensor_gain_format = 1 */ > + {0x352a, 0x08}, /* DIG_GAIN_FRAC_LONG dig_gain_long[14:8] = 0x08 (2x) */ > + > + /* ADC and analog control*/ > + {0x3603, 0x40}, > + {0x3604, 0x02}, > + {0x3609, 0x12}, > + {0x360c, 0x08}, > + {0x360f, 0xe5}, > + {0x3608, 0x8f}, > + {0x3611, 0x00}, > + {0x3613, 0xf7}, > + {0x3616, 0x58}, > + {0x3619, 0x99}, > + {0x361b, 0x60}, > + {0x361e, 0x79}, > + {0x3634, 0x10}, > + {0x3635, 0x10}, > + {0x3636, 0x15}, > + {0x3646, 0x86}, > + {0x364a, 0x0b}, > + > + /* Sensor control */ > + {0x3700, 0x17}, > + {0x3701, 0x22}, > + {0x3703, 0x10}, > + {0x370a, 0x37}, > + {0x3706, 0x63}, > + {0x3709, 0x3c}, > + {0x370c, 0x30}, > + {0x3710, 0x24}, > + {0x3720, 0x28}, > + {0x3729, 0x7b}, > + {0x372b, 0xbd}, > + {0x372c, 0xbc}, > + {0x372e, 0x52}, > + {0x373c, 0x0e}, > + {0x373e, 0x33}, > + {0x3743, 0x10}, > + {0x3744, 0x88}, > + {0x3745, 0xc0}, > + {0x374c, 0x00}, > + {0x374e, 0x23}, > + {0x3751, 0x7b}, > + {0x3753, 0xbd}, > + {0x3754, 0xbc}, > + {0x3756, 0x52}, > + {0x376b, 0x20}, > + {0x3774, 0x51}, > + {0x3776, 0xbd}, > + {0x3777, 0xbd}, > + {0x3781, 0x18}, > + {0x3783, 0x25}, > + {0x3798, 0x1b}, > + > + /* Timing control */ > + {0x3801, 0x08}, /* H_CROP_START_L h_crop_start[7:0] = 0x08 */ It would be nice to define register macros for the known registers. This can be done in a separate patch. Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> > + {0x3805, 0x97}, /* H_CROP_END_L h_crop_end[7:0] = 0x97 */ > + {0x380c, 0x0a}, /* TIMING_HTS_H hts[14:8] = 0x0a */ > + {0x380d, 0x0e}, /* TIMING_HTS_L hts[7:0] = 0x0e */ > + {0x3811, 0x08}, /* H_WIN_OFF_L h_win_off[7:0] = 0x08*/ > + {0x3813, 0x04}, /* V_WIN_OFF_L v_win_off[7:0] = 0x04 */ > + {0x3819, 0x01}, /* VSYNC_END_L vsync_end_point[7:0] = 0x01 */ > + {0x3821, 0x06}, /* TIMING_FORMAT2 array_h_mirror = 1, digital_h_mirror = 1 */ > + > + /* OTP control */ > + {0x3d85, 0x36}, /* OTP_REG85 OTP_power_up_load_setting_enable = 1, > + * OTP_power_up_load_data_enable = 1, > + * OTP_bist_select = 1 (compare with zero) > + */ > + {0x3d8c, 0x71}, /* OTP_SETTING_STT_ADDRESS_H */ > + {0x3d8d, 0xcb}, /* OTP_SETTING_STT_ADDRESS_L */ > + > + /* BLC registers*/ > + {0x4001, 0x40}, /* DEBUG_MODE */ > + {0x401b, 0x00}, /* DEBUG_MODE */ > + {0x401d, 0x00}, /* DEBUG_MODE */ > + {0x401f, 0x00}, /* DEBUG_MODE */ > + {0x4020, 0x00}, /* ANCHOR_LEFT_START_H anchor_left_start[11:8] = 0 */ > + {0x4021, 0x10}, /* ANCHOR_LEFT_START_L anchor_left_start[7:0] = 0x10 */ > + {0x4022, 0x07}, /* ANCHOR_LEFT_END_H anchor_left_end[11:8] = 0x07 */ > + {0x4023, 0xcf}, /* ANCHOR_LEFT_END_L anchor_left_end[7:0] = 0xcf */ > + {0x4024, 0x09}, /* ANCHOR_RIGHT_START_H anchor_right_start[11:8] = 0x09 */ > + {0x4025, 0x60}, /* ANCHOR_RIGHT_START_L anchor_right_start[7:0] = 0x60 */ > + {0x4026, 0x09}, /* ANCHOR_RIGHT_END_H anchor_right_end[11:8] = 0x09 */ > + {0x4027, 0x6f}, /* ANCHOR_RIGHT_END_L anchor_right_end[7:0] = 0x6f */ > + > + /* ADC sync control */ > + {0x4500, 0x6c}, /* ADC_SYNC_CTRL */ > + {0x4503, 0x01}, /* ADC_SYNC_CTRL */ > + > + /* VFIFO */ > + {0x4601, 0xa7}, /* VFIFO_CTRL_01 r_vfifo_read_start[7:0] = 0xa7 */ > + > + /* Temperature monitor */ > + {0x4d00, 0x04}, /* TPM_CTRL_00 tmp_slope[15:8] = 0x04 */ > + {0x4d01, 0x42}, /* TPM_CTRL_01 tmp_slope[7:0] = 0x42 */ > + {0x4d02, 0xd1}, /* TPM_CTRL_02 tpm_offset[31:24] = 0xd1 */ > + {0x4d03, 0x93}, /* TPM_CTRL_03 tpm_offset[23:16] = 0x93 */ > + {0x4d04, 0xf5}, /* TPM_CTRL_04 tpm_offset[15:8] = 0xf5 */ > + {0x4d05, 0xc1}, /* TPM_CTRL_05 tpm_offset[7:0] = 0xc1 */ > + > + /* pre-ISP control */ > + {0x5050, 0x0c}, /* DEBUG_MODE */ > + > + /* OTP-DPC control */ > + {0x5501, 0x10}, /* OTP_DPC_START_L otp_start_address[7:0] = 0x10 */ > + {0x5503, 0x0f}, /* OTP_DPC_END_L otp_end_address[7:0] = 0x0f */ > {REG_NULL, 0x00}, > }; >
Hi Laurent, and thank for the review! On 2024-02-23 at 13:23 +02, Laurent Pinchart <laurent.pinchart@ideasonboard.com> wrote: > HiMikhail, > > Thank you for the patch. > > On Mon, Dec 18, 2023 at 08:40:22PM +0300, Mikhail Rudenko wrote: >> Many values in the register table are actually power-on >> defaults. Remove those and also unused HDR exposures and gains. >> Annotate the remaining values using the publicly available datasheet >> to facilitate further development. No functional change intended. > > I'll trust you on that as I can't test the patch. > >> Signed-off-by: Mikhail Rudenko <mike.rudenko@gmail.com> >> --- >> drivers/media/i2c/ov4689.c | 203 +++++++++++++++++++++---------------- >> 1 file changed, 118 insertions(+), 85 deletions(-) >> >> diff --git a/drivers/media/i2c/ov4689.c b/drivers/media/i2c/ov4689.c >> index 403091651885..ff5213862974 100644 >> --- a/drivers/media/i2c/ov4689.c >> +++ b/drivers/media/i2c/ov4689.c >> @@ -3,7 +3,7 @@ >> * ov4689 driver >> * >> * Copyright (C) 2017 Fuzhou Rockchip Electronics Co., Ltd. >> - * Copyright (C) 2022 Mikhail Rudenko >> + * Copyright (C) 2022, 2023 Mikhail Rudenko >> */ >> >> #include <linux/clk.h> >> @@ -123,90 +123,123 @@ struct ov4689_gain_range { >> * mipi_datarate per lane 1008Mbps >> */ >> static const struct regval ov4689_2688x1520_regs[] = { >> - {0x0103, 0x01}, {0x3638, 0x00}, {0x0300, 0x00}, >> - {0x0302, 0x2a}, {0x0303, 0x00}, {0x0304, 0x03}, >> - {0x030b, 0x00}, {0x030d, 0x1e}, {0x030e, 0x04}, >> - {0x030f, 0x01}, {0x0312, 0x01}, {0x031e, 0x00}, >> - {0x3000, 0x20}, {0x3002, 0x00}, {0x3018, 0x72}, >> - {0x3020, 0x93}, {0x3021, 0x03}, {0x3022, 0x01}, >> - {0x3031, 0x0a}, {0x303f, 0x0c}, {0x3305, 0xf1}, >> - {0x3307, 0x04}, {0x3309, 0x29}, {0x3500, 0x00}, >> - {0x3501, 0x60}, {0x3502, 0x00}, {0x3503, 0x04}, >> - {0x3504, 0x00}, {0x3505, 0x00}, {0x3506, 0x00}, >> - {0x3507, 0x00}, {0x3508, 0x00}, {0x3509, 0x80}, >> - {0x350a, 0x00}, {0x350b, 0x00}, {0x350c, 0x00}, >> - {0x350d, 0x00}, {0x350e, 0x00}, {0x350f, 0x80}, >> - {0x3510, 0x00}, {0x3511, 0x00}, {0x3512, 0x00}, >> - {0x3513, 0x00}, {0x3514, 0x00}, {0x3515, 0x80}, >> - {0x3516, 0x00}, {0x3517, 0x00}, {0x3518, 0x00}, >> - {0x3519, 0x00}, {0x351a, 0x00}, {0x351b, 0x80}, >> - {0x351c, 0x00}, {0x351d, 0x00}, {0x351e, 0x00}, >> - {0x351f, 0x00}, {0x3520, 0x00}, {0x3521, 0x80}, >> - {0x3522, 0x08}, {0x3524, 0x08}, {0x3526, 0x08}, >> - {0x3528, 0x08}, {0x352a, 0x08}, {0x3602, 0x00}, >> - {0x3603, 0x40}, {0x3604, 0x02}, {0x3605, 0x00}, >> - {0x3606, 0x00}, {0x3607, 0x00}, {0x3609, 0x12}, >> - {0x360a, 0x40}, {0x360c, 0x08}, {0x360f, 0xe5}, >> - {0x3608, 0x8f}, {0x3611, 0x00}, {0x3613, 0xf7}, >> - {0x3616, 0x58}, {0x3619, 0x99}, {0x361b, 0x60}, >> - {0x361c, 0x7a}, {0x361e, 0x79}, {0x361f, 0x02}, >> - {0x3632, 0x00}, {0x3633, 0x10}, {0x3634, 0x10}, >> - {0x3635, 0x10}, {0x3636, 0x15}, {0x3646, 0x86}, >> - {0x364a, 0x0b}, {0x3700, 0x17}, {0x3701, 0x22}, >> - {0x3703, 0x10}, {0x370a, 0x37}, {0x3705, 0x00}, >> - {0x3706, 0x63}, {0x3709, 0x3c}, {0x370b, 0x01}, >> - {0x370c, 0x30}, {0x3710, 0x24}, {0x3711, 0x0c}, >> - {0x3716, 0x00}, {0x3720, 0x28}, {0x3729, 0x7b}, >> - {0x372a, 0x84}, {0x372b, 0xbd}, {0x372c, 0xbc}, >> - {0x372e, 0x52}, {0x373c, 0x0e}, {0x373e, 0x33}, >> - {0x3743, 0x10}, {0x3744, 0x88}, {0x3745, 0xc0}, >> - {0x374a, 0x43}, {0x374c, 0x00}, {0x374e, 0x23}, >> - {0x3751, 0x7b}, {0x3752, 0x84}, {0x3753, 0xbd}, >> - {0x3754, 0xbc}, {0x3756, 0x52}, {0x375c, 0x00}, >> - {0x3760, 0x00}, {0x3761, 0x00}, {0x3762, 0x00}, >> - {0x3763, 0x00}, {0x3764, 0x00}, {0x3767, 0x04}, >> - {0x3768, 0x04}, {0x3769, 0x08}, {0x376a, 0x08}, >> - {0x376b, 0x20}, {0x376c, 0x00}, {0x376d, 0x00}, >> - {0x376e, 0x00}, {0x3773, 0x00}, {0x3774, 0x51}, >> - {0x3776, 0xbd}, {0x3777, 0xbd}, {0x3781, 0x18}, >> - {0x3783, 0x25}, {0x3798, 0x1b}, {0x3800, 0x00}, >> - {0x3801, 0x08}, {0x3802, 0x00}, {0x3803, 0x04}, >> - {0x3804, 0x0a}, {0x3805, 0x97}, {0x3806, 0x05}, >> - {0x3807, 0xfb}, {0x3808, 0x0a}, {0x3809, 0x80}, >> - {0x380a, 0x05}, {0x380b, 0xf0}, {0x380c, 0x0a}, >> - {0x380d, 0x0e}, {0x380e, 0x06}, {0x380f, 0x12}, >> - {0x3810, 0x00}, {0x3811, 0x08}, {0x3812, 0x00}, >> - {0x3813, 0x04}, {0x3814, 0x01}, {0x3815, 0x01}, >> - {0x3819, 0x01}, {0x3820, 0x00}, {0x3821, 0x06}, >> - {0x3829, 0x00}, {0x382a, 0x01}, {0x382b, 0x01}, >> - {0x382d, 0x7f}, {0x3830, 0x04}, {0x3836, 0x01}, >> - {0x3837, 0x00}, {0x3841, 0x02}, {0x3846, 0x08}, >> - {0x3847, 0x07}, {0x3d85, 0x36}, {0x3d8c, 0x71}, >> - {0x3d8d, 0xcb}, {0x3f0a, 0x00}, {0x4000, 0xf1}, >> - {0x4001, 0x40}, {0x4002, 0x04}, {0x4003, 0x14}, >> - {0x400e, 0x00}, {0x4011, 0x00}, {0x401a, 0x00}, >> - {0x401b, 0x00}, {0x401c, 0x00}, {0x401d, 0x00}, >> - {0x401f, 0x00}, {0x4020, 0x00}, {0x4021, 0x10}, >> - {0x4022, 0x07}, {0x4023, 0xcf}, {0x4024, 0x09}, >> - {0x4025, 0x60}, {0x4026, 0x09}, {0x4027, 0x6f}, >> - {0x4028, 0x00}, {0x4029, 0x02}, {0x402a, 0x06}, >> - {0x402b, 0x04}, {0x402c, 0x02}, {0x402d, 0x02}, >> - {0x402e, 0x0e}, {0x402f, 0x04}, {0x4302, 0xff}, >> - {0x4303, 0xff}, {0x4304, 0x00}, {0x4305, 0x00}, >> - {0x4306, 0x00}, {0x4308, 0x02}, {0x4500, 0x6c}, >> - {0x4501, 0xc4}, {0x4502, 0x40}, {0x4503, 0x01}, >> - {0x4601, 0xa7}, {0x4800, 0x04}, {0x4813, 0x08}, >> - {0x481f, 0x40}, {0x4829, 0x78}, {0x4837, 0x10}, >> - {0x4b00, 0x2a}, {0x4b0d, 0x00}, {0x4d00, 0x04}, >> - {0x4d01, 0x42}, {0x4d02, 0xd1}, {0x4d03, 0x93}, >> - {0x4d04, 0xf5}, {0x4d05, 0xc1}, {0x5000, 0xf3}, >> - {0x5001, 0x11}, {0x5004, 0x00}, {0x500a, 0x00}, >> - {0x500b, 0x00}, {0x5032, 0x00}, {0x5040, 0x00}, >> - {0x5050, 0x0c}, {0x5500, 0x00}, {0x5501, 0x10}, >> - {0x5502, 0x01}, {0x5503, 0x0f}, {0x8000, 0x00}, >> - {0x8001, 0x00}, {0x8002, 0x00}, {0x8003, 0x00}, >> - {0x8004, 0x00}, {0x8005, 0x00}, {0x8006, 0x00}, >> - {0x8007, 0x00}, {0x8008, 0x00}, {0x3638, 0x00}, >> + /* System control*/ >> + {0x0103, 0x01}, /* SC_CTRL0103 software_reset = 1 */ >> + {0x3000, 0x20}, /* SC_CMMN_PAD_OEN0 FSIN_output_enable = 1 */ >> + {0x3021, 0x03}, /* >> + * SC_CMMN_MISC_CTRL fst_stby_ctr = 0, >> + * sleep_no_latch_enable = 0 >> + */ >> + >> + /* AEC PK */ >> + {0x3503, 0x04}, /* AEC_MANUAL gain_input_as_sensor_gain_format = 1 */ >> + {0x352a, 0x08}, /* DIG_GAIN_FRAC_LONG dig_gain_long[14:8] = 0x08 (2x) */ >> + >> + /* ADC and analog control*/ >> + {0x3603, 0x40}, >> + {0x3604, 0x02}, >> + {0x3609, 0x12}, >> + {0x360c, 0x08}, >> + {0x360f, 0xe5}, >> + {0x3608, 0x8f}, >> + {0x3611, 0x00}, >> + {0x3613, 0xf7}, >> + {0x3616, 0x58}, >> + {0x3619, 0x99}, >> + {0x361b, 0x60}, >> + {0x361e, 0x79}, >> + {0x3634, 0x10}, >> + {0x3635, 0x10}, >> + {0x3636, 0x15}, >> + {0x3646, 0x86}, >> + {0x364a, 0x0b}, >> + >> + /* Sensor control */ >> + {0x3700, 0x17}, >> + {0x3701, 0x22}, >> + {0x3703, 0x10}, >> + {0x370a, 0x37}, >> + {0x3706, 0x63}, >> + {0x3709, 0x3c}, >> + {0x370c, 0x30}, >> + {0x3710, 0x24}, >> + {0x3720, 0x28}, >> + {0x3729, 0x7b}, >> + {0x372b, 0xbd}, >> + {0x372c, 0xbc}, >> + {0x372e, 0x52}, >> + {0x373c, 0x0e}, >> + {0x373e, 0x33}, >> + {0x3743, 0x10}, >> + {0x3744, 0x88}, >> + {0x3745, 0xc0}, >> + {0x374c, 0x00}, >> + {0x374e, 0x23}, >> + {0x3751, 0x7b}, >> + {0x3753, 0xbd}, >> + {0x3754, 0xbc}, >> + {0x3756, 0x52}, >> + {0x376b, 0x20}, >> + {0x3774, 0x51}, >> + {0x3776, 0xbd}, >> + {0x3777, 0xbd}, >> + {0x3781, 0x18}, >> + {0x3783, 0x25}, >> + {0x3798, 0x1b}, >> + >> + /* Timing control */ >> + {0x3801, 0x08}, /* H_CROP_START_L h_crop_start[7:0] = 0x08 */ > > It would be nice to define register macros for the known registers. This > can be done in a separate patch. Register defines are introduced throughout the series as soon they get users outside the register tables. For the remaining known registers, I'd prefer to introduce corresponding defines in a separate patch outside this series. > Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> > >> + {0x3805, 0x97}, /* H_CROP_END_L h_crop_end[7:0] = 0x97 */ >> + {0x380c, 0x0a}, /* TIMING_HTS_H hts[14:8] = 0x0a */ >> + {0x380d, 0x0e}, /* TIMING_HTS_L hts[7:0] = 0x0e */ >> + {0x3811, 0x08}, /* H_WIN_OFF_L h_win_off[7:0] = 0x08*/ >> + {0x3813, 0x04}, /* V_WIN_OFF_L v_win_off[7:0] = 0x04 */ >> + {0x3819, 0x01}, /* VSYNC_END_L vsync_end_point[7:0] = 0x01 */ >> + {0x3821, 0x06}, /* TIMING_FORMAT2 array_h_mirror = 1, digital_h_mirror = 1 */ >> + >> + /* OTP control */ >> + {0x3d85, 0x36}, /* OTP_REG85 OTP_power_up_load_setting_enable = 1, >> + * OTP_power_up_load_data_enable = 1, >> + * OTP_bist_select = 1 (compare with zero) >> + */ >> + {0x3d8c, 0x71}, /* OTP_SETTING_STT_ADDRESS_H */ >> + {0x3d8d, 0xcb}, /* OTP_SETTING_STT_ADDRESS_L */ >> + >> + /* BLC registers*/ >> + {0x4001, 0x40}, /* DEBUG_MODE */ >> + {0x401b, 0x00}, /* DEBUG_MODE */ >> + {0x401d, 0x00}, /* DEBUG_MODE */ >> + {0x401f, 0x00}, /* DEBUG_MODE */ >> + {0x4020, 0x00}, /* ANCHOR_LEFT_START_H anchor_left_start[11:8] = 0 */ >> + {0x4021, 0x10}, /* ANCHOR_LEFT_START_L anchor_left_start[7:0] = 0x10 */ >> + {0x4022, 0x07}, /* ANCHOR_LEFT_END_H anchor_left_end[11:8] = 0x07 */ >> + {0x4023, 0xcf}, /* ANCHOR_LEFT_END_L anchor_left_end[7:0] = 0xcf */ >> + {0x4024, 0x09}, /* ANCHOR_RIGHT_START_H anchor_right_start[11:8] = 0x09 */ >> + {0x4025, 0x60}, /* ANCHOR_RIGHT_START_L anchor_right_start[7:0] = 0x60 */ >> + {0x4026, 0x09}, /* ANCHOR_RIGHT_END_H anchor_right_end[11:8] = 0x09 */ >> + {0x4027, 0x6f}, /* ANCHOR_RIGHT_END_L anchor_right_end[7:0] = 0x6f */ >> + >> + /* ADC sync control */ >> + {0x4500, 0x6c}, /* ADC_SYNC_CTRL */ >> + {0x4503, 0x01}, /* ADC_SYNC_CTRL */ >> + >> + /* VFIFO */ >> + {0x4601, 0xa7}, /* VFIFO_CTRL_01 r_vfifo_read_start[7:0] = 0xa7 */ >> + >> + /* Temperature monitor */ >> + {0x4d00, 0x04}, /* TPM_CTRL_00 tmp_slope[15:8] = 0x04 */ >> + {0x4d01, 0x42}, /* TPM_CTRL_01 tmp_slope[7:0] = 0x42 */ >> + {0x4d02, 0xd1}, /* TPM_CTRL_02 tpm_offset[31:24] = 0xd1 */ >> + {0x4d03, 0x93}, /* TPM_CTRL_03 tpm_offset[23:16] = 0x93 */ >> + {0x4d04, 0xf5}, /* TPM_CTRL_04 tpm_offset[15:8] = 0xf5 */ >> + {0x4d05, 0xc1}, /* TPM_CTRL_05 tpm_offset[7:0] = 0xc1 */ >> + >> + /* pre-ISP control */ >> + {0x5050, 0x0c}, /* DEBUG_MODE */ >> + >> + /* OTP-DPC control */ >> + {0x5501, 0x10}, /* OTP_DPC_START_L otp_start_address[7:0] = 0x10 */ >> + {0x5503, 0x0f}, /* OTP_DPC_END_L otp_end_address[7:0] = 0x0f */ >> {REG_NULL, 0x00}, >> }; >> -- Best regards, Mikhail Rudenko
Hi Mikhail, On Fri, Feb 23, 2024 at 07:40:20PM +0300, Mikhail Rudenko wrote: > On 2024-02-23 at 13:23 +02, Laurent Pinchart <laurent.pinchart@ideasonboard.com> wrote: > > On Mon, Dec 18, 2023 at 08:40:22PM +0300, Mikhail Rudenko wrote: > >> Many values in the register table are actually power-on > >> defaults. Remove those and also unused HDR exposures and gains. > >> Annotate the remaining values using the publicly available datasheet > >> to facilitate further development. No functional change intended. > > > > I'll trust you on that as I can't test the patch. > > > >> Signed-off-by: Mikhail Rudenko <mike.rudenko@gmail.com> > >> --- > >> drivers/media/i2c/ov4689.c | 203 +++++++++++++++++++++---------------- > >> 1 file changed, 118 insertions(+), 85 deletions(-) > >> > >> diff --git a/drivers/media/i2c/ov4689.c b/drivers/media/i2c/ov4689.c > >> index 403091651885..ff5213862974 100644 > >> --- a/drivers/media/i2c/ov4689.c > >> +++ b/drivers/media/i2c/ov4689.c > >> @@ -3,7 +3,7 @@ > >> * ov4689 driver > >> * > >> * Copyright (C) 2017 Fuzhou Rockchip Electronics Co., Ltd. > >> - * Copyright (C) 2022 Mikhail Rudenko > >> + * Copyright (C) 2022, 2023 Mikhail Rudenko > >> */ > >> > >> #include <linux/clk.h> > >> @@ -123,90 +123,123 @@ struct ov4689_gain_range { > >> * mipi_datarate per lane 1008Mbps > >> */ > >> static const struct regval ov4689_2688x1520_regs[] = { > >> - {0x0103, 0x01}, {0x3638, 0x00}, {0x0300, 0x00}, > >> - {0x0302, 0x2a}, {0x0303, 0x00}, {0x0304, 0x03}, > >> - {0x030b, 0x00}, {0x030d, 0x1e}, {0x030e, 0x04}, > >> - {0x030f, 0x01}, {0x0312, 0x01}, {0x031e, 0x00}, > >> - {0x3000, 0x20}, {0x3002, 0x00}, {0x3018, 0x72}, > >> - {0x3020, 0x93}, {0x3021, 0x03}, {0x3022, 0x01}, > >> - {0x3031, 0x0a}, {0x303f, 0x0c}, {0x3305, 0xf1}, > >> - {0x3307, 0x04}, {0x3309, 0x29}, {0x3500, 0x00}, > >> - {0x3501, 0x60}, {0x3502, 0x00}, {0x3503, 0x04}, > >> - {0x3504, 0x00}, {0x3505, 0x00}, {0x3506, 0x00}, > >> - {0x3507, 0x00}, {0x3508, 0x00}, {0x3509, 0x80}, > >> - {0x350a, 0x00}, {0x350b, 0x00}, {0x350c, 0x00}, > >> - {0x350d, 0x00}, {0x350e, 0x00}, {0x350f, 0x80}, > >> - {0x3510, 0x00}, {0x3511, 0x00}, {0x3512, 0x00}, > >> - {0x3513, 0x00}, {0x3514, 0x00}, {0x3515, 0x80}, > >> - {0x3516, 0x00}, {0x3517, 0x00}, {0x3518, 0x00}, > >> - {0x3519, 0x00}, {0x351a, 0x00}, {0x351b, 0x80}, > >> - {0x351c, 0x00}, {0x351d, 0x00}, {0x351e, 0x00}, > >> - {0x351f, 0x00}, {0x3520, 0x00}, {0x3521, 0x80}, > >> - {0x3522, 0x08}, {0x3524, 0x08}, {0x3526, 0x08}, > >> - {0x3528, 0x08}, {0x352a, 0x08}, {0x3602, 0x00}, > >> - {0x3603, 0x40}, {0x3604, 0x02}, {0x3605, 0x00}, > >> - {0x3606, 0x00}, {0x3607, 0x00}, {0x3609, 0x12}, > >> - {0x360a, 0x40}, {0x360c, 0x08}, {0x360f, 0xe5}, > >> - {0x3608, 0x8f}, {0x3611, 0x00}, {0x3613, 0xf7}, > >> - {0x3616, 0x58}, {0x3619, 0x99}, {0x361b, 0x60}, > >> - {0x361c, 0x7a}, {0x361e, 0x79}, {0x361f, 0x02}, > >> - {0x3632, 0x00}, {0x3633, 0x10}, {0x3634, 0x10}, > >> - {0x3635, 0x10}, {0x3636, 0x15}, {0x3646, 0x86}, > >> - {0x364a, 0x0b}, {0x3700, 0x17}, {0x3701, 0x22}, > >> - {0x3703, 0x10}, {0x370a, 0x37}, {0x3705, 0x00}, > >> - {0x3706, 0x63}, {0x3709, 0x3c}, {0x370b, 0x01}, > >> - {0x370c, 0x30}, {0x3710, 0x24}, {0x3711, 0x0c}, > >> - {0x3716, 0x00}, {0x3720, 0x28}, {0x3729, 0x7b}, > >> - {0x372a, 0x84}, {0x372b, 0xbd}, {0x372c, 0xbc}, > >> - {0x372e, 0x52}, {0x373c, 0x0e}, {0x373e, 0x33}, > >> - {0x3743, 0x10}, {0x3744, 0x88}, {0x3745, 0xc0}, > >> - {0x374a, 0x43}, {0x374c, 0x00}, {0x374e, 0x23}, > >> - {0x3751, 0x7b}, {0x3752, 0x84}, {0x3753, 0xbd}, > >> - {0x3754, 0xbc}, {0x3756, 0x52}, {0x375c, 0x00}, > >> - {0x3760, 0x00}, {0x3761, 0x00}, {0x3762, 0x00}, > >> - {0x3763, 0x00}, {0x3764, 0x00}, {0x3767, 0x04}, > >> - {0x3768, 0x04}, {0x3769, 0x08}, {0x376a, 0x08}, > >> - {0x376b, 0x20}, {0x376c, 0x00}, {0x376d, 0x00}, > >> - {0x376e, 0x00}, {0x3773, 0x00}, {0x3774, 0x51}, > >> - {0x3776, 0xbd}, {0x3777, 0xbd}, {0x3781, 0x18}, > >> - {0x3783, 0x25}, {0x3798, 0x1b}, {0x3800, 0x00}, > >> - {0x3801, 0x08}, {0x3802, 0x00}, {0x3803, 0x04}, > >> - {0x3804, 0x0a}, {0x3805, 0x97}, {0x3806, 0x05}, > >> - {0x3807, 0xfb}, {0x3808, 0x0a}, {0x3809, 0x80}, > >> - {0x380a, 0x05}, {0x380b, 0xf0}, {0x380c, 0x0a}, > >> - {0x380d, 0x0e}, {0x380e, 0x06}, {0x380f, 0x12}, > >> - {0x3810, 0x00}, {0x3811, 0x08}, {0x3812, 0x00}, > >> - {0x3813, 0x04}, {0x3814, 0x01}, {0x3815, 0x01}, > >> - {0x3819, 0x01}, {0x3820, 0x00}, {0x3821, 0x06}, > >> - {0x3829, 0x00}, {0x382a, 0x01}, {0x382b, 0x01}, > >> - {0x382d, 0x7f}, {0x3830, 0x04}, {0x3836, 0x01}, > >> - {0x3837, 0x00}, {0x3841, 0x02}, {0x3846, 0x08}, > >> - {0x3847, 0x07}, {0x3d85, 0x36}, {0x3d8c, 0x71}, > >> - {0x3d8d, 0xcb}, {0x3f0a, 0x00}, {0x4000, 0xf1}, > >> - {0x4001, 0x40}, {0x4002, 0x04}, {0x4003, 0x14}, > >> - {0x400e, 0x00}, {0x4011, 0x00}, {0x401a, 0x00}, > >> - {0x401b, 0x00}, {0x401c, 0x00}, {0x401d, 0x00}, > >> - {0x401f, 0x00}, {0x4020, 0x00}, {0x4021, 0x10}, > >> - {0x4022, 0x07}, {0x4023, 0xcf}, {0x4024, 0x09}, > >> - {0x4025, 0x60}, {0x4026, 0x09}, {0x4027, 0x6f}, > >> - {0x4028, 0x00}, {0x4029, 0x02}, {0x402a, 0x06}, > >> - {0x402b, 0x04}, {0x402c, 0x02}, {0x402d, 0x02}, > >> - {0x402e, 0x0e}, {0x402f, 0x04}, {0x4302, 0xff}, > >> - {0x4303, 0xff}, {0x4304, 0x00}, {0x4305, 0x00}, > >> - {0x4306, 0x00}, {0x4308, 0x02}, {0x4500, 0x6c}, > >> - {0x4501, 0xc4}, {0x4502, 0x40}, {0x4503, 0x01}, > >> - {0x4601, 0xa7}, {0x4800, 0x04}, {0x4813, 0x08}, > >> - {0x481f, 0x40}, {0x4829, 0x78}, {0x4837, 0x10}, > >> - {0x4b00, 0x2a}, {0x4b0d, 0x00}, {0x4d00, 0x04}, > >> - {0x4d01, 0x42}, {0x4d02, 0xd1}, {0x4d03, 0x93}, > >> - {0x4d04, 0xf5}, {0x4d05, 0xc1}, {0x5000, 0xf3}, > >> - {0x5001, 0x11}, {0x5004, 0x00}, {0x500a, 0x00}, > >> - {0x500b, 0x00}, {0x5032, 0x00}, {0x5040, 0x00}, > >> - {0x5050, 0x0c}, {0x5500, 0x00}, {0x5501, 0x10}, > >> - {0x5502, 0x01}, {0x5503, 0x0f}, {0x8000, 0x00}, > >> - {0x8001, 0x00}, {0x8002, 0x00}, {0x8003, 0x00}, > >> - {0x8004, 0x00}, {0x8005, 0x00}, {0x8006, 0x00}, > >> - {0x8007, 0x00}, {0x8008, 0x00}, {0x3638, 0x00}, > >> + /* System control*/ > >> + {0x0103, 0x01}, /* SC_CTRL0103 software_reset = 1 */ > >> + {0x3000, 0x20}, /* SC_CMMN_PAD_OEN0 FSIN_output_enable = 1 */ > >> + {0x3021, 0x03}, /* > >> + * SC_CMMN_MISC_CTRL fst_stby_ctr = 0, > >> + * sleep_no_latch_enable = 0 > >> + */ > >> + > >> + /* AEC PK */ > >> + {0x3503, 0x04}, /* AEC_MANUAL gain_input_as_sensor_gain_format = 1 */ > >> + {0x352a, 0x08}, /* DIG_GAIN_FRAC_LONG dig_gain_long[14:8] = 0x08 (2x) */ > >> + > >> + /* ADC and analog control*/ > >> + {0x3603, 0x40}, > >> + {0x3604, 0x02}, > >> + {0x3609, 0x12}, > >> + {0x360c, 0x08}, > >> + {0x360f, 0xe5}, > >> + {0x3608, 0x8f}, > >> + {0x3611, 0x00}, > >> + {0x3613, 0xf7}, > >> + {0x3616, 0x58}, > >> + {0x3619, 0x99}, > >> + {0x361b, 0x60}, > >> + {0x361e, 0x79}, > >> + {0x3634, 0x10}, > >> + {0x3635, 0x10}, > >> + {0x3636, 0x15}, > >> + {0x3646, 0x86}, > >> + {0x364a, 0x0b}, > >> + > >> + /* Sensor control */ > >> + {0x3700, 0x17}, > >> + {0x3701, 0x22}, > >> + {0x3703, 0x10}, > >> + {0x370a, 0x37}, > >> + {0x3706, 0x63}, > >> + {0x3709, 0x3c}, > >> + {0x370c, 0x30}, > >> + {0x3710, 0x24}, > >> + {0x3720, 0x28}, > >> + {0x3729, 0x7b}, > >> + {0x372b, 0xbd}, > >> + {0x372c, 0xbc}, > >> + {0x372e, 0x52}, > >> + {0x373c, 0x0e}, > >> + {0x373e, 0x33}, > >> + {0x3743, 0x10}, > >> + {0x3744, 0x88}, > >> + {0x3745, 0xc0}, > >> + {0x374c, 0x00}, > >> + {0x374e, 0x23}, > >> + {0x3751, 0x7b}, > >> + {0x3753, 0xbd}, > >> + {0x3754, 0xbc}, > >> + {0x3756, 0x52}, > >> + {0x376b, 0x20}, > >> + {0x3774, 0x51}, > >> + {0x3776, 0xbd}, > >> + {0x3777, 0xbd}, > >> + {0x3781, 0x18}, > >> + {0x3783, 0x25}, > >> + {0x3798, 0x1b}, > >> + > >> + /* Timing control */ > >> + {0x3801, 0x08}, /* H_CROP_START_L h_crop_start[7:0] = 0x08 */ > > > > It would be nice to define register macros for the known registers. This > > can be done in a separate patch. > > Register defines are introduced throughout the series as soon they get > users outside the register tables. For the remaining known registers, I'd > prefer to introduce corresponding defines in a separate patch outside > this series. Sure, it can be done in a separate series (or just separate patch), no problem. > > Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> > > > >> + {0x3805, 0x97}, /* H_CROP_END_L h_crop_end[7:0] = 0x97 */ > >> + {0x380c, 0x0a}, /* TIMING_HTS_H hts[14:8] = 0x0a */ > >> + {0x380d, 0x0e}, /* TIMING_HTS_L hts[7:0] = 0x0e */ > >> + {0x3811, 0x08}, /* H_WIN_OFF_L h_win_off[7:0] = 0x08*/ > >> + {0x3813, 0x04}, /* V_WIN_OFF_L v_win_off[7:0] = 0x04 */ > >> + {0x3819, 0x01}, /* VSYNC_END_L vsync_end_point[7:0] = 0x01 */ > >> + {0x3821, 0x06}, /* TIMING_FORMAT2 array_h_mirror = 1, digital_h_mirror = 1 */ > >> + > >> + /* OTP control */ > >> + {0x3d85, 0x36}, /* OTP_REG85 OTP_power_up_load_setting_enable = 1, > >> + * OTP_power_up_load_data_enable = 1, > >> + * OTP_bist_select = 1 (compare with zero) > >> + */ > >> + {0x3d8c, 0x71}, /* OTP_SETTING_STT_ADDRESS_H */ > >> + {0x3d8d, 0xcb}, /* OTP_SETTING_STT_ADDRESS_L */ > >> + > >> + /* BLC registers*/ > >> + {0x4001, 0x40}, /* DEBUG_MODE */ > >> + {0x401b, 0x00}, /* DEBUG_MODE */ > >> + {0x401d, 0x00}, /* DEBUG_MODE */ > >> + {0x401f, 0x00}, /* DEBUG_MODE */ > >> + {0x4020, 0x00}, /* ANCHOR_LEFT_START_H anchor_left_start[11:8] = 0 */ > >> + {0x4021, 0x10}, /* ANCHOR_LEFT_START_L anchor_left_start[7:0] = 0x10 */ > >> + {0x4022, 0x07}, /* ANCHOR_LEFT_END_H anchor_left_end[11:8] = 0x07 */ > >> + {0x4023, 0xcf}, /* ANCHOR_LEFT_END_L anchor_left_end[7:0] = 0xcf */ > >> + {0x4024, 0x09}, /* ANCHOR_RIGHT_START_H anchor_right_start[11:8] = 0x09 */ > >> + {0x4025, 0x60}, /* ANCHOR_RIGHT_START_L anchor_right_start[7:0] = 0x60 */ > >> + {0x4026, 0x09}, /* ANCHOR_RIGHT_END_H anchor_right_end[11:8] = 0x09 */ > >> + {0x4027, 0x6f}, /* ANCHOR_RIGHT_END_L anchor_right_end[7:0] = 0x6f */ > >> + > >> + /* ADC sync control */ > >> + {0x4500, 0x6c}, /* ADC_SYNC_CTRL */ > >> + {0x4503, 0x01}, /* ADC_SYNC_CTRL */ > >> + > >> + /* VFIFO */ > >> + {0x4601, 0xa7}, /* VFIFO_CTRL_01 r_vfifo_read_start[7:0] = 0xa7 */ > >> + > >> + /* Temperature monitor */ > >> + {0x4d00, 0x04}, /* TPM_CTRL_00 tmp_slope[15:8] = 0x04 */ > >> + {0x4d01, 0x42}, /* TPM_CTRL_01 tmp_slope[7:0] = 0x42 */ > >> + {0x4d02, 0xd1}, /* TPM_CTRL_02 tpm_offset[31:24] = 0xd1 */ > >> + {0x4d03, 0x93}, /* TPM_CTRL_03 tpm_offset[23:16] = 0x93 */ > >> + {0x4d04, 0xf5}, /* TPM_CTRL_04 tpm_offset[15:8] = 0xf5 */ > >> + {0x4d05, 0xc1}, /* TPM_CTRL_05 tpm_offset[7:0] = 0xc1 */ > >> + > >> + /* pre-ISP control */ > >> + {0x5050, 0x0c}, /* DEBUG_MODE */ > >> + > >> + /* OTP-DPC control */ > >> + {0x5501, 0x10}, /* OTP_DPC_START_L otp_start_address[7:0] = 0x10 */ > >> + {0x5503, 0x0f}, /* OTP_DPC_END_L otp_end_address[7:0] = 0x0f */ > >> {REG_NULL, 0x00}, > >> }; > >>
diff --git a/drivers/media/i2c/ov4689.c b/drivers/media/i2c/ov4689.c index 403091651885..ff5213862974 100644 --- a/drivers/media/i2c/ov4689.c +++ b/drivers/media/i2c/ov4689.c @@ -3,7 +3,7 @@ * ov4689 driver * * Copyright (C) 2017 Fuzhou Rockchip Electronics Co., Ltd. - * Copyright (C) 2022 Mikhail Rudenko + * Copyright (C) 2022, 2023 Mikhail Rudenko */ #include <linux/clk.h> @@ -123,90 +123,123 @@ struct ov4689_gain_range { * mipi_datarate per lane 1008Mbps */ static const struct regval ov4689_2688x1520_regs[] = { - {0x0103, 0x01}, {0x3638, 0x00}, {0x0300, 0x00}, - {0x0302, 0x2a}, {0x0303, 0x00}, {0x0304, 0x03}, - {0x030b, 0x00}, {0x030d, 0x1e}, {0x030e, 0x04}, - {0x030f, 0x01}, {0x0312, 0x01}, {0x031e, 0x00}, - {0x3000, 0x20}, {0x3002, 0x00}, {0x3018, 0x72}, - {0x3020, 0x93}, {0x3021, 0x03}, {0x3022, 0x01}, - {0x3031, 0x0a}, {0x303f, 0x0c}, {0x3305, 0xf1}, - {0x3307, 0x04}, {0x3309, 0x29}, {0x3500, 0x00}, - {0x3501, 0x60}, {0x3502, 0x00}, {0x3503, 0x04}, - {0x3504, 0x00}, {0x3505, 0x00}, {0x3506, 0x00}, - {0x3507, 0x00}, {0x3508, 0x00}, {0x3509, 0x80}, - {0x350a, 0x00}, {0x350b, 0x00}, {0x350c, 0x00}, - {0x350d, 0x00}, {0x350e, 0x00}, {0x350f, 0x80}, - {0x3510, 0x00}, {0x3511, 0x00}, {0x3512, 0x00}, - {0x3513, 0x00}, {0x3514, 0x00}, {0x3515, 0x80}, - {0x3516, 0x00}, {0x3517, 0x00}, {0x3518, 0x00}, - {0x3519, 0x00}, {0x351a, 0x00}, {0x351b, 0x80}, - {0x351c, 0x00}, {0x351d, 0x00}, {0x351e, 0x00}, - {0x351f, 0x00}, {0x3520, 0x00}, {0x3521, 0x80}, - {0x3522, 0x08}, {0x3524, 0x08}, {0x3526, 0x08}, - {0x3528, 0x08}, {0x352a, 0x08}, {0x3602, 0x00}, - {0x3603, 0x40}, {0x3604, 0x02}, {0x3605, 0x00}, - {0x3606, 0x00}, {0x3607, 0x00}, {0x3609, 0x12}, - {0x360a, 0x40}, {0x360c, 0x08}, {0x360f, 0xe5}, - {0x3608, 0x8f}, {0x3611, 0x00}, {0x3613, 0xf7}, - {0x3616, 0x58}, {0x3619, 0x99}, {0x361b, 0x60}, - {0x361c, 0x7a}, {0x361e, 0x79}, {0x361f, 0x02}, - {0x3632, 0x00}, {0x3633, 0x10}, {0x3634, 0x10}, - {0x3635, 0x10}, {0x3636, 0x15}, {0x3646, 0x86}, - {0x364a, 0x0b}, {0x3700, 0x17}, {0x3701, 0x22}, - {0x3703, 0x10}, {0x370a, 0x37}, {0x3705, 0x00}, - {0x3706, 0x63}, {0x3709, 0x3c}, {0x370b, 0x01}, - {0x370c, 0x30}, {0x3710, 0x24}, {0x3711, 0x0c}, - {0x3716, 0x00}, {0x3720, 0x28}, {0x3729, 0x7b}, - {0x372a, 0x84}, {0x372b, 0xbd}, {0x372c, 0xbc}, - {0x372e, 0x52}, {0x373c, 0x0e}, {0x373e, 0x33}, - {0x3743, 0x10}, {0x3744, 0x88}, {0x3745, 0xc0}, - {0x374a, 0x43}, {0x374c, 0x00}, {0x374e, 0x23}, - {0x3751, 0x7b}, {0x3752, 0x84}, {0x3753, 0xbd}, - {0x3754, 0xbc}, {0x3756, 0x52}, {0x375c, 0x00}, - {0x3760, 0x00}, {0x3761, 0x00}, {0x3762, 0x00}, - {0x3763, 0x00}, {0x3764, 0x00}, {0x3767, 0x04}, - {0x3768, 0x04}, {0x3769, 0x08}, {0x376a, 0x08}, - {0x376b, 0x20}, {0x376c, 0x00}, {0x376d, 0x00}, - {0x376e, 0x00}, {0x3773, 0x00}, {0x3774, 0x51}, - {0x3776, 0xbd}, {0x3777, 0xbd}, {0x3781, 0x18}, - {0x3783, 0x25}, {0x3798, 0x1b}, {0x3800, 0x00}, - {0x3801, 0x08}, {0x3802, 0x00}, {0x3803, 0x04}, - {0x3804, 0x0a}, {0x3805, 0x97}, {0x3806, 0x05}, - {0x3807, 0xfb}, {0x3808, 0x0a}, {0x3809, 0x80}, - {0x380a, 0x05}, {0x380b, 0xf0}, {0x380c, 0x0a}, - {0x380d, 0x0e}, {0x380e, 0x06}, {0x380f, 0x12}, - {0x3810, 0x00}, {0x3811, 0x08}, {0x3812, 0x00}, - {0x3813, 0x04}, {0x3814, 0x01}, {0x3815, 0x01}, - {0x3819, 0x01}, {0x3820, 0x00}, {0x3821, 0x06}, - {0x3829, 0x00}, {0x382a, 0x01}, {0x382b, 0x01}, - {0x382d, 0x7f}, {0x3830, 0x04}, {0x3836, 0x01}, - {0x3837, 0x00}, {0x3841, 0x02}, {0x3846, 0x08}, - {0x3847, 0x07}, {0x3d85, 0x36}, {0x3d8c, 0x71}, - {0x3d8d, 0xcb}, {0x3f0a, 0x00}, {0x4000, 0xf1}, - {0x4001, 0x40}, {0x4002, 0x04}, {0x4003, 0x14}, - {0x400e, 0x00}, {0x4011, 0x00}, {0x401a, 0x00}, - {0x401b, 0x00}, {0x401c, 0x00}, {0x401d, 0x00}, - {0x401f, 0x00}, {0x4020, 0x00}, {0x4021, 0x10}, - {0x4022, 0x07}, {0x4023, 0xcf}, {0x4024, 0x09}, - {0x4025, 0x60}, {0x4026, 0x09}, {0x4027, 0x6f}, - {0x4028, 0x00}, {0x4029, 0x02}, {0x402a, 0x06}, - {0x402b, 0x04}, {0x402c, 0x02}, {0x402d, 0x02}, - {0x402e, 0x0e}, {0x402f, 0x04}, {0x4302, 0xff}, - {0x4303, 0xff}, {0x4304, 0x00}, {0x4305, 0x00}, - {0x4306, 0x00}, {0x4308, 0x02}, {0x4500, 0x6c}, - {0x4501, 0xc4}, {0x4502, 0x40}, {0x4503, 0x01}, - {0x4601, 0xa7}, {0x4800, 0x04}, {0x4813, 0x08}, - {0x481f, 0x40}, {0x4829, 0x78}, {0x4837, 0x10}, - {0x4b00, 0x2a}, {0x4b0d, 0x00}, {0x4d00, 0x04}, - {0x4d01, 0x42}, {0x4d02, 0xd1}, {0x4d03, 0x93}, - {0x4d04, 0xf5}, {0x4d05, 0xc1}, {0x5000, 0xf3}, - {0x5001, 0x11}, {0x5004, 0x00}, {0x500a, 0x00}, - {0x500b, 0x00}, {0x5032, 0x00}, {0x5040, 0x00}, - {0x5050, 0x0c}, {0x5500, 0x00}, {0x5501, 0x10}, - {0x5502, 0x01}, {0x5503, 0x0f}, {0x8000, 0x00}, - {0x8001, 0x00}, {0x8002, 0x00}, {0x8003, 0x00}, - {0x8004, 0x00}, {0x8005, 0x00}, {0x8006, 0x00}, - {0x8007, 0x00}, {0x8008, 0x00}, {0x3638, 0x00}, + /* System control*/ + {0x0103, 0x01}, /* SC_CTRL0103 software_reset = 1 */ + {0x3000, 0x20}, /* SC_CMMN_PAD_OEN0 FSIN_output_enable = 1 */ + {0x3021, 0x03}, /* + * SC_CMMN_MISC_CTRL fst_stby_ctr = 0, + * sleep_no_latch_enable = 0 + */ + + /* AEC PK */ + {0x3503, 0x04}, /* AEC_MANUAL gain_input_as_sensor_gain_format = 1 */ + {0x352a, 0x08}, /* DIG_GAIN_FRAC_LONG dig_gain_long[14:8] = 0x08 (2x) */ + + /* ADC and analog control*/ + {0x3603, 0x40}, + {0x3604, 0x02}, + {0x3609, 0x12}, + {0x360c, 0x08}, + {0x360f, 0xe5}, + {0x3608, 0x8f}, + {0x3611, 0x00}, + {0x3613, 0xf7}, + {0x3616, 0x58}, + {0x3619, 0x99}, + {0x361b, 0x60}, + {0x361e, 0x79}, + {0x3634, 0x10}, + {0x3635, 0x10}, + {0x3636, 0x15}, + {0x3646, 0x86}, + {0x364a, 0x0b}, + + /* Sensor control */ + {0x3700, 0x17}, + {0x3701, 0x22}, + {0x3703, 0x10}, + {0x370a, 0x37}, + {0x3706, 0x63}, + {0x3709, 0x3c}, + {0x370c, 0x30}, + {0x3710, 0x24}, + {0x3720, 0x28}, + {0x3729, 0x7b}, + {0x372b, 0xbd}, + {0x372c, 0xbc}, + {0x372e, 0x52}, + {0x373c, 0x0e}, + {0x373e, 0x33}, + {0x3743, 0x10}, + {0x3744, 0x88}, + {0x3745, 0xc0}, + {0x374c, 0x00}, + {0x374e, 0x23}, + {0x3751, 0x7b}, + {0x3753, 0xbd}, + {0x3754, 0xbc}, + {0x3756, 0x52}, + {0x376b, 0x20}, + {0x3774, 0x51}, + {0x3776, 0xbd}, + {0x3777, 0xbd}, + {0x3781, 0x18}, + {0x3783, 0x25}, + {0x3798, 0x1b}, + + /* Timing control */ + {0x3801, 0x08}, /* H_CROP_START_L h_crop_start[7:0] = 0x08 */ + {0x3805, 0x97}, /* H_CROP_END_L h_crop_end[7:0] = 0x97 */ + {0x380c, 0x0a}, /* TIMING_HTS_H hts[14:8] = 0x0a */ + {0x380d, 0x0e}, /* TIMING_HTS_L hts[7:0] = 0x0e */ + {0x3811, 0x08}, /* H_WIN_OFF_L h_win_off[7:0] = 0x08*/ + {0x3813, 0x04}, /* V_WIN_OFF_L v_win_off[7:0] = 0x04 */ + {0x3819, 0x01}, /* VSYNC_END_L vsync_end_point[7:0] = 0x01 */ + {0x3821, 0x06}, /* TIMING_FORMAT2 array_h_mirror = 1, digital_h_mirror = 1 */ + + /* OTP control */ + {0x3d85, 0x36}, /* OTP_REG85 OTP_power_up_load_setting_enable = 1, + * OTP_power_up_load_data_enable = 1, + * OTP_bist_select = 1 (compare with zero) + */ + {0x3d8c, 0x71}, /* OTP_SETTING_STT_ADDRESS_H */ + {0x3d8d, 0xcb}, /* OTP_SETTING_STT_ADDRESS_L */ + + /* BLC registers*/ + {0x4001, 0x40}, /* DEBUG_MODE */ + {0x401b, 0x00}, /* DEBUG_MODE */ + {0x401d, 0x00}, /* DEBUG_MODE */ + {0x401f, 0x00}, /* DEBUG_MODE */ + {0x4020, 0x00}, /* ANCHOR_LEFT_START_H anchor_left_start[11:8] = 0 */ + {0x4021, 0x10}, /* ANCHOR_LEFT_START_L anchor_left_start[7:0] = 0x10 */ + {0x4022, 0x07}, /* ANCHOR_LEFT_END_H anchor_left_end[11:8] = 0x07 */ + {0x4023, 0xcf}, /* ANCHOR_LEFT_END_L anchor_left_end[7:0] = 0xcf */ + {0x4024, 0x09}, /* ANCHOR_RIGHT_START_H anchor_right_start[11:8] = 0x09 */ + {0x4025, 0x60}, /* ANCHOR_RIGHT_START_L anchor_right_start[7:0] = 0x60 */ + {0x4026, 0x09}, /* ANCHOR_RIGHT_END_H anchor_right_end[11:8] = 0x09 */ + {0x4027, 0x6f}, /* ANCHOR_RIGHT_END_L anchor_right_end[7:0] = 0x6f */ + + /* ADC sync control */ + {0x4500, 0x6c}, /* ADC_SYNC_CTRL */ + {0x4503, 0x01}, /* ADC_SYNC_CTRL */ + + /* VFIFO */ + {0x4601, 0xa7}, /* VFIFO_CTRL_01 r_vfifo_read_start[7:0] = 0xa7 */ + + /* Temperature monitor */ + {0x4d00, 0x04}, /* TPM_CTRL_00 tmp_slope[15:8] = 0x04 */ + {0x4d01, 0x42}, /* TPM_CTRL_01 tmp_slope[7:0] = 0x42 */ + {0x4d02, 0xd1}, /* TPM_CTRL_02 tpm_offset[31:24] = 0xd1 */ + {0x4d03, 0x93}, /* TPM_CTRL_03 tpm_offset[23:16] = 0x93 */ + {0x4d04, 0xf5}, /* TPM_CTRL_04 tpm_offset[15:8] = 0xf5 */ + {0x4d05, 0xc1}, /* TPM_CTRL_05 tpm_offset[7:0] = 0xc1 */ + + /* pre-ISP control */ + {0x5050, 0x0c}, /* DEBUG_MODE */ + + /* OTP-DPC control */ + {0x5501, 0x10}, /* OTP_DPC_START_L otp_start_address[7:0] = 0x10 */ + {0x5503, 0x0f}, /* OTP_DPC_END_L otp_end_address[7:0] = 0x0f */ {REG_NULL, 0x00}, };
Many values in the register table are actually power-on defaults. Remove those and also unused HDR exposures and gains. Annotate the remaining values using the publicly available datasheet to facilitate further development. No functional change intended. Signed-off-by: Mikhail Rudenko <mike.rudenko@gmail.com> --- drivers/media/i2c/ov4689.c | 203 +++++++++++++++++++++---------------- 1 file changed, 118 insertions(+), 85 deletions(-)