2c2
<  * Copyreght (C) 2011-2013 Freescale Semiconductor, Inc. All Rights Reserved.
---
>  * Copyright (C) 2011-2013 Freescale Semiconductor, Inc. All Rights Reserved.
5,6d4
<  *   OLD KERNEL
< 
13d10
< 
128,131c125,126
< 	//{ MEDIA_BUS_FMT_UYVY8_2X8, V4L2_COLORSPACE_SRGB, },
< 	//{ MEDIA_BUS_FMT_YUYV8_2X8, V4L2_COLORSPACE_SRGB, },
< 	{ MEDIA_BUS_FMT_UYVY8_2X8, V4L2_COLORSPACE_SMPTE170M, },
< 	{ MEDIA_BUS_FMT_YUYV8_2X8, V4L2_COLORSPACE_SMPTE170M, },
---
> 	{ MEDIA_BUS_FMT_UYVY8_2X8, V4L2_COLORSPACE_SRGB, },
> 	{ MEDIA_BUS_FMT_YUYV8_2X8, V4L2_COLORSPACE_SRGB, },
262,264c257,264
< 
< //NEW VGA(YUV_30fps)
< 
---
> /*
>  * FIXME: all of these register tables are likely filled with
>  * entries that set the register to their power-on default values,
>  * and which are otherwise not touched by this driver. Those entries
>  * should be identified and removed to speed register load time
>  * over i2c.
>  */
> /* YUV422 UYVY VGA@30fps */
266,340c266,347
< 
< 	{0x3103,0x11,0,0}, {0x3008,0x82,0,5}, {0x3008,0x42,0,0},
< 	{0x3103,0x03,0,0}, {0x3017,0xff,0,0}, {0x3018,0xff,0,0},
< 	{0x3034,0x1a,0,0}, {0x3037,0x13,0,0}, {0x3108,0x01,0,0}, 
< 	{0x3630,0x36,0,0}, {0x3631,0x0e,0,0}, {0x3632,0xe2,0,0}, 
< 	{0x3633,0x12,0,0}, {0x3621,0xe0,0,0}, {0x3704,0xa0,0,0}, 
< 	{0x3703,0x5a,0,0}, {0x3715,0x78,0,0}, {0x3717,0x01,0,0}, 
< 	{0x370b,0x60,0,0}, {0x3705,0x1a,0,0}, {0x3905,0x02,0,0}, 
< 	{0x3906,0x10,0,0}, {0x3901,0x0a,0,0}, {0x3731,0x12,0,0}, 
< 	{0x3600,0x08,0,0}, {0x3601,0x33,0,0}, {0x302d,0x60,0,0}, 
< 	{0x3620,0x52,0,0}, {0x371b,0x20,0,0}, {0x471c,0x50,0,0}, 
< 	{0x3a13,0x43,0,0}, {0x3a18,0x00,0,0}, {0x3a19,0xf8,0,0}, 
< 	{0x3635,0x13,0,0}, {0x3636,0x03,0,0}, {0x3634,0x40,0,0}, 
< 	{0x3622,0x01,0,0}, {0x3c01,0x34,0,0}, {0x3c04,0x28,0,0}, 
< 	{0x3c05,0x98,0,0}, {0x3c06,0x00,0,0}, {0x3c07,0x08,0,0}, 
< 	{0x3c08,0x00,0,0}, {0x3c09,0x1c,0,0}, {0x3c0a,0x9c,0,0}, 
< 	{0x3c0b,0x40,0,0}, {0x3810,0x00,0,0}, {0x3811,0x10,0,0}, 
< 	{0x3812,0x00,0,0}, {0x3708,0x64,0,0}, {0x4001,0x02,0,0}, 
< 	{0x4005,0x1a,0,0}, {0x3000,0x00,0,0}, {0x3004,0xff,0,0}, 
<         {0x300e,0x58,0,0}, {0x302e,0x00,0,0}, {0x4300,0x3f,0,0}, 
<         {0x501f,0x00,0,0}, {0x5000,0xa7,0,0}, {0x3a0f,0x30,0,0}, 
<         {0x3a10,0x28,0,0}, {0x3a1b,0x30,0,0}, {0x3a1e,0x26,0,0}, 
<         {0x3a11,0x60,0,0}, {0x3a1f,0x14,0,0},    
< 	{0x5800,0x23,0,0}, {0x5801,0x14,0,0}, {0x5802,0x0f,0,0},
< 	{0x5803,0x0f,0,0}, {0x5804,0x12,0,0}, {0x5805,0x26,0,0},
< 	{0x5806,0x0c,0,0}, {0x5807,0x08,0,0}, {0x5808,0x05,0,0},
< 	{0x5809,0x05,0,0}, {0x580a,0x08,0,0}, {0x580b,0x0d,0,0},
< 	{0x580c,0x08,0,0}, {0x580d,0x03,0,0}, {0x580e,0x00,0,0}, 
< 	{0x580f,0x00,0,0}, {0x5810,0x03,0,0}, {0x5811,0x09,0,0},
< 	{0x5812,0x07,0,0}, {0x5813,0x03,0,0}, {0x5814,0x00,0,0},
< 	{0x5815,0x01,0,0}, {0x5816,0x03,0,0}, {0x5817,0x08,0,0},
< 	{0x5818,0x0d,0,0}, {0x5819,0x08,0,0}, {0x581a,0x05,0,0},
< 	{0x581b,0x06,0,0}, {0x581c,0x08,0,0}, {0x581d,0x0e,0,0}, 
< 	{0x581e,0x29,0,0}, {0x581f,0x17,0,0}, {0x5820,0x11,0,0},
< 	{0x5821,0x11,0,0}, {0x5822,0x15,0,0}, {0x5823,0x28,0,0},
< 	{0x5824,0x46,0,0}, {0x5825,0x26,0,0}, {0x5826,0x08,0,0},
< 	{0x5827,0x26,0,0}, {0x5828,0x64,0,0}, {0x5829,0x26,0,0},
< 	{0x582a,0x24,0,0}, {0x582b,0x22,0,0}, {0x582c,0x24,0,0},
< 	{0x582d,0x24,0,0}, {0x582e,0x06,0,0}, {0x582f,0x22,0,0},
< 	{0x5830,0x40,0,0}, {0x5831,0x42,0,0}, {0x5832,0x24,0,0},
< 	{0x5833,0x26,0,0}, {0x5834,0x24,0,0}, {0x5835,0x22,0,0}, 
< 	{0x5836,0x22,0,0}, {0x5837,0x26,0,0}, {0x5838,0x44,0,0},
< 	{0x5839,0x24,0,0}, {0x583a,0x26,0,0}, {0x583b,0x28,0,0},
< 	{0x583c,0x42,0,0}, {0x583d,0xce,0,0}, 
< 	{0x5180,0xff,0,0}, {0x5181,0xf2,0,0}, {0x5182,0x00,0,0}, 
< 	{0x5183,0x14,0,0}, {0x5184,0x25,0,0}, {0x5185,0x24,0,0}, 
< 	{0x5186,0x09,0,0}, {0x5187,0x09,0,0}, {0x5188,0x09,0,0}, 
< 	{0x5189,0x75,0,0}, {0x518a,0x54,0,0}, {0x518b,0xe0,0,0}, 
< 	{0x518c,0xb2,0,0}, {0x518d,0x42,0,0}, {0x518e,0x3d,0,0}, 
< 	{0x518f,0x56,0,0}, {0x5190,0x46,0,0}, {0x5191,0xf8,0,0}, 
< 	{0x5192,0x04,0,0}, {0x5193,0x70,0,0}, {0x5194,0xf0,0,0}, 
< 	{0x5195,0xf0,0,0}, {0x5196,0x03,0,0}, {0x5197,0x01,0,0}, 
< 	{0x5198,0x04,0,0}, {0x5199,0x12,0,0}, {0x519a,0x04,0,0}, 
< 	{0x519b,0x00,0,0}, {0x519c,0x06,0,0}, {0x519d,0x82,0,0}, 
< 	{0x519e,0x38,0,0},
< 	{0x5480,0x01,0,0}, {0x5481,0x08,0,0}, {0x5482,0x14,0,0},
< 	{0x5483,0x28,0,0}, {0x5484,0x51,0,0}, {0x5485,0x65,0,0},
< 	{0x5486,0x71,0,0}, {0x5487,0x7d,0,0}, {0x5488,0x87,0,0},
< 	{0x5489,0x91,0,0}, {0x548a,0x9a,0,0}, {0x548b,0xaa,0,0},
< 	{0x548c,0xb8,0,0}, {0x548d,0xcd,0,0}, {0x548e,0xdd,0,0},
< 	{0x548f,0xea,0,0}, {0x5490,0x1d,0,0},
< 	{0x5381,0x1e,0,0}, {0x5382,0x5b,0,0}, {0x5383,0x08,0,0},
< 	{0x5384,0x0a,0,0}, {0x5385,0x7e,0,0}, {0x5386,0x88,0,0},
< 	{0x5387,0x7c,0,0}, {0x5388,0x6c,0,0}, {0x5389,0x10,0,0},
< 	{0x538a,0x01,0,0}, {0x538b,0x98,0,0},
< 	{0x5580,0x02,0,0}, {0x5583,0x40,0,0}, {0x5584,0x10,0,0},
< 	{0x5589,0x10,0,0}, {0x558a,0x00,0,0}, {0x558b,0xf8,0,0},
< 	{0x501d,0x40,0,0},
< 	{0x5300,0x08,0,0}, {0x5301,0x30,0,0}, {0x5302,0x10,0,0},
< 	{0x5303,0x00,0,0}, {0x5304,0x08,0,0}, {0x5305,0x30,0,0},
< 	{0x5306,0x08,0,0}, {0x5307,0x16,0,0}, {0x5309,0x08,0,0},
< 	{0x530a,0x30,0,0}, {0x530b,0x04,0,0}, {0x530c,0x06,0,0},
< 	{0x5025,0x00,0,0},
< 	{0x3008,0x02,0,0},	
< 
---
> 	{0x3103, 0x11, 0, 0}, {0x3008, 0x82, 0, 5}, {0x3008, 0x42, 0, 0},
> 	{0x3103, 0x03, 0, 0}, {0x3017, 0x00, 0, 0}, {0x3018, 0x00, 0, 0},
> 	{0x3630, 0x36, 0, 0},
> 	{0x3631, 0x0e, 0, 0}, {0x3632, 0xe2, 0, 0}, {0x3633, 0x12, 0, 0},
> 	{0x3621, 0xe0, 0, 0}, {0x3704, 0xa0, 0, 0}, {0x3703, 0x5a, 0, 0},
> 	{0x3715, 0x78, 0, 0}, {0x3717, 0x01, 0, 0}, {0x370b, 0x60, 0, 0},
> 	{0x3705, 0x1a, 0, 0}, {0x3905, 0x02, 0, 0}, {0x3906, 0x10, 0, 0},
> 	{0x3901, 0x0a, 0, 0}, {0x3731, 0x12, 0, 0}, {0x3600, 0x08, 0, 0},
> 	{0x3601, 0x33, 0, 0}, {0x302d, 0x60, 0, 0}, {0x3620, 0x52, 0, 0},
> 	{0x371b, 0x20, 0, 0}, {0x471c, 0x50, 0, 0}, {0x3a13, 0x43, 0, 0},
> 	{0x3a18, 0x00, 0, 0}, {0x3a19, 0xf8, 0, 0}, {0x3635, 0x13, 0, 0},
> 	{0x3636, 0x03, 0, 0}, {0x3634, 0x40, 0, 0}, {0x3622, 0x01, 0, 0},
> 	{0x3c01, 0xa4, 0, 0}, {0x3c04, 0x28, 0, 0}, {0x3c05, 0x98, 0, 0},
> 	{0x3c06, 0x00, 0, 0}, {0x3c07, 0x08, 0, 0}, {0x3c08, 0x00, 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},
> 	{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}, {0x3000, 0x00, 0, 0},
> 	{0x3002, 0x1c, 0, 0}, {0x3004, 0xff, 0, 0}, {0x3006, 0xc3, 0, 0},
> 	{0x302e, 0x08, 0, 0}, {0x4300, 0x3f, 0, 0},
> 	{0x501f, 0x00, 0, 0}, {0x4713, 0x03, 0, 0}, {0x4407, 0x04, 0, 0},
> 	{0x440e, 0x00, 0, 0}, {0x460b, 0x35, 0, 0}, {0x460c, 0x22, 0, 0},
> 	{0x4837, 0x0a, 0, 0}, {0x3824, 0x02, 0, 0},
> 	{0x5000, 0xa7, 0, 0}, {0x5001, 0xa3, 0, 0}, {0x5180, 0xff, 0, 0},
> 	{0x5181, 0xf2, 0, 0}, {0x5182, 0x00, 0, 0}, {0x5183, 0x14, 0, 0},
> 	{0x5184, 0x25, 0, 0}, {0x5185, 0x24, 0, 0}, {0x5186, 0x09, 0, 0},
> 	{0x5187, 0x09, 0, 0}, {0x5188, 0x09, 0, 0}, {0x5189, 0x88, 0, 0},
> 	{0x518a, 0x54, 0, 0}, {0x518b, 0xee, 0, 0}, {0x518c, 0xb2, 0, 0},
> 	{0x518d, 0x50, 0, 0}, {0x518e, 0x34, 0, 0}, {0x518f, 0x6b, 0, 0},
> 	{0x5190, 0x46, 0, 0}, {0x5191, 0xf8, 0, 0}, {0x5192, 0x04, 0, 0},
> 	{0x5193, 0x70, 0, 0}, {0x5194, 0xf0, 0, 0}, {0x5195, 0xf0, 0, 0},
> 	{0x5196, 0x03, 0, 0}, {0x5197, 0x01, 0, 0}, {0x5198, 0x04, 0, 0},
> 	{0x5199, 0x6c, 0, 0}, {0x519a, 0x04, 0, 0}, {0x519b, 0x00, 0, 0},
> 	{0x519c, 0x09, 0, 0}, {0x519d, 0x2b, 0, 0}, {0x519e, 0x38, 0, 0},
> 	{0x5381, 0x1e, 0, 0}, {0x5382, 0x5b, 0, 0}, {0x5383, 0x08, 0, 0},
> 	{0x5384, 0x0a, 0, 0}, {0x5385, 0x7e, 0, 0}, {0x5386, 0x88, 0, 0},
> 	{0x5387, 0x7c, 0, 0}, {0x5388, 0x6c, 0, 0}, {0x5389, 0x10, 0, 0},
> 	{0x538a, 0x01, 0, 0}, {0x538b, 0x98, 0, 0}, {0x5300, 0x08, 0, 0},
> 	{0x5301, 0x30, 0, 0}, {0x5302, 0x10, 0, 0}, {0x5303, 0x00, 0, 0},
> 	{0x5304, 0x08, 0, 0}, {0x5305, 0x30, 0, 0}, {0x5306, 0x08, 0, 0},
> 	{0x5307, 0x16, 0, 0}, {0x5309, 0x08, 0, 0}, {0x530a, 0x30, 0, 0},
> 	{0x530b, 0x04, 0, 0}, {0x530c, 0x06, 0, 0}, {0x5480, 0x01, 0, 0},
> 	{0x5481, 0x08, 0, 0}, {0x5482, 0x14, 0, 0}, {0x5483, 0x28, 0, 0},
> 	{0x5484, 0x51, 0, 0}, {0x5485, 0x65, 0, 0}, {0x5486, 0x71, 0, 0},
> 	{0x5487, 0x7d, 0, 0}, {0x5488, 0x87, 0, 0}, {0x5489, 0x91, 0, 0},
> 	{0x548a, 0x9a, 0, 0}, {0x548b, 0xaa, 0, 0}, {0x548c, 0xb8, 0, 0},
> 	{0x548d, 0xcd, 0, 0}, {0x548e, 0xdd, 0, 0}, {0x548f, 0xea, 0, 0},
> 	{0x5490, 0x1d, 0, 0}, {0x5580, 0x02, 0, 0}, {0x5583, 0x40, 0, 0},
> 	{0x5584, 0x10, 0, 0}, {0x5589, 0x10, 0, 0}, {0x558a, 0x00, 0, 0},
> 	{0x558b, 0xf8, 0, 0}, {0x5800, 0x23, 0, 0}, {0x5801, 0x14, 0, 0},
> 	{0x5802, 0x0f, 0, 0}, {0x5803, 0x0f, 0, 0}, {0x5804, 0x12, 0, 0},
> 	{0x5805, 0x26, 0, 0}, {0x5806, 0x0c, 0, 0}, {0x5807, 0x08, 0, 0},
> 	{0x5808, 0x05, 0, 0}, {0x5809, 0x05, 0, 0}, {0x580a, 0x08, 0, 0},
> 	{0x580b, 0x0d, 0, 0}, {0x580c, 0x08, 0, 0}, {0x580d, 0x03, 0, 0},
> 	{0x580e, 0x00, 0, 0}, {0x580f, 0x00, 0, 0}, {0x5810, 0x03, 0, 0},
> 	{0x5811, 0x09, 0, 0}, {0x5812, 0x07, 0, 0}, {0x5813, 0x03, 0, 0},
> 	{0x5814, 0x00, 0, 0}, {0x5815, 0x01, 0, 0}, {0x5816, 0x03, 0, 0},
> 	{0x5817, 0x08, 0, 0}, {0x5818, 0x0d, 0, 0}, {0x5819, 0x08, 0, 0},
> 	{0x581a, 0x05, 0, 0}, {0x581b, 0x06, 0, 0}, {0x581c, 0x08, 0, 0},
> 	{0x581d, 0x0e, 0, 0}, {0x581e, 0x29, 0, 0}, {0x581f, 0x17, 0, 0},
> 	{0x5820, 0x11, 0, 0}, {0x5821, 0x11, 0, 0}, {0x5822, 0x15, 0, 0},
> 	{0x5823, 0x28, 0, 0}, {0x5824, 0x46, 0, 0}, {0x5825, 0x26, 0, 0},
> 	{0x5826, 0x08, 0, 0}, {0x5827, 0x26, 0, 0}, {0x5828, 0x64, 0, 0},
> 	{0x5829, 0x26, 0, 0}, {0x582a, 0x24, 0, 0}, {0x582b, 0x22, 0, 0},
> 	{0x582c, 0x24, 0, 0}, {0x582d, 0x24, 0, 0}, {0x582e, 0x06, 0, 0},
> 	{0x582f, 0x22, 0, 0}, {0x5830, 0x40, 0, 0}, {0x5831, 0x42, 0, 0},
> 	{0x5832, 0x24, 0, 0}, {0x5833, 0x26, 0, 0}, {0x5834, 0x24, 0, 0},
> 	{0x5835, 0x22, 0, 0}, {0x5836, 0x22, 0, 0}, {0x5837, 0x26, 0, 0},
> 	{0x5838, 0x44, 0, 0}, {0x5839, 0x24, 0, 0}, {0x583a, 0x26, 0, 0},
> 	{0x583b, 0x28, 0, 0}, {0x583c, 0x42, 0, 0}, {0x583d, 0xce, 0, 0},
> 	{0x5025, 0x00, 0, 0}, {0x3a0f, 0x30, 0, 0}, {0x3a10, 0x28, 0, 0},
> 	{0x3a1b, 0x30, 0, 0}, {0x3a1e, 0x26, 0, 0}, {0x3a11, 0x60, 0, 0},
> 	{0x3a1f, 0x14, 0, 0}, {0x3008, 0x02, 0, 0}, {0x3c00, 0x04, 0, 300},
344,369c351,353
< 
< 	{0x3035, 0x11, 0, 0}, {0x3036, 0x46, 0, 0}, {0x3c07, 0x08, 0, 0},
< 	{0x3820, 0x00, 0, 0}, {0x3821, 0x00, 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, 0x02, 0, 0}, {0x3809, 0x80, 0, 0},
< 	{0x380a, 0x01, 0, 0}, {0x380b, 0xe0, 0, 0}, {0x380c, 0x07, 0, 0},
< 	{0x380d, 0x68, 0, 0}, {0x380e, 0x03, 0, 0}, {0x380f, 0xd8, 0, 0},
< 	{0x3813, 0x06, 0, 0}, {0x3618, 0x00, 0, 0}, {0x3612, 0x29, 0, 0}, 
< 	{0x3709, 0x52, 0, 0}, {0x370c, 0x03, 0, 0}, 
<         {0x3a02, 0x17, 0, 0}, {0x3a03, 0x10, 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, 0x17, 0, 0}, 
< 	{0x3a15, 0x10, 0, 0}, {0x4004, 0x02, 0, 0}, {0x3002, 0x1c, 0, 0}, 
< 	{0x3006, 0xc3, 0, 0}, {0x4713, 0x03, 0, 0}, {0x4407, 0x04, 0, 0}, 
< 	{0x460b, 0x35, 0, 0}, {0x460c, 0x22, 0, 0}, {0x4837, 0x22, 0, 0},
< 	{0x3824, 0x02, 0, 0}, {0x5001, 0xa3, 0, 0}, {0x3503, 0x00, 0, 0},
< 	
< }; 
< 
< static const struct reg_value ov5640_setting_720P_1280_720[] = { 
< 
< 	{0x3035, 0x21, 0, 0}, {0x3036, 0x69, 0, 0}, {0x3c07, 0x07, 0, 0},
< 	{0x3820, 0x00, 0, 0}, {0x3821, 0x00, 0, 0}, {0x3814, 0x31, 0, 0}, 
---
> 	{0x3c07, 0x08, 0, 0},
> 	{0x3c09, 0x1c, 0, 0}, {0x3c0a, 0x9c, 0, 0}, {0x3c0b, 0x40, 0, 0},
> 	{0x3814, 0x31, 0, 0},
371,384c355,366
< 	{0x3802, 0x00, 0, 0}, {0x3803, 0xfa, 0, 0}, {0x3804, 0x0a, 0, 0},
< 	{0x3805, 0x3f, 0, 0}, {0x3806, 0x06, 0, 0}, 
< 	{0x3807, 0xa9, 0, 0}, {0x3808, 0x05, 0, 0}, {0x3809, 0x00, 0, 0},
< 	{0x380a, 0x02, 0, 0}, {0x380b, 0xd0, 0, 0}, {0x380c, 0x07, 0, 0},
< 	{0x380d, 0x64, 0, 0}, {0x380e, 0x02, 0, 0}, {0x380f, 0xe4, 0, 0},
< 	{0x3813, 0x04, 0, 0}, {0x3618, 0x00, 0, 0}, {0x3612, 0x29, 0, 0}, 
< 	{0x3709, 0x52, 0, 0}, {0x370c, 0x03, 0, 0}, 
<     	{0x3a02, 0x17, 0, 0}, {0x3a03, 0xe0, 0, 0}, {0x3a08, 0x00, 0, 0}, 
< 	{0x3a09, 0x6f, 0, 0}, {0x3a0a, 0x00, 0, 0}, {0x3a0b, 0x5c, 0, 0}, 
< 	{0x3a0e, 0x06, 0, 0}, {0x3a0d, 0x08, 0, 0}, {0x3a14, 0x02, 0, 0}, 
< 	{0x3a15, 0xe0, 0, 0}, {0x4004, 0x02, 0, 0}, {0x3002, 0x1c, 0, 0}, 
< 	{0x3006, 0xc3, 0, 0}, {0x4713, 0x03, 0, 0}, {0x4407, 0x04, 0, 0}, 
< 	{0x460b, 0x37, 0, 0}, {0x460c, 0x20, 0, 0}, {0x4837, 0x16, 0, 0},
< 	{0x3824, 0x04, 0, 0}, {0x5001, 0x83, 0, 0}, {0x3503, 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},
481a464,482
> 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},
> 	{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, 0x03, 0, 0},
> 	{0x4407, 0x04, 0, 0}, {0x460b, 0x37, 0, 0}, {0x460c, 0x20, 0, 0},
> 	{0x3824, 0x04, 0, 0}, {0x5001, 0x83, 0, 0},
> };
> 
533d533
< 
540,546d539
< /*
< static const struct ov5640_mode_info ov5640_mode_init_data = {
< 	0, SUBSAMPLING, 1280, 1892, 720, 740,
< 	ov5640_init_setting_30fps_720P,
< 	ARRAY_SIZE(ov5640_init_setting_30fps_720P),
< };*/
< 
558c551
< 	 640, 1896, 480, 984,
---
> 	 640, 1896, 480, 1080,
574c567
< 	 1280, 1892, 720, 740, 
---
> 	 1280, 1892, 720, 740,
665d657
< 		printk( ": failed in read register : reg = %x\n",reg);
993c985,986
< 	unsigned long _rate = rate * OV5640_PLL_ROOT_DIV * OV5640_BIT_DIV * OV5640_PCLK_ROOT_DIV; // rate * 2 * 2 * 1
---
> 	unsigned long _rate = rate * OV5640_PLL_ROOT_DIV * OV5640_BIT_DIV *
> 				OV5640_PCLK_ROOT_DIV;
995,998c988,989
< 
< 	_rate = ov5640_calc_sys_clk(sensor, _rate, pll_prediv, pll_mult, sysdiv);
< 	
< 	
---
> 	_rate = ov5640_calc_sys_clk(sensor, _rate, pll_prediv, pll_mult,
> 				    sysdiv);
1003c994
< 	return _rate / *pll_rdiv / *bit_div / *pclk_div; // rate / 2 / 2 / 1;
---
> 	return _rate / *pll_rdiv / *bit_div / *pclk_div;
1011,1012c1002,1003
< 	unsigned long fourth_rate = ov5640_calc_pclk(sensor, rate, &prediv, &mult, &sysdiv, &pll_rdiv, &bit_div, &pclk_div);
< 	
---
> 	ov5640_calc_pclk(sensor, rate, &prediv, &mult, &sysdiv, &pll_rdiv,
> 			 &bit_div, &pclk_div);
1051d1041
< 
1064,1067c1054
< 	ret = ov5640_write_reg16(sensor, OV5640_REG_TIMING_VTS, mode->vtot);
< 	if (ret < 0)
< 		return ret;
< 	return 0;
---
> 	return ov5640_write_reg16(sensor, OV5640_REG_TIMING_VTS, mode->vtot);
1080d1066
< 
1098,1099c1084
< 	return ov5640_set_timings(sensor, mode); 
< 	//return 0; 
---
> 	return ov5640_set_timings(sensor, mode);
1113c1098
< 	
---
> 
1226c1211
< 		if (ret){
---
> 		if (ret)
1228d1212
< 		}
1241c1225
< 	if (ret) {
---
> 	if (ret)
1243d1226
< 	}
1257,1258c1240,1241
< 			       on ? 0x7f : 0); //changed from 7f
< 	if (ret){
---
> 			       on ? 0x7f : 0);
> 	if (ret)
1260d1242
< 	}
1268,1277c1250,1252
< 
< 	ret = ov5640_write_reg(sensor,
<                                 OV5640_REG_PAD_OUTPUT_ENABLE02,
<                                 on ? 0xfc : 0); //changed from fc
< 
< 	if (ret) {
< 		return ret;
< 	}
< 	
< 	return 0;
---
> 	return ov5640_write_reg(sensor,
> 				OV5640_REG_PAD_OUTPUT_ENABLE02,
> 				on ? 0xfc : 0);
1780d1754
< 	//return 0; 
1840d1813
< 
1911d1883
< 
1913d1884
< 
1995d1965
< 		{
1997d1966
< 		}
2102d2070
< 	//enum ov5640_frame_rate rate = OV5640_15_FPS;
2152c2120
< 	else{
---
> 	else
2155,2156d2122
< 	}
< 
2234d2199
< 
2261d2225
< 		//val = 0x20;changed to YUV444
2500c2464
< 			      ((value ^ sensor->upside_down)) ?
---
> 			      (!(value ^ sensor->upside_down)) ?
2529,2530d2492
< 		//if (!ctrl->val)
< 		//	return 0;
2537,2538d2498
< 		//if (ctrl->val == V4L2_EXPOSURE_MANUAL)
< 		//	return 0;
2846,2851d2805
< 		
< 		ret = ov5640_load_regs(sensor, &ov5640_mode_init_data);
< 		if(sensor->current_mode->hact == 640 && sensor->current_mode->vact == 480)
< 			ret = ov5640_load_regs(sensor, &ov5640_mode_data[OV5640_MODE_VGA_640_480]);
< 		else if(sensor->current_mode->hact == 1280 && sensor->current_mode->vact == 720)
< 			ret = ov5640_load_regs(sensor, &ov5640_mode_data[OV5640_MODE_720P_1280_720]);
2911d2864
< 		printk( ": failed to read chip identifier\n");
2918d2870
< 		printk( ": wrong chip identifier\n");
2921,2924d2872
<       	else
< 	{
< 		return 0; 
< 	}
2953c2901
< 	fmt->colorspace = V4L2_COLORSPACE_SMPTE170M;
---
> 	fmt->colorspace = V4L2_COLORSPACE_SRGB;
2963c2911,2912
< 	sensor->current_mode = &ov5640_mode_data[OV5640_MODE_VGA_640_480]; 
---
> 	sensor->current_mode =
> 		&ov5640_mode_data[OV5640_MODE_VGA_640_480];
2967c2916
< 	
---
> 
3048c2997
<  		
---
> 
3051a3001
>