davidlt/kernel-ark
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
ef08e78268
kernel-ark/drivers/media/video
History
Linus Torvalds ef08e78268 Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma 
Pull slave-dmaengine update from Vinod Koul:
 "This includes the cookie cleanup by Russell, the addition of context
  parameter for dmaengine APIs, more arm dmaengine driver cleanup by
  moving code to dmaengine, this time for imx by Javier and pl330 by
  Boojin along with the usual driver fixes."

Fix up some fairly trivial conflicts with various other cleanups.

* 'next' of git://git.infradead.org/users/vkoul/slave-dma: (67 commits)
  dmaengine: imx: fix the build failure on x86_64
  dmaengine: i.MX: Fix merge of cookie branch.
  dmaengine: i.MX: Add support for interleaved transfers.
  dmaengine: imx-dma: use 'dev_dbg' and 'dev_warn' for messages.
  dmaengine: imx-dma: remove 'imx_dmav1_baseaddr' and 'dma_clk'.
  dmaengine: imx-dma: remove unused arg of imxdma_sg_next.
  dmaengine: imx-dma: remove internal structure.
  dmaengine: imx-dma: remove 'resbytes' field of 'internal' structure.
  dmaengine: imx-dma: remove 'in_use' field of 'internal' structure.
  dmaengine: imx-dma: remove sg member from internal structure.
  dmaengine: imx-dma: remove 'imxdma_setup_sg_hw' function.
  dmaengine: imx-dma: remove 'imxdma_config_channel_hw' function.
  dmaengine: imx-dma: remove 'imxdma_setup_mem2mem_hw' function.
  dmaengine: imx-dma: remove dma_mode member of internal structure.
  dmaengine: imx-dma: remove data member from internal structure.
  dmaengine: imx-dma: merge old dma-v1.c with imx-dma.c
  dmaengine: at_hdmac: add slave config operation
  dmaengine: add context parameter to prep_slave_sg and prep_dma_cyclic
  dmaengine/dma_slave: introduce inline wrappers
  dma: imx-sdma: Treat firmware messages as warnings instead of erros
  ...
2012-03-29 15:34:57 -07:00
..
au0828 [media] drivers: media: au0828: Fix dependency for VIDEO_AU0828 2012-01-10 23:29:19 -02:00
blackfin [media] add blackfin capture bridge driver 2012-03-19 15:08:20 -03:00
bt8xx [media] v4l2: standardize log start/end message 2012-02-14 16:38:13 -02:00
cpia2 drivers/media: Add module.h to all files using it implicitly 2011-10-31 19:31:51 -04:00
cx18 Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media 2012-03-23 14:39:09 -07:00
cx88 Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media 2012-01-18 12:53:54 -08:00
cx231xx [media] media, cx231xx: Fix double free on close 2012-03-19 14:13:51 -03:00
cx23885 [media] cx23885: Don't duplicate xc4000 entry for radio 2012-01-16 11:55:12 -02:00
cx25821 [media] cx25821: Add a card definition for "No brand" cards that have: subvendor = 0x0000 subdevice = 0x0000 2012-03-08 12:42:28 -03:00
cx25840 [media] convert drivers/media/* to use module_i2c_driver() 2012-03-08 08:48:01 -03:00
davinci Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial 2012-03-20 21:12:50 -07:00
em28xx [media] partially reverts changeset fa5527c 2012-03-19 23:10:13 -03:00
et61x251 module_param: check type correctness for module_param_array 2012-01-13 09:32:16 +10:30
gspca [media] gspca - sn9c20x: Cleanup source 2012-03-19 22:32:35 -03:00
hdpvr Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media 2012-02-24 12:32:51 -08:00
ivtv Disintegrate and delete asm/system.h 2012-03-28 15:58:21 -07:00
m5mols [media] convert drivers/media/* to use module_i2c_driver() 2012-03-08 08:48:01 -03:00
marvell-ccic [media] marvell-cam: Demote the "release" print to debug level 2012-03-19 22:17:06 -03:00
omap [media] omap_vout: fix section mismatch 2012-01-23 15:27:17 -02:00
omap3isp Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media 2012-02-24 12:32:51 -08:00
pvrusb2 [media] pvrusb2: fix 7MHz & 8MHz DVB-T tuner support for HVR1900 rev D1F5 2012-03-19 22:26:01 -03:00
pwc [media] v4l2: standardize log start/end message 2012-02-14 16:38:13 -02:00
s5p-fimc Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media 2012-03-23 14:39:09 -07:00
s5p-g2d [media] s5p-g2d: Added locking for writing control values to registers 2012-03-08 07:43:37 -03:00
s5p-jpeg [media] s5p-jpeg: Adapt to new controls 2012-03-08 07:43:51 -03:00
s5p-mfc [media] s5p-mfc: Added support for clk_prepare 2012-03-08 07:42:52 -03:00
s5p-tv Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media 2012-03-23 14:39:09 -07:00
saa7134 [media] Add support for KWorld PC150-U ATSC hybrid tuner card 2012-03-08 11:01:25 -03:00
saa7164 [media] media: saa7164: append $(srctree) to -I parameters 2012-03-08 10:41:57 -03:00
sn9c102 module_param: check type correctness for module_param_array 2012-01-13 09:32:16 +10:30
tlg2300 [media] tlg2300: fix up check_firmware() return 2012-01-16 12:38:00 -02:00
tm6000 [media] tm6000: Don't use pointer after freeing it in tm6000_ir_fini() 2012-02-08 10:59:56 -02:00
usbvision Merge tag 'v3.2-rc2' into staging/for_v3.3 2011-11-23 19:42:09 -02:00
uvc [media] uvcvideo: uvc_driver.c: use linux/atomic.h 2012-03-19 14:08:34 -03:00
zoran Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media 2012-01-18 12:53:54 -08:00
adp1653.c [media] adp1653: included linux/module.h twice 2012-03-08 10:39:54 -03:00
adv7170.c [media] convert drivers/media/* to use module_i2c_driver() 2012-03-08 08:48:01 -03:00
adv7175.c [media] convert drivers/media/* to use module_i2c_driver() 2012-03-08 08:48:01 -03:00
adv7180.c [media] convert drivers/media/* to use module_i2c_driver() 2012-03-08 08:48:01 -03:00
adv7183_regs.h [media] adv7183: add adv7183 decoder driver 2012-03-19 15:04:10 -03:00
adv7183.c [media] adv7183: add adv7183 decoder driver 2012-03-19 15:04:10 -03:00
adv7343_regs.h
adv7343.c [media] convert drivers/media/* to use module_i2c_driver() 2012-03-08 08:48:01 -03:00
ak881x.c [media] convert drivers/media/* to use module_i2c_driver() 2012-03-08 08:48:01 -03:00
aptina-pll.c [media] v4l: Aptina-style sensor PLL support 2012-03-19 18:53:39 -03:00
aptina-pll.h [media] v4l: Aptina-style sensor PLL support 2012-03-19 18:53:39 -03:00
arv.c [media] Stop using linux/version.h on most video drivers 2011-07-27 17:53:12 -03:00
as3645a.c [media] convert drivers/media/* to use module_i2c_driver() 2012-03-08 08:48:01 -03:00
atmel-isi.c [media] V4L: atmel-isi: add clk_prepare()/clk_unprepare() functions 2012-01-23 18:13:21 -02:00
bt819.c [media] convert drivers/media/* to use module_i2c_driver() 2012-03-08 08:48:01 -03:00
bt856.c [media] convert drivers/media/* to use module_i2c_driver() 2012-03-08 08:48:01 -03:00
bt866.c [media] convert drivers/media/* to use module_i2c_driver() 2012-03-08 08:48:01 -03:00
btcx-risc.c
btcx-risc.h
bw-qcam.c [media] drivers/media/video: add missing kfree 2011-07-27 17:55:55 -03:00
c-qcam.c module_param: make bool parameters really bool (drivers & misc) 2012-01-13 09:32:20 +10:30
cs53l32a.c [media] convert drivers/media/* to use module_i2c_driver() 2012-03-08 08:48:01 -03:00
cs5345.c [media] convert drivers/media/* to use module_i2c_driver() 2012-03-08 08:48:01 -03:00
cs8420.h
cx2341x.c
fsl-viu.c [media] convert drivers/media/* to use module_platform_driver() 2012-01-10 23:27:13 -02:00
hexium_gemini.c Merge branch 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux 2011-11-06 19:44:47 -08:00
hexium_orion.c Merge branch 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux 2011-11-06 19:44:47 -08:00
ibmmpeg2.h
imx074.c [media] convert drivers/media/* to use module_i2c_driver() 2012-03-08 08:48:01 -03:00
indycam.c [media] convert drivers/media/* to use module_i2c_driver() 2012-03-08 08:48:01 -03:00
indycam.h
ir-kbd-i2c.c [media] convert drivers/media/* to use module_i2c_driver() 2012-03-08 08:48:01 -03:00
Kconfig [media] v4l: Add driver for Micron MT9M032 camera sensor 2012-03-19 18:56:33 -03:00
ks0127.c [media] convert drivers/media/* to use module_i2c_driver() 2012-03-08 08:48:01 -03:00
ks0127.h
m52790.c [media] convert drivers/media/* to use module_i2c_driver() 2012-03-08 08:48:01 -03:00
Makefile [media] v4l: Add driver for Micron MT9M032 camera sensor 2012-03-19 18:56:33 -03:00
mem2mem_testdev.c [media] V4L: vb2: prepare to support multi-size buffers 2011-11-03 18:28:28 -02:00
meye.c
meye.h
msp3400-driver.c [media] convert drivers/media/* to use module_i2c_driver() 2012-03-08 08:48:01 -03:00
msp3400-driver.h module_param: make bool parameters really bool (drivers & misc) 2012-01-13 09:32:20 +10:30
msp3400-kthreads.c [media] msp3400: Add standards detection to the driver 2011-10-08 08:01:34 -03:00
mt9m001.c [media] convert drivers/media/* to use module_i2c_driver() 2012-03-08 08:48:01 -03:00
mt9m032.c [media] v4l: Add driver for Micron MT9M032 camera sensor 2012-03-19 18:56:33 -03:00
mt9m111.c [media] convert drivers/media/* to use module_i2c_driver() 2012-03-08 08:48:01 -03:00
mt9p031.c [media] mt9p031: Use generic PLL setup code 2012-03-19 18:54:22 -03:00
mt9t001.c [media] convert drivers/media/* to use module_i2c_driver() 2012-03-08 08:48:01 -03:00
mt9t031.c [media] convert drivers/media/* to use module_i2c_driver() 2012-03-08 08:48:01 -03:00
mt9t112.c [media] convert drivers/media/* to use module_i2c_driver() 2012-03-08 08:48:01 -03:00
mt9v011.c [media] convert drivers/media/* to use module_i2c_driver() 2012-03-08 08:48:01 -03:00
mt9v022.c [media] convert drivers/media/* to use module_i2c_driver() 2012-03-08 08:48:01 -03:00
mt9v032.c [media] convert drivers/media/* to use module_i2c_driver() 2012-03-08 08:48:01 -03:00
mx1_camera.c [media] soc-camera: remove redundant parameter from .set_bus_param() 2012-01-06 11:00:23 -02:00
mx2_camera.c [media] media: i.MX27 camera: Add resizing support 2012-03-08 10:06:44 -03:00
mx2_emmaprp.c [media] MEM2MEM: Add support for eMMa-PrP mem2mem operations 2012-02-28 07:19:24 -03:00
mx3_camera.c dmaengine/dma_slave: introduce inline wrappers 2012-03-21 19:20:22 +05:30
mxb.c Merge branch 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux 2011-11-06 19:44:47 -08:00
mxb.h
noon010pc30.c [media] convert drivers/media/* to use module_i2c_driver() 2012-03-08 08:48:01 -03:00
omap1_camera.c [media] convert drivers/media/* to use module_platform_driver() 2012-01-10 23:27:13 -02:00
omap24xxcam-dma.c [media] [trivial] omap24xxcam-dma: Fix logical test 2011-12-09 20:28:42 -02:00
omap24xxcam.c [media] convert drivers/media/* to use module_platform_driver() 2012-01-10 23:27:13 -02:00
omap24xxcam.h
ov772x.c [media] convert drivers/media/* to use module_i2c_driver() 2012-03-08 08:48:01 -03:00
ov2640.c [media] convert drivers/media/* to use module_i2c_driver() 2012-03-08 08:48:01 -03:00
ov5642.c [media] convert drivers/media/* to use module_i2c_driver() 2012-03-08 08:48:01 -03:00
ov6650.c [media] convert drivers/media/* to use module_i2c_driver() 2012-03-08 08:48:01 -03:00
ov7670.c [media] convert drivers/media/* to use module_i2c_driver() 2012-03-08 08:48:01 -03:00
ov9640.c [media] convert drivers/media/* to use module_i2c_driver() 2012-03-08 08:48:01 -03:00
ov9640.h [media] ov9640: convert to the control framework 2011-11-03 18:28:36 -02:00
ov9740.c [media] convert drivers/media/* to use module_i2c_driver() 2012-03-08 08:48:01 -03:00
pms.c [media] Stop using linux/version.h on most video drivers 2011-07-27 17:53:12 -03:00
pxa_camera.c [media] V4L: pxa_camera: add clk_prepare/clk_unprepare calls 2012-03-19 22:11:07 -03:00
rj54n1cb0c.c [media] convert drivers/media/* to use module_i2c_driver() 2012-03-08 08:48:01 -03:00
s5k6aa.c [media] convert drivers/media/* to use module_i2c_driver() 2012-03-08 08:48:01 -03:00
s2255drv.c [media] s2255drv: fix some endian bugs 2012-03-08 10:39:56 -03:00
saa711x_regs.h
saa717x.c [media] convert drivers/media/* to use module_i2c_driver() 2012-03-08 08:48:01 -03:00
saa6588.c [media] convert drivers/media/* to use module_i2c_driver() 2012-03-08 08:48:01 -03:00
saa7110.c [media] convert drivers/media/* to use module_i2c_driver() 2012-03-08 08:48:01 -03:00
saa7115.c [media] convert drivers/media/* to use module_i2c_driver() 2012-03-08 08:48:01 -03:00
saa7121.h
saa7127.c [media] convert drivers/media/* to use module_i2c_driver() 2012-03-08 08:48:01 -03:00
saa7146.h
saa7146reg.h
saa7185.c [media] convert drivers/media/* to use module_i2c_driver() 2012-03-08 08:48:01 -03:00
saa7191.c [media] convert drivers/media/* to use module_i2c_driver() 2012-03-08 08:48:01 -03:00
saa7191.h
sh_mobile_ceu_camera.c [media] V4L: sh_mobile_ceu_camera: maximum image size depends on the hardware version 2012-03-19 22:11:06 -03:00
sh_mobile_csi2.c [media] convert drivers/media/* to use module_platform_driver() 2012-01-10 23:27:13 -02:00
sh_vou.c drivers/media: Add module.h to all files using it implicitly 2011-10-31 19:31:51 -04:00
soc_camera_platform.c [media] convert drivers/media/* to use module_platform_driver() 2012-01-10 23:27:13 -02:00
soc_camera.c [media] V4L: soc-camera: call soc_camera_power_on() after adding the client to the host 2012-03-19 22:11:05 -03:00
soc_mediabus.c [media] V4L: soc-camera: add helper functions for new bus configuration type 2011-11-03 18:27:13 -02:00
sr030pc30.c [media] convert drivers/media/* to use module_i2c_driver() 2012-03-08 08:48:01 -03:00
stk-sensor.c
stk-webcam.c Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media 2012-01-15 12:49:56 -08:00
stk-webcam.h
tcm825x.c drivers/media: Add module.h to all files using it implicitly 2011-10-31 19:31:51 -04:00
tcm825x.h
tda7432.c [media] convert drivers/media/* to use module_i2c_driver() 2012-03-08 08:48:01 -03:00
tda9840.c [media] convert drivers/media/* to use module_i2c_driver() 2012-03-08 08:48:01 -03:00
tea6415c.c [media] convert drivers/media/* to use module_i2c_driver() 2012-03-08 08:48:01 -03:00
tea6415c.h
tea6420.c [media] convert drivers/media/* to use module_i2c_driver() 2012-03-08 08:48:01 -03:00
tea6420.h
ths7303.c [media] convert drivers/media/* to use module_i2c_driver() 2012-03-08 08:48:01 -03:00
timblogiw.c dmaengine/dma_slave: introduce inline wrappers 2012-03-21 19:20:22 +05:30
tlv320aic23b.c [media] convert drivers/media/* to use module_i2c_driver() 2012-03-08 08:48:01 -03:00
tuner-core.c [media] convert drivers/media/* to use module_i2c_driver() 2012-03-08 08:48:01 -03:00
tvaudio.c [media] convert drivers/media/* to use module_i2c_driver() 2012-03-08 08:48:01 -03:00
tveeprom.c [media] tveeprom: update hauppauge tuner list thru 181 2012-02-28 18:46:53 -03:00
tvp514x_regs.h
tvp514x.c [media] convert drivers/media/* to use module_i2c_driver() 2012-03-08 08:48:01 -03:00
tvp5150_reg.h [media] tvp5150: Add video format registers configuration values 2011-10-08 08:01:52 -03:00
tvp5150.c [media] media: tvp5150: support g_mbus_fmt callback 2012-03-08 12:07:14 -03:00
tvp7002_reg.h
tvp7002.c [media] convert drivers/media/* to use module_i2c_driver() 2012-03-08 08:48:01 -03:00
tw9910.c [media] convert drivers/media/* to use module_i2c_driver() 2012-03-08 08:48:01 -03:00
upd64031a.c [media] convert drivers/media/* to use module_i2c_driver() 2012-03-08 08:48:01 -03:00
upd64083.c [media] convert drivers/media/* to use module_i2c_driver() 2012-03-08 08:48:01 -03:00
v4l2-common.c Remove all #inclusions of asm/system.h 2012-03-28 18:30:03 +01:00
v4l2-compat-ioctl32.c [media] v4l: Add custom compat_ioctl32 operation 2012-03-19 14:06:12 -03:00
v4l2-ctrls.c [media] Two small string fixes in v4l2-ctrls.c 2012-03-19 14:03:35 -03:00
v4l2-dev.c Disintegrate and delete asm/system.h 2012-03-28 15:58:21 -07:00
v4l2-device.c [media] media: fix truncated entity specification 2011-12-20 09:31:50 -02:00
v4l2-event.c Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media 2011-11-12 00:03:50 -02:00
v4l2-fh.c drivers/media: Add export.h for EXPORT_SYMBOL/THIS_MODULE as required 2011-10-31 19:31:51 -04:00
v4l2-int-device.c drivers/media: Add module.h to all files using it implicitly 2011-10-31 19:31:51 -04:00
v4l2-ioctl.c [media] -EINVAL -> -ENOTTY 2012-03-19 22:36:13 -03:00
v4l2-mem2mem.c [media] media: mem2mem: eliminate possible NULL pointer dereference 2011-09-06 15:03:26 -03:00
v4l2-subdev.c [media] v4l2-subdev: add start/end messages for log_status 2012-02-14 16:38:23 -02:00
via-camera.c Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media 2012-01-15 12:49:56 -08:00
via-camera.h
videobuf2-core.c [media] videobuf2-core: fix a warning at vb2 2011-12-30 16:12:43 -02:00
videobuf2-dma-contig.c [media] media: vb2: dma contig allocator: use dma_addr instread of paddr 2011-09-06 15:05:10 -03:00
videobuf2-dma-sg.c [media] media: vb2: fix potential deadlock in mmap vs. get_userptr handling 2011-12-30 16:06:49 -02:00
videobuf2-memops.c [media] media: vb2: fix potential deadlock in mmap vs. get_userptr handling 2011-12-30 16:06:49 -02:00
videobuf2-vmalloc.c [media] media: vb2: support userptr for PFN mappings 2012-03-08 07:42:17 -03:00
videobuf-core.c
videobuf-dma-contig.c
videobuf-dma-sg.c [media] videobuf_pages_to_sg: sglist[0] length problem 2011-07-27 17:52:19 -03:00
videobuf-dvb.c [media] videobuf-dvb: avoid spurious ENOMEM when CONFIG_DVB_NET=n 2012-01-06 12:42:19 -02:00
videobuf-vmalloc.c
vino.c [media] v4l: Casting (void *) value returned by kmalloc is useless 2011-11-24 21:06:57 -02:00
vino.h
vivi.c [media] vivi: use v4l2_ctrl_subscribe_event 2012-02-14 16:38:52 -02:00
vp27smpx.c [media] convert drivers/media/* to use module_i2c_driver() 2012-03-08 08:48:01 -03:00
vpx3220.c [media] convert drivers/media/* to use module_i2c_driver() 2012-03-08 08:48:01 -03:00
vs6624_regs.h [media] vs6624: add vs6624 sensor driver 2012-03-19 15:04:26 -03:00
vs6624.c [media] vs6624: add vs6624 sensor driver 2012-03-19 15:04:26 -03:00
w9966.c [media] /w9966: Fix a build warning 2012-03-19 15:37:59 -03:00
wm8739.c [media] convert drivers/media/* to use module_i2c_driver() 2012-03-08 08:48:01 -03:00
wm8775.c [media] convert drivers/media/* to use module_i2c_driver() 2012-03-08 08:48:01 -03:00
zr364xx.c USB: convert drivers/media/* to use module_usb_driver() 2011-11-18 09:46:12 -08:00