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

Jonathan writes:

First round of new drivers, functionality and cleanups for IIO in the 3.13 cycle

A number of new drivers and some new functionality + a lot of cleanups
all over IIO.

New Core Elements

1) New INT_TIME info_mask element for integration time, which may have
   different effects on measurement noise and similar, than an amplifier
   and hence is different from existing SCALE.  Already existed in some
   drivers as a custom attribute.

2) Introduce a iio_push_buffers_with_timestamp helper to cover the common
   case of filling the last 64 bits of data to be passed to the buffer with
   a timestamp.  Applied to lots of drivers. Cuts down on repeated code and
   moves a slightly fiddly bit of logic into a single location.

3) Introduce info_mask_[shared_by_dir/shared_by_all] elements to allow support
   of elements such as sampling_frequency which is typically shared by all
   input channels on a device.  This reduces code and makes these controls
   available from in kernel consumers of IIO devices.

New drivers

1) MCP3422/3/4 ADC

2) TSL4531 ambient light sensor

3) TCS3472/5 color light sensor

4) GP2AP020A00F ambient light / proximity sensor

5) LPS001WP support added to ST pressure sensor driver.

New driver functionality

1) ti_am335x_adc Add buffered sampling support.
   This device has a hardware fifo that is fed directly into an IIO kfifo
   buffer based on a watershed interrupt.  Note this will act as an example
   of how to handle this increasingly common type of device.
   The only previous example - sca3000 - take a less than optimal approach
   which is largely why it is still in staging.
   A couple of little cleanups for that new functionality followed later.

Core cleanups:

1) MAINTAINERS - Sachin actually brought my email address up to date because
   I said I'd do it and never got around to it :)

2) Assign buffer list elements as single element lists to simplify the
   iio_buffer_is_active logic.

3) wake_up_interruptible_poll instead of wake_up_interruptible to only wake
   up threads waiting for poll notifications.

4) Add O_CLOEXEC flag to anon_inode_get_fd call for IIO event interface.

5) Change iio_push_to_buffers to take a void * pointer so as to avoid some
   annoying and unnecessary type casts.

6) iio_compute_scan_bytes incorrectly took a long rather than unsigned long.

7) Various minor tidy ups.

Driver cleanups (in no particular order)

1) Another set of devm_ allocations patches from Sachin Kamat.

2) tsl2x7x - 0 to NULL cleanup.

3) hmc5843 - fix missing > in MODULE_AUTHOR

4) Set of strict_strto* to kstrto* conversions.

5) mxs-lradc - fix ordering of resource removal to match creation

6) mxs-lradc - add MODULE_ALIAS

7) adc7606 - drop a work pending test duplicated in core functions.

8) hmc5843 - devm_ allocation patch

9) Series of redundant breaks removed.

10) ad2s1200 - pr_err -> dev_err

11) adjd_s311 - use INT_TIME

12)  ST sensors - large set of cleanups from Lee Jones and removed restriction
    to using only triggers provided by the st_sensors themselves from
    Dennis Ciocca.

13) dummy and tmp006 provide sampling_frequency via info_mask_shared_by_all.

14) tcs3472 - fix incorrect buffer size and wrong device pointer used in
    suspend / resume functions.

15) max1363 - use defaults for buffer setup ops as provided by the triggered
    buffer helpers as they are the same as were specified in max1363 driver.

16) Trivial tidy ups in a number of other drivers.

3 files changed, 191 insertions, 79 deletions

diff --git a/drivers/iio/pressure/st_pressure.h b/drivers/iio/pressure/st_pressure.h
index b0b630688da6..049c21acf1f0 100644
--- a/drivers/iio/pressure/st_pressure.h
+++ b/drivers/iio/pressure/st_pressure.h
@@ -14,6 +14,7 @@
 #include <linux/types.h>
 #include <linux/iio/common/st_sensors.h>
 
+#define LPS001WP_PRESS_DEV_NAME         "lps001wp"
 #define LPS331AP_PRESS_DEV_NAME         "lps331ap"
 
 /**
diff --git a/drivers/iio/pressure/st_pressure_core.c b/drivers/iio/pressure/st_pressure_core.c
index ceebd3c27892..2da411b6925b 100644
--- a/drivers/iio/pressure/st_pressure_core.c
+++ b/drivers/iio/pressure/st_pressure_core.c
@@ -36,94 +36,200 @@
                                                  ST_PRESS_LSB_PER_CELSIUS)
 #define ST_PRESS_NUMBER_DATA_CHANNELS           1
 
-/* DEFAULT VALUE FOR SENSORS */
-#define ST_PRESS_DEFAULT_OUT_XL_ADDR            0x28
-#define ST_TEMP_DEFAULT_OUT_L_ADDR              0x2b
-
 /* FULLSCALE */
 #define ST_PRESS_FS_AVL_1260MB                  1260
 
-/* CUSTOM VALUES FOR SENSOR 1 */
-#define ST_PRESS_1_WAI_EXP                      0xbb
-#define ST_PRESS_1_ODR_ADDR                     0x20
-#define ST_PRESS_1_ODR_MASK                     0x70
-#define ST_PRESS_1_ODR_AVL_1HZ_VAL              0x01
-#define ST_PRESS_1_ODR_AVL_7HZ_VAL              0x05
-#define ST_PRESS_1_ODR_AVL_13HZ_VAL             0x06
-#define ST_PRESS_1_ODR_AVL_25HZ_VAL             0x07
-#define ST_PRESS_1_PW_ADDR                      0x20
-#define ST_PRESS_1_PW_MASK                      0x80
-#define ST_PRESS_1_FS_ADDR                      0x23
-#define ST_PRESS_1_FS_MASK                      0x30
-#define ST_PRESS_1_FS_AVL_1260_VAL              0x00
-#define ST_PRESS_1_FS_AVL_1260_GAIN             ST_PRESS_KPASCAL_NANO_SCALE
-#define ST_PRESS_1_FS_AVL_TEMP_GAIN             ST_PRESS_CELSIUS_NANO_SCALE
-#define ST_PRESS_1_BDU_ADDR                     0x20
-#define ST_PRESS_1_BDU_MASK                     0x04
-#define ST_PRESS_1_DRDY_IRQ_ADDR                0x22
-#define ST_PRESS_1_DRDY_IRQ_INT1_MASK           0x04
-#define ST_PRESS_1_DRDY_IRQ_INT2_MASK           0x20
-#define ST_PRESS_1_MULTIREAD_BIT                true
-#define ST_PRESS_1_TEMP_OFFSET                  42500
-
-static const struct iio_chan_spec st_press_channels[] = {
-        ST_SENSORS_LSM_CHANNELS(IIO_PRESSURE,
+/* CUSTOM VALUES FOR LPS331AP SENSOR */
+#define ST_PRESS_LPS331AP_WAI_EXP               0xbb
+#define ST_PRESS_LPS331AP_ODR_ADDR              0x20
+#define ST_PRESS_LPS331AP_ODR_MASK              0x70
+#define ST_PRESS_LPS331AP_ODR_AVL_1HZ_VAL       0x01
+#define ST_PRESS_LPS331AP_ODR_AVL_7HZ_VAL       0x05
+#define ST_PRESS_LPS331AP_ODR_AVL_13HZ_VAL      0x06
+#define ST_PRESS_LPS331AP_ODR_AVL_25HZ_VAL      0x07
+#define ST_PRESS_LPS331AP_PW_ADDR               0x20
+#define ST_PRESS_LPS331AP_PW_MASK               0x80
+#define ST_PRESS_LPS331AP_FS_ADDR               0x23
+#define ST_PRESS_LPS331AP_FS_MASK               0x30
+#define ST_PRESS_LPS331AP_FS_AVL_1260_VAL       0x00
+#define ST_PRESS_LPS331AP_FS_AVL_1260_GAIN      ST_PRESS_KPASCAL_NANO_SCALE
+#define ST_PRESS_LPS331AP_FS_AVL_TEMP_GAIN      ST_PRESS_CELSIUS_NANO_SCALE
+#define ST_PRESS_LPS331AP_BDU_ADDR              0x20
+#define ST_PRESS_LPS331AP_BDU_MASK              0x04
+#define ST_PRESS_LPS331AP_DRDY_IRQ_ADDR         0x22
+#define ST_PRESS_LPS331AP_DRDY_IRQ_INT1_MASK    0x04
+#define ST_PRESS_LPS331AP_DRDY_IRQ_INT2_MASK    0x20
+#define ST_PRESS_LPS331AP_MULTIREAD_BIT         true
+#define ST_PRESS_LPS331AP_TEMP_OFFSET           42500
+#define ST_PRESS_LPS331AP_OUT_XL_ADDR           0x28
+#define ST_TEMP_LPS331AP_OUT_L_ADDR             0x2b
+
+/* CUSTOM VALUES FOR LPS001WP SENSOR */
+#define ST_PRESS_LPS001WP_WAI_EXP               0xba
+#define ST_PRESS_LPS001WP_ODR_ADDR              0x20
+#define ST_PRESS_LPS001WP_ODR_MASK              0x30
+#define ST_PRESS_LPS001WP_ODR_AVL_1HZ_VAL       0x01
+#define ST_PRESS_LPS001WP_ODR_AVL_7HZ_VAL       0x02
+#define ST_PRESS_LPS001WP_ODR_AVL_13HZ_VAL      0x03
+#define ST_PRESS_LPS001WP_PW_ADDR               0x20
+#define ST_PRESS_LPS001WP_PW_MASK               0x40
+#define ST_PRESS_LPS001WP_BDU_ADDR              0x20
+#define ST_PRESS_LPS001WP_BDU_MASK              0x04
+#define ST_PRESS_LPS001WP_MULTIREAD_BIT         true
+#define ST_PRESS_LPS001WP_OUT_L_ADDR            0x28
+#define ST_TEMP_LPS001WP_OUT_L_ADDR             0x2a
+
+static const struct iio_chan_spec st_press_lps331ap_channels[] = {
+        {
+                .type = IIO_PRESSURE,
+                .channel2 = IIO_NO_MOD,
+                .address = ST_PRESS_LPS331AP_OUT_XL_ADDR,
+                .scan_index = ST_SENSORS_SCAN_X,
+                .scan_type = {
+                        .sign = 'u',
+                        .realbits = 24,
+                        .storagebits = 24,
+                        .endianness = IIO_LE,
+                },
+                .info_mask_separate =
                         BIT(IIO_CHAN_INFO_RAW) | BIT(IIO_CHAN_INFO_SCALE),
-                        ST_SENSORS_SCAN_X, 0, IIO_NO_MOD, 'u', IIO_LE, 24, 24,
-                        ST_PRESS_DEFAULT_OUT_XL_ADDR),
-        ST_SENSORS_LSM_CHANNELS(IIO_TEMP,
-                        BIT(IIO_CHAN_INFO_RAW) | BIT(IIO_CHAN_INFO_SCALE) |
-                                                BIT(IIO_CHAN_INFO_OFFSET),
-                        -1, 0, IIO_NO_MOD, 's', IIO_LE, 16, 16,
-                        ST_TEMP_DEFAULT_OUT_L_ADDR),
+                .modified = 0,
+        },
+        {
+                .type = IIO_TEMP,
+                .channel2 = IIO_NO_MOD,
+                .address = ST_TEMP_LPS331AP_OUT_L_ADDR,
+                .scan_index = -1,
+                .scan_type = {
+                        .sign = 'u',
+                        .realbits = 16,
+                        .storagebits = 16,
+                        .endianness = IIO_LE,
+                },
+                .info_mask_separate =
+                        BIT(IIO_CHAN_INFO_RAW) |
+                        BIT(IIO_CHAN_INFO_SCALE) |
+                        BIT(IIO_CHAN_INFO_OFFSET),
+                .modified = 0,
+        },
+        IIO_CHAN_SOFT_TIMESTAMP(1)
+};
+
+static const struct iio_chan_spec st_press_lps001wp_channels[] = {
+        {
+                .type = IIO_PRESSURE,
+                .channel2 = IIO_NO_MOD,
+                .address = ST_PRESS_LPS001WP_OUT_L_ADDR,
+                .scan_index = ST_SENSORS_SCAN_X,
+                .scan_type = {
+                        .sign = 'u',
+                        .realbits = 16,
+                        .storagebits = 16,
+                        .endianness = IIO_LE,
+                },
+                .info_mask_separate = BIT(IIO_CHAN_INFO_RAW),
+                .modified = 0,
+        },
+        {
+                .type = IIO_TEMP,
+                .channel2 = IIO_NO_MOD,
+                .address = ST_TEMP_LPS001WP_OUT_L_ADDR,
+                .scan_index = -1,
+                .scan_type = {
+                        .sign = 'u',
+                        .realbits = 16,
+                        .storagebits = 16,
+                        .endianness = IIO_LE,
+                },
+                .info_mask_separate =
+                        BIT(IIO_CHAN_INFO_RAW) |
+                        BIT(IIO_CHAN_INFO_OFFSET),
+                .modified = 0,
+        },
         IIO_CHAN_SOFT_TIMESTAMP(1)
 };
 
 static const struct st_sensors st_press_sensors[] = {
         {
-                .wai = ST_PRESS_1_WAI_EXP,
+                .wai = ST_PRESS_LPS331AP_WAI_EXP,
                 .sensors_supported = {
                         [0] = LPS331AP_PRESS_DEV_NAME,
                 },
-                .ch = (struct iio_chan_spec *)st_press_channels,
+                .ch = (struct iio_chan_spec *)st_press_lps331ap_channels,
+                .num_ch = ARRAY_SIZE(st_press_lps331ap_channels),
                 .odr = {
-                        .addr = ST_PRESS_1_ODR_ADDR,
-                        .mask = ST_PRESS_1_ODR_MASK,
+                        .addr = ST_PRESS_LPS331AP_ODR_ADDR,
+                        .mask = ST_PRESS_LPS331AP_ODR_MASK,
                         .odr_avl = {
-                                { 1, ST_PRESS_1_ODR_AVL_1HZ_VAL, },
-                                { 7, ST_PRESS_1_ODR_AVL_7HZ_VAL, },
-                                { 13, ST_PRESS_1_ODR_AVL_13HZ_VAL, },
-                                { 25, ST_PRESS_1_ODR_AVL_25HZ_VAL, },
+                                { 1, ST_PRESS_LPS331AP_ODR_AVL_1HZ_VAL, },
+                                { 7, ST_PRESS_LPS331AP_ODR_AVL_7HZ_VAL, },
+                                { 13, ST_PRESS_LPS331AP_ODR_AVL_13HZ_VAL, },
+                                { 25, ST_PRESS_LPS331AP_ODR_AVL_25HZ_VAL, },
                         },
                 },
                 .pw = {
-                        .addr = ST_PRESS_1_PW_ADDR,
-                        .mask = ST_PRESS_1_PW_MASK,
+                        .addr = ST_PRESS_LPS331AP_PW_ADDR,
+                        .mask = ST_PRESS_LPS331AP_PW_MASK,
                         .value_on = ST_SENSORS_DEFAULT_POWER_ON_VALUE,
                         .value_off = ST_SENSORS_DEFAULT_POWER_OFF_VALUE,
                 },
                 .fs = {
-                        .addr = ST_PRESS_1_FS_ADDR,
-                        .mask = ST_PRESS_1_FS_MASK,
+                        .addr = ST_PRESS_LPS331AP_FS_ADDR,
+                        .mask = ST_PRESS_LPS331AP_FS_MASK,
                         .fs_avl = {
                                 [0] = {
                                         .num = ST_PRESS_FS_AVL_1260MB,
-                                        .value = ST_PRESS_1_FS_AVL_1260_VAL,
-                                        .gain = ST_PRESS_1_FS_AVL_1260_GAIN,
-                                        .gain2 = ST_PRESS_1_FS_AVL_TEMP_GAIN,
+                                        .value = ST_PRESS_LPS331AP_FS_AVL_1260_VAL,
+                                        .gain = ST_PRESS_LPS331AP_FS_AVL_1260_GAIN,
+                                        .gain2 = ST_PRESS_LPS331AP_FS_AVL_TEMP_GAIN,
                                 },
                         },
                 },
                 .bdu = {
-                        .addr = ST_PRESS_1_BDU_ADDR,
-                        .mask = ST_PRESS_1_BDU_MASK,
+                        .addr = ST_PRESS_LPS331AP_BDU_ADDR,
+                        .mask = ST_PRESS_LPS331AP_BDU_MASK,
+                },
+                .drdy_irq = {
+                        .addr = ST_PRESS_LPS331AP_DRDY_IRQ_ADDR,
+                        .mask_int1 = ST_PRESS_LPS331AP_DRDY_IRQ_INT1_MASK,
+                        .mask_int2 = ST_PRESS_LPS331AP_DRDY_IRQ_INT2_MASK,
+                },
+                .multi_read_bit = ST_PRESS_LPS331AP_MULTIREAD_BIT,
+                .bootime = 2,
+        },
+        {
+                .wai = ST_PRESS_LPS001WP_WAI_EXP,
+                .sensors_supported = {
+                        [0] = LPS001WP_PRESS_DEV_NAME,
+                },
+                .ch = (struct iio_chan_spec *)st_press_lps001wp_channels,
+                .num_ch = ARRAY_SIZE(st_press_lps001wp_channels),
+                .odr = {
+                        .addr = ST_PRESS_LPS001WP_ODR_ADDR,
+                        .mask = ST_PRESS_LPS001WP_ODR_MASK,
+                        .odr_avl = {
+                                { 1, ST_PRESS_LPS001WP_ODR_AVL_1HZ_VAL, },
+                                { 7, ST_PRESS_LPS001WP_ODR_AVL_7HZ_VAL, },
+                                { 13, ST_PRESS_LPS001WP_ODR_AVL_13HZ_VAL, },
+                        },
+                },
+                .pw = {
+                        .addr = ST_PRESS_LPS001WP_PW_ADDR,
+                        .mask = ST_PRESS_LPS001WP_PW_MASK,
+                        .value_on = ST_SENSORS_DEFAULT_POWER_ON_VALUE,
+                        .value_off = ST_SENSORS_DEFAULT_POWER_OFF_VALUE,
+                },
+                .fs = {
+                        .addr = 0,
+                },
+                .bdu = {
+                        .addr = ST_PRESS_LPS001WP_BDU_ADDR,
+                        .mask = ST_PRESS_LPS001WP_BDU_MASK,
                 },
                 .drdy_irq = {
-                        .addr = ST_PRESS_1_DRDY_IRQ_ADDR,
-                        .mask_int1 = ST_PRESS_1_DRDY_IRQ_INT1_MASK,
-                        .mask_int2 = ST_PRESS_1_DRDY_IRQ_INT2_MASK,
+                        .addr = 0,
                 },
-                .multi_read_bit = ST_PRESS_1_MULTIREAD_BIT,
+                .multi_read_bit = ST_PRESS_LPS001WP_MULTIREAD_BIT,
                 .bootime = 2,
         },
 };
@@ -210,41 +316,46 @@ static const struct iio_trigger_ops st_press_trigger_ops = {
 int st_press_common_probe(struct iio_dev *indio_dev,
                                 struct st_sensors_platform_data *plat_data)
 {
-        int err;
         struct st_sensor_data *pdata = iio_priv(indio_dev);
+        int irq = pdata->get_irq_data_ready(indio_dev);
+        int err;
 
         indio_dev->modes = INDIO_DIRECT_MODE;
         indio_dev->info = &press_info;
 
         err = st_sensors_check_device_support(indio_dev,
-                                ARRAY_SIZE(st_press_sensors), st_press_sensors);
+                                              ARRAY_SIZE(st_press_sensors),
+                                              st_press_sensors);
         if (err < 0)
-                goto st_press_common_probe_error;
+                return err;
 
         pdata->num_data_channels = ST_PRESS_NUMBER_DATA_CHANNELS;
-        pdata->multiread_bit = pdata->sensor->multi_read_bit;
-        indio_dev->channels = pdata->sensor->ch;
-        indio_dev->num_channels = ARRAY_SIZE(st_press_channels);
+        pdata->multiread_bit     = pdata->sensor->multi_read_bit;
+        indio_dev->channels      = pdata->sensor->ch;
+        indio_dev->num_channels  = pdata->sensor->num_ch;
+
+        if (pdata->sensor->fs.addr != 0)
+                pdata->current_fullscale = (struct st_sensor_fullscale_avl *)
+                        &pdata->sensor->fs.fs_avl[0];
 
-        pdata->current_fullscale = (struct st_sensor_fullscale_avl *)
-                                                &pdata->sensor->fs.fs_avl[0];
         pdata->odr = pdata->sensor->odr.odr_avl[0].hz;
 
-        if (!plat_data)
+        /* Some devices don't support a data ready pin. */
+        if (!plat_data && pdata->sensor->drdy_irq.addr)
                 plat_data =
                         (struct st_sensors_platform_data *)&default_press_pdata;
 
         err = st_sensors_init_sensor(indio_dev, plat_data);
         if (err < 0)
-                goto st_press_common_probe_error;
+                return err;
 
-        if (pdata->get_irq_data_ready(indio_dev) > 0) {
-                err = st_press_allocate_ring(indio_dev);
-                if (err < 0)
-                        goto st_press_common_probe_error;
+        err = st_press_allocate_ring(indio_dev);
+        if (err < 0)
+                return err;
 
+        if (irq > 0) {
                 err = st_sensors_allocate_trigger(indio_dev,
-                                                        ST_PRESS_TRIGGER_OPS);
+                                                  ST_PRESS_TRIGGER_OPS);
                 if (err < 0)
                         goto st_press_probe_trigger_error;
         }
@@ -256,12 +367,11 @@ int st_press_common_probe(struct iio_dev *indio_dev,
         return err;
 
 st_press_device_register_error:
-        if (pdata->get_irq_data_ready(indio_dev) > 0)
+        if (irq > 0)
                 st_sensors_deallocate_trigger(indio_dev);
 st_press_probe_trigger_error:
-        if (pdata->get_irq_data_ready(indio_dev) > 0)
-                st_press_deallocate_ring(indio_dev);
-st_press_common_probe_error:
+        st_press_deallocate_ring(indio_dev);
+
         return err;
 }
 EXPORT_SYMBOL(st_press_common_probe);
@@ -271,10 +381,10 @@ void st_press_common_remove(struct iio_dev *indio_dev)
         struct st_sensor_data *pdata = iio_priv(indio_dev);
 
         iio_device_unregister(indio_dev);
-        if (pdata->get_irq_data_ready(indio_dev) > 0) {
+        if (pdata->get_irq_data_ready(indio_dev) > 0)
                 st_sensors_deallocate_trigger(indio_dev);
-                st_press_deallocate_ring(indio_dev);
-        }
+
+        st_press_deallocate_ring(indio_dev);
 }
 EXPORT_SYMBOL(st_press_common_remove);
 
diff --git a/drivers/iio/pressure/st_pressure_i2c.c b/drivers/iio/pressure/st_pressure_i2c.c
index 08aac5e6251d..51eab7fcb194 100644
--- a/drivers/iio/pressure/st_pressure_i2c.c
+++ b/drivers/iio/pressure/st_pressure_i2c.c
@@ -49,6 +49,7 @@ static int st_press_i2c_remove(struct i2c_client *client)
 }
 
 static const struct i2c_device_id st_press_id_table[] = {
+        { LPS001WP_PRESS_DEV_NAME },
         { LPS331AP_PRESS_DEV_NAME },
         {},
 };