linux/arch/arm/plat-mxc
Linus Torvalds ab11ca34ee 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:
 - some V4L2 API updates needed by embedded devices
 - DVB API extensions for ATSC-MH delivery system, used in US for mobile
   TV
 - new tuners for fc0011/0012/0013 and tua9001
 - a new dvb driver for af9033/9035
 - a new ATSC-MH frontend (lg2160)
 - new remote controller keymaps
 - Removal of a few legacy webcam driver that got replaced by gspca on
   several kernel versions ago
 - a new driver for Exynos 4/5 webcams(s5pp fimc-lite)
 - a new webcam sensor driver (smiapp)
 - a new video input driver for embedded (sta2x1xx)
 - several improvements, fixes, cleanups, etc inside the drivers.

Manually fix up conflicts due to err() -> dev_err() conversion in
drivers/staging/media/easycap/easycap_main.c

* 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (484 commits)
  [media] saa7134-cards: Remove a PCI entry added by mistake
  [media] radio-sf16fmi: add support for SF16-FMD
  [media] rc-loopback: remove duplicate line
  [media] patch for Asus My Cinema PS3-100 (1043:48cd)
  [media] au0828: Move the Kconfig knob under V4L_USB_DRIVERS
  [media] em28xx: simple comment fix
  [media] [resend] radio-sf16fmr2: add PnP support for SF16-FMD2
  [media] smiapp: Use v4l2_ctrl_new_int_menu() instead of v4l2_ctrl_new_custom()
  [media] smiapp: Add support for 8-bit uncompressed formats
  [media] smiapp: Allow generic quirk registers
  [media] smiapp: Use non-binning limits if the binning limit is zero
  [media] smiapp: Initialise rval in smiapp_read_nvm()
  [media] smiapp: Round minimum pre_pll up rather than down in ip_clk_freq check
  [media] smiapp: Use 8-bit reads only before identifying the sensor
  [media] smiapp: Quirk for sensors that only do 8-bit reads
  [media] smiapp: Pass struct sensor to register writing commands instead of i2c_client
  [media] smiapp: Allow using external clock from the clock framework
  [media] zl10353: change .read_snr() to report SNR as a 0.1 dB
  [media] media: add support to gspca/pac7302.c for 093a:2627 (Genius FaceCam 300)
  [media] m88rs2000 - only flip bit 2 on reg 0x70 on 16th try
  ...
2012-05-24 10:21:51 -07:00
..
devices ARM: driver specific updates 2012-03-27 16:41:24 -07:00
include/mach Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media 2012-05-24 10:21:51 -07:00
3ds_debugboard.c ARM: 3ds_debugboard: Fix smsc911x driver probe 2012-04-02 11:15:15 +02:00
avic.c ARM: Remove redundant ';' from avic_irq_set_priority() 2012-02-27 10:15:49 +01:00
clock.c arm: mxc: utilise usecount field in clock operations 2010-07-26 14:17:57 +02:00
cpu.c ARM: mx3: Setup AIPS registers 2012-03-02 08:49:37 +01:00
cpufreq.c arm/imx: fix cpufreq section mismatch 2011-12-19 12:26:05 +01:00
devices.c Merge branch 'next/cleanup' of git://git.linaro.org/people/arnd/arm-soc 2011-11-01 20:11:00 -07:00
epit.c ARM: mxc: epit: add clk_prepare/clk_unprepare 2012-02-01 14:28:00 +01:00
iomux-v1.c ARM: mxc: iomux-v1: Fix build warning 2011-07-07 09:07:33 +02:00
iomux-v3.c MXC IOMUX-V3 replace struct pad_desc with bitmapped cookie (step 2) 2010-12-15 12:42:49 +01:00
iram_alloc.c ARM: imx: Add iram allocator functions 2010-10-19 18:44:57 +02:00
irq-common.c ARM i.MX avic: convert to use generic irq chip 2011-09-23 08:32:14 +02:00
irq-common.h ARM i.MX avic: convert to use generic irq chip 2011-09-23 08:32:14 +02:00
Kconfig ASoC: imx: move audmux driver into sound/soc/imx 2012-03-06 00:03:00 +00:00
Makefile ASoC: imx: move audmux driver into sound/soc/imx 2012-03-06 00:03:00 +00:00
pwm.c ARM: mxc: pwm: add clk_prepare/clk_unprepare 2012-02-01 14:27:59 +01:00
ssi-fiq-ksym.c ASoC: Add a new imx-ssi sound driver 2010-01-17 11:09:46 +00:00
ssi-fiq.S ARM: mxc: Correct data alignment in headsmp.S for CONFIG_THUMB2_KERNEL 2011-04-12 09:48:10 +02:00
system.c Disintegrate and delete asm/system.h 2012-03-28 15:58:21 -07:00
time.c ARM: mxc: time: add clk_prepare/clk_unprepare 2012-02-01 14:27:59 +01:00
tzic.c ARM: mx5: use generic irq chip pm interface for pm functions on 2011-12-25 12:02:28 +08:00
ulpi.c usb: otg: ulpi: Start using struct usb_otg 2012-02-13 13:35:56 +02:00