linux/arch/arm/mach-imx
Linus Torvalds 0b8e74c6f4 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:
 "The first part of the media updates for Kernel 3.7.

  This series contain:

   - A major tree renaming patch series: now, drivers are organized
     internally by their used bus, instead of by V4L2 and/or DVB API,
     providing a cleaner driver location for hybrid drivers that
     implement both APIs, and allowing to cleanup the Kconfig items and
     make them more intuitive for the end user;

   - Media Kernel developers are typically very lazy with their duties
     of keeping the MAINTAINERS entries for their drivers updated.  As
     now the tree is more organized, we're doing an effort to add/update
     those entries for the drivers that aren't currently orphan;

   - Several DVB USB drivers got moved to a new DVB USB v2 core; the new
     core fixes several bugs (as the existing one that got bitroted).
     Now, suspend/resume finally started to work fine (at least with
     some devices - we should expect more work with regards to it);

   - added multistream support for DVB-T2, and unified the API for
     DVB-S2 and ISDB-S.  Backward binary support is preserved;

   - as usual, a few new drivers, some V4L2 core improvements and lots
     of drivers improvements and fixes.

  There are some points to notice on this series:

   1) you should expect a trivial merge conflict on your tree, with the
      removal of Documentation/feature-removal-schedule.txt: this series
      would be adding two additional entries there.  I opted to not
      rebase it due to this recent change;

   2) With regards to the PCTV 520e udev-related breakage, I opted to
      fix it in a way that the patches can be backported to 3.5 even
      without your firmware fix patch.  This way, Greg doesn't need to
      rush backporting your patch (as there are still the firmware cache
      and firmware path customization issues to be addressed there).

      I'll send later a patch (likely after the end of the merge window)
      reverting the rest of the DRX-K async firmware request, fully
      restoring its original behaviour to allow media drivers to
      initialize everything serialized as before for 3.7 and upper.

   3) I'm planning to work on this weekend to test the DMABUF patches
      for V4L2.  The patches are on my queue for several Kernel cycles,
      but, up to now, there is/was no way to test the series locally.

      I have some concerns about this particular changeset with regards
      to security issues, and with regards to the replacement of the old
      VIDIOC_OVERLAY ioctl's that is broken on modern systems, due to
      GPU drivers change.  The Overlay API allows direct PCI2PCI
      transfers from a media capture card into the GPU framebuffer, but
      its API is crappy.  Also, the only existing X11 driver that
      implements it requires a XV extension that is not available
      anymore on modern drivers.  The DMABUF can do the same thing, but
      with it is promising to be a properly-designed API.  If I can
      successfully test this series and be happy with it, I should be
      asking you to pull them next week."

* 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (717 commits)
  em28xx: regression fix: use DRX-K sync firmware requests on em28xx
  drxk: allow loading firmware synchrousnously
  em28xx: Make all em28xx extensions to be initialized asynchronously
  [media] tda18271: properly report read errors in tda18271_get_id
  [media] tda18271: delay IR & RF calibration until init() if delay_cal is set
  [media] MAINTAINERS: add Michael Krufky as tda827x maintainer
  [media] MAINTAINERS: add Michael Krufky as tda8290 maintainer
  [media] MAINTAINERS: add Michael Krufky as cxusb maintainer
  [media] MAINTAINERS: add Michael Krufky as lg2160 maintainer
  [media] MAINTAINERS: add Michael Krufky as lgdt3305 maintainer
  [media] MAINTAINERS: add Michael Krufky as mxl111sf maintainer
  [media] MAINTAINERS: add Michael Krufky as mxl5007t maintainer
  [media] MAINTAINERS: add Michael Krufky as tda18271 maintainer
  [media] s5p-tv: Report only multi-plane capabilities in vidioc_querycap
  [media] s5p-mfc: Fix misplaced return statement in s5p_mfc_suspend()
  [media] exynos-gsc: Add missing static storage class specifiers
  [media] exynos-gsc: Remove <linux/version.h> header file inclusion
  [media] s5p-fimc: Fix incorrect condition in fimc_lite_reqbufs()
  [media] s5p-tv: Fix potential NULL pointer dereference error
  [media] s5k6aa: Fix possible NULL pointer dereference
  ...
2012-10-07 17:49:05 +09:00
..
include/mach dmaengine: imx-dma: merge old dma-v1.c with imx-dma.c 2012-03-26 11:31:29 +05:30
Kconfig MFD bits for the 3.7 merge window. 2012-10-05 12:01:30 +09:00
Makefile ARM: soc: device tree updates 2012-10-01 18:28:06 -07:00
Makefile.boot ARM: move all dtb targets out of Makefile.boot 2012-09-14 09:22:04 -05:00
clk-busy.c ARM: imx: add common clock support for clk busy 2012-05-02 12:08:26 +02:00
clk-gate2.c ARM i.MX: Add common clock support for 2bit gate 2012-05-02 12:08:13 +02:00
clk-imx1.c ARM i.MX: remove now unnecessary argument from mxc_timer_init 2012-05-16 12:46:09 +02:00
clk-imx6q.c This is the second round of imx-dt patches for 3.7. It's based on 2012-09-20 20:16:27 -07:00
clk-imx21.c ARM i.MX: remove duplicated include from clk-imx21.c 2012-08-28 08:43:32 +02:00
clk-imx25.c ARM i.MX25: Make timer irq work again 2012-09-18 16:46:50 +02:00
clk-imx27.c Linux 3.6-rc3 2012-08-24 11:25:10 -03:00
clk-imx31.c ARM: clk-imx31: Fix the keypad clock name 2012-08-03 16:28:47 +02:00
clk-imx35.c Merge branch 'next/devel-samsung' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/soc 2012-09-21 23:00:41 -07:00
clk-imx51-imx53.c ARM: soc: soc-specific updates 2012-10-01 18:24:44 -07:00
clk-pfd.c ARM: imx: add common clock support for pfd 2012-05-02 12:08:20 +02:00
clk-pllv1.c ARM: i.MX remove last leftovers from legacy clock support 2012-09-12 11:46:51 +02:00
clk-pllv2.c ARM i.MX pllv2: make round_rate accurate 2012-06-04 15:23:47 +02:00
clk-pllv3.c ARM: imx: add common clock support for pllv3 2012-05-02 12:08:06 +02:00
clk.c ARM: i.MX remove last leftovers from legacy clock support 2012-09-12 11:46:51 +02:00
clk.h ARM: i.MX remove last leftovers from legacy clock support 2012-09-12 11:46:51 +02:00
cpu-imx5.c ARM: imx: use machine specific hook for late init 2012-05-08 20:36:16 +08:00
cpu-imx25.c ARM: mx25: Print silicon revision on boot 2011-08-26 08:50:58 +02:00
cpu-imx27.c ARM: mx27: Print silicon revision on boot 2011-08-26 08:50:58 +02:00
cpu-imx31.c ARM: mx31: use generic function for displaying silicon revision 2011-08-26 08:50:59 +02:00
cpu-imx35.c ARM: mx35: use generic function for displaying silicon revision 2011-08-26 08:50:59 +02:00
cpu_op-mx51.c bug.h: add include of it to various implicit C users 2012-02-29 17:15:08 -05:00
cpu_op-mx51.h ARM i.MX: Merge i.MX5 support into mach-imx 2011-11-16 08:37:37 +01:00
crm-regs-imx5.h ARM i.MX53: Fix PLL4 base address 2012-06-04 15:23:57 +02:00
crmregs-imx3.h ARM i.MX3: Make ccm base address a variable 2012-04-25 17:03:45 +02:00
devices-imx1.h ARM: imx: clean up the section marks of extern data 2011-05-19 13:11:11 +02:00
devices-imx21.h ARM: imx: remove unused pdata from device macros 2012-07-06 08:25:20 +02:00
devices-imx25.h ARM: imx: remove unused pdata from device macros 2012-07-06 08:25:20 +02:00
devices-imx27.h [media] i.MX: coda: Add platform support for coda in i.MX27 2012-08-06 08:32:23 -03:00
devices-imx31.h arm-soc: sparse IRQ conversion 2012-07-23 17:36:02 -07:00
devices-imx35.h arm-soc: sparse IRQ conversion 2012-07-23 17:36:02 -07:00
devices-imx50.h ARM i.MX: Merge i.MX5 support into mach-imx 2011-11-16 08:37:37 +01:00
devices-imx51.h ARM: imx: remove unused pdata from device macros 2012-07-06 08:25:20 +02:00
ehci-imx5.c ARM: imx: move platform_data definitions 2012-09-14 11:17:21 +02:00
ehci-imx25.c ARM: imx: move platform_data definitions 2012-09-14 11:17:21 +02:00
ehci-imx27.c ARM: imx: move platform_data definitions 2012-09-14 11:17:21 +02:00
ehci-imx31.c ARM: imx: move platform_data definitions 2012-09-14 11:17:21 +02:00
ehci-imx35.c ARM: imx: move platform_data definitions 2012-09-14 11:17:21 +02:00
eukrea_mbimx27-baseboard.c ARM: imx: eliminate macro IRQ_GPIOx() 2012-07-01 21:57:16 +08:00
eukrea_mbimxsd25-baseboard.c ARM: imx: eukrea_mbimxsd25: use IMX_GPIO_NR 2012-05-08 17:31:25 +02:00
eukrea_mbimxsd35-baseboard.c dma: ipu: remove the use of ipu_platform_data 2012-07-01 21:57:43 +08:00
eukrea_mbimxsd51-baseboard.c ARM: imx: eukrea_mbimxsd rename to eukrea_mbimxsd51 2012-05-08 17:31:25 +02:00
gpc.c arm/imx6q: add core drivers clock, gpc, mmdc and src 2011-10-31 14:26:23 +01:00
headsmp.S ARM: imx: build i.MX6 functions only when needed 2012-08-23 17:26:53 +02:00
hotplug.c ARM: SoC: convert imx6q to SMP operations 2012-09-14 11:15:00 +02:00
imx27-dt.c arm-soc: sparse IRQ conversion 2012-07-23 17:36:02 -07:00
imx31-dt.c ARM i.MX31: Add devicetree support 2012-07-10 19:23:03 +02:00
imx51-dt.c ARM: imx51: decouple device tree boot from board files 2012-09-11 16:26:59 +08:00
iomux-imx31.c ARM: gpio: convert includes of mach/gpio.h and asm/gpio.h to linux/gpio.h 2011-08-08 14:27:41 +01:00
lluart.c ARM: imx6: Add UART2 for low-level debug 2012-05-11 15:17:57 +08:00
mach-apf9328.c ARM: imx: remove unneeded mach/irq.h inclusion 2012-07-01 21:58:41 +08:00
mach-armadillo5x0.c ARM: imx: armadillo5x0: Fix illegal register access 2012-09-18 16:46:24 +02:00
mach-bug.c ARM: restart: mxc: use new restart hook 2012-01-05 12:57:15 +00:00
mach-cpuimx27.c arm-soc: sparse IRQ conversion 2012-07-23 17:36:02 -07:00
mach-cpuimx35.c arm-soc: sparse IRQ conversion 2012-07-23 17:36:02 -07:00
mach-cpuimx51sd.c arm-soc: sparse IRQ conversion 2012-07-23 17:36:02 -07:00
mach-eukrea_cpuimx25.c ARM: imx: remove unused pdata from device macros 2012-07-06 08:25:20 +02:00
mach-imx6q.c MFD bits for the 3.7 merge window. 2012-10-05 12:01:30 +09:00
mach-imx27_visstrim_m10.c [media] i.MX27: Visstrim_M10: Add support for deinterlacing driver 2012-08-06 09:08:00 -03:00
mach-imx27ipcam.c ARM: imx: remove unused pdata from device macros 2012-07-06 08:25:20 +02:00
mach-imx27lite.c ARM: restart: mxc: use new restart hook 2012-01-05 12:57:15 +00:00
mach-imx53.c ARM: imx53: support device tree boot only 2012-09-11 16:26:55 +08:00
mach-kzm_arm11_01.c Merge branch 'cleanup/__iomem' into next/cleanup 2012-09-22 10:24:29 -07:00
mach-mx1ads.c ARM: imx: remove unneeded mach/irq.h inclusion 2012-07-01 21:58:41 +08:00
mach-mx21ads.c Merge branch 'imx/sparse-irq' of git://git.linaro.org/people/shawnguo/linux-2.6 into next/irq 2012-07-02 23:18:19 +02:00
mach-mx25_3ds.c ARM: imx: remove unused pdata from device macros 2012-07-06 08:25:20 +02:00
mach-mx27_3ds.c ARM: mx27pdk: Add audio support 2012-08-03 15:59:29 +02:00
mach-mx27ads.c arm-soc: sparse IRQ conversion 2012-07-23 17:36:02 -07:00
mach-mx31_3ds.c arm-soc: sparse IRQ conversion 2012-07-23 17:36:02 -07:00
mach-mx31ads.c ARM: imx: use __iomem pointers for MMIO 2012-09-19 15:11:53 +02:00
mach-mx31lilly.c ARM: imx: eliminate macro IOMUX_TO_IRQ() 2012-07-01 21:57:06 +08:00
mach-mx31lite.c ARM: imx: use __iomem pointers for MMIO 2012-09-19 15:11:53 +02:00
mach-mx31moboard.c ARM: imx: move platform_data definitions 2012-09-14 11:17:21 +02:00
mach-mx35_3ds.c arm-soc: sparse IRQ conversion 2012-07-23 17:36:02 -07:00
mach-mx50_rdp.c Consolidate i.MX 5 platforms to be under the new shared i.MX 3/5/6 tree. 2012-01-23 14:50:30 -08:00
mach-mx51_3ds.c arm-soc: sparse IRQ conversion 2012-07-23 17:36:02 -07:00
mach-mx51_babbage.c ARM: imx: remove unused pdata from device macros 2012-07-06 08:25:20 +02:00
mach-mxt_td60.c ARM: imx: eliminate macro IRQ_GPIOx() 2012-07-01 21:57:16 +08:00
mach-pca100.c arm-soc: sparse IRQ conversion 2012-07-23 17:36:02 -07:00
mach-pcm037.c arm-soc: sparse IRQ conversion 2012-07-23 17:36:02 -07:00
mach-pcm037_eet.c ARM: imx: use machine specific hook for late init 2012-05-08 20:36:16 +08:00
mach-pcm038.c arm-soc: sparse IRQ conversion 2012-07-23 17:36:02 -07:00
mach-pcm043.c arm-soc: sparse IRQ conversion 2012-07-23 17:36:02 -07:00
mach-qong.c arm-soc: sparse IRQ conversion 2012-07-23 17:36:02 -07:00
mach-scb9328.c ARM: imx: remove unneeded mach/irq.h inclusion 2012-07-01 21:58:41 +08:00
mach-vpr200.c arm-soc: sparse IRQ conversion 2012-07-23 17:36:02 -07:00
mm-imx1.c ARM: imx: remove unneeded mach/irq.h inclusion 2012-07-01 21:58:41 +08:00
mm-imx3.c GPIO changes for v3.6: 2012-07-26 13:56:38 -07:00
mm-imx5.c ARM: imx53: remove unneeded files and functions 2012-09-11 16:26:57 +08:00
mm-imx21.c ARM: imx: remove unneeded mach/irq.h inclusion 2012-07-01 21:58:41 +08:00
mm-imx25.c GPIO changes for v3.6: 2012-07-26 13:56:38 -07:00
mm-imx27.c ARM: imx: remove unneeded mach/irq.h inclusion 2012-07-01 21:58:41 +08:00
mmdc.c arm/imx6q: add core drivers clock, gpc, mmdc and src 2011-10-31 14:26:23 +01:00
mx1-camera-fiq-ksym.c ARM: imx: move platform_data definitions 2012-09-14 11:17:21 +02:00
mx1-camera-fiq.S
mx31lilly-db.c dma: ipu: remove the use of ipu_platform_data 2012-07-01 21:57:43 +08:00
mx31lite-db.c arm-soc: sparse IRQ conversion 2012-07-23 17:36:02 -07:00
mx31moboard-devboard.c arm: imx: Start using struct usb_otg 2012-02-13 13:36:03 +02:00
mx31moboard-marxbot.c arm: imx: Start using struct usb_otg 2012-02-13 13:36:03 +02:00
mx31moboard-smartbot.c ARM: imx: move mx3 support to mach-imx 2011-05-19 13:11:38 +02:00
pcm037.h ARM: imx: use machine specific hook for late init 2012-05-08 20:36:16 +08:00
pcm970-baseboard.c ARM: imx: eliminate macro IRQ_GPIOx() 2012-07-01 21:57:16 +08:00
platsmp.c ARM: SoC: convert imx6q to SMP operations 2012-09-14 11:15:00 +02:00
pm-imx3.c ARM i.MX3: Make ccm base address a variable 2012-04-25 17:03:45 +02:00
pm-imx5.c ARM: imx: Add imx5 cpuidle 2012-06-05 08:51:47 +02:00
pm-imx6q.c ARM: imx6q: resume PL310 only when CACHE_L2X0 defined 2011-12-26 10:18:59 +08:00
pm-imx27.c ARM: plat-mxc: hook special idle handlers to arm_pm_idle 2012-01-20 18:55:14 -05:00
src.c ARM: 7293/1: logical_cpu_map: decouple CPU mapping from SMP 2012-01-23 10:20:05 +00:00