Message ID | 20230401145926.596216-8-hdegoede@redhat.com |
---|---|
State | Accepted |
Commit | 86199ed981ad0df0c9566bcf28867a7d299f4518 |
Headers | show |
Series | media: atomisp: Further sensor rework + exotic features removal | expand |
On Sat, Apr 1, 2023 at 4:59 PM Hans de Goede <hdegoede@redhat.com> wrote: > > enum gc0310_tok_type / the data_length read/write parameter > is always GC0310_8BIT, drop this. > > Note for the register-lists the indentation is also fixed and > c++ style comments are converted to regular C-style /* */ comments. > > Signed-off-by: Hans de Goede <hdegoede@redhat.com> > --- > .../media/atomisp/i2c/atomisp-gc0310.c | 72 ++--- > drivers/staging/media/atomisp/i2c/gc0310.h | 302 +++++++++--------- > 2 files changed, 167 insertions(+), 207 deletions(-) > > diff --git a/drivers/staging/media/atomisp/i2c/atomisp-gc0310.c b/drivers/staging/media/atomisp/i2c/atomisp-gc0310.c > index 5974dd5bd95e..4e92268da32a 100644 > --- a/drivers/staging/media/atomisp/i2c/atomisp-gc0310.c > +++ b/drivers/staging/media/atomisp/i2c/atomisp-gc0310.c > @@ -35,8 +35,7 @@ > #include "gc0310.h" > > /* i2c read/write stuff */ > -static int gc0310_read_reg(struct i2c_client *client, > - u16 data_length, u8 reg, u8 *val) > +static int gc0310_read_reg(struct i2c_client *client, u8 reg, u8 *val) > { > int err; > struct i2c_msg msg[2]; > @@ -48,12 +47,6 @@ static int gc0310_read_reg(struct i2c_client *client, > return -ENODEV; > } > > - if (data_length != GC0310_8BIT) { > - dev_err(&client->dev, "%s error, invalid data length\n", > - __func__); > - return -EINVAL; > - } > - > memset(msg, 0, sizeof(msg)); > > msg[0].addr = client->addr; > @@ -65,7 +58,7 @@ static int gc0310_read_reg(struct i2c_client *client, > data[0] = (u8)(reg & 0xff); Do we need the casting and & 0xff part? (see below) > msg[1].addr = client->addr; > - msg[1].len = data_length; > + msg[1].len = 1; > msg[1].flags = I2C_M_RD; > msg[1].buf = data; > > @@ -78,11 +71,7 @@ static int gc0310_read_reg(struct i2c_client *client, > return err; > } > > - *val = 0; > - /* high byte comes first */ > - if (data_length == GC0310_8BIT) > - *val = (u8)data[0]; > - > + *val = (u8)data[0]; Do we need casting? > return 0; > } > > @@ -101,25 +90,17 @@ static int gc0310_i2c_write(struct i2c_client *client, u16 len, u8 *data) > return ret == num_msg ? 0 : -EIO; > } > > -static int gc0310_write_reg(struct i2c_client *client, u16 data_length, > - u8 reg, u8 val) > +static int gc0310_write_reg(struct i2c_client *client, u8 reg, u8 val) > { > int ret; > unsigned char data[2] = {0}; > u8 *wreg = (u8 *)data; Oh, this looks like a candidate to the proper helpers (as you made somewhere else for other sensor drivers). > - const u16 len = data_length + sizeof(u8); /* 8-bit address + data */ > - > - if (data_length != GC0310_8BIT) { > - dev_err(&client->dev, > - "%s error, invalid data_length\n", __func__); > - return -EINVAL; > - } > + const u16 len = 1 + sizeof(u8); /* 8-bit address + data */ > > /* high byte goes out first */ > *wreg = (u8)(reg & 0xff); No casting? > - if (data_length == GC0310_8BIT) > - data[1] = (u8)(val); > + data[1] = (u8)(val); Ditto. And so on. > ret = gc0310_i2c_write(client, len, data); > if (ret) > @@ -142,7 +123,7 @@ static int gc0310_write_reg_array(struct i2c_client *client, > int i, err; > > for (i = 0; i < count; i++) { > - err = gc0310_write_reg(client, GC0310_8BIT, reglist[i].reg, reglist[i].val); > + err = gc0310_write_reg(client, reglist[i].reg, reglist[i].val); > if (err) > return err; > } > @@ -173,14 +154,12 @@ static int gc0310_set_gain(struct v4l2_subdev *sd, int gain) > dev_dbg(&client->dev, "gain=0x%x again=0x%x dgain=0x%x\n", gain, again, dgain); > > /* set analog gain */ > - ret = gc0310_write_reg(client, GC0310_8BIT, > - GC0310_AGC_ADJ, again); > + ret = gc0310_write_reg(client, GC0310_AGC_ADJ, again); > if (ret) > return ret; > > /* set digital gain */ > - ret = gc0310_write_reg(client, GC0310_8BIT, > - GC0310_DGC_ADJ, dgain); > + ret = gc0310_write_reg(client, GC0310_DGC_ADJ, dgain); > if (ret) > return ret; > > @@ -197,15 +176,11 @@ static int __gc0310_set_exposure(struct v4l2_subdev *sd, int coarse_itg, > dev_dbg(&client->dev, "coarse_itg=%d gain=%d digitgain=%d\n", coarse_itg, gain, digitgain); > > /* set exposure */ > - ret = gc0310_write_reg(client, GC0310_8BIT, > - GC0310_AEC_PK_EXPO_L, > - coarse_itg & 0xff); > + ret = gc0310_write_reg(client, GC0310_AEC_PK_EXPO_L, coarse_itg & 0xff); > if (ret) > return ret; > > - ret = gc0310_write_reg(client, GC0310_8BIT, > - GC0310_AEC_PK_EXPO_H, > - (coarse_itg >> 8) & 0x0f); > + ret = gc0310_write_reg(client, GC0310_AEC_PK_EXPO_H, (coarse_itg >> 8) & 0x0f); > if (ret) > return ret; > > @@ -280,16 +255,12 @@ static int gc0310_q_exposure(struct v4l2_subdev *sd, s32 *value) > int ret; > > /* get exposure */ > - ret = gc0310_read_reg(client, GC0310_8BIT, > - GC0310_AEC_PK_EXPO_L, > - ®_v); > + ret = gc0310_read_reg(client, GC0310_AEC_PK_EXPO_L, ®_v); > if (ret) > goto err; > > *value = reg_v; > - ret = gc0310_read_reg(client, GC0310_8BIT, > - GC0310_AEC_PK_EXPO_H, > - ®_v); > + ret = gc0310_read_reg(client, GC0310_AEC_PK_EXPO_H, ®_v); > if (ret) > goto err; > > @@ -654,14 +625,12 @@ static int gc0310_detect(struct i2c_client *client) > if (!i2c_check_functionality(adapter, I2C_FUNC_I2C)) > return -ENODEV; > > - ret = gc0310_read_reg(client, GC0310_8BIT, > - GC0310_SC_CMMN_CHIP_ID_H, &high); > + ret = gc0310_read_reg(client, GC0310_SC_CMMN_CHIP_ID_H, &high); > if (ret) { > dev_err(&client->dev, "read sensor_id_high failed\n"); > return -ENODEV; > } > - ret = gc0310_read_reg(client, GC0310_8BIT, > - GC0310_SC_CMMN_CHIP_ID_L, &low); > + ret = gc0310_read_reg(client, GC0310_SC_CMMN_CHIP_ID_L, &low); > if (ret) { > dev_err(&client->dev, "read sensor_id_low failed\n"); > return -ENODEV; > @@ -691,22 +660,20 @@ static int gc0310_s_stream(struct v4l2_subdev *sd, int enable) > > if (enable) { > /* enable per frame MIPI and sensor ctrl reset */ > - ret = gc0310_write_reg(client, GC0310_8BIT, > - 0xFE, 0x30); > + ret = gc0310_write_reg(client, 0xFE, 0x30); > if (ret) { > mutex_unlock(&dev->input_lock); > return ret; > } > } > > - ret = gc0310_write_reg(client, GC0310_8BIT, > - GC0310_RESET_RELATED, GC0310_REGISTER_PAGE_3); > + ret = gc0310_write_reg(client, GC0310_RESET_RELATED, GC0310_REGISTER_PAGE_3); > if (ret) { > mutex_unlock(&dev->input_lock); > return ret; > } > > - ret = gc0310_write_reg(client, GC0310_8BIT, GC0310_SW_STREAM, > + ret = gc0310_write_reg(client, GC0310_SW_STREAM, > enable ? GC0310_START_STREAMING : > GC0310_STOP_STREAMING); > if (ret) { > @@ -714,8 +681,7 @@ static int gc0310_s_stream(struct v4l2_subdev *sd, int enable) > return ret; > } > > - ret = gc0310_write_reg(client, GC0310_8BIT, > - GC0310_RESET_RELATED, GC0310_REGISTER_PAGE_0); > + ret = gc0310_write_reg(client, GC0310_RESET_RELATED, GC0310_REGISTER_PAGE_0); > if (ret) { > mutex_unlock(&dev->input_lock); > return ret; > diff --git a/drivers/staging/media/atomisp/i2c/gc0310.h b/drivers/staging/media/atomisp/i2c/gc0310.h > index a2734934fc6a..0ff2d93cbcbf 100644 > --- a/drivers/staging/media/atomisp/i2c/gc0310.h > +++ b/drivers/staging/media/atomisp/i2c/gc0310.h > @@ -138,20 +138,14 @@ struct gc0310_device { > bool power_on; > }; > > -enum gc0310_tok_type { > - GC0310_8BIT = 0x0001, > -}; > - > /** > * struct gc0310_reg - MI sensor register format > - * @type: type of the register > * @reg: 16-bit offset to register > * @val: 8/16/32-bit register value > * > * Define a structure for sensor register initialization values > */ > struct gc0310_reg { > - enum gc0310_tok_type type; > u8 reg; > u8 val; /* @set value for read/mod/write, @mask */ > }; > @@ -165,181 +159,181 @@ static const struct gc0310_reg gc0310_reset_register[] = { > ///////////////////////////////////////////////// > ///////////////// system reg ///////////////// > ///////////////////////////////////////////////// > - {GC0310_8BIT, 0xfe, 0xf0}, > - {GC0310_8BIT, 0xfe, 0xf0}, > - {GC0310_8BIT, 0xfe, 0x00}, > - > - {GC0310_8BIT, 0xfc, 0x0e}, //4e > - {GC0310_8BIT, 0xfc, 0x0e}, //16//4e // [0]apwd [6]regf_clk_gate > - {GC0310_8BIT, 0xf2, 0x80}, //sync output > - {GC0310_8BIT, 0xf3, 0x00}, //1f//01 data output > - {GC0310_8BIT, 0xf7, 0x33}, //f9 > - {GC0310_8BIT, 0xf8, 0x05}, //00 > - {GC0310_8BIT, 0xf9, 0x0e}, // 0x8e //0f > - {GC0310_8BIT, 0xfa, 0x11}, > + { 0xfe, 0xf0 }, > + { 0xfe, 0xf0 }, > + { 0xfe, 0x00 }, > + > + { 0xfc, 0x0e }, /* 4e */ > + { 0xfc, 0x0e }, /* 16//4e // [0]apwd [6]regf_clk_gate */ > + { 0xf2, 0x80 }, /* sync output */ > + { 0xf3, 0x00 }, /* 1f//01 data output */ > + { 0xf7, 0x33 }, /* f9 */ > + { 0xf8, 0x05 }, /* 00 */ > + { 0xf9, 0x0e }, /* 0x8e //0f */ > + { 0xfa, 0x11 }, > > ///////////////////////////////////////////////// > /////////////////// MIPI //////////////////// > ///////////////////////////////////////////////// > - {GC0310_8BIT, 0xfe, 0x03}, > - {GC0310_8BIT, 0x01, 0x03}, ///mipi 1lane > - {GC0310_8BIT, 0x02, 0x22}, // 0x33 > - {GC0310_8BIT, 0x03, 0x94}, > - {GC0310_8BIT, 0x04, 0x01}, // fifo_prog > - {GC0310_8BIT, 0x05, 0x00}, //fifo_prog > - {GC0310_8BIT, 0x06, 0x80}, //b0 //YUV ISP data > - {GC0310_8BIT, 0x11, 0x2a},//1e //LDI set YUV422 > - {GC0310_8BIT, 0x12, 0x90},//00 //04 //00 //04//00 //LWC[7:0] // > - {GC0310_8BIT, 0x13, 0x02},//05 //05 //LWC[15:8] > - {GC0310_8BIT, 0x15, 0x12}, // 0x10 //DPHYY_MODE read_ready > - {GC0310_8BIT, 0x17, 0x01}, > - {GC0310_8BIT, 0x40, 0x08}, > - {GC0310_8BIT, 0x41, 0x00}, > - {GC0310_8BIT, 0x42, 0x00}, > - {GC0310_8BIT, 0x43, 0x00}, > - {GC0310_8BIT, 0x21, 0x02}, // 0x01 > - {GC0310_8BIT, 0x22, 0x02}, // 0x01 > - {GC0310_8BIT, 0x23, 0x01}, // 0x05 //Nor:0x05 DOU:0x06 > - {GC0310_8BIT, 0x29, 0x00}, > - {GC0310_8BIT, 0x2A, 0x25}, // 0x05 //data zero 0x7a de > - {GC0310_8BIT, 0x2B, 0x02}, > - > - {GC0310_8BIT, 0xfe, 0x00}, > + { 0xfe, 0x03 }, > + { 0x01, 0x03 }, /* mipi 1lane */ > + { 0x02, 0x22 }, /* 0x33 */ > + { 0x03, 0x94 }, > + { 0x04, 0x01 }, /* fifo_prog */ > + { 0x05, 0x00 }, /* fifo_prog */ > + { 0x06, 0x80 }, /* b0 //YUV ISP data */ > + { 0x11, 0x2a }, /* 1e //LDI set YUV422 */ > + { 0x12, 0x90 }, /* 00 //04 //00 //04//00 //LWC[7:0] */ > + { 0x13, 0x02 }, /* 05 //05 //LWC[15:8] */ > + { 0x15, 0x12 }, /* 0x10 //DPHYY_MODE read_ready */ > + { 0x17, 0x01 }, > + { 0x40, 0x08 }, > + { 0x41, 0x00 }, > + { 0x42, 0x00 }, > + { 0x43, 0x00 }, > + { 0x21, 0x02 }, /* 0x01 */ > + { 0x22, 0x02 }, /* 0x01 */ > + { 0x23, 0x01 }, /* 0x05 //Nor:0x05 DOU:0x06 */ > + { 0x29, 0x00 }, > + { 0x2A, 0x25 }, /* 0x05 //data zero 0x7a de */ > + { 0x2B, 0x02 }, > + > + { 0xfe, 0x00 }, > > ///////////////////////////////////////////////// > ///////////////// CISCTL reg ///////////////// > ///////////////////////////////////////////////// > - {GC0310_8BIT, 0x00, 0x2f}, //2f//0f//02//01 > - {GC0310_8BIT, 0x01, 0x0f}, //06 > - {GC0310_8BIT, 0x02, 0x04}, > - {GC0310_8BIT, 0x4f, 0x00}, //AEC 0FF > - {GC0310_8BIT, 0x03, 0x01}, // 0x03 //04 > - {GC0310_8BIT, 0x04, 0xc0}, // 0xe8 //58 > - {GC0310_8BIT, 0x05, 0x00}, > - {GC0310_8BIT, 0x06, 0xb2}, // 0x0a //HB > - {GC0310_8BIT, 0x07, 0x00}, > - {GC0310_8BIT, 0x08, 0x0c}, // 0x89 //VB > - {GC0310_8BIT, 0x09, 0x00}, //row start > - {GC0310_8BIT, 0x0a, 0x00}, // > - {GC0310_8BIT, 0x0b, 0x00}, //col start > - {GC0310_8BIT, 0x0c, 0x00}, > - {GC0310_8BIT, 0x0d, 0x01}, //height > - {GC0310_8BIT, 0x0e, 0xf2}, // 0xf7 //height > - {GC0310_8BIT, 0x0f, 0x02}, //width > - {GC0310_8BIT, 0x10, 0x94}, // 0xa0 //height > - {GC0310_8BIT, 0x17, 0x14}, > - {GC0310_8BIT, 0x18, 0x1a}, //0a//[4]double reset > - {GC0310_8BIT, 0x19, 0x14}, //AD pipeline > - {GC0310_8BIT, 0x1b, 0x48}, > - {GC0310_8BIT, 0x1e, 0x6b}, //3b//col bias > - {GC0310_8BIT, 0x1f, 0x28}, //20//00//08//txlow > - {GC0310_8BIT, 0x20, 0x89}, //88//0c//[3:2]DA15 > - {GC0310_8BIT, 0x21, 0x49}, //48//[3] txhigh > - {GC0310_8BIT, 0x22, 0xb0}, > - {GC0310_8BIT, 0x23, 0x04}, //[1:0]vcm_r > - {GC0310_8BIT, 0x24, 0x16}, //15 > - {GC0310_8BIT, 0x34, 0x20}, //[6:4] rsg high//range > + { 0x00, 0x2f }, /* 2f//0f//02//01 */ > + { 0x01, 0x0f }, /* 06 */ > + { 0x02, 0x04 }, > + { 0x4f, 0x00 }, /* AEC 0FF */ > + { 0x03, 0x01 }, /* 0x03 //04 */ > + { 0x04, 0xc0 }, /* 0xe8 //58 */ > + { 0x05, 0x00 }, > + { 0x06, 0xb2 }, /* 0x0a //HB */ > + { 0x07, 0x00 }, > + { 0x08, 0x0c }, /* 0x89 //VB */ > + { 0x09, 0x00 }, /* row start */ > + { 0x0a, 0x00 }, > + { 0x0b, 0x00 }, /* col start */ > + { 0x0c, 0x00 }, > + { 0x0d, 0x01 }, /* height */ > + { 0x0e, 0xf2 }, /* 0xf7 //height */ > + { 0x0f, 0x02 }, /* width */ > + { 0x10, 0x94 }, /* 0xa0 //height */ > + { 0x17, 0x14 }, > + { 0x18, 0x1a }, /* 0a//[4]double reset */ > + { 0x19, 0x14 }, /* AD pipeline */ > + { 0x1b, 0x48 }, > + { 0x1e, 0x6b }, /* 3b//col bias */ > + { 0x1f, 0x28 }, /* 20//00//08//txlow */ > + { 0x20, 0x89 }, /* 88//0c//[3:2]DA15 */ > + { 0x21, 0x49 }, /* 48//[3] txhigh */ > + { 0x22, 0xb0 }, > + { 0x23, 0x04 }, /* [1:0]vcm_r */ > + { 0x24, 0x16 }, /* 15 */ > + { 0x34, 0x20 }, /* [6:4] rsg high//range */ > > ///////////////////////////////////////////////// > //////////////////// BLK //////////////////// > ///////////////////////////////////////////////// > - {GC0310_8BIT, 0x26, 0x23}, //[1]dark_current_en [0]offset_en > - {GC0310_8BIT, 0x28, 0xff}, //BLK_limie_value > - {GC0310_8BIT, 0x29, 0x00}, //global offset > - {GC0310_8BIT, 0x33, 0x18}, //offset_ratio > - {GC0310_8BIT, 0x37, 0x20}, //dark_current_ratio > - {GC0310_8BIT, 0x2a, 0x00}, > - {GC0310_8BIT, 0x2b, 0x00}, > - {GC0310_8BIT, 0x2c, 0x00}, > - {GC0310_8BIT, 0x2d, 0x00}, > - {GC0310_8BIT, 0x2e, 0x00}, > - {GC0310_8BIT, 0x2f, 0x00}, > - {GC0310_8BIT, 0x30, 0x00}, > - {GC0310_8BIT, 0x31, 0x00}, > - {GC0310_8BIT, 0x47, 0x80}, //a7 > - {GC0310_8BIT, 0x4e, 0x66}, //select_row > - {GC0310_8BIT, 0xa8, 0x02}, //win_width_dark, same with crop_win_width > - {GC0310_8BIT, 0xa9, 0x80}, > + { 0x26, 0x23 }, /* [1]dark_current_en [0]offset_en */ > + { 0x28, 0xff }, /* BLK_limie_value */ > + { 0x29, 0x00 }, /* global offset */ > + { 0x33, 0x18 }, /* offset_ratio */ > + { 0x37, 0x20 }, /* dark_current_ratio */ > + { 0x2a, 0x00 }, > + { 0x2b, 0x00 }, > + { 0x2c, 0x00 }, > + { 0x2d, 0x00 }, > + { 0x2e, 0x00 }, > + { 0x2f, 0x00 }, > + { 0x30, 0x00 }, > + { 0x31, 0x00 }, > + { 0x47, 0x80 }, /* a7 */ > + { 0x4e, 0x66 }, /* select_row */ > + { 0xa8, 0x02 }, /* win_width_dark, same with crop_win_width */ > + { 0xa9, 0x80 }, > > ///////////////////////////////////////////////// > ////////////////// ISP reg /////////////////// > ///////////////////////////////////////////////// > - {GC0310_8BIT, 0x40, 0x06}, // 0xff //ff //48 > - {GC0310_8BIT, 0x41, 0x00}, // 0x21 //00//[0]curve_en > - {GC0310_8BIT, 0x42, 0x04}, // 0xcf //0a//[1]awn_en > - {GC0310_8BIT, 0x44, 0x18}, // 0x18 //02 > - {GC0310_8BIT, 0x46, 0x02}, // 0x03 //sync > - {GC0310_8BIT, 0x49, 0x03}, > - {GC0310_8BIT, 0x4c, 0x20}, //00[5]pretect exp > - {GC0310_8BIT, 0x50, 0x01}, //crop enable > - {GC0310_8BIT, 0x51, 0x00}, > - {GC0310_8BIT, 0x52, 0x00}, > - {GC0310_8BIT, 0x53, 0x00}, > - {GC0310_8BIT, 0x54, 0x01}, > - {GC0310_8BIT, 0x55, 0x01}, //crop window height > - {GC0310_8BIT, 0x56, 0xf0}, > - {GC0310_8BIT, 0x57, 0x02}, //crop window width > - {GC0310_8BIT, 0x58, 0x90}, > + { 0x40, 0x06 }, /* 0xff //ff //48 */ > + { 0x41, 0x00 }, /* 0x21 //00//[0]curve_en */ > + { 0x42, 0x04 }, /* 0xcf //0a//[1]awn_en */ > + { 0x44, 0x18 }, /* 0x18 //02 */ > + { 0x46, 0x02 }, /* 0x03 //sync */ > + { 0x49, 0x03 }, > + { 0x4c, 0x20 }, /* 00[5]pretect exp */ > + { 0x50, 0x01 }, /* crop enable */ > + { 0x51, 0x00 }, > + { 0x52, 0x00 }, > + { 0x53, 0x00 }, > + { 0x54, 0x01 }, > + { 0x55, 0x01 }, /* crop window height */ > + { 0x56, 0xf0 }, > + { 0x57, 0x02 }, /* crop window width */ > + { 0x58, 0x90 }, > > ///////////////////////////////////////////////// > /////////////////// GAIN //////////////////// > ///////////////////////////////////////////////// > - {GC0310_8BIT, 0x70, 0x70}, //70 //80//global gain > - {GC0310_8BIT, 0x71, 0x20}, // pregain gain > - {GC0310_8BIT, 0x72, 0x40}, // post gain > - {GC0310_8BIT, 0x5a, 0x84}, //84//analog gain 0 > - {GC0310_8BIT, 0x5b, 0xc9}, //c9 > - {GC0310_8BIT, 0x5c, 0xed}, //ed//not use pga gain highest level > - {GC0310_8BIT, 0x77, 0x40}, // R gain 0x74 //awb gain > - {GC0310_8BIT, 0x78, 0x40}, // G gain > - {GC0310_8BIT, 0x79, 0x40}, // B gain 0x5f > - > - {GC0310_8BIT, 0x48, 0x00}, > - {GC0310_8BIT, 0xfe, 0x01}, > - {GC0310_8BIT, 0x0a, 0x45}, //[7]col gain mode > - > - {GC0310_8BIT, 0x3e, 0x40}, > - {GC0310_8BIT, 0x3f, 0x5c}, > - {GC0310_8BIT, 0x40, 0x7b}, > - {GC0310_8BIT, 0x41, 0xbd}, > - {GC0310_8BIT, 0x42, 0xf6}, > - {GC0310_8BIT, 0x43, 0x63}, > - {GC0310_8BIT, 0x03, 0x60}, > - {GC0310_8BIT, 0x44, 0x03}, > + { 0x70, 0x70 }, /* 70 //80//global gain */ > + { 0x71, 0x20 }, /* pregain gain */ > + { 0x72, 0x40 }, /* post gain */ > + { 0x5a, 0x84 }, /* 84//analog gain 0 */ > + { 0x5b, 0xc9 }, /* c9 */ > + { 0x5c, 0xed }, /* ed//not use pga gain highest level */ > + { 0x77, 0x40 }, /* R gain 0x74 //awb gain */ > + { 0x78, 0x40 }, /* G gain */ > + { 0x79, 0x40 }, /* B gain 0x5f */ > + > + { 0x48, 0x00 }, > + { 0xfe, 0x01 }, > + { 0x0a, 0x45 }, /* [7]col gain mode */ > + > + { 0x3e, 0x40 }, > + { 0x3f, 0x5c }, > + { 0x40, 0x7b }, > + { 0x41, 0xbd }, > + { 0x42, 0xf6 }, > + { 0x43, 0x63 }, > + { 0x03, 0x60 }, > + { 0x44, 0x03 }, > > ///////////////////////////////////////////////// > ///////////////// dark sun ////////////////// > ///////////////////////////////////////////////// > - {GC0310_8BIT, 0xfe, 0x01}, > - {GC0310_8BIT, 0x45, 0xa4}, // 0xf7 > - {GC0310_8BIT, 0x46, 0xf0}, // 0xff //f0//sun value th > - {GC0310_8BIT, 0x48, 0x03}, //sun mode > - {GC0310_8BIT, 0x4f, 0x60}, //sun_clamp > - {GC0310_8BIT, 0xfe, 0x00}, > + { 0xfe, 0x01 }, > + { 0x45, 0xa4 }, /* 0xf7 */ > + { 0x46, 0xf0 }, /* 0xff //f0//sun value th */ > + { 0x48, 0x03 }, /* sun mode */ > + { 0x4f, 0x60 }, /* sun_clamp */ > + { 0xfe, 0x00 }, > }; > > static struct gc0310_reg const gc0310_VGA_30fps[] = { > - {GC0310_8BIT, 0xfe, 0x00}, > - {GC0310_8BIT, 0x0d, 0x01}, //height > - {GC0310_8BIT, 0x0e, 0xf2}, // 0xf7 //height > - {GC0310_8BIT, 0x0f, 0x02}, //width > - {GC0310_8BIT, 0x10, 0x94}, // 0xa0 //height > - > - {GC0310_8BIT, 0x50, 0x01}, //crop enable > - {GC0310_8BIT, 0x51, 0x00}, > - {GC0310_8BIT, 0x52, 0x00}, > - {GC0310_8BIT, 0x53, 0x00}, > - {GC0310_8BIT, 0x54, 0x01}, > - {GC0310_8BIT, 0x55, 0x01}, //crop window height > - {GC0310_8BIT, 0x56, 0xf0}, > - {GC0310_8BIT, 0x57, 0x02}, //crop window width > - {GC0310_8BIT, 0x58, 0x90}, > - > - {GC0310_8BIT, 0xfe, 0x03}, > - {GC0310_8BIT, 0x12, 0x90},//00 //04 //00 //04//00 //LWC[7:0] // > - {GC0310_8BIT, 0x13, 0x02},//05 //05 //LWC[15:8] > - > - {GC0310_8BIT, 0xfe, 0x00}, > + { 0xfe, 0x00 }, > + { 0x0d, 0x01 }, /* height */ > + { 0x0e, 0xf2 }, /* 0xf7 //height */ > + { 0x0f, 0x02 }, /* width */ > + { 0x10, 0x94 }, /* 0xa0 //height */ > + > + { 0x50, 0x01 }, /* crop enable */ > + { 0x51, 0x00 }, > + { 0x52, 0x00 }, > + { 0x53, 0x00 }, > + { 0x54, 0x01 }, > + { 0x55, 0x01 }, /* crop window height */ > + { 0x56, 0xf0 }, > + { 0x57, 0x02 }, /* crop window width */ > + { 0x58, 0x90 }, > + > + { 0xfe, 0x03 }, > + { 0x12, 0x90 }, /* 00 //04 //00 //04//00 //LWC[7:0] */ > + { 0x13, 0x02 }, /* 05 //05 //LWC[15:8] */ > + > + { 0xfe, 0x00 }, > }; > > static struct gc0310_resolution gc0310_res_preview[] = { > -- > 2.39.1 >
diff --git a/drivers/staging/media/atomisp/i2c/atomisp-gc0310.c b/drivers/staging/media/atomisp/i2c/atomisp-gc0310.c index 5974dd5bd95e..4e92268da32a 100644 --- a/drivers/staging/media/atomisp/i2c/atomisp-gc0310.c +++ b/drivers/staging/media/atomisp/i2c/atomisp-gc0310.c @@ -35,8 +35,7 @@ #include "gc0310.h" /* i2c read/write stuff */ -static int gc0310_read_reg(struct i2c_client *client, - u16 data_length, u8 reg, u8 *val) +static int gc0310_read_reg(struct i2c_client *client, u8 reg, u8 *val) { int err; struct i2c_msg msg[2]; @@ -48,12 +47,6 @@ static int gc0310_read_reg(struct i2c_client *client, return -ENODEV; } - if (data_length != GC0310_8BIT) { - dev_err(&client->dev, "%s error, invalid data length\n", - __func__); - return -EINVAL; - } - memset(msg, 0, sizeof(msg)); msg[0].addr = client->addr; @@ -65,7 +58,7 @@ static int gc0310_read_reg(struct i2c_client *client, data[0] = (u8)(reg & 0xff); msg[1].addr = client->addr; - msg[1].len = data_length; + msg[1].len = 1; msg[1].flags = I2C_M_RD; msg[1].buf = data; @@ -78,11 +71,7 @@ static int gc0310_read_reg(struct i2c_client *client, return err; } - *val = 0; - /* high byte comes first */ - if (data_length == GC0310_8BIT) - *val = (u8)data[0]; - + *val = (u8)data[0]; return 0; } @@ -101,25 +90,17 @@ static int gc0310_i2c_write(struct i2c_client *client, u16 len, u8 *data) return ret == num_msg ? 0 : -EIO; } -static int gc0310_write_reg(struct i2c_client *client, u16 data_length, - u8 reg, u8 val) +static int gc0310_write_reg(struct i2c_client *client, u8 reg, u8 val) { int ret; unsigned char data[2] = {0}; u8 *wreg = (u8 *)data; - const u16 len = data_length + sizeof(u8); /* 8-bit address + data */ - - if (data_length != GC0310_8BIT) { - dev_err(&client->dev, - "%s error, invalid data_length\n", __func__); - return -EINVAL; - } + const u16 len = 1 + sizeof(u8); /* 8-bit address + data */ /* high byte goes out first */ *wreg = (u8)(reg & 0xff); - if (data_length == GC0310_8BIT) - data[1] = (u8)(val); + data[1] = (u8)(val); ret = gc0310_i2c_write(client, len, data); if (ret) @@ -142,7 +123,7 @@ static int gc0310_write_reg_array(struct i2c_client *client, int i, err; for (i = 0; i < count; i++) { - err = gc0310_write_reg(client, GC0310_8BIT, reglist[i].reg, reglist[i].val); + err = gc0310_write_reg(client, reglist[i].reg, reglist[i].val); if (err) return err; } @@ -173,14 +154,12 @@ static int gc0310_set_gain(struct v4l2_subdev *sd, int gain) dev_dbg(&client->dev, "gain=0x%x again=0x%x dgain=0x%x\n", gain, again, dgain); /* set analog gain */ - ret = gc0310_write_reg(client, GC0310_8BIT, - GC0310_AGC_ADJ, again); + ret = gc0310_write_reg(client, GC0310_AGC_ADJ, again); if (ret) return ret; /* set digital gain */ - ret = gc0310_write_reg(client, GC0310_8BIT, - GC0310_DGC_ADJ, dgain); + ret = gc0310_write_reg(client, GC0310_DGC_ADJ, dgain); if (ret) return ret; @@ -197,15 +176,11 @@ static int __gc0310_set_exposure(struct v4l2_subdev *sd, int coarse_itg, dev_dbg(&client->dev, "coarse_itg=%d gain=%d digitgain=%d\n", coarse_itg, gain, digitgain); /* set exposure */ - ret = gc0310_write_reg(client, GC0310_8BIT, - GC0310_AEC_PK_EXPO_L, - coarse_itg & 0xff); + ret = gc0310_write_reg(client, GC0310_AEC_PK_EXPO_L, coarse_itg & 0xff); if (ret) return ret; - ret = gc0310_write_reg(client, GC0310_8BIT, - GC0310_AEC_PK_EXPO_H, - (coarse_itg >> 8) & 0x0f); + ret = gc0310_write_reg(client, GC0310_AEC_PK_EXPO_H, (coarse_itg >> 8) & 0x0f); if (ret) return ret; @@ -280,16 +255,12 @@ static int gc0310_q_exposure(struct v4l2_subdev *sd, s32 *value) int ret; /* get exposure */ - ret = gc0310_read_reg(client, GC0310_8BIT, - GC0310_AEC_PK_EXPO_L, - ®_v); + ret = gc0310_read_reg(client, GC0310_AEC_PK_EXPO_L, ®_v); if (ret) goto err; *value = reg_v; - ret = gc0310_read_reg(client, GC0310_8BIT, - GC0310_AEC_PK_EXPO_H, - ®_v); + ret = gc0310_read_reg(client, GC0310_AEC_PK_EXPO_H, ®_v); if (ret) goto err; @@ -654,14 +625,12 @@ static int gc0310_detect(struct i2c_client *client) if (!i2c_check_functionality(adapter, I2C_FUNC_I2C)) return -ENODEV; - ret = gc0310_read_reg(client, GC0310_8BIT, - GC0310_SC_CMMN_CHIP_ID_H, &high); + ret = gc0310_read_reg(client, GC0310_SC_CMMN_CHIP_ID_H, &high); if (ret) { dev_err(&client->dev, "read sensor_id_high failed\n"); return -ENODEV; } - ret = gc0310_read_reg(client, GC0310_8BIT, - GC0310_SC_CMMN_CHIP_ID_L, &low); + ret = gc0310_read_reg(client, GC0310_SC_CMMN_CHIP_ID_L, &low); if (ret) { dev_err(&client->dev, "read sensor_id_low failed\n"); return -ENODEV; @@ -691,22 +660,20 @@ static int gc0310_s_stream(struct v4l2_subdev *sd, int enable) if (enable) { /* enable per frame MIPI and sensor ctrl reset */ - ret = gc0310_write_reg(client, GC0310_8BIT, - 0xFE, 0x30); + ret = gc0310_write_reg(client, 0xFE, 0x30); if (ret) { mutex_unlock(&dev->input_lock); return ret; } } - ret = gc0310_write_reg(client, GC0310_8BIT, - GC0310_RESET_RELATED, GC0310_REGISTER_PAGE_3); + ret = gc0310_write_reg(client, GC0310_RESET_RELATED, GC0310_REGISTER_PAGE_3); if (ret) { mutex_unlock(&dev->input_lock); return ret; } - ret = gc0310_write_reg(client, GC0310_8BIT, GC0310_SW_STREAM, + ret = gc0310_write_reg(client, GC0310_SW_STREAM, enable ? GC0310_START_STREAMING : GC0310_STOP_STREAMING); if (ret) { @@ -714,8 +681,7 @@ static int gc0310_s_stream(struct v4l2_subdev *sd, int enable) return ret; } - ret = gc0310_write_reg(client, GC0310_8BIT, - GC0310_RESET_RELATED, GC0310_REGISTER_PAGE_0); + ret = gc0310_write_reg(client, GC0310_RESET_RELATED, GC0310_REGISTER_PAGE_0); if (ret) { mutex_unlock(&dev->input_lock); return ret; diff --git a/drivers/staging/media/atomisp/i2c/gc0310.h b/drivers/staging/media/atomisp/i2c/gc0310.h index a2734934fc6a..0ff2d93cbcbf 100644 --- a/drivers/staging/media/atomisp/i2c/gc0310.h +++ b/drivers/staging/media/atomisp/i2c/gc0310.h @@ -138,20 +138,14 @@ struct gc0310_device { bool power_on; }; -enum gc0310_tok_type { - GC0310_8BIT = 0x0001, -}; - /** * struct gc0310_reg - MI sensor register format - * @type: type of the register * @reg: 16-bit offset to register * @val: 8/16/32-bit register value * * Define a structure for sensor register initialization values */ struct gc0310_reg { - enum gc0310_tok_type type; u8 reg; u8 val; /* @set value for read/mod/write, @mask */ }; @@ -165,181 +159,181 @@ static const struct gc0310_reg gc0310_reset_register[] = { ///////////////////////////////////////////////// ///////////////// system reg ///////////////// ///////////////////////////////////////////////// - {GC0310_8BIT, 0xfe, 0xf0}, - {GC0310_8BIT, 0xfe, 0xf0}, - {GC0310_8BIT, 0xfe, 0x00}, - - {GC0310_8BIT, 0xfc, 0x0e}, //4e - {GC0310_8BIT, 0xfc, 0x0e}, //16//4e // [0]apwd [6]regf_clk_gate - {GC0310_8BIT, 0xf2, 0x80}, //sync output - {GC0310_8BIT, 0xf3, 0x00}, //1f//01 data output - {GC0310_8BIT, 0xf7, 0x33}, //f9 - {GC0310_8BIT, 0xf8, 0x05}, //00 - {GC0310_8BIT, 0xf9, 0x0e}, // 0x8e //0f - {GC0310_8BIT, 0xfa, 0x11}, + { 0xfe, 0xf0 }, + { 0xfe, 0xf0 }, + { 0xfe, 0x00 }, + + { 0xfc, 0x0e }, /* 4e */ + { 0xfc, 0x0e }, /* 16//4e // [0]apwd [6]regf_clk_gate */ + { 0xf2, 0x80 }, /* sync output */ + { 0xf3, 0x00 }, /* 1f//01 data output */ + { 0xf7, 0x33 }, /* f9 */ + { 0xf8, 0x05 }, /* 00 */ + { 0xf9, 0x0e }, /* 0x8e //0f */ + { 0xfa, 0x11 }, ///////////////////////////////////////////////// /////////////////// MIPI //////////////////// ///////////////////////////////////////////////// - {GC0310_8BIT, 0xfe, 0x03}, - {GC0310_8BIT, 0x01, 0x03}, ///mipi 1lane - {GC0310_8BIT, 0x02, 0x22}, // 0x33 - {GC0310_8BIT, 0x03, 0x94}, - {GC0310_8BIT, 0x04, 0x01}, // fifo_prog - {GC0310_8BIT, 0x05, 0x00}, //fifo_prog - {GC0310_8BIT, 0x06, 0x80}, //b0 //YUV ISP data - {GC0310_8BIT, 0x11, 0x2a},//1e //LDI set YUV422 - {GC0310_8BIT, 0x12, 0x90},//00 //04 //00 //04//00 //LWC[7:0] // - {GC0310_8BIT, 0x13, 0x02},//05 //05 //LWC[15:8] - {GC0310_8BIT, 0x15, 0x12}, // 0x10 //DPHYY_MODE read_ready - {GC0310_8BIT, 0x17, 0x01}, - {GC0310_8BIT, 0x40, 0x08}, - {GC0310_8BIT, 0x41, 0x00}, - {GC0310_8BIT, 0x42, 0x00}, - {GC0310_8BIT, 0x43, 0x00}, - {GC0310_8BIT, 0x21, 0x02}, // 0x01 - {GC0310_8BIT, 0x22, 0x02}, // 0x01 - {GC0310_8BIT, 0x23, 0x01}, // 0x05 //Nor:0x05 DOU:0x06 - {GC0310_8BIT, 0x29, 0x00}, - {GC0310_8BIT, 0x2A, 0x25}, // 0x05 //data zero 0x7a de - {GC0310_8BIT, 0x2B, 0x02}, - - {GC0310_8BIT, 0xfe, 0x00}, + { 0xfe, 0x03 }, + { 0x01, 0x03 }, /* mipi 1lane */ + { 0x02, 0x22 }, /* 0x33 */ + { 0x03, 0x94 }, + { 0x04, 0x01 }, /* fifo_prog */ + { 0x05, 0x00 }, /* fifo_prog */ + { 0x06, 0x80 }, /* b0 //YUV ISP data */ + { 0x11, 0x2a }, /* 1e //LDI set YUV422 */ + { 0x12, 0x90 }, /* 00 //04 //00 //04//00 //LWC[7:0] */ + { 0x13, 0x02 }, /* 05 //05 //LWC[15:8] */ + { 0x15, 0x12 }, /* 0x10 //DPHYY_MODE read_ready */ + { 0x17, 0x01 }, + { 0x40, 0x08 }, + { 0x41, 0x00 }, + { 0x42, 0x00 }, + { 0x43, 0x00 }, + { 0x21, 0x02 }, /* 0x01 */ + { 0x22, 0x02 }, /* 0x01 */ + { 0x23, 0x01 }, /* 0x05 //Nor:0x05 DOU:0x06 */ + { 0x29, 0x00 }, + { 0x2A, 0x25 }, /* 0x05 //data zero 0x7a de */ + { 0x2B, 0x02 }, + + { 0xfe, 0x00 }, ///////////////////////////////////////////////// ///////////////// CISCTL reg ///////////////// ///////////////////////////////////////////////// - {GC0310_8BIT, 0x00, 0x2f}, //2f//0f//02//01 - {GC0310_8BIT, 0x01, 0x0f}, //06 - {GC0310_8BIT, 0x02, 0x04}, - {GC0310_8BIT, 0x4f, 0x00}, //AEC 0FF - {GC0310_8BIT, 0x03, 0x01}, // 0x03 //04 - {GC0310_8BIT, 0x04, 0xc0}, // 0xe8 //58 - {GC0310_8BIT, 0x05, 0x00}, - {GC0310_8BIT, 0x06, 0xb2}, // 0x0a //HB - {GC0310_8BIT, 0x07, 0x00}, - {GC0310_8BIT, 0x08, 0x0c}, // 0x89 //VB - {GC0310_8BIT, 0x09, 0x00}, //row start - {GC0310_8BIT, 0x0a, 0x00}, // - {GC0310_8BIT, 0x0b, 0x00}, //col start - {GC0310_8BIT, 0x0c, 0x00}, - {GC0310_8BIT, 0x0d, 0x01}, //height - {GC0310_8BIT, 0x0e, 0xf2}, // 0xf7 //height - {GC0310_8BIT, 0x0f, 0x02}, //width - {GC0310_8BIT, 0x10, 0x94}, // 0xa0 //height - {GC0310_8BIT, 0x17, 0x14}, - {GC0310_8BIT, 0x18, 0x1a}, //0a//[4]double reset - {GC0310_8BIT, 0x19, 0x14}, //AD pipeline - {GC0310_8BIT, 0x1b, 0x48}, - {GC0310_8BIT, 0x1e, 0x6b}, //3b//col bias - {GC0310_8BIT, 0x1f, 0x28}, //20//00//08//txlow - {GC0310_8BIT, 0x20, 0x89}, //88//0c//[3:2]DA15 - {GC0310_8BIT, 0x21, 0x49}, //48//[3] txhigh - {GC0310_8BIT, 0x22, 0xb0}, - {GC0310_8BIT, 0x23, 0x04}, //[1:0]vcm_r - {GC0310_8BIT, 0x24, 0x16}, //15 - {GC0310_8BIT, 0x34, 0x20}, //[6:4] rsg high//range + { 0x00, 0x2f }, /* 2f//0f//02//01 */ + { 0x01, 0x0f }, /* 06 */ + { 0x02, 0x04 }, + { 0x4f, 0x00 }, /* AEC 0FF */ + { 0x03, 0x01 }, /* 0x03 //04 */ + { 0x04, 0xc0 }, /* 0xe8 //58 */ + { 0x05, 0x00 }, + { 0x06, 0xb2 }, /* 0x0a //HB */ + { 0x07, 0x00 }, + { 0x08, 0x0c }, /* 0x89 //VB */ + { 0x09, 0x00 }, /* row start */ + { 0x0a, 0x00 }, + { 0x0b, 0x00 }, /* col start */ + { 0x0c, 0x00 }, + { 0x0d, 0x01 }, /* height */ + { 0x0e, 0xf2 }, /* 0xf7 //height */ + { 0x0f, 0x02 }, /* width */ + { 0x10, 0x94 }, /* 0xa0 //height */ + { 0x17, 0x14 }, + { 0x18, 0x1a }, /* 0a//[4]double reset */ + { 0x19, 0x14 }, /* AD pipeline */ + { 0x1b, 0x48 }, + { 0x1e, 0x6b }, /* 3b//col bias */ + { 0x1f, 0x28 }, /* 20//00//08//txlow */ + { 0x20, 0x89 }, /* 88//0c//[3:2]DA15 */ + { 0x21, 0x49 }, /* 48//[3] txhigh */ + { 0x22, 0xb0 }, + { 0x23, 0x04 }, /* [1:0]vcm_r */ + { 0x24, 0x16 }, /* 15 */ + { 0x34, 0x20 }, /* [6:4] rsg high//range */ ///////////////////////////////////////////////// //////////////////// BLK //////////////////// ///////////////////////////////////////////////// - {GC0310_8BIT, 0x26, 0x23}, //[1]dark_current_en [0]offset_en - {GC0310_8BIT, 0x28, 0xff}, //BLK_limie_value - {GC0310_8BIT, 0x29, 0x00}, //global offset - {GC0310_8BIT, 0x33, 0x18}, //offset_ratio - {GC0310_8BIT, 0x37, 0x20}, //dark_current_ratio - {GC0310_8BIT, 0x2a, 0x00}, - {GC0310_8BIT, 0x2b, 0x00}, - {GC0310_8BIT, 0x2c, 0x00}, - {GC0310_8BIT, 0x2d, 0x00}, - {GC0310_8BIT, 0x2e, 0x00}, - {GC0310_8BIT, 0x2f, 0x00}, - {GC0310_8BIT, 0x30, 0x00}, - {GC0310_8BIT, 0x31, 0x00}, - {GC0310_8BIT, 0x47, 0x80}, //a7 - {GC0310_8BIT, 0x4e, 0x66}, //select_row - {GC0310_8BIT, 0xa8, 0x02}, //win_width_dark, same with crop_win_width - {GC0310_8BIT, 0xa9, 0x80}, + { 0x26, 0x23 }, /* [1]dark_current_en [0]offset_en */ + { 0x28, 0xff }, /* BLK_limie_value */ + { 0x29, 0x00 }, /* global offset */ + { 0x33, 0x18 }, /* offset_ratio */ + { 0x37, 0x20 }, /* dark_current_ratio */ + { 0x2a, 0x00 }, + { 0x2b, 0x00 }, + { 0x2c, 0x00 }, + { 0x2d, 0x00 }, + { 0x2e, 0x00 }, + { 0x2f, 0x00 }, + { 0x30, 0x00 }, + { 0x31, 0x00 }, + { 0x47, 0x80 }, /* a7 */ + { 0x4e, 0x66 }, /* select_row */ + { 0xa8, 0x02 }, /* win_width_dark, same with crop_win_width */ + { 0xa9, 0x80 }, ///////////////////////////////////////////////// ////////////////// ISP reg /////////////////// ///////////////////////////////////////////////// - {GC0310_8BIT, 0x40, 0x06}, // 0xff //ff //48 - {GC0310_8BIT, 0x41, 0x00}, // 0x21 //00//[0]curve_en - {GC0310_8BIT, 0x42, 0x04}, // 0xcf //0a//[1]awn_en - {GC0310_8BIT, 0x44, 0x18}, // 0x18 //02 - {GC0310_8BIT, 0x46, 0x02}, // 0x03 //sync - {GC0310_8BIT, 0x49, 0x03}, - {GC0310_8BIT, 0x4c, 0x20}, //00[5]pretect exp - {GC0310_8BIT, 0x50, 0x01}, //crop enable - {GC0310_8BIT, 0x51, 0x00}, - {GC0310_8BIT, 0x52, 0x00}, - {GC0310_8BIT, 0x53, 0x00}, - {GC0310_8BIT, 0x54, 0x01}, - {GC0310_8BIT, 0x55, 0x01}, //crop window height - {GC0310_8BIT, 0x56, 0xf0}, - {GC0310_8BIT, 0x57, 0x02}, //crop window width - {GC0310_8BIT, 0x58, 0x90}, + { 0x40, 0x06 }, /* 0xff //ff //48 */ + { 0x41, 0x00 }, /* 0x21 //00//[0]curve_en */ + { 0x42, 0x04 }, /* 0xcf //0a//[1]awn_en */ + { 0x44, 0x18 }, /* 0x18 //02 */ + { 0x46, 0x02 }, /* 0x03 //sync */ + { 0x49, 0x03 }, + { 0x4c, 0x20 }, /* 00[5]pretect exp */ + { 0x50, 0x01 }, /* crop enable */ + { 0x51, 0x00 }, + { 0x52, 0x00 }, + { 0x53, 0x00 }, + { 0x54, 0x01 }, + { 0x55, 0x01 }, /* crop window height */ + { 0x56, 0xf0 }, + { 0x57, 0x02 }, /* crop window width */ + { 0x58, 0x90 }, ///////////////////////////////////////////////// /////////////////// GAIN //////////////////// ///////////////////////////////////////////////// - {GC0310_8BIT, 0x70, 0x70}, //70 //80//global gain - {GC0310_8BIT, 0x71, 0x20}, // pregain gain - {GC0310_8BIT, 0x72, 0x40}, // post gain - {GC0310_8BIT, 0x5a, 0x84}, //84//analog gain 0 - {GC0310_8BIT, 0x5b, 0xc9}, //c9 - {GC0310_8BIT, 0x5c, 0xed}, //ed//not use pga gain highest level - {GC0310_8BIT, 0x77, 0x40}, // R gain 0x74 //awb gain - {GC0310_8BIT, 0x78, 0x40}, // G gain - {GC0310_8BIT, 0x79, 0x40}, // B gain 0x5f - - {GC0310_8BIT, 0x48, 0x00}, - {GC0310_8BIT, 0xfe, 0x01}, - {GC0310_8BIT, 0x0a, 0x45}, //[7]col gain mode - - {GC0310_8BIT, 0x3e, 0x40}, - {GC0310_8BIT, 0x3f, 0x5c}, - {GC0310_8BIT, 0x40, 0x7b}, - {GC0310_8BIT, 0x41, 0xbd}, - {GC0310_8BIT, 0x42, 0xf6}, - {GC0310_8BIT, 0x43, 0x63}, - {GC0310_8BIT, 0x03, 0x60}, - {GC0310_8BIT, 0x44, 0x03}, + { 0x70, 0x70 }, /* 70 //80//global gain */ + { 0x71, 0x20 }, /* pregain gain */ + { 0x72, 0x40 }, /* post gain */ + { 0x5a, 0x84 }, /* 84//analog gain 0 */ + { 0x5b, 0xc9 }, /* c9 */ + { 0x5c, 0xed }, /* ed//not use pga gain highest level */ + { 0x77, 0x40 }, /* R gain 0x74 //awb gain */ + { 0x78, 0x40 }, /* G gain */ + { 0x79, 0x40 }, /* B gain 0x5f */ + + { 0x48, 0x00 }, + { 0xfe, 0x01 }, + { 0x0a, 0x45 }, /* [7]col gain mode */ + + { 0x3e, 0x40 }, + { 0x3f, 0x5c }, + { 0x40, 0x7b }, + { 0x41, 0xbd }, + { 0x42, 0xf6 }, + { 0x43, 0x63 }, + { 0x03, 0x60 }, + { 0x44, 0x03 }, ///////////////////////////////////////////////// ///////////////// dark sun ////////////////// ///////////////////////////////////////////////// - {GC0310_8BIT, 0xfe, 0x01}, - {GC0310_8BIT, 0x45, 0xa4}, // 0xf7 - {GC0310_8BIT, 0x46, 0xf0}, // 0xff //f0//sun value th - {GC0310_8BIT, 0x48, 0x03}, //sun mode - {GC0310_8BIT, 0x4f, 0x60}, //sun_clamp - {GC0310_8BIT, 0xfe, 0x00}, + { 0xfe, 0x01 }, + { 0x45, 0xa4 }, /* 0xf7 */ + { 0x46, 0xf0 }, /* 0xff //f0//sun value th */ + { 0x48, 0x03 }, /* sun mode */ + { 0x4f, 0x60 }, /* sun_clamp */ + { 0xfe, 0x00 }, }; static struct gc0310_reg const gc0310_VGA_30fps[] = { - {GC0310_8BIT, 0xfe, 0x00}, - {GC0310_8BIT, 0x0d, 0x01}, //height - {GC0310_8BIT, 0x0e, 0xf2}, // 0xf7 //height - {GC0310_8BIT, 0x0f, 0x02}, //width - {GC0310_8BIT, 0x10, 0x94}, // 0xa0 //height - - {GC0310_8BIT, 0x50, 0x01}, //crop enable - {GC0310_8BIT, 0x51, 0x00}, - {GC0310_8BIT, 0x52, 0x00}, - {GC0310_8BIT, 0x53, 0x00}, - {GC0310_8BIT, 0x54, 0x01}, - {GC0310_8BIT, 0x55, 0x01}, //crop window height - {GC0310_8BIT, 0x56, 0xf0}, - {GC0310_8BIT, 0x57, 0x02}, //crop window width - {GC0310_8BIT, 0x58, 0x90}, - - {GC0310_8BIT, 0xfe, 0x03}, - {GC0310_8BIT, 0x12, 0x90},//00 //04 //00 //04//00 //LWC[7:0] // - {GC0310_8BIT, 0x13, 0x02},//05 //05 //LWC[15:8] - - {GC0310_8BIT, 0xfe, 0x00}, + { 0xfe, 0x00 }, + { 0x0d, 0x01 }, /* height */ + { 0x0e, 0xf2 }, /* 0xf7 //height */ + { 0x0f, 0x02 }, /* width */ + { 0x10, 0x94 }, /* 0xa0 //height */ + + { 0x50, 0x01 }, /* crop enable */ + { 0x51, 0x00 }, + { 0x52, 0x00 }, + { 0x53, 0x00 }, + { 0x54, 0x01 }, + { 0x55, 0x01 }, /* crop window height */ + { 0x56, 0xf0 }, + { 0x57, 0x02 }, /* crop window width */ + { 0x58, 0x90 }, + + { 0xfe, 0x03 }, + { 0x12, 0x90 }, /* 00 //04 //00 //04//00 //LWC[7:0] */ + { 0x13, 0x02 }, /* 05 //05 //LWC[15:8] */ + + { 0xfe, 0x00 }, }; static struct gc0310_resolution gc0310_res_preview[] = {
enum gc0310_tok_type / the data_length read/write parameter is always GC0310_8BIT, drop this. Note for the register-lists the indentation is also fixed and c++ style comments are converted to regular C-style /* */ comments. Signed-off-by: Hans de Goede <hdegoede@redhat.com> --- .../media/atomisp/i2c/atomisp-gc0310.c | 72 ++--- drivers/staging/media/atomisp/i2c/gc0310.h | 302 +++++++++--------- 2 files changed, 167 insertions(+), 207 deletions(-)