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

Pull media updates from Mauro Carvalho Chehab:
 "This series contains:
   - Exynos s5p-mfc driver got support for VP8 encoder
   - Some SoC drivers gained support for asynchronous registration
     (needed for DT)
   - The RC subsystem gained support for RC activity LED;
   - New drivers added: a video decoder(adv7842), a video encoder
     (adv7511), a new GSPCA driver (stk1135) and support for Renesas
     R-Car (vsp1)
   - the first SDR kernel driver: mirics msi3101.  Due to some troubles
     with the driver, and because the API is still under discussion, it
     will be merged at staging for 3.12.  Need to rework on it
   - usual new boards additions, fixes, cleanups and driver
     improvements"

* 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (242 commits)
  [media] cx88: Fix regression: CX88_AUDIO_WM8775 can't be 0
  [media] exynos4-is: Fix entity unregistration on error path
  [media] exynos-gsc: Register v4l2 device
  [media] exynos4-is: Fix fimc-lite bayer formats
  [media] em28xx: fix assignment of the eeprom data
  [media] hdpvr: fix iteration over uninitialized lists in hdpvr_probe()
  [media] usbtv: Throw corrupted frames away
  [media] usbtv: Fix deinterlacing
  [media] v4l2: added missing mutex.h include to v4l2-ctrls.h
  [media] DocBook: upgrade media_api DocBook version to 4.2
  [media] ml86v7667: fix compile warning: 'ret' set but not used
  [media] s5p-g2d: Fix registration failure
  [media] media: coda: Fix DT driver data pointer for i.MX27
  [media] s5p-mfc: Fix input/output format reporting
  [media] v4l: vsp1: Fix mutex double lock at streamon time
  [media] v4l: vsp1: Add support for RT clock
  [media] v4l: vsp1: Initialize media device bus_info field
  [media] davinci: vpif_capture: fix error return code in vpif_probe()
  [media] davinci: vpif_display: fix error return code in vpif_probe()
  [media] MAINTAINERS: add entries for adv7511 and adv7842
  ...

diff --cc MAINTAINERS
Simple merge

diff --cc arch/arm/mach-shmobile/board-bockw.c
index 3354a85c90f7091c776ab248df641d9dddb3990d,7d44f66ab004635811fdf44f402f0b63ecee4d7e..24f26ee97f4264a3e42f9e769c56ed7c82b7a12e
--- 1/arch/arm/mach-shmobile/board-bockw.c
--- 2/arch/arm/mach-shmobile/board-bockw.c
+++ b/arch/arm/mach-shmobile/board-bockw.c
@@@ -167,13 -188,17 +188,23 @@@ static const struct pinctrl_map bockw_p
                                  "usb1", "usb1"),
        /* SDHI0 */
        PIN_MAP_MUX_GROUP_DEFAULT("sh_mobile_sdhi.0", "pfc-r8a7778",
 -                                "sdhi0", "sdhi0"),
 +                                "sdhi0_data4", "sdhi0"),
 +      PIN_MAP_MUX_GROUP_DEFAULT("sh_mobile_sdhi.0", "pfc-r8a7778",
 +                                "sdhi0_ctrl", "sdhi0"),
 +      PIN_MAP_MUX_GROUP_DEFAULT("sh_mobile_sdhi.0", "pfc-r8a7778",
 +                                "sdhi0_cd", "sdhi0"),
 +      PIN_MAP_MUX_GROUP_DEFAULT("sh_mobile_sdhi.0", "pfc-r8a7778",
 +                                "sdhi0_wp", "sdhi0"),
+       /* VIN0 */
+       PIN_MAP_MUX_GROUP_DEFAULT("r8a7778-vin.0", "pfc-r8a7778",
+                                 "vin0_clk", "vin0"),
+       PIN_MAP_MUX_GROUP_DEFAULT("r8a7778-vin.0", "pfc-r8a7778",
+                                 "vin0_data8", "vin0"),
+       /* VIN1 */
+       PIN_MAP_MUX_GROUP_DEFAULT("r8a7778-vin.1", "pfc-r8a7778",
+                                 "vin1_clk", "vin1"),
+       PIN_MAP_MUX_GROUP_DEFAULT("r8a7778-vin.1", "pfc-r8a7778",
+                                 "vin1_data8", "vin1"),
  };
  
  #define FPGA  0x18200000

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

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

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

diff --cc drivers/media/platform/s5p-mfc/s5p_mfc_dec.c
index 4f6dd42c9adb06755eebbc520ba57124f77a5e35,5c764f9e8a1af3138010aa09f7c192230f8af6ad..8faf9691712dd8febd2c06abecd5e8b2cff29068
--- 1/drivers/media/platform/s5p-mfc/s5p_mfc_dec.c
--- 2/drivers/media/platform/s5p-mfc/s5p_mfc_dec.c
+++ b/drivers/media/platform/s5p-mfc/s5p_mfc_dec.c
@@@ -386,7 -386,11 +386,7 @@@ static int vidioc_try_fmt(struct file *
                        mfc_err("Unknown codec\n");
                        return -EINVAL;
                }
-               if (!IS_MFCV6(dev)) {
 -              if (!IS_MFCV6_PLUS(dev) && (fmt->fourcc == V4L2_PIX_FMT_VP8)) {
 -                      mfc_err("Not supported format.\n");
 -                      return -EINVAL;
 -              }
+               if (!IS_MFCV6_PLUS(dev)) {
                        if (fmt->fourcc == V4L2_PIX_FMT_VP8) {
                                mfc_err("Not supported format.\n");
                                return -EINVAL;

diff --cc drivers/media/v4l2-core/v4l2-dev.c
Simple merge