media: i2c: ov5647: Separate out the common registers.

There are many registers in common between all the modes.
Pull those out into one common table.

Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
This commit is contained in:
Dave Stevenson
2024-10-15 17:02:39 +01:00
committed by Dom Cobley
parent 9029793c3a
commit cf93cde519

View File

@@ -161,22 +161,16 @@ static const struct regval_list sensor_oe_enable_regs[] = {
{0x3002, 0xe4}, {0x3002, 0xe4},
}; };
static struct regval_list ov5647_2592x1944_10bpp[] = { static struct regval_list ov5647_common_regs[] = {
{0x0100, 0x00}, {0x0100, 0x00},
{0x0103, 0x01}, {0x0103, 0x01},
{0x3034, 0x1a}, {0x3034, 0x1a},
{0x3035, 0x21}, {0x3035, 0x21},
{0x3036, 0x69},
{0x303c, 0x11}, {0x303c, 0x11},
{0x3106, 0xf5}, {0x3106, 0xf5},
{0x3821, 0x00},
{0x3820, 0x00},
{0x3827, 0xec}, {0x3827, 0xec},
{0x370c, 0x03}, {0x370c, 0x03},
{0x3612, 0x5b},
{0x3618, 0x04},
{0x5000, 0x06}, {0x5000, 0x06},
{0x5002, 0x41},
{0x5003, 0x08}, {0x5003, 0x08},
{0x5a00, 0x08}, {0x5a00, 0x08},
{0x3000, 0x00}, {0x3000, 0x00},
@@ -191,14 +185,47 @@ static struct regval_list ov5647_2592x1944_10bpp[] = {
{0x3a19, 0xf8}, {0x3a19, 0xf8},
{0x3c01, 0x80}, {0x3c01, 0x80},
{0x3b07, 0x0c}, {0x3b07, 0x0c},
{0x3630, 0x2e},
{0x3632, 0xe2},
{0x3633, 0x23},
{0x3634, 0x44},
{0x3636, 0x06},
{0x3620, 0x64},
{0x3621, 0xe0},
{0x3600, 0x37},
{0x3704, 0xa0},
{0x3703, 0x5a},
{0x3715, 0x78},
{0x3717, 0x01},
{0x3731, 0x02},
{0x370b, 0x60},
{0x3705, 0x1a},
{0x3f05, 0x02},
{0x3f06, 0x10},
{0x3f01, 0x0a},
{0x3a08, 0x01},
{0x3a0f, 0x58},
{0x3a10, 0x50},
{0x3a1b, 0x58},
{0x3a1e, 0x50},
{0x3a11, 0x60},
{0x3a1f, 0x28},
{0x4001, 0x02},
{0x4000, 0x09},
{0x3503, 0x03},
};
static struct regval_list ov5647_2592x1944_10bpp[] = {
{0x3036, 0x69},
{0x3821, 0x00},
{0x3820, 0x00},
{0x3612, 0x5b},
{0x3618, 0x04},
{0x5002, 0x41},
{0x3814, 0x11}, {0x3814, 0x11},
{0x3815, 0x11}, {0x3815, 0x11},
{0x3708, 0x64}, {0x3708, 0x64},
{0x3709, 0x12}, {0x3709, 0x12},
{0x3808, 0x0a},
{0x3809, 0x20},
{0x380a, 0x07},
{0x380b, 0x98},
{0x3800, 0x00}, {0x3800, 0x00},
{0x3801, 0x00}, {0x3801, 0x00},
{0x3802, 0x00}, {0x3802, 0x00},
@@ -207,85 +234,34 @@ static struct regval_list ov5647_2592x1944_10bpp[] = {
{0x3805, 0x3f}, {0x3805, 0x3f},
{0x3806, 0x07}, {0x3806, 0x07},
{0x3807, 0xa3}, {0x3807, 0xa3},
{0x3808, 0x0a},
{0x3809, 0x20},
{0x380a, 0x07},
{0x380b, 0x98},
{0x3811, 0x10}, {0x3811, 0x10},
{0x3813, 0x06}, {0x3813, 0x06},
{0x3630, 0x2e},
{0x3632, 0xe2},
{0x3633, 0x23},
{0x3634, 0x44},
{0x3636, 0x06},
{0x3620, 0x64},
{0x3621, 0xe0},
{0x3600, 0x37},
{0x3704, 0xa0},
{0x3703, 0x5a},
{0x3715, 0x78},
{0x3717, 0x01},
{0x3731, 0x02},
{0x370b, 0x60},
{0x3705, 0x1a},
{0x3f05, 0x02},
{0x3f06, 0x10},
{0x3f01, 0x0a},
{0x3a08, 0x01},
{0x3a09, 0x28}, {0x3a09, 0x28},
{0x3a0a, 0x00}, {0x3a0a, 0x00},
{0x3a0b, 0xf6}, {0x3a0b, 0xf6},
{0x3a0d, 0x08}, {0x3a0d, 0x08},
{0x3a0e, 0x06}, {0x3a0e, 0x06},
{0x3a0f, 0x58},
{0x3a10, 0x50},
{0x3a1b, 0x58},
{0x3a1e, 0x50},
{0x3a11, 0x60},
{0x3a1f, 0x28},
{0x4001, 0x02},
{0x4004, 0x04}, {0x4004, 0x04},
{0x4000, 0x09},
{0x4837, 0x19}, {0x4837, 0x19},
{0x4800, 0x24}, {0x4800, 0x24},
{0x3503, 0x03},
{0x0100, 0x01}, {0x0100, 0x01},
}; };
static struct regval_list ov5647_1080p30_10bpp[] = { static struct regval_list ov5647_1080p30_10bpp[] = {
{0x0100, 0x00},
{0x0103, 0x01},
{0x3034, 0x1a},
{0x3035, 0x21},
{0x3036, 0x62}, {0x3036, 0x62},
{0x303c, 0x11},
{0x3106, 0xf5},
{0x3821, 0x00}, {0x3821, 0x00},
{0x3820, 0x00}, {0x3820, 0x00},
{0x3827, 0xec},
{0x370c, 0x03},
{0x3612, 0x5b}, {0x3612, 0x5b},
{0x3618, 0x04}, {0x3618, 0x04},
{0x5000, 0x06},
{0x5002, 0x41}, {0x5002, 0x41},
{0x5003, 0x08},
{0x5a00, 0x08},
{0x3000, 0x00},
{0x3001, 0x00},
{0x3002, 0x00},
{0x3016, 0x08},
{0x3017, 0xe0},
{0x3018, 0x44},
{0x301c, 0xf8},
{0x301d, 0xf0},
{0x3a18, 0x00},
{0x3a19, 0xf8},
{0x3c01, 0x80},
{0x3b07, 0x0c},
{0x3814, 0x11}, {0x3814, 0x11},
{0x3815, 0x11}, {0x3815, 0x11},
{0x3708, 0x64}, {0x3708, 0x64},
{0x3709, 0x12}, {0x3709, 0x12},
{0x3808, 0x07},
{0x3809, 0x80},
{0x380a, 0x04},
{0x380b, 0x38},
{0x3800, 0x01}, {0x3800, 0x01},
{0x3801, 0x5c}, {0x3801, 0x5c},
{0x3802, 0x01}, {0x3802, 0x01},
@@ -294,77 +270,30 @@ static struct regval_list ov5647_1080p30_10bpp[] = {
{0x3805, 0xe3}, {0x3805, 0xe3},
{0x3806, 0x05}, {0x3806, 0x05},
{0x3807, 0xf1}, {0x3807, 0xf1},
{0x3808, 0x07},
{0x3809, 0x80},
{0x380a, 0x04},
{0x380b, 0x38},
{0x3811, 0x04}, {0x3811, 0x04},
{0x3813, 0x02}, {0x3813, 0x02},
{0x3630, 0x2e},
{0x3632, 0xe2},
{0x3633, 0x23},
{0x3634, 0x44},
{0x3636, 0x06},
{0x3620, 0x64},
{0x3621, 0xe0},
{0x3600, 0x37},
{0x3704, 0xa0},
{0x3703, 0x5a},
{0x3715, 0x78},
{0x3717, 0x01},
{0x3731, 0x02},
{0x370b, 0x60},
{0x3705, 0x1a},
{0x3f05, 0x02},
{0x3f06, 0x10},
{0x3f01, 0x0a},
{0x3a08, 0x01},
{0x3a09, 0x4b}, {0x3a09, 0x4b},
{0x3a0a, 0x01}, {0x3a0a, 0x01},
{0x3a0b, 0x13}, {0x3a0b, 0x13},
{0x3a0d, 0x04}, {0x3a0d, 0x04},
{0x3a0e, 0x03}, {0x3a0e, 0x03},
{0x3a0f, 0x58},
{0x3a10, 0x50},
{0x3a1b, 0x58},
{0x3a1e, 0x50},
{0x3a11, 0x60},
{0x3a1f, 0x28},
{0x4001, 0x02},
{0x4004, 0x04}, {0x4004, 0x04},
{0x4000, 0x09},
{0x4837, 0x19}, {0x4837, 0x19},
{0x4800, 0x34}, {0x4800, 0x34},
{0x3503, 0x03},
{0x0100, 0x01}, {0x0100, 0x01},
}; };
static struct regval_list ov5647_2x2binned_10bpp[] = { static struct regval_list ov5647_2x2binned_10bpp[] = {
{0x0100, 0x00},
{0x0103, 0x01},
{0x3034, 0x1a},
{0x3035, 0x21},
{0x3036, 0x62}, {0x3036, 0x62},
{0x303c, 0x11},
{0x3106, 0xf5},
{0x3821, 0x01}, {0x3821, 0x01},
{0x3820, 0x41}, {0x3820, 0x41},
{0x3827, 0xec},
{0x370c, 0x03},
{0x3612, 0x59}, {0x3612, 0x59},
{0x3618, 0x00}, {0x3618, 0x00},
{0x5000, 0x06},
{0x5002, 0x41}, {0x5002, 0x41},
{0x5003, 0x08},
{0x5a00, 0x08},
{0x3000, 0x00},
{0x3001, 0x00},
{0x3002, 0x00},
{0x3016, 0x08},
{0x3017, 0xe0},
{0x3018, 0x44},
{0x301c, 0xf8},
{0x301d, 0xf0},
{0x3a18, 0x00},
{0x3a19, 0xf8},
{0x3c01, 0x80},
{0x3b07, 0x0c},
{0x3800, 0x00}, {0x3800, 0x00},
{0x3801, 0x00}, {0x3801, 0x00},
{0x3802, 0x00}, {0x3802, 0x00},
@@ -381,42 +310,14 @@ static struct regval_list ov5647_2x2binned_10bpp[] = {
{0x3813, 0x06}, {0x3813, 0x06},
{0x3814, 0x31}, {0x3814, 0x31},
{0x3815, 0x31}, {0x3815, 0x31},
{0x3630, 0x2e},
{0x3632, 0xe2},
{0x3633, 0x23},
{0x3634, 0x44},
{0x3636, 0x06},
{0x3620, 0x64},
{0x3621, 0xe0},
{0x3600, 0x37},
{0x3704, 0xa0},
{0x3703, 0x5a},
{0x3715, 0x78},
{0x3717, 0x01},
{0x3731, 0x02},
{0x370b, 0x60},
{0x3705, 0x1a},
{0x3f05, 0x02},
{0x3f06, 0x10},
{0x3f01, 0x0a},
{0x3a08, 0x01},
{0x3a09, 0x28}, {0x3a09, 0x28},
{0x3a0a, 0x00}, {0x3a0a, 0x00},
{0x3a0b, 0xf6}, {0x3a0b, 0xf6},
{0x3a0d, 0x08}, {0x3a0d, 0x08},
{0x3a0e, 0x06}, {0x3a0e, 0x06},
{0x3a0f, 0x58},
{0x3a10, 0x50},
{0x3a1b, 0x58},
{0x3a1e, 0x50},
{0x3a11, 0x60},
{0x3a1f, 0x28},
{0x4001, 0x02},
{0x4004, 0x04}, {0x4004, 0x04},
{0x4000, 0x09},
{0x4837, 0x16}, {0x4837, 0x16},
{0x4800, 0x24}, {0x4800, 0x24},
{0x3503, 0x03},
{0x350a, 0x00}, {0x350a, 0x00},
{0x350b, 0x10}, {0x350b, 0x10},
{0x3500, 0x00}, {0x3500, 0x00},
@@ -427,42 +328,15 @@ static struct regval_list ov5647_2x2binned_10bpp[] = {
}; };
static struct regval_list ov5647_640x480_10bpp[] = { static struct regval_list ov5647_640x480_10bpp[] = {
{0x0100, 0x00},
{0x0103, 0x01},
{0x3034, 0x1a},
{0x3035, 0x21},
{0x3036, 0x46}, {0x3036, 0x46},
{0x303c, 0x11},
{0x3106, 0xf5},
{0x3821, 0x01}, {0x3821, 0x01},
{0x3820, 0x41}, {0x3820, 0x41},
{0x3827, 0xec},
{0x370c, 0x03},
{0x3612, 0x59}, {0x3612, 0x59},
{0x3618, 0x00}, {0x3618, 0x00},
{0x5000, 0x06},
{0x5003, 0x08},
{0x5a00, 0x08},
{0x3000, 0x00},
{0x3001, 0x00},
{0x3002, 0x00},
{0x3016, 0x08},
{0x3017, 0xe0},
{0x3018, 0x44},
{0x301c, 0xf8},
{0x301d, 0xf0},
{0x3a18, 0x00},
{0x3a19, 0xf8},
{0x3c01, 0x80},
{0x3b07, 0x0c},
{0x3814, 0x35}, {0x3814, 0x35},
{0x3815, 0x35}, {0x3815, 0x35},
{0x3708, 0x64}, {0x3708, 0x64},
{0x3709, 0x52}, {0x3709, 0x52},
{0x3808, 0x02},
{0x3809, 0x80},
{0x380a, 0x01},
{0x380b, 0xe0},
{0x3800, 0x00}, {0x3800, 0x00},
{0x3801, 0x10}, {0x3801, 0x10},
{0x3802, 0x00}, {0x3802, 0x00},
@@ -471,41 +345,17 @@ static struct regval_list ov5647_640x480_10bpp[] = {
{0x3805, 0x2f}, {0x3805, 0x2f},
{0x3806, 0x07}, {0x3806, 0x07},
{0x3807, 0x9f}, {0x3807, 0x9f},
{0x3630, 0x2e}, {0x3808, 0x02},
{0x3632, 0xe2}, {0x3809, 0x80},
{0x3633, 0x23}, {0x380a, 0x01},
{0x3634, 0x44}, {0x380b, 0xe0},
{0x3636, 0x06},
{0x3620, 0x64},
{0x3621, 0xe0},
{0x3600, 0x37},
{0x3704, 0xa0},
{0x3703, 0x5a},
{0x3715, 0x78},
{0x3717, 0x01},
{0x3731, 0x02},
{0x370b, 0x60},
{0x3705, 0x1a},
{0x3f05, 0x02},
{0x3f06, 0x10},
{0x3f01, 0x0a},
{0x3a08, 0x01},
{0x3a09, 0x2e}, {0x3a09, 0x2e},
{0x3a0a, 0x00}, {0x3a0a, 0x00},
{0x3a0b, 0xfb}, {0x3a0b, 0xfb},
{0x3a0d, 0x02}, {0x3a0d, 0x02},
{0x3a0e, 0x01}, {0x3a0e, 0x01},
{0x3a0f, 0x58},
{0x3a10, 0x50},
{0x3a1b, 0x58},
{0x3a1e, 0x50},
{0x3a11, 0x60},
{0x3a1f, 0x28},
{0x4001, 0x02},
{0x4004, 0x02}, {0x4004, 0x02},
{0x4000, 0x09},
{0x4800, 0x34}, {0x4800, 0x34},
{0x3503, 0x03},
{0x0100, 0x01}, {0x0100, 0x01},
}; };
@@ -714,6 +564,13 @@ static int ov5647_set_mode(struct v4l2_subdev *sd)
if (ret < 0) if (ret < 0)
return ret; return ret;
ret = ov5647_write_array(sd, ov5647_common_regs,
ARRAY_SIZE(ov5647_common_regs));
if (ret < 0) {
dev_err(&client->dev, "write sensor common regs error\n");
return ret;
}
ret = ov5647_write_array(sd, sensor->mode->reg_list, ret = ov5647_write_array(sd, sensor->mode->reg_list,
sensor->mode->num_regs); sensor->mode->num_regs);
if (ret < 0) { if (ret < 0) {