[media] davinci: move struct vpif_interface to chan_cfg

struct vpif_interface is channel specific, not subdev specific.
Move it to the channel config.

Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Acked-by: Sekhar Nori <nsekhar@ti.com>
Acked-by: Lad, Prabhakar <prabhakar.lad@ti.com>
Tested-by: Lad, Prabhakar <prabhakar.lad@ti.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

2 files changed, 24 insertions, 24 deletions

diff --git a/arch/arm/mach-davinci/board-da850-evm.c b/arch/arm/mach-davinci/board-da850-evm.c
index 87bd249ffb9c..8663df3d2a58 100644
--- a/arch/arm/mach-davinci/board-da850-evm.c
+++ b/arch/arm/mach-davinci/board-da850-evm.c
@@ -1213,12 +1213,6 @@ static struct vpif_subdev_info da850_vpif_capture_sdev_info[] = {
                         I2C_BOARD_INFO("tvp5146", 0x5d),
                         .platform_data = &tvp5146_pdata,
                 },
-                .vpif_if = {
-                        .if_type = VPIF_IF_BT656,
-                        .hd_pol  = 1,
-                        .vd_pol  = 1,
-                        .fid_pol = 0,
-                },
         },
         {
                 .name = TVP5147_CH1,
@@ -1226,12 +1220,6 @@ static struct vpif_subdev_info da850_vpif_capture_sdev_info[] = {
                         I2C_BOARD_INFO("tvp5146", 0x5c),
                         .platform_data = &tvp5146_pdata,
                 },
-                .vpif_if = {
-                        .if_type = VPIF_IF_BT656,
-                        .hd_pol  = 1,
-                        .vd_pol  = 1,
-                        .fid_pol = 0,
-                },
         },
 };
 
@@ -1241,10 +1229,22 @@ static struct vpif_capture_config da850_vpif_capture_config = {
         .chan_config[0] = {
                 .inputs = da850_ch0_inputs,
                 .input_count = ARRAY_SIZE(da850_ch0_inputs),
+                .vpif_if = {
+                        .if_type = VPIF_IF_BT656,
+                        .hd_pol  = 1,
+                        .vd_pol  = 1,
+                        .fid_pol = 0,
+                },
         },
         .chan_config[1] = {
                 .inputs = da850_ch1_inputs,
                 .input_count = ARRAY_SIZE(da850_ch1_inputs),
+                .vpif_if = {
+                        .if_type = VPIF_IF_BT656,
+                        .hd_pol  = 1,
+                        .vd_pol  = 1,
+                        .fid_pol = 0,
+                },
         },
         .card_name = "DA850/OMAP-L138 Video Capture",
 };
diff --git a/arch/arm/mach-davinci/board-dm646x-evm.c b/arch/arm/mach-davinci/board-dm646x-evm.c
index 6f329caca6e8..2647b8966dd2 100644
--- a/arch/arm/mach-davinci/board-dm646x-evm.c
+++ b/arch/arm/mach-davinci/board-dm646x-evm.c
@@ -601,12 +601,6 @@ static struct vpif_subdev_info vpif_capture_sdev_info[] = {
                         I2C_BOARD_INFO("tvp5146", 0x5d),
                         .platform_data = &tvp5146_pdata,
                 },
-                .vpif_if = {
-                        .if_type = VPIF_IF_BT656,
-                        .hd_pol = 1,
-                        .vd_pol = 1,
-                        .fid_pol = 0,
-                },
         },
         {
                 .name   = TVP5147_CH1,
@@ -614,12 +608,6 @@ static struct vpif_subdev_info vpif_capture_sdev_info[] = {
                         I2C_BOARD_INFO("tvp5146", 0x5c),
                         .platform_data = &tvp5146_pdata,
                 },
-                .vpif_if = {
-                        .if_type = VPIF_IF_BT656,
-                        .hd_pol = 1,
-                        .vd_pol = 1,
-                        .fid_pol = 0,
-                },
         },
 };
 
@@ -661,10 +649,22 @@ static struct vpif_capture_config dm646x_vpif_capture_cfg = {
         .chan_config[0] = {
                 .inputs = dm6467_ch0_inputs,
                 .input_count = ARRAY_SIZE(dm6467_ch0_inputs),
+                .vpif_if = {
+                        .if_type = VPIF_IF_BT656,
+                        .hd_pol = 1,
+                        .vd_pol = 1,
+                        .fid_pol = 0,
+                },
         },
         .chan_config[1] = {
                 .inputs = dm6467_ch1_inputs,
                 .input_count = ARRAY_SIZE(dm6467_ch1_inputs),
+                .vpif_if = {
+                        .if_type = VPIF_IF_BT656,
+                        .hd_pol = 1,
+                        .vd_pol = 1,
+                        .fid_pol = 0,
+                },
         },
 };