Merge tag 'media/v3.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab...

Pull media updates from Mauro Carvalho Chehab:
 - Two new dvb frontend drivers: mn88472 and mn88473
 - A new driver for some PCIe DVBSky cards
 - A new remote controller driver: meson-ir
 - One LIRC staging driver got rewritten and promoted to mainstream:
   igorplugusb
 - A new tuner driver (m88rs6000t)
 - The old omap2 media driver got removed from staging.  This driver
   uses an old DMA API and it is likely broken on recent kernels.
   Nobody cared enough to fix it
 - Media bus format moved to a separate header, as DRM will also use the
   definitions there
 - mem2mem_testdev were renamed to vim2m, in order to use the same
   naming convention taken by the other virtual test driver (vivid)
 - Added a new driver for coda SoC (coda-jpeg)
 - The cx88 driver got converted to use videobuf2 core
 - Make DMABUF export buffer to work with DMA Scatter/Gather and Vmalloc
   cores
 - Lots of other fixes, improvements and cleanups on the drivers.

* tag 'media/v3.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (384 commits)
  [media] mn88473: One function call less in mn88473_init() after error
  [media] mn88473: Remove uneeded check before release_firmware()
  [media] lirc_zilog: Deletion of unnecessary checks before vfree()
  [media] MAINTAINERS: Add myself as img-ir maintainer
  [media] img-ir: Don't set driver's module owner
  [media] img-ir: Depend on METAG or MIPS or COMPILE_TEST
  [media] img-ir/hw: Drop [un]register_decoder declarations
  [media] img-ir/hw: Fix potential deadlock stopping timer
  [media] img-ir/hw: Always read data to clear buffer
  [media] redrat3: ensure dma is setup properly
  [media] ddbridge: remove unneeded check before dvb_unregister_device()
  [media] si2157: One function call less in si2157_init() after error
  [media] tuners: remove uneeded checks before release_firmware()
  [media] arm: omap2: rx51-peripherals: fix build warning
  [media] stv090x: add an extra protetion against buffer overflow
  [media] stv090x: Remove an unreachable code
  [media] stv090x: Some whitespace cleanups
  [media] em28xx: checkpatch cleanup: whitespaces/new lines cleanups
  [media] si2168: add support for firmware files in new format
  [media] si2168: debug printout for firmware version
  ...

diff --cc MAINTAINERS
Simple merge

diff --cc arch/arm/boot/dts/meson.dtsi
index 03bcff87bd27194c43a8d375ae04ae03f69efb2b,6a37f15e8627bcda7b1a3450f8cb72293d2c3975..b67ede515bcdeb9decd615aac0a7b30b0951a30d
--- 1/arch/arm/boot/dts/meson.dtsi
--- 2/arch/arm/boot/dts/meson.dtsi
+++ b/arch/arm/boot/dts/meson.dtsi
@@@ -114,34 -107,11 +114,41 @@@
                        status = "disabled";
                };
  
 +              i2c_AO: i2c@c8100500 {
 +                      compatible = "amlogic,meson6-i2c";
 +                      reg = <0xc8100500 0x20>;
 +                      interrupts = <0 92 1>;
 +                      clocks = <&clk81>;
 +                      #address-cells = <1>;
 +                      #size-cells = <0>;
 +                      status = "disabled";
 +              };
 +
 +              i2c_A: i2c@c1108500 {
 +                      compatible = "amlogic,meson6-i2c";
 +                      reg = <0xc1108500 0x20>;
 +                      interrupts = <0 21 1>;
 +                      clocks = <&clk81>;
 +                      #address-cells = <1>;
 +                      #size-cells = <0>;
 +                      status = "disabled";
 +              };
 +
 +              i2c_B: i2c@c11087c0 {
 +                      compatible = "amlogic,meson6-i2c";
 +                      reg = <0xc11087c0 0x20>;
 +                      interrupts = <0 128 1>;
 +                      clocks = <&clk81>;
 +                      #address-cells = <1>;
 +                      #size-cells = <0>;
 +                      status = "disabled";
 +              };
++
+               ir_receiver: ir-receiver@c8100480 {
+                       compatible= "amlogic,meson6-ir";
+                       reg = <0xc8100480 0x20>;
+                       interrupts = <0 15 1>;
+                       status = "disabled";
+               };
        };
  }; /* end of / */

diff --cc arch/arm/mach-omap2/board-rx51-peripherals.c
index 03502abe4f2efbd82d3140c3cddd0a244275d0ee,2fd63fb98e7dca4644b866e6968146f65e81d6b5..14edcd7a2a1d14c990848bf41c515009bb74bdb5
--- 1/arch/arm/mach-omap2/board-rx51-peripherals.c
--- 2/arch/arm/mach-omap2/board-rx51-peripherals.c
+++ b/arch/arm/mach-omap2/board-rx51-peripherals.c
@@@ -23,7 -23,7 +23,8 @@@
  #include <linux/regulator/machine.h>
  #include <linux/gpio.h>
  #include <linux/gpio_keys.h>
+ #include <linux/gpio/machine.h>
 +#include <linux/omap-gpmc.h>
  #include <linux/mmc/host.h>
  #include <linux/power/isp1704_charger.h>
  #include <linux/platform_data/spi-omap2-mcspi.h>

diff --cc arch/arm/mach-omap2/devices.c
index a7bc4ce81e19e3ebc979c56b158a58afd79b461b,1b623a06cdcdea512bfd6f845e343731df565c3f..1afb50d6d63672887805d4ae3d29962593b14ddb
--- 1/arch/arm/mach-omap2/devices.c
--- 2/arch/arm/mach-omap2/devices.c
+++ b/arch/arm/mach-omap2/devices.c
@@@ -67,28 -67,40 +67,6 @@@ static int __init omap3_l3_init(void
  }
  omap_postcore_initcall(omap3_l3_init);
  
- #if defined(CONFIG_VIDEO_OMAP2) || defined(CONFIG_VIDEO_OMAP2_MODULE)
 -static int __init omap4_l3_init(void)
 -{
 -      int i;
 -      struct omap_hwmod *oh[3];
 -      struct platform_device *pdev;
 -      char oh_name[L3_MODULES_MAX_LEN];
--
- static struct resource omap2cam_resources[] = {
-       {
-               .start          = OMAP24XX_CAMERA_BASE,
-               .end            = OMAP24XX_CAMERA_BASE + 0xfff,
-               .flags          = IORESOURCE_MEM,
-       },
-       {
-               .start          = 24 + OMAP_INTC_START,
-               .flags          = IORESOURCE_IRQ,
 -      /* If dtb is there, the devices will be created dynamically */
 -      if (of_have_populated_dt())
 -              return -ENODEV;
 -
 -      /*
 -       * To avoid code running on other OMAPs in
 -       * multi-omap builds
 -       */
 -      if (!cpu_is_omap44xx() && !soc_is_omap54xx())
 -              return -ENODEV;
 -
 -      for (i = 0; i < L3_MODULES; i++) {
 -              snprintf(oh_name, L3_MODULES_MAX_LEN, "l3_main_%d", i+1);
 -
 -              oh[i] = omap_hwmod_lookup(oh_name);
 -              if (!(oh[i]))
 -                      pr_err("could not look up %s\n", oh_name);
--      }
- };
--
- static struct platform_device omap2cam_device = {
-       .name           = "omap24xxcam",
-       .id             = -1,
-       .num_resources  = ARRAY_SIZE(omap2cam_resources),
-       .resource       = omap2cam_resources,
- };
- #endif
 -      pdev = omap_device_build_ss("omap_l3_noc", 0, oh, 3, NULL, 0);
 -
 -      WARN(IS_ERR(pdev), "could not build omap_device for %s\n", oh_name);
 -
 -      return PTR_RET(pdev);
 -}
 -omap_postcore_initcall(omap4_l3_init);
--
  #if defined(CONFIG_IOMMU_API)
  
  #include <linux/platform_data/iommu-omap.h>

diff --cc arch/arm/mach-shmobile/board-mackerel.c
Simple merge

diff --cc drivers/media/i2c/smiapp/smiapp-core.c
Simple merge

diff --cc drivers/media/pci/cx23885/cx23885-core.c
Simple merge

diff --cc drivers/media/platform/coda/coda-common.c
Simple merge

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

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

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

diff --cc drivers/media/platform/s5p-jpeg/jpeg-core.c
Simple merge

diff --cc drivers/media/platform/s5p-mfc/s5p_mfc.c
Simple merge

diff --cc drivers/media/usb/s2255/s2255drv.c
Simple merge

diff --cc include/uapi/linux/Kbuild
Simple merge