Linus Torvalds
4f1cd91497
Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media
...
Pull second set of media updates from Mauro Carvalho Chehab:
"Despite its size, most of the stuff here is trivial. This series
contains:
- s5p-mfc: additions at the driver and at the core to support H.264
hardware codec;
- Some improvements at s5p and davinci embedded drivers;
- Some V4L2 compliance fixes applied on a few drivers;
- Several random trivial patches, including several fixes and a few
new board support additions;
Notes:
1) Some Exynos media patches were dependent on some -arm fixes that
got merged on changeset 782cd9e . That's why this pull request is
based that changeset.
2) As promised, I reviewed the pending VB2 DMABUF series.
While setting a test environment, it was noticed that the upstream
support for Samsung Exynos 4 boards (smdk310 and Origen) are
broken upstream, likely due to regressions: both defconfigs are
wrong and regulator settings for both boards are broken. That,
allied with some bug at the dummy regulator driver, causes OOPSes
during boot time.
Long story short: even fixing the above, the proposed patches
OOPSed when running the DMABUF test. Not sure yet if the OOPSes
are due to some other undetected regressions, or due to some bug
on the patches.
Due to the above, DMABUF patches for vb2 got NACKed for 3.7."
* 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (109 commits)
[media] m5mols: Add missing #include <linux/sizes.h>
[media] stk1160: Add support for S-Video input
Revert "[media] omap3isp: Replace cpu_is_omap3630() with ISP revision check"
[media] dvb: LNA implementation changes
[media] v4l2-ioctl: fix W=1 warnings
[media] v4l2-ioctl: add blocks check for VIDIOC_SUBDEV_G/S_EDID
[media] omap3isp: Fix compilation error in ispreg.h
[media] rc-msi-digivox-ii: Add full scan keycodes
[media] cx25821: testing the wrong variable
[media] tda18271-common: hold the I2C adapter during write transfers
[media] ds3000: add module parameter to force firmware upload
[media] drivers/media: Remove unnecessary semicolon
[media] winbond: remove space from driver name
[media] iguanair: cannot send data from the stack
[media] omap3isp: Replace cpu_is_omap3630() with ISP revision check
[media] dvb-usb: print small buffers via %*ph
[media] uvc: Add return code check at vb2_queue_init()
[media] em28xx: Replace memcpy with struct assignment
[media] bt8xx: Add video4linux control V4L2_CID_COLOR_KILLER
[media] mem2mem_testdev: Use devm_kzalloc() in probe
...
Conflicts:
arch/arm/mach-davinci/include/mach/da8xx.h
2012-10-12 12:39:17 +09:00
..
ad5755.h
iio:dac: Add ad5755 driver
2012-09-17 20:55:54 +01:00
ad7266.h
iio:adc: Add AD7265/AD7266 support
2012-06-30 10:15:07 +01:00
ad7791.h
staging:iio:adc: Add AD7791 driver
2012-09-08 10:20:09 +01:00
asoc-imx-ssi.h
ARM: imx: move platform_data definitions
2012-09-14 11:17:21 +02:00
asoc-kirkwood.h
ARM: orion: move platform_data definitions
2012-09-19 17:42:17 +02:00
asoc-mx27vis.h
ASoC: mx27vis: retrieve gpio numbers from platform_data
2012-09-17 07:35:08 -04:00
asoc-palm27x.h
ARM: pxa: move platform_data definitions
2012-09-14 11:18:10 +02:00
asoc-s3c.h
ARM: samsung: move platform_data definitions
2012-09-19 17:42:18 +02:00
asoc-s3c24xx_simtec.h
ARM: samsung: move platform_data definitions
2012-09-19 17:42:18 +02:00
asoc-ti-mcbsp.h
Sound updates for 3.7-rc1
2012-10-09 07:07:14 +09:00
at91_adc.h
ARM: AT91: Add platform data for the AT91 ADCs
2012-05-14 13:17:49 -07:00
ata-pxa.h
ARM: pxa: move platform_data definitions
2012-09-14 11:18:10 +02:00
ata-samsung_cf.h
ARM: samsung: move platform_data definitions
2012-09-19 17:42:18 +02:00
atmel-aes.h
ARM: at91: move platform_data definitions
2012-09-14 11:16:40 +02:00
atmel.h
avr32: fix build failures from mis-naming of atmel_nand.h
2012-04-02 14:41:25 -07:00
camera-mx1.h
ARM: imx: move platform_data definitions
2012-09-14 11:17:21 +02:00
camera-mx2.h
Merge branch 'multiplatform/platform-data' into next/multiplatform
2012-09-22 01:07:21 -07:00
camera-mx3.h
ARM: imx: move platform_data definitions
2012-09-14 11:17:21 +02:00
camera-pxa.h
ARM: pxa: move platform_data definitions
2012-09-14 11:18:10 +02:00
clk-integrator.h
ARM: integrator: convert to common clock
2012-07-11 17:58:45 -07:00
clk-nomadik.h
ARM: nomadik: convert to generic clock
2012-06-10 18:41:40 +02:00
clk-realview.h
clk: convert ARM RealView to common clk
2012-08-24 17:42:10 -07:00
clk-u300.h
ARM: u300: convert to common clock
2012-07-11 15:36:45 -07:00
clk-ux500.h
clk: ux500: First version of clock definitions for ux500
2012-09-06 15:58:04 -07:00
cpsw.h
crypto-ux500.h
ARM: nomadik: move platform_data definitions
2012-09-14 11:19:00 +02:00
davinci_asp.h
ASoC: Davinci: McASP: add support new McASP IP Variant
2012-09-06 08:20:33 +08:00
dma-atmel.h
ARM: at91: move platform_data definitions
2012-09-14 11:16:40 +02:00
dma-ep93xx.h
ARM: ep93xx: move platform_data definitions
2012-09-14 11:16:55 +02:00
dma-imx-sdma.h
ARM: imx: move platform_data definitions
2012-09-14 11:17:21 +02:00
dma-imx.h
ARM: imx: move platform_data definitions
2012-09-14 11:17:21 +02:00
dma-mmp_tdma.h
ARM: pxa: move platform_data definitions
2012-09-14 11:18:10 +02:00
dma-mv_xor.h
ARM: orion: move platform_data definitions
2012-09-19 17:42:17 +02:00
dsp-omap.h
ARM: omap: move platform_data definitions
2012-09-19 17:39:52 +02:00
dwc3-exynos.h
dwc3-omap.h
efm32-uart.h
ehci-sh.h
usb: ehci-sh: Add PHY init function with platform data
2012-04-18 13:52:35 -07:00
emif_plat.h
memory: emif: add basic infrastructure for EMIF driver
2012-05-02 00:10:49 -07:00
eth-netx.h
ARM: netx: move platform_data definitions
2012-09-14 11:17:36 +02:00
exynos4_tmu.h
fsa9480.h
gpio-em.h
gpio: Emma Mobile GPIO driver V2
2012-05-18 00:00:45 +02:00
gpio-omap.h
ARM: OMAP: Move gpio.h to include/linux/platform_data
2012-09-12 18:06:30 -07:00
hwmon-s3c.h
ARM: samsung: move platform_data definitions
2012-09-19 17:42:18 +02:00
i2c-davinci.h
ARM: davinci: move platform_data definitions
2012-09-14 11:16:54 +02:00
i2c-imx.h
ARM: imx: move platform_data definitions
2012-09-14 11:17:21 +02:00
i2c-nomadik.h
i2c: nomadik: Add Device Tree support to the Nomadik I2C driver
2012-10-06 13:20:33 +02:00
i2c-nuc900.h
ARM: w90x900: move platform_data definitions
2012-09-14 11:18:59 +02:00
i2c-s3c2410.h
ARM: samsung: move platform_data definitions
2012-09-19 17:42:18 +02:00
ina2xx.h
hwmon: INA219 and INA226 support
2012-05-22 06:48:02 -07:00
irda-pxaficp.h
ARM: pxa: move platform_data definitions
2012-09-14 11:18:10 +02:00
keyboard-pxa930_rotary.h
ARM: pxa: move platform_data definitions
2012-09-14 11:18:10 +02:00
keyboard-spear.h
ARM: spear: move platform_data definitions
2012-09-19 17:42:19 +02:00
keypad-ep93xx.h
ARM: ep93xx: move platform_data definitions
2012-09-14 11:16:55 +02:00
keypad-nomadik-ske.h
ARM: nomadik: move platform_data definitions
2012-09-14 11:19:00 +02:00
keypad-omap.h
ARM: omap: move platform_data definitions
2012-09-19 17:39:52 +02:00
keypad-pxa27x.h
ARM: pxa: move platform_data definitions
2012-09-14 11:18:10 +02:00
keypad-w90p910.h
ARM: w90x900: move platform_data definitions
2012-09-14 11:18:59 +02:00
keyscan-davinci.h
ARM: davinci: move platform_data definitions
2012-09-14 11:16:54 +02:00
lcd-mipid.h
ARM: omap: move platform_data definitions
2012-09-19 17:39:52 +02:00
leds-kirkwood-netxbig.h
ARM: orion: move platform_data definitions
2012-09-19 17:42:17 +02:00
leds-kirkwood-ns2.h
ARM: orion: move platform_data definitions
2012-09-19 17:42:17 +02:00
leds-lm355x.h
leds: Add new LED driver for lm355x chips
2012-09-11 18:32:43 +08:00
leds-lm3642.h
leds: Add new LED driver for lm3642 chips
2012-09-13 11:56:41 +08:00
leds-pca9633.h
leds: add output driver configuration for pca9633 led driver
2012-09-24 19:12:29 +08:00
leds-renesas-tpu.h
leds-s3c24xx.h
ARM: samsung: move platform_data definitions
2012-09-19 17:42:18 +02:00
lm3630_bl.h
backlight: add Backlight driver for lm3630 chip
2012-10-06 03:04:53 +09:00
lm3639_bl.h
backlight: add new lm3639 backlight driver
2012-10-06 03:04:53 +09:00
lp855x.h
backlight: lp855x: add FAST bit description for LP8556
2012-10-06 03:04:52 +09:00
lp8727.h
lp8727_charger: More pure cosmetic improvements
2012-09-20 18:07:23 -07:00
macb.h
max197.h
hwmon: add Maxim MAX197 support
2012-09-23 21:08:33 -07:00
max310x.h
serial: New serial driver MAX310X
2012-08-16 12:12:25 -07:00
mfd-mcp-sa11x0.h
ARM: sa1100: move platform_data definitions
2012-09-14 11:18:57 +02:00
mipi-csis.h
[media] s5p-csis: Allow to specify pixel clock's source through platform data
2012-10-05 22:35:16 -03:00
mmc-davinci.h
ARM: davinci: move platform_data definitions
2012-09-14 11:16:54 +02:00
mmc-esdhc-imx.h
ARM: imx: move platform_data definitions
2012-09-14 11:17:21 +02:00
mmc-msm_sdcc.h
ARM: msm: move platform_data definitions
2012-09-14 11:17:35 +02:00
mmc-mvsdio.h
ARM: orion: move platform_data definitions
2012-09-19 17:42:17 +02:00
mmc-mxcmmc.h
ARM: imx: move platform_data definitions
2012-09-14 11:17:21 +02:00
mmc-pxamci.h
ARM: pxa: move platform_data definitions
2012-09-14 11:18:10 +02:00
mmc-s3cmci.h
ARM: samsung: move platform_data definitions
2012-09-19 17:42:18 +02:00
mmc-sdhci-tegra.h
ARM: tegra: move sdhci platform_data definition
2012-09-14 11:18:57 +02:00
mmp_audio.h
ASoC: mmp: add audio dma support
2012-06-13 13:13:37 +01:00
mmp_dma.h
dmaengine: mmp-pdma support
2012-09-14 08:14:07 +05:30
mouse-pxa930_trkball.h
ARM: pxa: move platform_data definitions
2012-09-14 11:18:10 +02:00
msm_serial_hs.h
mtd-davinci-aemif.h
ARM: davinci: move platform_data definitions
2012-09-14 11:16:54 +02:00
mtd-davinci.h
ARM: davinci: move platform_data definitions
2012-09-14 11:16:54 +02:00
mtd-mxc_nand.h
ARM: imx: move platform_data definitions
2012-09-14 11:17:21 +02:00
mtd-nand-omap2.h
ARM: omap: move platform_data definitions
2012-09-19 17:39:52 +02:00
mtd-nand-pxa3xx.h
ARM: pxa: move platform_data definitions
2012-09-14 11:18:10 +02:00
mtd-nand-s3c2410.h
ARM: samsung: move platform_data definitions
2012-09-19 17:42:18 +02:00
mtd-nomadik-nand.h
ARM: nomadik: move platform_data definitions
2012-09-14 11:19:00 +02:00
mtd-onenand-omap2.h
ARM: omap: move platform_data definitions
2012-09-19 17:39:52 +02:00
mtd-orion_nand.h
ARM: orion: move platform_data definitions
2012-09-19 17:42:17 +02:00
mv_usb.h
usb/marvell: remove conditional compilation of clk code
2012-07-30 17:25:12 -07:00
ntc_thermistor.h
omap-abe-twl6040.h
omap-twl4030.h
ASoC: omap-twl4030: Simple machine driver for TI SoC with twl4030 codec
2012-08-15 17:09:59 +01:00
omap1_bl.h
ARM: OMAP1: move omap1_bl pdata out of arch/arm/*
2012-09-10 16:34:00 -07:00
omap4-keypad.h
omap_drm.h
omap2+: add drm device
2012-07-02 04:05:57 -07:00
pcmcia-pxa2xx_viper.h
ARM: pxa: move platform_data definitions
2012-09-14 11:18:10 +02:00
pinctrl-coh901.h
pinctrl/coh901: move header to platform data dir
2012-08-13 13:53:05 +02:00
pxa_sdhci.h
mmc: sdhci-pxav3: dt: Support "cd-gpios" property
2012-09-19 16:29:12 +08:00
remoteproc-omap.h
- Remoteproc Recovery - by Fernando Guzman Lugo - when a remote processor
2012-10-04 09:11:57 -07:00
s3c-hsotg.h
usb: s3c-hsotg: Add header file protection macros in s3c-hsotg.h
2012-07-17 10:54:29 -07:00
s3c-hsudc.h
sc18is602.h
spi: Master driver for NXP SC18IS602/603
2012-08-22 19:34:51 +01:00
sccnxp.h
serial: New serial driver SCCNXP
2012-09-05 13:21:46 -07:00
serial-imx.h
ARM: imx: move platform_data definitions
2012-09-14 11:17:21 +02:00
shmob_drm.h
drm: Renesas SH Mobile DRM driver
2012-09-18 12:28:22 +02:00
sht15.h
hwmon: (sht15) move header to linux/platform_data/
2012-09-23 21:08:35 -07:00
spi-davinci.h
ARM: davinci: move platform_data definitions
2012-09-14 11:16:54 +02:00
spi-ep93xx.h
ARM: ep93xx: move platform_data definitions
2012-09-14 11:16:55 +02:00
spi-imx.h
ARM: imx: move platform_data definitions
2012-09-14 11:17:21 +02:00
spi-nuc900.h
ARM: w90x900: move platform_data definitions
2012-09-14 11:18:59 +02:00
spi-omap2-mcspi.h
ARM: omap: move platform_data definitions
2012-09-19 17:39:52 +02:00
spi-s3c64xx.h
ARM: samsung: move platform_data definitions
2012-09-19 17:42:18 +02:00
tegra_emc.h
tegra_usb.h
usb: ehci-tegra: Add vbus_gpio to platform data
2012-04-18 10:26:37 -06:00
touchscreen-s3c2410.h
ARM: samsung: move platform_data definitions
2012-09-19 17:42:18 +02:00
uio_pruss.h
usb-davinci.h
ARM: davinci: move platform_data definitions
2012-09-14 11:16:54 +02:00
usb-ehci-mxc.h
ARM: imx: move platform_data definitions
2012-09-14 11:17:21 +02:00
usb-ehci-orion.h
ARM: orion: move platform_data definitions
2012-09-19 17:42:17 +02:00
usb-ehci-s5p.h
ARM: samsung: move platform_data definitions
2012-09-19 17:42:18 +02:00
usb-exynos.h
ARM: samsung: move platform_data definitions
2012-09-19 17:42:18 +02:00
usb-imx_udc.h
ARM: imx: move platform_data definitions
2012-09-14 11:17:21 +02:00
usb-musb-ux500.h
ARM: nomadik: move platform_data definitions
2012-09-14 11:19:00 +02:00
usb-mx2.h
ARM: imx: move platform_data definitions
2012-09-14 11:17:21 +02:00
usb-ohci-pxa27x.h
ARM: pxa: move platform_data definitions
2012-09-14 11:18:10 +02:00
usb-ohci-s3c2410.h
ARM: samsung: move platform_data definitions
2012-09-19 17:42:18 +02:00
usb-pxa3xx-ulpi.h
ARM: pxa: move platform_data definitions
2012-09-14 11:18:10 +02:00
usb-s3c2410_udc.h
ARM: samsung: move platform_data definitions
2012-09-19 17:42:18 +02:00
video-ep93xx.h
ARM: ep93xx: move platform_data definitions
2012-09-14 11:16:55 +02:00
video-imxfb.h
ARM: imx: move platform_data definitions
2012-09-14 11:17:21 +02:00
video-msm_fb.h
ARM: msm: move platform_data definitions
2012-09-14 11:17:35 +02:00
video-mx3fb.h
ARM: imx: move platform_data definitions
2012-09-14 11:17:21 +02:00
video-nuc900fb.h
ARM: w90x900: move platform_data definitions
2012-09-14 11:18:59 +02:00
video-pxafb.h
ARM: pxa: move platform_data definitions
2012-09-14 11:18:10 +02:00
video-vt8500lcdfb.h
ARM: vt8500: move platform_data definitions
2012-09-14 11:18:58 +02:00
voltage-omap.h
ARM: omap: move platform_data definitions
2012-09-19 17:39:52 +02:00
wiznet.h
Ethernet driver for the WIZnet W5300 chip
2012-04-05 01:43:02 -04:00