summaryrefslogtreecommitdiffstats
path: root/drivers (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6 into nextDmitry Torokhov2008-07-212306-169410/+202383
|\
| * Merge branch 'drm-fixes' of ↵Linus Torvalds2008-07-211-1/+3
| |\ | | | | | | | | | | | | | | | | | | git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6 * 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6: gpu: re-order GPU subdirectory vs char for AGP vs DRM startup.
| | * gpu: re-order GPU subdirectory vs char for AGP vs DRM startup.Dave Airlie2008-07-211-1/+3
| | | | | | | | | | | | Signed-off-by: Dave Airlie <airlied@linux.ie>
| * | Merge branch 'for-linus' of git://git.o-hand.com/linux-mfdLinus Torvalds2008-07-212-166/+224
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'for-linus' of git://git.o-hand.com/linux-mfd: mfd: let asic3 use mem resource instead of bus_shift mfd: remove DS1WM register definitions from asic3.h mfd: add ASIC3_CONFIG_GPIO templates mfd: fix the asic3 irq demux code mfd: asic3 should depend on gpiolib mfd: fix asic3 config array initialisation mfd: move asic3 probe functions into __init section mfd: Use uppercase only for asic3 macros and defines mfd: use dev_* macros for asic3 debugging mfd: New asic3 gpio configuration code mfd: asic3 children platform data removal mfd: asic3 gpiolib support
| | * | mfd: let asic3 use mem resource instead of bus_shiftPhilipp Zabel2008-07-201-6/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The bus_shift parameter in platform_data is not needed as we can tell the driver with the IOMEM_RESOURCE whether the ASIC is located on a 16bit or 32bit memory bus. The htc-egpio driver uses a more descriptive bus_width parameter, but for drivers where the register map size fixed, we don't even need this. Signed-off-by: Philipp Zabel <philipp.zabel@gmail.com> Signed-off-by: Samuel Ortiz <sameo@openedhand.com>
| | * | mfd: fix the asic3 irq demux codePhilipp Zabel2008-07-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Wrong irq numbers were given to desc->handle_irq, which on some devices caused endless loops (asic3_irq_demux calling itself, basically). Signed-off-by: Philipp Zabel <philipp.zabel@gmail.com> Signed-off-by: Samuel Ortiz <sameo@openedhand.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
| | * | mfd: asic3 should depend on gpiolibSamuel Ortiz2008-07-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now that asic3 implements the gpiolib API, it should depend on it at build time. Signed-off-by: Samuel Ortiz <sameo@openedhand.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
| | * | mfd: fix asic3 config array initialisationPhilipp Zabel2008-07-201-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Our memset length was incorrect. Tested-by: Philipp Zabel <philipp.zabel@gmail.com> Signed-off-by: Samuel Ortiz <sameo@openedhand.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
| | * | mfd: move asic3 probe functions into __init sectionPhilipp Zabel2008-07-201-6/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Potentially free some memory by moving the _probe functions into __init. Signed-off-by: Philipp Zabel <philipp.zabel@gmail.com> Signed-off-by: Samuel Ortiz <sameo@openedhand.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
| | * | mfd: Use uppercase only for asic3 macros and definesSamuel Ortiz2008-07-201-44/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Let's be consistent and use uppercase only, for both macro and defines. Signed-off-by: Samuel Ortiz <sameo@openedhand.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
| | * | mfd: use dev_* macros for asic3 debuggingSamuel Ortiz2008-07-201-14/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | We replace the various printks, and use the dev_* macros instead. Signed-off-by: Samuel Ortiz <sameo@openedhand.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
| | * | mfd: New asic3 gpio configuration codeSamuel Ortiz2008-07-201-56/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The ASIC3 GPIO configuration code is a bit obscure and hardly readable. This patch changes it so that it is now more readable and understandable, by being more explicit. Signed-off-by: Samuel Ortiz <sameo@openedhand.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
| | * | mfd: asic3 children platform data removalSamuel Ortiz2008-07-201-8/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Platform devices should be dynamically allocated, and each supported device should have its own platform data. For now we just remove this buggy code. Signed-off-by: Samuel Ortiz <sameo@openedhand.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
| | * | mfd: asic3 gpiolib supportSamuel Ortiz2008-07-201-71/+153
| | |/ | | | | | | | | | | | | | | | | | | | | | ASIC3 is, among other things, a GPIO extender. We should thus have it supporting the current gpiolib API. Signed-off-by: Samuel Ortiz <sameo@openedhand.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
| * | Merge git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/v4l-dvbLinus Torvalds2008-07-21271-5099/+47012
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/v4l-dvb: (277 commits) V4L/DVB (8415): gspca: Infinite loop in i2c_w() of etoms. V4L/DVB (8414): videodev/cx18: fix get_index bug and error-handling lock-ups V4L/DVB (8411): videobuf-dma-contig.c: fix 64-bit build for pre-2.6.24 kernels V4L/DVB (8410): sh_mobile_ceu_camera: fix 64-bit compiler warnings V4L/DVB (8397): video: convert select VIDEO_ZORAN_ZR36060 into depends on V4L/DVB (8396): video: Fix Kbuild dependency for VIDEO_IR_I2C V4L/DVB (8395): saa7134: Fix Kbuild dependency of ir-kbd-i2c V4L/DVB (8394): ir-common: CodingStyle fix: move EXPORT_SYMBOL_GPL to their proper places V4L/DVB (8393): media/video: Fix depencencies for VIDEOBUF V4L/DVB (8392): media/Kconfig: Convert V4L1_COMPAT select into "depends on" V4L/DVB (8390): videodev: add comment and remove magic number. V4L/DVB (8389): videodev: simplify get_index() V4L/DVB (8387): Some cosmetic changes V4L/DVB (8381): ov7670: fix compile warnings V4L/DVB (8380): saa7115: use saa7115_auto instead of saa711x as the autodetect driver name. V4L/DVB (8379): saa7127: Make device detection optional V4L/DVB (8378): cx18: move cx18_av_vbi_setup to av-core.c and rename to cx18_av_std_setup V4L/DVB (8377): ivtv/cx18: ensure the default control values are correct V4L/DVB (8376): cx25840: move cx25840_vbi_setup to core.c and rename to cx25840_std_setup V4L/DVB (8374): gspca: No conflict of 0c45:6011 with the sn9c102 driver. ...
| | * | V4L/DVB (8415): gspca: Infinite loop in i2c_w() of etoms.Jean-Francois Moine2008-07-201-1/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Jean-Francois Moine <moinejf@free.fr> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
| | * | V4L/DVB (8414): videodev/cx18: fix get_index bug and error-handling lock-upsHans Verkuil2008-07-202-5/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix a bug in get_index that was introduced earlier. Also fix two error handling lock-ups in videodev and cx18 that where found thanks to that bug. Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
| | * | V4L/DVB (8411): videobuf-dma-contig.c: fix 64-bit build for pre-2.6.24 kernelsHans Verkuil2008-07-201-0/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
| | * | V4L/DVB (8410): sh_mobile_ceu_camera: fix 64-bit compiler warningsHans Verkuil2008-07-201-3/+3
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
| | * | V4L/DVB (8397): video: convert select VIDEO_ZORAN_ZR36060 into depends onMauro Carvalho Chehab2008-07-201-24/+24
| | | | | | | | | | | | | | | | Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
| | * | V4L/DVB (8396): video: Fix Kbuild dependency for VIDEO_IR_I2CMauro Carvalho Chehab2008-07-201-4/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| | * | V4L/DVB (8395): saa7134: Fix Kbuild dependency of ir-kbd-i2cMauro Carvalho Chehab2008-07-202-82/+78
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| | * | V4L/DVB (8394): ir-common: CodingStyle fix: move EXPORT_SYMBOL_GPL to their ↵Mauro Carvalho Chehab2008-07-201-17/+8
| | | | | | | | | | | | | | | | | | | | | | | | proper places Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
| | * | V4L/DVB (8393): media/video: Fix depencencies for VIDEOBUFMauro Carvalho Chehab2008-07-202-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | VIDEOBUF_DVB depends on VIDEOBUF_CORE, not on VIDEOBUF_DMA_SG Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
| | * | V4L/DVB (8392): media/Kconfig: Convert V4L1_COMPAT select into "depends on"Mauro Carvalho Chehab2008-07-201-3/+2
| | | | | | | | | | | | | | | | Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
| | * | V4L/DVB (8390): videodev: add comment and remove magic number.Hans Verkuil2008-07-201-2/+6
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
| | * | V4L/DVB (8389): videodev: simplify get_index()Brandon Philips2008-07-201-48/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
| | * | V4L/DVB (8387): Some cosmetic changesHans Verkuil2008-07-201-12/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Those changes, together with some proper patches, will allow out-of-tree compilation for for kernels < 2.6.19 Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
| | * | V4L/DVB (8381): ov7670: fix compile warningsHans Verkuil2008-07-201-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl> Acked-by: Jonathan Corbet <corbet@lwn.net> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
| | * | V4L/DVB (8380): saa7115: use saa7115_auto instead of saa711x as the ↵Hans Verkuil2008-07-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | autodetect driver name. 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> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
| | * | V4L/DVB (8379): saa7127: Make device detection optionalJean Delvare2008-07-202-16/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
| | * | V4L/DVB (8378): cx18: move cx18_av_vbi_setup to av-core.c and rename to ↵Hans Verkuil2008-07-203-145/+147
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cx18_av_std_setup 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> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
| | * | V4L/DVB (8377): ivtv/cx18: ensure the default control values are correctHans Verkuil2008-07-205-70/+92
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
| | * | V4L/DVB (8376): cx25840: move cx25840_vbi_setup to core.c and rename to ↵Hans Verkuil2008-07-203-152/+155
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cx25840_std_setup 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> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
| | * | V4L/DVB (8374): gspca: No conflict of 0c45:6011 with the sn9c102 driver.Hans de Goede2008-07-202-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
| | * | V4L/DVB (8373): gspca: Hue, saturation and contrast controls added for ↵Hans de Goede2008-07-201-2/+175
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sn9c10x ovxxxx. (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> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
| | * | V4L/DVB (8372): gspca: Small ov6650 fixes.Hans de Goede2008-07-201-5/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
| | * | V4L/DVB (8371): gspca: Webcam 08ca:2050 added.Jean-Francois Moine2008-07-201-0/+2
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Jean-Francois Moine <moinejf@free.fr> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
| | * | V4L/DVB (8370): gspca: Webcam 0461:0821 added.Jean-Francois Moine2008-07-202-4/+12
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Jean-Francois Moine <moinejf@free.fr> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
| | * | V4L/DVB (8369): gspca: Bad initialization of sn9c102 ov7630.Jean-Francois Moine2008-07-202-3/+3
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Jean-Francois Moine <moinejf@free.fr> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
| | * | V4L/DVB (8367): gspca: Light frequency filter / exposure / clean-up for ↵Andoni Zubimendi2008-07-201-22/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sn9c103 ov7630. Signed-off-by: Andoni Zubimendi <andoni.zubimendi@gmail.com> Signed-off-by: Jean-Francois Moine <moinejf@free.fr> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
| | * | V4L/DVB (8366): gspca: Better code for ov6650 and ov7630.Hans de Goede2008-07-201-57/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
| | * | V4L/DVB (8364): gspca: Support of powerline frequency for ov6650.Hans de Goede2008-07-201-7/+93
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Hans de Goede <j.w.r.degoede@hhs.nl> Signed-off-by: Jean-Francois Moine <moinejf@free.fr> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
| | * | V4L/DVB (8363): gspca: Bad image size with spca501.Hans de Goede2008-07-201-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Hans de Goede <j.w.r.degoede@hhs.nl> Signed-off-by: Jean-Francois Moine <moinejf@free.fr> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
| | * | V4L/DVB (8362): gspca: Bad offset of the brightness sum in sn9c103 packets.Hans de Goede2008-07-201-7/+19
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Jean-Francois Moine <moinejf@free.fr> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
| | * | V4L/DVB (8361): gspca: Bad check of i2c write to sn9c10x.Andoni Zubimendi2008-07-201-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Andoni Zubimendi <andoni.zubimendi@gmail.com> Signed-off-by: Jean-Francois Moine <moinejf@free.fr> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
| | * | V4L/DVB (8360): gspca: Bad initialization of sn9c103 - ov7630.Andoni Zubimendi2008-07-201-12/+50
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Andoni Zubimendi <andoni.zubimendi@gmail.com> Signed-off-by: Jean-Francois Moine <moinejf@free.fr> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
| | * | V4L/DVB (8359): gspca: Adds register aliases for zc03xx registersMauro Carvalho Chehab2008-07-202-4074/+4354
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Thanks to http://zc0302.sourceforge.net/zc0302.php, we have some hints about what each zc3xx register means. Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org> Signed-off-by: Jean-Francois Moine <moinejf@free.fr>
| | * | V4L/DVB (8358): gspca: Better initialization of sn9c120 - ov7660.Jean-Francois Moine2008-07-201-40/+85
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Jean-Francois Moine <moinejf@free.fr> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
| | * | V4L/DVB (8357): gspca: Perfect exposure for sn9c10x, sensor ov6650.Hans de Goede2008-07-201-11/+43
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Hans de Goede <j.w.r.degoede@hhs.nl> Signed-off-by: Jean-Francois Moine <moinejf@free.fr> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-25 07:53:21 +0100