media: gspca: ov543-ov772x: move video format specific registers into bridge_start

In preparation for adding SGBRG8 as a second video format besides YUYV,
move video format specific register settings from the bridge_init array
into the bridge_start arrays.

Signed-off-by: Philipp Zabel <philipp.zabel@gmail.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>

diff --git a/drivers/media/usb/gspca/ov534.c b/drivers/media/usb/gspca/ov534.c
index 44f06a5..077c49a 100644 (file)
--- a/drivers/media/usb/gspca/ov534.c
+++ b/drivers/media/usb/gspca/ov534.c
@@ -411,9 +411,7 @@ static const u8 sensor_start_qvga_767x[][2] = {
 };
 
 static const u8 bridge_init_772x[][2] = {
-       { 0xc2, 0x0c },
        { 0x88, 0xf8 },
-       { 0xc3, 0x69 },
        { 0x89, 0xff },
        { 0x76, 0x03 },
        { 0x92, 0x01 },
@@ -439,7 +437,6 @@ static const u8 bridge_init_772x[][2] = {
        { 0x1f, 0x81 },
        { 0x34, 0x05 },
        { 0xe3, 0x04 },
-       { 0x88, 0x00 },
        { 0x89, 0x00 },
        { 0x76, 0x00 },
        { 0xe7, 0x2e },
@@ -460,13 +457,7 @@ static const u8 bridge_init_772x[][2] = {
        { 0x1d, 0x08 }, /* turn on UVC header */
        { 0x1d, 0x0e }, /* .. */
 
-       { 0x8d, 0x1c },
-       { 0x8e, 0x80 },
        { 0xe5, 0x04 },
-
-       { 0xc0, 0x50 },
-       { 0xc1, 0x3c },
-       { 0xc2, 0x0c },
 };
 static const u8 sensor_init_772x[][2] = {
        { 0x12, 0x80 },
@@ -562,6 +553,7 @@ static const u8 sensor_init_772x[][2] = {
        { 0x0c, 0xd0 }
 };
 static const u8 bridge_start_vga_772x[][2] = {
+       {0x88, 0x00},
        {0x1c, 0x00},
        {0x1d, 0x40},
        {0x1d, 0x02},
@@ -569,8 +561,12 @@ static const u8 bridge_start_vga_772x[][2] = {
        {0x1d, 0x02},
        {0x1d, 0x58},
        {0x1d, 0x00},
+       {0x8d, 0x1c},
+       {0x8e, 0x80},
        {0xc0, 0x50},
        {0xc1, 0x3c},
+       {0xc2, 0x0c},
+       {0xc3, 0x69},
 };
 static const u8 sensor_start_vga_772x[][2] = {
        {0x12, 0x00},
@@ -583,6 +579,7 @@ static const u8 sensor_start_vga_772x[][2] = {
        {0x65, 0x20},
 };
 static const u8 bridge_start_qvga_772x[][2] = {
+       {0x88, 0x00},
        {0x1c, 0x00},
        {0x1d, 0x40},
        {0x1d, 0x02},
@@ -590,8 +587,12 @@ static const u8 bridge_start_qvga_772x[][2] = {
        {0x1d, 0x01},
        {0x1d, 0x4b},
        {0x1d, 0x00},
+       {0x8d, 0x1c},
+       {0x8e, 0x80},
        {0xc0, 0x28},
        {0xc1, 0x1e},
+       {0xc2, 0x0c},
+       {0xc3, 0x69},
 };
 static const u8 sensor_start_qvga_772x[][2] = {
        {0x12, 0x40},