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 V4L2 API updates needed by embedded devices
 - DVB API extensions for ATSC-MH delivery system, used in US for mobile
   TV
 - new tuners for fc0011/0012/0013 and tua9001
 - a new dvb driver for af9033/9035
 - a new ATSC-MH frontend (lg2160)
 - new remote controller keymaps
 - Removal of a few legacy webcam driver that got replaced by gspca on
   several kernel versions ago
 - a new driver for Exynos 4/5 webcams(s5pp fimc-lite)
 - a new webcam sensor driver (smiapp)
 - a new video input driver for embedded (sta2x1xx)
 - several improvements, fixes, cleanups, etc inside the drivers.

Manually fix up conflicts due to err() -> dev_err() conversion in
drivers/staging/media/easycap/easycap_main.c

* 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (484 commits)
  [media] saa7134-cards: Remove a PCI entry added by mistake
  [media] radio-sf16fmi: add support for SF16-FMD
  [media] rc-loopback: remove duplicate line
  [media] patch for Asus My Cinema PS3-100 (1043:48cd)
  [media] au0828: Move the Kconfig knob under V4L_USB_DRIVERS
  [media] em28xx: simple comment fix
  [media] [resend] radio-sf16fmr2: add PnP support for SF16-FMD2
  [media] smiapp: Use v4l2_ctrl_new_int_menu() instead of v4l2_ctrl_new_custom()
  [media] smiapp: Add support for 8-bit uncompressed formats
  [media] smiapp: Allow generic quirk registers
  [media] smiapp: Use non-binning limits if the binning limit is zero
  [media] smiapp: Initialise rval in smiapp_read_nvm()
  [media] smiapp: Round minimum pre_pll up rather than down in ip_clk_freq check
  [media] smiapp: Use 8-bit reads only before identifying the sensor
  [media] smiapp: Quirk for sensors that only do 8-bit reads
  [media] smiapp: Pass struct sensor to register writing commands instead of i2c_client
  [media] smiapp: Allow using external clock from the clock framework
  [media] zl10353: change .read_snr() to report SNR as a 0.1 dB
  [media] media: add support to gspca/pac7302.c for 093a:2627 (Genius FaceCam 300)
  [media] m88rs2000 - only flip bit 2 on reg 0x70 on 16th try
  ...

1 files changed, 1 insertions, 23 deletions

diff --git a/drivers/media/video/omap3isp/ispccp2.c b/drivers/media/video/omap3isp/ispccp2.c
index 70ddbf35b223..85f0de85f37c 100644
--- a/drivers/media/video/omap3isp/ispccp2.c
+++ b/drivers/media/video/omap3isp/ispccp2.c
@@ -161,7 +161,6 @@ static void ccp2_pwr_cfg(struct isp_ccp2_device *ccp2)
 static void ccp2_if_enable(struct isp_ccp2_device *ccp2, u8 enable)
 {
         struct isp_device *isp = to_isp_device(ccp2);
-        struct isp_pipeline *pipe = to_isp_pipeline(&ccp2->subdev.entity);
         int i;
 
         if (enable && ccp2->vdds_csib)
@@ -178,19 +177,6 @@ static void ccp2_if_enable(struct isp_ccp2_device *ccp2, u8 enable)
                         ISPCCP2_CTRL_MODE | ISPCCP2_CTRL_IF_EN,
                         enable ? (ISPCCP2_CTRL_MODE | ISPCCP2_CTRL_IF_EN) : 0);
 
-        /* For frame count propagation */
-        if (pipe->do_propagation) {
-                /* We may want the Frame Start IRQ from LC0 */
-                if (enable)
-                        isp_reg_set(isp, OMAP3_ISP_IOMEM_CCP2,
-                                    ISPCCP2_LC01_IRQENABLE,
-                                    ISPCCP2_LC01_IRQSTATUS_LC0_FS_IRQ);
-                else
-                        isp_reg_clr(isp, OMAP3_ISP_IOMEM_CCP2,
-                                    ISPCCP2_LC01_IRQENABLE,
-                                    ISPCCP2_LC01_IRQSTATUS_LC0_FS_IRQ);
-        }
-
         if (!enable && ccp2->vdds_csib)
                 regulator_disable(ccp2->vdds_csib);
 }
@@ -350,7 +336,6 @@ static void ccp2_lcx_config(struct isp_ccp2_device *ccp2,
               ISPCCP2_LC01_IRQSTATUS_LC0_CRC_IRQ |
               ISPCCP2_LC01_IRQSTATUS_LC0_FSP_IRQ |
               ISPCCP2_LC01_IRQSTATUS_LC0_FW_IRQ |
-              ISPCCP2_LC01_IRQSTATUS_LC0_FS_IRQ |
               ISPCCP2_LC01_IRQSTATUS_LC0_FSC_IRQ |
               ISPCCP2_LC01_IRQSTATUS_LC0_SSC_IRQ;
 
@@ -613,14 +598,6 @@ void omap3isp_ccp2_isr(struct isp_ccp2_device *ccp2)
         if (omap3isp_module_sync_is_stopping(&ccp2->wait, &ccp2->stopping))
                 return;
 
-        /* Frame number propagation */
-        if (lcx_irqstatus & ISPCCP2_LC01_IRQSTATUS_LC0_FS_IRQ) {
-                struct isp_pipeline *pipe =
-                        to_isp_pipeline(&ccp2->subdev.entity);
-                if (pipe->do_propagation)
-                        atomic_inc(&pipe->frame_number);
-        }
-
         /* Handle queued buffers on frame end interrupts */
         if (lcm_irqstatus & ISPCCP2_LCM_IRQSTATUS_EOF_IRQ)
                 ccp2_isr_buffer(ccp2);
@@ -1021,6 +998,7 @@ static int ccp2_link_setup(struct media_entity *entity,
 /* media operations */
 static const struct media_entity_operations ccp2_media_ops = {
         .link_setup = ccp2_link_setup,
+        .link_validate = v4l2_subdev_link_validate,
 };
 
 /*