Skip to content

Commit 8e96509

Browse files
committed
media: imx355: Set frame length from VBLANK, not mode.
Registers 0x0340 and 0x0341 (FRM_LENGTH_LINES) is already written from the set_ctrl(V4L2_CID_VBLANK) handler, so don't write it from the mode register list. Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
1 parent c8bad25 commit 8e96509

1 file changed

Lines changed: 0 additions & 28 deletions

File tree

drivers/media/i2c/imx355.c

Lines changed: 0 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -256,8 +256,6 @@ static const struct imx355_reg_list imx355_global_setting = {
256256
static const struct imx355_reg mode_3268x2448_regs[] = {
257257
{ 0x0342, 0x0e },
258258
{ 0x0343, 0x58 },
259-
{ 0x0340, 0x0a },
260-
{ 0x0341, 0x37 },
261259
{ 0x0344, 0x00 },
262260
{ 0x0345, 0x08 },
263261
{ 0x0346, 0x00 },
@@ -280,8 +278,6 @@ static const struct imx355_reg mode_3268x2448_regs[] = {
280278
static const struct imx355_reg mode_3264x2448_regs[] = {
281279
{ 0x0342, 0x0e },
282280
{ 0x0343, 0x58 },
283-
{ 0x0340, 0x0a },
284-
{ 0x0341, 0x37 },
285281
{ 0x0344, 0x00 },
286282
{ 0x0345, 0x08 },
287283
{ 0x0346, 0x00 },
@@ -304,8 +300,6 @@ static const struct imx355_reg mode_3264x2448_regs[] = {
304300
static const struct imx355_reg mode_3280x2464_regs[] = {
305301
{ 0x0342, 0x0e },
306302
{ 0x0343, 0x58 },
307-
{ 0x0340, 0x0a },
308-
{ 0x0341, 0x37 },
309303
{ 0x0344, 0x00 },
310304
{ 0x0345, 0x00 },
311305
{ 0x0346, 0x00 },
@@ -328,8 +322,6 @@ static const struct imx355_reg mode_3280x2464_regs[] = {
328322
static const struct imx355_reg mode_1940x1096_regs[] = {
329323
{ 0x0342, 0x0e },
330324
{ 0x0343, 0x58 },
331-
{ 0x0340, 0x05 },
332-
{ 0x0341, 0x1a },
333325
{ 0x0344, 0x02 },
334326
{ 0x0345, 0xa0 },
335327
{ 0x0346, 0x02 },
@@ -352,8 +344,6 @@ static const struct imx355_reg mode_1940x1096_regs[] = {
352344
static const struct imx355_reg mode_1936x1096_regs[] = {
353345
{ 0x0342, 0x0e },
354346
{ 0x0343, 0x58 },
355-
{ 0x0340, 0x05 },
356-
{ 0x0341, 0x1a },
357347
{ 0x0344, 0x02 },
358348
{ 0x0345, 0xa0 },
359349
{ 0x0346, 0x02 },
@@ -376,8 +366,6 @@ static const struct imx355_reg mode_1936x1096_regs[] = {
376366
static const struct imx355_reg mode_1924x1080_regs[] = {
377367
{ 0x0342, 0x0e },
378368
{ 0x0343, 0x58 },
379-
{ 0x0340, 0x05 },
380-
{ 0x0341, 0x1a },
381369
{ 0x0344, 0x02 },
382370
{ 0x0345, 0xa8 },
383371
{ 0x0346, 0x02 },
@@ -400,8 +388,6 @@ static const struct imx355_reg mode_1924x1080_regs[] = {
400388
static const struct imx355_reg mode_1920x1080_regs[] = {
401389
{ 0x0342, 0x0e },
402390
{ 0x0343, 0x58 },
403-
{ 0x0340, 0x05 },
404-
{ 0x0341, 0x1a },
405391
{ 0x0344, 0x02 },
406392
{ 0x0345, 0xa8 },
407393
{ 0x0346, 0x02 },
@@ -424,8 +410,6 @@ static const struct imx355_reg mode_1920x1080_regs[] = {
424410
static const struct imx355_reg mode_1640x1232_regs[] = {
425411
{ 0x0342, 0x07 },
426412
{ 0x0343, 0x2c },
427-
{ 0x0340, 0x05 },
428-
{ 0x0341, 0x1a },
429413
{ 0x0344, 0x00 },
430414
{ 0x0345, 0x00 },
431415
{ 0x0346, 0x00 },
@@ -448,8 +432,6 @@ static const struct imx355_reg mode_1640x1232_regs[] = {
448432
static const struct imx355_reg mode_1640x922_regs[] = {
449433
{ 0x0342, 0x07 },
450434
{ 0x0343, 0x2c },
451-
{ 0x0340, 0x05 },
452-
{ 0x0341, 0x1a },
453435
{ 0x0344, 0x00 },
454436
{ 0x0345, 0x00 },
455437
{ 0x0346, 0x01 },
@@ -472,8 +454,6 @@ static const struct imx355_reg mode_1640x922_regs[] = {
472454
static const struct imx355_reg mode_1300x736_regs[] = {
473455
{ 0x0342, 0x07 },
474456
{ 0x0343, 0x2c },
475-
{ 0x0340, 0x05 },
476-
{ 0x0341, 0x1a },
477457
{ 0x0344, 0x01 },
478458
{ 0x0345, 0x58 },
479459
{ 0x0346, 0x01 },
@@ -496,8 +476,6 @@ static const struct imx355_reg mode_1300x736_regs[] = {
496476
static const struct imx355_reg mode_1296x736_regs[] = {
497477
{ 0x0342, 0x07 },
498478
{ 0x0343, 0x2c },
499-
{ 0x0340, 0x05 },
500-
{ 0x0341, 0x1a },
501479
{ 0x0344, 0x01 },
502480
{ 0x0345, 0x58 },
503481
{ 0x0346, 0x01 },
@@ -520,8 +498,6 @@ static const struct imx355_reg mode_1296x736_regs[] = {
520498
static const struct imx355_reg mode_1284x720_regs[] = {
521499
{ 0x0342, 0x07 },
522500
{ 0x0343, 0x2c },
523-
{ 0x0340, 0x05 },
524-
{ 0x0341, 0x1a },
525501
{ 0x0344, 0x01 },
526502
{ 0x0345, 0x68 },
527503
{ 0x0346, 0x02 },
@@ -544,8 +520,6 @@ static const struct imx355_reg mode_1284x720_regs[] = {
544520
static const struct imx355_reg mode_1280x720_regs[] = {
545521
{ 0x0342, 0x07 },
546522
{ 0x0343, 0x2c },
547-
{ 0x0340, 0x05 },
548-
{ 0x0341, 0x1a },
549523
{ 0x0344, 0x01 },
550524
{ 0x0345, 0x68 },
551525
{ 0x0346, 0x02 },
@@ -568,8 +542,6 @@ static const struct imx355_reg mode_1280x720_regs[] = {
568542
static const struct imx355_reg mode_820x616_regs[] = {
569543
{ 0x0342, 0x0e },
570544
{ 0x0343, 0x58 },
571-
{ 0x0340, 0x02 },
572-
{ 0x0341, 0x8c },
573545
{ 0x0344, 0x00 },
574546
{ 0x0345, 0x00 },
575547
{ 0x0346, 0x00 },

0 commit comments

Comments
 (0)