summaryrefslogtreecommitdiffstats
path: root/drivers/staging
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'v4l_for_linus' of ↵Linus Torvalds2011-05-2410-957/+781Star
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6 * 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6: (247 commits) [media] gspca - sunplus: Fix some warnings and simplify code [media] gspca: Fix some warnings tied to 'no debug' [media] gspca: Unset debug by default [media] gspca - cpia1: Remove a bad conditional compilation instruction [media] gspca - main: Remove USB traces [media] gspca - main: Version change to 2.13 [media] gspca - stk014 / t613: Accept the index 0 in querymenu [media] gspca - kinect: Remove __devinitdata [media] gspca - cpia1: Fix some warnings [media] video/Kconfig: Fix mis-classified devices [media] support for medion dvb stick 1660:1921 [media] tm6000: fix uninitialized field, change prink to dprintk [media] cx231xx: Add support for Iconbit U100 [media] saa7134 add new TV cards [media] Use a more consistent value for RC repeat period [media] cx18: Move spinlock and vb_type initialisation into stream_init [media] tm6000: remove tm6010 sif audio start and stop [media] tm6000: remove unused exports [media] tm6000: add pts logging [media] tm6000: change from ioctl to unlocked_ioctl ...
| * [media] tm6000: fix uninitialized field, change prink to dprintkStefan Ringel2011-05-212-2/+5
| | | | | | | | | | | | | | fix uninitialized field, change prink to dprintk Signed-off-by: Stefan Ringel <stefan.ringel@arcor.de> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
| * [media] tm6000: remove tm6010 sif audio start and stopStefan Ringel2011-05-211-3/+0Star
| | | | | | | | | | | | | | remove tm6010 sif audio start and stop Signed-off-by: Stefan Ringel <stefan.ringel@arcor.de> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
| * [media] tm6000: remove unused exportsStefan Ringel2011-05-211-3/+0Star
| | | | | | | | | | Signed-off-by: Stefan Ringel <stefan.ringel@arcor.de> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
| * [media] tm6000: add pts loggingStefan Ringel2011-05-211-1/+5
| | | | | | | | | | Signed-off-by: Stefan Ringel <stefan.ringel@arcor.de> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
| * [media] tm6000: change from ioctl to unlocked_ioctlStefan Ringel2011-05-211-4/+4
| | | | | | | | | | Signed-off-by: Stefan Ringel <stefan.ringel@arcor.de> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
| * [media] tm6000: all audio packets must swabStefan Ringel2011-05-211-8/+5Star
| | | | | | | | | | Signed-off-by: Stefan Ringel <stefan.ringel@arcor.de> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
| * [media] tm6000: remove input selectStefan Ringel2011-05-211-8/+0Star
| | | | | | | | | | Signed-off-by: Stefan Ringel <stefan.ringel@arcor.de> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
| * [media] tm6000: move from tm6000_set_reg to tm6000_set_reg_maskStefan Ringel2011-05-211-16/+10Star
| | | | | | | | | | | | | | move from tm6000_set_reg to tm6000_set_reg_mask Signed-off-by: Stefan Ringel <stefan.ringel@arcor.de> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
| * [media] tm6000: remove duplicated initStefan Ringel2011-05-211-3/+0Star
| | | | | | | | | | Signed-off-by: Stefan Ringel <stefan.ringel@arcor.de> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
| * [media] tm6000: remove old tuner paramsStefan Ringel2011-05-211-5/+1Star
| | | | | | | | | | Signed-off-by: Stefan Ringel <stefan.ringel@arcor.de> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
| * [media] tm6000: remove unused capabilitiesStefan Ringel2011-05-212-10/+0Star
| | | | | | | | | | Signed-off-by: Stefan Ringel <stefan.ringel@arcor.de> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
| * [media] tm6000: add eepromStefan Ringel2011-05-211-2/+5
| | | | | | | | | | Signed-off-by: Stefan Ringel <stefan.ringel@arcor.de> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
| * [media] tm6000: change input controlStefan Ringel2011-05-214-669/+130Star
| | | | | | | | | | | | | | change input control Signed-off-by: Stefan Ringel <stefan.ringel@arcor.de> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
| * [media] tm6000: vitual input enumsStefan Ringel2011-05-211-43/+57
| | | | | | | | | | | | | | vitual input enums Signed-off-by: Stefan Ringel <stefan.ringel@arcor.de> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
| * [media] tm6000: change to virtual inputsStefan Ringel2011-05-213-50/+303
| | | | | | | | | | | | | | change to virtual inputs Signed-off-by: Stefan Ringel <stefan.ringel@arcor.de> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
| * [media] tm6000: add tm6010 audio mode setupStefan Ringel2011-05-213-78/+107
| | | | | | | | | | | | | | add tm6010 audio mode setup Signed-off-by: Stefan Ringel <stefan.ringel@arcor.de> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
| * [media] tm6000: add radio capabilitiesStefan Ringel2011-05-213-16/+23
| | | | | | | | | | | | | | add radio capabilities Signed-off-by: Stefan Ringel <stefan.ringel@arcor.de> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
| * [media] tm6000: add detection based on eeprom nameMauro Carvalho Chehab2011-05-203-32/+105
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On some situations, it is desired to use eeprom data to detect the board type. This patch adds a logic for it and fixes 2 detection issues: 1) 10Moons UT-821 uses a generic Trident ID. Other boards also share the same ID. So, better to use an alternative way for it; 2) Sometimes, HVR-900H is loaded with the default Trident ID. This seems to be some hardware bug or race condition. The new logic will only be enabled if the device is detected as having a generic ID. Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
| * [media] tm6000: add CARDLISTStefan Ringel2011-05-201-0/+16
| | | | | | | | | | | | | | add CARDLIST Signed-off-by: Stefan Ringel <stefan.ringel@arcor.de> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
| * [media] tm6000: fix vbuf may be used uninitializedJarod Wilson2011-05-201-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit 8aff8ba95155df, most of the manipulations to vbuf inside copy_streams were gated on if !dev->radio, but one place that touches vbuf lays outside those gates -- a memcpy of vbuf isn't NULL. If we initialize vbuf to NULL, that memcpy will never happen in the case where we do have dev->radio, and otherwise, in the !dev->radio case, the code behaves exactly like it did prior to 8aff8ba95155df. While we're at it, also fix an incorrectly indented closing brace for one of the sections touching vbuf that is conditional on !dev->radio. Signed-off-by: Jarod Wilson <jarod@redhat.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
| * [media] lirc_sasem: key debug spew off debug modparamJarod Wilson2011-05-201-6/+7
| | | | | | | | | | Signed-off-by: Jarod Wilson <jarod@redhat.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
* | Merge branch 'staging-next' of ↵Linus Torvalds2011-05-23821-171851/+68282Star
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6 * 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6: (970 commits) staging: usbip: replace usbip_u{dbg,err,info} and printk with dev_ and pr_ staging:iio: Trivial kconfig reorganization and uniformity improvements. staging:iio:documenation partial update. staging:iio: use pollfunc allocation helpers in remaining drivers. staging:iio:max1363 misc cleanups and use of for_each_bit_set to simplify event code spitting out. staging:iio: implement an iio_info structure to take some of the constant elements out of iio_dev. staging:iio:meter:ade7758: Use private data space from iio_allocate_device staging:iio:accel:lis3l02dq make write_reg_8 take value not a pointer to value. staging:iio: ring core cleanups + check if read_last available in lis3l02dq staging:iio:core cleanup: squash tiny wrappers and use dev_set_name to handle creation of event interface name. staging:iio: poll func allocation clean up. staging:iio:ad7780 trivial unused header cleanup. staging:iio:adc: AD7780: Use private data space from iio_allocate_device + trivial fixes staging:iio:adc:AD7780: Convert to new channel registration method staging:iio:adc: AD7606: Drop dev_data in favour of iio_priv() staging:iio:adc: AD7606: Consitently use indio_dev staging:iio: Rip out helper for software rings. staging:iio:adc:AD7298: Use private data space from iio_allocate_device staging:iio: rationalization of different buffer implementation hooks. staging:iio:imu:adis16400 avoid allocating rx, tx, and state separately from iio_dev. ... Fix up trivial conflicts in - drivers/staging/intel_sst/intelmid.c: patches applied in both branches - drivers/staging/rt2860/common/cmm_data_{pci,usb}.c: removed vs spelling - drivers/staging/usbip/vhci_sysfs.c: trivial header file inclusion
| * | staging: usbip: replace usbip_u{dbg,err,info} and printk with dev_ and pr_matt mooney2011-05-2011-306/+220Star
| | | | | | | | | | | | | | | | | | | | | | | | | | | This switches all of the usbip_u{dbg,err,info} and printk statements to dev_<level>, if possible, or pr_<level> macros. And removes a few unnecessary debug statements. Signed-off-by: matt mooney <mfm@muteddisk.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * | staging:iio: Trivial kconfig reorganization and uniformity improvements.Jonathan Cameron2011-05-203-41/+41
| | | | | | | | | | | | | | | Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * | staging:iio:documenation partial update.Jonathan Cameron2011-05-205-78/+91
| | | | | | | | | | | | | | | | | | | | | | | | | | | More to be added, but this brings the docs in line with the current code. Now they are hopefully just uninformative rather than actually incorrect. Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * | staging:iio: use pollfunc allocation helpers in remaining drivers.Jonathan Cameron2011-05-209-129/+79Star
| | | | | | | | | | | | | | | | | | | | | Some didn't get converted the first time around. Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * | staging:iio:max1363 misc cleanups and use of for_each_bit_set to simplify ↵Jonathan Cameron2011-05-203-116/+63Star
| | | | | | | | | | | | | | | | | | | | | event code spitting out. Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * | staging:iio: implement an iio_info structure to take some of the constant ↵Jonathan Cameron2011-05-2061-669/+964
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | elements out of iio_dev. This was suggested by Arnd Bergmann, Other elements may well move in here in future, but it definitely makes sense for these. Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * | staging:iio:meter:ade7758: Use private data space from iio_allocate_deviceMichael Hennerich2011-05-204-70/+62Star
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use private data space from iio_allocate_device. Drop dev_data in favor of iio_priv(). Fix indention issues from previous patches. Signed-off-by: Michael Hennerich <michael.hennerich@analog.com> Acked-by: Jonathan Cameron <jic23@cam.ac.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * | staging:iio:accel:lis3l02dq make write_reg_8 take value not a pointer to value.Jonathan Cameron2011-05-203-21/+21
| | | | | | | | | | | | | | | | | | | | | Silliness that has been there a long time. Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * | staging:iio: ring core cleanups + check if read_last available in lis3l02dqJonathan Cameron2011-05-203-233/+136Star
| | | | | | | | | | | | | | | Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * | staging:iio:core cleanup: squash tiny wrappers and use dev_set_name to ↵Jonathan Cameron2011-05-202-39/+18Star
| | | | | | | | | | | | | | | | | | | | | handle creation of event interface name. Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * | staging:iio: poll func allocation clean up.Jonathan Cameron2011-05-208-90/+95
| | | | | | | | | | | | | | | | | | | | | | | | Add a function to neatly deal with allocation of poll functions. Ultimately this allows us to more easily change the implementation. Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * | staging:iio:ad7780 trivial unused header cleanup.Jonathan Cameron2011-05-201-2/+0Star
| | | | | | | | | | | | | | | Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * | staging:iio:adc: AD7780: Use private data space from iio_allocate_device + ↵Michael Hennerich2011-05-201-44/+36Star
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | trivial fixes Use private data space from iio_allocate_device Drop dev_data in favour of iio_priv() Fix typo in gpio name Fix error return path, free gpio Make scale_uv type unsigned long Signed-off-by: Michael Hennerich <michael.hennerich@analog.com> Acked-by: Jonathan Cameron <jic23@cam.ac.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * | staging:iio:adc:AD7780: Convert to new channel registration methodMichael Hennerich2011-05-201-62/+51Star
| | | | | | | | | | | | | | | | | | | | | | | | Convert to new channel registration method Signed-off-by: Michael Hennerich <michael.hennerich@analog.com> Acked-by: Jonathan Cameron <jic23@cam.ac.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * | staging:iio:adc: AD7606: Drop dev_data in favour of iio_priv()Michael Hennerich2011-05-203-19/+16Star
| | | | | | | | | | | | | | | | | | | | | | | | Some other small cleanups including excess header removals. Signed-off-by: Michael Hennerich <michael.hennerich@analog.com> Acked-by: Jonathan Cameron <jic23@cam.ac.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * | staging:iio:adc: AD7606: Consitently use indio_devMichael Hennerich2011-05-201-19/+19
| | | | | | | | | | | | | | | | | | Signed-off-by: Michael Hennerich <michael.hennerich@analog.com> Acked-by: Jonathan Cameron <jic23@cam.ac.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * | staging:iio: Rip out helper for software rings.Jonathan Cameron2011-05-205-209/+111Star
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It seemed like a good idea at the time, it wasn't. The code with this in place is larger and more complex for no real gain. Basically we've cleaned up the core around it so much that this no longer makes sense. Only really effects the lis3l02dq driver. Signed-off-by: Jonathan Cameron <jic23@cam.acuk> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * | staging:iio:adc:AD7298: Use private data space from iio_allocate_deviceMichael Hennerich2011-05-203-44/+41Star
| | | | | | | | | | | | | | | | | | | | | Use private data space from iio_allocate_device Signed-off-by: Michael Hennerich <michael.hennerich@analog.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * | staging:iio: rationalization of different buffer implementation hooks.Jonathan Cameron2011-05-2023-463/+363Star
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1) move a generic helper function out of ring_sw. It applies to other buffers as well. 2) Get rid of a lot of left over function definitions. 3) Move all the access functions into static structures. 4) Introduce and use a static structure for the setup functions, preenable etc. Some driver conversions thanks to Michael Hennerich (pulled out of patches that would otherwise sit after this). Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * | staging:iio:imu:adis16400 avoid allocating rx, tx, and state separately from ↵Jonathan Cameron2011-05-204-90/+63Star
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | iio_dev. Uses the iio_allocate_device parameter to set aside space for adis16400_state and ____cacheline_aligned buffers for tx and rx to avoid separatel allocating them. Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * | staging:iio:trigger handle name attr in core, remove old alloc and register ↵Jonathan Cameron2011-05-2015-356/+110Star
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | any control_attrs via struct device As the majority of triggers don't actually have any other control_attrs lets use the fact that struct device has a groups element when we do need to have these attributes registered. A vargs function is used to cut down on lots of building strings in every single driver just in order to pass them into the allocate. Also iio_allocate_trigger_named -> iio_allocate_trigger as there is no unamed version any more, so that is now just confusing. Blackfin tested and fixed by Michael Hennerich. V2: Elements from Michael Hennerich's patches for the ade7758 Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * | staging:iio: iio_event_interfaces - clean out unused elementsJonathan Cameron2011-05-202-18/+8Star
| | | | | | | | | | | | | | | | | | | | | Also removed const casting of _name that was unnecessary. Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * | staging:iio:lis3l02dq remerge the two interrupt handlers.Jonathan Cameron2011-05-203-40/+47
| | | | | | | | | | | | | | | | | | | | | | | | Does add a small burden to both handlers, but the gain is somewhat simpler code. Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * | staging:iio:buffer - remove unused event code for buffer events.Jonathan Cameron2011-05-203-7/+2Star
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These events are no longer passed up to userspace. ad7745 - was using these events to indicate directly dataready events. I'm not sure when it ever makes sense to push these to userspace so for now I've taken them to event codes 0 and 1 until someone has time to make this driver do something more standard. (they were arbitary before, they still are, be it in a different way!) Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * | staging:iio:addac:adt7316 replace abuse of buffer events.Jonathan Cameron2011-05-201-30/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently squashed the fault condition from external temperature sensor - lots of other issues to be fixed with this driver which obeys almost no elements of the abi. V2: removed a couple of usused variables that sparse found. Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * | staging:iio:adc:adt7410 replace abuse of buffer events.Jonathan Cameron2011-05-201-14/+12Star
| | | | | | | | | | | | | | | Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * | staging:iio:adc:adt7310 replace abuse of buffer events.Jonathan Cameron2011-05-201-13/+11Star
| | | | | | | | | | | | | | | Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
generated by cgit v1.2.3-55-g7522 (git 2.39.0) at 2024-07-23 07:45:36 +0200