summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video
AgeCommit message (Collapse)Author
2007-05-13Backport kernel changeset 59c51591a0ac7568824f541f57de967e88adaa07Mauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> kernel-sync: The original patch is from Michael Opdenacker <michael@free-electrons.com> Fix occurrences of "the the " Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2007-05-13Backport kernel changeset beb7dd86a101263bf63a78c7c6d4da3849b35bd6Mauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> kernel-sync: The original patch is from Robert P. J. Day <rpjday@mindspring.com>: Fix misspellings collected by members of KJ list. Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2007-05-13Backport several i2c cleanups from mainstreamMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> backport commit 2096b956d24c4b5950b808fc23b218425d79ebb1 from David Brownell <david-b@pacbell.net> Maybe I've merged also other i2c cleanups here that happened on Kernel. Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2007-05-13Whitespace cleanupsMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2007-05-13backport commit cbefb762b67fa6d3eb2a48ae3380358a940e8c9dMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> kernel-sync: Backport the original patch from Mattia Dongili <malattia@linux.it> meye: make meye use sony-laptop instead of sonypi Change sonypi_camera_command() calls to sony_pic_camera_command() and use the renamed macros. Also, added compat stuff to allow compiling meye driver for kernels < 2.6.22 Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2007-05-13backport mainstream changeset 6473d160b4aba8023bcf38519a5989694dfd51a7Mauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> kernel-sync: The original kernel patch is from Jean Delvare <khali@linux-fr.org> PCI: Cleanup the includes of <linux/pci.h> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2007-05-13Backport kernel changeset e63340ae6b6205fef26b40a75673d1c9c0c8bb90Mauro Carvalho Chehab
From: Mauro Carvalho Chehab kernel-sync: The original patch description, from Randy Dunlap <randy.dunlap@oracle.com>: header cleaning: don't include smp_lock.h when not used Remove includes of <linux/smp_lock.h> where it is not used/needed. Suggested by Al Viro. Builds cleanly on x86_64, i386, alpha, ia64, powerpc, sparc, sparc64, and arm (all 59 defconfigs). Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2007-05-11Saa7134: enable ir-remote for 10moons TM300Mauro Carvalho Chehab
From: Tony Wan <wankai@sjtu.org> Using Encore's key codes, we needn't add any additional key table. Signed-off-by: Tony Wan <wankai@sjtu.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2007-05-10V4l: saa7134: add support for 10moons TM300 cardMauro Carvalho Chehab
From: Tony Wan <wankai@sjtu.org> Support the 10moons TM300 TV card (so called TV Master 3), which is a 10moons saa7130 based board. Here not include features for the IR-remote. It has been tested using TVTIME. The card was auto-detected and all the input sources worked correct with sound. Signed-off-by: Tony Wan <wankai@sjtu.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2007-05-09merge: http://linuxtv.org/hg/~tmerle/v4l-dvbMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2007-05-09Fix: em28xx currently doesn't require VIDEO_BUFMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> Fix a bad dependency, as pointed by Geert Uytterhoeven <geert@linux-m68k.org>: | drivers/media/video/video-buf.c: In function 'videobuf_queue_pci': | drivers/media/video/video-buf.c:399: error: 'pci_map_sg' undeclared (first use in this function) Probably some new driver does a select VIDEO_BUF, which overrides that VIDEO_BUF depends on PCI? Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2007-05-09Fix Kconfig dependencies for ivtvMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> As pointed by Geert Uytterhoeven <geert@linux-m68k.org>, ivtv-driver.h have two checks for CONFIG vars, inerited from the time it were an out of kernel driver. Also, ivtv were wrongly marked as dependent of USB. Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2007-05-08merge: http://linuxtv.org/hg/~mkrufky/dvb-pll-convMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2007-05-08cx88: kill core->pll_desc and core->pll_addrMichael Krufky
From: Michael Krufky <mkrufky@linuxtv.org> Now that dvb-pll is being used properly in all cx88-dvb instances, the cx88 driver no longer needs to store pll_desc nor pll_addr. Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
2007-05-08Integrate all users of the fmd1216 tuner with dvb-pllTrent Piepho
From: Trent Piepho <xyzzy@speakeasy.org> Enhance the dvb-pll definition of the fmd1216 tuner by adding an init sequence and a sleep sequence. The init sequence sets the AGC control register to 0xa0, selecting the fast time constant and 112 dBuV take-over point. This the recommended value for DVB-T operation. The sleep sequence sets bit P4 (which is believed to turn the analog demodulator on), turns off the tuning voltage, and sets the AGC control register to 0x60 (external AGC voltage, the recommended value for analog operation). The existing dvb-pll users in the cx88 driver, listed below, will gain these init and sleep sequences. CX88_BOARD_HAUPPAUGE_HVR1100 Hauppauge WinTV-HVR1100 DVB-T/Hybrid CX88_BOARD_HAUPPAUGE_HVR1100LP Hauppauge WinTV-HVR1100 DVB-T/Hybrid (Low Profi CX88_BOARD_WINFAST_DTV2000H WinFast DTV2000 H CX88_BOARD_HAUPPAUGE_HVR3000 Hauppauge WinTV-HVR3000 TriMode Analog/DVB-S/DV CX88_BOARD_HAUPPAUGE_HVR1300 Hauppauge WinTV-HVR1300 DVB-T/Hybrid MPEG Encod This non-dvb-pll user in the cx88 driver should only gain the sleep sequence, as it already had an equivalent init sequence. The non-dvb-pll code for this user is removed. X88_BOARD_DNTV_LIVE_DVB_T_PRO digitalnow DNTV Live! DVB-T Pro In these saa7134 driver, these non-dvb-pll users are converted to use dvb-pll: SAA7134_BOARD_MD7134 Medion 7134 SAA7134_BOARD_ASUS_EUROPA2_HYBRID Asus Europa2 OEM The saa7134 functions philips_fmd1216_tuner_init(), philips_fmd1216_tuner_sleep(), and philips_fmd1216_tuner_set_params() are deleted and the dvb-pll versions are used. This should result in equivalent sleep, init, and tuning sequences being sent to the tuner. For the cxusb driver, only one board is effected: USB_PID_MEDION_MD95700 Medion MD95700 This board used dvb_usb_tuner_init_i2c() and dvb_usb_tuner_set_params_i2c() for init and tuning, respectively. These functions are effectively the same as the dvb-pll versions. They call a tuner pass control function defined at the dvb-usb level, but this does not matter, as this card does not have a tuner pass control function (only the dib3000mb does). This board will gain the sleep sequence, while init and tuning should be unchanged. Signed-off-by: Trent Piepho <xyzzy@speakeasy.org> Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
2007-05-08usbvision: video_ioctl2 conversionThierry MERLE
From: Thierry MERLE <thierry.merle@free.fr> The ioctl entry point, a big switch/case, is splitted in little functions. These functions are set as callbacks for the video_ioctl2 video4linux facility. This improves the driver memory consumption and enables the v4l1 compatibility as a side effect. Acked-by: Dwaine P. Garden <dwainegarden@rogers.com> Signed-off-by: Thierry MERLE <thierry.merle@free.fr>
2007-05-07saa7134-dvb: convert philips td1316 handling to properly use dvb-pllMichael Krufky
From: Michael Krufky <mkrufky@linuxtv.org> removed mt352_aver777_tuner_calc_regs, using dvb_pll_attach, instead. Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
2007-05-05cx88: VP3054 support can't be a module when cx88 is compiled inTrent Piepho
From: Trent Piepho <xyzzy@speakeasy.org> If cx88 support is compiled into the kernel while vp3054 is left as a module, the kernel will fail to link. Adjust the existing "#if" code in cx88 so that it won't consider vp3054 to be supported in this case. It might make sense to move vp3054 selection into the "customisation" menu instead of a cx88 sub-option (though this is a cx88 feature, there is no extra chip involved). It might also make sense to use dvb_attach() to load vp3054 support. Signed-off-by: Trent Piepho <xyzzy@speakeasy.org>
2007-05-08Fix mistake in patch 5571Mauro Carvalho Chehab
From: Trent Piepho <xyzzy@speakeasy.org> Two lines from an older version snuck in. Signed-off-by: Trent Piepho <xyzzy@speakeasy.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2007-05-07Cx88: Drop the generic i2c client from cx88-vp3054-i2cMauro Carvalho Chehab
From: Jean Delvare <khali@linux-fr.org> Drop the generic client declared in cx88-vp3054-i2c: it's not used anywhere. This shrinks cx88-vp3054-i2c.o by 29% on x86_64. Unless it was there for later use? Signed-off-by: Jean Delvare <khali@linux-fr.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2007-05-07V4L2: videodev, allow debuggingMauro Carvalho Chehab
From: Jiri Slaby <jirislaby@gmail.com> videodev, allow debugging fix typo? in videodev.c to allow debugging Signed-off-by: Jiri Slaby <jirislaby@gmail.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2007-05-06From: James T Klaas <jklaas@appalachian.dyndns.org>Mauro Carvalho Chehab
Fixes cards table for SAA7134_BOARD_SABRENT_TV_PCB05 Thanks to Hermann Pithon helping fixing the issues Signed-off-by: James T Klaas <jklaas@appalachian.dyndns.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2007-05-05tuv1236d: move rf input switching code into dvb-pllMichael Krufky
From: Michael Krufky <mkrufky@linuxtv.org> This patch removes duplicate code from cx88-dvb and saa7134-dvb that handles rf input switching for the TUV1236d tuner. The functionality is added to dvb-pll, where all the other code that handles the TUV1236d is kept. Signed-off-by: Michael Krufky <mkrufky@linuxtv.org> Signed-off-by: Trent Piepho <xyzzy@speakeasy.org>
2007-05-05dvb-pll: pass dvb_frontend_parameters to generic set() functionMichael Krufky
From: Michael Krufky <mkrufky@linuxtv.org> Rename dvb_pll_desc.setbw() to set(), and accept struct dvb_frontend_parameters instead of passing both freq and bandwidth, so that this may be used as a generic function. In order to do this, dvb_pll_configure must also be altered in the same manner, to take struct dvb_frontend_parameters instead of freq and bandwidth. Signed-off-by: Michael Krufky <mkrufky@linuxtv.org> Signed-off-by: Trent Piepho <xyzzy@speakeasy.org>
2007-05-04V4L: Prevent queueing queued buffers.Mauro Carvalho Chehab
From: Sakari Ailus <sakari.ailus@nokia.com> videobuf_qbuf queues buffers to q->stream but does not properly check the state of the buffer before queueing. It was possible to queue buffers that already were in the queue. Only buffers that are in states STATE_NEEDS_INIT and STATE_IDLE can be queued. Signed-off-by: Sakari Ailus <sakari.ailus@nokia.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2007-05-02usbvision: make common video and radio ioctlsThierry MERLE
From: Thierry MERLE <thierry.merle@free.fr> Radio and video ioctls are the same, delete the usbvision_do_radio_ioctl function add the special cases for radio in usbvision_v4l2_do_ioctl Signed-off-by: Thierry MERLE <thierry.merle@free.fr>
2007-05-02Add help for RADIO_ADAPTERS and VIDEO_CAPTURE_DRIVERSMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> Add a small help for those two new Kconfig vars. Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2007-05-02Use menuconfig objects II - V4LMauro Carvalho Chehab
From: Jan Engelhardt <jengelh@linux01.gwdg.de> Change Kconfig objects from "menu, config" into "menuconfig" so that the user can disable the whole feature without having to enter the menu first. Signed-off-by: Jan Engelhardt <jengelh@gmx.de> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2007-05-03Backed out changeset d130e8e1eb762e055371d5e3e1724d7735bad244Mauro Carvalho Chehab
Also reverting this one. V4L/DVB building system can't handle menuconfig and if/endif Kconfig items. We should first patch the building system before reapplying those two patches. Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2007-05-02Use menuconfig objects II - V4LMauro Carvalho Chehab
From: Jan Engelhardt <jengelh@linux01.gwdg.de> Change Kconfig objects from "menu, config" into "menuconfig" so that the user can disable the whole feature without having to enter the menu first. Signed-off-by: Jan Engelhardt <jengelh@gmx.de> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2007-05-02SN9C1xx driver updatesMauro Carvalho Chehab
From: Luca Risolia <luca.risolia@studio.unibo.it> Changes: + new, * cleanup, @ bugfix * Default color improvements to the OV7660 @ Fix sn9c102_write_reg() @ Fix sn9c102_i2c_try_raw_read() @ Fix MI-0343 + Add support for pair MI0360+SN9C120 + Add more USB ids Signed-off-by: Luca Risolia <luca.risolia@studio.unibo.it> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2007-05-02VIDEO4LINUX-2: Replace MINOR() with a call to iminor().Mauro Carvalho Chehab
From: Robert P. J. Day <rpjday@mindspring.com> Replace the call to MINOR() with a call to the inline iminor() routine. Signed-off-by: Robert P. J. Day <rpjday@mindspring.com> Acked-by: Hans Verkuil <hverkuil@xs4all.nl> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2007-05-01Added support for Sabrent TV-PCB05 card.Mauro Carvalho Chehab
From: James T Klaas <jklaas@appalachian.dyndns.org> Maintainer's notice: I needed to re-number the board, since the board number conflicted with a patch committed previously. Signed-off-by: James T Klaas <jklaas@appalachian.dyndns.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2007-05-01Add support for three cards to saa7134 driverMauro Carvalho Chehab
From: Simon Farnsworth <simon.farnsworth@onelan.co.uk> Add support for the "Elitegroup ECS TVP3XP FM1246", the "KWorld DVB-T 210", and the Animation Technologies LR214 Rev F onwards (SAA7131) to the saa7134 driver. Also rename the LR214WF to the LR214 Rev E or ealier (SAA7135), to match what we've seen on boards in the field. Changed the comment on the Lifeview cards to indicate Rev E and earlier versus Rev F and later, together with a chip indicator, following feedback from Peter Missel <peter.missel@onlinehome.de>. Signed-off-by: Simon Farnsworth <simon.farnsworth@onelan.co.uk> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2007-05-01merge: http://linuxtv.org/hg/~mcisely/pvrusb2Mauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2007-04-30usbvision-core.c:usbvision_set_video_format: add comment that VO_MODE is ↵Thierry MERLE
also being set. From: David Warman <dwarman@davidwarman.net> Signed-off-by: David Warman <dwarman@davidwarman.net> Signed-off-by: Thierry MERLE <thierry.merle@free.fr>
2007-04-30usbvision-cards.c: change VideoNorm to NTSC for Belkin USB Videobus IIThierry MERLE
From: David Warman <dwarman@davidwarman.net> Signed-off-by: David Warman <dwarman@davidwarman.net> Signed-off-by: Thierry MERLE <thierry.merle@free.fr>
2007-04-29Improve / fix support for PAL-60 in cx25840Mike Isely
From: Servaas Vandenberghe <vdb128@picaros.org> This causes the cx25840 module to treat V4L2_STD_PAL_60 similar to other 60Hz timings, and it fixes a wrongly-named variable (timings are independant of color system). Signed-off-by: Mike Isely <isely@pobox.com> Acked-by: Hans Verkuil <hverkuil@xs4all.nl>
2007-04-28pvrusb2: Implement ability to disable IR receiverMike Isely
From: Mike Isely <isely@pobox.com> Anyone using multiple PVR USB2 devices really only want one of them acting as the actual IR receiver. Implemented here is a new per-instance module option (ir_mode) which is a flag to enable the IR receiver. The default is enabled. IR reception is disabled by blocking access to the IR receiver chip in the device. Signed-off-by: Mike Isely <isely@pobox.com>
2007-04-28pvrusb2: Improve handling of PAL-60 video standardMike Isely
From: Mike Isely <isely@pobox.com> This patch originated with Servaas Vandenberghe <vdb128@picaros.org> and has been further developed a bit (to preserve saa7115 behavior). These changes allow for correct operation of PAL-60 video (Servaas tested this against a PAL-B/G tuner with the video standard overridden as a module option). Signed-off-by: Mike Isely <isely@pobox.com>
2007-04-28pvrusb2: kill unnecessary attribute->ownerMike Isely
From: Tejun Heo <htejun@gmail.com> [Mike Isely: This is the pvrusb2 affected part of a much larger patch in the kernel from Tejun Heo] sysfs is now completely out of driver/module lifetime game. After deletion, a sysfs node doesn't access anything outside sysfs proper, so there's no reason to hold onto the attribute owners. Note that often the wrong modules were accounted for as owners leading to accessing removed modules. This patch kills now unnecessary attribute->owner. Note that with this change, userland holding a sysfs node does not prevent the backing module from being unloaded. For more info regarding lifetime rule cleanup, please read the following message. http://article.gmane.org/gmane.linux.kernel/510293 Signed-off-by: Tejun Heo <htejun@gmail.com> Signed-off-by: Mike Isely <isely@pobox.com>
2007-04-28pvrusb2: use mutex instead of semaphoreMike Isely
From: Matthias Kaehlcke <matthias.kaehlcke@gmail.com> the pvrusb2 driver use a semaphore as mutex. use the mutex API instead of the (binary) semaphore Signed-off-by: Matthias Kaehlcke <matthias.kaehlcke@gmail.com> Signed-off-by: Mike Isely <isely@pobox.com>
2007-04-27v4l1-compat: Make VIDIOCSPICT return errors in a useful wayTrent Piepho
From: Trent Piepho <xyzzy@speakeasy.org> Among other things, VIDIOCSPICT sets the pixel format. Some drivers don't support all formats, e.g. cx88 doesn't support the planar formats. The compat code that translates VIDIOCSPICT into V4L2 ioctls doesn't pass on any errors, so a userspace program doesn't know if it has selected an unsupported pixel format. VIDIOCSPICT sets both the memory capture and overlay formats, and it's possible that one will be set while the other will fail, e.g. cx88 doesn't even support overlay. Also, trying to set the overlay format will fail for non-root users. Signed-off-by: Trent Piepho <xyzzy@speakeasy.org>
2007-04-27v4l1-compat: misc fixes for pixelformat functionTrent Piepho
From: Trent Piepho <xyzzy@speakeasy.org> Mark the palette2pixelformat lookup table as const pixelformat is unsigned, adjust the palette2pixelformat table and pixelformat_to_palette() palette_to_pixelformat() is a pure function pixelformat_to_palette() is a const function Signed-off-by: Trent Piepho <xyzzy@speakeasy.org>
2007-05-01Fix: v4l1_compat should be called only if V4L1_COMPATMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> Added also some explanations about V4L1 handling Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2007-05-01VIDIOCGMBUF handling in video_ioctl2()Mauro Carvalho Chehab
From: Sam Revitch <sam.revitch@gmail.com> Correct handling of VIDIOCGMBUF in video_ioctl2(). Signed-off-by: Sam Revitch <samr7@cs.washington.edu> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2007-05-01Cx88-mpeg.c: make 2 functions staticMauro Carvalho Chehab
From: Adrian Bunk <bunk@stusta.de> This patch makes two needlessly global functions static. Signed-off-by: Adrian Bunk <bunk@stusta.de> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2007-05-01MEDIA: Spinlock initializer cleanupMauro Carvalho Chehab
From: Thomas Gleixner <tglx@linutronix.de> Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2007-05-01cx88: fix compilation on alphaMauro Carvalho Chehab
From: Alexey Dobriyan <adobriyan@gmail.com> error: 'DMA_32BIT_MASK' undeclared Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2007-04-27Backport copyright changesMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> kernel-sync: Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>