6 files changed, 30 insertions, 23 deletions

diff --git a/arch/arm/mach-davinci/board-da850-evm.c b/arch/arm/mach-davinci/board-da850-evm.c
index 1f50a653eb8c..c2dfe06563df 100644
--- a/arch/arm/mach-davinci/board-da850-evm.c
+++ b/arch/arm/mach-davinci/board-da850-evm.c
@@ -1253,11 +1253,24 @@ static struct vpif_capture_config da850_vpif_capture_config = {
 };
 
 /* VPIF display configuration */
+
+static struct adv7343_platform_data adv7343_pdata = {
+        .mode_config = {
+                .dac_3 = 1,
+                .dac_2 = 1,
+                .dac_1 = 1,
+        },
+        .sd_config = {
+                .sd_dac_out1 = 1,
+        },
+};
+
 static struct vpif_subdev_info da850_vpif_subdev[] = {
         {
                 .name = "adv7343",
                 .board_info = {
                         I2C_BOARD_INFO("adv7343", 0x2a),
+                        .platform_data = &adv7343_pdata,
                 },
         },
 };
diff --git a/arch/arm/mach-davinci/board-dm644x-evm.c b/arch/arm/mach-davinci/board-dm644x-evm.c
index e4a16f98e6a2..71735e7797cc 100644
--- a/arch/arm/mach-davinci/board-dm644x-evm.c
+++ b/arch/arm/mach-davinci/board-dm644x-evm.c
@@ -690,7 +690,7 @@ static struct vpbe_output dm644xevm_vpbe_outputs[] = {
                         .std            = VENC_STD_ALL,
                         .capabilities   = V4L2_OUT_CAP_STD,
                 },
-                .subdev_name    = VPBE_VENC_SUBDEV_NAME,
+                .subdev_name    = DM644X_VPBE_VENC_SUBDEV_NAME,
                 .default_mode   = "ntsc",
                 .num_modes      = ARRAY_SIZE(dm644xevm_enc_std_timing),
                 .modes          = dm644xevm_enc_std_timing,
@@ -702,7 +702,7 @@ static struct vpbe_output dm644xevm_vpbe_outputs[] = {
                         .type           = V4L2_OUTPUT_TYPE_ANALOG,
                         .capabilities   = V4L2_OUT_CAP_DV_TIMINGS,
                 },
-                .subdev_name    = VPBE_VENC_SUBDEV_NAME,
+                .subdev_name    = DM644X_VPBE_VENC_SUBDEV_NAME,
                 .default_mode   = "480p59_94",
                 .num_modes      = ARRAY_SIZE(dm644xevm_enc_preset_timing),
                 .modes          = dm644xevm_enc_preset_timing,
@@ -713,10 +713,10 @@ static struct vpbe_config dm644xevm_display_cfg = {
         .module_name    = "dm644x-vpbe-display",
         .i2c_adapter_id = 1,
         .osd            = {
-                .module_name    = VPBE_OSD_SUBDEV_NAME,
+                .module_name    = DM644X_VPBE_OSD_SUBDEV_NAME,
         },
         .venc           = {
-                .module_name    = VPBE_VENC_SUBDEV_NAME,
+                .module_name    = DM644X_VPBE_VENC_SUBDEV_NAME,
         },
         .num_outputs    = ARRAY_SIZE(dm644xevm_vpbe_outputs),
         .outputs        = dm644xevm_vpbe_outputs,
diff --git a/arch/arm/mach-davinci/dm644x.c b/arch/arm/mach-davinci/dm644x.c
index 11c79a3362ef..db1dd92e00af 100644
--- a/arch/arm/mach-davinci/dm644x.c
+++ b/arch/arm/mach-davinci/dm644x.c
@@ -669,19 +669,14 @@ static struct resource dm644x_osd_resources[] = {
         },
 };
 
-static struct osd_platform_data dm644x_osd_data = {
-        .vpbe_type     = VPBE_VERSION_1,
-};
-
 static struct platform_device dm644x_osd_dev = {
-        .name           = VPBE_OSD_SUBDEV_NAME,
+        .name           = DM644X_VPBE_OSD_SUBDEV_NAME,
         .id             = -1,
         .num_resources  = ARRAY_SIZE(dm644x_osd_resources),
         .resource       = dm644x_osd_resources,
         .dev            = {
                 .dma_mask               = &dm644x_video_dma_mask,
                 .coherent_dma_mask      = DMA_BIT_MASK(32),
-                .platform_data          = &dm644x_osd_data,
         },
 };
 
@@ -751,12 +746,11 @@ static struct platform_device dm644x_vpbe_display = {
 };
 
 static struct venc_platform_data dm644x_venc_pdata = {
-        .venc_type      = VPBE_VERSION_1,
         .setup_clock    = dm644x_venc_setup_clock,
 };
 
 static struct platform_device dm644x_venc_dev = {
-        .name           = VPBE_VENC_SUBDEV_NAME,
+        .name           = DM644X_VPBE_VENC_SUBDEV_NAME,
         .id             = -1,
         .num_resources  = ARRAY_SIZE(dm644x_venc_resources),
         .resource       = dm644x_venc_resources,
diff --git a/arch/arm/mach-exynos/mach-nuri.c b/arch/arm/mach-exynos/mach-nuri.c
index b8b3fbf0bae7..1ea79730187f 100644
--- a/arch/arm/mach-exynos/mach-nuri.c
+++ b/arch/arm/mach-exynos/mach-nuri.c
@@ -1208,25 +1208,25 @@ static struct i2c_board_info m5mols_board_info = {
         .platform_data  = &m5mols_platdata,
 };
 
-static struct s5p_fimc_isp_info nuri_camera_sensors[] = {
+static struct fimc_source_info nuri_camera_sensors[] = {
         {
                 .flags          = V4L2_MBUS_PCLK_SAMPLE_RISING |
                                   V4L2_MBUS_VSYNC_ACTIVE_LOW,
-                .bus_type       = FIMC_ITU_601,
+                .fimc_bus_type  = FIMC_BUS_TYPE_ITU_601,
                 .board_info     = &s5k6aa_board_info,
                 .clk_frequency  = 24000000UL,
                 .i2c_bus_num    = 6,
         }, {
                 .flags          = V4L2_MBUS_PCLK_SAMPLE_FALLING |
                                   V4L2_MBUS_VSYNC_ACTIVE_LOW,
-                .bus_type       = FIMC_MIPI_CSI2,
+                .fimc_bus_type  = FIMC_BUS_TYPE_MIPI_CSI2,
                 .board_info     = &m5mols_board_info,
                 .clk_frequency  = 24000000UL,
         },
 };
 
 static struct s5p_platform_fimc fimc_md_platdata = {
-        .isp_info       = nuri_camera_sensors,
+        .source_info    = nuri_camera_sensors,
         .num_clients    = ARRAY_SIZE(nuri_camera_sensors),
 };
 
diff --git a/arch/arm/mach-exynos/mach-universal_c210.c b/arch/arm/mach-exynos/mach-universal_c210.c
index c9d33a43103e..497fcb793dc1 100644
--- a/arch/arm/mach-exynos/mach-universal_c210.c
+++ b/arch/arm/mach-exynos/mach-universal_c210.c
@@ -987,12 +987,12 @@ static struct i2c_board_info m5mols_board_info = {
         .platform_data = &m5mols_platdata,
 };
 
-static struct s5p_fimc_isp_info universal_camera_sensors[] = {
+static struct fimc_source_info universal_camera_sensors[] = {
         {
                 .mux_id         = 0,
                 .flags          = V4L2_MBUS_PCLK_SAMPLE_FALLING |
                                   V4L2_MBUS_VSYNC_ACTIVE_LOW,
-                .bus_type       = FIMC_ITU_601,
+                .fimc_bus_type  = FIMC_BUS_TYPE_ITU_601,
                 .board_info     = &s5k6aa_board_info,
                 .i2c_bus_num    = 0,
                 .clk_frequency  = 24000000UL,
@@ -1000,7 +1000,7 @@ static struct s5p_fimc_isp_info universal_camera_sensors[] = {
                 .mux_id         = 0,
                 .flags          = V4L2_MBUS_PCLK_SAMPLE_FALLING |
                                   V4L2_MBUS_VSYNC_ACTIVE_LOW,
-                .bus_type       = FIMC_MIPI_CSI2,
+                .fimc_bus_type  = FIMC_BUS_TYPE_MIPI_CSI2,
                 .board_info     = &m5mols_board_info,
                 .i2c_bus_num    = 0,
                 .clk_frequency  = 24000000UL,
@@ -1008,7 +1008,7 @@ static struct s5p_fimc_isp_info universal_camera_sensors[] = {
 };
 
 static struct s5p_platform_fimc fimc_md_platdata = {
-        .isp_info       = universal_camera_sensors,
+        .source_info    = universal_camera_sensors,
         .num_clients    = ARRAY_SIZE(universal_camera_sensors),
 };
 
diff --git a/arch/arm/mach-s5pv210/mach-goni.c b/arch/arm/mach-s5pv210/mach-goni.c
index 570481591746..3a38f7b34b94 100644
--- a/arch/arm/mach-s5pv210/mach-goni.c
+++ b/arch/arm/mach-s5pv210/mach-goni.c
@@ -840,12 +840,12 @@ static struct i2c_board_info noon010pc30_board_info = {
         .platform_data = &noon010pc30_pldata,
 };
 
-static struct s5p_fimc_isp_info goni_camera_sensors[] = {
+static struct fimc_source_info goni_camera_sensors[] = {
         {
                 .mux_id         = 0,
                 .flags          = V4L2_MBUS_PCLK_SAMPLE_FALLING |
                                   V4L2_MBUS_VSYNC_ACTIVE_LOW,
-                .bus_type       = FIMC_ITU_601,
+                .bus_type       = FIMC_BUS_TYPE_ITU_601,
                 .board_info     = &noon010pc30_board_info,
                 .i2c_bus_num    = 0,
                 .clk_frequency  = 16000000UL,
@@ -853,7 +853,7 @@ static struct s5p_fimc_isp_info goni_camera_sensors[] = {
 };
 
 static struct s5p_platform_fimc goni_fimc_md_platdata __initdata = {
-        .isp_info       = goni_camera_sensors,
+        .source_info    = goni_camera_sensors,
         .num_clients    = ARRAY_SIZE(goni_camera_sensors),
 };