Merge tag 'iio-for-3.16a' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio into staging-next

Jonathan writes:

First round of IIO new driver, functionality and cleanups for the 3.16 cycle.

New device support
* AS3935 Lightning Sensor
* MCP3426/7/8 support added to the existing MCP3422 ADC driver
* AK8963 support in the AK8975 driver
* MPU6500 support in the MPU6050 driver (the functionality that is different
  is mostly not supported yet in either part).

Staging Graduations
* AD799x ADC

New functionality
* ACPI enumeration for the ak8975 driver

Cleanup / tweaks
* Use snprintf as a matter of good practice in a few additional places.
* Document *_mean_raw attributes.  These have been there a while, but were
  undocumented.
* Add an in kernel interface to get the mean values.
* Bug in the length of the event info mask that by coincidence wasn't yet
  actually causing any problems.
* itg3000 drop an unreachable return statement.
* spear_adc cleanups (heading for a staging graduation but a few more
  issues showed up in the review of these patches).
* Exynos ADC dependencies changed so it is only built when Exynos is present
  or COMPILE_TEST and OF are set.
* tsl2583 cleanups.
* Some cut and paste typos in the comments of various drivers still in staging.
* Couple of minor improvements to the ST sensor drivers.

2 files changed, 24 insertions, 0 deletions

diff --git a/Documentation/ABI/testing/sysfs-bus-iio b/Documentation/ABI/testing/sysfs-bus-iio
index 6e02c5029152..58ba33300305 100644
--- a/Documentation/ABI/testing/sysfs-bus-iio
+++ b/Documentation/ABI/testing/sysfs-bus-iio
@@ -210,6 +210,14 @@ Contact:	linux-iio@vger.kernel.org
 Description:
                 Scaled humidity measurement in milli percent.
 
+What:           /sys/bus/iio/devices/iio:deviceX/in_X_mean_raw
+KernelVersion:  3.5
+Contact:        linux-iio@vger.kernel.org
+Description:
+                Averaged raw measurement from channel X. The number of values
+                used for averaging is device specific. The converting rules for
+                normal raw values also applies to the averaged raw values.
+
 What:           /sys/bus/iio/devices/iio:deviceX/in_accel_offset
 What:           /sys/bus/iio/devices/iio:deviceX/in_accel_x_offset
 What:           /sys/bus/iio/devices/iio:deviceX/in_accel_y_offset
diff --git a/Documentation/ABI/testing/sysfs-bus-iio-proximity-as3935 b/Documentation/ABI/testing/sysfs-bus-iio-proximity-as3935
new file mode 100644
index 000000000000..6708c5e264aa
--- /dev/null
+++ b/Documentation/ABI/testing/sysfs-bus-iio-proximity-as3935
@@ -0,0 +1,16 @@
+What            /sys/bus/iio/devices/iio:deviceX/in_proximity_raw
+Date:           March 2014
+KernelVersion:  3.15
+Contact:        Matt Ranostay <mranostay@gmail.com>
+Description:
+                Get the current distance in meters of storm (1km steps)
+                1000-40000 = distance in meters
+
+What            /sys/bus/iio/devices/iio:deviceX/sensor_sensitivity
+Date:           March 2014
+KernelVersion:  3.15
+Contact:        Matt Ranostay <mranostay@gmail.com>
+Description:
+                Show or set the gain boost of the amp, from 0-31 range.
+                18 = indoors (default)
+                14 = outdoors