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:
 "This series contain:
   - new i2c video drivers: ml86v7667 (video decoder),
                            ths8200 (video encoder)
   - a new video driver for EasyCap cards based on Fushicai USBTV007
   - Improved support for OF and embedded systems, with V4L2 async
     initialization and a better support for clocks
   - API cleanups on the ioctls used by the v4l2 debug tool
   - Lots of cleanups
   - As usual, several driver improvements and new cards additions
   - Revert two changesets that change the minimal symbol rate for
     stv0399, as request by Manu
   - Update MAINTAINERS and other files to point to my new e-mail"

* 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (378 commits)
  MAINTAINERS & ABI: Update to point to my new email
  [media] stb0899: restore minimal rate to 5Mbauds
  [media] exynos4-is: Correct colorspace handling at FIMC-LITE
  [media] exynos4-is: Set valid initial format on FIMC.n subdevs
  [media] exynos4-is: Set valid initial format on FIMC-IS-ISP subdev pads
  [media] exynos4-is: Fix format propagation on FIMC-IS-ISP subdev
  [media] exynos4-is: Set valid initial format at FIMC-LITE
  [media] exynos4-is: Fix format propagation on FIMC-LITE.n subdevs
  [media] MAINTAINERS: Update S5P/Exynos FIMC driver entry
  [media] Documentation: Update driver's directory in video4linux/fimc.txt
  [media] exynos4-is: Change fimc-is firmware file names
  [media] exynos4-is: Add support for Exynos5250 MIPI-CSIS
  [media] exynos4-is: Add Exynos5250 SoC support to fimc-lite driver
  [media] exynos4-is: Drop drvdata handling in fimc-lite for non-dt platforms
  [media] media: i2c: tvp514x: remove manual setting of subdev name
  [media] media: i2c: tvp7002: remove manual setting of subdev name
  [media] mem2mem: set missing v4l2_dev pointer
  [media] wl128x: add missing struct v4l2_device
  [media] tvp514x: Fix init seqeunce
  [media] saa7134: Fix sparse warnings by adding __user annotation
  ...

6 files changed, 121 insertions, 17 deletions

diff --git a/Documentation/devicetree/bindings/media/exynos-fimc-lite.txt b/Documentation/devicetree/bindings/media/exynos-fimc-lite.txt
index de9f6b78ee51..0bf6fb7fbeab 100644
--- a/Documentation/devicetree/bindings/media/exynos-fimc-lite.txt
+++ b/Documentation/devicetree/bindings/media/exynos-fimc-lite.txt
@@ -2,8 +2,10 @@ Exynos4x12/Exynos5 SoC series camera host interface (FIMC-LITE)
 
 Required properties:
 
-- compatible    : should be "samsung,exynos4212-fimc-lite" for Exynos4212 and
-                  Exynos4412 SoCs;
+- compatible    : should be one of:
+                  "samsung,exynos4212-fimc-lite" for Exynos4212/4412 SoCs,
+                  "samsung,exynos5250-fimc-lite" for Exynos5250 compatible
+                   devices;
 - reg           : physical base address and size of the device memory mapped
                   registers;
 - interrupts    : should contain FIMC-LITE interrupt;
diff --git a/Documentation/devicetree/bindings/media/i2c/mt9p031.txt b/Documentation/devicetree/bindings/media/i2c/mt9p031.txt
new file mode 100644
index 000000000000..cb60443ff78f
--- /dev/null
+++ b/Documentation/devicetree/bindings/media/i2c/mt9p031.txt
@@ -0,0 +1,40 @@
+* Aptina 1/2.5-Inch 5Mp CMOS Digital Image Sensor
+
+The Aptina MT9P031 is a 1/2.5-inch CMOS active pixel digital image sensor with
+an active array size of 2592H x 1944V. It is programmable through a simple
+two-wire serial interface.
+
+Required Properties:
+- compatible: value should be either one among the following
+        (a) "aptina,mt9p031" for mt9p031 sensor
+        (b) "aptina,mt9p031m" for mt9p031m sensor
+
+- input-clock-frequency: Input clock frequency.
+
+- pixel-clock-frequency: Pixel clock frequency.
+
+Optional Properties:
+- reset-gpios: Chip reset GPIO
+
+For further reading on port node refer to
+Documentation/devicetree/bindings/media/video-interfaces.txt.
+
+Example:
+
+        i2c0@1c22000 {
+                ...
+                ...
+                mt9p031@5d {
+                        compatible = "aptina,mt9p031";
+                        reg = <0x5d>;
+                        reset-gpios = <&gpio3 30 0>;
+
+                        port {
+                                mt9p031_1: endpoint {
+                                        input-clock-frequency = <6000000>;
+                                        pixel-clock-frequency = <96000000>;
+                                };
+                        };
+                };
+                ...
+        };
diff --git a/Documentation/devicetree/bindings/media/i2c/tvp514x.txt b/Documentation/devicetree/bindings/media/i2c/tvp514x.txt
new file mode 100644
index 000000000000..46752cc71f2e
--- /dev/null
+++ b/Documentation/devicetree/bindings/media/i2c/tvp514x.txt
@@ -0,0 +1,44 @@
+* Texas Instruments TVP514x video decoder
+
+The TVP5146/TVP5146m2/TVP5147/TVP5147m1 device is high quality, single-chip
+digital video decoder that digitizes and decodes all popular baseband analog
+video formats into digital video component. The tvp514x decoder supports analog-
+to-digital (A/D) conversion of component RGB and YPbPr signals as well as A/D
+conversion and decoding of NTSC, PAL and SECAM composite and S-video into
+component YCbCr.
+
+Required Properties :
+- compatible : value should be either one among the following
+        (a) "ti,tvp5146" for tvp5146 decoder.
+        (b) "ti,tvp5146m2" for tvp5146m2 decoder.
+        (c) "ti,tvp5147" for tvp5147 decoder.
+        (d) "ti,tvp5147m1" for tvp5147m1 decoder.
+
+- hsync-active: HSYNC Polarity configuration for endpoint.
+
+- vsync-active: VSYNC Polarity configuration for endpoint.
+
+- pclk-sample: Clock polarity of the endpoint.
+
+For further reading on port node refer to Documentation/devicetree/bindings/
+media/video-interfaces.txt.
+
+Example:
+
+        i2c0@1c22000 {
+                ...
+                ...
+                tvp514x@5c {
+                        compatible = "ti,tvp5146";
+                        reg = <0x5c>;
+
+                        port {
+                                tvp514x_1: endpoint {
+                                        hsync-active = <1>;
+                                        vsync-active = <1>;
+                                        pclk-sample = <0>;
+                                };
+                        };
+                };
+                ...
+        };
diff --git a/Documentation/devicetree/bindings/media/samsung-fimc.txt b/Documentation/devicetree/bindings/media/samsung-fimc.txt
index 51c776b7f7a3..96312f6c4c26 100644
--- a/Documentation/devicetree/bindings/media/samsung-fimc.txt
+++ b/Documentation/devicetree/bindings/media/samsung-fimc.txt
@@ -127,22 +127,22 @@ Example:
                                 };
                         };
                 };
-        };
 
-        /* MIPI CSI-2 bus IF sensor */
-        s5c73m3: sensor@0x1a {
-                compatible = "samsung,s5c73m3";
-                reg = <0x1a>;
-                vddio-supply = <...>;
+                /* MIPI CSI-2 bus IF sensor */
+                s5c73m3: sensor@0x1a {
+                        compatible = "samsung,s5c73m3";
+                        reg = <0x1a>;
+                        vddio-supply = <...>;
 
-                clock-frequency = <24000000>;
-                clocks = <...>;
-                clock-names = "mclk";
+                        clock-frequency = <24000000>;
+                        clocks = <...>;
+                        clock-names = "mclk";
 
-                port {
-                        s5c73m3_1: endpoint {
-                                data-lanes = <1 2 3 4>;
-                                remote-endpoint = <&csis0_ep>;
+                        port {
+                                s5c73m3_1: endpoint {
+                                        data-lanes = <1 2 3 4>;
+                                        remote-endpoint = <&csis0_ep>;
+                                };
                         };
                 };
         };
diff --git a/Documentation/devicetree/bindings/media/samsung-mipi-csis.txt b/Documentation/devicetree/bindings/media/samsung-mipi-csis.txt
index 5f8e28e2484f..be45f0b1a449 100644
--- a/Documentation/devicetree/bindings/media/samsung-mipi-csis.txt
+++ b/Documentation/devicetree/bindings/media/samsung-mipi-csis.txt
@@ -5,8 +5,8 @@ Required properties:
 
 - compatible      : "samsung,s5pv210-csis" for S5PV210 (S5PC110),
                     "samsung,exynos4210-csis" for Exynos4210 (S5PC210),
-                    "samsung,exynos4212-csis" for Exynos4212/Exynos4412
-                    SoC series;
+                    "samsung,exynos4212-csis" for Exynos4212/Exynos4412,
+                    "samsung,exynos5250-csis" for Exynos5250;
 - reg             : offset and length of the register set for the device;
 - interrupts      : should contain MIPI CSIS interrupt; the format of the
                     interrupt specifier depends on the interrupt controller;
diff --git a/Documentation/devicetree/bindings/media/sh_mobile_ceu.txt b/Documentation/devicetree/bindings/media/sh_mobile_ceu.txt
new file mode 100644
index 000000000000..1ce4e46bcbb7
--- /dev/null
+++ b/Documentation/devicetree/bindings/media/sh_mobile_ceu.txt
@@ -0,0 +1,18 @@
+Bindings, specific for the sh_mobile_ceu_camera.c driver:
+ - compatible: Should be "renesas,sh-mobile-ceu"
+ - reg: register base and size
+ - interrupts: the interrupt number
+ - interrupt-parent: the interrupt controller
+ - renesas,max-width: maximum image width, supported on this SoC
+ - renesas,max-height: maximum image height, supported on this SoC
+
+Example:
+
+ceu0: ceu@0xfe910000 {
+        compatible = "renesas,sh-mobile-ceu";
+        reg = <0xfe910000 0xa0>;
+        interrupt-parent = <&intcs>;
+        interrupts = <0x880>;
+        renesas,max-width = <8188>;
+        renesas,max-height = <8188>;
+};