Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 086c25f8 authored by Maxime Ripard's avatar Maxime Ripard Committed by Mauro Carvalho Chehab
Browse files

media: ov5640: Enhance FPS handling 



Now that we have moved the clock generation logic out of the bytes array,
these arrays are identical between the 15fps and 30fps variants.

Remove the duplicate entries, and convert the code accordingly.

Signed-off-by: default avatarMaxime Ripard <maxime.ripard@bootlin.com>
Tested-by: Adam Ford <aford173@gmail.com> #imx6dq
Signed-off-by: default avatarSakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+samsung@kernel.org>
parent 86d81ad9

drivers/media/i2c/ov5640.c

+51 −255
Original line number Diff line number Diff line
@@ -341,26 +341,7 @@ static const struct reg_value ov5640_init_setting_30fps_VGA[] = { 
	{0x3a1f, 0x14, 0, 0}, {0x3008, 0x02, 0, 0}, {0x3c00, 0x04, 0, 300},

};



static const struct reg_value ov5640_setting_30fps_VGA_640_480[] = {

	{0x3c07, 0x08, 0, 0},

	{0x3c09, 0x1c, 0, 0}, {0x3c0a, 0x9c, 0, 0}, {0x3c0b, 0x40, 0, 0},

	{0x3814, 0x31, 0, 0},

	{0x3815, 0x31, 0, 0}, {0x3800, 0x00, 0, 0}, {0x3801, 0x00, 0, 0},

	{0x3802, 0x00, 0, 0}, {0x3803, 0x04, 0, 0}, {0x3804, 0x0a, 0, 0},

	{0x3805, 0x3f, 0, 0}, {0x3806, 0x07, 0, 0}, {0x3807, 0x9b, 0, 0},

	{0x3810, 0x00, 0, 0},

	{0x3811, 0x10, 0, 0}, {0x3812, 0x00, 0, 0}, {0x3813, 0x06, 0, 0},

	{0x3618, 0x00, 0, 0}, {0x3612, 0x29, 0, 0}, {0x3708, 0x64, 0, 0},

	{0x3709, 0x52, 0, 0}, {0x370c, 0x03, 0, 0}, {0x3a02, 0x03, 0, 0},

	{0x3a03, 0xd8, 0, 0}, {0x3a08, 0x01, 0, 0}, {0x3a09, 0x0e, 0, 0},

	{0x3a0a, 0x00, 0, 0}, {0x3a0b, 0xf6, 0, 0}, {0x3a0e, 0x03, 0, 0},

	{0x3a0d, 0x04, 0, 0}, {0x3a14, 0x03, 0, 0}, {0x3a15, 0xd8, 0, 0},

	{0x4001, 0x02, 0, 0}, {0x4004, 0x02, 0, 0}, {0x4713, 0x03, 0, 0},

	{0x4407, 0x04, 0, 0}, {0x460b, 0x35, 0, 0}, {0x460c, 0x22, 0, 0},

	{0x3824, 0x02, 0, 0}, {0x5001, 0xa3, 0, 0}, {0x3503, 0x00, 0, 0},

};



static const struct reg_value ov5640_setting_15fps_VGA_640_480[] = {

static const struct reg_value ov5640_setting_VGA_640_480[] = {

	{0x3c07, 0x08, 0, 0},

	{0x3c09, 0x1c, 0, 0}, {0x3c0a, 0x9c, 0, 0}, {0x3c0b, 0x40, 0, 0},

	{0x3814, 0x31, 0, 0},
@@ -379,26 +360,7 @@ static const struct reg_value ov5640_setting_15fps_VGA_640_480[] = { 
	{0x3824, 0x02, 0, 0}, {0x5001, 0xa3, 0, 0},

};



static const struct reg_value ov5640_setting_30fps_XGA_1024_768[] = {

	{0x3c07, 0x08, 0, 0},

	{0x3c09, 0x1c, 0, 0}, {0x3c0a, 0x9c, 0, 0}, {0x3c0b, 0x40, 0, 0},

	{0x3814, 0x31, 0, 0},

	{0x3815, 0x31, 0, 0}, {0x3800, 0x00, 0, 0}, {0x3801, 0x00, 0, 0},

	{0x3802, 0x00, 0, 0}, {0x3803, 0x04, 0, 0}, {0x3804, 0x0a, 0, 0},

	{0x3805, 0x3f, 0, 0}, {0x3806, 0x07, 0, 0}, {0x3807, 0x9b, 0, 0},

	{0x3810, 0x00, 0, 0},

	{0x3811, 0x10, 0, 0}, {0x3812, 0x00, 0, 0}, {0x3813, 0x06, 0, 0},

	{0x3618, 0x00, 0, 0}, {0x3612, 0x29, 0, 0}, {0x3708, 0x64, 0, 0},

	{0x3709, 0x52, 0, 0}, {0x370c, 0x03, 0, 0}, {0x3a02, 0x03, 0, 0},

	{0x3a03, 0xd8, 0, 0}, {0x3a08, 0x01, 0, 0}, {0x3a09, 0x0e, 0, 0},

	{0x3a0a, 0x00, 0, 0}, {0x3a0b, 0xf6, 0, 0}, {0x3a0e, 0x03, 0, 0},

	{0x3a0d, 0x04, 0, 0}, {0x3a14, 0x03, 0, 0}, {0x3a15, 0xd8, 0, 0},

	{0x4001, 0x02, 0, 0}, {0x4004, 0x02, 0, 0}, {0x4713, 0x03, 0, 0},

	{0x4407, 0x04, 0, 0}, {0x460b, 0x35, 0, 0}, {0x460c, 0x22, 0, 0},

	{0x3824, 0x02, 0, 0}, {0x5001, 0xa3, 0, 0}, {0x3503, 0x00, 0, 0},

};



static const struct reg_value ov5640_setting_15fps_XGA_1024_768[] = {

static const struct reg_value ov5640_setting_XGA_1024_768[] = {

	{0x3c07, 0x08, 0, 0},

	{0x3c09, 0x1c, 0, 0}, {0x3c0a, 0x9c, 0, 0}, {0x3c0b, 0x40, 0, 0},

	{0x3814, 0x31, 0, 0},
@@ -417,7 +379,7 @@ static const struct reg_value ov5640_setting_15fps_XGA_1024_768[] = { 
	{0x3824, 0x02, 0, 0}, {0x5001, 0xa3, 0, 0},

};



static const struct reg_value ov5640_setting_30fps_QVGA_320_240[] = {

static const struct reg_value ov5640_setting_QVGA_320_240[] = {

	{0x3c07, 0x08, 0, 0},

	{0x3c09, 0x1c, 0, 0}, {0x3c0a, 0x9c, 0, 0}, {0x3c0b, 0x40, 0, 0},

	{0x3814, 0x31, 0, 0},
@@ -436,7 +398,7 @@ static const struct reg_value ov5640_setting_30fps_QVGA_320_240[] = { 
	{0x3824, 0x02, 0, 0}, {0x5001, 0xa3, 0, 0},

};



static const struct reg_value ov5640_setting_15fps_QVGA_320_240[] = {

static const struct reg_value ov5640_setting_QCIF_176_144[] = {

	{0x3c07, 0x08, 0, 0},

	{0x3c09, 0x1c, 0, 0}, {0x3c0a, 0x9c, 0, 0}, {0x3c0b, 0x40, 0, 0},

	{0x3814, 0x31, 0, 0},
@@ -455,45 +417,7 @@ static const struct reg_value ov5640_setting_15fps_QVGA_320_240[] = { 
	{0x3824, 0x02, 0, 0}, {0x5001, 0xa3, 0, 0},

};



static const struct reg_value ov5640_setting_30fps_QCIF_176_144[] = {

	{0x3c07, 0x08, 0, 0},

	{0x3c09, 0x1c, 0, 0}, {0x3c0a, 0x9c, 0, 0}, {0x3c0b, 0x40, 0, 0},

	{0x3814, 0x31, 0, 0},

	{0x3815, 0x31, 0, 0}, {0x3800, 0x00, 0, 0}, {0x3801, 0x00, 0, 0},

	{0x3802, 0x00, 0, 0}, {0x3803, 0x04, 0, 0}, {0x3804, 0x0a, 0, 0},

	{0x3805, 0x3f, 0, 0}, {0x3806, 0x07, 0, 0}, {0x3807, 0x9b, 0, 0},

	{0x3810, 0x00, 0, 0},

	{0x3811, 0x10, 0, 0}, {0x3812, 0x00, 0, 0}, {0x3813, 0x06, 0, 0},

	{0x3618, 0x00, 0, 0}, {0x3612, 0x29, 0, 0}, {0x3708, 0x64, 0, 0},

	{0x3709, 0x52, 0, 0}, {0x370c, 0x03, 0, 0}, {0x3a02, 0x03, 0, 0},

	{0x3a03, 0xd8, 0, 0}, {0x3a08, 0x01, 0, 0}, {0x3a09, 0x27, 0, 0},

	{0x3a0a, 0x00, 0, 0}, {0x3a0b, 0xf6, 0, 0}, {0x3a0e, 0x03, 0, 0},

	{0x3a0d, 0x04, 0, 0}, {0x3a14, 0x03, 0, 0}, {0x3a15, 0xd8, 0, 0},

	{0x4001, 0x02, 0, 0}, {0x4004, 0x02, 0, 0}, {0x4713, 0x03, 0, 0},

	{0x4407, 0x04, 0, 0}, {0x460b, 0x35, 0, 0}, {0x460c, 0x22, 0, 0},

	{0x3824, 0x02, 0, 0}, {0x5001, 0xa3, 0, 0},

};



static const struct reg_value ov5640_setting_15fps_QCIF_176_144[] = {

	{0x3c07, 0x08, 0, 0},

	{0x3c09, 0x1c, 0, 0}, {0x3c0a, 0x9c, 0, 0}, {0x3c0b, 0x40, 0, 0},

	{0x3814, 0x31, 0, 0},

	{0x3815, 0x31, 0, 0}, {0x3800, 0x00, 0, 0}, {0x3801, 0x00, 0, 0},

	{0x3802, 0x00, 0, 0}, {0x3803, 0x04, 0, 0}, {0x3804, 0x0a, 0, 0},

	{0x3805, 0x3f, 0, 0}, {0x3806, 0x07, 0, 0}, {0x3807, 0x9b, 0, 0},

	{0x3810, 0x00, 0, 0},

	{0x3811, 0x10, 0, 0}, {0x3812, 0x00, 0, 0}, {0x3813, 0x06, 0, 0},

	{0x3618, 0x00, 0, 0}, {0x3612, 0x29, 0, 0}, {0x3708, 0x64, 0, 0},

	{0x3709, 0x52, 0, 0}, {0x370c, 0x03, 0, 0}, {0x3a02, 0x03, 0, 0},

	{0x3a03, 0xd8, 0, 0}, {0x3a08, 0x01, 0, 0}, {0x3a09, 0x27, 0, 0},

	{0x3a0a, 0x00, 0, 0}, {0x3a0b, 0xf6, 0, 0}, {0x3a0e, 0x03, 0, 0},

	{0x3a0d, 0x04, 0, 0}, {0x3a14, 0x03, 0, 0}, {0x3a15, 0xd8, 0, 0},

	{0x4001, 0x02, 0, 0}, {0x4004, 0x02, 0, 0}, {0x4713, 0x03, 0, 0},

	{0x4407, 0x04, 0, 0}, {0x460b, 0x35, 0, 0}, {0x460c, 0x22, 0, 0},

	{0x3824, 0x02, 0, 0}, {0x5001, 0xa3, 0, 0},

};



static const struct reg_value ov5640_setting_30fps_NTSC_720_480[] = {

static const struct reg_value ov5640_setting_NTSC_720_480[] = {

	{0x3c07, 0x08, 0, 0},

	{0x3c09, 0x1c, 0, 0}, {0x3c0a, 0x9c, 0, 0}, {0x3c0b, 0x40, 0, 0},

	{0x3814, 0x31, 0, 0},
@@ -512,26 +436,7 @@ static const struct reg_value ov5640_setting_30fps_NTSC_720_480[] = { 
	{0x3824, 0x02, 0, 0}, {0x5001, 0xa3, 0, 0},

};



static const struct reg_value ov5640_setting_15fps_NTSC_720_480[] = {

	{0x3c07, 0x08, 0, 0},

	{0x3c09, 0x1c, 0, 0}, {0x3c0a, 0x9c, 0, 0}, {0x3c0b, 0x40, 0, 0},

	{0x3814, 0x31, 0, 0},

	{0x3815, 0x31, 0, 0}, {0x3800, 0x00, 0, 0}, {0x3801, 0x00, 0, 0},

	{0x3802, 0x00, 0, 0}, {0x3803, 0x04, 0, 0}, {0x3804, 0x0a, 0, 0},

	{0x3805, 0x3f, 0, 0}, {0x3806, 0x07, 0, 0}, {0x3807, 0x9b, 0, 0},

	{0x3810, 0x00, 0, 0},

	{0x3811, 0x10, 0, 0}, {0x3812, 0x00, 0, 0}, {0x3813, 0x3c, 0, 0},

	{0x3618, 0x00, 0, 0}, {0x3612, 0x29, 0, 0}, {0x3708, 0x64, 0, 0},

	{0x3709, 0x52, 0, 0}, {0x370c, 0x03, 0, 0}, {0x3a02, 0x03, 0, 0},

	{0x3a03, 0xd8, 0, 0}, {0x3a08, 0x01, 0, 0}, {0x3a09, 0x27, 0, 0},

	{0x3a0a, 0x00, 0, 0}, {0x3a0b, 0xf6, 0, 0}, {0x3a0e, 0x03, 0, 0},

	{0x3a0d, 0x04, 0, 0}, {0x3a14, 0x03, 0, 0}, {0x3a15, 0xd8, 0, 0},

	{0x4001, 0x02, 0, 0}, {0x4004, 0x02, 0, 0}, {0x4713, 0x03, 0, 0},

	{0x4407, 0x04, 0, 0}, {0x460b, 0x35, 0, 0}, {0x460c, 0x22, 0, 0},

	{0x3824, 0x02, 0, 0}, {0x5001, 0xa3, 0, 0},

};



static const struct reg_value ov5640_setting_30fps_PAL_720_576[] = {

static const struct reg_value ov5640_setting_PAL_720_576[] = {

	{0x3c07, 0x08, 0, 0},

	{0x3c09, 0x1c, 0, 0}, {0x3c0a, 0x9c, 0, 0}, {0x3c0b, 0x40, 0, 0},

	{0x3814, 0x31, 0, 0},
@@ -550,47 +455,7 @@ static const struct reg_value ov5640_setting_30fps_PAL_720_576[] = { 
	{0x3824, 0x02, 0, 0}, {0x5001, 0xa3, 0, 0},

};



static const struct reg_value ov5640_setting_15fps_PAL_720_576[] = {

	{0x3c07, 0x08, 0, 0},

	{0x3c09, 0x1c, 0, 0}, {0x3c0a, 0x9c, 0, 0}, {0x3c0b, 0x40, 0, 0},

	{0x3814, 0x31, 0, 0},

	{0x3815, 0x31, 0, 0}, {0x3800, 0x00, 0, 0}, {0x3801, 0x00, 0, 0},

	{0x3802, 0x00, 0, 0}, {0x3803, 0x04, 0, 0}, {0x3804, 0x0a, 0, 0},

	{0x3805, 0x3f, 0, 0}, {0x3806, 0x07, 0, 0}, {0x3807, 0x9b, 0, 0},

	{0x3810, 0x00, 0, 0},

	{0x3811, 0x38, 0, 0}, {0x3812, 0x00, 0, 0}, {0x3813, 0x06, 0, 0},

	{0x3618, 0x00, 0, 0}, {0x3612, 0x29, 0, 0}, {0x3708, 0x64, 0, 0},

	{0x3709, 0x52, 0, 0}, {0x370c, 0x03, 0, 0}, {0x3a02, 0x03, 0, 0},

	{0x3a03, 0xd8, 0, 0}, {0x3a08, 0x01, 0, 0}, {0x3a09, 0x27, 0, 0},

	{0x3a0a, 0x00, 0, 0}, {0x3a0b, 0xf6, 0, 0}, {0x3a0e, 0x03, 0, 0},

	{0x3a0d, 0x04, 0, 0}, {0x3a14, 0x03, 0, 0}, {0x3a15, 0xd8, 0, 0},

	{0x4001, 0x02, 0, 0}, {0x4004, 0x02, 0, 0}, {0x4713, 0x03, 0, 0},

	{0x4407, 0x04, 0, 0}, {0x460b, 0x35, 0, 0}, {0x460c, 0x22, 0, 0},

	{0x3824, 0x02, 0, 0}, {0x5001, 0xa3, 0, 0},

};



static const struct reg_value ov5640_setting_30fps_720P_1280_720[] = {

	{0x3008, 0x42, 0, 0},

	{0x3c07, 0x07, 0, 0},

	{0x3c09, 0x1c, 0, 0}, {0x3c0a, 0x9c, 0, 0}, {0x3c0b, 0x40, 0, 0},

	{0x3814, 0x31, 0, 0},

	{0x3815, 0x31, 0, 0}, {0x3800, 0x00, 0, 0}, {0x3801, 0x00, 0, 0},

	{0x3802, 0x00, 0, 0}, {0x3803, 0xfa, 0, 0}, {0x3804, 0x0a, 0, 0},

	{0x3805, 0x3f, 0, 0}, {0x3806, 0x06, 0, 0}, {0x3807, 0xa9, 0, 0},

	{0x3810, 0x00, 0, 0},

	{0x3811, 0x10, 0, 0}, {0x3812, 0x00, 0, 0}, {0x3813, 0x04, 0, 0},

	{0x3618, 0x00, 0, 0}, {0x3612, 0x29, 0, 0}, {0x3708, 0x64, 0, 0},

	{0x3709, 0x52, 0, 0}, {0x370c, 0x03, 0, 0}, {0x3a02, 0x02, 0, 0},

	{0x3a03, 0xe4, 0, 0}, {0x3a08, 0x01, 0, 0}, {0x3a09, 0xbc, 0, 0},

	{0x3a0a, 0x01, 0, 0}, {0x3a0b, 0x72, 0, 0}, {0x3a0e, 0x01, 0, 0},

	{0x3a0d, 0x02, 0, 0}, {0x3a14, 0x02, 0, 0}, {0x3a15, 0xe4, 0, 0},

	{0x4001, 0x02, 0, 0}, {0x4004, 0x02, 0, 0}, {0x4713, 0x02, 0, 0},

	{0x4407, 0x04, 0, 0}, {0x460b, 0x37, 0, 0}, {0x460c, 0x20, 0, 0},

	{0x3824, 0x04, 0, 0}, {0x5001, 0x83, 0, 0}, {0x4005, 0x1a, 0, 0},

	{0x3008, 0x02, 0, 0}, {0x3503, 0,    0, 0},

};



static const struct reg_value ov5640_setting_15fps_720P_1280_720[] = {

static const struct reg_value ov5640_setting_720P_1280_720[] = {

	{0x3c07, 0x07, 0, 0},

	{0x3c09, 0x1c, 0, 0}, {0x3c0a, 0x9c, 0, 0}, {0x3c0b, 0x40, 0, 0},

	{0x3814, 0x31, 0, 0},
@@ -609,40 +474,7 @@ static const struct reg_value ov5640_setting_15fps_720P_1280_720[] = { 
	{0x3824, 0x04, 0, 0}, {0x5001, 0x83, 0, 0},

};



static const struct reg_value ov5640_setting_30fps_1080P_1920_1080[] = {

	{0x3008, 0x42, 0, 0},

	{0x3c07, 0x08, 0, 0},

	{0x3c09, 0x1c, 0, 0}, {0x3c0a, 0x9c, 0, 0}, {0x3c0b, 0x40, 0, 0},

	{0x3814, 0x11, 0, 0},

	{0x3815, 0x11, 0, 0}, {0x3800, 0x00, 0, 0}, {0x3801, 0x00, 0, 0},

	{0x3802, 0x00, 0, 0}, {0x3803, 0x00, 0, 0}, {0x3804, 0x0a, 0, 0},

	{0x3805, 0x3f, 0, 0}, {0x3806, 0x07, 0, 0}, {0x3807, 0x9f, 0, 0},

	{0x3810, 0x00, 0, 0},

	{0x3811, 0x10, 0, 0}, {0x3812, 0x00, 0, 0}, {0x3813, 0x04, 0, 0},

	{0x3618, 0x04, 0, 0}, {0x3612, 0x29, 0, 0}, {0x3708, 0x21, 0, 0},

	{0x3709, 0x12, 0, 0}, {0x370c, 0x00, 0, 0}, {0x3a02, 0x03, 0, 0},

	{0x3a03, 0xd8, 0, 0}, {0x3a08, 0x01, 0, 0}, {0x3a09, 0x27, 0, 0},

	{0x3a0a, 0x00, 0, 0}, {0x3a0b, 0xf6, 0, 0}, {0x3a0e, 0x03, 0, 0},

	{0x3a0d, 0x04, 0, 0}, {0x3a14, 0x03, 0, 0}, {0x3a15, 0xd8, 0, 0},

	{0x4001, 0x02, 0, 0}, {0x4004, 0x06, 0, 0}, {0x4713, 0x03, 0, 0},

	{0x4407, 0x04, 0, 0}, {0x460b, 0x35, 0, 0}, {0x460c, 0x22, 0, 0},

	{0x3824, 0x02, 0, 0}, {0x5001, 0x83, 0, 0},

	{0x3c07, 0x07, 0, 0}, {0x3c08, 0x00, 0, 0},

	{0x3c09, 0x1c, 0, 0}, {0x3c0a, 0x9c, 0, 0}, {0x3c0b, 0x40, 0, 0},

	{0x3800, 0x01, 0, 0}, {0x3801, 0x50, 0, 0}, {0x3802, 0x01, 0, 0},

	{0x3803, 0xb2, 0, 0}, {0x3804, 0x08, 0, 0}, {0x3805, 0xef, 0, 0},

	{0x3806, 0x05, 0, 0}, {0x3807, 0xf1, 0, 0},

	{0x3612, 0x2b, 0, 0}, {0x3708, 0x64, 0, 0},

	{0x3a02, 0x04, 0, 0}, {0x3a03, 0x60, 0, 0}, {0x3a08, 0x01, 0, 0},

	{0x3a09, 0x50, 0, 0}, {0x3a0a, 0x01, 0, 0}, {0x3a0b, 0x18, 0, 0},

	{0x3a0e, 0x03, 0, 0}, {0x3a0d, 0x04, 0, 0}, {0x3a14, 0x04, 0, 0},

	{0x3a15, 0x60, 0, 0}, {0x4713, 0x02, 0, 0}, {0x4407, 0x04, 0, 0},

	{0x460b, 0x37, 0, 0}, {0x460c, 0x20, 0, 0}, {0x3824, 0x04, 0, 0},

	{0x4005, 0x1a, 0, 0}, {0x3008, 0x02, 0, 0},

	{0x3503, 0, 0, 0},

};



static const struct reg_value ov5640_setting_15fps_1080P_1920_1080[] = {

static const struct reg_value ov5640_setting_1080P_1920_1080[] = {

	{0x3008, 0x42, 0, 0},

	{0x3c07, 0x08, 0, 0},

	{0x3c09, 0x1c, 0, 0}, {0x3c0a, 0x9c, 0, 0}, {0x3c0b, 0x40, 0, 0},
@@ -674,7 +506,7 @@ static const struct reg_value ov5640_setting_15fps_1080P_1920_1080[] = { 
	{0x4005, 0x1a, 0, 0}, {0x3008, 0x02, 0, 0}, {0x3503, 0, 0, 0},

};



static const struct reg_value ov5640_setting_15fps_QSXGA_2592_1944[] = {

static const struct reg_value ov5640_setting_QSXGA_2592_1944[] = {

	{0x3c07, 0x08, 0, 0},

	{0x3c09, 0x1c, 0, 0}, {0x3c0a, 0x9c, 0, 0}, {0x3c0b, 0x40, 0, 0},

	{0x3814, 0x11, 0, 0},
@@ -701,79 +533,43 @@ static const struct ov5640_mode_info ov5640_mode_init_data = { 
};



static const struct ov5640_mode_info

ov5640_mode_data[OV5640_NUM_FRAMERATES][OV5640_NUM_MODES] = {

	{

ov5640_mode_data[OV5640_NUM_MODES] = {

	{OV5640_MODE_QCIF_176_144, SUBSAMPLING,

	 176, 1896, 144, 984,

		 ov5640_setting_15fps_QCIF_176_144,

		 ARRAY_SIZE(ov5640_setting_15fps_QCIF_176_144)},

	 ov5640_setting_QCIF_176_144,

	 ARRAY_SIZE(ov5640_setting_QCIF_176_144)},

	{OV5640_MODE_QVGA_320_240, SUBSAMPLING,

	 320, 1896, 240, 984,

		 ov5640_setting_15fps_QVGA_320_240,

		 ARRAY_SIZE(ov5640_setting_15fps_QVGA_320_240)},

	 ov5640_setting_QVGA_320_240,

	 ARRAY_SIZE(ov5640_setting_QVGA_320_240)},

	{OV5640_MODE_VGA_640_480, SUBSAMPLING,

	 640, 1896, 480, 1080,

		 ov5640_setting_15fps_VGA_640_480,

		 ARRAY_SIZE(ov5640_setting_15fps_VGA_640_480)},

	 ov5640_setting_VGA_640_480,

	 ARRAY_SIZE(ov5640_setting_VGA_640_480)},

	{OV5640_MODE_NTSC_720_480, SUBSAMPLING,

	 720, 1896, 480, 984,

		 ov5640_setting_15fps_NTSC_720_480,

		 ARRAY_SIZE(ov5640_setting_15fps_NTSC_720_480)},

	 ov5640_setting_NTSC_720_480,

	 ARRAY_SIZE(ov5640_setting_NTSC_720_480)},

	{OV5640_MODE_PAL_720_576, SUBSAMPLING,

	 720, 1896, 576, 984,

		 ov5640_setting_15fps_PAL_720_576,

		 ARRAY_SIZE(ov5640_setting_15fps_PAL_720_576)},

	 ov5640_setting_PAL_720_576,

	 ARRAY_SIZE(ov5640_setting_PAL_720_576)},

	{OV5640_MODE_XGA_1024_768, SUBSAMPLING,

	 1024, 1896, 768, 1080,

		 ov5640_setting_15fps_XGA_1024_768,

		 ARRAY_SIZE(ov5640_setting_15fps_XGA_1024_768)},

	 ov5640_setting_XGA_1024_768,

	 ARRAY_SIZE(ov5640_setting_XGA_1024_768)},

	{OV5640_MODE_720P_1280_720, SUBSAMPLING,

	 1280, 1892, 720, 740,

		 ov5640_setting_15fps_720P_1280_720,

		 ARRAY_SIZE(ov5640_setting_15fps_720P_1280_720)},

	 ov5640_setting_720P_1280_720,

	 ARRAY_SIZE(ov5640_setting_720P_1280_720)},

	{OV5640_MODE_1080P_1920_1080, SCALING,

	 1920, 2500, 1080, 1120,

		 ov5640_setting_15fps_1080P_1920_1080,

		 ARRAY_SIZE(ov5640_setting_15fps_1080P_1920_1080)},

	 ov5640_setting_1080P_1920_1080,

	 ARRAY_SIZE(ov5640_setting_1080P_1920_1080)},

	{OV5640_MODE_QSXGA_2592_1944, SCALING,

	 2592, 2844, 1944, 1968,

		 ov5640_setting_15fps_QSXGA_2592_1944,

		 ARRAY_SIZE(ov5640_setting_15fps_QSXGA_2592_1944)},

	}, {

		{OV5640_MODE_QCIF_176_144, SUBSAMPLING,

		 176, 1896, 144, 984,

		 ov5640_setting_30fps_QCIF_176_144,

		 ARRAY_SIZE(ov5640_setting_30fps_QCIF_176_144)},

		{OV5640_MODE_QVGA_320_240, SUBSAMPLING,

		 320, 1896, 240, 984,

		 ov5640_setting_30fps_QVGA_320_240,

		 ARRAY_SIZE(ov5640_setting_30fps_QVGA_320_240)},

		{OV5640_MODE_VGA_640_480, SUBSAMPLING,

		 640, 1896, 480, 1080,

		 ov5640_setting_30fps_VGA_640_480,

		 ARRAY_SIZE(ov5640_setting_30fps_VGA_640_480)},

		{OV5640_MODE_NTSC_720_480, SUBSAMPLING,

		 720, 1896, 480, 984,

		 ov5640_setting_30fps_NTSC_720_480,

		 ARRAY_SIZE(ov5640_setting_30fps_NTSC_720_480)},

		{OV5640_MODE_PAL_720_576, SUBSAMPLING,

		 720, 1896, 576, 984,

		 ov5640_setting_30fps_PAL_720_576,

		 ARRAY_SIZE(ov5640_setting_30fps_PAL_720_576)},

		{OV5640_MODE_XGA_1024_768, SUBSAMPLING,

		 1024, 1896, 768, 1080,

		 ov5640_setting_30fps_XGA_1024_768,

		 ARRAY_SIZE(ov5640_setting_30fps_XGA_1024_768)},

		{OV5640_MODE_720P_1280_720, SUBSAMPLING,

		 1280, 1892, 720, 740,

		 ov5640_setting_30fps_720P_1280_720,

		 ARRAY_SIZE(ov5640_setting_30fps_720P_1280_720)},

		{OV5640_MODE_1080P_1920_1080, SCALING,

		 1920, 2500, 1080, 1120,

		 ov5640_setting_30fps_1080P_1920_1080,

		 ARRAY_SIZE(ov5640_setting_30fps_1080P_1920_1080)},

		{OV5640_MODE_QSXGA_2592_1944, -1, 0, 0, 0, 0, NULL, 0},

	},

	 ov5640_setting_QSXGA_2592_1944,

	 ARRAY_SIZE(ov5640_setting_QSXGA_2592_1944)},

};



static int ov5640_init_slave_id(struct ov5640_dev *sensor)
@@ -1757,8 +1553,8 @@ ov5640_find_mode(struct ov5640_dev *sensor, enum ov5640_frame_rate fr, 
{

	const struct ov5640_mode_info *mode;



	mode = v4l2_find_nearest_size(ov5640_mode_data[fr],

				      ARRAY_SIZE(ov5640_mode_data[fr]),

	mode = v4l2_find_nearest_size(ov5640_mode_data,

				      ARRAY_SIZE(ov5640_mode_data),

				      hact, vact,

				      width, height);
@@ -2832,10 +2628,10 @@ static int ov5640_enum_frame_size(struct v4l2_subdev *sd, 
		return -EINVAL;



	fse->min_width =

		ov5640_mode_data[0][fse->index].hact;

		ov5640_mode_data[fse->index].hact;

	fse->max_width = fse->min_width;

	fse->min_height =

		ov5640_mode_data[0][fse->index].vact;

		ov5640_mode_data[fse->index].vact;

	fse->max_height = fse->min_height;



	return 0;
@@ -3069,7 +2865,7 @@ static int ov5640_probe(struct i2c_client *client, 
	sensor->frame_interval.denominator = ov5640_framerates[OV5640_30_FPS];

	sensor->current_fr = OV5640_30_FPS;

	sensor->current_mode =

		&ov5640_mode_data[OV5640_30_FPS][OV5640_MODE_VGA_640_480];

		&ov5640_mode_data[OV5640_MODE_VGA_640_480];

	sensor->last_mode = sensor->current_mode;



	sensor->ae_target = 52;