summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2008-07-17backport commit 4f2a0c3cdbead635f8aae729f550fcabcb73d1a5Mauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> Author: David Woodhouse <dwmw2@infradead.org> Date: Sat May 24 00:11:44 2008 +0100 bt8xx: treat firmware data as const kernel-sync: Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2008-07-17backport commit 3a9282cacdb13466b9c745518237938434dbde0bMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> Author: David Woodhouse <dwmw2@infradead.org> Date: Sat May 24 00:13:08 2008 +0100 gp8psk: treat firmware data as const Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2008-07-17backport commit 5794e1b14bcd9817c5fa27d3254996f0d9551296Mauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> Author: Jonathan Corbet <corbet@lwn.net> Date: Thu May 15 16:26:57 2008 -0600 dvb: cdev lock_kernel() pushdown kernel-sync: Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2008-07-17backport commit cad84238056babf4e4e6b0de183238224aab8177Mauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> Author: Arnd Bergmann <arnd@arndb.de> Date: Tue May 20 19:16:12 2008 +0200 media-radio-miropcm20-rds: BKL pushdown kernel-sync: Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2008-07-17backport commit e62f89f2aebd57f48687f139c20cf6375693b622Mauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> Author: David Woodhouse <dwmw2@infradead.org> cxusb: treat firmware data as const ...which means allocating our own copy when we want to modify it. (stupid thinko fixed by mkrufky) kernel-sync: Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2008-07-17backport commit bc179153ae2334efe28cf4f3300e024da7d83753Mauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> Author: David Woodhouse <dwmw2@infradead.org> Date: Sat May 24 00:12:23 2008 +0100 dvb frontends: treat firmware data as const kernel-sync: Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2008-07-17backport commit c63e87e90abb5d3ecd05d6c6eba94163bf8c1760Mauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> Author: David Woodhouse <dwmw2@infradead.org> Date: Sat May 24 00:13:34 2008 +0100 tuners: treat firmware data as const kernel-sync: Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2008-07-17Sync with arm pxa filesMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> kernel-sync: Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2008-07-17Sync with whitespaces on -gitMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> kernel-sync: Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2008-07-17Fix autodetection for SAA7134_BOARD_ASUSTeK_P7131_ANALOGMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2008-07-17video: convert select VIDEO_ZORAN_ZR36060 into depends onMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2008-07-17video: Fix Kbuild dependency for VIDEO_IR_I2CMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> Instead of letting VIDEO_IR_I2C to be selected by VIDEO_IR, if I2C, convert it into a symbol that depends on both VIDEO_IR and I2C. Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2008-07-17saa7134: Fix Kbuild dependency of ir-kbd-i2cMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> Currently, saa7134 is dependent of ir-kbd-i2c, since it uses a symbol that is defined there. However, as this symbol is used only on saa7134, there's no sense on keeping it defined there (or on ir-commons). So, let's move it to saa7134 and remove one symbol for being exported. Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2008-07-17ir-common: CodingStyle fix: move EXPORT_SYMBOL_GPL to their proper placesMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2008-07-17media/video: Fix depencencies for VIDEOBUFMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> VIDEOBUF_DVB depends on VIDEOBUF_CORE, not on VIDEOBUF_DMA_SG Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2008-07-17media/Kconfig: Convert V4L1_COMPAT select into "depends on"Mauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2008-07-17Improve make_config.pl scriptMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> This patch adds the capability of processing some tags that contains "if", like: menuconfig foo if bar boolean foo if bar tristate foo if bar default foo if bar Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2008-07-17videodev: add comment and remove magic number.Hans Verkuil
From: Hans Verkuil <hverkuil@xs4all.nl> Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
2008-06-24videodev: simplify get_index()Brandon Philips
Use Hans Verkuil's suggested method of implementing get_index which doesn't depend on class_for_each_device and instead uses the video_device array. This simplifies the code and reduces its memory footprint. Signed-off-by: Brandon Philips <bphilips@suse.de>
2008-07-17btaudio/tvmixer/miropcm20-rds: fix 2.6.16 compilationHans Verkuil
From: Hans Verkuil <hverkuil@xs4all.nl> Missed a few warnings, this patch fixes them. Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
2008-07-17videodev: add support for kernels < 2.6.19Hans Verkuil
From: Hans Verkuil <hverkuil@xs4all.nl> Add the necessary compatibility code to handle the struct device/struct class_device differences. It was too much work (with uncertain benefits) to convert several drivers to handle kernels <2.6.19, so they are not built on these older kernels. Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
2008-07-17videodev/dabusb/dvbdev: fix 2.6.16 compilationHans Verkuil
From: Hans Verkuil <hverkuil@xs4all.nl> struct file_operations was made const in 2.6.17. Cast const away when compiling under 2.6.16. Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
2008-07-17gspca/tea575x-tuner: fix compilation for kernels <= 2.6.17Hans Verkuil
From: Hans Verkuil <hverkuil@xs4all.nl> Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
2008-07-17cx18/smsusb: fix compile errors when building for kernels < 2.6.19Hans Verkuil
From: Hans Verkuil <hverkuil@xs4all.nl> Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
2008-07-17v4l-dvb: fix compilation issues for kernel 2.6.21Hans Verkuil
From: Hans Verkuil <hverkuil@xs4all.nl> - fix unused function warnings in v4l2-i2c-drv.h and v4l2-i2c-drv-legacy.h - fix ivtvfb.c compile warning that would in fact lead to an oops - disable DVB_DRX397XD for kernels <= 2.6.21: it needs div64_64 Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
2008-07-17mt9m001/saa7127: fix 2.6.25 kernel build warning/error.Hans Verkuil
From: Hans Verkuil <hverkuil@xs4all.nl> Allow these to build for kernels < 2.6.26. Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
2008-07-17ov7670: fix compile warningsHans Verkuil
From: Hans Verkuil <hverkuil@xs4all.nl> Acked-by: Jonathan Corbet <corbet@lwn.net> Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
2008-07-17saa7115: use saa7115_auto instead of saa711x as the autodetect driver name.Hans Verkuil
From: Hans Verkuil <hverkuil@xs4all.nl> Having an _auto suffix is less ambiguous than a 'saa711x' identifier. It's also used like this in the saa7127 driver. Thanks to Jean Delvare for suggesting this. Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
2008-07-17saa7127: Make device detection optionalHans Verkuil
From: Jean Delvare <khali@linux-fr.org> The saa7127 driver supports all of SAA7126, SAA7127, SAA7128 and SAA1729 devices. Declare all these devices, so that board drivers can tell which device is present, instead of always relying on auto-detection (which needs to write to the chip, eek!). We still need the detection for ivtv, so a special device name "saa7127_auto" can be used when the caller doesn't know exactly which device is present. Signed-off-by: Jean Delvare <khali@linux-fr.org> Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
2008-07-17cx18: move cx18_av_vbi_setup to av-core.c and rename to cx18_av_std_setupHans Verkuil
From: Hans Verkuil <hverkuil@xs4all.nl> Same issue as for cx25840: this function sets up the standard timings and has nothing to do with VBI setup. Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
2008-07-17ivtv/cx18: ensure the default control values are correctHans Verkuil
From: Hans Verkuil <hverkuil@xs4all.nl> For several MPEG controls and the volume control the default as returned by VIDIOC_QUERYCTRL was incorrect and did not match the actual initial value. This is now fixed for cx18 and ivtv. Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
2008-07-17cx25840: move cx25840_vbi_setup to core.c and rename to cx25840_std_setupHans Verkuil
From: Hans Verkuil <hverkuil@xs4all.nl> cx25840_vbi_setup has nothing to do with setting up VBI, but everything with setting up the standard. Move to cx25840-core.c and rename. Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
2008-07-17merge: http://linuxtv.org/hg/~jfrancois/gspca/Mauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2008-07-17Don't increment if a patch were renamedMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2008-07-17Avoid running checkpatch.pl for merge patchesMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2008-07-17gspca: No conflict of 0c45:6011 with the sn9c102 driver.Jean-Francois Moine
From: Hans de Goede <j.w.r.degoede@hhs.nl> The sn9c102 driver claims to support usb-ID 0x0c45:0x6011, which is a sn9c102 with ov6650 sensor, but the sn9c102 driver does not support the ov6650 sensor (tested). Also the sn9c102 driver claims to support usb-ID 0x0c45:0x603f, which is a sn9c102 with CISVF10 sensor, but the sn9c102 driver does not support the CISVF10 sensor (not tested). Signed-off-by: Hans de Goede <j.w.r.degoede@hhs.nl> Signed-off-by: Jean-Francois Moine <moinejf@free.fr>
2008-07-17gspca: Hue, saturation and contrast controls added for sn9c10x ovxxxx.Jean-Francois Moine
From: Hans de Goede <j.w.r.degoede@hhs.nl> (does not work with ov6650) Signed-off-by: Hans de Goede <j.w.r.degoede@hhs.nl> Signed-off-by: Jean-Francois Moine <moinejf@free.fr>
2008-07-17gspca: Small ov6650 fixes.Jean-Francois Moine
From: Hans de Goede <j.w.r.degoede@hhs.nl> 1) Don't change the red and blue pre-gain's from their defaults 2) Actually make the powerline freq ctrl available to userspace Signed-off-by: Hans de Goede <j.w.r.degoede@hhs.nl> Signed-off-by: Jean-Francois Moine <moinejf@free.fr>
2008-07-17gspca: Webcam 08ca:2050 added.Jean-Francois Moine
From: Jean-Francois Moine <moinejf@free.fr> Signed-off-by: Jean-Francois Moine <moinejf@free.fr>
2008-07-17gspca: Webcam 0461:0821 added.Jean-Francois Moine
From: Jean-Francois Moine <moinejf@free.fr> Signed-off-by: Jean-Francois Moine <moinejf@free.fr>
2008-07-17gspca: Bad initialization of sn9c102 ov7630.Jean-Francois Moine
From: Jean-Francois Moine <moinejf@free.fr> Signed-off-by: Jean-Francois Moine <moinejf@free.fr>
2008-07-17merge: v4l-dvbJean-Francois Moine
2008-07-17gspca: Light frequency filter / exposure / clean-up for sn9c103 ov7630.Jean-Francois Moine
From: Andoni Zubimendi <andoni.zubimendi@gmail.com> Signed-off-by: Andoni Zubimendi <andoni.zubimendi@gmail.com> Signed-off-by: Jean-Francois Moine <moinejf@free.fr>
2008-07-17soc_camera_platform: Add SoC Camera Platform driverMagnus Damm
This patch adds a simple platform camera device. Useful for testing cameras with SoC camera host drivers. Only one single pixel format and resolution combination is supported. Signed-off-by: Magnus Damm <damm@igel.co.jp> Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@pengutronix.de> --- drivers/media/video/Kconfig | 6 drivers/media/video/Makefile | 1 drivers/media/video/soc_camera_platform.c | 198 +++++++++++++++++++++++++++++ include/media/soc_camera_platform.h | 15 ++ 4 files changed, 220 insertions(+)
2008-07-17sh_mobile_ceu_camera: Add SuperH Mobile CEU driver V3Magnus Damm
This is V3 of the SuperH Mobile CEU soc_camera driver. The CEU hardware block is configured in a transparent data fetch mode, frames are captured from the attached camera and written to physically contiguous memory buffers provided by the newly added videobuf-dma-contig queue. Tested on sh7722 and sh7723 processors. Signed-off-by: Magnus Damm <damm@igel.co.jp> Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@pengutronix.de> --- Changes since V2: - remove SUPERH Kconfig dependency - move sh_mobile_ceu.h to include/media - add board callback support with enable_camera()/disable_camera() - add support for declare_coherent_memory - rework video memory limit - more verbose error messages Changes since V1: - fixed the CEU driver to work with the newly updated patches drivers/media/video/Kconfig | 8 drivers/media/video/Makefile | 1 drivers/media/video/sh_mobile_ceu_camera.c | 657 ++++++++++++++++++++++++++++ include/media/sh_mobile_ceu.h | 12 4 files changed, 678 insertions(+)
2008-07-16videobuf: Add physically contiguous queue code V3Magnus Damm
This is V3 of the physically contiguous videobuf queues patch. Useful for hardware such as the SuperH Mobile CEU which doesn't support scatter gatter bus mastering. Since it may be difficult to allocate large chunks of physically contiguous memory after some uptime due to fragmentation, this code allocates memory using dma_alloc_coherent(). Architectures supporting dma_declare_coherent_memory() can easily avoid fragmentation issues by using dma_declare_coherent_memory() to force dma_alloc_coherent() to allocate from a certain pre-allocated memory area. Signed-off-by: Magnus Damm <damm@igel.co.jp> Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@pengutronix.de> --- Changes since V2 - use dma_handle for physical address - use "scatter gather" instead of "scatter gatter" Changes since V1: - use dev_err() instead of pr_err() - remember size in struct videobuf_dma_contig_memory - keep struct videobuf_dma_contig_memory in .c file - let videobuf_to_dma_contig() return dma_addr_t - implement __videobuf_sync() - return statements, white space and other minor fixes drivers/media/video/Kconfig | 5 drivers/media/video/Makefile | 1 drivers/media/video/videobuf-dma-contig.c | 417 +++++++++++++++++++++++++++++ include/media/videobuf-dma-contig.h | 32 ++ 4 files changed, 455 insertions(+)
2008-07-16videobuf: Fix gather spellingMagnus Damm
Use "scatter gather" instead of "scatter gatter". Signed-off-by: Magnus Damm <damm@igel.co.jp> Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@pengutronix.de> --- drivers/media/video/videobuf-dma-sg.c | 2 +- drivers/media/video/videobuf-vmalloc.c | 2 +- include/media/videobuf-dma-sg.h | 2 +- include/media/videobuf-vmalloc.h | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-)
2008-07-16gspca: Better code for ov6650 and ov7630.Jean-Francois Moine
From: Hans de Goede <j.w.r.degoede@hhs.nl> sonixb: Common code between ov6650 and ov7630. Fix brightness oscillation with ov6650 sensor. Signed-off-by: Hans de Goede <j.w.r.degoede@hhs.nl> Signed-off-by: Jean-Francois Moine <moinejf@free.fr>
2008-07-16merge: http://linuxtv.org/hg/~endriss/v4l-dvbMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2008-07-16merge: http://linuxtv.org/hg/~awalls/v4l-dvbMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>