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

Pull media update from Mauro Carvalho Chehab:

 - OF documentation and patches at core and drivers, to be used by for
   embedded media systems

 - some I2C drivers used on go7007 were rewritten/promoted from staging:
   sony-btf-mpx, tw2804, tw9903, tw9906, wis-ov7640, wis-uda1342

 - add fimc-is driver (Exynos)

 - add a new radio driver: radio-si476x

 - add a two new tuners: r820t and tuner_it913x

 - split camera code on em28xx driver and add more models

 - the cypress firmware load is used outside dvb usb drivers.  So, move
   it to a common directory to make easier to re-use it

 - siano media driver updated to work with sms2270 devices

 - several work done in order to promote go7007 and solo6x1x out of
   staging (still, there are some pending issues)

 - several API compliance fixes at v4l2 drivers that don't behave as
   expected

 - as usual, lots of driver fixes, improvements, cleanups and new device
   addition at the existing drivers.

* 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (831 commits)
  [media] cx88: make core less verbose
  [media] em28xx: fix oops at em28xx_dvb_bus_ctrl()
  [media] s5c73m3: fix indentation of the help section in Kconfig
  [media] cx25821-alsa: get rid of a __must_check warning
  [media] cx25821-video: declare cx25821_vidioc_s_std as static
  [media] cx25821-video: remove maxw from cx25821_vidioc_try_fmt_vid_cap
  [media] r820t: Remove a warning for an unused value
  [media] dib0090: Fix a warning at dib0090_set_EFUSE
  [media] dib8000: fix a warning
  [media] dib8000: Fix sub-channel range
  [media] dib8000: store dtv_property_cache in a temp var
  [media] dib8000: warning fix: declare internal functions as static
  [media] r820t: quiet gcc warning on n_ring
  [media] r820t: memory leak in release()
  [media] r820t: precendence bug in r820t_xtal_check()
  [media] videodev2.h: Remove the unused old V4L1 buffer types
  [media] anysee: Grammar s/report the/report to/
  [media] anysee: Initialize ret = 0 in anysee_frontend_attach()
  [media] media: videobuf2: fix the length check for mmap
  [media] em28xx: save isoc endpoint number for DVB only if endpoint has alt settings with xMaxPacketSize != 0
  ...

18 files changed, 183 insertions, 313 deletions

diff --git a/drivers/media/platform/davinci/Kconfig b/drivers/media/platform/davinci/Kconfig
index ccfde4eb626a..afb3aec1320e 100644
--- a/drivers/media/platform/davinci/Kconfig
+++ b/drivers/media/platform/davinci/Kconfig
@@ -1,79 +1,47 @@
 config VIDEO_DAVINCI_VPIF_DISPLAY
-        tristate "DM646x/DA850/OMAPL138 EVM Video Display"
-        depends on VIDEO_DEV && (MACH_DAVINCI_DM6467_EVM || MACH_DAVINCI_DA850_EVM)
+        tristate "TI DaVinci VPIF V4L2-Display driver"
+        depends on VIDEO_DEV && ARCH_DAVINCI
         select VIDEOBUF2_DMA_CONTIG
-        select VIDEO_DAVINCI_VPIF
         select VIDEO_ADV7343 if MEDIA_SUBDRV_AUTOSELECT
         select VIDEO_THS7303 if MEDIA_SUBDRV_AUTOSELECT
         help
           Enables Davinci VPIF module used for display devices.
-          This module is common for following DM6467/DA850/OMAPL138
-          based display devices.
+          This module is used for display on TI DM6467/DA850/OMAPL138
+          SoCs.
 
-          To compile this driver as a module, choose M here: the
-          module will be called vpif_display.
+          To compile this driver as a module, choose M here. There will
+          be two modules called vpif.ko and vpif_display.ko
 
 config VIDEO_DAVINCI_VPIF_CAPTURE
-        tristate "DM646x/DA850/OMAPL138 EVM Video Capture"
-        depends on VIDEO_DEV && (MACH_DAVINCI_DM6467_EVM || MACH_DAVINCI_DA850_EVM)
+        tristate "TI DaVinci VPIF video capture driver"
+        depends on VIDEO_DEV && ARCH_DAVINCI
         select VIDEOBUF2_DMA_CONTIG
-        select VIDEO_DAVINCI_VPIF
         help
-          Enables Davinci VPIF module used for captur devices.
-          This module is common for following DM6467/DA850/OMAPL138
-          based capture devices.
+          Enables Davinci VPIF module used for capture devices.
+          This module is used for capture on TI DM6467/DA850/OMAPL138
+          SoCs.
 
-          To compile this driver as a module, choose M here: the
-          module will be called vpif_capture.
+          To compile this driver as a module, choose M here. There will
+          be two modules called vpif.ko and vpif_capture.ko
 
-config VIDEO_DAVINCI_VPIF
-        tristate "DaVinci VPIF Driver"
-        depends on VIDEO_DAVINCI_VPIF_DISPLAY || VIDEO_DAVINCI_VPIF_CAPTURE
-        help
-          Support for DaVinci VPIF Driver.
-
-          To compile this driver as a module, choose M here: the
-          module will be called vpif.
-
-config VIDEO_VPSS_SYSTEM
-        tristate "VPSS System module driver"
-        depends on ARCH_DAVINCI
-        help
-          Support for vpss system module for video driver
-
-config VIDEO_VPFE_CAPTURE
-        tristate "VPFE Video Capture Driver"
+config VIDEO_DM6446_CCDC
+        tristate "TI DM6446 CCDC video capture driver"
         depends on VIDEO_V4L2 && (ARCH_DAVINCI || ARCH_OMAP3)
-        depends on I2C
         select VIDEOBUF_DMA_CONTIG
         help
-          Support for DMx/AMx VPFE based frame grabber. This is the
-          common V4L2 module for following DMx/AMx SoCs from Texas
-          Instruments:- DM6446, DM365, DM355 & AM3517/05.
-
-          To compile this driver as a module, choose M here: the
-          module will be called vpfe-capture.
-
-config VIDEO_DM6446_CCDC
-        tristate "DM6446 CCDC HW module"
-        depends on VIDEO_VPFE_CAPTURE
-        select VIDEO_VPSS_SYSTEM
-        default y
-        help
            Enables DaVinci CCD hw module. DaVinci CCDC hw interfaces
            with decoder modules such as TVP5146 over BT656 or
            sensor module such as MT9T001 over a raw interface. This
            module configures the interface and CCDC/ISIF to do
            video frame capture from slave decoders.
 
-           To compile this driver as a module, choose M here: the
-           module will be called vpfe.
+           To compile this driver as a module, choose M here. There will
+           be three modules called vpfe_capture.ko, vpss.ko and dm644x_ccdc.ko
 
 config VIDEO_DM355_CCDC
-        tristate "DM355 CCDC HW module"
-        depends on ARCH_DAVINCI_DM355 && VIDEO_VPFE_CAPTURE
-        select VIDEO_VPSS_SYSTEM
-        default y
+        tristate "TI DM355 CCDC video capture driver"
+        depends on VIDEO_V4L2 && ARCH_DAVINCI
+        select VIDEOBUF_DMA_CONTIG
         help
            Enables DM355 CCD hw module. DM355 CCDC hw interfaces
            with decoder modules such as TVP5146 over BT656 or
@@ -81,31 +49,30 @@ config VIDEO_DM355_CCDC
            module configures the interface and CCDC/ISIF to do
            video frame capture from a slave decoders
 
-           To compile this driver as a module, choose M here: the
-           module will be called vpfe.
+           To compile this driver as a module, choose M here. There will
+           be three modules called vpfe_capture.ko, vpss.ko and dm355_ccdc.ko
 
-config VIDEO_ISIF
-        tristate "ISIF HW module"
-        depends on ARCH_DAVINCI_DM365 && VIDEO_VPFE_CAPTURE
-        select VIDEO_VPSS_SYSTEM
-        default y
+config VIDEO_DM365_ISIF
+        tristate "TI DM365 ISIF video capture driver"
+        depends on VIDEO_V4L2 && ARCH_DAVINCI
+        select VIDEOBUF_DMA_CONTIG
         help
            Enables ISIF hw module. This is the hardware module for
-           configuring ISIF in VPFE to capture Raw Bayer RGB data  from
+           configuring ISIF in VPFE to capture Raw Bayer RGB data from
            a image sensor or YUV data from a YUV source.
 
-           To compile this driver as a module, choose M here: the
-           module will be called vpfe.
+           To compile this driver as a module, choose M here. There will
+           be three modules called vpfe_capture.ko, vpss.ko and isif.ko
 
 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
+        tristate "TI DaVinci VPBE V4L2-Display driver"
+        depends on ARCH_DAVINCI
         select VIDEOBUF2_DMA_CONTIG
         help
             Enables Davinci VPBE module used for display devices.
-            This module is common for following DM644x/DM365/DM355
+            This module is used for display on TI DM644x/DM365/DM355
             based display devices.
 
-            To compile this driver as a module, choose M here: the
-            module will be called vpbe.
+            To compile this driver as a module, choose M here. There will
+            be five modules created called vpss.ko, vpbe.ko, vpbe_osd.ko,
+            vpbe_venc.ko and vpbe_display.ko
diff --git a/drivers/media/platform/davinci/Makefile b/drivers/media/platform/davinci/Makefile
index f40f5219ca50..d74d9eeb0e9e 100644
--- a/drivers/media/platform/davinci/Makefile
+++ b/drivers/media/platform/davinci/Makefile
@@ -2,19 +2,14 @@
 # Makefile for the davinci video device drivers.
 #
 
-# VPIF
-obj-$(CONFIG_VIDEO_DAVINCI_VPIF) += vpif.o
-
 #VPIF Display driver
-obj-$(CONFIG_VIDEO_DAVINCI_VPIF_DISPLAY) += vpif_display.o
+obj-$(CONFIG_VIDEO_DAVINCI_VPIF_DISPLAY) += vpif.o vpif_display.o
 #VPIF Capture driver
-obj-$(CONFIG_VIDEO_DAVINCI_VPIF_CAPTURE) += vpif_capture.o
+obj-$(CONFIG_VIDEO_DAVINCI_VPIF_CAPTURE) += vpif.o vpif_capture.o
 
 # Capture: DM6446 and DM355
-obj-$(CONFIG_VIDEO_VPSS_SYSTEM) += vpss.o
-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_DAVINCI_VPBE_DISPLAY) += vpbe.o vpbe_osd.o \
+obj-$(CONFIG_VIDEO_DM6446_CCDC) += vpfe_capture.o vpss.o dm644x_ccdc.o
+obj-$(CONFIG_VIDEO_DM355_CCDC) += vpfe_capture.o vpss.o dm355_ccdc.o
+obj-$(CONFIG_VIDEO_DM365_ISIF) += vpfe_capture.o vpss.o isif.o
+obj-$(CONFIG_VIDEO_DAVINCI_VPBE_DISPLAY) += vpss.o 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 4277e4ad810c..05f8fb7f7b70 100644
--- a/drivers/media/platform/davinci/dm355_ccdc.c
+++ b/drivers/media/platform/davinci/dm355_ccdc.c
@@ -37,7 +37,6 @@
 #include <linux/platform_device.h>
 #include <linux/uaccess.h>
 #include <linux/videodev2.h>
-#include <linux/clk.h>
 #include <linux/err.h>
 #include <linux/module.h>
 
@@ -59,10 +58,6 @@ static struct ccdc_oper_config {
         struct ccdc_params_raw bayer;
         /* YCbCr configuration */
         struct ccdc_params_ycbcr ycbcr;
-        /* Master clock */
-        struct clk *mclk;
-        /* slave clock */
-        struct clk *sclk;
         /* ccdc base address */
         void __iomem *base_addr;
 } ccdc_cfg = {
@@ -85,7 +80,7 @@ static struct ccdc_oper_config {
                         .mfilt1 = CCDC_NO_MEDIAN_FILTER1,
                         .mfilt2 = CCDC_NO_MEDIAN_FILTER2,
                         .alaw = {
-                                .gama_wd = 2,
+                                .gamma_wd = 2,
                         },
                         .blk_clamp = {
                                 .sample_pixel = 1,
@@ -303,8 +298,8 @@ static int validate_ccdc_param(struct ccdc_config_params_raw *ccdcparam)
         }
 
         if (ccdcparam->alaw.enable) {
-                if (ccdcparam->alaw.gama_wd < CCDC_GAMMA_BITS_13_4 ||
-                    ccdcparam->alaw.gama_wd > CCDC_GAMMA_BITS_09_0) {
+                if (ccdcparam->alaw.gamma_wd < CCDC_GAMMA_BITS_13_4 ||
+                    ccdcparam->alaw.gamma_wd > CCDC_GAMMA_BITS_09_0) {
                         dev_dbg(ccdc_cfg.dev, "Invalid value of ALAW\n");
                         return -EINVAL;
                 }
@@ -680,8 +675,8 @@ static int ccdc_config_raw(void)
         /* Enable and configure aLaw register if needed */
         if (config_params->alaw.enable) {
                 val |= (CCDC_ALAW_ENABLE |
-                        ((config_params->alaw.gama_wd &
-                        CCDC_ALAW_GAMA_WD_MASK) <<
+                        ((config_params->alaw.gamma_wd &
+                        CCDC_ALAW_GAMMA_WD_MASK) <<
                         CCDC_GAMMAWD_INPUT_SHIFT));
         }
 
@@ -997,32 +992,10 @@ static int dm355_ccdc_probe(struct platform_device *pdev)
                 goto fail_nomem;
         }
 
-        /* Get and enable Master clock */
-        ccdc_cfg.mclk = clk_get(&pdev->dev, "master");
-        if (IS_ERR(ccdc_cfg.mclk)) {
-                status = PTR_ERR(ccdc_cfg.mclk);
-                goto fail_nomap;
-        }
-        if (clk_prepare_enable(ccdc_cfg.mclk)) {
-                status = -ENODEV;
-                goto fail_mclk;
-        }
-
-        /* Get and enable Slave clock */
-        ccdc_cfg.sclk = clk_get(&pdev->dev, "slave");
-        if (IS_ERR(ccdc_cfg.sclk)) {
-                status = PTR_ERR(ccdc_cfg.sclk);
-                goto fail_mclk;
-        }
-        if (clk_prepare_enable(ccdc_cfg.sclk)) {
-                status = -ENODEV;
-                goto fail_sclk;
-        }
-
         /* Platform data holds setup_pinmux function ptr */
         if (NULL == pdev->dev.platform_data) {
                 status = -ENODEV;
-                goto fail_sclk;
+                goto fail_nomap;
         }
         setup_pinmux = pdev->dev.platform_data;
         /*
@@ -1033,12 +1006,6 @@ static int dm355_ccdc_probe(struct platform_device *pdev)
         ccdc_cfg.dev = &pdev->dev;
         printk(KERN_NOTICE "%s is registered with vpfe.\n", ccdc_hw_dev.name);
         return 0;
-fail_sclk:
-        clk_disable_unprepare(ccdc_cfg.sclk);
-        clk_put(ccdc_cfg.sclk);
-fail_mclk:
-        clk_disable_unprepare(ccdc_cfg.mclk);
-        clk_put(ccdc_cfg.mclk);
 fail_nomap:
         iounmap(ccdc_cfg.base_addr);
 fail_nomem:
@@ -1052,10 +1019,6 @@ static int dm355_ccdc_remove(struct platform_device *pdev)
 {
         struct resource *res;
 
-        clk_disable_unprepare(ccdc_cfg.sclk);
-        clk_disable_unprepare(ccdc_cfg.mclk);
-        clk_put(ccdc_cfg.mclk);
-        clk_put(ccdc_cfg.sclk);
         iounmap(ccdc_cfg.base_addr);
         res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
         if (res)
diff --git a/drivers/media/platform/davinci/dm355_ccdc_regs.h b/drivers/media/platform/davinci/dm355_ccdc_regs.h
index d6d2ef0533b5..2e1946e0b99f 100644
--- a/drivers/media/platform/davinci/dm355_ccdc_regs.h
+++ b/drivers/media/platform/davinci/dm355_ccdc_regs.h
@@ -153,7 +153,7 @@
 #define CCDC_VDHDEN_ENABLE                      (1 << 16)
 #define CCDC_LPF_ENABLE                         (1 << 14)
 #define CCDC_ALAW_ENABLE                        1
-#define CCDC_ALAW_GAMA_WD_MASK                  7
+#define CCDC_ALAW_GAMMA_WD_MASK                 7
 #define CCDC_REC656IF_BT656_EN                  3
 
 #define CCDC_FMTCFG_FMTMODE_MASK                3
diff --git a/drivers/media/platform/davinci/dm644x_ccdc.c b/drivers/media/platform/davinci/dm644x_ccdc.c
index 318e80512998..30fa08405d61 100644
--- a/drivers/media/platform/davinci/dm644x_ccdc.c
+++ b/drivers/media/platform/davinci/dm644x_ccdc.c
@@ -38,7 +38,6 @@
 #include <linux/uaccess.h>
 #include <linux/videodev2.h>
 #include <linux/gfp.h>
-#include <linux/clk.h>
 #include <linux/err.h>
 #include <linux/module.h>
 
@@ -60,10 +59,6 @@ static struct ccdc_oper_config {
         struct ccdc_params_raw bayer;
         /* YCbCr configuration */
         struct ccdc_params_ycbcr ycbcr;
-        /* Master clock */
-        struct clk *mclk;
-        /* slave clock */
-        struct clk *sclk;
         /* ccdc base address */
         void __iomem *base_addr;
 } ccdc_cfg = {
@@ -228,9 +223,12 @@ static void ccdc_readregs(void)
 static int validate_ccdc_param(struct ccdc_config_params_raw *ccdcparam)
 {
         if (ccdcparam->alaw.enable) {
-                if ((ccdcparam->alaw.gama_wd > CCDC_GAMMA_BITS_09_0) ||
-                    (ccdcparam->alaw.gama_wd < CCDC_GAMMA_BITS_15_6) ||
-                    (ccdcparam->alaw.gama_wd < ccdcparam->data_sz)) {
+                u8 max_gamma = ccdc_gamma_width_max_bit(ccdcparam->alaw.gamma_wd);
+                u8 max_data = ccdc_data_size_max_bit(ccdcparam->data_sz);
+
+                if ((ccdcparam->alaw.gamma_wd > CCDC_GAMMA_BITS_09_0) ||
+                    (ccdcparam->alaw.gamma_wd < CCDC_GAMMA_BITS_15_6) ||
+                    (max_gamma > max_data)) {
                         dev_dbg(ccdc_cfg.dev, "\nInvalid data line select");
                         return -1;
                 }
@@ -560,8 +558,8 @@ void ccdc_config_raw(void)
 
         /* Enable and configure aLaw register if needed */
         if (config_params->alaw.enable) {
-                val = ((config_params->alaw.gama_wd &
-                      CCDC_ALAW_GAMA_WD_MASK) | CCDC_ALAW_ENABLE);
+                val = ((config_params->alaw.gamma_wd &
+                      CCDC_ALAW_GAMMA_WD_MASK) | CCDC_ALAW_ENABLE);
                 regw(val, CCDC_ALAW);
                 dev_dbg(ccdc_cfg.dev, "\nWriting 0x%x to ALAW...\n", val);
         }
@@ -988,38 +986,9 @@ static int dm644x_ccdc_probe(struct platform_device *pdev)
                 goto fail_nomem;
         }
 
-        /* Get and enable Master clock */
-        ccdc_cfg.mclk = clk_get(&pdev->dev, "master");
-        if (IS_ERR(ccdc_cfg.mclk)) {
-                status = PTR_ERR(ccdc_cfg.mclk);
-                goto fail_nomap;
-        }
-        if (clk_prepare_enable(ccdc_cfg.mclk)) {
-                status = -ENODEV;
-                goto fail_mclk;
-        }
-
-        /* Get and enable Slave clock */
-        ccdc_cfg.sclk = clk_get(&pdev->dev, "slave");
-        if (IS_ERR(ccdc_cfg.sclk)) {
-                status = PTR_ERR(ccdc_cfg.sclk);
-                goto fail_mclk;
-        }
-        if (clk_prepare_enable(ccdc_cfg.sclk)) {
-                status = -ENODEV;
-                goto fail_sclk;
-        }
         ccdc_cfg.dev = &pdev->dev;
         printk(KERN_NOTICE "%s is registered with vpfe.\n", ccdc_hw_dev.name);
         return 0;
-fail_sclk:
-        clk_disable_unprepare(ccdc_cfg.sclk);
-        clk_put(ccdc_cfg.sclk);
-fail_mclk:
-        clk_disable_unprepare(ccdc_cfg.mclk);
-        clk_put(ccdc_cfg.mclk);
-fail_nomap:
-        iounmap(ccdc_cfg.base_addr);
 fail_nomem:
         release_mem_region(res->start, resource_size(res));
 fail_nores:
@@ -1031,10 +1000,6 @@ static int dm644x_ccdc_remove(struct platform_device *pdev)
 {
         struct resource *res;
 
-        clk_disable_unprepare(ccdc_cfg.mclk);
-        clk_disable_unprepare(ccdc_cfg.sclk);
-        clk_put(ccdc_cfg.mclk);
-        clk_put(ccdc_cfg.sclk);
         iounmap(ccdc_cfg.base_addr);
         res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
         if (res)
@@ -1049,18 +1014,12 @@ static int dm644x_ccdc_suspend(struct device *dev)
         ccdc_save_context();
         /* Disable CCDC */
         ccdc_enable(0);
-        /* Disable both master and slave clock */
-        clk_disable_unprepare(ccdc_cfg.mclk);
-        clk_disable_unprepare(ccdc_cfg.sclk);
 
         return 0;
 }
 
 static int dm644x_ccdc_resume(struct device *dev)
 {
-        /* Enable both master and slave clock */
-        clk_prepare_enable(ccdc_cfg.mclk);
-        clk_prepare_enable(ccdc_cfg.sclk);
         /* Restore CCDC context */
         ccdc_restore_context();
 
diff --git a/drivers/media/platform/davinci/dm644x_ccdc_regs.h b/drivers/media/platform/davinci/dm644x_ccdc_regs.h
index 90370e414e2c..2b0aca5383f0 100644
--- a/drivers/media/platform/davinci/dm644x_ccdc_regs.h
+++ b/drivers/media/platform/davinci/dm644x_ccdc_regs.h
@@ -84,7 +84,7 @@
 #define CCDC_VDHDEN_ENABLE                      (1 << 16)
 #define CCDC_LPF_ENABLE                         (1 << 14)
 #define CCDC_ALAW_ENABLE                        (1 << 3)
-#define CCDC_ALAW_GAMA_WD_MASK                  7
+#define CCDC_ALAW_GAMMA_WD_MASK                 7
 #define CCDC_BLK_CLAMP_ENABLE                   (1 << 31)
 #define CCDC_BLK_SGAIN_MASK                     0x1F
 #define CCDC_BLK_ST_PXL_MASK                    0x7FFF
diff --git a/drivers/media/platform/davinci/isif.c b/drivers/media/platform/davinci/isif.c
index 5050f9265f48..3332cca632e5 100644
--- a/drivers/media/platform/davinci/isif.c
+++ b/drivers/media/platform/davinci/isif.c
@@ -32,7 +32,6 @@
 #include <linux/uaccess.h>
 #include <linux/io.h>
 #include <linux/videodev2.h>
-#include <linux/clk.h>
 #include <linux/err.h>
 #include <linux/module.h>
 
@@ -88,8 +87,6 @@ static struct isif_oper_config {
         struct isif_ycbcr_config ycbcr;
         struct isif_params_raw bayer;
         enum isif_data_pack data_pack;
-        /* Master clock */
-        struct clk *mclk;
         /* ISIF base address */
         void __iomem *base_addr;
         /* ISIF Linear Table 0 */
@@ -604,7 +601,7 @@ static int isif_config_raw(void)
         if (module_params->compress.alg == ISIF_ALAW)
                 val |= ISIF_ALAW_ENABLE;
 
-        val |= (params->data_msb << ISIF_ALAW_GAMA_WD_SHIFT);
+        val |= (params->data_msb << ISIF_ALAW_GAMMA_WD_SHIFT);
         regw(val, CGAMMAWD);
 
         /* Configure DPCM compression settings */
@@ -1039,6 +1036,10 @@ static int isif_probe(struct platform_device *pdev)
         void *__iomem addr;
         int status = 0, i;
 
+        /* Platform data holds setup_pinmux function ptr */
+        if (!pdev->dev.platform_data)
+                return -ENODEV;
+
         /*
          * first try to register with vpfe. If not correct platform, then we
          * don't have to iomap
@@ -1047,22 +1048,6 @@ static int isif_probe(struct platform_device *pdev)
         if (status < 0)
                 return status;
 
-        /* Get and enable Master clock */
-        isif_cfg.mclk = clk_get(&pdev->dev, "master");
-        if (IS_ERR(isif_cfg.mclk)) {
-                status = PTR_ERR(isif_cfg.mclk);
-                goto fail_mclk;
-        }
-        if (clk_prepare_enable(isif_cfg.mclk)) {
-                status = -ENODEV;
-                goto fail_mclk;
-        }
-
-        /* Platform data holds setup_pinmux function ptr */
-        if (NULL == pdev->dev.platform_data) {
-                status = -ENODEV;
-                goto fail_mclk;
-        }
         setup_pinmux = pdev->dev.platform_data;
         /*
          * setup Mux configuration for ccdc which may be different for
@@ -1124,9 +1109,6 @@ fail_nobase_res:
                 release_mem_region(res->start, resource_size(res));
                 i--;
         }
-fail_mclk:
-        clk_disable_unprepare(isif_cfg.mclk);
-        clk_put(isif_cfg.mclk);
         vpfe_unregister_ccdc_device(&isif_hw_dev);
         return status;
 }
@@ -1146,8 +1128,6 @@ static int isif_remove(struct platform_device *pdev)
                 i++;
         }
         vpfe_unregister_ccdc_device(&isif_hw_dev);
-        clk_disable_unprepare(isif_cfg.mclk);
-        clk_put(isif_cfg.mclk);
         return 0;
 }
 
diff --git a/drivers/media/platform/davinci/isif_regs.h b/drivers/media/platform/davinci/isif_regs.h
index aa69a463c122..3993aece821b 100644
--- a/drivers/media/platform/davinci/isif_regs.h
+++ b/drivers/media/platform/davinci/isif_regs.h
@@ -203,8 +203,8 @@
 #define ISIF_LPF_MASK                           1
 
 /* GAMMAWD registers */
-#define ISIF_ALAW_GAMA_WD_MASK                  0xF
-#define ISIF_ALAW_GAMA_WD_SHIFT                 1
+#define ISIF_ALAW_GAMMA_WD_MASK                 0xF
+#define ISIF_ALAW_GAMMA_WD_SHIFT                1
 #define ISIF_ALAW_ENABLE                        1
 #define ISIF_GAMMAWD_CFA_SHIFT                  5
 
diff --git a/drivers/media/platform/davinci/vpbe.c b/drivers/media/platform/davinci/vpbe.c
index 4ca0f9a2ad8a..33b9660b7f77 100644
--- a/drivers/media/platform/davinci/vpbe.c
+++ b/drivers/media/platform/davinci/vpbe.c
@@ -344,7 +344,7 @@ static int vpbe_s_dv_timings(struct vpbe_device *vpbe_dev,
                 return -EINVAL;
 
         for (i = 0; i < output->num_modes; i++) {
-                if (output->modes[i].timings_type == VPBE_ENC_CUSTOM_TIMINGS &&
+                if (output->modes[i].timings_type == VPBE_ENC_DV_TIMINGS &&
                     !memcmp(&output->modes[i].dv_timings,
                                 dv_timings, sizeof(*dv_timings)))
                         break;
@@ -385,7 +385,7 @@ static int vpbe_g_dv_timings(struct vpbe_device *vpbe_dev,
                      struct v4l2_dv_timings *dv_timings)
 {
         if (vpbe_dev->current_timings.timings_type &
-          VPBE_ENC_CUSTOM_TIMINGS) {
+          VPBE_ENC_DV_TIMINGS) {
                 *dv_timings = vpbe_dev->current_timings.dv_timings;
                 return 0;
         }
@@ -412,7 +412,7 @@ static int vpbe_enum_dv_timings(struct vpbe_device *vpbe_dev,
                 return -EINVAL;
 
         for (i = 0; i < output->num_modes; i++) {
-                if (output->modes[i].timings_type == VPBE_ENC_CUSTOM_TIMINGS) {
+                if (output->modes[i].timings_type == VPBE_ENC_DV_TIMINGS) {
                         if (j == timings->index)
                                 break;
                         j++;
@@ -431,7 +431,7 @@ static int vpbe_enum_dv_timings(struct vpbe_device *vpbe_dev,
  * Sets the standard if supported by the current encoder. Return the status.
  * 0 - success & -EINVAL on error
  */
-static int vpbe_s_std(struct vpbe_device *vpbe_dev, v4l2_std_id *std_id)
+static int vpbe_s_std(struct vpbe_device *vpbe_dev, v4l2_std_id std_id)
 {
         struct vpbe_config *cfg = vpbe_dev->cfg;
         int out_index = vpbe_dev->current_out_index;
@@ -442,14 +442,14 @@ static int vpbe_s_std(struct vpbe_device *vpbe_dev, v4l2_std_id *std_id)
                 V4L2_OUT_CAP_STD))
                 return -EINVAL;
 
-        ret = vpbe_get_std_info(vpbe_dev, *std_id);
+        ret = vpbe_get_std_info(vpbe_dev, std_id);
         if (ret)
                 return ret;
 
         mutex_lock(&vpbe_dev->lock);
 
         ret = v4l2_subdev_call(vpbe_dev->encoders[sd_index], video,
-                               s_std_output, *std_id);
+                               s_std_output, std_id);
         /* set the lcd controller output for the given mode */
         if (!ret) {
                 struct osd_state *osd_device = vpbe_dev->osd_device;
@@ -513,9 +513,9 @@ static int vpbe_set_mode(struct vpbe_device *vpbe_dev,
                          */
                         if (preset_mode->timings_type & VPBE_ENC_STD)
                                 return vpbe_s_std(vpbe_dev,
-                                                 &preset_mode->std_id);
+                                                 preset_mode->std_id);
                         if (preset_mode->timings_type &
-                                                VPBE_ENC_CUSTOM_TIMINGS) {
+                                                VPBE_ENC_DV_TIMINGS) {
                                 dv_timings =
                                         preset_mode->dv_timings;
                                 return vpbe_s_dv_timings(vpbe_dev, &dv_timings);
diff --git a/drivers/media/platform/davinci/vpbe_display.c b/drivers/media/platform/davinci/vpbe_display.c
index 5e6b0cab514b..1802f11e939f 100644
--- a/drivers/media/platform/davinci/vpbe_display.c
+++ b/drivers/media/platform/davinci/vpbe_display.c
@@ -983,7 +983,7 @@ static int vpbe_display_try_fmt(struct file *file, void *priv,
  * 0 - success & -EINVAL on error
  */
 static int vpbe_display_s_std(struct file *file, void *priv,
-                                v4l2_std_id *std_id)
+                                v4l2_std_id std_id)
 {
         struct vpbe_fh *fh = priv;
         struct vpbe_layer *layer = fh->layer;
@@ -1176,10 +1176,6 @@ vpbe_display_s_dv_timings(struct file *file, void *priv,
                         "Failed to set the dv timings info\n");
                 return -EINVAL;
         }
-        /* set the current norm to zero to be consistent. If STD is used
-         * v4l2 layer will set the norm properly on successful s_std call
-         */
-        layer->video_dev.current_norm = 0;
 
         return 0;
 }
@@ -1202,7 +1198,7 @@ vpbe_display_g_dv_timings(struct file *file, void *priv,
         /* Get the given standard in the encoder */
 
         if (vpbe_dev->current_timings.timings_type &
-                                VPBE_ENC_CUSTOM_TIMINGS) {
+                                VPBE_ENC_DV_TIMINGS) {
                 *dv_timings = vpbe_dev->current_timings.dv_timings;
         } else {
                 return -EINVAL;
@@ -1404,6 +1400,7 @@ static int vpbe_display_reqbufs(struct file *file, void *priv,
         q->ops = &video_qops;
         q->mem_ops = &vb2_dma_contig_memops;
         q->buf_struct_size = sizeof(struct vpbe_disp_buffer);
+        q->timestamp_type = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC;
 
         ret = vb2_queue_init(q);
         if (ret) {
@@ -1600,7 +1597,7 @@ static int vpbe_display_g_register(struct file *file, void *priv,
 }
 
 static int vpbe_display_s_register(struct file *file, void *priv,
-                        struct v4l2_dbg_register *reg)
+                        const struct v4l2_dbg_register *reg)
 {
         return 0;
 }
@@ -1693,12 +1690,8 @@ static int init_vpbe_layer(int i, struct vpbe_display *disp_dev,
         vbd->vfl_dir    = VFL_DIR_TX;
 
         if (disp_dev->vpbe_dev->current_timings.timings_type &
-                        VPBE_ENC_STD) {
+                        VPBE_ENC_STD)
                 vbd->tvnorms = (V4L2_STD_525_60 | V4L2_STD_625_50);
-                vbd->current_norm =
-                        disp_dev->vpbe_dev->current_timings.std_id;
-        } else
-                vbd->current_norm = 0;
 
         snprintf(vbd->name, sizeof(vbd->name),
                         "DaVinci_VPBE Display_DRIVER_V%d.%d.%d",
diff --git a/drivers/media/platform/davinci/vpbe_osd.c b/drivers/media/platform/davinci/vpbe_osd.c
index 12ad17c52ef3..396a51cbede7 100644
--- a/drivers/media/platform/davinci/vpbe_osd.c
+++ b/drivers/media/platform/davinci/vpbe_osd.c
@@ -52,6 +52,9 @@ static struct platform_device_id vpbe_osd_devtype[] = {
                 .name = DM355_VPBE_OSD_SUBDEV_NAME,
                 .driver_data = VPBE_VERSION_3,
         },
+        {
+                /* sentinel */
+        }
 };
 
 MODULE_DEVICE_TABLE(platform, vpbe_osd_devtype);
diff --git a/drivers/media/platform/davinci/vpbe_venc.c b/drivers/media/platform/davinci/vpbe_venc.c
index bdbebd59df98..87eef9be08ed 100644
--- a/drivers/media/platform/davinci/vpbe_venc.c
+++ b/drivers/media/platform/davinci/vpbe_venc.c
@@ -51,6 +51,9 @@ static struct platform_device_id vpbe_venc_devtype[] = {
                 .name = DM355_VPBE_VENC_SUBDEV_NAME,
                 .driver_data = VPBE_VERSION_3,
         },
+        {
+                /* sentinel */
+        }
 };
 
 MODULE_DEVICE_TABLE(platform, vpbe_venc_devtype);
@@ -199,6 +202,25 @@ static void venc_enabledigitaloutput(struct v4l2_subdev *sd, int benable)
         }
 }
 
+static void
+venc_enable_vpss_clock(int venc_type,
+                       enum vpbe_enc_timings_type type,
+                       unsigned int pclock)
+{
+        if (venc_type == VPBE_VERSION_1)
+                return;
+
+        if (venc_type == VPBE_VERSION_2 && (type == VPBE_ENC_STD || (type ==
+            VPBE_ENC_DV_TIMINGS && pclock <= 27000000))) {
+                vpss_enable_clock(VPSS_VENC_CLOCK_SEL, 1);
+                vpss_enable_clock(VPSS_VPBE_CLOCK, 1);
+                return;
+        }
+
+        if (venc_type == VPBE_VERSION_3 && type == VPBE_ENC_STD)
+                vpss_enable_clock(VPSS_VENC_CLOCK_SEL, 0);
+}
+
 #define VDAC_CONFIG_SD_V3       0x0E21A6B6
 #define VDAC_CONFIG_SD_V2       0x081141CF
 /*
@@ -217,6 +239,7 @@ static int venc_set_ntsc(struct v4l2_subdev *sd)
         if (pdata->setup_clock(VPBE_ENC_STD, V4L2_STD_525_60) < 0)
                 return -EINVAL;
 
+        venc_enable_vpss_clock(venc->venc_type, VPBE_ENC_STD, V4L2_STD_525_60);
         venc_enabledigitaloutput(sd, 0);
 
         if (venc->venc_type == VPBE_VERSION_3) {
@@ -262,6 +285,7 @@ static int venc_set_pal(struct v4l2_subdev *sd)
         if (venc->pdata->setup_clock(VPBE_ENC_STD, V4L2_STD_625_50) < 0)
                 return -EINVAL;
 
+        venc_enable_vpss_clock(venc->venc_type, VPBE_ENC_STD, V4L2_STD_625_50);
         venc_enabledigitaloutput(sd, 0);
 
         if (venc->venc_type == VPBE_VERSION_3) {
@@ -313,9 +337,10 @@ static int venc_set_480p59_94(struct v4l2_subdev *sd)
                 return -EINVAL;
 
         /* Setup clock at VPSS & VENC for SD */
-        if (pdata->setup_clock(VPBE_ENC_CUSTOM_TIMINGS, 27000000) < 0)
+        if (pdata->setup_clock(VPBE_ENC_DV_TIMINGS, 27000000) < 0)
                 return -EINVAL;
 
+        venc_enable_vpss_clock(venc->venc_type, VPBE_ENC_DV_TIMINGS, 27000000);
         venc_enabledigitaloutput(sd, 0);
 
         if (venc->venc_type == VPBE_VERSION_2)
@@ -360,9 +385,10 @@ static int venc_set_576p50(struct v4l2_subdev *sd)
             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)
+        if (pdata->setup_clock(VPBE_ENC_DV_TIMINGS, 27000000) < 0)
                 return -EINVAL;
 
+        venc_enable_vpss_clock(venc->venc_type, VPBE_ENC_DV_TIMINGS, 27000000);
         venc_enabledigitaloutput(sd, 0);
 
         if (venc->venc_type == VPBE_VERSION_2)
@@ -400,9 +426,10 @@ static int venc_set_720p60_internal(struct v4l2_subdev *sd)
         struct venc_state *venc = to_state(sd);
         struct venc_platform_data *pdata = venc->pdata;
 
-        if (pdata->setup_clock(VPBE_ENC_CUSTOM_TIMINGS, 74250000) < 0)
+        if (pdata->setup_clock(VPBE_ENC_DV_TIMINGS, 74250000) < 0)
                 return -EINVAL;
 
+        venc_enable_vpss_clock(venc->venc_type, VPBE_ENC_DV_TIMINGS, 74250000);
         venc_enabledigitaloutput(sd, 0);
 
         venc_write(sd, VENC_OSDCLK0, 0);
@@ -428,9 +455,10 @@ static int venc_set_1080i30_internal(struct v4l2_subdev *sd)
         struct venc_state *venc = to_state(sd);
         struct venc_platform_data *pdata = venc->pdata;
 
-        if (pdata->setup_clock(VPBE_ENC_CUSTOM_TIMINGS, 74250000) < 0)
+        if (pdata->setup_clock(VPBE_ENC_DV_TIMINGS, 74250000) < 0)
                 return -EINVAL;
 
+        venc_enable_vpss_clock(venc->venc_type, VPBE_ENC_DV_TIMINGS, 74250000);
         venc_enabledigitaloutput(sd, 0);
 
         venc_write(sd, VENC_OSDCLK0, 0);
diff --git a/drivers/media/platform/davinci/vpfe_capture.c b/drivers/media/platform/davinci/vpfe_capture.c
index 28d019da4c01..8c50d3074866 100644
--- a/drivers/media/platform/davinci/vpfe_capture.c
+++ b/drivers/media/platform/davinci/vpfe_capture.c
@@ -376,7 +376,7 @@ static int vpfe_config_ccdc_image_format(struct vpfe_device *vpfe_dev)
  * values in ccdc
  */
 static int vpfe_config_image_format(struct vpfe_device *vpfe_dev,
-                                    const v4l2_std_id *std_id)
+                                    v4l2_std_id std_id)
 {
         struct vpfe_subdev_info *sdinfo = vpfe_dev->current_subdev;
         struct v4l2_mbus_framefmt mbus_fmt;
@@ -384,7 +384,7 @@ static int vpfe_config_image_format(struct vpfe_device *vpfe_dev,
         int i, ret = 0;
 
         for (i = 0; i < ARRAY_SIZE(vpfe_standards); i++) {
-                if (vpfe_standards[i].std_id & *std_id) {
+                if (vpfe_standards[i].std_id & std_id) {
                         vpfe_dev->std_info.active_pixels =
                                         vpfe_standards[i].width;
                         vpfe_dev->std_info.active_lines =
@@ -461,7 +461,7 @@ static int vpfe_initialize_device(struct vpfe_device *vpfe_dev)
 
         /* Configure the default format information */
         ret = vpfe_config_image_format(vpfe_dev,
-                                &vpfe_standards[vpfe_dev->std_index].std_id);
+                                vpfe_standards[vpfe_dev->std_index].std_id);
         if (ret)
                 return ret;
 
@@ -1107,6 +1107,7 @@ static int vpfe_g_input(struct file *file, void *priv, unsigned int *index)
 static int vpfe_s_input(struct file *file, void *priv, unsigned int index)
 {
         struct vpfe_device *vpfe_dev = video_drvdata(file);
+        struct v4l2_subdev *sd;
         struct vpfe_subdev_info *sdinfo;
         int subdev_index, inp_index;
         struct vpfe_route *route;
@@ -1138,14 +1139,15 @@ static int vpfe_s_input(struct file *file, void *priv, unsigned int index)
         }
 
         sdinfo = &vpfe_dev->cfg->sub_devs[subdev_index];
+        sd = vpfe_dev->sd[subdev_index];
         route = &sdinfo->routes[inp_index];
         if (route && sdinfo->can_route) {
                 input = route->input;
                 output = route->output;
         }
 
-        ret = v4l2_device_call_until_err(&vpfe_dev->v4l2_dev, sdinfo->grp_id,
-                                         video, s_routing, input, output, 0);
+        if (sd)
+                ret = v4l2_subdev_call(sd, video, s_routing, input, output, 0);
 
         if (ret) {
                 v4l2_err(&vpfe_dev->v4l2_dev,
@@ -1154,6 +1156,8 @@ static int vpfe_s_input(struct file *file, void *priv, unsigned int index)
                 goto unlock_out;
         }
         vpfe_dev->current_subdev = sdinfo;
+        if (sd)
+                vpfe_dev->v4l2_dev.ctrl_handler = sd->ctrl_handler;
         vpfe_dev->current_input = index;
         vpfe_dev->std_index = 0;
 
@@ -1164,7 +1168,7 @@ static int vpfe_s_input(struct file *file, void *priv, unsigned int index)
 
         /* set the default image parameters in the device */
         ret = vpfe_config_image_format(vpfe_dev,
-                                &vpfe_standards[vpfe_dev->std_index].std_id);
+                                vpfe_standards[vpfe_dev->std_index].std_id);
 unlock_out:
         mutex_unlock(&vpfe_dev->lock);
         return ret;
@@ -1189,7 +1193,7 @@ static int vpfe_querystd(struct file *file, void *priv, v4l2_std_id *std_id)
         return ret;
 }
 
-static int vpfe_s_std(struct file *file, void *priv, v4l2_std_id *std_id)
+static int vpfe_s_std(struct file *file, void *priv, v4l2_std_id std_id)
 {
         struct vpfe_device *vpfe_dev = video_drvdata(file);
         struct vpfe_subdev_info *sdinfo;
@@ -1211,7 +1215,7 @@ static int vpfe_s_std(struct file *file, void *priv, v4l2_std_id *std_id)
         }
 
         ret = v4l2_device_call_until_err(&vpfe_dev->v4l2_dev, sdinfo->grp_id,
-                                         core, s_std, *std_id);
+                                         core, s_std, std_id);
         if (ret < 0) {
                 v4l2_err(&vpfe_dev->v4l2_dev, "Failed to set standard\n");
                 goto unlock_out;
@@ -1439,41 +1443,6 @@ static int vpfe_dqbuf(struct file *file, void *priv,
                                       buf, file->f_flags & O_NONBLOCK);
 }
 
-static int vpfe_queryctrl(struct file *file, void *priv,
-                struct v4l2_queryctrl *qctrl)
-{
-        struct vpfe_device *vpfe_dev = video_drvdata(file);
-        struct vpfe_subdev_info *sdinfo;
-
-        sdinfo = vpfe_dev->current_subdev;
-
-        return v4l2_device_call_until_err(&vpfe_dev->v4l2_dev, sdinfo->grp_id,
-                                         core, queryctrl, qctrl);
-
-}
-
-static int vpfe_g_ctrl(struct file *file, void *priv, struct v4l2_control *ctrl)
-{
-        struct vpfe_device *vpfe_dev = video_drvdata(file);
-        struct vpfe_subdev_info *sdinfo;
-
-        sdinfo = vpfe_dev->current_subdev;
-
-        return v4l2_device_call_until_err(&vpfe_dev->v4l2_dev, sdinfo->grp_id,
-                                         core, g_ctrl, ctrl);
-}
-
-static int vpfe_s_ctrl(struct file *file, void *priv, struct v4l2_control *ctrl)
-{
-        struct vpfe_device *vpfe_dev = video_drvdata(file);
-        struct vpfe_subdev_info *sdinfo;
-
-        sdinfo = vpfe_dev->current_subdev;
-
-        return v4l2_device_call_until_err(&vpfe_dev->v4l2_dev, sdinfo->grp_id,
-                                         core, s_ctrl, ctrl);
-}
-
 /*
  * vpfe_calculate_offsets : This function calculates buffers offset
  * for top and bottom field
@@ -1717,7 +1686,7 @@ unlock_out:
 
 
 static long vpfe_param_handler(struct file *file, void *priv,
-                bool valid_prio, int cmd, void *param)
+                bool valid_prio, unsigned int cmd, void *param)
 {
         struct vpfe_device *vpfe_dev = video_drvdata(file);
         int ret = 0;
@@ -1781,9 +1750,6 @@ static const struct v4l2_ioctl_ops vpfe_ioctl_ops = {
         .vidioc_querystd         = vpfe_querystd,
         .vidioc_s_std            = vpfe_s_std,
         .vidioc_g_std            = vpfe_g_std,
-        .vidioc_queryctrl        = vpfe_queryctrl,
-        .vidioc_g_ctrl           = vpfe_g_ctrl,
-        .vidioc_s_ctrl           = vpfe_s_ctrl,
         .vidioc_reqbufs          = vpfe_reqbufs,
         .vidioc_querybuf         = vpfe_querybuf,
         .vidioc_qbuf             = vpfe_qbuf,
@@ -1918,7 +1884,6 @@ static int vpfe_probe(struct platform_device *pdev)
         vfd->fops               = &vpfe_fops;
         vfd->ioctl_ops          = &vpfe_ioctl_ops;
         vfd->tvnorms            = 0;
-        vfd->current_norm       = V4L2_STD_PAL;
         vfd->v4l2_dev           = &vpfe_dev->v4l2_dev;
         snprintf(vfd->name, sizeof(vfd->name),
                  "%s_V%d.%d.%d",
@@ -2007,6 +1972,7 @@ static int vpfe_probe(struct platform_device *pdev)
 
         /* set first sub device as current one */
         vpfe_dev->current_subdev = &vpfe_cfg->sub_devs[0];
+        vpfe_dev->v4l2_dev.ctrl_handler = vpfe_dev->sd[0]->ctrl_handler;
 
         /* We have at least one sub device to work with */
         mutex_unlock(&ccdc_lock);
diff --git a/drivers/media/platform/davinci/vpif.c b/drivers/media/platform/davinci/vpif.c
index 28638a86f129..ea82a8bd2803 100644
--- a/drivers/media/platform/davinci/vpif.c
+++ b/drivers/media/platform/davinci/vpif.c
@@ -23,8 +23,8 @@
 #include <linux/spinlock.h>
 #include <linux/kernel.h>
 #include <linux/io.h>
-#include <linux/clk.h>
 #include <linux/err.h>
+#include <linux/pm_runtime.h>
 #include <linux/v4l2-dv-timings.h>
 
 #include <mach/hardware.h>
@@ -44,13 +44,13 @@ static struct resource	*res;
 spinlock_t vpif_lock;
 
 void __iomem *vpif_base;
-struct clk *vpif_clk;
+EXPORT_SYMBOL_GPL(vpif_base);
 
 /**
- * ch_params: video standard configuration parameters for vpif
+ * vpif_ch_params: video standard configuration parameters for vpif
  * The table must include all presets from supported subdevices.
  */
-const struct vpif_channel_config_params ch_params[] = {
+const struct vpif_channel_config_params vpif_ch_params[] = {
         /* HDTV formats */
         {
                 .name = "480p59_94",
@@ -220,8 +220,10 @@ const struct vpif_channel_config_params ch_params[] = {
                 .stdid = V4L2_STD_625_50,
         },
 };
+EXPORT_SYMBOL_GPL(vpif_ch_params);
 
-const unsigned int vpif_ch_params_count = ARRAY_SIZE(ch_params);
+const unsigned int vpif_ch_params_count = ARRAY_SIZE(vpif_ch_params);
+EXPORT_SYMBOL_GPL(vpif_ch_params_count);
 
 static inline void vpif_wr_bit(u32 reg, u32 bit, u32 val)
 {
@@ -439,19 +441,13 @@ static int vpif_probe(struct platform_device *pdev)
                 goto fail;
         }
 
-        vpif_clk = clk_get(&pdev->dev, "vpif");
-        if (IS_ERR(vpif_clk)) {
-                status = PTR_ERR(vpif_clk);
-                goto clk_fail;
-        }
-        clk_prepare_enable(vpif_clk);
+        pm_runtime_enable(&pdev->dev);
+        pm_runtime_get(&pdev->dev);
 
         spin_lock_init(&vpif_lock);
         dev_info(&pdev->dev, "vpif probe success\n");
         return 0;
 
-clk_fail:
-        iounmap(vpif_base);
 fail:
         release_mem_region(res->start, res_len);
         return status;
@@ -459,11 +455,7 @@ fail:
 
 static int vpif_remove(struct platform_device *pdev)
 {
-        if (vpif_clk) {
-                clk_disable_unprepare(vpif_clk);
-                clk_put(vpif_clk);
-        }
-
+        pm_runtime_disable(&pdev->dev);
         iounmap(vpif_base);
         release_mem_region(res->start, res_len);
         return 0;
@@ -472,13 +464,13 @@ static int vpif_remove(struct platform_device *pdev)
 #ifdef CONFIG_PM
 static int vpif_suspend(struct device *dev)
 {
-        clk_disable_unprepare(vpif_clk);
+        pm_runtime_put(dev);
         return 0;
 }
 
 static int vpif_resume(struct device *dev)
 {
-        clk_prepare_enable(vpif_clk);
+        pm_runtime_get(dev);
         return 0;
 }
 
diff --git a/drivers/media/platform/davinci/vpif.h b/drivers/media/platform/davinci/vpif.h
index a1ab6a0f4e9e..9956e6788693 100644
--- a/drivers/media/platform/davinci/vpif.h
+++ b/drivers/media/platform/davinci/vpif.h
@@ -638,7 +638,7 @@ struct vpif_channel_config_params {
 };
 
 extern const unsigned int vpif_ch_params_count;
-extern const struct vpif_channel_config_params ch_params[];
+extern const struct vpif_channel_config_params vpif_ch_params[];
 
 struct vpif_video_params;
 struct vpif_params;
diff --git a/drivers/media/platform/davinci/vpif_capture.c b/drivers/media/platform/davinci/vpif_capture.c
index 5892d2bc8eee..5f98df1fc8a0 100644
--- a/drivers/media/platform/davinci/vpif_capture.c
+++ b/drivers/media/platform/davinci/vpif_capture.c
@@ -563,7 +563,7 @@ static int vpif_update_std_info(struct channel_obj *ch)
         vpif_dbg(2, debug, "vpif_update_std_info\n");
 
         for (index = 0; index < vpif_ch_params_count; index++) {
-                config = &ch_params[index];
+                config = &vpif_ch_params[index];
                 if (config->hd_sd == 0) {
                         vpif_dbg(2, debug, "SD format\n");
                         if (config->stdid & vid_ch->stdid) {
@@ -1035,6 +1035,7 @@ static int vpif_reqbufs(struct file *file, void *priv,
         q->ops = &video_qops;
         q->mem_ops = &vb2_dma_contig_memops;
         q->buf_struct_size = sizeof(struct vpif_cap_buffer);
+        q->timestamp_type = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC;
 
         ret = vb2_queue_init(q);
         if (ret) {
@@ -1394,7 +1395,7 @@ static int vpif_g_std(struct file *file, void *priv, v4l2_std_id *std)
  * @priv: file handle
  * @std_id: ptr to std id
  */
-static int vpif_s_std(struct file *file, void *priv, v4l2_std_id *std_id)
+static int vpif_s_std(struct file *file, void *priv, v4l2_std_id std_id)
 {
         struct vpif_fh *fh = priv;
         struct channel_obj *ch = fh->channel;
@@ -1423,7 +1424,7 @@ static int vpif_s_std(struct file *file, void *priv, v4l2_std_id *std_id)
         fh->initialized = 1;
 
         /* Call encoder subdevice function to set the standard */
-        ch->video.stdid = *std_id;
+        ch->video.stdid = std_id;
         memset(&ch->video.dv_timings, 0, sizeof(ch->video.dv_timings));
 
         /* Get the information about the standard */
@@ -1436,7 +1437,7 @@ static int vpif_s_std(struct file *file, void *priv, v4l2_std_id *std_id)
         vpif_config_format(ch);
 
         /* set standard in the sub device */
-        ret = v4l2_subdev_call(ch->sd, core, s_std, *std_id);
+        ret = v4l2_subdev_call(ch->sd, core, s_std, std_id);
         if (ret && ret != -ENOIOCTLCMD && ret != -ENODEV) {
                 vpif_dbg(1, debug, "Failed to set standard for sub devices\n");
                 return ret;
@@ -1923,7 +1924,8 @@ static int vpif_dbg_g_register(struct file *file, void *priv,
  * Returns zero or -EINVAL if write operations fails.
  */
 static int vpif_dbg_s_register(struct file *file, void *priv,
-                struct v4l2_dbg_register *reg){
+                const struct v4l2_dbg_register *reg)
+{
         struct vpif_fh *fh = priv;
         struct channel_obj *ch = fh->channel;
 
diff --git a/drivers/media/platform/davinci/vpif_display.c b/drivers/media/platform/davinci/vpif_display.c
index dd249c96126d..1b3fb5ca2ad4 100644
--- a/drivers/media/platform/davinci/vpif_display.c
+++ b/drivers/media/platform/davinci/vpif_display.c
@@ -511,7 +511,7 @@ static int vpif_update_std_info(struct channel_obj *ch)
         int i;
 
         for (i = 0; i < vpif_ch_params_count; i++) {
-                config = &ch_params[i];
+                config = &vpif_ch_params[i];
                 if (config->hd_sd == 0) {
                         vpif_dbg(2, debug, "SD format\n");
                         if (config->stdid & vid_ch->stdid) {
@@ -1001,6 +1001,7 @@ static int vpif_reqbufs(struct file *file, void *priv,
         q->ops = &video_qops;
         q->mem_ops = &vb2_dma_contig_memops;
         q->buf_struct_size = sizeof(struct vpif_disp_buffer);
+        q->timestamp_type = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC;
 
         ret = vb2_queue_init(q);
         if (ret) {
@@ -1058,14 +1059,14 @@ static int vpif_qbuf(struct file *file, void *priv, struct v4l2_buffer *buf)
         return vb2_qbuf(&common->buffer_queue, buf);
 }
 
-static int vpif_s_std(struct file *file, void *priv, v4l2_std_id *std_id)
+static int vpif_s_std(struct file *file, void *priv, v4l2_std_id std_id)
 {
         struct vpif_fh *fh = priv;
         struct channel_obj *ch = fh->channel;
         struct common_obj *common = &ch->common[VPIF_VIDEO_INDEX];
         int ret = 0;
 
-        if (!(*std_id & VPIF_V4L2_STD))
+        if (!(std_id & VPIF_V4L2_STD))
                 return -EINVAL;
 
         if (common->started) {
@@ -1074,7 +1075,7 @@ static int vpif_s_std(struct file *file, void *priv, v4l2_std_id *std_id)
         }
 
         /* Call encoder subdevice function to set the standard */
-        ch->video.stdid = *std_id;
+        ch->video.stdid = std_id;
         memset(&ch->video.dv_timings, 0, sizeof(ch->video.dv_timings));
         /* Get the information about the standard */
         if (vpif_update_resolution(ch))
@@ -1092,14 +1093,14 @@ static int vpif_s_std(struct file *file, void *priv, v4l2_std_id *std_id)
         vpif_config_format(ch);
 
         ret = v4l2_device_call_until_err(&vpif_obj.v4l2_dev, 1, video,
-                                                s_std_output, *std_id);
+                                                s_std_output, std_id);
         if (ret < 0) {
                 vpif_err("Failed to set output standard\n");
                 return ret;
         }
 
         ret = v4l2_device_call_until_err(&vpif_obj.v4l2_dev, 1, core,
-                                                        s_std, *std_id);
+                                                        s_std, std_id);
         if (ret < 0)
                 vpif_err("Failed to set standard for sub devices\n");
         return ret;
@@ -1567,7 +1568,8 @@ static int vpif_dbg_g_register(struct file *file, void *priv,
  * Returns zero or -EINVAL if write operations fails.
  */
 static int vpif_dbg_s_register(struct file *file, void *priv,
-                struct v4l2_dbg_register *reg){
+                const struct v4l2_dbg_register *reg)
+{
         struct vpif_fh *fh = priv;
         struct channel_obj *ch = fh->channel;
 
diff --git a/drivers/media/platform/davinci/vpss.c b/drivers/media/platform/davinci/vpss.c
index a19c552232d1..8a2f01e344ee 100644
--- a/drivers/media/platform/davinci/vpss.c
+++ b/drivers/media/platform/davinci/vpss.c
@@ -17,14 +17,11 @@
  *
  * common vpss system module platform driver for all video drivers.
  */
-#include <linux/kernel.h>
-#include <linux/sched.h>
-#include <linux/init.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
-#include <linux/spinlock.h>
-#include <linux/compiler.h>
 #include <linux/io.h>
+#include <linux/pm_runtime.h>
+
 #include <media/davinci/vpss.h>
 
 MODULE_LICENSE("GPL");
@@ -99,7 +96,7 @@ enum vpss_platform_type {
 
 /*
  * vpss operations. Depends on platform. Not all functions are available
- * on all platforms. The api, first check if a functio is available before
+ * on all platforms. The api, first check if a function is available before
  * invoking it. In the probe, the function ptrs are initialized based on
  * vpss name. vpss name can be "dm355_vpss", "dm644x_vpss" etc.
  */
@@ -114,7 +111,7 @@ struct vpss_hw_ops {
         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 */
+        /* check and clear interrupt if occurred */
         int (*dma_complete_interrupt)(void);
 };
 
@@ -233,7 +230,7 @@ EXPORT_SYMBOL(vpss_clear_wbl_overflow);
 
 /*
  *  dm355_enable_clock - Enable VPSS Clock
- *  @clock_sel: CLock to be enabled/disabled
+ *  @clock_sel: Clock to be enabled/disabled
  *  @en: enable/disable flag
  *
  *  This is called to enable or disable a vpss clock
@@ -490,6 +487,10 @@ static int vpss_probe(struct platform_device *pdev)
         } else
                 oper_cfg.hw_ops.clear_wbl_overflow = dm644x_clear_wbl_overflow;
 
+        pm_runtime_enable(&pdev->dev);
+
+        pm_runtime_get(&pdev->dev);
+
         spin_lock_init(&oper_cfg.vpss_lock);
         dev_info(&pdev->dev, "%s vpss probe success\n", platform_name);
         return 0;
@@ -507,6 +508,7 @@ static int vpss_remove(struct platform_device *pdev)
 {
         struct resource         *res;
 
+        pm_runtime_disable(&pdev->dev);
         iounmap(oper_cfg.vpss_regs_base0);
         res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
         release_mem_region(res->start, resource_size(res));
@@ -518,10 +520,28 @@ static int vpss_remove(struct platform_device *pdev)
         return 0;
 }
 
+static int vpss_suspend(struct device *dev)
+{
+        pm_runtime_put(dev);
+        return 0;
+}
+
+static int vpss_resume(struct device *dev)
+{
+        pm_runtime_get(dev);
+        return 0;
+}
+
+static const struct dev_pm_ops vpss_pm_ops = {
+        .suspend = vpss_suspend,
+        .resume = vpss_resume,
+};
+
 static struct platform_driver vpss_driver = {
         .driver = {
                 .name   = "vpss",
                 .owner = THIS_MODULE,
+                .pm = &vpss_pm_ops,
         },
         .remove = vpss_remove,
         .probe = vpss_probe,