Omnivision OV4689 refactoring and improvements
Mikhail Rudenko
maintainerv5 cover Omnivision OV4689 refactoring and improvements
Hi,
this is the fourth revision of the series containing refactoring and new features implementation for the Omnivision OV4689 sensor driver. Specifically, patches 1, 2, 3, 5, 6, 10, 15, 16 are refactorings, and are not supposed to introduce any functional change. Patches 4 and 7 perform migration to CCI helpers and subdevice active state respectively, and should not introduce any hardware- and/or user-visible change either. Patch 8 fixes a possible race condition due to v4l2_async_register_subdev_sensor being called too early in ov4689_probe, and patch 9 migrates power management to PM autosuspend.
Patches 11-14 expose more sensor controls to the userspace, such as (read-write) HBLANK, VFLIP/HFLIP, digital gain, and color balance. It should be noted that publicly available sensor documentation is lacking description of many registers and their value ranges, so a lot of values had to be found by experimentation.
Patches 17-20 from v4 are dropped and will be reintroduced as a separate series later.
Changes in v5:
- add spaces inside {} in the register tables
Changes in v4:
- rebase on top of media_stage
- collect Reviewed-by's from v3
- add comments "Horizontal" and "Vertical" to TIMING_FORMAT registers
- fix a typo in the commit message in patch 17/20
- remove "__" prefix from stream on/off functions
- rename the label in ov4689_stream_off and remove extra space
Changes in v3:
- rebase on top of media_stage
- collect Reviewed-by and Acked-by from v2
- update copyright year
- zero-initialize ret in ov4689_set_ctrl
- get back blank line before return in ov4689_set_ctrl
- move sd->flags |= V4L2_SUBDEV_FL_HAS_DEVNODE before ov4689_initialize_controls() in ov4689_probe
- remove blank line after v4l2_subdev_init_finalize(sd)
- use pm_runtime_put instead of pm_runtime_put_sync
- add comment for dummy columns/rows defines
- fix OV4689_PIXEL_ARRAY_WIDTH use instead of OV4689_PIXEL_ARRAY_HEIGHT in ov4689_get_selection
- split s_stream into two functions for start and stop
Changes in v2:
- collect Laurent's r-b's
- squash together "CCI conversion" and "Set gain in one 16 bit write"
- use ctrl->val in ov4689_set_ctrl
- rename try_fmt to fmt in ov4689_init_cfg and drop corresponding comment
- rebase on top of media-stage and rename init_cfg->init_state
- sort register definitions by address throughout the whole series
- fix number of controls hint in v4l2_ctrl_handler_init
- make all hexadecimal constants lowercase
- disable runtime pm in probe error path
- implement pm autosuspend
Mikhail Rudenko (16):
media: i2c: ov4689: Clean up and annotate the register table
media: i2c: ov4689: Sort register definitions by address
media: i2c: ov4689: Fix typo in a comment
media: i2c: ov4689: CCI conversion
media: i2c: ov4689: Remove i2c_client from ov4689 struct
media: i2c: ov4689: Refactor ov4689_set_ctrl
media: i2c: ov4689: Use sub-device active state
media: i2c: ov4689: Enable runtime PM before registering sub-device
media: i2c: ov4689: Use runtime PM autosuspend
media: i2c: ov4689: Remove max_fps field from struct ov4689_mode
media: i2c: ov4689: Make horizontal blanking configurable
media: i2c: ov4689: Implement vflip/hflip controls
media: i2c: ov4689: Implement digital gain control
media: i2c: ov4689: Implement manual color balance controls
media: i2c: ov4689: Move pixel array size out of struct ov4689_mode
media: i2c: ov4689: Set timing registers programmatically
drivers/media/i2c/Kconfig | 1 + drivers/media/i2c/ov4689.c | 671 ++++++++++++++++++++----------------- 2 files changed, 359 insertions(+), 313 deletions(-)
--
2.44.0
Mikhail Rudenko
maintainerPATCH v5 1/16 media: i2c: ov4689: Clean up and annotate the register table
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.
--- drivers/media/i2c/ov4689.c | 205 +++++++++++++++++++++---------------- 1 file changed, 119 insertions(+), 86 deletions(-)
drivers/media/i2c/ov4689.c +119 -86
@@ -3,7 +3,7 @@* ov4689 driver * * Copyright (C) 2017 Fuzhou Rockchip Electronics Co., Ltd. -* Copyright (C) 2022 Mikhail Rudenko +* Copyright (C) 2022, 2024 Mikhail Rudenko */ #include <linux/clk.h>
@@ -123,91 +123,124 @@ 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 }, - {REG_NULL ,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 }, };static const struct ov4689_mode supported_modes[] = {
Signature · 1 line
2.44.0
Mikhail Rudenko
maintainerPATCH v5 2/16 media: i2c: ov4689: Sort register definitions by address
In reply to Mikhail RudenkoPut register defininitions in the order of increasing register address.
--- drivers/media/i2c/ov4689.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
drivers/media/i2c/ov4689.c +5 -5
@@ -19,15 +19,15 @@#include <media/v4l2-subdev.h> #include <media/v4l2-fwnode.h> -#define CHIP_ID 0x004688 -#define OV4689_REG_CHIP_ID 0x300a -#define OV4689_XVCLK_FREQ 24000000#define OV4689_REG_CTRL_MODE 0x0100#define OV4689_MODE_SW_STANDBY 0x0#define OV4689_MODE_STREAMING BIT(0) +#define OV4689_REG_CHIP_ID 0x300a +#define CHIP_ID 0x004688 +#define OV4689_REG_EXPOSURE 0x3500#define OV4689_EXPOSURE_MIN 4#define OV4689_EXPOSURE_STEP 1
@@ -41,12 +41,12 @@#define OV4689_GAIN_STEP 1#define OV4689_GAIN_DEFAULT 0x80 +#define OV4689_REG_VTS 0x380e +#define OV4689_REG_TEST_PATTERN 0x5040#define OV4689_TEST_PATTERN_ENABLE 0x80#define OV4689_TEST_PATTERN_DISABLE 0x0 -#define OV4689_REG_VTS 0x380e -#define REG_NULL 0xFFFF#define OV4689_REG_VALUE_08BIT 1
Signature · 1 line
2.44.0
Mikhail Rudenko
maintainerPATCH v5 3/16 media: i2c: ov4689: Fix typo in a comment
In reply to Mikhail RudenkoFix a spelling error in a comment.
--- drivers/media/i2c/ov4689.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/media/i2c/ov4689.c +1 -1
@@ -692,7 +692,7 @@ static int ov4689_set_ctrl(struct v4l2_ctrl *ctrl)switch (ctrl->id) {case V4L2_CID_EXPOSURE : -/* 4 least significant bits of expsoure are fractional part */ +/* 4 least significant bits of exposure are fractional part */ ret =ov4689_write_reg (ov4689->client,OV4689_REG_EXPOSURE ,OV4689_REG_VALUE_24BIT , ctrl->val <<4 );break ;
Signature · 1 line
2.44.0
Mikhail Rudenko
maintainerPATCH v5 4/16 media: i2c: ov4689: CCI conversion
In reply to Mikhail RudenkoConvert the i2c register accesses to utilize the CCI helper library rather than relying on driver-specific functions. Also, set analogue gain in a single 16-bit write instead of two 8-bit writes.
--- drivers/media/i2c/Kconfig | 1 + drivers/media/i2c/ov4689.c | 358 ++++++++++++++----------------------- 2 files changed, 133 insertions(+), 226 deletions(-)
drivers/media/i2c/Kconfig +1 -0
@@ -405,6 +405,7 @@ config VIDEO_OV2740 config VIDEO_OV4689 tristate "OmniVision OV4689 sensor support" depends on GPIOLIB + select V4L2_CCI_I2C help This is a Video4Linux2 sensor-level driver for the OmniVision OV4689 camera.
drivers/media/i2c/ov4689.c +132 -226
496 lines not on this page · raw message
Signature · 1 line
2.44.0
Mikhail Rudenko
maintainerPATCH v5 5/16 media: i2c: ov4689: Remove i2c_client from ov4689 struct
In reply to Mikhail RudenkoThe 'client' field within the 'ov4689' structure is solely used to access its 'dev' member. This commit removes the 'client' field and directly stores a pointer to the 'struct device'.
--- drivers/media/i2c/ov4689.c | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-)
drivers/media/i2c/ov4689.c +18 -18
@@ -74,7 +74,7 @@ struct ov4689_mode { };struct ov4689 { -struct i2c_client *client; +struct device *dev;struct regmap *regmap;struct clk *xvclk;struct gpio_desc *reset_gpio;
@@ -405,13 +405,13 @@ static int ov4689_get_selection(struct v4l2_subdev *sd,static int ov4689_s_stream (struct v4l2_subdev *sd,int on) {struct ov4689 *ov4689 =to_ov4689 (sd); -struct i2c_client *client = ov4689->client; +struct device *dev = ov4689->dev;int ret =0 ;mutex_lock (&ov4689->mutex);if (on) { - ret =pm_runtime_resume_and_get (&client->dev); + ret =pm_runtime_resume_and_get (dev);if (ret <0 ) goto unlock_and_return;
@@ -420,26 +420,26 @@ static int ov4689_s_stream(struct v4l2_subdev *sd, int on) ov4689->cur_mode->num_regs, NULL);if (ret) { -pm_runtime_put (&client->dev); +pm_runtime_put (dev); goto unlock_and_return; } ret =__v4l2_ctrl_handler_setup (&ov4689->ctrl_handler);if (ret) { -pm_runtime_put (&client->dev); +pm_runtime_put (dev); goto unlock_and_return; } ret =cci_write (ov4689->regmap,OV4689_REG_CTRL_MODE ,OV4689_MODE_STREAMING ,NULL );if (ret) { -pm_runtime_put (&client->dev); +pm_runtime_put (dev); goto unlock_and_return; } }else {cci_write (ov4689->regmap,OV4689_REG_CTRL_MODE ,OV4689_MODE_SW_STANDBY ,NULL ); -pm_runtime_put (&client->dev); +pm_runtime_put (dev); } unlock_and_return:
@@ -553,7 +553,6 @@ static const struct v4l2_subdev_ops ov4689_subdev_ops = {*/ static int ov4689_map_gain (struct ov4689 *ov4689,int logical_gain,int *result) { -const struct device *dev = &ov4689->client->dev;const struct ov4689_gain_range *range;unsigned int n;
@@ -564,7 +563,8 @@ static int ov4689_map_gain(struct ov4689 *ov4689, int logical_gain, int *result) }if (n ==ARRAY_SIZE (ov4689_gain_ranges)) { -dev_warn_ratelimited (dev,"no mapping found for gain %d\n" , +dev_warn_ratelimited (ov4689->dev, +"no mapping found for gain %d\n" , logical_gain);return -EINVAL ; }
@@ -580,7 +580,7 @@ static int ov4689_set_ctrl(struct v4l2_ctrl *ctrl) {struct ov4689 *ov4689 = container_of(ctrl->handler, struct ov4689, ctrl_handler); -struct i2c_client *client = ov4689->client; +struct device *dev = ov4689->dev;int sensor_gain;s64 max_expo;int ret;
@@ -597,7 +597,7 @@ static int ov4689_set_ctrl(struct v4l2_ctrl *ctrl)break ; } -if (!pm_runtime_get_if_in_use (&client->dev)) +if (!pm_runtime_get_if_in_use (dev))return 0 ;switch (ctrl->id) {
@@ -618,13 +618,13 @@ static int ov4689_set_ctrl(struct v4l2_ctrl *ctrl) ret =ov4689_enable_test_pattern (ov4689, ctrl->val);break ;default : -dev_warn (&client->dev,"%s Unhandled id:0x%x, val:0x%x\n" , +dev_warn (dev,"%s Unhandled id:0x%x, val:0x%x\n" , __func__, ctrl->id, ctrl->val); ret = -EINVAL ;break ; } -pm_runtime_put (&client->dev); +pm_runtime_put (dev);return ret; }
@@ -689,8 +689,7 @@ static int ov4689_initialize_controls(struct ov4689 *ov4689)if (handler->error) { ret = handler->error; -dev_err (&ov4689->client->dev,"Failed to init controls(%d)\n" , - ret); +dev_err (ov4689->dev,"Failed to init controls(%d)\n" , ret); goto err_free_handler; }
@@ -716,7 +715,7 @@ static int ov4689_initialize_controls(struct ov4689 *ov4689)static int ov4689_check_sensor_id (struct ov4689 *ov4689,struct i2c_client *client) { -struct device *dev = &ov4689->client->dev; +struct device *dev = ov4689->dev;u64 id =0 ;int ret;
@@ -744,7 +743,7 @@ static int ov4689_configure_regulators(struct ov4689 *ov4689)for (i =0 ; i <ARRAY_SIZE (ov4689_supply_names); i++) ov4689->supplies[i].supply = ov4689_supply_names[i]; -return devm_regulator_bulk_get (&ov4689->client->dev, +return devm_regulator_bulk_get (ov4689->dev,ARRAY_SIZE (ov4689_supply_names), ov4689->supplies); }
@@ -813,7 +812,8 @@ static int ov4689_probe(struct i2c_client *client)if (!ov4689)return -ENOMEM ; - ov4689->client = client; + ov4689->dev = dev; + ov4689->cur_mode = &supported_modes[OV4689_MODE_2688_1520 ]; ov4689->xvclk =devm_clk_get_optional (dev,NULL );
Signature · 1 line
2.44.0
Mikhail Rudenko
maintainerPATCH v5 6/16 media: i2c: ov4689: Refactor ov4689_set_ctrl
In reply to Mikhail RudenkoIntroduce local variable for regmap within the ov4689_set_ctrl function. This adjustment eliminates repetition within the function.
--- drivers/media/i2c/ov4689.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
drivers/media/i2c/ov4689.c +6 -6
@@ -580,10 +580,11 @@ static int ov4689_set_ctrl(struct v4l2_ctrl *ctrl) {struct ov4689 *ov4689 = container_of(ctrl->handler, struct ov4689, ctrl_handler); +struct regmap *regmap = ov4689->regmap;struct device *dev = ov4689->dev;int sensor_gain;s64 max_expo; -int ret; +int ret =0 ;/* Propagate change of current control to all related controls */ switch (ctrl->id) {
@@ -603,16 +604,15 @@ static int ov4689_set_ctrl(struct v4l2_ctrl *ctrl)switch (ctrl->id) {case V4L2_CID_EXPOSURE :/* 4 least significant bits of exposure are fractional part */ - ret =cci_write (ov4689->regmap,OV4689_REG_EXPOSURE , - ctrl->val <<4 ,NULL ); +cci_write (regmap,OV4689_REG_EXPOSURE , ctrl->val <<4 , &ret);break ;case V4L2_CID_ANALOGUE_GAIN : ret =ov4689_map_gain (ov4689, ctrl->val, &sensor_gain); -cci_write (ov4689->regmap,OV4689_REG_GAIN , sensor_gain, &ret); +cci_write (regmap,OV4689_REG_GAIN , sensor_gain, &ret);break ;case V4L2_CID_VBLANK : - ret =cci_write (ov4689->regmap,OV4689_REG_VTS , - ctrl->val + ov4689->cur_mode->height,NULL ); +cci_write (regmap,OV4689_REG_VTS , + ctrl->val + ov4689->cur_mode->height, &ret);break ;case V4L2_CID_TEST_PATTERN : ret =ov4689_enable_test_pattern (ov4689, ctrl->val);
Signature · 1 line
2.44.0
Mikhail Rudenko
maintainerPATCH v5 7/16 media: i2c: ov4689: Use sub-device active state
In reply to Mikhail RudenkoUse sub-device active state. Employ control handler lock to synchronize access to the active state and s_stream.
--- drivers/media/i2c/ov4689.c | 75 ++++++++++++++++---------------------- 1 file changed, 31 insertions(+), 44 deletions(-)
drivers/media/i2c/ov4689.c +31 -44
@@ -86,7 +86,6 @@ struct ov4689 {u32 clock_rate; -struct mutex mutex;/* lock to protect ctrls and cur_mode */ struct v4l2_ctrl_handler ctrl_handler;struct v4l2_ctrl *exposure;
@@ -319,19 +318,6 @@ static int ov4689_set_fmt(struct v4l2_subdev *sd,return 0 ; } -static int ov4689_get_fmt (struct v4l2_subdev *sd, -struct v4l2_subdev_state *sd_state, -struct v4l2_subdev_format *fmt) -{ -struct v4l2_mbus_framefmt *mbus_fmt = &fmt->format; -struct ov4689 *ov4689 =to_ov4689 (sd); - -/* only one mode supported for now */ -ov4689_fill_fmt (ov4689->cur_mode, mbus_fmt); - -return 0 ; -} -static int ov4689_enum_mbus_code (struct v4l2_subdev *sd,struct v4l2_subdev_state *sd_state,struct v4l2_subdev_mbus_code_enum *code)
@@ -405,10 +391,11 @@ static int ov4689_get_selection(struct v4l2_subdev *sd,static int ov4689_s_stream (struct v4l2_subdev *sd,int on) {struct ov4689 *ov4689 =to_ov4689 (sd); +struct v4l2_subdev_state *sd_state;struct device *dev = ov4689->dev;int ret =0 ; -mutex_lock (&ov4689->mutex); + sd_state =v4l2_subdev_lock_and_get_active_state (&ov4689->subdev);if (on) { ret =pm_runtime_resume_and_get (dev);
@@ -443,7 +430,7 @@ static int ov4689_s_stream(struct v4l2_subdev *sd, int on) } unlock_and_return: -mutex_unlock (&ov4689->mutex); +v4l2_subdev_unlock_state (sd_state);return ret; }
@@ -506,18 +493,13 @@ static int __maybe_unused ov4689_power_off(struct device *dev)return 0 ; } -static int ov4689_open (struct v4l2_subdev *sd,struct v4l2_subdev_fh *fh) +static int ov4689_init_state (struct v4l2_subdev *sd, +struct v4l2_subdev_state *sd_state) { -struct ov4689 *ov4689 =to_ov4689 (sd); -struct v4l2_mbus_framefmt *try_fmt; - -mutex_lock (&ov4689->mutex); - - try_fmt =v4l2_subdev_state_get_format (fh->state,0 ); -/* Initialize try_fmt */ -ov4689_fill_fmt (&supported_modes[OV4689_MODE_2688_1520 ], try_fmt); +struct v4l2_mbus_framefmt *fmt = +v4l2_subdev_state_get_format (sd_state,0 ); -mutex_unlock (&ov4689->mutex); +ov4689_fill_fmt (&supported_modes[OV4689_MODE_2688_1520 ], fmt);return 0 ; }
@@ -526,10 +508,6 @@ static const struct dev_pm_ops ov4689_pm_ops = { SET_RUNTIME_PM_OPS(ov4689_power_off, ov4689_power_on, NULL) }; -static const struct v4l2_subdev_internal_ops ov4689_internal_ops = { - .open = ov4689_open, -}; -static const struct v4l2_subdev_video_ops ov4689_video_ops = { .s_stream = ov4689_s_stream, };
@@ -537,11 +515,15 @@ static const struct v4l2_subdev_video_ops ov4689_video_ops = {static const struct v4l2_subdev_pad_ops ov4689_pad_ops = { .enum_mbus_code = ov4689_enum_mbus_code, .enum_frame_size = ov4689_enum_frame_sizes, - .get_fmt = ov4689_get_fmt, + .get_fmt = v4l2_subdev_get_fmt, .set_fmt = ov4689_set_fmt, .get_selection = ov4689_get_selection, }; +static const struct v4l2_subdev_internal_ops ov4689_internal_ops = { + .init_state = ov4689_init_state, +}; +static const struct v4l2_subdev_ops ov4689_subdev_ops = { .video = &ov4689_video_ops, .pad = &ov4689_pad_ops,
@@ -649,7 +631,6 @@ static int ov4689_initialize_controls(struct ov4689 *ov4689) ret =v4l2_ctrl_handler_init (handler,10 );if (ret)return ret; - handler->lock = &ov4689->mutex; ctrl =v4l2_ctrl_new_int_menu (handler,NULL ,V4L2_CID_LINK_FREQ ,0 ,0 , link_freq_menu_items);
@@ -862,13 +843,15 @@ static int ov4689_probe(struct i2c_client *client)return dev_err_probe (dev, ret,"Failed to get power regulators\n" ); -mutex_init (&ov4689->mutex); - sd = &ov4689->subdev;v4l2_i2c_subdev_init (sd, client, &ov4689_subdev_ops); + sd->internal_ops = &ov4689_internal_ops; + sd->flags |=V4L2_SUBDEV_FL_HAS_DEVNODE ; ret =ov4689_initialize_controls (ov4689); -if (ret) - goto err_destroy_mutex; +if (ret) { +dev_err (dev,"Failed to initialize controls\n" ); +return ret; + } ret =ov4689_power_on (dev);if (ret)
@@ -878,19 +861,24 @@ static int ov4689_probe(struct i2c_client *client)if (ret) goto err_power_off; - sd->internal_ops = &ov4689_internal_ops; - sd->flags |=V4L2_SUBDEV_FL_HAS_DEVNODE ; - ov4689->pad.flags =MEDIA_PAD_FL_SOURCE ; sd->entity.function =MEDIA_ENT_F_CAM_SENSOR ; + ov4689->pad.flags =MEDIA_PAD_FL_SOURCE ; ret =media_entity_pads_init (&sd->entity,1 , &ov4689->pad);if (ret <0 ) goto err_power_off; + sd->state_lock = ov4689->ctrl_handler.lock; + ret =v4l2_subdev_init_finalize (sd); +if (ret) { +dev_err (dev,"Could not register v4l2 device\n" ); + goto err_clean_entity; + } + ret =v4l2_async_register_subdev_sensor (sd);if (ret) {dev_err (dev,"v4l2 async register subdev failed\n" ); - goto err_clean_entity; + goto err_clean_subdev; }pm_runtime_set_active (dev);
@@ -899,14 +887,14 @@ static int ov4689_probe(struct i2c_client *client)return 0 ; +err_clean_subdev: +v4l2_subdev_cleanup (sd); err_clean_entity:media_entity_cleanup (&sd->entity); err_power_off:ov4689_power_off (dev); err_free_handler:v4l2_ctrl_handler_free (&ov4689->ctrl_handler); -err_destroy_mutex: -mutex_destroy (&ov4689->mutex);return ret; }
@@ -918,9 +906,8 @@ static void ov4689_remove(struct i2c_client *client)v4l2_async_unregister_subdev (sd);media_entity_cleanup (&sd->entity); - +v4l2_subdev_cleanup (sd);v4l2_ctrl_handler_free (&ov4689->ctrl_handler); -mutex_destroy (&ov4689->mutex);pm_runtime_disable (&client->dev);if (!pm_runtime_status_suspended (&client->dev))
Signature · 1 line
2.44.0
Mikhail Rudenko
maintainerPATCH v5 8/16 media: i2c: ov4689: Enable runtime PM before registering sub-device
In reply to Mikhail RudenkoAs the sensor may be accessible right after its async sub-device is registered, enable runtime PM before doing so.
--- drivers/media/i2c/ov4689.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-)
drivers/media/i2c/ov4689.c +8 -6
@@ -875,19 +875,21 @@ static int ov4689_probe(struct i2c_client *client) goto err_clean_entity; } +pm_runtime_set_active (dev); +pm_runtime_enable (dev); +pm_runtime_idle (dev); + ret =v4l2_async_register_subdev_sensor (sd);if (ret) {dev_err (dev,"v4l2 async register subdev failed\n" ); - goto err_clean_subdev; + goto err_clean_subdev_pm; } -pm_runtime_set_active (dev); -pm_runtime_enable (dev); -pm_runtime_idle (dev); -return 0 ; -err_clean_subdev: +err_clean_subdev_pm: +pm_runtime_disable (dev); +pm_runtime_set_suspended (dev);v4l2_subdev_cleanup (sd); err_clean_entity:media_entity_cleanup (&sd->entity);
Signature · 1 line
2.44.0
Mikhail Rudenko
maintainerPATCH v5 9/16 media: i2c: ov4689: Use runtime PM autosuspend
In reply to Mikhail RudenkoUse runtime PM autosuspend to avoid powering off the sensor during fast stop-reconfigure-restart cycles.
--- drivers/media/i2c/ov4689.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-)
drivers/media/i2c/ov4689.c +11 -4
@@ -426,7 +426,8 @@ static int ov4689_s_stream(struct v4l2_subdev *sd, int on) }else {cci_write (ov4689->regmap,OV4689_REG_CTRL_MODE ,OV4689_MODE_SW_STANDBY ,NULL ); -pm_runtime_put (dev); +pm_runtime_mark_last_busy (dev); +pm_runtime_put_autosuspend (dev); } unlock_and_return:
@@ -606,7 +607,8 @@ static int ov4689_set_ctrl(struct v4l2_ctrl *ctrl)break ; } -pm_runtime_put (dev); +pm_runtime_mark_last_busy (dev); +pm_runtime_put_autosuspend (dev);return ret; }
@@ -876,8 +878,10 @@ static int ov4689_probe(struct i2c_client *client) }pm_runtime_set_active (dev); +pm_runtime_get_noresume (dev);pm_runtime_enable (dev); -pm_runtime_idle (dev); +pm_runtime_set_autosuspend_delay (dev,1000 ); +pm_runtime_use_autosuspend (dev); ret =v4l2_async_register_subdev_sensor (sd);if (ret) {
@@ -885,11 +889,14 @@ static int ov4689_probe(struct i2c_client *client) goto err_clean_subdev_pm; } +pm_runtime_mark_last_busy (dev); +pm_runtime_put_autosuspend (dev); +return 0 ; err_clean_subdev_pm:pm_runtime_disable (dev); -pm_runtime_set_suspended (dev); +pm_runtime_put_noidle (dev);v4l2_subdev_cleanup (sd); err_clean_entity:media_entity_cleanup (&sd->entity);
Signature · 1 line
2.44.0
Mikhail Rudenko
maintainerPATCH v5 10/16 media: i2c: ov4689: Remove max_fps field from struct ov4689_mode
In reply to Mikhail Rudenkomax_fps field of struct ov4689_mode is unused in this driver, so remove it.
--- drivers/media/i2c/ov4689.c | 2 -- 1 file changed, 2 deletions(-)
drivers/media/i2c/ov4689.c +0 -2
@@ -60,7 +60,6 @@ struct ov4689_mode {enum ov4689_mode_id id;u32 width;u32 height; -u32 max_fps;u32 hts_def;u32 vts_def;u32 exp_def;
@@ -237,7 +236,6 @@ static const struct ov4689_mode supported_modes[] = { .sensor_height = 1536, .crop_top = 8, .crop_left = 16, - .max_fps = 30, .exp_def = 1536, .hts_def = 4 * 2574, .vts_def = 1554,
Signature · 1 line
2.44.0
Mikhail Rudenko
maintainerPATCH v5 11/16 media: i2c: ov4689: Make horizontal blanking configurable
In reply to Mikhail RudenkoMake horizontal blanking configurable. To do so, set HTS register according to the requested horizontal blanking in ov4689_set_ctrl instead of the register table. Default HTS value is not changed by this patch. Minimal HTS value is found experimentally and corresponds to 90 fps framerate at minimum vertical blanking. Real HTS value is the register value multiplied by 4.
--- drivers/media/i2c/ov4689.c | 31 ++++++++++++++++++++----------- 1 file changed, 20 insertions(+), 11 deletions(-)
drivers/media/i2c/ov4689.c +20 -11
@@ -30,13 +30,17 @@#define OV4689_REG_EXPOSURE CCI_REG24(0x3500)#define OV4689_EXPOSURE_MIN 4#define OV4689_EXPOSURE_STEP 1 -#define OV4689_VTS_MAX 0x7fff#define OV4689_REG_GAIN CCI_REG16(0x3508)#define OV4689_GAIN_STEP 1#define OV4689_GAIN_DEFAULT 0x80 +#define OV4689_REG_HTS CCI_REG16(0x380c) +#define OV4689_HTS_DIVIDER 4 +#define OV4689_HTS_MAX 0x7fff +#define OV4689_REG_VTS CCI_REG16(0x380e) +#define OV4689_VTS_MAX 0x7fff#define OV4689_REG_TEST_PATTERN CCI_REG8(0x5040)#define OV4689_TEST_PATTERN_ENABLE 0x80
@@ -61,6 +65,7 @@ struct ov4689_mode {u32 width;u32 height;u32 hts_def; +u32 hts_min;u32 vts_def;u32 exp_def;u32 pixel_rate;
@@ -104,7 +109,7 @@ struct ov4689_gain_range {/* * Xclk 24Mhz -* max_framerate 30fps +* max_framerate 90fps * mipi_datarate per lane 1008Mbps */ static const struct cci_reg_sequence ov4689_2688x1520_regs[] = {
@@ -175,8 +180,6 @@ static const struct cci_reg_sequence ov4689_2688x1520_regs[] = {/* Timing control */ { CCI_REG8(0x3801), 0x08 }, /* H_CROP_START_L h_crop_start[7:0] = 0x08 */ { CCI_REG8(0x3805), 0x97 }, /* H_CROP_END_L h_crop_end[7:0] = 0x97 */ - { CCI_REG8(0x380c), 0x0a }, /* TIMING_HTS_H hts[14:8] = 0x0a */ - { CCI_REG8(0x380d), 0x0e }, /* TIMING_HTS_L hts[7:0] = 0x0e */ { CCI_REG8(0x3811), 0x08 }, /* H_WIN_OFF_L h_win_off[7:0] = 0x08*/ { CCI_REG8(0x3813), 0x04 }, /* V_WIN_OFF_L v_win_off[7:0] = 0x04 */ { CCI_REG8(0x3819), 0x01 }, /* VSYNC_END_L vsync_end_point[7:0] = 0x01 */
@@ -237,7 +240,8 @@ static const struct ov4689_mode supported_modes[] = { .crop_top = 8, .crop_left = 16, .exp_def = 1536, - .hts_def = 4 * 2574, + .hts_def = 10296, + .hts_min = 3432, .vts_def = 1554, .pixel_rate = 480000000, .reg_list = ov4689_2688x1520_regs,
@@ -598,6 +602,11 @@ static int ov4689_set_ctrl(struct v4l2_ctrl *ctrl)case V4L2_CID_TEST_PATTERN : ret =ov4689_enable_test_pattern (ov4689, ctrl->val);break ; +case V4L2_CID_HBLANK : +cci_write (regmap,OV4689_REG_HTS , + (ctrl->val + ov4689->cur_mode->width) / +OV4689_HTS_DIVIDER , &ret); +break ;default :dev_warn (dev,"%s Unhandled id:0x%x, val:0x%x\n" , __func__, ctrl->id, ctrl->val);
@@ -622,8 +631,8 @@ static int ov4689_initialize_controls(struct ov4689 *ov4689)struct v4l2_ctrl_handler *handler;const struct ov4689_mode *mode;s64 exposure_max, vblank_def; +s64 hblank_def, hblank_min;struct v4l2_ctrl *ctrl; -s64 h_blank_def;int ret; handler = &ov4689->ctrl_handler;
@@ -640,11 +649,11 @@ static int ov4689_initialize_controls(struct ov4689 *ov4689)v4l2_ctrl_new_std (handler,NULL ,V4L2_CID_PIXEL_RATE ,0 , mode->pixel_rate,1 , mode->pixel_rate); - h_blank_def = mode->hts_def - mode->width; - ctrl =v4l2_ctrl_new_std (handler,NULL ,V4L2_CID_HBLANK , h_blank_def, - h_blank_def,1 , h_blank_def); -if (ctrl) - ctrl->flags |=V4L2_CTRL_FLAG_READ_ONLY ; + hblank_def = mode->hts_def - mode->width; + hblank_min = mode->hts_min - mode->width; +v4l2_ctrl_new_std (handler, &ov4689_ctrl_ops,V4L2_CID_HBLANK , + hblank_min,OV4689_HTS_MAX - mode->width, +OV4689_HTS_DIVIDER , hblank_def); vblank_def = mode->vts_def - mode->height; v4l2_ctrl_new_std(handler, &ov4689_ctrl_ops, V4L2_CID_VBLANK,
Signature · 1 line
2.44.0
Mikhail Rudenko
maintainerPATCH v5 12/16 media: i2c: ov4689: Implement vflip/hflip controls
In reply to Mikhail RudenkoThe OV4689 sensor supports horizontal and vertical flipping. Add appropriate controls to the driver. Toggling both array flip and digital flip bits allows to achieve flipping while maintaining output Bayer order. Note that the default value of hflip control corresponds to both bits set, as it was before this patch.
--- drivers/media/i2c/ov4689.c | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-)
drivers/media/i2c/ov4689.c +22 -2
@@ -42,6 +42,14 @@#define OV4689_REG_VTS CCI_REG16(0x380e)#define OV4689_VTS_MAX 0x7fff +#define OV4689_REG_TIMING_FORMAT1 CCI_REG8(0x3820)/* Vertical */ +#define OV4689_REG_TIMING_FORMAT2 CCI_REG8(0x3821)/* Horizontal */ +#define OV4689_TIMING_FLIP_MASK GENMASK(2, 1) +#define OV4689_TIMING_FLIP_ARRAY BIT(1) +#define OV4689_TIMING_FLIP_DIGITAL BIT(2) +#define OV4689_TIMING_FLIP_BOTH (OV4689_TIMING_FLIP_ARRAY |\ + OV4689_TIMING_FLIP_DIGITAL) +#define OV4689_REG_TEST_PATTERN CCI_REG8(0x5040)#define OV4689_TEST_PATTERN_ENABLE 0x80#define OV4689_TEST_PATTERN_DISABLE 0x0
@@ -183,7 +191,6 @@ static const struct cci_reg_sequence ov4689_2688x1520_regs[] = { { CCI_REG8(0x3811), 0x08 }, /* H_WIN_OFF_L h_win_off[7:0] = 0x08*/ { CCI_REG8(0x3813), 0x04 }, /* V_WIN_OFF_L v_win_off[7:0] = 0x04 */ { CCI_REG8(0x3819), 0x01 }, /* VSYNC_END_L vsync_end_point[7:0] = 0x01 */ - { CCI_REG8(0x3821), 0x06 }, /* TIMING_FORMAT2 array_h_mirror = 1, digital_h_mirror = 1 *//* OTP control */ { CCI_REG8(0x3d85), 0x36 }, /* OTP_REG85 OTP_power_up_load_setting_enable = 1,
@@ -607,6 +614,16 @@ static int ov4689_set_ctrl(struct v4l2_ctrl *ctrl) (ctrl->val + ov4689->cur_mode->width) / OV4689_HTS_DIVIDER, &ret);break ; +case V4L2_CID_VFLIP : +cci_update_bits (regmap,OV4689_REG_TIMING_FORMAT1 , +OV4689_TIMING_FLIP_MASK , + ctrl->val ?OV4689_TIMING_FLIP_BOTH :0 , &ret); +break ; +case V4L2_CID_HFLIP : +cci_update_bits (regmap,OV4689_REG_TIMING_FORMAT2 , +OV4689_TIMING_FLIP_MASK , + ctrl->val ?0 :OV4689_TIMING_FLIP_BOTH , &ret); +break ;default :dev_warn (dev,"%s Unhandled id:0x%x, val:0x%x\n" , __func__, ctrl->id, ctrl->val);
@@ -637,7 +654,7 @@ static int ov4689_initialize_controls(struct ov4689 *ov4689) handler = &ov4689->ctrl_handler; mode = ov4689->cur_mode; - ret =v4l2_ctrl_handler_init (handler,10 ); + ret =v4l2_ctrl_handler_init (handler,12 );if (ret)return ret;
@@ -677,6 +694,9 @@ static int ov4689_initialize_controls(struct ov4689 *ov4689)ARRAY_SIZE (ov4689_test_pattern_menu) -1 , 0, 0, ov4689_test_pattern_menu); +v4l2_ctrl_new_std (handler, &ov4689_ctrl_ops,V4L2_CID_VFLIP ,0 ,1 ,1 ,0 ); +v4l2_ctrl_new_std (handler, &ov4689_ctrl_ops,V4L2_CID_HFLIP ,0 ,1 ,1 ,0 ); +if (handler->error) { ret = handler->error;dev_err (ov4689->dev,"Failed to init controls(%d)\n" , ret);
Signature · 1 line
2.44.0
Mikhail Rudenko
maintainerPATCH v5 13/16 media: i2c: ov4689: Implement digital gain control
In reply to Mikhail RudenkoThe OV4689 sensor supports digital gain up to 16x. Implement corresponding control in the driver. Default digital gain value is not modified by this patch.
--- drivers/media/i2c/ov4689.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-)
drivers/media/i2c/ov4689.c +14 -2
@@ -35,6 +35,12 @@#define OV4689_GAIN_STEP 1#define OV4689_GAIN_DEFAULT 0x80 +#define OV4689_REG_DIG_GAIN CCI_REG16(0x352a) +#define OV4689_DIG_GAIN_MIN 1 +#define OV4689_DIG_GAIN_MAX 0x7fff +#define OV4689_DIG_GAIN_STEP 1 +#define OV4689_DIG_GAIN_DEFAULT 0x800 +#define OV4689_REG_HTS CCI_REG16(0x380c)#define OV4689_HTS_DIVIDER 4#define OV4689_HTS_MAX 0x7fff
@@ -131,7 +137,6 @@ static const struct cci_reg_sequence ov4689_2688x1520_regs[] = {/* AEC PK */ { CCI_REG8(0x3503), 0x04 }, /* AEC_MANUAL gain_input_as_sensor_gain_format = 1 */ - { CCI_REG8(0x352a), 0x08 }, /* DIG_GAIN_FRAC_LONG dig_gain_long[14:8] = 0x08 (2x) *//* ADC and analog control*/ { CCI_REG8(0x3603), 0x40 },
@@ -624,6 +629,9 @@ static int ov4689_set_ctrl(struct v4l2_ctrl *ctrl)OV4689_TIMING_FLIP_MASK , ctrl->val ? 0 : OV4689_TIMING_FLIP_BOTH, &ret);break ; +case V4L2_CID_DIGITAL_GAIN : +cci_write (regmap,OV4689_REG_DIG_GAIN , ctrl->val, &ret); +break ;default :dev_warn (dev,"%s Unhandled id:0x%x, val:0x%x\n" , __func__, ctrl->id, ctrl->val);
@@ -654,7 +662,7 @@ static int ov4689_initialize_controls(struct ov4689 *ov4689) handler = &ov4689->ctrl_handler; mode = ov4689->cur_mode; - ret =v4l2_ctrl_handler_init (handler,12 ); + ret =v4l2_ctrl_handler_init (handler,13 );if (ret)return ret;
@@ -697,6 +705,10 @@ static int ov4689_initialize_controls(struct ov4689 *ov4689)v4l2_ctrl_new_std (handler, &ov4689_ctrl_ops,V4L2_CID_VFLIP ,0 ,1 ,1 ,0 );v4l2_ctrl_new_std (handler, &ov4689_ctrl_ops,V4L2_CID_HFLIP ,0 ,1 ,1 ,0 ); +v4l2_ctrl_new_std (handler, &ov4689_ctrl_ops,V4L2_CID_DIGITAL_GAIN , +OV4689_DIG_GAIN_MIN ,OV4689_DIG_GAIN_MAX , +OV4689_DIG_GAIN_STEP ,OV4689_DIG_GAIN_DEFAULT ); +if (handler->error) { ret = handler->error;dev_err (ov4689->dev,"Failed to init controls(%d)\n" , ret);
Signature · 1 line
2.44.0
Mikhail Rudenko
maintainerPATCH v5 14/16 media: i2c: ov4689: Implement manual color balance controls
In reply to Mikhail RudenkoThe OV4689 sensor has separate red and blue gain settings (up to 4x). Implement appropriate controls in the driver. Default gain values are not modified.
--- drivers/media/i2c/ov4689.c | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-)
drivers/media/i2c/ov4689.c +22 -1
@@ -56,6 +56,13 @@#define OV4689_TIMING_FLIP_BOTH (OV4689_TIMING_FLIP_ARRAY |\ OV4689_TIMING_FLIP_DIGITAL) +#define OV4689_REG_WB_GAIN_RED CCI_REG16(0x500c) +#define OV4689_REG_WB_GAIN_BLUE CCI_REG16(0x5010) +#define OV4689_WB_GAIN_MIN 1 +#define OV4689_WB_GAIN_MAX 0xfff +#define OV4689_WB_GAIN_STEP 1 +#define OV4689_WB_GAIN_DEFAULT 0x400 +#define OV4689_REG_TEST_PATTERN CCI_REG8(0x5040)#define OV4689_TEST_PATTERN_ENABLE 0x80#define OV4689_TEST_PATTERN_DISABLE 0x0
@@ -632,6 +639,12 @@ static int ov4689_set_ctrl(struct v4l2_ctrl *ctrl)case V4L2_CID_DIGITAL_GAIN :cci_write (regmap,OV4689_REG_DIG_GAIN , ctrl->val, &ret);break ; +case V4L2_CID_RED_BALANCE : +cci_write (regmap,OV4689_REG_WB_GAIN_RED , ctrl->val, &ret); +break ; +case V4L2_CID_BLUE_BALANCE : +cci_write (regmap,OV4689_REG_WB_GAIN_BLUE , ctrl->val, &ret); +break ;default :dev_warn (dev,"%s Unhandled id:0x%x, val:0x%x\n" , __func__, ctrl->id, ctrl->val);
@@ -662,7 +675,7 @@ static int ov4689_initialize_controls(struct ov4689 *ov4689) handler = &ov4689->ctrl_handler; mode = ov4689->cur_mode; - ret =v4l2_ctrl_handler_init (handler,13 ); + ret =v4l2_ctrl_handler_init (handler,15 );if (ret)return ret;
@@ -709,6 +722,14 @@ static int ov4689_initialize_controls(struct ov4689 *ov4689)OV4689_DIG_GAIN_MIN ,OV4689_DIG_GAIN_MAX , OV4689_DIG_GAIN_STEP, OV4689_DIG_GAIN_DEFAULT); +v4l2_ctrl_new_std (handler, &ov4689_ctrl_ops,V4L2_CID_RED_BALANCE , +OV4689_WB_GAIN_MIN ,OV4689_WB_GAIN_MAX , +OV4689_WB_GAIN_STEP ,OV4689_WB_GAIN_DEFAULT ); + +v4l2_ctrl_new_std (handler, &ov4689_ctrl_ops,V4L2_CID_BLUE_BALANCE , +OV4689_WB_GAIN_MIN ,OV4689_WB_GAIN_MAX , +OV4689_WB_GAIN_STEP ,OV4689_WB_GAIN_DEFAULT ); +if (handler->error) { ret = handler->error;dev_err (ov4689->dev,"Failed to init controls(%d)\n" , ret);
Signature · 1 line
2.44.0
Mikhail Rudenko
maintainerPATCH v5 15/16 media: i2c: ov4689: Move pixel array size out of struct ov4689_mode
In reply to Mikhail RudenkoPixel array dimensions and default crop size do not belong to the ov4689_mode structure, since they are mode independent. Make them defines instead.
--- drivers/media/i2c/ov4689.c | 29 +++++++++++++---------------- 1 file changed, 13 insertions(+), 16 deletions(-)
drivers/media/i2c/ov4689.c +13 -16
@@ -70,6 +70,11 @@#define OV4689_LANES 4#define OV4689_XVCLK_FREQ 24000000 +#define OV4689_PIXEL_ARRAY_WIDTH 2720 +#define OV4689_PIXEL_ARRAY_HEIGHT 1536 +#define OV4689_DUMMY_ROWS 8/* 8 dummy rows on each side */ +#define OV4689_DUMMY_COLUMNS 16/* 16 dummy columns on each side */ +static const char *const ov4689_supply_names[] = {"avdd" ,/* Analog power */ "dovdd" ,/* Digital I/O power */
@@ -90,10 +95,6 @@ struct ov4689_mode {u32 vts_def;u32 exp_def;u32 pixel_rate; -u32 sensor_width; -u32 sensor_height; -u32 crop_top; -u32 crop_left;const struct cci_reg_sequence *reg_list;unsigned int num_regs; };
@@ -254,10 +255,6 @@ static const struct ov4689_mode supported_modes[] = { .id = OV4689_MODE_2688_1520, .width = 2688, .height = 1520, - .sensor_width = 2720, - .sensor_height = 1536, - .crop_top = 8, - .crop_left = 16, .exp_def = 1536, .hts_def = 10296, .hts_min = 3432,
@@ -385,8 +382,6 @@ static int ov4689_get_selection(struct v4l2_subdev *sd, struct v4l2_subdev_state *state, struct v4l2_subdev_selection *sel) { - const struct ov4689_mode *mode = to_ov4689(sd)->cur_mode; -if (sel->which !=V4L2_SUBDEV_FORMAT_ACTIVE )return -EINVAL ;
@@ -394,15 +389,17 @@ static int ov4689_get_selection(struct v4l2_subdev *sd,case V4L2_SEL_TGT_CROP_BOUNDS : sel->r.top =0 ; sel->r.left =0 ; - sel->r.width = mode->sensor_width; - sel->r.height = mode->sensor_height; + sel->r.width =OV4689_PIXEL_ARRAY_WIDTH ; + sel->r.height =OV4689_PIXEL_ARRAY_HEIGHT ;return 0 ;case V4L2_SEL_TGT_CROP :case V4L2_SEL_TGT_CROP_DEFAULT : - sel->r.top = mode->crop_top; - sel->r.left = mode->crop_left; - sel->r.width = mode->width; - sel->r.height = mode->height; + sel->r.top =OV4689_DUMMY_ROWS ; + sel->r.left =OV4689_DUMMY_COLUMNS ; + sel->r.width = +OV4689_PIXEL_ARRAY_WIDTH -2 *OV4689_DUMMY_COLUMNS ; + sel->r.height = +OV4689_PIXEL_ARRAY_HEIGHT -2 *OV4689_DUMMY_ROWS ;return 0 ; }
Signature · 1 line
2.44.0
Mikhail Rudenko
maintainerPATCH v5 16/16 media: i2c: ov4689: Set timing registers programmatically
In reply to Mikhail RudenkoSet timing-related and BLC anchor registers via cci calls instead of hardcoding them in the register table. This prepares the driver for implementation of configurable analogue crop and binning. No functional change intended.
--- drivers/media/i2c/ov4689.c | 83 +++++++++++++++++++++++++++++++------- 1 file changed, 68 insertions(+), 15 deletions(-)
drivers/media/i2c/ov4689.c +68 -15
@@ -41,6 +41,13 @@#define OV4689_DIG_GAIN_STEP 1#define OV4689_DIG_GAIN_DEFAULT 0x800 +#define OV4689_REG_H_CROP_START CCI_REG16(0x3800) +#define OV4689_REG_V_CROP_START CCI_REG16(0x3802) +#define OV4689_REG_H_CROP_END CCI_REG16(0x3804) +#define OV4689_REG_V_CROP_END CCI_REG16(0x3806) +#define OV4689_REG_H_OUTPUT_SIZE CCI_REG16(0x3808) +#define OV4689_REG_V_OUTPUT_SIZE CCI_REG16(0x380a) +#define OV4689_REG_HTS CCI_REG16(0x380c)#define OV4689_HTS_DIVIDER 4#define OV4689_HTS_MAX 0x7fff
@@ -48,6 +55,9 @@#define OV4689_REG_VTS CCI_REG16(0x380e)#define OV4689_VTS_MAX 0x7fff +#define OV4689_REG_H_WIN_OFF CCI_REG16(0x3810) +#define OV4689_REG_V_WIN_OFF CCI_REG16(0x3812) +#define OV4689_REG_TIMING_FORMAT1 CCI_REG8(0x3820)/* Vertical */ #define OV4689_REG_TIMING_FORMAT2 CCI_REG8(0x3821)/* Horizontal */ #define OV4689_TIMING_FLIP_MASK GENMASK(2, 1)
@@ -56,6 +66,17 @@#define OV4689_TIMING_FLIP_BOTH (OV4689_TIMING_FLIP_ARRAY |\ OV4689_TIMING_FLIP_DIGITAL) +#define OV4689_REG_ANCHOR_LEFT_START CCI_REG16(0x4020) +#define OV4689_ANCHOR_LEFT_START_DEF 576 +#define OV4689_REG_ANCHOR_LEFT_END CCI_REG16(0x4022) +#define OV4689_ANCHOR_LEFT_END_DEF 831 +#define OV4689_REG_ANCHOR_RIGHT_START CCI_REG16(0x4024) +#define OV4689_ANCHOR_RIGHT_START_DEF 1984 +#define OV4689_REG_ANCHOR_RIGHT_END CCI_REG16(0x4026) +#define OV4689_ANCHOR_RIGHT_END_DEF 2239 + +#define OV4689_REG_VFIFO_CTRL_01 CCI_REG8(0x4601) +#define OV4689_REG_WB_GAIN_RED CCI_REG16(0x500c)#define OV4689_REG_WB_GAIN_BLUE CCI_REG16(0x5010)#define OV4689_WB_GAIN_MIN 1
@@ -199,10 +220,6 @@ static const struct cci_reg_sequence ov4689_2688x1520_regs[] = { { CCI_REG8(0x3798), 0x1b },/* Timing control */ - { CCI_REG8(0x3801), 0x08 }, /* H_CROP_START_L h_crop_start[7:0] = 0x08 */ - { CCI_REG8(0x3805), 0x97 }, /* H_CROP_END_L h_crop_end[7:0] = 0x97 */ - { CCI_REG8(0x3811), 0x08 }, /* H_WIN_OFF_L h_win_off[7:0] = 0x08*/ - { CCI_REG8(0x3813), 0x04 }, /* V_WIN_OFF_L v_win_off[7:0] = 0x04 */ { CCI_REG8(0x3819), 0x01 }, /* VSYNC_END_L vsync_end_point[7:0] = 0x01 *//* OTP control */
@@ -218,22 +235,11 @@ static const struct cci_reg_sequence ov4689_2688x1520_regs[] = { { CCI_REG8(0x401b), 0x00 }, /* DEBUG_MODE */ { CCI_REG8(0x401d), 0x00 }, /* DEBUG_MODE */ { CCI_REG8(0x401f), 0x00 }, /* DEBUG_MODE */ - { CCI_REG8(0x4020), 0x00 }, /* ANCHOR_LEFT_START_H anchor_left_start[11:8] = 0 */ - { CCI_REG8(0x4021), 0x10 }, /* ANCHOR_LEFT_START_L anchor_left_start[7:0] = 0x10 */ - { CCI_REG8(0x4022), 0x07 }, /* ANCHOR_LEFT_END_H anchor_left_end[11:8] = 0x07 */ - { CCI_REG8(0x4023), 0xcf }, /* ANCHOR_LEFT_END_L anchor_left_end[7:0] = 0xcf */ - { CCI_REG8(0x4024), 0x09 }, /* ANCHOR_RIGHT_START_H anchor_right_start[11:8] = 0x09 */ - { CCI_REG8(0x4025), 0x60 }, /* ANCHOR_RIGHT_START_L anchor_right_start[7:0] = 0x60 */ - { CCI_REG8(0x4026), 0x09 }, /* ANCHOR_RIGHT_END_H anchor_right_end[11:8] = 0x09 */ - { CCI_REG8(0x4027), 0x6f }, /* ANCHOR_RIGHT_END_L anchor_right_end[7:0] = 0x6f *//* ADC sync control */ { CCI_REG8(0x4500), 0x6c }, /* ADC_SYNC_CTRL */ { CCI_REG8(0x4503), 0x01 }, /* ADC_SYNC_CTRL */ -/* VFIFO */ - { CCI_REG8(0x4601), 0xa7 }, /* VFIFO_CTRL_01 r_vfifo_read_start[7:0] = 0xa7 */ -/* Temperature monitor */ { CCI_REG8(0x4d00), 0x04 }, /* TPM_CTRL_00 tmp_slope[15:8] = 0x04 */ { CCI_REG8(0x4d01), 0x42 }, /* TPM_CTRL_01 tmp_slope[7:0] = 0x42 */
@@ -406,6 +412,41 @@ static int ov4689_get_selection(struct v4l2_subdev *sd,return -EINVAL ; } +static int ov4689_setup_timings (struct ov4689 *ov4689) +{ +const struct ov4689_mode *mode = ov4689->cur_mode; +struct regmap *rm = ov4689->regmap; +int ret =0 ; + +cci_write (rm,OV4689_REG_H_CROP_START ,8 , &ret); +cci_write (rm,OV4689_REG_V_CROP_START ,8 , &ret); +cci_write (rm,OV4689_REG_H_CROP_END ,2711 , &ret); +cci_write (rm,OV4689_REG_V_CROP_END ,1531 , &ret); + +cci_write (rm,OV4689_REG_H_OUTPUT_SIZE , mode->width, &ret); +cci_write (rm,OV4689_REG_V_OUTPUT_SIZE , mode->height, &ret); + +cci_write (rm,OV4689_REG_H_WIN_OFF ,8 , &ret); +cci_write (rm,OV4689_REG_V_WIN_OFF ,4 , &ret); + +cci_write (rm,OV4689_REG_VFIFO_CTRL_01 ,167 , &ret); + +return ret; +} + +static int ov4689_setup_blc_anchors (struct ov4689 *ov4689) +{ +struct regmap *rm = ov4689->regmap; +int ret =0 ; + +cci_write (rm,OV4689_REG_ANCHOR_LEFT_START ,16 , &ret); +cci_write (rm,OV4689_REG_ANCHOR_LEFT_END ,1999 , &ret); +cci_write (rm,OV4689_REG_ANCHOR_RIGHT_START ,2400 , &ret); +cci_write (rm,OV4689_REG_ANCHOR_RIGHT_END ,2415 , &ret); + +return ret; +} +static int ov4689_s_stream (struct v4l2_subdev *sd,int on) {struct ov4689 *ov4689 =to_ov4689 (sd);
@@ -429,6 +470,18 @@ static int ov4689_s_stream(struct v4l2_subdev *sd, int on) goto unlock_and_return; } + ret =ov4689_setup_timings (ov4689); +if (ret) { +pm_runtime_put (dev); + goto unlock_and_return; + } + + ret =ov4689_setup_blc_anchors (ov4689); +if (ret) { +pm_runtime_put (dev); + goto unlock_and_return; + } + ret =__v4l2_ctrl_handler_setup (&ov4689->ctrl_handler);if (ret) {pm_runtime_put (dev);
Signature · 1 line
2.44.0