summaryrefslogtreecommitdiff
path: root/linux
AgeCommit message (Collapse)Author
2009-04-24soc-camera: link host drivers after clientsGuennadi Liakhovetski
From: Guennadi Liakhovetski <lyakh@axis700.grange> With the transition of soc-camera to become a platform driver and to the v4l2-subdev framework the initialisation order becomes important. In case of a static build clients (i2c) drivers have to be available when host drivers are probed. Moving host drivers down in the Makefile achieves the desired order. Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de> --- drivers/media/video/Makefile | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-)
2009-04-24soc-camera: simplify register access routines in multiple sensor driversGuennadi Liakhovetski
From: Guennadi Liakhovetski <g.liakhovetski@gmx.de> Register access routines only need the I2C client, not the soc-camera device context. Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de> --- drivers/media/video/mt9m001.c | 105 +++++++++++++++++--------------- drivers/media/video/mt9m111.c | 73 ++++++++++++---------- drivers/media/video/mt9t031.c | 135 +++++++++++++++++++++------------------- drivers/media/video/mt9v022.c | 135 +++++++++++++++++++++-------------------- 4 files changed, 236 insertions(+), 212 deletions(-)
2009-04-24soc-camera: remove an extra device generation from struct soc_camera_hostGuennadi Liakhovetski
From: Guennadi Liakhovetski <g.liakhovetski@gmx.de> Make camera devices direct children of host platform devices, move the inheritance management into the soc_camera.c core driver. Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de> --- drivers/media/video/mx1_camera.c | 35 +++++----- drivers/media/video/mx3_camera.c | 40 ++++++------ drivers/media/video/pxa_camera.c | 97 ++++++++++++++-------------- drivers/media/video/sh_mobile_ceu_camera.c | 21 +++--- drivers/media/video/soc_camera.c | 35 +++------- include/media/soc_camera.h | 4 +- 6 files changed, 107 insertions(+), 125 deletions(-)
2009-04-24soc-camera: host-driver cleanupGuennadi Liakhovetski
From: Guennadi Liakhovetski <g.liakhovetski@gmx.de> Embed struct soc_camera_host in platform-specific per host instance objects instead of allocating them statically in drivers, use platform_[gs]et_drvdata consistently, use resource_size(). Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de> --- drivers/media/video/mx1_camera.c | 21 ++++++++----------- drivers/media/video/mx3_camera.c | 2 +- drivers/media/video/pxa_camera.c | 29 ++++++++++++--------------- drivers/media/video/sh_mobile_ceu_camera.c | 6 ++-- 4 files changed, 26 insertions(+), 32 deletions(-)
2009-04-24soc-camera: add a free_bus method to struct soc_camera_linkGuennadi Liakhovetski
From: Guennadi Liakhovetski <g.liakhovetski@gmx.de> Currently pcm990 camera bus-width management functions request a GPIO and never free it again. With this approach the GPIO extender driver cannot be unloaded once camera drivers have been loaded, also unloading theb i2c-pxa bus driver produces errors, because the GPIO extender driver cannot unregister properly. Another problem is, that if camera drivers are once loaded before the GPIO extender driver, the platform code marks the GPIO unavailable and only a reboot helps to recover. Adding an explicit free_bus method and using it in mt9m001 and mt9v022 drivers fixes these problems. Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de> Acked-by: Eric Miao <eric.miao@marvell.com> --- arch/arm/mach-pxa/pcm990-baseboard.c | 23 ++++++++++++++++------- drivers/media/video/mt9m001.c | 3 +++ drivers/media/video/mt9v022.c | 3 +++ include/media/soc_camera.h | 1 + 4 files changed, 23 insertions(+), 7 deletions(-)
2009-04-24ARM: update pcm990-baseboard.c to match mainlineGuennadi Liakhovetski
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de> kernel-sync:
2009-04-24stv090x.h and stv6110x.h: Fix two trivial compilation breakage errorsMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@redhat.com> /home/v4l/master/v4l/stv6110x.h:64: error: expected identifier or '(' before '{' token In file included from /home/v4l/master/v4l/budget.c:52: /home/v4l/master/v4l/stv090x.h:116: error: redefinition of 'stv090x_attach' /home/v4l/master/v4l/stv090x.h:108: error: previous definition of 'stv090x_attach' was here The first pne were due to an extra ';', and the other is due to a duplicated inline function declaration. This patch will need to be merged with the one that added those two headers at -git, to avoid breaking git bisect. CC: Manu Abraham <abraham.manu@gmail.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2009-04-24merge: http://jusst.de/hg/v4l-dvb/Mauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@redhat.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2009-04-23patch: s2255drv: code cleanupMauro Carvalho Chehab
From: Dean Anderson <dean@sensoray.com> This patch does: - remove unused structure items. - define Response values; - change Driver revision printk. Signed-off-by: Dean Anderson <dean@sensoray.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2009-04-23Update demodulator capabilitiesManu Abraham
From: Andreas Regel <andreas.regel@gmx.de> Signed-off-by: Andreas Regel <andreas.regel@gmx.de> Signed-off-by: Manu Abraham <manu@linuxtv.org>
2009-04-23Use Continuous clockManu Abraham
From: Andreas Regel <andreas.regel@gmx.de> Signed-off-by: Andreas Regel <andreas.regel@gmx.de> Signed-off-by: Manu Abraham <manu@linuxtv.org>
2009-04-23Use budget driver insteadManu Abraham
From: Andreas Regel <andreas.regel@gmx.de> Signed-off-by: Andreas Regel <andreas.regel@gmx.de> Signed-off-by: Manu Abraham <manu@linuxtv.org>
2009-04-23Fix missing wakeup in initManu Abraham
From: Andreas Regel <andreas.regel@gmx.de> Signed-off-by: Andreas Regel <andreas.regel@gmx.de> Signed-off-by: Manu Abraham <manu@linuxtv.org>
2009-04-23Fixes read_status to return 0 in case of no errorManu Abraham
From: Andreas Regel <andreas.regel@gmx.de> Signed-off-by: Andreas Regel <andreas.regel@gmx.de> Signed-off-by: Manu Abraham <manu@linuxtv.org>
2009-04-23Fixes Some register definitionsManu Abraham
From: Andreas Regel <andreas.regel@gmx.de> Signed-off-by: Andreas Regel <andreas.regel@gmx.de> Signed-off-by: Manu Abraham <manu@linuxtv.org>
2009-04-23Fixes:Manu Abraham
* Cut revision was read too late * Missing increment * wrong return value * mismatched entries From: Andreas Regel <andreas.regel@gmx.de> Signed-off-by: Andreas Regel <andreas.regel@gmx.de> Signed-off-by: Manu Abraham <manu@linuxtv.org>
2009-04-23saa7134: split Behold`s card entries to properly identify the modelMauro Carvalho Chehab
From: Dmitri Belimov <d.belimov@gmail.com> Split Beholdr`s cards to correct models. Signed-off-by: Beholder Intl. Ltd. Dmitry Belimov <d.belimov@gmail.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2009-04-23merge: http://linuxtv.org/hg/~pinchartl/uvcvideo/Mauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@redhat.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2009-04-23merge: http://linuxtv.org/hg/~pb/v4l-dvb/Mauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@redhat.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2009-04-20patch: s2255drv: fix race condition on set modeMauro Carvalho Chehab
From: Dean Anderson <dean@sensoray.com> set_modeready flag must be set before command sent to USB in s2255_write_config. Signed-off-by: Dean Anderson <dean@sensoray.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2009-04-20Add Elgato EyeTV DTT deluxe to dibcom driverPatrick Boettcher
From: Armin Schenker <sar@snafu.de> This patch introduces support for DVB-T for the following dibcom based card: Elgato EyeTV DTT deluxe (USB-ID: 0fd9:0020) Priority: normal Signed-off-by: Armin Schenker <sar@snafu.de> Signed-off-by: Patrick Boettcher <pb@linuxtv.org>
2009-04-19av7110_hw: fix compile warningMauro Carvalho Chehab
From: Alexey Klimov <klimov.linux@gmail.com> Signed-off-by: Alexey Klimov <klimov.linux@gmail.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2009-04-18merge: v4l-dvbJean-Francois Moine
2009-04-18uvcvideo: fix uvc resume failedtom.leiming@gmail.com
From: Ming Lei <tom.leiming@gmail.com> Now urb buffers is not freed before suspend, so uvc_alloc_urb_buffers should return packet counts allocated originally during uvc resume, instead of zero. This version uses round down to return packet counts on Linus' suggestions, or else may lead to buffer destructed if packet size is changed before calling uvc_alloc_urb_buffers() in this kind of case. Priority: normal Signed-off-by: Ming Lei <tom.leiming@gmail.com> Acked-by: Laurent Pinchart <laurent.pinchart@skynet.be> --- linux/drivers/media/video/uvc/uvc_video.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
2009-04-20uvcvideo: fill reserved fields with zero of VIDIOC_QUERYMENULaurent Pinchart
From: Márton Németh <nm127@freemail.hu> When querying menu items with VIDIOC_QUERYMENU the reserved field is not set to zero as required by V4L2 API revision 0.24 [1]. Add this fill. The patch was tested with v4l-test 0.11 [2] with CNF7129 webcam found on EeePC 901. References: [1] V4L2 API specification, revision 0.24 http://v4l2spec.bytesex.org/spec/r13317.htm#V4L2-QUERYMENU [2] v4l-test: Test environment for Video For Linux Two API http://v4l-test.sourceforge.net/ [Modified by Laurent Pinchart] Use u32 instead of __u32 in non-exported kernel code. Priority: normal Signed-off-by: Márton Németh <nm127@freemail.hu> Signed-off-by: Laurent Pinchart <laurent.pinchart@skynet.be>
2009-04-17cx18: Fix the handling of i2c bus registration errorMauro Carvalho Chehab
From: Jean Delvare <khali@linux-fr.org> * Return actual error values as returned by the i2c subsystem, rather than 0 or 1. * If the registration of the second bus fails, unregister the first one before exiting, otherwise we are leaking resources. Signed-off-by: Jean Delvare <khali@linux-fr.org> Acked-by: Andy Walls <awalls@radix.net> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2009-04-16v4l: remove driver-core BUS_ID_SIZEMauro Carvalho Chehab
From: Kay Sievers <kay.sievers@vrfy.org> The name size limit is gone from the driver core, the BUS_ID_SIZE value will be removed. Acked-by: Greg Kroah-Hartman <gregkh@suse.de> Signed-off-by: Kay Sievers <kay.sievers@vrfy.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2009-04-16Fix incorrect TSMODE usageManu Abraham
From: Andreas Regel <andreas.regel@gmx.de> Signed-off-by: Andreas Regel <andreas.regel@gmx.de> Signed-off-by: Manu Abraham <manu@linuxtv.org>
2009-04-16Fix RolloffManu Abraham
From: Andreas Regel <andreas.regel@gmx.de> Signed-off-by: Andreas Regel <andreas.regel@gmx.de> Signed-off-by: Manu Abraham <manu@linuxtv.org>
2009-04-16Fix read bug in STV6110xManu Abraham
From: Andreas Regel <andreas.regel@gmx.de> Signed-off-by: Andreas Regel <andreas.regel@gmx.de> Signed-off-by: Manu Abraham <manu@linuxtv.org>
2009-04-15cx18: Increment version due to significant buffer handling changesAndy Walls
From: Andy Walls <awalls@radix.net> Version bump from 1.1.0 to 1.2.0 Priority: normal Signed-off-by: Andy Walls <awalls@radix.net>
2009-04-15cx18: Simplify the work handler for outgoing mailbox commandsAndy Walls
From: Andy Walls <awalls@radix.net> Simplify the way outgoing work handler gets scheduled to send empty buffers back to the firmware for use. Also reduced the memory required for scheduling this outgoing work, by using a single, per stream work object. Priority: normal Signed-off-by: Andy Walls <awalls@radix.net>
2009-04-15uvcvideo: Prevent invormation loss with removing implicit castingLaurent Pinchart
From: Márton Németh <nm127@freemail.hu> The uvcvideo driver supports only one input, which is input 0. For all other input index the return value shall be EINVAL. This patch fixes the problem when the value 0x80000000 was incorrectly casted and treated as a zero value. The patch was tested with v4l-test 0.10 [2] with CNF7129 webcam found on EeePC 901. References: [1] V4L2 API specification, revision 0.24 http://v4l2spec.bytesex.org/spec/r11217.htm [2] v4l-test: Test environment for Video For Linux Two API http://v4l-test.sourceforge.net/ [Modified by Laurent Pinchart] Invalid input value (u32)-1 would be accepted due to integer overflow. Make sure the driver rejects it and returns -EINVAL. Priority: normal Signed-off-by: Márton Németh <nm127@freemail.hu> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Laurent Pinchart <laurent.pinchart@skynet.be>
2009-04-20revert changeset 11562:fd645c976997Mauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@redhat.com> The changeset created breakage on both modules: WARNING: "sms_debug" [/home/v4l/master/v4l/smsusb.ko] undefined! WARNING: "sms_debug" [/home/v4l/master/v4l/smsdvb.ko] undefined! Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2009-04-14drivers/media/video/saa5246a.c: fix use-after-freeMauro Carvalho Chehab
From: Dan Carpenter <error27@gmail.com> I lowered the kfree(t) down a couple lines and removed the superflous "t->vdev = NULL;" Signed-off-by: Dan Carpenter <error27@gmail.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2009-04-14drivers/media/video/saa5249.c: fix use-after-free and leakMauro Carvalho Chehab
From: Dan Carpenter <error27@gmail.com> I moved the kfree() down a couple lines. t->vdev is going to be in freed memory so there is no point setting it to NULL. I added a kfree(t) on a different error path. Signed-off-by: Dan Carpenter <error27@gmail.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2009-04-14Added support for AVerMedia Cardbus PlusMauro Carvalho Chehab
From: Oldřich Jedlička <oldium.pro@seznam.cz> Here comes the full support for AVerMedia Cardbus Plus (E501R) - including remote control. TV, Composite and FM radio tested, I don't have S-Video to test. I've figured out that the radio works only with xtal frequency 13MHz. Now without word-wrapping. [mchehab@redhat.com: CodingStyle fixes] Signed-off-by: Oldřich Jedlička <oldium.pro@seznam.cz> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2009-04-14sync arm/mach-mx1/Makefile with upstreamMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@redhat.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2009-04-14backport commit 74ca11c2056d01d9ebb3615cd781a148450c3c82Mauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@redhat.com> kernel-sync: Author: Bastien Nocera <hadess@hadess.net> Date: Sat Jan 10 23:44:22 2009 -0800 Input: uvc - the button on the camera is KEY_CAMERA Cameras should generate KEY_CAMERA, not BTN_0. Also call input_sync() on the device once the button has been pressed. CC: Laurent Pinchart <laurent.pinchart@skynet.be> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2009-04-14backport upstream changes on i2c-id.hMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@redhat.com> kernel-sync: Basically, removes unused i2c id's Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2009-04-14backport commit e58de7baf7de11f01a675cbbf6ecc8a2758b9ca5Mauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@redhat.com> kernel-sync: Author: Takashi Iwai <tiwai@alsa3.local> Date: Sun Dec 28 16:44:30 2008 +0100 ALSA: Convert to snd_card_create() in sound/pci/* Convert from snd_card_new() to the new snd_card_create() function in sound/pci/*. Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2009-04-14backport a few minor cleanupsMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@redhat.com> kernel-sync: Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2009-04-14backport commit 32a0f488ce5e8a9a148491f15edc508ab5e8265bMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@redhat.com> Author: Beat Michel Liechti <bml303@gmail.com> Date: Thu Mar 26 22:36:52 2009 +0100 DVB: firedtv: FireDTV S2 problems with tuning solved Tuning was broken on FireDTV S2 (and presumably FloppyDTV S2) because a wrong opcode was sent. The box only gave "not implemented" responses. Changing the opcode to _TUNE_QPSK2 fixes this for good. kernel-sync: Priority: normal Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2009-04-14backport commit 99b76233803beab302123d243eea9e41149804f3Mauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@redhat.com> kernel-sync: Author: Alexey Dobriyan <adobriyan@gmail.com> Date: Wed Mar 25 22:48:06 2009 +0300 proc 2/2: remove struct proc_dir_entry::owner Setting ->owner as done currently (pde->owner = THIS_MODULE) is racy as correctly noted at bug #12454. Someone can lookup entry with NULL ->owner, thus not pinning enything, and release it later resulting in module refcount underflow. We can keep ->owner and supply it at registration time like ->proc_fops and ->data. But this leaves ->owner as easy-manipulative field (just one C assignment) and somebody will forget to unpin previous/pin current module when switching ->owner. ->proc_fops is declared as "const" which should give some thoughts. ->read_proc/->write_proc were just fixed to not require ->owner for protection. rmmod'ed directories will be empty and return "." and ".." -- no harm. And directories with tricky enough readdir and lookup shouldn't be modular. We definitely don't want such modular code. Removing ->owner will also make PDE smaller. So, let's nuke it. Kudos to Jeff Layton for reminding about this, let's say, oversight. http://bugzilla.kernel.org/show_bug.cgi?id=12454 Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2009-04-14backport commit 758021bfa9ea25c58e62d2f68512628b19502ce7Mauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@redhat.com> Author: Takashi Iwai <tiwai@suse.de> Date: Mon Jan 12 15:17:09 2009 +0100 drivers/media: Convert to snd_card_create() Convert from snd_card_new() to the new snd_card_create() function. While here, backport also cx231xx-audio upstream changes for using snd_card_create(). kernel-sync: Priority: normal Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2009-04-14backport commit 284901a90a9e0b812ca3f5f852cbbfb60d10249dMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@redhat.com> Author: Yang Hongyang <yanghy@cn.fujitsu.com> Date: Mon Apr 6 19:01:15 2009 -0700 dma-mapping: replace all DMA_32BIT_MASK macro with DMA_BIT_MASK(32) Replace all DMA_32BIT_MASK macro with DMA_BIT_MASK(32) Priority: normal Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2009-04-14backport a few language cleanupsMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@redhat.com> kernel-sync: Priority: normal Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2009-04-14backport commit 4f8d182513690b42b20fb81e487be4cd4729e27cMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@redhat.com> Author: Jaswinder Singh <jaswinder@infradead.org> Date: Sun Jun 22 18:24:19 2008 +0530 Remove fdump tool for av7110 firmware There's no point in this, since the user can use the BUILTIN_FIRMWARE option to include arbitrary firmware files directly in the kernel image. Thanks to David Woodhouse for help. kernel-sync: Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2009-04-14backport commit 9137f05f7e72517d44b6b0c15b11b419ecb5d201Mauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@redhat.com> Author: Jaswinder Singh <jaswinder@infradead.org> Date: Mon Apr 6 14:34:12 2009 -0700 firmware: convert av7110 driver to request_firmware() kernel-sync: Priority: normal Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2009-04-14backport arch arm/sh changes that affected v4lMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@redhat.com> kernel-sync: Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-09 08:17:37 +0000