leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
ab11ca34ee
linux/arch/arm/mach-imx
History
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
..
include/mach dmaengine: imx-dma: merge old dma-v1.c with imx-dma.c 2012-03-26 11:31:29 +05:30
clock-imx1.c serial/imx: get rid of the uses of cpu_is_mx1() 2011-07-27 09:30:38 +08:00
clock-imx6q.c ARM: imx6q: add cko1 clock 2012-02-27 15:18:06 +08:00
clock-imx21.c serial/imx: get rid of the uses of cpu_is_mx1() 2011-07-27 09:30:38 +08:00
clock-imx25.c ARM: mx25: Print silicon revision on boot 2011-08-26 08:50:58 +02:00
clock-imx27.c MX2: Fix mx2_camera clock regression. 2012-04-02 11:11:05 +02:00
clock-imx31.c ARM: mx3: Let mx31 and mx35 share the same CCM header file 2012-02-27 10:14:48 +01:00
clock-imx35.c ARM: mx35: Fix registration of camera clock 2012-04-02 11:27:41 +02:00
clock-mx51-mx53.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
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
cpu-imx5.c ARM: mx5: Use common function for configuring AIPS 2012-03-07 21:29:57 +01: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
crm-regs-imx5.h ARM i.MX: Merge i.MX5 support into mach-imx 2011-11-16 08:37:37 +01:00
crmregs-imx3.h ARM: SoC specific updates 2012-03-27 16:14:44 -07: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: clean up the section marks of extern data 2011-05-19 13:11:11 +02:00
devices-imx25.h ARM: imx: clean up the section marks of extern data 2011-05-19 13:11:11 +02:00
devices-imx27.h [media] MX2: Add platform definitions for eMMa-PrP device 2012-02-28 07:20:32 -03:00
devices-imx31.h ARM: imx: Define functions for registering PATA 2011-08-24 18:13:34 +02:00
devices-imx35.h ARM: imx: Define functions for registering PATA 2011-08-24 18:13:34 +02: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 i.MX: Merge i.MX5 support into mach-imx 2011-11-16 08:37:37 +01:00
devices-imx53.h ARM i.MX: Merge i.MX5 support into mach-imx 2011-11-16 08:37:37 +01:00
efika.h ARM i.MX: Merge i.MX5 support into mach-imx 2011-11-16 08:37:37 +01:00
ehci-imx5.c ARM i.MX: Merge i.MX5 support into mach-imx 2011-11-16 08:37:37 +01:00
ehci-imx25.c ARM i.MX ehci: factor out soc specific functions 2011-02-11 08:34:17 +01:00
ehci-imx27.c ARM i.MX ehci: factor out soc specific functions 2011-02-11 08:34:17 +01:00
ehci-imx31.c ARM: imx: move mx3 support to mach-imx 2011-05-19 13:11:38 +02:00
ehci-imx35.c ARM: imx: move mx3 support to mach-imx 2011-05-19 13:11:38 +02:00
eukrea_mbimx27-baseboard.c ARM: imx/eukrea_mbimx27-baseboard: fix typo in error message 2012-05-02 10:25:37 +02: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 ARM: imx: eukrea_mbimxsd35: add spi controler and spidev support 2012-05-08 17:31:24 +02: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
head-v7.S Merge branch 'imx/pm2' of git://git.linaro.org/people/shawnguo/linux-2.6 into imx6/pm 2012-01-06 12:44:05 -08:00
hotplug.c arm/imx6q: add smp and cpu hotplug support 2011-10-31 14:26:24 +01:00
imx27-dt.c ARM: imx27-dt: Fix build due to removal of irq_domain_add_simple() 2012-04-18 11:52:24 +02:00
imx51-dt.c ARM: imx: enable pinctrl dummy states 2012-05-08 23:05:16 +08:00
imx53-dt.c ARM: imx: enable pinctrl dummy states 2012-05-08 23:05:16 +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
Kconfig Sound updates for 3.5-rc1 2012-05-23 13:05:43 -07:00
lluart.c ARM: imx6: Rename DEBUG_IMX6Q_UART to UART4 2012-02-27 15:17:32 +08:00
mach-apf9328.c Merge branch 'samsung/cleanup' into next/boards 2012-01-09 17:06:36 +00:00
mach-armadillo5x0.c ARM: armadillo5x0: Fix smsc911x driver probe 2012-04-02 16:31:22 +02:00
mach-bug.c ARM: restart: mxc: use new restart hook 2012-01-05 12:57:15 +00:00
mach-cpuimx27.c ARM: restart: mxc: use new restart hook 2012-01-05 12:57:15 +00:00
mach-cpuimx35.c arm: imx: make various struct sys_timer static 2012-04-26 09:43:50 +02:00
mach-cpuimx51sd.c ARM: imx: eukrea_cpuimx51sd: support rev2 PCB 2012-05-08 17:31:24 +02:00
mach-eukrea_cpuimx25.c ARM: imx: eukrea_cpuimx25: add watchdog support 2012-05-08 17:31:24 +02:00
mach-imx6q.c ARM: imx: enable pinctrl dummy states 2012-05-08 23:05:16 +08:00
mach-imx27_visstrim_m10.c 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
mach-imx27ipcam.c ARM: restart: mxc: use new restart hook 2012-01-05 12:57:15 +00:00
mach-imx27lite.c ARM: restart: mxc: use new restart hook 2012-01-05 12:57:15 +00:00
mach-kzm_arm11_01.c ARM: kzm_arm11_01: Fix smsc911x driver probe 2012-04-02 16:31:22 +02:00
mach-mx1ads.c arm: imx: make various struct sys_timer static 2012-04-26 09:43:50 +02:00
mach-mx21ads.c ARM: imx/mx21ads: remove unneeded cast 2012-04-02 11:06:42 +02:00
mach-mx25_3ds.c ARM: restart: mxc: use new restart hook 2012-01-05 12:57:15 +00:00
mach-mx27_3ds.c ARM: mx27_3ds: Add camera support 2012-02-27 10:13:51 +01:00
mach-mx27ads.c ARM: restart: mxc: use new restart hook 2012-01-05 12:57:15 +00:00
mach-mx31_3ds.c ARM: mx31_3ds: Add sound support 2012-05-18 16:42:44 +01:00
mach-mx31ads.c CS89x0 : add CS89x0 platform device to the iMX31ADS board 2012-02-01 16:52:02 +01:00
mach-mx31lilly.c ARM: mx31lilly: Fix smsc911x driver probe 2012-04-02 16:31:22 +02:00
mach-mx31lite.c arm: imx: make various struct sys_timer static 2012-04-26 09:43:50 +02:00
mach-mx31moboard.c Sound updates for 3.5-rc1 2012-05-23 13:05:43 -07:00
mach-mx35_3ds.c arm-soc: board specific changes 2012-05-22 13:32:53 -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 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_babbage.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_efikamx.c ARM: i.MX: efikamx: match machine descriptions with legacy 2012-04-16 09:54:50 +02:00
mach-mx51_efikasb.c ARM: i.MX: efikamx: match machine descriptions with legacy 2012-04-16 09:54:50 +02:00
mach-mx53_ard.c ARM: mx53ard: Fix smsc911x driver probe 2012-04-02 16:31:21 +02:00
mach-mx53_evk.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-mx53_loco.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-mx53_smd.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-mxt_td60.c ARM: restart: mxc: use new restart hook 2012-01-05 12:57:15 +00:00
mach-pca100.c ASoC: imx: move phycore audmux call into ASoC machine driver 2012-03-06 00:02:47 +00:00
mach-pcm037_eet.c ARM: imx: move mx3 support to mach-imx 2011-05-19 13:11:38 +02:00
mach-pcm037.c arm: imx: make various struct sys_timer static 2012-04-26 09:43:50 +02:00
mach-pcm038.c ARM: mach-pcm038: Fix field name of regulator_consumer_supply struct 2012-02-27 10:12:40 +01:00
mach-pcm043.c arm: imx: make various struct sys_timer static 2012-04-26 09:43:50 +02:00
mach-qong.c ARM: restart: mxc: use new restart hook 2012-01-05 12:57:15 +00:00
mach-scb9328.c ARM: restart: mxc: use new restart hook 2012-01-05 12:57:15 +00:00
mach-vpr200.c arm: imx: make various struct sys_timer static 2012-04-26 09:43:50 +02:00
Makefile ARM: imx: eukrea_mbimxsd rename to eukrea_mbimxsd51 2012-05-08 17:31:25 +02:00
Makefile.boot ARM: imx5: generate dtbs for imx5 boards 2012-02-27 11:33:32 +08:00
mm-imx1.c ARM: imx: enable pinctrl dummy states 2012-05-08 23:05:16 +08:00
mm-imx3.c ARM: imx: enable pinctrl dummy states 2012-05-08 23:05:16 +08:00
mm-imx5.c ARM: imx: enable pinctrl dummy states 2012-05-08 23:05:16 +08:00
mm-imx21.c ARM: imx: enable pinctrl dummy states 2012-05-08 23:05:16 +08:00
mm-imx25.c ARM: imx: enable pinctrl dummy states 2012-05-08 23:05:16 +08:00
mm-imx27.c ARM: imx: enable pinctrl dummy states 2012-05-08 23:05:16 +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 mx1 support to mach-imx 2010-06-30 08:59:44 +02:00
mx1-camera-fiq.S ARM: imx: move mx1 support to mach-imx 2010-06-30 08:59:44 +02:00
mx31lilly-db.c ARM: imx: move mx3 support to mach-imx 2011-05-19 13:11:38 +02:00
mx31lite-db.c ARM: imx: convert to new leds-gpio registration helper 2011-07-07 09:59:57 +02: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
mx51_efika.c ARM i.MX: Merge i.MX5 support into mach-imx 2011-11-16 08:37:37 +01:00
pcm037.h ARM: imx: move mx3 support to mach-imx 2011-05-19 13:11:38 +02:00
pcm970-baseboard.c ARM: imx: remove now empty devices.h 2010-11-17 10:01:34 +01:00
platsmp.c arm/imx6q: add smp and cpu hotplug support 2011-10-31 14:26:24 +01:00
pm-imx3.c ARM: mx3: Let mx31 and mx35 enter in LPM mode in WFI 2012-03-02 08:47:49 +01:00
pm-imx5.c ARM: pm-imx5: add clk_prepare/clk_unprepare 2012-02-01 14:29:30 +01: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