summaryrefslogtreecommitdiff
path: root/drivers/media
AgeCommit message (Collapse)AuthorFilesLines
2009-06-17soc-camera: unify i2c camera device platform dataGuennadi Liakhovetski2-4/+8
Unify i2c camera device platform data to point to struct soc_camera_link for a smooth transition to soc-camera as a platform driver. Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de> Signed-off-by: Paul Mundt <lethal@linux-sh.org>
2009-06-17Merge branch 'for_linus' of ↵Linus Torvalds235-6400/+21513
git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6 * 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6: (425 commits) V4L/DVB (11870): gspca - main: VIDIOC_ENUM_FRAMESIZES ioctl added. V4L/DVB (12004): poll method lose race condition V4L/DVB (11894): flexcop-pci: dmesg visible names broken V4L/DVB (11892): Siano: smsendian - declare function as extern V4L/DVB (11891): Siano: smscore - bind the GPIO SMS protocol V4L/DVB (11890): Siano: smscore - remove redundant code V4L/DVB (11889): Siano: smsdvb - add DVB v3 events V4L/DVB (11888): Siano: smsusb - remove redundant ifdef V4L/DVB (11887): Siano: smscards - add board (target) events V4L/DVB (11886): Siano: smscore - fix some new GPIO definitions names V4L/DVB (11885): Siano: Add new GPIO management interface V4L/DVB (11884): Siano: smssdio - revert to stand alone module V4L/DVB (11883): Siano: cards - add two additional (USB) devices V4L/DVB (11824): Siano: smsusb - change exit func debug msg V4L/DVB (11823): Siano: smsusb - fix typo in module description V4L/DVB (11822): Siano: smscore - bug fix at get_device_mode V4L/DVB (11821): Siano: smscore - fix isdb-t firmware name V4L/DVB (11820): Siano: smscore - fix byte ordering bug V4L/DVB (11819): Siano: smscore - fix get_common_buffer bug V4L/DVB (11818): Siano: smscards - assign gpio to HPG targets ...
2009-06-17Merge branch 'akpm'Linus Torvalds1-5/+89
* akpm: (182 commits) fbdev: bf54x-lq043fb: use kzalloc over kmalloc/memset fbdev: *bfin*: fix __dev{init,exit} markings fbdev: *bfin*: drop unnecessary calls to memset fbdev: bfin-t350mcqb-fb: drop unused local variables fbdev: blackfin has __raw I/O accessors, so use them in fb.h fbdev: s1d13xxxfb: add accelerated bitblt functions tcx: use standard fields for framebuffer physical address and length fbdev: add support for handoff from firmware to hw framebuffers intelfb: fix a bug when changing video timing fbdev: use framebuffer_release() for freeing fb_info structures radeon: P2G2CLK_ALWAYS_ONb tested twice, should 2nd be P2G2CLK_DAC_ALWAYS_ONb? s3c-fb: CPUFREQ frequency scaling support s3c-fb: fix resource releasing on error during probing carminefb: fix possible access beyond end of carmine_modedb[] acornfb: remove fb_mmap function mb862xxfb: use CONFIG_OF instead of CONFIG_PPC_OF mb862xxfb: restrict compliation of platform driver to PPC Samsung SoC Framebuffer driver: add Alpha Channel support atmel-lcdc: fix pixclock upper bound detection offb: use framebuffer_alloc() to allocate fb_info struct ... Manually fix up conflicts due to kmemcheck in mm/slab.c
2009-06-17videobuf-dma-contig: zero copy USERPTR supportMagnus Damm1-5/+89
Since videobuf-dma-contig is designed to handle physically contiguous memory, this patch modifies the videobuf-dma-contig code to only accept a user space pointer to physically contiguous memory. For now only VM_PFNMAP vmas are supported, so forget hotplug. On SuperH Mobile we use this with our sh_mobile_ceu_camera driver together with various multimedia accelerator blocks that are exported to user space using UIO. The UIO kernel code exports physically contiguous memory to user space and lets the user space application mmap() this memory and pass a pointer using the USERPTR interface for V4L2 zero copy operation. With this approach we support zero copy capture, hardware scaling and various forms of hardware encoding and decoding. [akpm@linux-foundation.org: coding-style fixes] Signed-off-by: Magnus Damm <damm@igel.co.jp> Cc: Johannes Weiner <hannes@cmpxchg.org> Cc: Paul Mundt <lethal@linux-sh.org> Acked-by: Mauro Carvalho Chehab <mchehab@infradead.org> Cc: Hans Verkuil <hverkuil@xs4all.nl> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2009-06-17V4L/DVB (11870): gspca - main: VIDIOC_ENUM_FRAMESIZES ioctl added.Hans de Goede1-0/+27
Signed-off-by: Hans de Goede <hdegoede@redhat.com> Signed-off-by: Jean-Francois Moine <moinejf@free.fr> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2009-06-17V4L/DVB (12004): poll method lose race conditionFigo.zhang3-12/+27
bttv-driver.c,cx23885-video.c,cx88-video.c: poll method lose race condition for capture video. Signed-off-by: Figo.zhang <figo1802@gmail.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2009-06-17V4L/DVB (11894): flexcop-pci: dmesg visible names brokenMatthias Schwarzott1-10/+10
Changeset 1589a993f074124c3edfff03656e910bb472eeaa broke user visible names of flexcop-pci devices, as it did reorder the enum of card types, but did not adjust the array containing the card names. Reorder the names, and uses [FC_AIR_DVBT] = "Air2PC/AirStar 2 DVB-T" assignment style for more clarity. It also adds the revision Number to the name for SkyStar rev. 2.3 and rev 2.6 as I think it is useful to see in log output. Signed-off-by: Matthias Schwarzott <zzam@gentoo.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2009-06-17V4L/DVB (11892): Siano: smsendian - declare function as externUri Shkolnik1-3/+3
Declare the object function as 'extern' Signed-off-by: Uri Shkolnik <uris@siano-ms.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2009-06-17V4L/DVB (11891): Siano: smscore - bind the GPIO SMS protocolUri Shkolnik1-0/+20
Bind SMS protocol commands to the GPIO commands Signed-off-by: Uri Shkolnik <uris@siano-ms.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2009-06-17V4L/DVB (11890): Siano: smscore - remove redundant codeUri Shkolnik1-13/+0
remove redundant code, which in the past handled the various components (now independent modules) registrations. Signed-off-by: Uri Shkolnik <uris@siano-ms.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2009-06-17V4L/DVB (11889): Siano: smsdvb - add DVB v3 eventsUri Shkolnik1-0/+48
Add various DVB-API v3 events, those events will trig target (card) events. Signed-off-by: Uri Shkolnik <uris@siano-ms.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2009-06-17V4L/DVB (11888): Siano: smsusb - remove redundant ifdefUri Shkolnik1-2/+0
Remove a redundant ifdef Signed-off-by: Uri Shkolnik <uris@siano-ms.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2009-06-17V4L/DVB (11887): Siano: smscards - add board (target) eventsUri Shkolnik2-0/+191
Add events handling for targets. All board-specific (target specific) should reside here. Signed-off-by: Uri Shkolnik <uris@siano-ms.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2009-06-17V4L/DVB (11886): Siano: smscore - fix some new GPIO definitions namesUri Shkolnik1-11/+10
Fix some definitions' names, in order to emphasize the names Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2009-06-17V4L/DVB (11885): Siano: Add new GPIO management interfaceUri Shkolnik3-4/+288
Add new GPIO management interface to replace old (buggy) one. Keeping old interface intact for now. Signed-off-by: Uri Shkolnik <uris@siano-ms.com> Acked-by: Michael Krufky <mkrufky@linuxtv.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2009-06-17V4L/DVB (11884): Siano: smssdio - revert to stand alone moduleUri Shkolnik1-2/+5
Make the SDIO interface driver a stand alone module. Signed-off-by: Uri Shkolnik <uris@siano-ms.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2009-06-17V4L/DVB (11883): Siano: cards - add two additional (USB) devicesUri Shkolnik3-2/+19
Add two additional USB targets, add these to the 'cards' modules and to the 'smsusb' module. Signed-off-by: Uri Shkolnik <uris@siano-ms.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2009-06-17V4L/DVB (11824): Siano: smsusb - change exit func debug msgUri Shkolnik1-1/+1
Change the debug message of the USB interface driver exit function. Signed-off-by: Uri Shkolnik <uris@siano-ms.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2009-06-17V4L/DVB (11823): Siano: smsusb - fix typo in module descriptionUri Shkolnik1-1/+1
Fix small typo in the module description Signed-off-by: Uri Shkolnik <uris@siano-ms.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2009-06-17V4L/DVB (11822): Siano: smscore - bug fix at get_device_modeUri Shkolnik1-1/+1
Fix bug that cause error log to echo also if success Signed-off-by: Uri Shkolnik <uris@siano-ms.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2009-06-17V4L/DVB (11821): Siano: smscore - fix isdb-t firmware nameUri Shkolnik1-1/+1
Signed-off-by: Uri Shkolnik <uris@siano-ms.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2009-06-17V4L/DVB (11820): Siano: smscore - fix byte ordering bugUri Shkolnik1-1/+6
Fix byte ordering bug. Signed-off-by: Uri Shkolnik <uris@siano-ms.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2009-06-17V4L/DVB (11819): Siano: smscore - fix get_common_buffer bugUri Shkolnik1-9/+29
get common buffers() should block operation until valid buffer is avaliable. Signed-off-by: Uri Shkolnik <uris@siano-ms.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2009-06-17V4L/DVB (11818): Siano: smscards - assign gpio to HPG targetsUri Shkolnik1-0/+5
Assign using the new gpio structures, i/o for exist HPG targets, without removing the old implementation. Signed-off-by: Uri Shkolnik <uris@siano-ms.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2009-06-17V4L/DVB (11817): Siano: smscards - fix wrong firmware assignmentUri Shkolnik1-3/+0
Remove wrong firmware assignments for Nova, Stellar Signed-off-by: Uri Shkolnik <uris@siano-ms.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2009-06-17V4L/DVB (11816): Siano: USB - move the device id table to the cards moduleUri Shkolnik1-14/+84
The card modules is the component which handles various targets, so the IDs table should reside within it. [mchehab@redhat.com: add missing smsendian.h include at smscoreapi.c] Signed-off-by: Uri Shkolnik <uris@siano-ms.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2009-06-17V4L/DVB (11815): Siano: bind infra-red componentUri Shkolnik5-14/+20
Add the infra-red to the makefile and declare the assignment in the cards components. [mchehab@redhat.com: Fixed a few trivial merge conflicts] Signed-off-by: Uri Shkolnik <uris@siano-ms.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2009-06-17V4L/DVB (11814): Siano: smscards - add gpio look-up tableUri Shkolnik1-0/+34
Add gpio look-up table for various requirements, any target may select any gpio and assign it to a function Signed-off-by: Uri Shkolnik <uris@siano-ms.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2009-06-17V4L/DVB (11813): Siano: move dvb-api headers' includes to dvb adapterUri Shkolnik2-7/+5
Move the DVB-API v3 headers' include list from the core component to the smsdvb (DVB adapter) which is the only one that uses them. Signed-off-by: Uri Shkolnik <uris@siano-ms.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2009-06-17V4L/DVB (11783): Siano: smsdvb - small typo fix ad module authorUri Shkolnik1-1/+1
Fix type at the module description Signed-off-by: Uri Shkolnik <uris@siano-ms.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2009-06-17V4L/DVB (11782): Siano: smsdvb - use 'push' status mechanismUri Shkolnik3-191/+366
This patch replace the old method of pulling the device status by sending "get_statistics" request, to push mode. This make status update much faster, and reduce various operation time (UHF scan now takes 15s instead of 2m). In order to make the change the following modification have been applied: 1) core header - update statistics headers. 2) dvb adapter - omit the statistics request, add handling of status indications. 3) core 'onresponse' - re-route messages addressed to other adapter to the dvb adapter. Signed-off-by: Uri Shkolnik <uris@siano-ms.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2009-06-17V4L/DVB (11781): Siano: smsdvb - add big endian supportUri Shkolnik1-1/+9
Add support for Siano protocol messages with big endian systems. Signed-off-by: Uri Shkolnik <uris@siano-ms.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2009-06-17V4L/DVB (11780): Siano: fix compilation error due to the lack of EXTERNAL_SYMBOLMauro Carvalho Chehab1-1/+3
Cc: Uri Shkolnik <urishk@yahoo.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2009-06-17V4L/DVB (11779): Siano: Makefile - add smsendian to buildUri Shkolnik1-1/+1
Add smsendian component to the module build Signed-off-by: Uri Shkolnik <uris@siano-ms.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2009-06-17V4L/DVB (11778): Siano: smsusb - lost buffers bug fixUri Shkolnik1-5/+8
This patch fixes a problem were protocol buffers have been lost during USB disconnect events. Signed-off-by: Uri Shkolnik <uris@siano-ms.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2009-06-17V4L/DVB (11777): Siano: smsusb - handle byte ordering and big endianityUri Shkolnik1-2/+4
This patch adds support for byte ordering and big endianity handling for the USB interface driver Signed-off-by: Uri Shkolnik <uris@siano-ms.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2009-06-17V4L/DVB (11776): Siano: smsusb - update licenseUri Shkolnik1-20/+20
This patch updates the license of the USB interface driver Signed-off-by: Uri Shkolnik <uris@siano-ms.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2009-06-17V4L/DVB (11729): Siano: smsdvb - remove redundent complete instructionUri Shkolnik1-1/+0
Remove redundant complete instruction from smsdvb, in the past this was used by the statistics state machine, but no longer. Signed-off-by: Uri Shkolnik <uris@siano-ms.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2009-06-17V4L/DVB (11728): Siano: smsdvb - modify licenseUri Shkolnik1-20/+20
Siano: smsdvb - Fix license to match all other Siano's files Signed-off-by: Uri Shkolnik <uris@siano-ms.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2009-06-17V4L/DVB (11727): Siano: core header - update include filesUri Shkolnik1-2/+7
Re-order the include files list Re-order the include files list, put the DVB-API v3 within its own section, within a define container. Signed-off-by: Uri Shkolnik <uris@siano-ms.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2009-06-17V4L/DVB (11726): Modify the file license to match all other Siano's filesUri Shkolnik1-24/+24
Modify the file license to match all other Siano's files Signed-off-by: Uri Shkolnik <uris@siano-ms.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2009-06-17V4L/DVB (11561): Siano: add messages handling for big-endian targetUri Shkolnik2-0/+132
Add code that modify the content of Siano's protocol messages when running with big-endian target. Signed-off-by: Uri Shkolnik <uris@siano-ms.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2009-06-17V4L/DVB (11559): Siano: add support for infra-red (IR) controllersUri Shkolnik2-0/+394
This patch add support for IR (infra-red) remote controllers. Further commits are needed in order to enable the activation of the IR components. Signed-off-by: Uri Shkolnik <uris@siano-ms.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2009-06-17V4L/DVB (11556): Siano: core header - indentationUri Shkolnik1-19/+23
Some more indentation for the smscoreapi.h There are no implementation changes in this patch. Signed-off-by: Uri Shkolnik <uris@siano-ms.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2009-06-17V4L/DVB (11555): Siano: core - move and update the main core structure ↵Uri Shkolnik2-36/+54
declaration smscoreapi - move the main core structure declaration to the header, in order to enable other components (such as IR) to use it. Signed-off-by: Uri Shkolnik <uris@siano-ms.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2009-06-17V4L/DVB (11554): Siano: core header - add definitions and structuresUri Shkolnik1-2/+25
Add new definitions (of Siano's protocol messages), and protocol structures (for future commits usage) Signed-off-by: Uri Shkolnik <uris@siano-ms.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2009-06-17V4L/DVB (11552): Siano: SDIO interface driver - remove two redundant linesUri Shkolnik1-2/+0
Remove two redundant lines, based on Klimov Alexey code review. Signed-off-by: Uri Shkolnik <uris@siano-ms.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2009-06-17V4L/DVB (11441): cx88-dsp: fixing 64bit mathMiroslav Sustek1-2/+15
cx88-dsp: fixing 64bit math on 32bit kernels Some gcc versions report the missing of __divdi3 [mchehab.redhat.com: CodingStyle fixes] Signed-off-by: Miroslav Sustek <sustmidown@centrum.cz> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2009-06-17V4L/DVB (11396): cx88: avoid reprogramming every audio register on A2 ↵Marton Balint1-6/+4
stereo/mono change This patch changes cx88_set_stereo to avoid resetting all of the audio registers on stereo/mono change if the audio standard is A2, and set only the AUD_CTL register. The benefit of this method is that it eliminates the annoying clicking noise on setting the audio mode to stereo or mono. The driver had used the same method 1.5 years ago (and for FM radio it still does), but a pretty big cleanup commit changed it to the "complete audio reset" method, although the reason for this move was not clear. (If somebody knows why it was necessary, please let me know!) The original commit: http://linuxtv.org/hg/v4l-dvb/rev/ffe313541d7d Signed-off-by: Marton Balint <cus@fazekas.hu> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2009-06-17V4L/DVB (11395): cx88: audio thread: if stereo detection is hw supported ↵Marton Balint1-18/+33
don't do it manually The sole purpose of the audio thread is to detect if stereo transmission is available, and if it is, then switch to stereo mode (and switch back, if it's no longer available). This manual autodetection is useful for some audio standards (e.g. A2) where cx88_get_stereo CAN detect stereo sound, but the cx2388x chip CANNOT auto-detect stereo sound. However, for other audio standards, the cx2388x chip CAN auto-detect the stereo sound, so the manual autodetection in the audio thread is not needed. In fact, it can cause serious problems because for some of these audio standards, cx88_get_stereo CANNOT detect the presence of stereo sound. Besides that, if the hardware automatically detects stereo/mono sound, you cannot set core->audiomode_current to the real current audio mode on channel change. With this patch, the manual autodetection is only used if audiomode_current is known after a channel change (because of the initial mono mode), and hardware-based stereo autodetecion is not applicable for the current audio standard. Signed-off-by: Marton Balint <cus@fazekas.hu> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>