summaryrefslogtreecommitdiffstats
path: root/drivers/media
diff options
context:
space:
mode:
authorFrank Schaefer <fschaefer.oss@googlemail.com>2017-04-16 13:35:40 -0400
committerMauro Carvalho Chehab <mchehab@s-opensource.com>2017-04-19 07:53:36 -0400
commit534dca983e3a9b8ea461104d4072d2a646acefdf (patch)
treea3787c4d676575e3040bb2327dac952b901b04de /drivers/media
parenta463ea990d2138ca93027b006be96a0324b77fe4 (diff)
[media] ov2640: fix init sequence alignment
While we are at it, remove a misleading comment (copy/paste mistake) Signed-off-by: Frank Schäfer <fschaefer.oss@googlemail.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
Diffstat (limited to 'drivers/media')
-rw-r--r--drivers/media/i2c/ov2640.c24
1 files changed, 12 insertions, 12 deletions
diff --git a/drivers/media/i2c/ov2640.c b/drivers/media/i2c/ov2640.c
index 9c00ed3543f8..1735a5d49121 100644
--- a/drivers/media/i2c/ov2640.c
+++ b/drivers/media/i2c/ov2640.c
@@ -199,7 +199,7 @@
199#define COM7_ZOOM_EN 0x04 /* Enable Zoom mode */ 199#define COM7_ZOOM_EN 0x04 /* Enable Zoom mode */
200#define COM7_COLOR_BAR_TEST 0x02 /* Enable Color Bar Test Pattern */ 200#define COM7_COLOR_BAR_TEST 0x02 /* Enable Color Bar Test Pattern */
201#define COM8 0x13 /* Common control 8 */ 201#define COM8 0x13 /* Common control 8 */
202#define COM8_DEF 0xC0 /* Banding filter ON/OFF */ 202#define COM8_DEF 0xC0
203#define COM8_BNDF_EN 0x20 /* Banding filter ON/OFF */ 203#define COM8_BNDF_EN 0x20 /* Banding filter ON/OFF */
204#define COM8_AGC_EN 0x04 /* AGC Auto/Manual control selection */ 204#define COM8_AGC_EN 0x04 /* AGC Auto/Manual control selection */
205#define COM8_AEC_EN 0x01 /* Auto/Manual Exposure control */ 205#define COM8_AEC_EN 0x01 /* Auto/Manual Exposure control */
@@ -306,11 +306,11 @@ static const struct regval_list ov2640_init_regs[] = {
306 { 0x2e, 0xdf }, 306 { 0x2e, 0xdf },
307 { BANK_SEL, BANK_SEL_SENS }, 307 { BANK_SEL, BANK_SEL_SENS },
308 { 0x3c, 0x32 }, 308 { 0x3c, 0x32 },
309 { CLKRC, CLKRC_DIV_SET(1) }, 309 { CLKRC, CLKRC_DIV_SET(1) },
310 { COM2, COM2_OCAP_Nx_SET(3) }, 310 { COM2, COM2_OCAP_Nx_SET(3) },
311 { REG04, REG04_DEF | REG04_HREF_EN }, 311 { REG04, REG04_DEF | REG04_HREF_EN },
312 { COM8, COM8_DEF | COM8_BNDF_EN | COM8_AGC_EN | COM8_AEC_EN }, 312 { COM8, COM8_DEF | COM8_BNDF_EN | COM8_AGC_EN | COM8_AEC_EN },
313 { COM9, COM9_AGC_GAIN_8x | 0x08}, 313 { COM9, COM9_AGC_GAIN_8x | 0x08},
314 { 0x2c, 0x0c }, 314 { 0x2c, 0x0c },
315 { 0x33, 0x78 }, 315 { 0x33, 0x78 },
316 { 0x3a, 0x33 }, 316 { 0x3a, 0x33 },
@@ -355,25 +355,25 @@ static const struct regval_list ov2640_init_regs[] = {
355 { 0x71, 0x94 }, 355 { 0x71, 0x94 },
356 { 0x73, 0xc1 }, 356 { 0x73, 0xc1 },
357 { 0x3d, 0x34 }, 357 { 0x3d, 0x34 },
358 { COM7, COM7_RES_UXGA | COM7_ZOOM_EN }, 358 { COM7, COM7_RES_UXGA | COM7_ZOOM_EN },
359 { 0x5a, 0x57 }, 359 { 0x5a, 0x57 },
360 { BD50, 0xbb }, 360 { BD50, 0xbb },
361 { BD60, 0x9c }, 361 { BD60, 0x9c },
362 { BANK_SEL, BANK_SEL_DSP }, 362 { BANK_SEL, BANK_SEL_DSP },
363 { 0xe5, 0x7f }, 363 { 0xe5, 0x7f },
364 { MC_BIST, MC_BIST_RESET | MC_BIST_BOOT_ROM_SEL }, 364 { MC_BIST, MC_BIST_RESET | MC_BIST_BOOT_ROM_SEL },
365 { 0x41, 0x24 }, 365 { 0x41, 0x24 },
366 { RESET, RESET_JPEG | RESET_DVP }, 366 { RESET, RESET_JPEG | RESET_DVP },
367 { 0x76, 0xff }, 367 { 0x76, 0xff },
368 { 0x33, 0xa0 }, 368 { 0x33, 0xa0 },
369 { 0x42, 0x20 }, 369 { 0x42, 0x20 },
370 { 0x43, 0x18 }, 370 { 0x43, 0x18 },
371 { 0x4c, 0x00 }, 371 { 0x4c, 0x00 },
372 { CTRL3, CTRL3_BPC_EN | CTRL3_WPC_EN | 0x10 }, 372 { CTRL3, CTRL3_BPC_EN | CTRL3_WPC_EN | 0x10 },
373 { 0x88, 0x3f }, 373 { 0x88, 0x3f },
374 { 0xd7, 0x03 }, 374 { 0xd7, 0x03 },
375 { 0xd9, 0x10 }, 375 { 0xd9, 0x10 },
376 { R_DVP_SP , R_DVP_SP_AUTO_MODE | 0x2 }, 376 { R_DVP_SP, R_DVP_SP_AUTO_MODE | 0x2 },
377 { 0xc8, 0x08 }, 377 { 0xc8, 0x08 },
378 { 0xc9, 0x80 }, 378 { 0xc9, 0x80 },
379 { BPADDR, 0x00 }, 379 { BPADDR, 0x00 },