Snap for 4456800 from 0110eb508dbaa2c88557e39b1dfaac35b3962c86 to oc-mr1-iot-release
Change-Id: I8e2e74a83abd960522c7df513c3b6be8e2be4c7f
diff --git a/drivers/media/platform/mxc/subdev/ov5645_mipi.c b/drivers/media/platform/mxc/subdev/ov5645_mipi.c
index d29c87e..3e379b4 100644
--- a/drivers/media/platform/mxc/subdev/ov5645_mipi.c
+++ b/drivers/media/platform/mxc/subdev/ov5645_mipi.c
@@ -49,7 +49,8 @@
ov5645_mode_720P_1280_720 = 2,
ov5645_mode_1080P_1920_1080 = 3,
ov5645_mode_QSXGA_2592_1944 = 4,
- ov5645_mode_MAX = 5,
+ ov5645_mode_QCIF_176_144 = 5,
+ ov5645_mode_MAX = 6,
ov5645_mode_INIT = 0xff, /*only for sensor init*/
};
@@ -343,6 +344,28 @@
{0x4202, 0x00, 0, 0}, /* stream on the sensor */
};
+static struct reg_value ov5645_setting_30fps_QCIF_176_144[] = {
+ {0x3008, 0x42, 0, 0},
+ {0x3035, 0x14, 0, 0}, {0x3036, 0x38, 0, 0}, {0x3c07, 0x08, 0, 0},
+ {0x3c09, 0x1c, 0, 0}, {0x3c0a, 0x9c, 0, 0}, {0x3c0b, 0x40, 0, 0},
+ {0x3820, 0x41, 0, 0}, {0x3821, 0x07, 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},
+ {0x3808, 0x00, 0, 0}, {0x3809, 0xb0, 0, 0}, {0x380a, 0x00, 0, 0},
+ {0x380b, 0x90, 0, 0}, {0x380c, 0x07, 0, 0}, {0x380d, 0x68, 0, 0},
+ {0x380e, 0x03, 0, 0}, {0x380f, 0xd8, 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 struct ov5645_mode_info ov5645_mode_info_data[2][ov5645_mode_MAX + 1] = {
{
{ov5645_mode_VGA_640_480, -1, 0, 0, NULL, 0},
@@ -352,6 +375,7 @@
{ov5645_mode_QSXGA_2592_1944, SCALING, 2592, 1944,
ov5645_setting_15fps_QSXGA_2592_1944,
ARRAY_SIZE(ov5645_setting_15fps_QSXGA_2592_1944)},
+ {ov5645_mode_QCIF_176_144, -1, 0, 0, NULL, 0},
},
{
{ov5645_mode_VGA_640_480, SUBSAMPLING, 640, 480,
@@ -367,6 +391,9 @@
ov5645_setting_30fps_1080P_1920_1080,
ARRAY_SIZE(ov5645_setting_30fps_1080P_1920_1080)},
{ov5645_mode_QSXGA_2592_1944, -1, 0, 0, NULL, 0},
+ {ov5645_mode_QCIF_176_144, SUBSAMPLING, 176, 144,
+ ov5645_setting_30fps_QCIF_176_144,
+ ARRAY_SIZE(ov5645_setting_30fps_QCIF_176_144)},
},
};
