summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2009-09-13merge: http://www.linuxtv.org/hg/~hverkuil/v4l-dvb-go7007-newMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@redhat.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2009-09-13merge: http://www.linuxtv.org/hg/~hverkuil/v4l-dvb-coreMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@redhat.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2009-09-13merge: http://linuxtv.org/hg/~dougsland/em28xxMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@redhat.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2009-09-13af9015: fix typo in register compareAntti Palosaari
From: Antti Palosaari <crope@iki.fi> And mask should be 0xff00 instead of 0xae00. Thanks to Jochen Friedrich <jochen@scram.de> for pointing this. Priority: normal Signed-off-by: Antti Palosaari <crope@iki.fi> Cc: Jochen Friedrich <jochen@scram.de>
2009-09-13af9015: improve usb control message function slightlyAntti Palosaari
From: Antti Palosaari <crope@iki.fi> * define names for few values * decrease buffer len by one byte which was not used * add check for buffer overflow for sure * indentation fixes * remove useless 0 len check from memcpy It should not happen and if it happens memcpy should not do anything. Priority: normal Signed-off-by: Antti Palosaari <crope@iki.fi>
2009-09-12af9015: revert changeset: 12588:184e9d1d8707Mauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@redhat.com> Revert this patch as requested by the patch author. Priority: normal Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2009-09-12siano/Kconfig: a driver shouldn't be selected by defaultMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@redhat.com> Priority: normal Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2009-09-12backport commit 8a8bdcc7533b104d789d9bb3ed90da9352515e21Mauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@redhat.com> kernel-sync: Author: Kay Sievers <kay.sievers@vrfy.org> Date: Thu Apr 30 15:23:42 2009 +0200 Driver Core: dvb: add nodename for dvb drivers This adds support to the dvb core to report the proper device name to userspace for their devices. Priority: normal Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2009-09-12backport changeset f7a386c5b8ff34cd84ae922603d1c6f9d234edeeMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@redhat.com> kernel-sync: Author: Kay Sievers <kay.sievers@vrfy.org> Date: Thu Apr 30 15:23:42 2009 +0200 Driver Core: usb: add nodename support for usb drivers. This adds support for USB drivers to report their requested nodename to userspace. It also updates a number of USB drivers to provide the needed subdirectory and device name to be used for them. Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2009-09-12af9015: [2/2] fix USB TS configurationAntti Palosaari
From: Antti Palosaari <crope@iki.fi> Fix wrongly configured USB1.1 TS EP. Patch serie also increases USB URB size to reduce wakeups. USB1.1 URB size from 64 to 940 bytes USB2.0 URB size from 512 to 16356 bytes Priority: high Signed-off-by: Antti Palosaari <crope@iki.fi>
2009-09-12backport upstream changes for archMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@redhat.com> It also backports a needed change at vpif_display, applied at -git to fix compilation against the arm drivers. Priority: normal Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2009-09-12backport commit 720b17e759a50635c429ccaa2ec3d01edb4f92d6Mauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@redhat.com> kernel-sync: Author: Magnus Damm <damm@igel.co.jp> Date: Tue Jun 16 15:32:36 2009 -0700 videobuf-dma-contig: zero copy USERPTR support 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. Priority: normal Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2009-09-12af9015: [1/2] fix USB TS configurationAntti Palosaari
From: Jose Alberto Reguero <jareguero@telefonica.net> Fix wrongly configured USB2.0 TS EP. Priority: high Signed-off-by: Jose Alberto Reguero <jareguero@telefonica.net> Signed-off-by: Antti Palosaari <crope@iki.fi>
2009-09-12get_dvb_firmware: add af9015 firmwareAntti Palosaari
From: Antti Palosaari <crope@iki.fi> Add af9015 firmware to get_dvb_firmware script. Firmware version is 4.95.0.0. Priority: normal Signed-off-by: Antti Palosaari <crope@iki.fi>
2009-09-10em28xx: fix unused variable warningDevin Heitmueller
From: Devin Heitmueller <dheitmueller@kernellabs.com> Remove unused variable from when I introduced the g_std() function. This work was sponsored by EyeMagnet Limited. Priority: normal Signed-off-by: Devin Heitmueller <dheitmueller@kernellabs.com>
2009-09-10em28xx: remove unneeded code that set VINCTRL registerDevin Heitmueller
From: Devin Heitmueller <dheitmueller@kernellabs.com> Remove redundant call to set the vinctrl register. This eliminates any ambiguity as to how the register is configured (since it is now always set in em28xx_set_outfmt). This work was sponsored by EyeMagnet Limited. Priority: normal Signed-off-by: Devin Heitmueller <dheitmueller@kernellabs.com>
2009-09-10em28xx: implement g_std v4l callDevin Heitmueller
From: Devin Heitmueller <dheitmueller@kernellabs.com> We need to implement the g_std call, or else the default norm always gets returned, which breaks VBI capturing if you had changed the standard to NTSC using s_std. I had temporarily changed the default norm to NTSC so that zvbi-ntsc-cc wouldn't choke, so now that we are returning the correct value, switch it back to PAL as the default. This work was sponsored by EyeMagnet Limited. Priority: normal Signed-off-by: Devin Heitmueller <dheitmueller@kernellabs.com>
2009-09-10em28xx: only advertise VBI capability if supportedDevin Heitmueller
From: Devin Heitmueller <dheitmueller@kernellabs.com> Change the code so we only claim to support VBI if the underlying chipset actually has the support. This work was sponsored by EyeMagnet Limited. Priority: normal Signed-off-by: Devin Heitmueller <dheitmueller@kernellabs.com>
2009-09-10em28xx: do not create /dev/vbiX device if VBI not supportedDevin Heitmueller
From: Devin Heitmueller <dheitmueller@kernellabs.com> Do not create the VBI device in cases where VBI is not supported on the target em28xx chip. This work was sponsored by EyeMagnet Limited. Priority: normal Signed-off-by: Devin Heitmueller <dheitmueller@kernellabs.com>
2009-09-10go7007: semaphore -> mutex conversionHans Verkuil
From: Hans Verkuil <hverkuil@xs4all.nl> Priority: normal Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
2009-09-10v4l: Merge drivers/staging/go7007 in v4l-dvb.Hans Verkuil
From: Hans Verkuil <hverkuil@xs4all.nl> Having go7007 as part of v4l-dvb makes it easier to continue developing this driver. Priority: normal Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
2009-09-08em28xx: Cleanups at ir_i2c handlerMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@redhat.com> There are some extra parenthesis at the clauses, and some switch() tests for boards that don't have i2c ir. Remove those extra code. Priority: normal Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2009-09-08em28xx: properly load ir-kbd-i2c when neededMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@redhat.com> Currently, the logic to load ir i2c ancillary module is broken. It is associated to Hauppauge devices with IR flag on their eeprom, no matter if the device uses i2c or em28xx direct IR support. That's wrong. Instead, add a flag to the boards that use i2c IR chips and load the module only for those devices and if ir is not disabled. Priority: normal Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2009-09-06dvb-spec/sgml: A few fixes to make hg status/hg diff happyMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@redhat.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2009-09-06dvb-spec/sgml: Finish conversion to DocBook XML 4.1.2Mauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@redhat.com> With the conversion of both v4l2 and dvb-spec to the same DocBook version used in kernel, it is now possible to do some interesting things like adding the docs upstream and/or merge or share chapters between the two specs. Also, after promoting this version to official, just one set of text tools will be needed to generate both DVB and V4L2 specs. Yet, more work is needed to validate the conversion, improve the layout of the documents, provide cross references, etc. Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2009-09-06em28xx-cards: Add vendor/product id for Kworld DVD Maker 2Douglas Schilling Landgraf
From: Douglas Schilling Landgraf <dougsland@redhat.com> Added Kworld DVD Maker 2 Thanks to C Western <l@c-m-w.me.uk> for reporting this board. Priority: normal Signed-off-by: Douglas Schilling Landgraf <dougsland@redhat.com>
2009-09-06dvb-spec/sgml: Remove blank cells from the tablesMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@redhat.com> The htlatex added some empty rows at the tables. Remove it with this small script: perl -ne '$txt=""; while (<>) { $txt .=$_ }; $txt=~s,\<row\>[\s\n]*\<entry[^\>]*>[\s\n]*\<\/entry\>[\n\s]*\<\/row\>,,g; print $txt; exit;' Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2009-09-06dvb-spec: Start a DocBook XML 4.1.2 version of DVB API docsMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@redhat.com> This is an unfinished work. It is a port of DVB API verison 3 from LaTex into DocBook. Currently, only chapters 1 and 2 were converted. Still pending the conversion of the remaining chapters and a good style revision after the end of the conversion. Priority: normal Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2009-09-06v4l: warn when desired devnodenr is in use & add _no_warn functionHans Verkuil
From: Hans Verkuil <hverkuil@xs4all.nl> Warn when the desired device node number is already in use, except when the new video_register_device_no_warn function is called since in some use-cases that warning is not relevant. Priority: normal Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
2009-09-07v4l2-dev: add simple wrapper functions around the devnode numbersHans Verkuil
From: Hans Verkuil <hverkuil@xs4all.nl> There are some subtle differences in the way the devnode numbers are handled depending on whether the FIXED_MINOR_RANGES config option is set. Add some simple wrapper functions to handle that correctly. Priority: normal Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
2009-09-02em28xx: remove unreferenced variableDevin Heitmueller
From: Devin Heitmueller <dheitmueller@kernellabs.com> Remove an unreferenced variable introduced during the VBI introduction. Priority: normal Signed-off-by: Devin Heitmueller <dheitmueller@kernellabs.com>
2009-09-02em28xx: restructure fh/dev locking to handle both video and vbiDevin Heitmueller
From: Devin Heitmueller <dheitmueller@kernellabs.com> The current locking infrastructure didn't support having multiple fds accessing the device (such as video and vbi). Rework the locking infrastructure, borrowing the design from cx88. This work was sponsored by EyeMagnet Limited. Priority: normal Signed-off-by: Devin Heitmueller <dheitmueller@kernellabs.com>
2009-09-02em28xx: fix mmap_mapper with vbiDevin Heitmueller
From: Devin Heitmueller <dheitmueller@kernellabs.com> When adding support for both video and VBI, I missed the mmap ioctl. Add the missing call. Priority: normal Signed-off-by: Devin Heitmueller <dheitmueller@kernellabs.com>
2009-09-01em28xx: add raw VBI support for NTSCDevin Heitmueller
From: Devin Heitmueller <dheitmueller@kernellabs.com> Add support for raw VBI capture for the em28xx bridge, currently only for NTSC. Support for PAL capture to follow shortly (including the removal of numerous hard-coded NTSC-specific sizes for capture buffers, etc). Note that the code currently changes the default current norm from PAL to NTSC (so that zvbi-ntsc-cc works properly). The default norm really should be moved into a board-level parameter. This work was sponsored by EyeMagnet Limited. Priority: normal Signed-off-by: Devin Heitmueller <dheitmueller@kernellabs.com>
2009-09-01em28xx: make video isoc stream work when VBI is enabledDevin Heitmueller
From: Devin Heitmueller <dheitmueller@kernellabs.com> Add code enabling the VBI registers for variants of the em28xx chip that support VBI, and make sure the isoc streaming code continues to work for the video component of the stream (note the video and vbi data arrive intermixed on the same isoc pipe). Note that this version just drops the actual VBI data onto the floor as opposed to processing it. The "#ifdef 0" tags are for the videobuf code that appears in the next patch in this series. We created a separate version of the isoc_copy version for parsing the version of the stream that includes VBI data. In theory, they might be able to be merged at some point in the future, but the initial goal is to ensure that we do not cause any regressions with devices that do not have VBI support. This work was sponsored by EyeMagnet Limited. Priority: normal Signed-off-by: Devin Heitmueller <dheitmueller@kernellabs.com>
2009-08-31em28xx: better describe vinctrl registersDevin Heitmueller
From: Devin Heitmueller <dheitmueller@kernellabs.com> Properly document the video input control register, in preparation for the addition of VBI support. Note this patch makes no functional changes. Priority: normal Signed-off-by: Devin Heitmueller <dheitmueller@kernellabs.com>
2009-06-30gspca - main: Change the ISOC initialization mechanism.Jean-Francois Moine
From: Jean-Francois Moine <moinejf@free.fr> - call a new subdriver function 'isoc_init' before chosing the first alternate setting. - call a new subdriver function 'isoc_nego' when submitting the URBs failed. Priority: normal Signed-off-by: Jean-Francois Moine <moinejf@free.fr>
2009-06-29libv4l: update upside down devices tablehans@rhel5-devel.localdomain
From: Hans de Goede <hdegoede@redhat.com> libv4l: update upside down devices table Priority: normal Signed-off-by: Hans de Goede <hdegoede@redhat.com>
2009-06-29libv4l: update upside down devices tablehans@rhel5-devel.localdomain
From: Hans de Goede <hdegoede@redhat.com> libv4l: update upside down devices table Priority: normal Signed-off-by: Hans de Goede <hdegoede@redhat.com>
2009-06-28uvcvideo: Restructure the driver to support multiple simultaneous streams.Laurent Pinchart
From: Laurent Pinchart <laurent.pinchart@skynet.be> As a first step towards multiple streaming interfaces support, reorganize the driver's data structures to cleanly separate video control and video streaming data. Priority: normal Signed-off-by: Laurent Pinchart <laurent.pinchart@skynet.be>
2009-06-28Siano: Fixed SDIO compilation bugsMauro Carvalho Chehab
From: Udi Atar <udia@siano-ms.com> Fixed SDIO compilation bugs (for latest kernel). Also fixed a memory overrun issue in buffer management. Priority: normal Signed-off-by: Udi Atar <udia@siano-ms.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2009-08-12adds webcam for Micron device MT9M111 0x143A to em28xxMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@redhat.com> Priority: normal Signed-off-by: Steve Gotthardt <gotthardt@gmail.com> [mchehab@redhat.com: fix merge conflict and a few CodingStyle issues] Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2009-08-13versions: Fix compilation with kernel 2.6.16Mauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@redhat.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2009-06-27gspca - vc032x: Webcam 0ac8:c301 added.Jean-Francois Moine
From: Jean-Francois Moine <moinejf@free.fr> Only the back sensor (mi1320_soc) is usable. Priority: normal Signed-off-by: Jean-Francois Moine <moinejf@free.fr>
2009-06-26au0828: fix i2c for kernels prior to 2.6.26Michael Krufky
From: Michael Krufky <mkrufky@kernellabs.com> Priority: normal Signed-off-by: Michael Krufky <mkrufky@kernellabs.com>
2009-06-26uvcvideo: Move UVC definitions to linux/usb/video.hLaurent Pinchart
From: Laurent Pinchart <laurent.pinchart@skynet.be> To make UVC constants accessible by a future UVC gadget driver, move them from drivers/media/video/uvc/uvcvideo.h to include/linux/usb/video.h. Priority: normal Signed-off-by: Laurent Pinchart <laurent.pinchart@skynet.be>
2009-06-26uvcvideo: Remove unused Logitech-specific constantsLaurent Pinchart
From: Laurent Pinchart <laurent.pinchart@skynet.be> Those constants are not used anymore, remove them. Priority: normal Signed-off-by: Laurent Pinchart <laurent.pinchart@skynet.be>
2009-06-26uvcvideo: Prefix all UVC constants with UVC_Laurent Pinchart
From: Laurent Pinchart <laurent.pinchart@skynet.be> In preparation to moving UVC constants to a public location, prefix all constants with UVC_ to avoid namespace clashes. Priority: normal Signed-off-by: Laurent Pinchart <laurent.pinchart@skynet.be>
2009-06-26uvcvideo: Use class-specific descriptor types from usb/ch9.hLaurent Pinchart
From: Laurent Pinchart <laurent.pinchart@skynet.be> uvcvideo.h redefines class-specific descriptor types already present in usb/ch9.h. Remove the duplicated definitions and use the ones from usb/ch9.h. Priority: normal Signed-off-by: Laurent Pinchart <laurent.pinchart@skynet.be>
2009-06-26em28xx: enable new-style i2c API for kernels >= 2.6.26, not 2.6.22.Hans Verkuil
From: Hans Verkuil <hverkuil@xs4all.nl> Priority: normal Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>