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

Jonathan writes:

First set of new drivers, cleanups and functionality for IIO in the 4.1 cycle.

New drivers
* CM3323 color sensor.
* MS5611 pressure and temperature sensor.

New functionality
* mup6050 - create mux clients for devices described via ACPI. The reasoning
     and approach taken in this patch are complex.  Basically there is no
     otherway of finding out what is there than by some esoteric look ups in
     the ACPI data.
* cm3232 - PM support
* itg3200 - suspend/resume support
* mcp320x - add more ADCs to the kconfig to reflect what the driver supports
     (this patch and the bindings got left behind when the support was added
      a while back).

Docs / utils
* ti-adc128s052 - DT bindings.
* mcp3422 - DT bindings.
* mcp320x - DT bindings
* ABI docs for event threshold scale attributes, in_magn_offset, proximity
  scan_element and thresh falling/rising values for accelerometers.  All
  elements long in use that have slipped by being explicitly documented.
* Tidy up the tools previously in drivers/staging/iio/Documentation and move
  them out to /tools/iio. Yet another move that should have happened long ago.
  This time Roberta Dobrescu did the leg work.  Thanks!

Core Cleanups
* Export userspace IIO headers.  We should have done the appropriate header
  splitting a long time ago. Thanks to Daniel for sorting this out.

* Refactor the registring of attributes for buffers to move all non-custom
  ones to a vector allowing easier additions to the current set in the future.

Driver Cleanups
* gpiod related cleanups.  Make use of the additional parameter to specify
  	initial direciton to avoid extra code.
* bmc150 - Various refactorings to reduce code repitition and prepare for
           hardware buffer support.  Some of these cleanups are good even
	   without the new functionality.
* kmx61 - direct use of index to an array avoiding a structure element which
          was always the index to an element in an array of that structure.
* vf610 - avoid incorrect type for return from wait_for_completion_timeout.
* gp2ap020a00f - use put_unaligned_le32 for slight code simplification.
* ade7754 - improve error handling including suppressing some build warnings.
* ade7759 - improve error handling including suppressing some build warnings.
* hmc5843 - Long line and indentation fixes. Also some constifying of various
      constant data.
* ade7854 - 80+ character line splitting.
* ad2s1210 - fix wrong printf format string.
* mxs-lradc - fix wrong printf format string.
* ade7954-i2c - code alignment fixes and other trivial but worthwhile bits.
* periodic rtc trigger - make the frequency type an unsigned int as it
  is always treated as such.
* jsa1212 - constify struct regmap_config as it is constant.
* ad7793 - typo in the MODULE_DESCRIPTION
* mma9551 - check gpiod_to_irq errors.  Note that this doesn't actually cause
    any trouble but is worth tidying up as obviously incorrect.
* mlx90614 - refactor the register symbols to make it clear which reads are to
    RAM not PROM.

1 files changed, 158 insertions, 0 deletions

diff --git a/tools/iio/lsiio.c b/tools/iio/lsiio.c
new file mode 100644
index 000000000000..c585440f864e
--- /dev/null
+++ b/tools/iio/lsiio.c
@@ -0,0 +1,158 @@
+/*
+ * Industrial I/O utilities - lsiio.c
+ *
+ * Copyright (c) 2010 Manuel Stahl <manuel.stahl@iis.fraunhofer.de>
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 as published by
+ * the Free Software Foundation.
+ */
+
+#include <string.h>
+#include <dirent.h>
+#include <stdio.h>
+#include <errno.h>
+#include <stdint.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <sys/dir.h>
+#include "iio_utils.h"
+
+
+static enum verbosity {
+        VERBLEVEL_DEFAULT,      /* 0 gives lspci behaviour */
+        VERBLEVEL_SENSORS,      /* 1 lists sensors */
+} verblevel = VERBLEVEL_DEFAULT;
+
+const char *type_device = "iio:device";
+const char *type_trigger = "trigger";
+
+
+static inline int check_prefix(const char *str, const char *prefix)
+{
+        return strlen(str) > strlen(prefix) &&
+                strncmp(str, prefix, strlen(prefix)) == 0;
+}
+
+static inline int check_postfix(const char *str, const char *postfix)
+{
+        return strlen(str) > strlen(postfix) &&
+                strcmp(str + strlen(str) - strlen(postfix), postfix) == 0;
+}
+
+static int dump_channels(const char *dev_dir_name)
+{
+        DIR *dp;
+        const struct dirent *ent;
+
+        dp = opendir(dev_dir_name);
+        if (dp == NULL)
+                return -errno;
+        while (ent = readdir(dp), ent != NULL)
+                if (check_prefix(ent->d_name, "in_") &&
+                    check_postfix(ent->d_name, "_raw")) {
+                        printf("   %-10s\n", ent->d_name);
+                }
+
+        return 0;
+}
+
+static int dump_one_device(const char *dev_dir_name)
+{
+        char name[IIO_MAX_NAME_LENGTH];
+        int dev_idx;
+        int retval;
+
+        retval = sscanf(dev_dir_name + strlen(iio_dir) + strlen(type_device),
+                        "%i", &dev_idx);
+        if (retval != 1)
+                return -EINVAL;
+        read_sysfs_string("name", dev_dir_name, name);
+        printf("Device %03d: %s\n", dev_idx, name);
+
+        if (verblevel >= VERBLEVEL_SENSORS)
+                return dump_channels(dev_dir_name);
+        return 0;
+}
+
+static int dump_one_trigger(const char *dev_dir_name)
+{
+        char name[IIO_MAX_NAME_LENGTH];
+        int dev_idx;
+        int retval;
+
+        retval = sscanf(dev_dir_name + strlen(iio_dir) + strlen(type_trigger),
+                        "%i", &dev_idx);
+        if (retval != 1)
+                return -EINVAL;
+        read_sysfs_string("name", dev_dir_name, name);
+        printf("Trigger %03d: %s\n", dev_idx, name);
+        return 0;
+}
+
+static void dump_devices(void)
+{
+        const struct dirent *ent;
+        DIR *dp;
+
+        dp = opendir(iio_dir);
+        if (dp == NULL) {
+                printf("No industrial I/O devices available\n");
+                return;
+        }
+
+        while (ent = readdir(dp), ent != NULL) {
+                if (check_prefix(ent->d_name, type_device)) {
+                        char *dev_dir_name;
+
+                        asprintf(&dev_dir_name, "%s%s", iio_dir, ent->d_name);
+                        dump_one_device(dev_dir_name);
+                        free(dev_dir_name);
+                        if (verblevel >= VERBLEVEL_SENSORS)
+                                printf("\n");
+                }
+        }
+        rewinddir(dp);
+        while (ent = readdir(dp), ent != NULL) {
+                if (check_prefix(ent->d_name, type_trigger)) {
+                        char *dev_dir_name;
+
+                        asprintf(&dev_dir_name, "%s%s", iio_dir, ent->d_name);
+                        dump_one_trigger(dev_dir_name);
+                        free(dev_dir_name);
+                }
+        }
+        closedir(dp);
+}
+
+int main(int argc, char **argv)
+{
+        int c, err = 0;
+
+        while ((c = getopt(argc, argv, "d:D:v")) != EOF) {
+                switch (c) {
+                case 'v':
+                        verblevel++;
+                        break;
+
+                case '?':
+                default:
+                        err++;
+                        break;
+                }
+        }
+        if (err || argc > optind) {
+                fprintf(stderr, "Usage: lsiio [options]...\n"
+                        "List industrial I/O devices\n"
+                        "  -v, --verbose\n"
+                        "      Increase verbosity (may be given multiple times)\n"
+                        );
+                exit(1);
+        }
+
+        dump_devices();
+
+        return 0;
+}