summaryrefslogtreecommitdiff
path: root/linux/drivers/media
AgeCommit message (Collapse)Author
2009-09-13merge: http://linuxtv.org/hg/~anttip/af9015/Mauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@redhat.com> Priority: normal Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2009-09-13merge: http://kernellabs.com/hg/~dheitmueller/em28xx-vbi3Mauro 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-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-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-07building system: fix compilation with kernels older than 2.6.30Mauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@redhat.com> Priority: normal Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2009-09-07merge: http://bitbucket.org/brijohn/v4l-dvbMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@redhat.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2009-09-07changeset: 12701:86bff049a6fbMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@redhat.com> tag: tip user: Mauro Carvalho Chehab <mchehab@redhat.com> date: Mon Sep 07 01:30:10 2009 -0300 files: linux/drivers/media/video/saa7134/saa7134-input.c linux/drivers/media/video/saa7134/saa7134.h description: SAA7134: ir-kbd-i2c initialization data should point to a persistent object ir-kbd-i2c's ir_probe() function can be called much later (i.e. at ir-kbd-i2c module load), than the lifetime of a struct IR_i2c_init_data allocated off of the stack in cx18_i2c_new_ir() at registration time. Make sure we pass a pointer to a persistent IR_i2c_init_data object at i2c registration time. Thanks to Brain Rogers, Dustin Mitchell, Andy Walls and Jean Delvare to rise this question. Before this patch, if ir-kbd-i2c were probed after SAA7134, trash data were used. Compile tested only, but the patch is identical to em28xx one. So, it should work properly. Priority: high Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2009-09-07merge: http://linuxtv.org/hg/~awalls/v4l-dvbMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@redhat.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2009-09-07em28xx: ir-kbd-i2c initialization data should point to a persistent objectMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@redhat.com> ir-kbd-i2c's ir_probe() function can be called much later (i.e. at ir-kbd-i2c module load), than the lifetime of a struct IR_i2c_init_data allocated off of the stack in cx18_i2c_new_ir() at registration time. Make sure we pass a pointer to a persistent IR_i2c_init_data object at i2c registration time. Thanks to Brain Rogers, Dustin Mitchell, Andy Walls and Jean Delvare to rise this question. Before this patch, if ir-kbd-i2c were probed after em28xx, trash data were used. After the patch, no matter what order, it is properly reported as tested by me: input: i2c IR (i2c IR (EM2840 Hauppaug as /class/input/input10 ir-kbd-i2c: i2c IR (i2c IR (EM2840 Hauppaug detected at i2c-4/4-0030/ir0 [em28xx #0] Priority: high Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2009-09-07merge: http://linuxtv.org/hg/~jfrancois/v4l-dvbMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@redhat.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2009-09-07merge: http://www.linuxtv.org/hg/~hverkuil/v4l-dvbMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@redhat.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2009-09-07merge: http://hg.jannau.net/v4l-dvb/v4l-dvbMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@redhat.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2009-09-06merge: http://linuxtv.org/hg/~hgoede/gspca/Mauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@redhat.com> 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-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-05cx18: ir-kbd-i2c initialization data should point to a persistent objectAndy Walls
From: Andy Walls <awalls@radix.net> ir-kbd-i2c's ir_probe() function can be called much later (i.e. at ir-kbd-i2c module load), than the lifetime of a struct IR_i2c_init_data allocated off of the stack in cx18_i2c_new_ir() at registration time. Make sure we pass a pointer to a persistent IR_i2c_init_data object at i2c registration time. Thanks to Brain Rogers for pointing out a solution, and Dustin Mitchell for testing against a 2.6.30 kernel. Reported-by: Dustin Mitchell <soxslayer@gmail.com> Reported-by: Brian Rogers <brian@xyzw.org> Priority: high Tested-by: Dustin Mitchell <soxslayer@gmail.com> Signed-off-by: Andy Walls <awalls@radix.net>
2009-09-03gspca - sn9c20x: Add SXGA support to MT9M111Brian Johnson
From: Brian Johnson <brijohn@gmail.com> Priority: normal Signed-off-by: Brian Johnson <brijohn@gmail.com>
2009-09-03gspca - sn9c20x: disable exposure/gain controls for MT9M111 sensors.Brian Johnson
From: Brian Johnson <brijohn@gmail.com> Using the MT9M111's IFP to handle exposure/gain gives better results. Priority: normal Signed-off-by: Brian Johnson <brijohn@gmail.com>
2009-09-03gspca_mr97310a: Add one more vivitar mini cam to the list of CIF camshans@rhel5-devel.localdomain
From: Hans de Goede <hdegoede@redhat.com> gspca_mr97310a: Add one more vivitar mini cam to the list of CIF cams Priority: normal Signed-off-by: Hans de Goede <hdegoede@redhat.com>
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-02gspca - sn9c20x: Add SXGA support to SOI968Brian Johnson
From: Brian Johnson <brijohn@gmail.com> Priority: normal Signed-off-by: Brian Johnson <brijohn@gmail.com>
2009-09-02gspca - sn9c20x: Fix exposure on SOI968 sensorsBrian Johnson
From: Brian Johnson <brijohn@gmail.com> Fixes broken exposure on SOI968 webcams that was causing the camera to display a black screen Priority: high Signed-off-by: Brian Johnson <brijohn@gmail.com>
2009-09-02gspca_mr97310a: Allow overriding of detected sensor typehans@rhel5-devel.localdomain
From: Hans de Goede <hdegoede@redhat.com> gspca_mr97310a: Allow overriding of detected sensor type Priority: normal Signed-off-by: Hans de Goede <hdegoede@redhat.com>
2009-09-02gspca - sn9c20x: Reduces size of objectBrian Johnson
From: Joe Perches <joe@perches.com> Use s16 instead of int where possible. Use struct instead of arrays Priority: normal Signed-off-by: Joe Perches <joe@perches.com> Signed-off-by: Brian Johnson <brijohn@gmail.com>
2009-09-02dvb-core: check supported QAM modulationsJanne Grunau
From: Janne Grunau <j@jannau.net> Check the modulation in dvb_frontend_check_parameters against frontend's capabilties for FE_QAM devices. Priority: normal Signed-off-by: Janne Grunau <j@jannau.net>
2009-09-02dvb-core: check fe->ops.set_frontend return valueJanne Grunau
From: Janne Grunau <j@jannau.net> Various frontend driver have parameter checks in their set_frontend functions and return an error if the parameters are not supported, tda10021 and cx24116 to name two. The tuning ioctls FE_SET_FRONTEND/FE_SET_PROPERTY only change values in the property cache and return before set_frontend is called. If a set_frontend call in software zigzag algorithm fails and the card was previously locked it will report a lock and the new parameters but is still tuned to the old transport. This is not detectable from userspace. This change checks the return values of fe->ops.set_frontend and changes the state to the added FESTATE_ERROR for software zigzag. No lock will be reported to userspace if the State is FESTATE_ERROR. Priority: normal Signed-off-by: Janne Grunau <j@jannau.net>
2009-09-02DVB: make DVB_MAX_ADAPTERS configurableJanne Grunau
From: Janne Grunau <j@jannau.net> Support for more than 8 DVB devices is requested regularly so make it a kconfig variable instead of a header define. Values in the range 4-32 are tested. Priority: normal Signed-off-by: Janne Grunau <j@jannau.net> Signed-off-by: Michael Krufky <mkrufky@kernellabs.com>
2009-09-01vino: add missing compat.h include.Hans Verkuil
From: Hans Verkuil <hverkuil@xs4all.nl> vino needs compat.h to get the I2C_ADDRS macro on kernels < 2.6.31. Priority: normal Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
2009-09-01gspca - sonixj / sn9c102: Two drivers for 0c45:60fc and 0c45:613e.Jean-Francois Moine
From: Jean-Francois Moine <moinejf@free.fr> Let 0c45:60fc in sn9c102 and 0c45:613e in gspca-sonixj (sensor not supported). Priority: normal Signed-off-by: Jean-Francois Moine <moinejf@free.fr>
2009-09-01gspca - vc032x: Do the LED work with the sensor hv7131r.Jean-Francois Moine
From: Jean-Francois Moine <moinejf@free.fr> Priority: normal Signed-off-by: Jean-Francois Moine <moinejf@free.fr>