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

* 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (144 commits)
  [media] saa7134.h: Suppress compiler warnings when CONFIG_VIDEO_SAA7134_RC is not set
  [media] it913x [VER 1.07] Support for single ITE 9135 devices
  [media] Support for Terratec G1
  [media] cx25821: off by one in cx25821_vidioc_s_input()
  [media] media: tea5764: reconcile Kconfig symbol and macro
  [media] omap_vout: Add poll() support
  [media] omap3isp: preview: Add crop support on the sink pad
  [media] omap3isp: preview: Rename min/max input/output sizes defines
  [media] omap3isp: preview: Remove horizontal averager support
  [media] omap3isp: Report the ISP revision through the media controller API
  [media] omap3isp: ccdc: remove redundant operation
  [media] omap3isp: Fix memory leaks in initialization error paths
  [media] omap3isp: Add missing mutex_destroy() calls
  [media] omap3isp: Move *_init_entities() functions to the init/cleanup section
  [media] omap3isp: Move media_entity_cleanup() from unregister() to cleanup()
  [media] MFC: Change MFC firmware binary name
  [media] vb2: add vb2_get_unmapped_area in vb2 core
  [media] v4l: Add v4l2 subdev driver for S5K6AAFX sensor
  [media] v4l: Add AUTO option for the V4L2_CID_POWER_LINE_FREQUENCY control
  [media] media: ov6650: stylistic improvements
  ...

1 files changed, 42 insertions, 29 deletions

diff --git a/drivers/media/video/mx1_camera.c b/drivers/media/video/mx1_camera.c
index 087db12a3a67..18e94c7d2be8 100644
--- a/drivers/media/video/mx1_camera.c
+++ b/drivers/media/video/mx1_camera.c
@@ -78,11 +78,10 @@
 #define CSI_IRQ_MASK    (CSISR_SFF_OR_INT | CSISR_RFF_OR_INT | \
                         CSISR_STATFF_INT | CSISR_RXFF_INT | CSISR_SOF_INT)
 
-#define CSI_BUS_FLAGS   (SOCAM_MASTER | SOCAM_HSYNC_ACTIVE_HIGH | \
-                        SOCAM_VSYNC_ACTIVE_HIGH | SOCAM_VSYNC_ACTIVE_LOW | \
-                        SOCAM_PCLK_SAMPLE_RISING | SOCAM_PCLK_SAMPLE_FALLING | \
-                        SOCAM_DATA_ACTIVE_HIGH | SOCAM_DATA_ACTIVE_LOW | \
-                        SOCAM_DATAWIDTH_8)
+#define CSI_BUS_FLAGS   (V4L2_MBUS_MASTER | V4L2_MBUS_HSYNC_ACTIVE_HIGH | \
+                        V4L2_MBUS_VSYNC_ACTIVE_HIGH | V4L2_MBUS_VSYNC_ACTIVE_LOW | \
+                        V4L2_MBUS_PCLK_SAMPLE_RISING | V4L2_MBUS_PCLK_SAMPLE_FALLING | \
+                        V4L2_MBUS_DATA_ACTIVE_HIGH | V4L2_MBUS_DATA_ACTIVE_LOW)
 
 #define MAX_VIDEO_MEM 16        /* Video memory limit in megabytes */
 
@@ -490,59 +489,73 @@ static int mx1_camera_set_crop(struct soc_camera_device *icd,
 
 static int mx1_camera_set_bus_param(struct soc_camera_device *icd, __u32 pixfmt)
 {
+        struct v4l2_subdev *sd = soc_camera_to_subdev(icd);
         struct soc_camera_host *ici = to_soc_camera_host(icd->parent);
         struct mx1_camera_dev *pcdev = ici->priv;
-        unsigned long camera_flags, common_flags;
+        struct v4l2_mbus_config cfg = {.type = V4L2_MBUS_PARALLEL,};
+        unsigned long common_flags;
         unsigned int csicr1;
         int ret;
 
-        camera_flags = icd->ops->query_bus_param(icd);
-
         /* MX1 supports only 8bit buswidth */
-        common_flags = soc_camera_bus_param_compatible(camera_flags,
-                                                       CSI_BUS_FLAGS);
-        if (!common_flags)
-                return -EINVAL;
+        ret = v4l2_subdev_call(sd, video, g_mbus_config, &cfg);
+        if (!ret) {
+                common_flags = soc_mbus_config_compatible(&cfg, CSI_BUS_FLAGS);
+                if (!common_flags) {
+                        dev_warn(icd->parent,
+                                 "Flags incompatible: camera 0x%x, host 0x%x\n",
+                                 cfg.flags, CSI_BUS_FLAGS);
+                        return -EINVAL;
+                }
+        } else if (ret != -ENOIOCTLCMD) {
+                return ret;
+        } else {
+                common_flags = CSI_BUS_FLAGS;
+        }
 
         /* Make choises, based on platform choice */
-        if ((common_flags & SOCAM_VSYNC_ACTIVE_HIGH) &&
-                (common_flags & SOCAM_VSYNC_ACTIVE_LOW)) {
+        if ((common_flags & V4L2_MBUS_VSYNC_ACTIVE_HIGH) &&
+                (common_flags & V4L2_MBUS_VSYNC_ACTIVE_LOW)) {
                         if (!pcdev->pdata ||
                              pcdev->pdata->flags & MX1_CAMERA_VSYNC_HIGH)
-                                common_flags &= ~SOCAM_VSYNC_ACTIVE_LOW;
+                                common_flags &= ~V4L2_MBUS_VSYNC_ACTIVE_LOW;
                         else
-                                common_flags &= ~SOCAM_VSYNC_ACTIVE_HIGH;
+                                common_flags &= ~V4L2_MBUS_VSYNC_ACTIVE_HIGH;
         }
 
-        if ((common_flags & SOCAM_PCLK_SAMPLE_RISING) &&
-                (common_flags & SOCAM_PCLK_SAMPLE_FALLING)) {
+        if ((common_flags & V4L2_MBUS_PCLK_SAMPLE_RISING) &&
+                (common_flags & V4L2_MBUS_PCLK_SAMPLE_FALLING)) {
                         if (!pcdev->pdata ||
                              pcdev->pdata->flags & MX1_CAMERA_PCLK_RISING)
-                                common_flags &= ~SOCAM_PCLK_SAMPLE_FALLING;
+                                common_flags &= ~V4L2_MBUS_PCLK_SAMPLE_FALLING;
                         else
-                                common_flags &= ~SOCAM_PCLK_SAMPLE_RISING;
+                                common_flags &= ~V4L2_MBUS_PCLK_SAMPLE_RISING;
         }
 
-        if ((common_flags & SOCAM_DATA_ACTIVE_HIGH) &&
-                (common_flags & SOCAM_DATA_ACTIVE_LOW)) {
+        if ((common_flags & V4L2_MBUS_DATA_ACTIVE_HIGH) &&
+                (common_flags & V4L2_MBUS_DATA_ACTIVE_LOW)) {
                         if (!pcdev->pdata ||
                              pcdev->pdata->flags & MX1_CAMERA_DATA_HIGH)
-                                common_flags &= ~SOCAM_DATA_ACTIVE_LOW;
+                                common_flags &= ~V4L2_MBUS_DATA_ACTIVE_LOW;
                         else
-                                common_flags &= ~SOCAM_DATA_ACTIVE_HIGH;
+                                common_flags &= ~V4L2_MBUS_DATA_ACTIVE_HIGH;
         }
 
-        ret = icd->ops->set_bus_param(icd, common_flags);
-        if (ret < 0)
+        cfg.flags = common_flags;
+        ret = v4l2_subdev_call(sd, video, s_mbus_config, &cfg);
+        if (ret < 0 && ret != -ENOIOCTLCMD) {
+                dev_dbg(icd->parent, "camera s_mbus_config(0x%lx) returned %d\n",
+                        common_flags, ret);
                 return ret;
+        }
 
         csicr1 = __raw_readl(pcdev->base + CSICR1);
 
-        if (common_flags & SOCAM_PCLK_SAMPLE_RISING)
+        if (common_flags & V4L2_MBUS_PCLK_SAMPLE_RISING)
                 csicr1 |= CSICR1_REDGE;
-        if (common_flags & SOCAM_VSYNC_ACTIVE_HIGH)
+        if (common_flags & V4L2_MBUS_VSYNC_ACTIVE_HIGH)
                 csicr1 |= CSICR1_SOF_POL;
-        if (common_flags & SOCAM_DATA_ACTIVE_LOW)
+        if (common_flags & V4L2_MBUS_DATA_ACTIVE_LOW)
                 csicr1 |= CSICR1_DATA_POL;
 
         __raw_writel(csicr1, pcdev->base + CSICR1);