linux.git/drivers/iio, branch v3.18-rc2 Linux kernel source tree staging: iio: fix up merge error 2014-09-22T14:54:10+00:00 Greg Kroah-Hartman gregkh@linuxfoundation.org 2014-09-22T14:54:10+00:00 8deab4754c478149f8a139d6f54dc8b3ff665724 Fix up a build merge error in drivers/iio/accel/bma180.c that I caused. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> 
Fix up a build merge error in drivers/iio/accel/bma180.c that I caused.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Merge 3.17-rc6 into staging-next. 2014-09-22T14:30:03+00:00 Greg Kroah-Hartman gregkh@linuxfoundation.org 2014-09-22T14:30:03+00:00 d84a2b0d6fecbb6e29875dd9dc97cdcdaa15744a We want the fixes in there, and it resolves a merge issue with drivers/iio/accel/bma180.c Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> 
We want the fixes in there, and it resolves a merge issue with
drivers/iio/accel/bma180.c

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
iio:bma180: Add BMA250 chip support 2014-09-14T19:52:25+00:00 Peter Meerwald pmeerw@pmeerw.net 2014-08-19T22:43:00+00:00 2017cff24cc08b145bff7256dd6b0ef99e7e8a01 the BMA250 has only 10-bit resolution; while the data readout registers have identical layout, the configuration is completely different compared to the BMA180 datasheet: http://ae-bst.resource.bosch.com/media/products/dokumente/bma250/BST-BMA250-DS002-05.pdf Signed-off-by: Peter Meerwald <pmeerw@pmeerw.net> Cc: Oleksandr Kravchenko <o.v.kravchenko@globallogic.com> Signed-off-by: Jonathan Cameron <jic23@kernel.org> 
the BMA250 has only 10-bit resolution; while the data readout registers
have identical layout, the configuration is completely different compared
to the BMA180

datasheet: http://ae-bst.resource.bosch.com/media/products/dokumente/bma250/BST-BMA250-DS002-05.pdf

Signed-off-by: Peter Meerwald <pmeerw@pmeerw.net>
Cc: Oleksandr Kravchenko <o.v.kravchenko@globallogic.com>
Signed-off-by: Jonathan Cameron <jic23@kernel.org>
iio:bma180: Implement _available sysfs attribute dynamically 2014-09-14T19:50:58+00:00 Peter Meerwald pmeerw@pmeerw.net 2014-08-19T22:43:00+00:00 402a324e6103c234f73564a3a611766414b6325b makes it easier to add more chip variants and removes redundancy: scales and frequencies are now stated just once Signed-off-by: Peter Meerwald <pmeerw@pmeerw.net> Cc: Oleksandr Kravchenko <o.v.kravchenko@globallogic.com> Signed-off-by: Jonathan Cameron <jic23@kernel.org> 
makes it easier to add more chip variants and removes redundancy:
scales and frequencies are now stated just once

Signed-off-by: Peter Meerwald <pmeerw@pmeerw.net>
Cc: Oleksandr Kravchenko <o.v.kravchenko@globallogic.com>
Signed-off-by: Jonathan Cameron <jic23@kernel.org>
iio:bma180: Prepare for accelerometer channels with different resolutions 2014-09-14T19:26:08+00:00 Peter Meerwald pmeerw@pmeerw.net 2014-08-19T22:43:00+00:00 6377aa496a0bc40af4f66574c813bb9a807a7e3a allow to specify channels resolution and compute shift assuming 16-bit registers and MSB allocation Signed-off-by: Peter Meerwald <pmeerw@pmeerw.net> Cc: Oleksandr Kravchenko <o.v.kravchenko@globallogic.com> Signed-off-by: Jonathan Cameron <jic23@kernel.org> 
allow to specify channels resolution and compute shift assuming
16-bit registers and MSB allocation

Signed-off-by: Peter Meerwald <pmeerw@pmeerw.net>
Cc: Oleksandr Kravchenko <o.v.kravchenko@globallogic.com>
Signed-off-by: Jonathan Cameron <jic23@kernel.org>
iio:bma180: Introduce part-specific _config() and disable() code 2014-09-14T19:25:59+00:00 Peter Meerwald pmeerw@pmeerw.net 2014-08-19T22:43:00+00:00 c1949ec18e50e1e23f3045a7c3836c289f553bb8 move part of bma180_init() to bma180_config() (split initialization and configuration code); configuration is heavily chip-specific Signed-off-by: Peter Meerwald <pmeerw@pmeerw.net> Cc: Oleksandr Kravchenko <o.v.kravchenko@globallogic.com> Signed-off-by: Jonathan Cameron <jic23@kernel.org> 
move part of bma180_init() to bma180_config() (split initialization and
configuration code); configuration is heavily chip-specific

Signed-off-by: Peter Meerwald <pmeerw@pmeerw.net>
Cc: Oleksandr Kravchenko <o.v.kravchenko@globallogic.com>
Signed-off-by: Jonathan Cameron <jic23@kernel.org>
iio:bma180: Introduce part_info to differentiate further chip variants 2014-09-14T19:21:30+00:00 Peter Meerwald pmeerw@pmeerw.net 2014-08-19T22:43:00+00:00 1b9030f5a0ac7c71bc733af3c9c1064204fc0258 Signed-off-by: Peter Meerwald <pmeerw@pmeerw.net> Cc: Oleksandr Kravchenko <o.v.kravchenko@globallogic.com> Signed-off-by: Jonathan Cameron <jic23@kernel.org> 
Signed-off-by: Peter Meerwald <pmeerw@pmeerw.net>
Cc: Oleksandr Kravchenko <o.v.kravchenko@globallogic.com>
Signed-off-by: Jonathan Cameron <jic23@kernel.org>
iio:bma180: Drop _update_scan_mode() 2014-09-14T19:19:52+00:00 Peter Meerwald pmeerw@pmeerw.net 2014-08-19T22:43:00+00:00 b9a6a237ffc99f63fd96f3ad11b3c5c532d211f8 statically allocate maximum size Signed-off-by: Peter Meerwald <pmeerw@pmeerw.net> Cc: Oleksandr Kravchenko <o.v.kravchenko@globallogic.com> Signed-off-by: Jonathan Cameron <jic23@kernel.org> 
statically allocate maximum size

Signed-off-by: Peter Meerwald <pmeerw@pmeerw.net>
Cc: Oleksandr Kravchenko <o.v.kravchenko@globallogic.com>
Signed-off-by: Jonathan Cameron <jic23@kernel.org>
iio:bma180: Expose temperature channel 2014-09-14T17:48:39+00:00 Peter Meerwald pmeerw@pmeerw.net 2014-08-19T22:43:00+00:00 b81fbab7f567aaa12aba6532681b426f3e130e11 8-bit signed; 0 LSB @ 24 °C, 0.5 °C per LSB Signed-off-by: Peter Meerwald <pmeerw@pmeerw.net> Cc: Oleksandr Kravchenko <o.v.kravchenko@globallogic.com> Signed-off-by: Jonathan Cameron <jic23@kernel.org> 
8-bit signed; 0 LSB @ 24 °C, 0.5 °C per LSB

Signed-off-by: Peter Meerwald <pmeerw@pmeerw.net>
Cc: Oleksandr Kravchenko <o.v.kravchenko@globallogic.com>
Signed-off-by: Jonathan Cameron <jic23@kernel.org>
iio:bma180: Use bool instead of int for state 2014-09-14T17:48:13+00:00 Peter Meerwald pmeerw@pmeerw.net 2014-08-19T22:43:00+00:00 c7c69e8540895be5d09bf023f1b48db3cab7a78b Signed-off-by: Peter Meerwald <pmeerw@pmeerw.net> Cc: Oleksandr Kravchenko <o.v.kravchenko@globallogic.com> Signed-off-by: Jonathan Cameron <jic23@kernel.org> 
Signed-off-by: Peter Meerwald <pmeerw@pmeerw.net>
Cc: Oleksandr Kravchenko <o.v.kravchenko@globallogic.com>
Signed-off-by: Jonathan Cameron <jic23@kernel.org>