13 files changed, 473 insertions, 69 deletions

diff --git a/arch/arm/mach-davinci/Kconfig b/arch/arm/mach-davinci/Kconfig
index ab99c3c3b752..026b4b277ae5 100644
--- a/arch/arm/mach-davinci/Kconfig
+++ b/arch/arm/mach-davinci/Kconfig
@@ -186,6 +186,13 @@ config DA850_UI_RMII
           NOTE: Please take care while choosing this option, MII PHY will
           not be functional if RMII mode is selected.
 
+config DA850_UI_SD_VIDEO_PORT
+        bool "Video Port Interface"
+        help
+          Say Y if you want to use Video Port Interface (VPIF) on the
+          DA850/OMAP-L138 EVM. The Video decoders/encoders are found on the
+          UI daughter card that is supplied with the EVM.
+
 endchoice
 
 config DA850_WL12XX
diff --git a/arch/arm/mach-davinci/board-da850-evm.c b/arch/arm/mach-davinci/board-da850-evm.c
index 1295e616ceee..32ee3f895967 100644
--- a/arch/arm/mach-davinci/board-da850-evm.c
+++ b/arch/arm/mach-davinci/board-da850-evm.c
@@ -45,6 +45,9 @@
 #include <linux/platform_data/mtd-davinci-aemif.h>
 #include <linux/platform_data/spi-davinci.h>
 
+#include <media/tvp514x.h>
+#include <media/adv7343.h>
+
 #define DA850_EVM_PHY_ID                "davinci_mdio-0:00"
 #define DA850_LCD_PWR_PIN               GPIO_TO_PIN(2, 8)
 #define DA850_LCD_BL_PIN                GPIO_TO_PIN(2, 15)
@@ -452,6 +455,15 @@ static void da850_evm_ui_keys_init(unsigned gpio)
         }
 }
 
+#ifdef CONFIG_DA850_UI_SD_VIDEO_PORT
+static inline void da850_evm_setup_video_port(int video_sel)
+{
+        gpio_set_value_cansleep(video_sel, 0);
+}
+#else
+static inline void da850_evm_setup_video_port(int video_sel) { }
+#endif
+
 static int da850_evm_ui_expander_setup(struct i2c_client *client, unsigned gpio,
                                                 unsigned ngpio, void *c)
 {
@@ -497,6 +509,8 @@ static int da850_evm_ui_expander_setup(struct i2c_client *client, unsigned gpio,
 
         da850_evm_setup_emac_rmii(sel_a);
 
+        da850_evm_setup_video_port(sel_c);
+
         return 0;
 
 exp_setup_keys_fail:
@@ -1149,6 +1163,169 @@ static __init int da850_evm_init_cpufreq(void)
 static __init int da850_evm_init_cpufreq(void) { return 0; }
 #endif
 
+#if defined(CONFIG_DA850_UI_SD_VIDEO_PORT)
+
+#define TVP5147_CH0             "tvp514x-0"
+#define TVP5147_CH1             "tvp514x-1"
+
+/* VPIF capture configuration */
+static struct tvp514x_platform_data tvp5146_pdata = {
+                .clk_polarity = 0,
+                .hs_polarity  = 1,
+                .vs_polarity  = 1,
+};
+
+#define TVP514X_STD_ALL (V4L2_STD_NTSC | V4L2_STD_PAL)
+
+static const struct vpif_input da850_ch0_inputs[] = {
+        {
+                .input = {
+                        .index = 0,
+                        .name  = "Composite",
+                        .type  = V4L2_INPUT_TYPE_CAMERA,
+                        .capabilities = V4L2_IN_CAP_STD,
+                        .std   = TVP514X_STD_ALL,
+                },
+                .input_route = INPUT_CVBS_VI2B,
+                .output_route = OUTPUT_10BIT_422_EMBEDDED_SYNC,
+                .subdev_name = TVP5147_CH0,
+        },
+};
+
+static const struct vpif_input da850_ch1_inputs[] = {
+        {
+                .input = {
+                        .index = 0,
+                        .name  = "S-Video",
+                        .type  = V4L2_INPUT_TYPE_CAMERA,
+                        .capabilities = V4L2_IN_CAP_STD,
+                        .std   = TVP514X_STD_ALL,
+                },
+                .input_route = INPUT_SVIDEO_VI2C_VI1C,
+                .output_route = OUTPUT_10BIT_422_EMBEDDED_SYNC,
+                .subdev_name = TVP5147_CH1,
+        },
+};
+
+static struct vpif_subdev_info da850_vpif_capture_sdev_info[] = {
+        {
+                .name = TVP5147_CH0,
+                .board_info = {
+                        I2C_BOARD_INFO("tvp5146", 0x5d),
+                        .platform_data = &tvp5146_pdata,
+                },
+        },
+        {
+                .name = TVP5147_CH1,
+                .board_info = {
+                        I2C_BOARD_INFO("tvp5146", 0x5c),
+                        .platform_data = &tvp5146_pdata,
+                },
+        },
+};
+
+static struct vpif_capture_config da850_vpif_capture_config = {
+        .subdev_info = da850_vpif_capture_sdev_info,
+        .subdev_count = ARRAY_SIZE(da850_vpif_capture_sdev_info),
+        .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",
+};
+
+/* VPIF display configuration */
+static struct vpif_subdev_info da850_vpif_subdev[] = {
+        {
+                .name = "adv7343",
+                .board_info = {
+                        I2C_BOARD_INFO("adv7343", 0x2a),
+                },
+        },
+};
+
+static const struct vpif_output da850_ch0_outputs[] = {
+        {
+                .output = {
+                        .index = 0,
+                        .name = "Composite",
+                        .type = V4L2_OUTPUT_TYPE_ANALOG,
+                        .capabilities = V4L2_OUT_CAP_STD,
+                        .std = V4L2_STD_ALL,
+                },
+                .subdev_name = "adv7343",
+                .output_route = ADV7343_COMPOSITE_ID,
+        },
+        {
+                .output = {
+                        .index = 1,
+                        .name = "S-Video",
+                        .type = V4L2_OUTPUT_TYPE_ANALOG,
+                        .capabilities = V4L2_OUT_CAP_STD,
+                        .std = V4L2_STD_ALL,
+                },
+                .subdev_name = "adv7343",
+                .output_route = ADV7343_SVIDEO_ID,
+        },
+};
+
+static struct vpif_display_config da850_vpif_display_config = {
+        .subdevinfo   = da850_vpif_subdev,
+        .subdev_count = ARRAY_SIZE(da850_vpif_subdev),
+        .chan_config[0] = {
+                .outputs = da850_ch0_outputs,
+                .output_count = ARRAY_SIZE(da850_ch0_outputs),
+        },
+        .card_name    = "DA850/OMAP-L138 Video Display",
+};
+
+static __init void da850_vpif_init(void)
+{
+        int ret;
+
+        ret = da850_register_vpif();
+        if (ret)
+                pr_warn("da850_evm_init: VPIF setup failed: %d\n", ret);
+
+        ret = davinci_cfg_reg_list(da850_vpif_capture_pins);
+        if (ret)
+                pr_warn("da850_evm_init: VPIF capture mux setup failed: %d\n",
+                        ret);
+
+        ret = da850_register_vpif_capture(&da850_vpif_capture_config);
+        if (ret)
+                pr_warn("da850_evm_init: VPIF capture setup failed: %d\n", ret);
+
+        ret = davinci_cfg_reg_list(da850_vpif_display_pins);
+        if (ret)
+                pr_warn("da850_evm_init: VPIF display mux setup failed: %d\n",
+                        ret);
+
+        ret = da850_register_vpif_display(&da850_vpif_display_config);
+        if (ret)
+                pr_warn("da850_evm_init: VPIF display setup failed: %d\n", ret);
+}
+
+#else
+static __init void da850_vpif_init(void) {}
+#endif
+
 #ifdef CONFIG_DA850_WL12XX
 
 static void wl12xx_set_power(int index, bool power_on)
@@ -1375,6 +1552,8 @@ static __init void da850_evm_init(void)
                 pr_warning("da850_evm_init: suspend registration failed: %d\n",
                                 ret);
 
+        da850_vpif_init();
+
         ret = da8xx_register_spi(1, da850evm_spi_info,
                                  ARRAY_SIZE(da850evm_spi_info));
         if (ret)
diff --git a/arch/arm/mach-davinci/board-dm644x-evm.c b/arch/arm/mach-davinci/board-dm644x-evm.c
index ca72fc4b8cca..f22572cee49d 100644
--- a/arch/arm/mach-davinci/board-dm644x-evm.c
+++ b/arch/arm/mach-davinci/board-dm644x-evm.c
@@ -23,6 +23,7 @@
 #include <linux/phy.h>
 #include <linux/clk.h>
 #include <linux/videodev2.h>
+#include <linux/v4l2-dv-timings.h>
 #include <linux/export.h>
 
 #include <media/tvp514x.h>
@@ -620,7 +621,7 @@ static struct vpbe_enc_mode_info dm644xevm_enc_std_timing[] = {
         {
                 .name           = "ntsc",
                 .timings_type   = VPBE_ENC_STD,
-                .timings        = {V4L2_STD_525_60},
+                .std_id         = V4L2_STD_525_60,
                 .interlaced     = 1,
                 .xres           = 720,
                 .yres           = 480,
@@ -632,7 +633,7 @@ static struct vpbe_enc_mode_info dm644xevm_enc_std_timing[] = {
         {
                 .name           = "pal",
                 .timings_type   = VPBE_ENC_STD,
-                .timings        = {V4L2_STD_625_50},
+                .std_id         = V4L2_STD_625_50,
                 .interlaced     = 1,
                 .xres           = 720,
                 .yres           = 576,
@@ -647,8 +648,8 @@ static struct vpbe_enc_mode_info dm644xevm_enc_std_timing[] = {
 static struct vpbe_enc_mode_info dm644xevm_enc_preset_timing[] = {
         {
                 .name           = "480p59_94",
-                .timings_type   = VPBE_ENC_DV_PRESET,
-                .timings        = {V4L2_DV_480P59_94},
+                .timings_type   = VPBE_ENC_CUSTOM_TIMINGS,
+                .dv_timings     = V4L2_DV_BT_CEA_720X480P59_94,
                 .interlaced     = 0,
                 .xres           = 720,
                 .yres           = 480,
@@ -659,8 +660,8 @@ static struct vpbe_enc_mode_info dm644xevm_enc_preset_timing[] = {
         },
         {
                 .name           = "576p50",
-                .timings_type   = VPBE_ENC_DV_PRESET,
-                .timings        = {V4L2_DV_576P50},
+                .timings_type   = VPBE_ENC_CUSTOM_TIMINGS,
+                .dv_timings     = V4L2_DV_BT_CEA_720X576P50,
                 .interlaced     = 0,
                 .xres           = 720,
                 .yres           = 576,
@@ -698,7 +699,7 @@ static struct vpbe_output dm644xevm_vpbe_outputs[] = {
                         .index          = 1,
                         .name           = "Component",
                         .type           = V4L2_OUTPUT_TYPE_ANALOG,
-                        .capabilities   = V4L2_OUT_CAP_PRESETS,
+                        .capabilities   = V4L2_OUT_CAP_DV_TIMINGS,
                 },
                 .subdev_name    = VPBE_VENC_SUBDEV_NAME,
                 .default_mode   = "480p59_94",
diff --git a/arch/arm/mach-davinci/board-dm646x-evm.c b/arch/arm/mach-davinci/board-dm646x-evm.c
index 9944367b4931..1dbf85beed1b 100644
--- a/arch/arm/mach-davinci/board-dm646x-evm.c
+++ b/arch/arm/mach-davinci/board-dm646x-evm.c
@@ -26,6 +26,7 @@
 #include <linux/i2c/pcf857x.h>
 
 #include <media/tvp514x.h>
+#include <media/adv7343.h>
 
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/nand.h>
@@ -496,18 +497,49 @@ static struct vpif_subdev_info dm646x_vpif_subdev[] = {
         },
 };
 
-static const char *output[] = {
-        "Composite",
-        "Component",
-        "S-Video",
+static const struct vpif_output dm6467_ch0_outputs[] = {
+        {
+                .output = {
+                        .index = 0,
+                        .name = "Composite",
+                        .type = V4L2_OUTPUT_TYPE_ANALOG,
+                        .capabilities = V4L2_OUT_CAP_STD,
+                        .std = V4L2_STD_ALL,
+                },
+                .subdev_name = "adv7343",
+                .output_route = ADV7343_COMPOSITE_ID,
+        },
+        {
+                .output = {
+                        .index = 1,
+                        .name = "Component",
+                        .type = V4L2_OUTPUT_TYPE_ANALOG,
+                        .capabilities = V4L2_OUT_CAP_CUSTOM_TIMINGS,
+                },
+                .subdev_name = "adv7343",
+                .output_route = ADV7343_COMPONENT_ID,
+        },
+        {
+                .output = {
+                        .index = 2,
+                        .name = "S-Video",
+                        .type = V4L2_OUTPUT_TYPE_ANALOG,
+                        .capabilities = V4L2_OUT_CAP_STD,
+                        .std = V4L2_STD_ALL,
+                },
+                .subdev_name = "adv7343",
+                .output_route = ADV7343_SVIDEO_ID,
+        },
 };
 
 static struct vpif_display_config dm646x_vpif_display_config = {
         .set_clock      = set_vpif_clock,
         .subdevinfo     = dm646x_vpif_subdev,
         .subdev_count   = ARRAY_SIZE(dm646x_vpif_subdev),
-        .output         = output,
-        .output_count   = ARRAY_SIZE(output),
+        .chan_config[0] = {
+                .outputs = dm6467_ch0_outputs,
+                .output_count = ARRAY_SIZE(dm6467_ch0_outputs),
+        },
         .card_name      = "DM646x EVM",
 };
 
@@ -601,15 +633,6 @@ static struct vpif_subdev_info vpif_capture_sdev_info[] = {
                         I2C_BOARD_INFO("tvp5146", 0x5d),
                         .platform_data = &tvp5146_pdata,
                 },
-                .input = INPUT_CVBS_VI2B,
-                .output = OUTPUT_10BIT_422_EMBEDDED_SYNC,
-                .can_route = 1,
-                .vpif_if = {
-                        .if_type = VPIF_IF_BT656,
-                        .hd_pol = 1,
-                        .vd_pol = 1,
-                        .fid_pol = 0,
-                },
         },
         {
                 .name   = TVP5147_CH1,
@@ -617,15 +640,6 @@ static struct vpif_subdev_info vpif_capture_sdev_info[] = {
                         I2C_BOARD_INFO("tvp5146", 0x5c),
                         .platform_data = &tvp5146_pdata,
                 },
-                .input = INPUT_SVIDEO_VI2C_VI1C,
-                .output = OUTPUT_10BIT_422_EMBEDDED_SYNC,
-                .can_route = 1,
-                .vpif_if = {
-                        .if_type = VPIF_IF_BT656,
-                        .hd_pol = 1,
-                        .vd_pol = 1,
-                        .fid_pol = 0,
-                },
         },
 };
 
@@ -635,9 +649,12 @@ static const struct vpif_input dm6467_ch0_inputs[] = {
                         .index = 0,
                         .name = "Composite",
                         .type = V4L2_INPUT_TYPE_CAMERA,
+                        .capabilities = V4L2_IN_CAP_STD,
                         .std = TVP514X_STD_ALL,
                 },
                 .subdev_name = TVP5147_CH0,
+                .input_route = INPUT_CVBS_VI2B,
+                .output_route = OUTPUT_10BIT_422_EMBEDDED_SYNC,
         },
 };
 
@@ -647,9 +664,12 @@ static const struct vpif_input dm6467_ch1_inputs[] = {
                         .index = 0,
                         .name = "S-Video",
                         .type = V4L2_INPUT_TYPE_CAMERA,
+                        .capabilities = V4L2_IN_CAP_STD,
                         .std = TVP514X_STD_ALL,
                 },
                 .subdev_name = TVP5147_CH1,
+                .input_route = INPUT_SVIDEO_VI2C_VI1C,
+                .output_route = OUTPUT_10BIT_422_EMBEDDED_SYNC,
         },
 };
 
@@ -661,10 +681,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,
+                },
         },
 };
 
diff --git a/arch/arm/mach-davinci/da850.c b/arch/arm/mach-davinci/da850.c
index e517e1036b09..b90c172d5541 100644
--- a/arch/arm/mach-davinci/da850.c
+++ b/arch/arm/mach-davinci/da850.c
@@ -347,6 +347,13 @@ static struct clk spi1_clk = {
         .flags          = DA850_CLK_ASYNC3,
 };
 
+static struct clk vpif_clk = {
+        .name           = "vpif",
+        .parent         = &pll0_sysclk2,
+        .lpsc           = DA850_LPSC1_VPIF,
+        .gpsc           = 1,
+};
+
 static struct clk sata_clk = {
         .name           = "sata",
         .parent         = &pll0_sysclk2,
@@ -397,6 +404,7 @@ static struct clk_lookup da850_clks[] = {
         CLK(NULL,               "usb20",        &usb20_clk),
         CLK("spi_davinci.0",    NULL,           &spi0_clk),
         CLK("spi_davinci.1",    NULL,           &spi1_clk),
+        CLK("vpif",             NULL,           &vpif_clk),
         CLK("ahci",             NULL,           &sata_clk),
         CLK(NULL,               NULL,           NULL),
 };
@@ -573,6 +581,46 @@ static const struct mux_config da850_pins[] = {
         MUX_CFG(DA850, GPIO6_10,        13,     20,     15,     8,      false)
         MUX_CFG(DA850, GPIO6_13,        13,     8,      15,     8,      false)
         MUX_CFG(DA850, RTC_ALARM,       0,      28,     15,     2,      false)
+        /* VPIF Capture */
+        MUX_CFG(DA850, VPIF_DIN0,       15,     4,      15,     1,      false)
+        MUX_CFG(DA850, VPIF_DIN1,       15,     0,      15,     1,      false)
+        MUX_CFG(DA850, VPIF_DIN2,       14,     28,     15,     1,      false)
+        MUX_CFG(DA850, VPIF_DIN3,       14,     24,     15,     1,      false)
+        MUX_CFG(DA850, VPIF_DIN4,       14,     20,     15,     1,      false)
+        MUX_CFG(DA850, VPIF_DIN5,       14,     16,     15,     1,      false)
+        MUX_CFG(DA850, VPIF_DIN6,       14,     12,     15,     1,      false)
+        MUX_CFG(DA850, VPIF_DIN7,       14,     8,      15,     1,      false)
+        MUX_CFG(DA850, VPIF_DIN8,       16,     4,      15,     1,      false)
+        MUX_CFG(DA850, VPIF_DIN9,       16,     0,      15,     1,      false)
+        MUX_CFG(DA850, VPIF_DIN10,      15,     28,     15,     1,      false)
+        MUX_CFG(DA850, VPIF_DIN11,      15,     24,     15,     1,      false)
+        MUX_CFG(DA850, VPIF_DIN12,      15,     20,     15,     1,      false)
+        MUX_CFG(DA850, VPIF_DIN13,      15,     16,     15,     1,      false)
+        MUX_CFG(DA850, VPIF_DIN14,      15,     12,     15,     1,      false)
+        MUX_CFG(DA850, VPIF_DIN15,      15,     8,      15,     1,      false)
+        MUX_CFG(DA850, VPIF_CLKIN0,     14,     0,      15,     1,      false)
+        MUX_CFG(DA850, VPIF_CLKIN1,     14,     4,      15,     1,      false)
+        MUX_CFG(DA850, VPIF_CLKIN2,     19,     8,      15,     1,      false)
+        MUX_CFG(DA850, VPIF_CLKIN3,     19,     16,     15,     1,      false)
+        /* VPIF Display */
+        MUX_CFG(DA850, VPIF_DOUT0,      17,     4,      15,     1,      false)
+        MUX_CFG(DA850, VPIF_DOUT1,      17,     0,      15,     1,      false)
+        MUX_CFG(DA850, VPIF_DOUT2,      16,     28,     15,     1,      false)
+        MUX_CFG(DA850, VPIF_DOUT3,      16,     24,     15,     1,      false)
+        MUX_CFG(DA850, VPIF_DOUT4,      16,     20,     15,     1,      false)
+        MUX_CFG(DA850, VPIF_DOUT5,      16,     16,     15,     1,      false)
+        MUX_CFG(DA850, VPIF_DOUT6,      16,     12,     15,     1,      false)
+        MUX_CFG(DA850, VPIF_DOUT7,      16,     8,      15,     1,      false)
+        MUX_CFG(DA850, VPIF_DOUT8,      18,     4,      15,     1,      false)
+        MUX_CFG(DA850, VPIF_DOUT9,      18,     0,      15,     1,      false)
+        MUX_CFG(DA850, VPIF_DOUT10,     17,     28,     15,     1,      false)
+        MUX_CFG(DA850, VPIF_DOUT11,     17,     24,     15,     1,      false)
+        MUX_CFG(DA850, VPIF_DOUT12,     17,     20,     15,     1,      false)
+        MUX_CFG(DA850, VPIF_DOUT13,     17,     16,     15,     1,      false)
+        MUX_CFG(DA850, VPIF_DOUT14,     17,     12,     15,     1,      false)
+        MUX_CFG(DA850, VPIF_DOUT15,     17,     8,      15,     1,      false)
+        MUX_CFG(DA850, VPIF_CLKO2,      19,     12,     15,     1,      false)
+        MUX_CFG(DA850, VPIF_CLKO3,      19,     20,     15,     1,      false)
 #endif
 };
 
@@ -595,6 +643,26 @@ const short da850_lcdcntl_pins[] __initconst = {
         -1
 };
 
+const short da850_vpif_capture_pins[] __initdata = {
+        DA850_VPIF_DIN0, DA850_VPIF_DIN1, DA850_VPIF_DIN2, DA850_VPIF_DIN3,
+        DA850_VPIF_DIN4, DA850_VPIF_DIN5, DA850_VPIF_DIN6, DA850_VPIF_DIN7,
+        DA850_VPIF_DIN8, DA850_VPIF_DIN9, DA850_VPIF_DIN10, DA850_VPIF_DIN11,
+        DA850_VPIF_DIN12, DA850_VPIF_DIN13, DA850_VPIF_DIN14, DA850_VPIF_DIN15,
+        DA850_VPIF_CLKIN0, DA850_VPIF_CLKIN1, DA850_VPIF_CLKIN2,
+        DA850_VPIF_CLKIN3,
+        -1
+};
+
+const short da850_vpif_display_pins[] __initdata = {
+        DA850_VPIF_DOUT0, DA850_VPIF_DOUT1, DA850_VPIF_DOUT2, DA850_VPIF_DOUT3,
+        DA850_VPIF_DOUT4, DA850_VPIF_DOUT5, DA850_VPIF_DOUT6, DA850_VPIF_DOUT7,
+        DA850_VPIF_DOUT8, DA850_VPIF_DOUT9, DA850_VPIF_DOUT10,
+        DA850_VPIF_DOUT11, DA850_VPIF_DOUT12, DA850_VPIF_DOUT13,
+        DA850_VPIF_DOUT14, DA850_VPIF_DOUT15, DA850_VPIF_CLKO2,
+        DA850_VPIF_CLKO3,
+        -1
+};
+
 /* FIQ are pri 0-1; otherwise 2-7, with 7 lowest priority */
 static u8 da850_default_priorities[DA850_N_CP_INTC_IRQ] = {
         [IRQ_DA8XX_COMMTX]              = 7,
@@ -1064,6 +1132,90 @@ no_ddrpll_mem:
         return ret;
 }
 
+/* VPIF resource, platform data */
+static u64 da850_vpif_dma_mask = DMA_BIT_MASK(32);
+
+static struct resource da850_vpif_resource[] = {
+        {
+                .start = DA8XX_VPIF_BASE,
+                .end   = DA8XX_VPIF_BASE + 0xfff,
+                .flags = IORESOURCE_MEM,
+        }
+};
+
+static struct platform_device da850_vpif_dev = {
+        .name           = "vpif",
+        .id             = -1,
+        .dev            = {
+                .dma_mask               = &da850_vpif_dma_mask,
+                .coherent_dma_mask      = DMA_BIT_MASK(32),
+        },
+        .resource       = da850_vpif_resource,
+        .num_resources  = ARRAY_SIZE(da850_vpif_resource),
+};
+
+static struct resource da850_vpif_display_resource[] = {
+        {
+                .start = IRQ_DA850_VPIFINT,
+                .end   = IRQ_DA850_VPIFINT,
+                .flags = IORESOURCE_IRQ,
+        },
+};
+
+static struct platform_device da850_vpif_display_dev = {
+        .name           = "vpif_display",
+        .id             = -1,
+        .dev            = {
+                .dma_mask               = &da850_vpif_dma_mask,
+                .coherent_dma_mask      = DMA_BIT_MASK(32),
+        },
+        .resource       = da850_vpif_display_resource,
+        .num_resources  = ARRAY_SIZE(da850_vpif_display_resource),
+};
+
+static struct resource da850_vpif_capture_resource[] = {
+        {
+                .start = IRQ_DA850_VPIFINT,
+                .end   = IRQ_DA850_VPIFINT,
+                .flags = IORESOURCE_IRQ,
+        },
+        {
+                .start = IRQ_DA850_VPIFINT,
+                .end   = IRQ_DA850_VPIFINT,
+                .flags = IORESOURCE_IRQ,
+        },
+};
+
+static struct platform_device da850_vpif_capture_dev = {
+        .name           = "vpif_capture",
+        .id             = -1,
+        .dev            = {
+                .dma_mask               = &da850_vpif_dma_mask,
+                .coherent_dma_mask      = DMA_BIT_MASK(32),
+        },
+        .resource       = da850_vpif_capture_resource,
+        .num_resources  = ARRAY_SIZE(da850_vpif_capture_resource),
+};
+
+int __init da850_register_vpif(void)
+{
+        return platform_device_register(&da850_vpif_dev);
+}
+
+int __init da850_register_vpif_display(struct vpif_display_config
+                                                *display_config)
+{
+        da850_vpif_display_dev.dev.platform_data = display_config;
+        return platform_device_register(&da850_vpif_display_dev);
+}
+
+int __init da850_register_vpif_capture(struct vpif_capture_config
+                                                        *capture_config)
+{
+        da850_vpif_capture_dev.dev.platform_data = capture_config;
+        return platform_device_register(&da850_vpif_capture_dev);
+}
+
 static struct davinci_soc_info davinci_soc_info_da850 = {
         .io_desc                = da850_io_desc,
         .io_desc_num            = ARRAY_SIZE(da850_io_desc),
diff --git a/arch/arm/mach-davinci/dm644x.c b/arch/arm/mach-davinci/dm644x.c
index 0755d466221a..cd0c8b1e1ecf 100644
--- a/arch/arm/mach-davinci/dm644x.c
+++ b/arch/arm/mach-davinci/dm644x.c
@@ -701,7 +701,7 @@ static struct resource dm644x_venc_resources[] = {
 #define DM644X_VPSS_DACCLKEN                  BIT(4)
 
 static int dm644x_venc_setup_clock(enum vpbe_enc_timings_type type,
-                                   unsigned int mode)
+                                   unsigned int pclock)
 {
         int ret = 0;
         u32 v = DM644X_VPSS_VENCLKEN;
@@ -711,27 +711,18 @@ static int dm644x_venc_setup_clock(enum vpbe_enc_timings_type type,
                 v |= DM644X_VPSS_DACCLKEN;
                 writel(v, DAVINCI_SYSMOD_VIRT(SYSMOD_VPSS_CLKCTL));
                 break;
-        case VPBE_ENC_DV_PRESET:
-                switch (mode) {
-                case V4L2_DV_480P59_94:
-                case V4L2_DV_576P50:
+        case VPBE_ENC_CUSTOM_TIMINGS:
+                if (pclock <= 27000000) {
                         v |= DM644X_VPSS_MUXSEL_PLL2_MODE |
                              DM644X_VPSS_DACCLKEN;
                         writel(v, DAVINCI_SYSMOD_VIRT(SYSMOD_VPSS_CLKCTL));
-                        break;
-                case V4L2_DV_720P60:
-                case V4L2_DV_1080I60:
-                case V4L2_DV_1080P30:
+                } else {
                         /*
                          * For HD, use external clock source since
                          * HD requires higher clock rate
                          */
                         v |= DM644X_VPSS_MUXSEL_VPBECLK_MODE;
                         writel(v, DAVINCI_SYSMOD_VIRT(SYSMOD_VPSS_CLKCTL));
-                        break;
-                default:
-                        ret = -EINVAL;
-                        break;
                 }
                 break;
         default:
diff --git a/arch/arm/mach-davinci/include/mach/da8xx.h b/arch/arm/mach-davinci/include/mach/da8xx.h
index c9ee723c56f3..aaccdc4528fc 100644
--- a/arch/arm/mach-davinci/include/mach/da8xx.h
+++ b/arch/arm/mach-davinci/include/mach/da8xx.h
@@ -17,6 +17,7 @@
 #include <linux/davinci_emac.h>
 #include <linux/spi/spi.h>
 #include <linux/platform_data/davinci_asp.h>
+#include <linux/videodev2.h>
 
 #include <mach/serial.h>
 #include <mach/edma.h>
@@ -26,6 +27,8 @@
 #include <linux/platform_data/usb-davinci.h>
 #include <linux/platform_data/spi-davinci.h>
 
+#include <media/davinci/vpif_types.h>
+
 extern void __iomem *da8xx_syscfg0_base;
 extern void __iomem *da8xx_syscfg1_base;
 
@@ -63,6 +66,7 @@ extern unsigned int da850_max_speed;
 #define DA8XX_PLL0_BASE         0x01c11000
 #define DA8XX_TIMER64P0_BASE    0x01c20000
 #define DA8XX_TIMER64P1_BASE    0x01c21000
+#define DA8XX_VPIF_BASE         0x01e17000
 #define DA8XX_GPIO_BASE         0x01e26000
 #define DA8XX_PSC1_BASE         0x01e27000
 #define DA8XX_AEMIF_CS2_BASE    0x60000000
@@ -92,6 +96,11 @@ int da8xx_register_cpuidle(void);
 void __iomem * __init da8xx_get_mem_ctlr(void);
 int da850_register_pm(struct platform_device *pdev);
 int __init da850_register_sata(unsigned long refclkpn);
+int __init da850_register_vpif(void);
+int __init da850_register_vpif_display
+                        (struct vpif_display_config *display_config);
+int __init da850_register_vpif_capture
+                        (struct vpif_capture_config *capture_config);
 void da8xx_restart(char mode, const char *cmd);
 
 extern struct platform_device da8xx_serial_device;
@@ -126,6 +135,8 @@ extern const short da830_ecap1_pins[];
 extern const short da830_ecap2_pins[];
 extern const short da830_eqep0_pins[];
 extern const short da830_eqep1_pins[];
+extern const short da850_vpif_capture_pins[];
+extern const short da850_vpif_display_pins[];
 
 extern const short da850_i2c0_pins[];
 extern const short da850_i2c1_pins[];
diff --git a/arch/arm/mach-davinci/include/mach/mux.h b/arch/arm/mach-davinci/include/mach/mux.h
index a7e92fca32e6..9e95b8a1edb6 100644
--- a/arch/arm/mach-davinci/include/mach/mux.h
+++ b/arch/arm/mach-davinci/include/mach/mux.h
@@ -928,6 +928,48 @@ enum davinci_da850_index {
         DA850_GPIO6_10,
         DA850_GPIO6_13,
         DA850_RTC_ALARM,
+
+        /* VPIF Capture */
+        DA850_VPIF_DIN0,
+        DA850_VPIF_DIN1,
+        DA850_VPIF_DIN2,
+        DA850_VPIF_DIN3,
+        DA850_VPIF_DIN4,
+        DA850_VPIF_DIN5,
+        DA850_VPIF_DIN6,
+        DA850_VPIF_DIN7,
+        DA850_VPIF_DIN8,
+        DA850_VPIF_DIN9,
+        DA850_VPIF_DIN10,
+        DA850_VPIF_DIN11,
+        DA850_VPIF_DIN12,
+        DA850_VPIF_DIN13,
+        DA850_VPIF_DIN14,
+        DA850_VPIF_DIN15,
+        DA850_VPIF_CLKIN0,
+        DA850_VPIF_CLKIN1,
+        DA850_VPIF_CLKIN2,
+        DA850_VPIF_CLKIN3,
+
+        /* VPIF Display */
+        DA850_VPIF_DOUT0,
+        DA850_VPIF_DOUT1,
+        DA850_VPIF_DOUT2,
+        DA850_VPIF_DOUT3,
+        DA850_VPIF_DOUT4,
+        DA850_VPIF_DOUT5,
+        DA850_VPIF_DOUT6,
+        DA850_VPIF_DOUT7,
+        DA850_VPIF_DOUT8,
+        DA850_VPIF_DOUT9,
+        DA850_VPIF_DOUT10,
+        DA850_VPIF_DOUT11,
+        DA850_VPIF_DOUT12,
+        DA850_VPIF_DOUT13,
+        DA850_VPIF_DOUT14,
+        DA850_VPIF_DOUT15,
+        DA850_VPIF_CLKO2,
+        DA850_VPIF_CLKO3,
 };
 
 enum davinci_tnetv107x_index {
diff --git a/arch/arm/mach-davinci/include/mach/psc.h b/arch/arm/mach-davinci/include/mach/psc.h
index 405318e35bf6..40a0027838e8 100644
--- a/arch/arm/mach-davinci/include/mach/psc.h
+++ b/arch/arm/mach-davinci/include/mach/psc.h
@@ -166,6 +166,7 @@
 #define DA830_LPSC1_McASP1              8
 #define DA850_LPSC1_SATA                8
 #define DA830_LPSC1_McASP2              9
+#define DA850_LPSC1_VPIF                9
 #define DA8XX_LPSC1_SPI1                10
 #define DA8XX_LPSC1_I2C                 11
 #define DA8XX_LPSC1_UART1               12
diff --git a/arch/arm/mach-exynos/mach-nuri.c b/arch/arm/mach-exynos/mach-nuri.c
index 85fc2feb0af0..c05d7aa84031 100644
--- a/arch/arm/mach-exynos/mach-nuri.c
+++ b/arch/arm/mach-exynos/mach-nuri.c
@@ -378,10 +378,10 @@ static struct regulator_consumer_supply __initdata max8997_ldo1_[] = {
 };
 static struct regulator_consumer_supply __initdata max8997_ldo3_[] = {
         REGULATOR_SUPPLY("vusb_d", "s3c-hsotg"), /* USB */
-        REGULATOR_SUPPLY("vdd11", "s5p-mipi-csis.0"), /* MIPI */
+        REGULATOR_SUPPLY("vddcore", "s5p-mipi-csis.0"), /* MIPI */
 };
 static struct regulator_consumer_supply __initdata max8997_ldo4_[] = {
-        REGULATOR_SUPPLY("vdd18", "s5p-mipi-csis.0"), /* MIPI */
+        REGULATOR_SUPPLY("vddio", "s5p-mipi-csis.0"), /* MIPI */
 };
 static struct regulator_consumer_supply __initdata max8997_ldo5_[] = {
         REGULATOR_SUPPLY("vhsic", "modemctl"), /* MODEM */
@@ -1180,9 +1180,7 @@ static struct platform_device cam_8m_12v_fixed_rdev = {
 static struct s5p_platform_mipi_csis mipi_csis_platdata = {
         .clk_rate       = 166000000UL,
         .lanes          = 2,
-        .alignment      = 32,
         .hs_settle      = 12,
-        .phy_enable     = s5p_csis_phy_enable,
 };
 
 #define GPIO_CAM_MEGA_RST       EXYNOS4_GPY3(7) /* ISP_RESET */
@@ -1226,7 +1224,6 @@ static struct s5p_fimc_isp_info nuri_camera_sensors[] = {
                 .bus_type       = FIMC_MIPI_CSI2,
                 .board_info     = &m5mols_board_info,
                 .clk_frequency  = 24000000UL,
-                .csi_data_align = 32,
         },
 };
 
diff --git a/arch/arm/mach-exynos/mach-origen.c b/arch/arm/mach-exynos/mach-origen.c
index c11a62e23dcc..9adf491674ea 100644
--- a/arch/arm/mach-exynos/mach-origen.c
+++ b/arch/arm/mach-exynos/mach-origen.c
@@ -97,12 +97,12 @@ static struct s3c2410_uartcfg origen_uartcfgs[] __initdata = {
 };
 
 static struct regulator_consumer_supply __initdata ldo3_consumer[] = {
-        REGULATOR_SUPPLY("vdd11", "s5p-mipi-csis.0"), /* MIPI */
+        REGULATOR_SUPPLY("vddcore", "s5p-mipi-csis.0"), /* MIPI */
         REGULATOR_SUPPLY("vdd", "exynos4-hdmi"), /* HDMI */
         REGULATOR_SUPPLY("vdd_pll", "exynos4-hdmi"), /* HDMI */
 };
 static struct regulator_consumer_supply __initdata ldo6_consumer[] = {
-        REGULATOR_SUPPLY("vdd18", "s5p-mipi-csis.0"), /* MIPI */
+        REGULATOR_SUPPLY("vddio", "s5p-mipi-csis.0"), /* MIPI */
 };
 static struct regulator_consumer_supply __initdata ldo7_consumer[] = {
         REGULATOR_SUPPLY("avdd", "alc5625"), /* Realtek ALC5625 */
diff --git a/arch/arm/mach-exynos/mach-universal_c210.c b/arch/arm/mach-exynos/mach-universal_c210.c
index 08b81fd99505..ebc9dd339a38 100644
--- a/arch/arm/mach-exynos/mach-universal_c210.c
+++ b/arch/arm/mach-exynos/mach-universal_c210.c
@@ -209,7 +209,7 @@ static struct regulator_consumer_supply lp3974_ldo3_consumer[] = {
         REGULATOR_SUPPLY("vusb_a", "s3c-hsotg"),
         REGULATOR_SUPPLY("vdd", "exynos4-hdmi"),
         REGULATOR_SUPPLY("vdd_pll", "exynos4-hdmi"),
-        REGULATOR_SUPPLY("vdd11", "s5p-mipi-csis.0"),
+        REGULATOR_SUPPLY("vddcore", "s5p-mipi-csis.0"),
 };
 
 static struct regulator_init_data lp3974_ldo3_data = {
@@ -273,7 +273,7 @@ static struct regulator_init_data lp3974_ldo6_data = {
 };
 
 static struct regulator_consumer_supply lp3974_ldo7_consumer[] = {
-        REGULATOR_SUPPLY("vdd18", "s5p-mipi-csis.0"),
+        REGULATOR_SUPPLY("vddio", "s5p-mipi-csis.0"),
 };
 
 static struct regulator_init_data lp3974_ldo7_data = {
@@ -942,9 +942,7 @@ static struct platform_device cam_s_if_fixed_reg_dev = {
 static struct s5p_platform_mipi_csis mipi_csis_platdata = {
         .clk_rate       = 166000000UL,
         .lanes          = 2,
-        .alignment      = 32,
         .hs_settle      = 12,
-        .phy_enable     = s5p_csis_phy_enable,
 };
 
 #define GPIO_CAM_LEVEL_EN(n)    EXYNOS4_GPE4(n + 3)
@@ -1008,7 +1006,6 @@ static struct s5p_fimc_isp_info universal_camera_sensors[] = {
                 .board_info     = &m5mols_board_info,
                 .i2c_bus_num    = 0,
                 .clk_frequency  = 24000000UL,
-                .csi_data_align = 32,
         },
 };
 
diff --git a/arch/arm/plat-samsung/setup-mipiphy.c b/arch/arm/plat-samsung/setup-mipiphy.c
index 683c466c0e6a..147459327601 100644
--- a/arch/arm/plat-samsung/setup-mipiphy.c
+++ b/arch/arm/plat-samsung/setup-mipiphy.c
@@ -14,24 +14,18 @@
 #include <linux/spinlock.h>
 #include <mach/regs-clock.h>
 
-static int __s5p_mipi_phy_control(struct platform_device *pdev,
-                                  bool on, u32 reset)
+static int __s5p_mipi_phy_control(int id, bool on, u32 reset)
 {
         static DEFINE_SPINLOCK(lock);
         void __iomem *addr;
         unsigned long flags;
-        int pid;
         u32 cfg;
 
-        if (!pdev)
+        id = max(0, id);
+        if (id > 1)
                 return -EINVAL;
 
-        pid = (pdev->id == -1) ? 0 : pdev->id;
-
-        if (pid != 0 && pid != 1)
-                return -EINVAL;
-
-        addr = S5P_MIPI_DPHY_CONTROL(pid);
+        addr = S5P_MIPI_DPHY_CONTROL(id);
 
         spin_lock_irqsave(&lock, flags);
 
@@ -52,12 +46,12 @@ static int __s5p_mipi_phy_control(struct platform_device *pdev,
         return 0;
 }
 
-int s5p_csis_phy_enable(struct platform_device *pdev, bool on)
+int s5p_csis_phy_enable(int id, bool on)
 {
-        return __s5p_mipi_phy_control(pdev, on, S5P_MIPI_DPHY_SRESETN);
+        return __s5p_mipi_phy_control(id, on, S5P_MIPI_DPHY_SRESETN);
 }
 
 int s5p_dsim_phy_enable(struct platform_device *pdev, bool on)
 {
-        return __s5p_mipi_phy_control(pdev, on, S5P_MIPI_DPHY_MRESETN);
+        return __s5p_mipi_phy_control(pdev->id, on, S5P_MIPI_DPHY_MRESETN);
 }