Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab...

[firefly-linux-kernel-4.4.55.git] / arch / arm / mach-exynos / mach-nuri.c

diff --git a/arch/arm/mach-exynos/mach-nuri.c b/arch/arm/mach-exynos/mach-nuri.c
index b8b3fbf0bae73508ce00d989130f48824dc6077c..1ea79730187f9e3e1297a717a5a4a66650bf9d6a 100644 (file)
--- 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),
 };