Merge branch 'topic/exynos' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab...

Pull exynos media updates from Mauro Carvalho Chehab:
 "These are the remaining patches I have for the merge windows.  It
  basically adds a new sensor and adds the needed DT bits for it to
  work"

* 'topic/exynos' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media:
  [media] s5p-fimc: Remove reference to outdated macro
  [media] s5p-jpeg: Fix broken indentation in jpeg-regs.h
  [media] exynos4-is: Add the FIMC-IS ISP capture DMA driver
  [media] exynos4-is: Add support for asynchronous subdevices registration
  [media] exynos4-is: Add clock provider for the SCLK_CAM clock outputs
  [media] exynos4-is: Use external s5k6a3 sensor driver
  [media] V4L: s5c73m3: Add device tree support
  [media] V4L: Add driver for s5k6a3 image sensor
  [media] Documentation: devicetree: Update Samsung FIMC DT binding
  [media] Documentation: dt: Add binding documentation for S5C73M3 camera
  [media] Documentation: dt: Add binding documentation for S5K6A3 image sensor

diff --cc drivers/media/i2c/Kconfig
Simple merge

diff --cc drivers/media/platform/exynos4-is/fimc-is.c
index 9bdfa45,c289d5a..128b73b
--- 1/drivers/media/platform/exynos4-is/fimc-is.c
--- 2/drivers/media/platform/exynos4-is/fimc-is.c
+++ b/drivers/media/platform/exynos4-is/fimc-is.c
@@@ -167,11 -168,19 +168,19 @@@ static int fimc_is_parse_sensor_config(
        u32 tmp = 0;
        int ret;
  
-       np = of_graph_get_next_endpoint(np, NULL);
-       if (!np)
+       sensor->drvdata = fimc_is_sensor_get_drvdata(node);
+       if (!sensor->drvdata) {
+               dev_err(&is->pdev->dev, "no driver data found for: %s\n",
+                                                        node->full_name);
+               return -EINVAL;
+       }
+ 
 -      node = v4l2_of_get_next_endpoint(node, NULL);
++      node = of_graph_get_next_endpoint(node, NULL);
+       if (!node)
                return -ENXIO;
-       np = of_graph_get_remote_port(np);
-       if (!np)
+ 
 -      node = v4l2_of_get_remote_port(node);
++      node = of_graph_get_remote_port(node);
+       if (!node)
                return -ENXIO;
  
        /* Use MIPI-CSIS channel id to determine the ISP I2C bus index. */

diff --cc drivers/media/platform/exynos4-is/media-dev.c
Simple merge