mirror of
https://mirrors.bfsu.edu.cn/git/linux.git
synced 2024-12-15 15:04:27 +08:00
media: atomisp: ov2680: Make setting the modes algorithm based
Instead of using a long fixed register settings list for each resolution, calculate the register settings based on the requested width + height. This will allow future enhancements like adding hblank and vblank controls and adding selection support. Signed-off-by: Hans de Goede <hdegoede@redhat.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
This commit is contained in:
Hans de Goede
Mauro Carvalho Chehab
parent
1c08b2faa8
commit
0611888592
@ -378,6 +378,131 @@ static void ov2680_fill_format(struct ov2680_device *sensor,
|
||||
ov2680_set_bayer_order(sensor, fmt);
|
||||
}
|
||||
|
||||
static void ov2680_calc_mode(struct ov2680_device *sensor, int width, int height)
|
||||
{
|
||||
int orig_width = width;
|
||||
int orig_height = height;
|
||||
|
||||
if (width <= (OV2680_NATIVE_WIDTH / 2) &&
|
||||
height <= (OV2680_NATIVE_HEIGHT / 2)) {
|
||||
sensor->mode.binning = true;
|
||||
width *= 2;
|
||||
height *= 2;
|
||||
} else {
|
||||
sensor->mode.binning = false;
|
||||
}
|
||||
|
||||
sensor->mode.h_start = ((OV2680_NATIVE_WIDTH - width) / 2) & ~1;
|
||||
sensor->mode.v_start = ((OV2680_NATIVE_HEIGHT - height) / 2) & ~1;
|
||||
sensor->mode.h_end = min(sensor->mode.h_start + width + OV2680_END_MARGIN - 1,
|
||||
OV2680_NATIVE_WIDTH - 1);
|
||||
sensor->mode.v_end = min(sensor->mode.v_start + height + OV2680_END_MARGIN - 1,
|
||||
OV2680_NATIVE_HEIGHT - 1);
|
||||
sensor->mode.h_output_size = orig_width;
|
||||
sensor->mode.v_output_size = orig_height;
|
||||
sensor->mode.hts = OV2680_PIXELS_PER_LINE;
|
||||
sensor->mode.vts = OV2680_LINES_PER_FRAME;
|
||||
}
|
||||
|
||||
static int ov2680_set_mode(struct ov2680_device *sensor, int width, int height)
|
||||
{
|
||||
struct i2c_client *client = sensor->client;
|
||||
u8 pll_div, unknown, inc, fmt1, fmt2;
|
||||
int ret;
|
||||
|
||||
ov2680_calc_mode(sensor, width, height);
|
||||
|
||||
if (sensor->mode.binning) {
|
||||
pll_div = 1;
|
||||
unknown = 0x23;
|
||||
inc = 0x31;
|
||||
fmt1 = 0xc2;
|
||||
fmt2 = 0x01;
|
||||
} else {
|
||||
pll_div = 0;
|
||||
unknown = 0x21;
|
||||
inc = 0x11;
|
||||
fmt1 = 0xc0;
|
||||
fmt2 = 0x00;
|
||||
}
|
||||
|
||||
ret = ov_write_reg8(client, 0x3086, pll_div);
|
||||
if (ret)
|
||||
return ret;
|
||||
|
||||
ret = ov_write_reg8(client, 0x370a, unknown);
|
||||
if (ret)
|
||||
return ret;
|
||||
|
||||
ret = ov_write_reg16(client, OV2680_HORIZONTAL_START_H, sensor->mode.h_start);
|
||||
if (ret)
|
||||
return ret;
|
||||
|
||||
ret = ov_write_reg16(client, OV2680_VERTICAL_START_H, sensor->mode.v_start);
|
||||
if (ret)
|
||||
return ret;
|
||||
|
||||
ret = ov_write_reg16(client, OV2680_HORIZONTAL_END_H, sensor->mode.h_end);
|
||||
if (ret)
|
||||
return ret;
|
||||
|
||||
ret = ov_write_reg16(client, OV2680_VERTICAL_END_H, sensor->mode.v_end);
|
||||
if (ret)
|
||||
return ret;
|
||||
|
||||
ret = ov_write_reg16(client, OV2680_HORIZONTAL_OUTPUT_SIZE_H,
|
||||
sensor->mode.h_output_size);
|
||||
if (ret)
|
||||
return ret;
|
||||
|
||||
ret = ov_write_reg16(client, OV2680_VERTICAL_OUTPUT_SIZE_H,
|
||||
sensor->mode.v_output_size);
|
||||
if (ret)
|
||||
return ret;
|
||||
|
||||
ret = ov_write_reg16(client, OV2680_HTS, sensor->mode.hts);
|
||||
if (ret)
|
||||
return ret;
|
||||
|
||||
ret = ov_write_reg16(client, OV2680_VTS, sensor->mode.vts);
|
||||
if (ret)
|
||||
return ret;
|
||||
|
||||
ret = ov_write_reg16(client, OV2680_ISP_X_WIN, 0);
|
||||
if (ret)
|
||||
return ret;
|
||||
|
||||
ret = ov_write_reg16(client, OV2680_ISP_Y_WIN, 0);
|
||||
if (ret)
|
||||
return ret;
|
||||
|
||||
ret = ov_write_reg8(client, OV2680_X_INC, inc);
|
||||
if (ret)
|
||||
return ret;
|
||||
|
||||
ret = ov_write_reg8(client, OV2680_Y_INC, inc);
|
||||
if (ret)
|
||||
return ret;
|
||||
|
||||
ret = ov_write_reg16(client, OV2680_X_WIN, sensor->mode.h_output_size);
|
||||
if (ret)
|
||||
return ret;
|
||||
|
||||
ret = ov_write_reg16(client, OV2680_Y_WIN, sensor->mode.v_output_size);
|
||||
if (ret)
|
||||
return ret;
|
||||
|
||||
ret = ov_write_reg8(client, OV2680_REG_FORMAT1, fmt1);
|
||||
if (ret)
|
||||
return ret;
|
||||
|
||||
ret = ov_write_reg8(client, OV2680_REG_FORMAT2, fmt2);
|
||||
if (ret)
|
||||
return ret;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int ov2680_set_fmt(struct v4l2_subdev *sd,
|
||||
struct v4l2_subdev_state *sd_state,
|
||||
struct v4l2_subdev_format *format)
|
||||
@ -409,18 +534,10 @@ static int ov2680_set_fmt(struct v4l2_subdev *sd,
|
||||
|
||||
/* s_power has not been called yet for std v4l2 clients (camorama) */
|
||||
power_up(sd);
|
||||
ret = ov2680_write_reg_array(client, dev->res->regs);
|
||||
if (ret) {
|
||||
dev_err(&client->dev,
|
||||
"ov2680 write resolution register err: %d\n", ret);
|
||||
goto err;
|
||||
}
|
||||
|
||||
ret = ov_write_reg16(client, OV2680_TIMING_VTS_H, dev->res->lines_per_frame);
|
||||
if (ret) {
|
||||
dev_err(&client->dev, "ov2680 write vts err: %d\n", ret);
|
||||
ret = ov2680_set_mode(dev, fmt->width, fmt->height);
|
||||
if (ret < 0)
|
||||
goto err;
|
||||
}
|
||||
|
||||
/* Restore value of all ctrls */
|
||||
ret = __v4l2_ctrl_handler_setup(&dev->ctrls.handler);
|
||||
|
||||
@ -35,6 +35,13 @@
|
||||
#define OV2680_NATIVE_WIDTH 1616
|
||||
#define OV2680_NATIVE_HEIGHT 1216
|
||||
|
||||
/* 1704 * 1294 * 30fps = 66MHz pixel clock */
|
||||
#define OV2680_PIXELS_PER_LINE 1704
|
||||
#define OV2680_LINES_PER_FRAME 1294
|
||||
|
||||
/* If possible send 16 extra rows / lines to the ISP as padding */
|
||||
#define OV2680_END_MARGIN 16
|
||||
|
||||
#define OV2680_FOCAL_LENGTH_NUM 334 /*3.34mm*/
|
||||
|
||||
#define OV2680_BIN_FACTOR_MAX 4
|
||||
@ -105,10 +112,13 @@
|
||||
#define OV2680_HORIZONTAL_OUTPUT_SIZE_L 0x3809 /*Bit[7:0]*/
|
||||
#define OV2680_VERTICAL_OUTPUT_SIZE_H 0x380a /*Bit[3:0]*/
|
||||
#define OV2680_VERTICAL_OUTPUT_SIZE_L 0x380b /*Bit[7:0]*/
|
||||
#define OV2680_TIMING_HTS_H 0x380C /*High 8-bit, and low 8-bit HTS address is 0x380d*/
|
||||
#define OV2680_TIMING_HTS_L 0x380D /*High 8-bit, and low 8-bit HTS address is 0x380d*/
|
||||
#define OV2680_TIMING_VTS_H 0x380e /*High 8-bit, and low 8-bit HTS address is 0x380f*/
|
||||
#define OV2680_TIMING_VTS_L 0x380f /*High 8-bit, and low 8-bit HTS address is 0x380f*/
|
||||
#define OV2680_HTS 0x380c
|
||||
#define OV2680_VTS 0x380e
|
||||
#define OV2680_ISP_X_WIN 0x3810
|
||||
#define OV2680_ISP_Y_WIN 0x3812
|
||||
#define OV2680_X_INC 0x3814
|
||||
#define OV2680_Y_INC 0x3815
|
||||
|
||||
#define OV2680_FRAME_OFF_NUM 0x4202
|
||||
|
||||
/*Flip/Mirror*/
|
||||
@ -122,6 +132,10 @@
|
||||
|
||||
#define OV2680_REG_ISP_CTRL00 0x5080
|
||||
|
||||
#define OV2680_X_WIN 0x5704
|
||||
#define OV2680_Y_WIN 0x5706
|
||||
#define OV2680_WIN_CONTROL 0x5708
|
||||
|
||||
#define OV2680_START_STREAMING 0x01
|
||||
#define OV2680_STOP_STREAMING 0x00
|
||||
|
||||
@ -165,6 +179,15 @@ struct ov2680_device {
|
||||
|
||||
struct ov2680_mode {
|
||||
struct v4l2_mbus_framefmt fmt;
|
||||
bool binning;
|
||||
u16 h_start;
|
||||
u16 v_start;
|
||||
u16 h_end;
|
||||
u16 v_end;
|
||||
u16 h_output_size;
|
||||
u16 v_output_size;
|
||||
u16 hts;
|
||||
u16 vts;
|
||||
} mode;
|
||||
|
||||
struct ov2680_ctrls {
|
||||
@ -248,6 +271,8 @@ static struct ov2680_reg const ov2680_global_setting[] = {
|
||||
{0x3819, 0x04},
|
||||
{0x4000, 0x81},
|
||||
{0x4001, 0x40},
|
||||
{0x4008, 0x00},
|
||||
{0x4009, 0x03},
|
||||
{0x4602, 0x02},
|
||||
{0x481f, 0x36},
|
||||
{0x4825, 0x36},
|
||||
@ -260,6 +285,8 @@ static struct ov2680_reg const ov2680_global_setting[] = {
|
||||
{0x5008, 0x04},
|
||||
{0x5009, 0x00},
|
||||
{0x5080, 0x00},
|
||||
{0x5081, 0x41},
|
||||
{0x5708, 0x01}, /* add for full size flip off and mirror off 2014/09/11 */
|
||||
{0x3701, 0x64}, //add on 14/05/13
|
||||
{0x3784, 0x0c}, //based OV2680_R1A_AM10.ovt add on 14/06/13
|
||||
{0x5780, 0x3e}, //based OV2680_R1A_AM10.ovt,Adjust DPC setting (57xx) on 14/06/13
|
||||
|
||||
Loading…
Reference in New Issue
Block a user