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

Pull media updates from Mauro Carvalho Chehab:

 - Some cleanups at V4L2 documentation

 - new drivers: ts2020 frontend, ov9650 sensor, s5c73m3 sensor,
   sh-mobile veu mem2mem driver, radio-ma901, davinci_vpfe staging
   driver

 - Lots of missing MAINTAINERS entries added

 - several em28xx driver improvements, including its conversion to
   videobuf2

 - several fixups on drivers to make them to better comply with the API

 - DVB core: add support for DVBv5 stats, allowing the implementation of
   statistics for new standards like ISDB

 - mb86a20s: add statistics to the driver

 - lots of new board additions, cleanups, and driver improvements.

* 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (596 commits)
  [media] media: Add 0x3009 USB PID to ttusb2 driver (fixed diff)
  [media] rtl28xxu: Add USB IDs for Compro VideoMate U620F
  [media] em28xx: add usb id for terratec h5 rev. 3
  [media] media: rc: gpio-ir-recv: add support for device tree parsing
  [media] mceusb: move check earlier to make smatch happy
  [media] radio-si470x doc: add info about v4l2-ctl and sox+alsa
  [media] staging: media: Remove unnecessary OOM messages
  [media] sh_vou: Use vou_dev instead of vou_file wherever possible
  [media] sh_vou: Use video_drvdata()
  [media] drivers/media/platform/soc_camera/pxa_camera.c: use devm_ functions
  [media] mt9t112: mt9t111 format set up differs from mt9t112
  [media] sh-mobile-ceu-camera: fix SHARPNESS control default
  Revert "[media] fc0011: Return early, if the frequency is already tuned"
  [media] cx18/ivtv: fix regression: remove __init from a non-init function
  [media] em28xx: fix analog streaming with USB bulk transfers
  [media] stv0900: remove unnecessary null pointer check
  [media] fc0011: Return early, if the frequency is already tuned
  [media] fc0011: Add some sanity checks and cleanups
  [media] fc0011: Fix xin value clamping
  Revert "[media] [PATH,1/2] mxl5007 move reset to attach"
  ...

11 files changed, 162 insertions, 70 deletions

diff --git a/drivers/media/platform/davinci/Kconfig b/drivers/media/platform/davinci/Kconfig
index 3c56037c82fc..ccfde4eb626a 100644
--- a/drivers/media/platform/davinci/Kconfig
+++ b/drivers/media/platform/davinci/Kconfig
@@ -97,25 +97,15 @@ config VIDEO_ISIF
            To compile this driver as a module, choose M here: the
            module will be called vpfe.
 
-config VIDEO_DM644X_VPBE
-        tristate "DM644X VPBE HW module"
-        depends on ARCH_DAVINCI_DM644x
+config VIDEO_DAVINCI_VPBE_DISPLAY
+        tristate "DM644X/DM365/DM355 VPBE HW module"
+        depends on ARCH_DAVINCI_DM644x || ARCH_DAVINCI_DM355 || ARCH_DAVINCI_DM365
         select VIDEO_VPSS_SYSTEM
         select VIDEOBUF2_DMA_CONTIG
         help
-            Enables VPBE modules used for display on a DM644x
-            SoC.
+            Enables Davinci VPBE module used for display devices.
+            This module is common for following DM644x/DM365/DM355
+            based display devices.
 
             To compile this driver as a module, choose M here: the
             module will be called vpbe.
-
-
-config VIDEO_VPBE_DISPLAY
-        tristate "VPBE V4L2 Display driver"
-        depends on ARCH_DAVINCI_DM644x
-        select VIDEO_DM644X_VPBE
-        help
-            Enables VPBE V4L2 Display driver on a DM644x device
-
-            To compile this driver as a module, choose M here: the
-            module will be called vpbe_display.
diff --git a/drivers/media/platform/davinci/Makefile b/drivers/media/platform/davinci/Makefile
index 74ed92d09257..f40f5219ca50 100644
--- a/drivers/media/platform/davinci/Makefile
+++ b/drivers/media/platform/davinci/Makefile
@@ -16,5 +16,5 @@ obj-$(CONFIG_VIDEO_VPFE_CAPTURE) += vpfe_capture.o
 obj-$(CONFIG_VIDEO_DM6446_CCDC) += dm644x_ccdc.o
 obj-$(CONFIG_VIDEO_DM355_CCDC) += dm355_ccdc.o
 obj-$(CONFIG_VIDEO_ISIF) += isif.o
-obj-$(CONFIG_VIDEO_DM644X_VPBE) += vpbe.o vpbe_osd.o vpbe_venc.o
-obj-$(CONFIG_VIDEO_VPBE_DISPLAY) += vpbe_display.o
+obj-$(CONFIG_VIDEO_DAVINCI_VPBE_DISPLAY) += vpbe.o vpbe_osd.o \
+        vpbe_venc.o vpbe_display.o
diff --git a/drivers/media/platform/davinci/dm355_ccdc.c b/drivers/media/platform/davinci/dm355_ccdc.c
index f263cabade7a..4277e4ad810c 100644
--- a/drivers/media/platform/davinci/dm355_ccdc.c
+++ b/drivers/media/platform/davinci/dm355_ccdc.c
@@ -557,7 +557,7 @@ static int ccdc_config_vdfc(struct ccdc_vertical_dft *dfc)
  */
 static void ccdc_config_csc(struct ccdc_csc *csc)
 {
-        u32 val1, val2;
+        u32 val1 = 0, val2;
         int i;
 
         if (!csc->enable)
diff --git a/drivers/media/platform/davinci/vpbe.c b/drivers/media/platform/davinci/vpbe.c
index 841b91a3d255..4ca0f9a2ad8a 100644
--- a/drivers/media/platform/davinci/vpbe.c
+++ b/drivers/media/platform/davinci/vpbe.c
@@ -558,9 +558,9 @@ static int platform_device_get(struct device *dev, void *data)
         struct platform_device *pdev = to_platform_device(dev);
         struct vpbe_device *vpbe_dev = data;
 
-        if (strcmp("vpbe-osd", pdev->name) == 0)
+        if (strstr(pdev->name, "vpbe-osd") != NULL)
                 vpbe_dev->osd_device = platform_get_drvdata(pdev);
-        if (strcmp("vpbe-venc", pdev->name) == 0)
+        if (strstr(pdev->name, "vpbe-venc") != NULL)
                 vpbe_dev->venc_device = dev_get_platdata(&pdev->dev);
 
         return 0;
@@ -584,7 +584,6 @@ static int vpbe_initialize(struct device *dev, struct vpbe_device *vpbe_dev)
         struct v4l2_subdev **enc_subdev;
         struct osd_state *osd_device;
         struct i2c_adapter *i2c_adap;
-        int output_index;
         int num_encoders;
         int ret = 0;
         int err;
@@ -632,8 +631,10 @@ static int vpbe_initialize(struct device *dev, struct vpbe_device *vpbe_dev)
 
         err = bus_for_each_dev(&platform_bus_type, NULL, vpbe_dev,
                                platform_device_get);
-        if (err < 0)
-                return err;
+        if (err < 0) {
+                ret = err;
+                goto fail_dev_unregister;
+        }
 
         vpbe_dev->venc = venc_sub_dev_init(&vpbe_dev->v4l2_dev,
                                            vpbe_dev->cfg->venc.module_name);
@@ -731,7 +732,6 @@ static int vpbe_initialize(struct device *dev, struct vpbe_device *vpbe_dev)
         /* set the current encoder and output to that of venc by default */
         vpbe_dev->current_sd_index = 0;
         vpbe_dev->current_out_index = 0;
-        output_index = 0;
 
         mutex_unlock(&vpbe_dev->lock);
 
diff --git a/drivers/media/platform/davinci/vpbe_display.c b/drivers/media/platform/davinci/vpbe_display.c
index e707a6f2325b..5e6b0cab514b 100644
--- a/drivers/media/platform/davinci/vpbe_display.c
+++ b/drivers/media/platform/davinci/vpbe_display.c
@@ -791,7 +791,6 @@ static int vpbe_display_g_crop(struct file *file, void *priv,
         struct vpbe_device *vpbe_dev = fh->disp_dev->vpbe_dev;
         struct osd_state *osd_device = fh->disp_dev->osd_device;
         struct v4l2_rect *rect = &crop->c;
-        int ret;
 
         v4l2_dbg(1, debug, &vpbe_dev->v4l2_dev,
                         "VIDIOC_G_CROP, layer id = %d\n",
@@ -799,7 +798,7 @@ static int vpbe_display_g_crop(struct file *file, void *priv,
 
         if (crop->type != V4L2_BUF_TYPE_VIDEO_OUTPUT) {
                 v4l2_err(&vpbe_dev->v4l2_dev, "Invalid buf type\n");
-                ret = -EINVAL;
+                return -EINVAL;
         }
         osd_device->ops.get_layer_config(osd_device,
                                 layer->layer_info.id, cfg);
@@ -1393,9 +1392,9 @@ static int vpbe_display_reqbufs(struct file *file, void *priv,
         }
         /* Initialize videobuf queue as per the buffer type */
         layer->alloc_ctx = vb2_dma_contig_init_ctx(vpbe_dev->pdev);
-        if (!layer->alloc_ctx) {
+        if (IS_ERR(layer->alloc_ctx)) {
                 v4l2_err(&vpbe_dev->v4l2_dev, "Failed to get the context\n");
-                return -EINVAL;
+                return PTR_ERR(layer->alloc_ctx);
         }
         q = &layer->buffer_queue;
         memset(q, 0, sizeof(*q));
@@ -1656,7 +1655,7 @@ static int vpbe_device_get(struct device *dev, void *data)
         if (strcmp("vpbe_controller", pdev->name) == 0)
                 vpbe_disp->vpbe_dev = platform_get_drvdata(pdev);
 
-        if (strcmp("vpbe-osd", pdev->name) == 0)
+        if (strstr(pdev->name, "vpbe-osd") != NULL)
                 vpbe_disp->osd_device = platform_get_drvdata(pdev);
 
         return 0;
diff --git a/drivers/media/platform/davinci/vpbe_osd.c b/drivers/media/platform/davinci/vpbe_osd.c
index 707f243f810d..12ad17c52ef3 100644
--- a/drivers/media/platform/davinci/vpbe_osd.c
+++ b/drivers/media/platform/davinci/vpbe_osd.c
@@ -39,7 +39,22 @@
 #include <linux/io.h>
 #include "vpbe_osd_regs.h"
 
-#define MODULE_NAME     VPBE_OSD_SUBDEV_NAME
+#define MODULE_NAME     "davinci-vpbe-osd"
+
+static struct platform_device_id vpbe_osd_devtype[] = {
+        {
+                .name = DM644X_VPBE_OSD_SUBDEV_NAME,
+                .driver_data = VPBE_VERSION_1,
+        }, {
+                .name = DM365_VPBE_OSD_SUBDEV_NAME,
+                .driver_data = VPBE_VERSION_2,
+        }, {
+                .name = DM355_VPBE_OSD_SUBDEV_NAME,
+                .driver_data = VPBE_VERSION_3,
+        },
+};
+
+MODULE_DEVICE_TABLE(platform, vpbe_osd_devtype);
 
 /* register access routines */
 static inline u32 osd_read(struct osd_state *sd, u32 offset)
@@ -129,7 +144,7 @@ static int _osd_dm6446_vid0_pingpong(struct osd_state *sd,
         struct osd_platform_data *pdata;
 
         pdata = (struct osd_platform_data *)sd->dev->platform_data;
-        if (pdata->field_inv_wa_enable) {
+        if (pdata != NULL && pdata->field_inv_wa_enable) {
 
                 if (!field_inversion || !lconfig->interlaced) {
                         osd_write(sd, fb_base_phys & ~0x1F, OSD_VIDWIN0ADR);
@@ -1526,7 +1541,7 @@ static const struct vpbe_osd_ops osd_ops = {
 
 static int osd_probe(struct platform_device *pdev)
 {
-        struct osd_platform_data *pdata;
+        const struct platform_device_id *pdev_id;
         struct osd_state *osd;
         struct resource *res;
         int ret = 0;
@@ -1535,16 +1550,15 @@ static int osd_probe(struct platform_device *pdev)
         if (osd == NULL)
                 return -ENOMEM;
 
-        osd->dev = &pdev->dev;
-        pdata = (struct osd_platform_data *)pdev->dev.platform_data;
-        osd->vpbe_type = (enum vpbe_version)pdata->vpbe_type;
-        if (NULL == pdev->dev.platform_data) {
-                dev_err(osd->dev, "No platform data defined for OSD"
-                        " sub device\n");
-                ret = -ENOENT;
+        pdev_id = platform_get_device_id(pdev);
+        if (!pdev_id) {
+                ret = -EINVAL;
                 goto free_mem;
         }
 
+        osd->dev = &pdev->dev;
+        osd->vpbe_type = pdev_id->driver_data;
+
         res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
         if (!res) {
                 dev_err(osd->dev, "Unable to get OSD register address map\n");
@@ -1595,6 +1609,7 @@ static struct platform_driver osd_driver = {
                 .name   = MODULE_NAME,
                 .owner  = THIS_MODULE,
         },
+        .id_table       = vpbe_osd_devtype
 };
 
 module_platform_driver(osd_driver);
diff --git a/drivers/media/platform/davinci/vpbe_venc.c b/drivers/media/platform/davinci/vpbe_venc.c
index aed7369b962a..bdbebd59df98 100644
--- a/drivers/media/platform/davinci/vpbe_venc.c
+++ b/drivers/media/platform/davinci/vpbe_venc.c
@@ -38,7 +38,22 @@
 
 #include "vpbe_venc_regs.h"
 
-#define MODULE_NAME     VPBE_VENC_SUBDEV_NAME
+#define MODULE_NAME     "davinci-vpbe-venc"
+
+static struct platform_device_id vpbe_venc_devtype[] = {
+        {
+                .name = DM644X_VPBE_VENC_SUBDEV_NAME,
+                .driver_data = VPBE_VERSION_1,
+        }, {
+                .name = DM365_VPBE_VENC_SUBDEV_NAME,
+                .driver_data = VPBE_VERSION_2,
+        }, {
+                .name = DM355_VPBE_VENC_SUBDEV_NAME,
+                .driver_data = VPBE_VERSION_3,
+        },
+};
+
+MODULE_DEVICE_TABLE(platform, vpbe_venc_devtype);
 
 static int debug = 2;
 module_param(debug, int, 0644);
@@ -54,6 +69,7 @@ struct venc_state {
         spinlock_t lock;
         void __iomem *venc_base;
         void __iomem *vdaccfg_reg;
+        enum vpbe_version venc_type;
 };
 
 static inline struct venc_state *to_state(struct v4l2_subdev *sd)
@@ -127,7 +143,7 @@ static int venc_set_dac(struct v4l2_subdev *sd, u32 out_index)
 static void venc_enabledigitaloutput(struct v4l2_subdev *sd, int benable)
 {
         struct venc_state *venc = to_state(sd);
-        struct venc_platform_data *pdata = venc->pdata;
+
         v4l2_dbg(debug, 2, sd, "venc_enabledigitaloutput\n");
 
         if (benable) {
@@ -159,7 +175,7 @@ static void venc_enabledigitaloutput(struct v4l2_subdev *sd, int benable)
 
                 /* Disable LCD output control (accepting default polarity) */
                 venc_write(sd, VENC_LCDOUT, 0);
-                if (pdata->venc_type != VPBE_VERSION_3)
+                if (venc->venc_type != VPBE_VERSION_3)
                         venc_write(sd, VENC_CMPNT, 0x100);
                 venc_write(sd, VENC_HSPLS, 0);
                 venc_write(sd, VENC_HINT, 0);
@@ -203,11 +219,11 @@ static int venc_set_ntsc(struct v4l2_subdev *sd)
 
         venc_enabledigitaloutput(sd, 0);
 
-        if (pdata->venc_type == VPBE_VERSION_3) {
+        if (venc->venc_type == VPBE_VERSION_3) {
                 venc_write(sd, VENC_CLKCTL, 0x01);
                 venc_write(sd, VENC_VIDCTL, 0);
                 val = vdaccfg_write(sd, VDAC_CONFIG_SD_V3);
-        } else if (pdata->venc_type == VPBE_VERSION_2) {
+        } else if (venc->venc_type == VPBE_VERSION_2) {
                 venc_write(sd, VENC_CLKCTL, 0x01);
                 venc_write(sd, VENC_VIDCTL, 0);
                 vdaccfg_write(sd, VDAC_CONFIG_SD_V2);
@@ -238,7 +254,6 @@ static int venc_set_ntsc(struct v4l2_subdev *sd)
 static int venc_set_pal(struct v4l2_subdev *sd)
 {
         struct venc_state *venc = to_state(sd);
-        struct venc_platform_data *pdata = venc->pdata;
 
         v4l2_dbg(debug, 2, sd, "venc_set_pal\n");
 
@@ -249,11 +264,11 @@ static int venc_set_pal(struct v4l2_subdev *sd)
 
         venc_enabledigitaloutput(sd, 0);
 
-        if (pdata->venc_type == VPBE_VERSION_3) {
+        if (venc->venc_type == VPBE_VERSION_3) {
                 venc_write(sd, VENC_CLKCTL, 0x1);
                 venc_write(sd, VENC_VIDCTL, 0);
                 vdaccfg_write(sd, VDAC_CONFIG_SD_V3);
-        } else if (pdata->venc_type == VPBE_VERSION_2) {
+        } else if (venc->venc_type == VPBE_VERSION_2) {
                 venc_write(sd, VENC_CLKCTL, 0x1);
                 venc_write(sd, VENC_VIDCTL, 0);
                 vdaccfg_write(sd, VDAC_CONFIG_SD_V2);
@@ -293,8 +308,8 @@ static int venc_set_480p59_94(struct v4l2_subdev *sd)
         struct venc_platform_data *pdata = venc->pdata;
 
         v4l2_dbg(debug, 2, sd, "venc_set_480p59_94\n");
-        if ((pdata->venc_type != VPBE_VERSION_1) &&
-            (pdata->venc_type != VPBE_VERSION_2))
+        if (venc->venc_type != VPBE_VERSION_1 &&
+            venc->venc_type != VPBE_VERSION_2)
                 return -EINVAL;
 
         /* Setup clock at VPSS & VENC for SD */
@@ -303,12 +318,12 @@ static int venc_set_480p59_94(struct v4l2_subdev *sd)
 
         venc_enabledigitaloutput(sd, 0);
 
-        if (pdata->venc_type == VPBE_VERSION_2)
+        if (venc->venc_type == VPBE_VERSION_2)
                 vdaccfg_write(sd, VDAC_CONFIG_HD_V2);
         venc_write(sd, VENC_OSDCLK0, 0);
         venc_write(sd, VENC_OSDCLK1, 1);
 
-        if (pdata->venc_type == VPBE_VERSION_1) {
+        if (venc->venc_type == VPBE_VERSION_1) {
                 venc_modify(sd, VENC_VDPRO, VENC_VDPRO_DAFRQ,
                             VENC_VDPRO_DAFRQ);
                 venc_modify(sd, VENC_VDPRO, VENC_VDPRO_DAUPS,
@@ -341,8 +356,8 @@ static int venc_set_576p50(struct v4l2_subdev *sd)
 
         v4l2_dbg(debug, 2, sd, "venc_set_576p50\n");
 
-        if ((pdata->venc_type != VPBE_VERSION_1) &&
-          (pdata->venc_type != VPBE_VERSION_2))
+        if (venc->venc_type != VPBE_VERSION_1 &&
+            venc->venc_type != VPBE_VERSION_2)
                 return -EINVAL;
         /* Setup clock at VPSS & VENC for SD */
         if (pdata->setup_clock(VPBE_ENC_CUSTOM_TIMINGS, 27000000) < 0)
@@ -350,13 +365,13 @@ static int venc_set_576p50(struct v4l2_subdev *sd)
 
         venc_enabledigitaloutput(sd, 0);
 
-        if (pdata->venc_type == VPBE_VERSION_2)
+        if (venc->venc_type == VPBE_VERSION_2)
                 vdaccfg_write(sd, VDAC_CONFIG_HD_V2);
 
         venc_write(sd, VENC_OSDCLK0, 0);
         venc_write(sd, VENC_OSDCLK1, 1);
 
-        if (pdata->venc_type == VPBE_VERSION_1) {
+        if (venc->venc_type == VPBE_VERSION_1) {
                 venc_modify(sd, VENC_VDPRO, VENC_VDPRO_DAFRQ,
                             VENC_VDPRO_DAFRQ);
                 venc_modify(sd, VENC_VDPRO, VENC_VDPRO_DAUPS,
@@ -460,14 +475,14 @@ static int venc_s_dv_timings(struct v4l2_subdev *sd,
         else if (height == 480)
                 return venc_set_480p59_94(sd);
         else if ((height == 720) &&
-                        (venc->pdata->venc_type == VPBE_VERSION_2)) {
+                        (venc->venc_type == VPBE_VERSION_2)) {
                 /* TBD setup internal 720p mode here */
                 ret = venc_set_720p60_internal(sd);
                 /* for DM365 VPBE, there is DAC inside */
                 vdaccfg_write(sd, VDAC_CONFIG_HD_V2);
                 return ret;
         } else if ((height == 1080) &&
-                (venc->pdata->venc_type == VPBE_VERSION_2)) {
+                (venc->venc_type == VPBE_VERSION_2)) {
                 /* TBD setup internal 1080i mode here */
                 ret = venc_set_1080i30_internal(sd);
                 /* for DM365 VPBE, there is DAC inside */
@@ -556,7 +571,7 @@ static int venc_device_get(struct device *dev, void *data)
         struct platform_device *pdev = to_platform_device(dev);
         struct venc_state **venc = data;
 
-        if (strcmp(MODULE_NAME, pdev->name) == 0)
+        if (strstr(pdev->name, "vpbe-venc") != NULL)
                 *venc = platform_get_drvdata(pdev);
 
         return 0;
@@ -593,6 +608,7 @@ EXPORT_SYMBOL(venc_sub_dev_init);
 
 static int venc_probe(struct platform_device *pdev)
 {
+        const struct platform_device_id *pdev_id;
         struct venc_state *venc;
         struct resource *res;
         int ret;
@@ -601,6 +617,12 @@ static int venc_probe(struct platform_device *pdev)
         if (venc == NULL)
                 return -ENOMEM;
 
+        pdev_id = platform_get_device_id(pdev);
+        if (!pdev_id) {
+                ret = -EINVAL;
+                goto free_mem;
+        }
+        venc->venc_type = pdev_id->driver_data;
         venc->pdev = &pdev->dev;
         venc->pdata = pdev->dev.platform_data;
         if (NULL == venc->pdata) {
@@ -630,7 +652,7 @@ static int venc_probe(struct platform_device *pdev)
                 goto release_venc_mem_region;
         }
 
-        if (venc->pdata->venc_type != VPBE_VERSION_1) {
+        if (venc->venc_type != VPBE_VERSION_1) {
                 res = platform_get_resource(pdev, IORESOURCE_MEM, 1);
                 if (!res) {
                         dev_err(venc->pdev,
@@ -681,7 +703,7 @@ static int venc_remove(struct platform_device *pdev)
         res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
         iounmap((void *)venc->venc_base);
         release_mem_region(res->start, resource_size(res));
-        if (venc->pdata->venc_type != VPBE_VERSION_1) {
+        if (venc->venc_type != VPBE_VERSION_1) {
                 res = platform_get_resource(pdev, IORESOURCE_MEM, 1);
                 iounmap((void *)venc->vdaccfg_reg);
                 release_mem_region(res->start, resource_size(res));
@@ -698,6 +720,7 @@ static struct platform_driver venc_driver = {
                 .name   = MODULE_NAME,
                 .owner  = THIS_MODULE,
         },
+        .id_table       = vpbe_venc_devtype
 };
 
 module_platform_driver(venc_driver);
diff --git a/drivers/media/platform/davinci/vpfe_capture.c b/drivers/media/platform/davinci/vpfe_capture.c
index be9d3e1b4868..28d019da4c01 100644
--- a/drivers/media/platform/davinci/vpfe_capture.c
+++ b/drivers/media/platform/davinci/vpfe_capture.c
@@ -560,10 +560,7 @@ static void vpfe_schedule_bottom_field(struct vpfe_device *vpfe_dev)
 
 static void vpfe_process_buffer_complete(struct vpfe_device *vpfe_dev)
 {
-        struct timeval timevalue;
-
-        do_gettimeofday(&timevalue);
-        vpfe_dev->cur_frm->ts = timevalue;
+        v4l2_get_timestamp(&vpfe_dev->cur_frm->ts);
         vpfe_dev->cur_frm->state = VIDEOBUF_DONE;
         vpfe_dev->cur_frm->size = vpfe_dev->fmt.fmt.pix.sizeimage;
         wake_up_interruptible(&vpfe_dev->cur_frm->done);
diff --git a/drivers/media/platform/davinci/vpif_capture.c b/drivers/media/platform/davinci/vpif_capture.c
index a409ccefb380..5892d2bc8eee 100644
--- a/drivers/media/platform/davinci/vpif_capture.c
+++ b/drivers/media/platform/davinci/vpif_capture.c
@@ -411,7 +411,7 @@ static struct vb2_ops video_qops = {
  */
 static void vpif_process_buffer_complete(struct common_obj *common)
 {
-        do_gettimeofday(&common->cur_frm->vb.v4l2_buf.timestamp);
+        v4l2_get_timestamp(&common->cur_frm->vb.v4l2_buf.timestamp);
         vb2_buffer_done(&common->cur_frm->vb,
                                             VB2_BUF_STATE_DONE);
         /* Make curFrm pointing to nextFrm */
diff --git a/drivers/media/platform/davinci/vpif_display.c b/drivers/media/platform/davinci/vpif_display.c
index 9f2b603be9c9..dd249c96126d 100644
--- a/drivers/media/platform/davinci/vpif_display.c
+++ b/drivers/media/platform/davinci/vpif_display.c
@@ -402,7 +402,7 @@ static void process_interlaced_mode(int fid, struct common_obj *common)
                 /* one frame is displayed If next frame is
                  *  available, release cur_frm and move on */
                 /* Copy frame display time */
-                do_gettimeofday(&common->cur_frm->vb.v4l2_buf.timestamp);
+                v4l2_get_timestamp(&common->cur_frm->vb.v4l2_buf.timestamp);
                 /* Change status of the cur_frm */
                 vb2_buffer_done(&common->cur_frm->vb,
                                             VB2_BUF_STATE_DONE);
@@ -462,8 +462,8 @@ static irqreturn_t vpif_channel_isr(int irq, void *dev_id)
                         if (!channel_first_int[i][channel_id]) {
                                 /* Mark status of the cur_frm to
                                  * done and unlock semaphore on it */
-                                do_gettimeofday(&common->cur_frm->vb.
-                                                v4l2_buf.timestamp);
+                                v4l2_get_timestamp(&common->cur_frm->vb.
+                                                   v4l2_buf.timestamp);
                                 vb2_buffer_done(&common->cur_frm->vb,
                                             VB2_BUF_STATE_DONE);
                                 /* Make cur_frm pointing to next_frm */
diff --git a/drivers/media/platform/davinci/vpss.c b/drivers/media/platform/davinci/vpss.c
index 684e815a81b6..a19c552232d1 100644
--- a/drivers/media/platform/davinci/vpss.c
+++ b/drivers/media/platform/davinci/vpss.c
@@ -50,13 +50,29 @@ MODULE_AUTHOR("Texas Instruments");
 /* VENCINT - vpss_int8 */
 #define DM355_VPSSBL_EVTSEL_DEFAULT     0x4
 
-#define DM365_ISP5_PCCR                 0x04
+#define DM365_ISP5_PCCR                         0x04
+#define DM365_ISP5_PCCR_BL_CLK_ENABLE           BIT(0)
+#define DM365_ISP5_PCCR_ISIF_CLK_ENABLE         BIT(1)
+#define DM365_ISP5_PCCR_H3A_CLK_ENABLE          BIT(2)
+#define DM365_ISP5_PCCR_RSZ_CLK_ENABLE          BIT(3)
+#define DM365_ISP5_PCCR_IPIPE_CLK_ENABLE        BIT(4)
+#define DM365_ISP5_PCCR_IPIPEIF_CLK_ENABLE      BIT(5)
+#define DM365_ISP5_PCCR_RSV                     BIT(6)
+
+#define DM365_ISP5_BCR                  0x08
+#define DM365_ISP5_BCR_ISIF_OUT_ENABLE  BIT(1)
+
 #define DM365_ISP5_INTSEL1              0x10
 #define DM365_ISP5_INTSEL2              0x14
 #define DM365_ISP5_INTSEL3              0x18
 #define DM365_ISP5_CCDCMUX              0x20
 #define DM365_ISP5_PG_FRAME_SIZE        0x28
 #define DM365_VPBE_CLK_CTRL             0x00
+
+#define VPSS_CLK_CTRL                   0x01c40044
+#define VPSS_CLK_CTRL_VENCCLKEN         BIT(3)
+#define VPSS_CLK_CTRL_DACCLKEN          BIT(4)
+
 /*
  * vpss interrupts. VDINT0 - vpss_int0, VDINT1 - vpss_int1,
  * AF - vpss_int3
@@ -94,12 +110,19 @@ struct vpss_hw_ops {
         void (*select_ccdc_source)(enum vpss_ccdc_source_sel src_sel);
         /* clear wbl overflow bit */
         int (*clear_wbl_overflow)(enum vpss_wbl_sel wbl_sel);
+        /* set sync polarity */
+        void (*set_sync_pol)(struct vpss_sync_pol);
+        /* set the PG_FRAME_SIZE register*/
+        void (*set_pg_frame_size)(struct vpss_pg_frame_size);
+        /* check and clear interrupt if occured */
+        int (*dma_complete_interrupt)(void);
 };
 
 /* vpss configuration */
 struct vpss_oper_config {
         __iomem void *vpss_regs_base0;
         __iomem void *vpss_regs_base1;
+        resource_size_t *vpss_regs_base2;
         enum vpss_platform_type platform;
         spinlock_t vpss_lock;
         struct vpss_hw_ops hw_ops;
@@ -157,6 +180,14 @@ static void dm355_select_ccdc_source(enum vpss_ccdc_source_sel src_sel)
         bl_regw(src_sel << VPSS_HSSISEL_SHIFT, DM355_VPSSBL_CCDCMUX);
 }
 
+int vpss_dma_complete_interrupt(void)
+{
+        if (!oper_cfg.hw_ops.dma_complete_interrupt)
+                return 2;
+        return oper_cfg.hw_ops.dma_complete_interrupt();
+}
+EXPORT_SYMBOL(vpss_dma_complete_interrupt);
+
 int vpss_select_ccdc_source(enum vpss_ccdc_source_sel src_sel)
 {
         if (!oper_cfg.hw_ops.select_ccdc_source)
@@ -182,6 +213,15 @@ static int dm644x_clear_wbl_overflow(enum vpss_wbl_sel wbl_sel)
         return 0;
 }
 
+void vpss_set_sync_pol(struct vpss_sync_pol sync)
+{
+        if (!oper_cfg.hw_ops.set_sync_pol)
+                return;
+
+        oper_cfg.hw_ops.set_sync_pol(sync);
+}
+EXPORT_SYMBOL(vpss_set_sync_pol);
+
 int vpss_clear_wbl_overflow(enum vpss_wbl_sel wbl_sel)
 {
         if (!oper_cfg.hw_ops.clear_wbl_overflow)
@@ -347,6 +387,15 @@ void dm365_vpss_set_sync_pol(struct vpss_sync_pol sync)
 }
 EXPORT_SYMBOL(dm365_vpss_set_sync_pol);
 
+void vpss_set_pg_frame_size(struct vpss_pg_frame_size frame_size)
+{
+        if (!oper_cfg.hw_ops.set_pg_frame_size)
+                return;
+
+        oper_cfg.hw_ops.set_pg_frame_size(frame_size);
+}
+EXPORT_SYMBOL(vpss_set_pg_frame_size);
+
 void dm365_vpss_set_pg_frame_size(struct vpss_pg_frame_size frame_size)
 {
         int current_reg = ((frame_size.hlpfr >> 1) - 1) << 16;
@@ -425,6 +474,16 @@ static int vpss_probe(struct platform_device *pdev)
                 oper_cfg.hw_ops.enable_clock = dm365_enable_clock;
                 oper_cfg.hw_ops.select_ccdc_source = dm365_select_ccdc_source;
                 /* Setup vpss interrupts */
+                isp5_write((isp5_read(DM365_ISP5_PCCR) |
+                                      DM365_ISP5_PCCR_BL_CLK_ENABLE |
+                                      DM365_ISP5_PCCR_ISIF_CLK_ENABLE |
+                                      DM365_ISP5_PCCR_H3A_CLK_ENABLE |
+                                      DM365_ISP5_PCCR_RSZ_CLK_ENABLE |
+                                      DM365_ISP5_PCCR_IPIPE_CLK_ENABLE |
+                                      DM365_ISP5_PCCR_IPIPEIF_CLK_ENABLE |
+                                      DM365_ISP5_PCCR_RSV), DM365_ISP5_PCCR);
+                isp5_write((isp5_read(DM365_ISP5_BCR) |
+                            DM365_ISP5_BCR_ISIF_OUT_ENABLE), DM365_ISP5_BCR);
                 isp5_write(DM365_ISP5_INTSEL1_DEFAULT, DM365_ISP5_INTSEL1);
                 isp5_write(DM365_ISP5_INTSEL2_DEFAULT, DM365_ISP5_INTSEL2);
                 isp5_write(DM365_ISP5_INTSEL3_DEFAULT, DM365_ISP5_INTSEL3);
@@ -470,11 +529,20 @@ static struct platform_driver vpss_driver = {
 
 static void vpss_exit(void)
 {
+        iounmap(oper_cfg.vpss_regs_base2);
+        release_mem_region(VPSS_CLK_CTRL, 4);
         platform_driver_unregister(&vpss_driver);
 }
 
 static int __init vpss_init(void)
 {
+        if (!request_mem_region(VPSS_CLK_CTRL, 4, "vpss_clock_control"))
+                return -EBUSY;
+
+        oper_cfg.vpss_regs_base2 = ioremap(VPSS_CLK_CTRL, 4);
+        writel(VPSS_CLK_CTRL_VENCCLKEN |
+                     VPSS_CLK_CTRL_DACCLKEN, oper_cfg.vpss_regs_base2);
+
         return platform_driver_register(&vpss_driver);
 }
 subsys_initcall(vpss_init);