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

Jonathan writes:

First round of new drivers, cleanups and functionality for the 3.17 cycle.

New drivers
* t5403 barometric pressure sensor
* kxcjk1013 accelerometer (with a locking followup fix).
* ak09911 digital compass

Documentation
* ABI docs for proximity added (interface has been there a long time but
  somehow snuck through without being documented)
* Move iio-trig-sysfs documentation out of staging (got left behind when
  the driver moved some time ago).

Cleanups
 * drop the timestamp argument from iio_trigger_poll(_chained) as
   nothing has been done with it for some time.
 * ad799x kerneldoc for ad799x_chip brought up to date.
 * replace a number of reimplementations of the GENMASK macro and
   use the BIT macro to cleanup a few locations.
 * bring the iio_event_monitor example program up to date with new
   device types.
 * fix some incorrect function prototypes in iio_utils.h example code.
 * INDIO_RING_TRIGGERED to INDIO_BUFFER_TRIGGERED fix in docs. This
   got left behind after we renamed it a long time back.
 * fix error handling in the generic_buffer example program.
 * small tidy ups in the iio-trig-periodic-rtc driver.
 * Allow reseting iio-trig-periodic-rtc frequency to 0 (default) after
   it has changed.
 * Trivial tidy ups in coding style in iio_simply_dummy

2 files changed, 24 insertions, 0 deletions

diff --git a/Documentation/ABI/testing/sysfs-bus-iio b/Documentation/ABI/testing/sysfs-bus-iio
index a9757dcf2e81..738b56f862b4 100644
--- a/Documentation/ABI/testing/sysfs-bus-iio
+++ b/Documentation/ABI/testing/sysfs-bus-iio
@@ -895,6 +895,19 @@ Description:
                 on-chip EEPROM. After power-up or chip reset the device will
                 automatically load the saved configuration.
 
+What:           /sys/.../iio:deviceX/in_proximity_raw
+What:           /sys/.../iio:deviceX/in_proximity_input
+What:           /sys/.../iio:deviceX/in_proximityY_raw
+KernelVersion:  3.4
+Contact:        linux-iio@vger.kernel.org
+Description:
+                Proximity measurement indicating that some
+                object is near the sensor, usually be observing
+                reflectivity of infrared or ultrasound emitted.
+                Often these sensors are unit less and as such conversion
+                to SI units is not possible.  Where it is, the units should
+                be meters.
+
 What:           /sys/.../iio:deviceX/in_illuminanceY_input
 What:           /sys/.../iio:deviceX/in_illuminanceY_raw
 What:           /sys/.../iio:deviceX/in_illuminanceY_mean_raw
diff --git a/Documentation/ABI/testing/sysfs-bus-iio-trigger-sysfs b/Documentation/ABI/testing/sysfs-bus-iio-trigger-sysfs
new file mode 100644
index 000000000000..5235e6c749ab
--- /dev/null
+++ b/Documentation/ABI/testing/sysfs-bus-iio-trigger-sysfs
@@ -0,0 +1,11 @@
+What:           /sys/bus/iio/devices/triggerX/trigger_now
+KernelVersion:  2.6.38
+Contact:        linux-iio@vger.kernel.org
+Description:
+                This file is provided by the iio-trig-sysfs stand-alone trigger
+                driver. Writing this file with any value triggers an event
+                driven driver, associated with this trigger, to capture data
+                into an in kernel buffer. This approach can be valuable during
+                automated testing or in situations, where other trigger methods
+                are not applicable. For example no RTC or spare GPIOs.
+                X is the IIO index of the trigger.