Greg Kroah-Hartman
e2aad1d571
Merge 3.12-rc2 into staging-next.
...
This resolves the merge problem with two iio drivers that Stephen
Rothwell pointed out.
Reported-by: Stephen Rothwell <sfr@canb.auug.org.au >
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org >
2013-09-25 08:59:04 -07:00
Lars-Peter Clausen
6bf9d87756
iio:bma180: Use iio_push_buffers_with_timestamp()
...
Makes the code shorter and a bit less ugly.
Signed-off-by: Lars-Peter Clausen <lars@metafoo.de >
Cc: Oleksandr Kravchenko <o.v.kravchenko@globallogic.com >
Signed-off-by: Jonathan Cameron <jic23@kernel.org >
2013-09-21 19:23:50 +01:00
Peter Meerwald
234efa1703
iio: Fix bma180 dev-to-indio_dev conversion in suspend/resume
...
dev_to_iio_dev() is a false friend
Signed-off-by: Peter Meerwald <pmeerw@pmeerw.net >
Cc: Oleksandr Kravchenko <o.v.kravchenko@globallogic.com >
Signed-off-by: Jonathan Cameron <jic23@kernel.org >
2013-09-21 12:04:34 +01:00
Lars-Peter Clausen
8c60c7e75d
iio: Remove unnecessary casts for iio_push_to_buffers()
...
Now that iio_push_to_buffers() takes a void pointer for the data parameter we
can remove those casts to u8*.
Signed-off-by: Lars-Peter Clausen <lars@metafoo.de >
Signed-off-by: Jonathan Cameron <jic23@kernel.org >
2013-09-15 19:05:07 +01:00
Oleksandr Kravchenko
fdadbce0da
iio: add Bosch BMA180 acceleration sensor driver
...
This patch adds IIO driver for Bosch BMA180 triaxial
acceleration sensor.
http://dlnmh9ip6v2uc.cloudfront.net/datasheets/
Sensors/Accelerometers/BST-BMA180-DS000-07_2.pdf
Signed-off-by: Oleksandr Kravchenko <o.v.kravchenko@globallogic.com >
Acked-by: Stephen Warren <swarren@nvidia.com >
Signed-off-by: Jonathan Cameron <jic23@kernel.org >
2013-08-28 20:12:22 +01:00
