system/linux
system/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux synced 2024-09-24 05:17:36 +00:00
Code Issues Packages Projects Releases Wiki Activity
199656 commits 7 branches 853 tags 6.7 GiB
Commit graph

98 commits

Author SHA1 Message Date
Greg Kroah-Hartman c8d1a12692 Merge staging-next tree into Linus's latest version 
Conflicts:
	drivers/staging/arlan/arlan-main.c
	drivers/staging/comedi/drivers/cb_das16_cs.c
	drivers/staging/cx25821/cx25821-alsa.c
	drivers/staging/dt3155/dt3155_drv.c
	drivers/staging/hv/hv.c
	drivers/staging/netwave/netwave_cs.c
	drivers/staging/wavelan/wavelan.c
	drivers/staging/wavelan/wavelan_cs.c
	drivers/staging/wlags49_h2/wl_cs.c

This required a bit of hand merging due to the conflicts
that happened in the later .34-rc releases, as well as
some staging driver changing coming in through other trees
(v4l and pcmcia).

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 2010-05-21 12:48:55 -07:00
Barry Song 5763dcab5c staging: iio: adis16350 and similar IMU driver 
This version has the right part number in the commit message.
Whilst technically the part I listed last time is also supported
by the driver, the commit message might have caused confusion.

Another driver from Barry at Analog.  Again, I've lifted
if from the blackfin tree and done the usual sparse
and checkpatch fixes + the abi changes.  I actually
have one of these, so am particularly pleased to see
it supported!

Signed-off-by: Barry Song <Barry.Song@analog.com>
Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 2010-05-18 14:44:28 -07:00
Jonathan Cameron 81b77f94a1 Staging: iio: max1363 Fix two bugs in single_channel_from_ring 
This patch contains fixes for the two bugs Michael pointed
out last week.  As the other suggestion Michael made is
not a bug fix (just a much more sensible way of handling
things), I'll do that as a separate patch soon.

The bugs were introduced with the abi changes.

Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk>
Reported-by: Michael Hennerich <Michael.Hennerich@analog.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 2010-05-18 14:43:08 -07:00
Jonathan Cameron 9a3af585e7 Staging: iio: adis16220 extract bin_attribute structures from state 
Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 2010-05-18 14:42:57 -07:00
Barry Song 06f1962ab4 Staging: iio: adis16220 vibration sensor driver 
Signed-off-by: Barry Song <Barry.Song@analog.com>
Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 2010-05-18 14:40:47 -07:00
Barry Song 089a41985c staging: iio: adis16260 digital gyro driver 
Signed-off-by: Barry Song <Barry.Song@analog.com>
Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 2010-05-14 13:20:35 -07:00
Barry Song 2c834b4d2d staging: iio: adis16240 driver 
Signed-off-by: Barry Song <Barry.Song@analog.com>
Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 2010-05-11 14:33:24 -07:00
Barry Song 671ece14bc staging: iio: adis16209 driver 
Signed-off-by: Barry Song <Barry.Song@analog.com>
Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 2010-05-11 14:33:24 -07:00
Jonathan Cameron b155498b18 staging: iio: adis16400 clean out some unused code 
Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 2010-05-11 14:33:24 -07:00
Jonathan Cameron e5107fb870 staging: iio: Documentation update to add incli and switch to magn 
Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 2010-05-11 14:33:24 -07:00
Jonathan Cameron 4da54d93ab staging: iio: adis16300 clean out some unused code 
Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 2010-05-11 14:33:24 -07:00
Jonathan Cameron a1169c5a0b staging: iio: Break up gyro.h and move to new abi 
Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 2010-05-11 14:33:24 -07:00
Jonathan Cameron 85798ec85e staging: iio: Documentation fixes 
Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 2010-05-11 14:33:24 -07:00
Greg Kroah-Hartman 74112d3f3a Staging: iio: industrialio-trigger.c: minor fixups 
We needed to include a header file that declared the functions that are
being exported in this file.

Also fix up an indentation problem, and some sparse warnings.

Cc: Jonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 2010-05-11 11:36:11 -07:00
Greg Kroah-Hartman 19ca92e0bc Staging: iio: ring_sw.c: fix up sparse warnings 
NULL usage, static stuff, etc.

Cc: Jonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 2010-05-11 11:36:11 -07:00
Greg Kroah-Hartman 0deebb4fc4 Staging: iio: industrialio-ring.c: fix up sparse warnings 
Cc: Jonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 2010-05-11 11:36:11 -07:00
Greg Kroah-Hartman 7cfce527a2 Staging: iio: accel: fix up some sparse warnings. 
Minor stuff (static, NULL, etc.)

Cc: Jonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 2010-05-11 11:36:11 -07:00
Greg Kroah-Hartman d1d8abdb05 Staging: iio: trigger: fix up some global variables 
These should be static.

Cc: Jonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 2010-05-11 11:36:10 -07:00
Greg Kroah-Hartman 341713f265 Staging: iio: light: tsl2563: fix static sparse warning 
Cc: Jonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 2010-05-11 11:36:10 -07:00
Greg Kroah-Hartman acbbfe236e Staging: iio: adc: max1363_ring.c: fix up sparse warnings 
Cc: Jonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 2010-05-11 11:36:10 -07:00
Greg Kroah-Hartman f03de82b3f Staging: iio: max1363_core: fix bug in kzalloc call 
The operands were switched around :(

Cc: Jonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 2010-05-11 11:36:10 -07:00
Greg Kroah-Hartman 1b183e4b93 Staging: iio: adc: max1363_core: fix up some sparse warnings 
Also fix a minor coding style issue.

Cc: Jonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 2010-05-11 11:36:10 -07:00
Jonathan Cameron cb6405b15f Staging: iio: light trivial whitespace fix 
Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 2010-05-11 11:36:10 -07:00
Jonathan Cameron 26de720828 Staging: iio: accelerometers trivial checkpatch related fixes 
Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 2010-05-11 11:36:10 -07:00
Jonathan Cameron 5f87404dfc Staging: iio: Trivial - remove pointless semi colon (checkpatch found) 
Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 2010-05-11 11:36:10 -07:00
Barry Song a9d26f00b8 staging:iio:imu ADIS16400 and ADIS16405 driver 
Signed-off-by: Manuel Stahl <manuel.stahl@iis.fraunhofer.de>
Signed-off-by: Barry Song <Barry.Song@analog.com>
Acked-by: Jonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 2010-05-11 11:36:06 -07:00
Barry Song 1e3864e635 staging:iio:imu ADIS16300 driver 
Signed-off-by: Barry Song <Barry.Song@analog.com>
Acked-by: Jonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 2010-05-11 11:36:06 -07:00
Jonathan Cameron 9d8ae6c884 staging:iio:Documentation: Rewrite example for new abi. 
Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 2010-05-11 11:36:06 -07:00
Jonathan Cameron e9124afad3 staging:iio:tsl2563 add a name attribute under the iio 
Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 2010-05-11 11:36:06 -07:00
Jonathan Cameron 8474ddd7cb staging:iio:ring_sw: Fix incorrect test on successful read of last value, causes infinite loop 
Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 2010-05-11 11:36:06 -07:00
Jonathan Cameron 3bf877c1cc staging:iio:max1363 add support for 8 bit equivalent devices, max1036-9, max11600-5 
Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 2010-05-11 11:36:06 -07:00
Jonathan Cameron c3fa0fddd6 staging:iio:max1363 add support for max11606-max11617 
Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 2010-05-11 11:36:06 -07:00
Jonathan Cameron 758d988ce0 staging:iio: Remove naming via IDR's where no longer necessary under new abi. 
Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 2010-05-11 11:36:06 -07:00
Jonathan Cameron 2a6a255494 staging:iio:tsl2563: change lux to illuminance0_input to match new abi 
Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 2010-05-11 11:36:06 -07:00
Jonathan Cameron ba5c6fbac6 staging:iio: Directory name changes to match new ABI. 
Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 2010-05-11 11:36:05 -07:00
Jonathan Cameron e34d2c5fa2 staging:iio: ABI documentation (partial) 
Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 2010-05-11 11:36:05 -07:00
Jonathan Cameron eaf86ff939 staging:iio: Documentation, update iio_utils.h for the move to a bus 
Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 2010-05-11 11:36:05 -07:00
Jonathan Cameron 82020b0ef1 staging:iio:max1363 move to new abi. 
Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 2010-05-11 11:36:05 -07:00
Jonathan Cameron 1722762cea staging:iio: Clean out unused IIO_SCAN_EL and add IIO_SCAN_NAMED_EL_C 
Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 2010-05-11 11:36:05 -07:00
Jonathan Cameron 5cba220b0a staging:iio: Move event attributes into the event[n] device in sysfs 
Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 2010-05-11 11:36:05 -07:00
Jonathan Cameron 5aaaeba82e staging: iio: Move from class to bus 
Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 2010-05-11 11:36:05 -07:00
Jonathan Cameron e5c003ae82 staging:iio: Support functions for scan mask matching 
Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 2010-05-11 11:36:05 -07:00
Jonathan Cameron f3fb001191 iio:staging:accelerometers move towards the new abi 
Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 2010-05-11 11:36:05 -07:00
Jonathan Cameron ff7723e203 staging:iio: Add new attrs for sampling frequency available and temp_raw 
Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 2010-05-11 11:36:04 -07:00
Jonathan Cameron ad313b1062 staging:iio: Add new in_raw definitions for adc channels. 
Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 2010-05-11 11:36:04 -07:00
Roel Van Nyen c849d2538e Staging: iio: Fix remaining code style issues 
fix code style issues

Signed-of-by: Roel Van Nyen <roel.vannyen@gmail.com>
Cc: Jonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 2010-05-11 11:35:57 -07:00
Michael Hennerich 7c32785701 Staging: iio: iio_trigger_find_by_name: Skip trailing newline if available 
Skip trailing newline if available.

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>
 2010-05-11 11:35:46 -07:00
Michael Hennerich a05d7ce36c Staging: iio: iio-trig-gpio: Remove redundant gpio_request 
Remove redundant gpio_request:
The GPIO used as trigger IRQ, is also requested as gpio, but actually never read.

Use platform resource facility to get IRQs numbers and flags.
Make sure this driver can be used with any system IRQ, not necessarily limited to GPIO-IRQs.
Use dev_err(dev...) and friends instead of printk(KERN_ERR...)

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>
 2010-05-11 11:35:46 -07:00
Barry Song ceb0525c9e Staging: iio: fix typo in userspace example codes and document 
Signed-off-by: Barry Song <21cnbao@gmail.com>
Acked-by: Jonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 2010-05-11 11:35:46 -07:00
Andrea Gelmini 013659f558 Staging: iio: Documentation/lis3l02dqbuffersimple.c: duplicated include 
drivers/staging/iio/Documentation/lis3l02dqbuffersimple.c: dirent.h is included more than once.

Signed-off-by: Andrea Gelmini <andrea.gelmini@gelma.net>
Acked-by: Jonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 2010-05-11 11:35:46 -07:00