6 files changed, 82 insertions, 60 deletions

diff --git a/drivers/iio/adc/ad7266.c b/drivers/iio/adc/ad7266.c
index 58e945594c7b..70f78c3062a7 100644
--- a/drivers/iio/adc/ad7266.c
+++ b/drivers/iio/adc/ad7266.c
@@ -43,19 +43,22 @@ struct ad7266_state {
          * The buffer needs to be large enough to hold two samples (4 bytes) and
          * the naturally aligned timestamp (8 bytes).
          */
-        uint8_t data[ALIGN(4, sizeof(s64)) + sizeof(s64)] ____cacheline_aligned;
+        struct {
+                __be16 sample[2];
+                s64 timestamp;
+        } data ____cacheline_aligned;
 };
 
 static int ad7266_wakeup(struct ad7266_state *st)
 {
         /* Any read with >= 2 bytes will wake the device */
-        return spi_read(st->spi, st->data, 2);
+        return spi_read(st->spi, &st->data.sample[0], 2);
 }
 
 static int ad7266_powerdown(struct ad7266_state *st)
 {
         /* Any read with < 2 bytes will powerdown the device */
-        return spi_read(st->spi, st->data, 1);
+        return spi_read(st->spi, &st->data.sample[0], 1);
 }
 
 static int ad7266_preenable(struct iio_dev *indio_dev)
@@ -84,9 +87,9 @@ static irqreturn_t ad7266_trigger_handler(int irq, void *p)
         struct ad7266_state *st = iio_priv(indio_dev);
         int ret;
 
-        ret = spi_read(st->spi, st->data, 4);
+        ret = spi_read(st->spi, st->data.sample, 4);
         if (ret == 0) {
-                iio_push_to_buffers_with_timestamp(indio_dev, st->data,
+                iio_push_to_buffers_with_timestamp(indio_dev, &st->data,
                             pf->timestamp);
         }
 
@@ -137,7 +140,7 @@ static int ad7266_read_single(struct ad7266_state *st, int *val,
         ad7266_select_input(st, address);
 
         ret = spi_sync(st->spi, &st->single_msg);
-        *val = be16_to_cpu(st->data[address % 2]);
+        *val = be16_to_cpu(st->data.sample[address % 2]);
 
         return ret;
 }
@@ -442,15 +445,15 @@ static int ad7266_probe(struct spi_device *spi)
         ad7266_init_channels(indio_dev);
 
         /* wakeup */
-        st->single_xfer[0].rx_buf = &st->data;
+        st->single_xfer[0].rx_buf = &st->data.sample[0];
         st->single_xfer[0].len = 2;
         st->single_xfer[0].cs_change = 1;
         /* conversion */
-        st->single_xfer[1].rx_buf = &st->data;
+        st->single_xfer[1].rx_buf = st->data.sample;
         st->single_xfer[1].len = 4;
         st->single_xfer[1].cs_change = 1;
         /* powerdown */
-        st->single_xfer[2].tx_buf = &st->data;
+        st->single_xfer[2].tx_buf = &st->data.sample[0];
         st->single_xfer[2].len = 1;
 
         spi_message_init(&st->single_msg);
diff --git a/drivers/iio/adc/ad7887.c b/drivers/iio/adc/ad7887.c
index acb7f90359a3..749a6cadab8b 100644
--- a/drivers/iio/adc/ad7887.c
+++ b/drivers/iio/adc/ad7887.c
@@ -200,7 +200,13 @@ static const struct ad7887_chip_info ad7887_chip_info_tbl[] = {
                         .info_mask_shared_by_type = BIT(IIO_CHAN_INFO_SCALE),
                         .address = 1,
                         .scan_index = 1,
-                        .scan_type = IIO_ST('u', 12, 16, 0),
+                        .scan_type = {
+                                .sign = 'u',
+                                .realbits = 12,
+                                .storagebits = 16,
+                                .shift = 0,
+                                .endianness = IIO_BE,
+                        },
                 },
                 .channel[1] = {
                         .type = IIO_VOLTAGE,
@@ -210,7 +216,13 @@ static const struct ad7887_chip_info ad7887_chip_info_tbl[] = {
                         .info_mask_shared_by_type = BIT(IIO_CHAN_INFO_SCALE),
                         .address = 0,
                         .scan_index = 0,
-                        .scan_type = IIO_ST('u', 12, 16, 0),
+                        .scan_type = {
+                                .sign = 'u',
+                                .realbits = 12,
+                                .storagebits = 16,
+                                .shift = 0,
+                                .endianness = IIO_BE,
+                        },
                 },
                 .channel[2] = IIO_CHAN_SOFT_TIMESTAMP(2),
                 .int_vref_mv = 2500,
diff --git a/drivers/iio/adc/max1363.c b/drivers/iio/adc/max1363.c
index 6118dced02b6..e283f2f2ee2f 100644
--- a/drivers/iio/adc/max1363.c
+++ b/drivers/iio/adc/max1363.c
@@ -1039,10 +1039,10 @@ static const struct iio_info max1238_info = {
 };
 
 static const struct iio_info max1363_info = {
-        .read_event_value_new = &max1363_read_thresh,
-        .write_event_value_new = &max1363_write_thresh,
-        .read_event_config_new = &max1363_read_event_config,
-        .write_event_config_new = &max1363_write_event_config,
+        .read_event_value = &max1363_read_thresh,
+        .write_event_value = &max1363_write_thresh,
+        .read_event_config = &max1363_read_event_config,
+        .write_event_config = &max1363_write_event_config,
         .read_raw = &max1363_read_raw,
         .update_scan_mode = &max1363_update_scan_mode,
         .driver_module = THIS_MODULE,
diff --git a/drivers/iio/adc/mcp3422.c b/drivers/iio/adc/mcp3422.c
index c8c1baaec6c1..47dcb34ff44c 100644
--- a/drivers/iio/adc/mcp3422.c
+++ b/drivers/iio/adc/mcp3422.c
@@ -362,7 +362,7 @@ static int mcp3422_probe(struct i2c_client *client,
                 | MCP3422_SAMPLE_RATE_VALUE(MCP3422_SRATE_240));
         mcp3422_update_config(adc, config);
 
-        err = iio_device_register(indio_dev);
+        err = devm_iio_device_register(&client->dev, indio_dev);
         if (err < 0)
                 return err;
 
@@ -371,12 +371,6 @@ static int mcp3422_probe(struct i2c_client *client,
         return 0;
 }
 
-static int mcp3422_remove(struct i2c_client *client)
-{
-        iio_device_unregister(i2c_get_clientdata(client));
-        return 0;
-}
-
 static const struct i2c_device_id mcp3422_id[] = {
         { "mcp3422", 2 },
         { "mcp3423", 3 },
@@ -400,7 +394,6 @@ static struct i2c_driver mcp3422_driver = {
                 .of_match_table = of_match_ptr(mcp3422_of_match),
         },
         .probe = mcp3422_probe,
-        .remove = mcp3422_remove,
         .id_table = mcp3422_id,
 };
 module_i2c_driver(mcp3422_driver);
diff --git a/drivers/iio/adc/ti_am335x_adc.c b/drivers/iio/adc/ti_am335x_adc.c
index d4d748214e4b..31e786e3999b 100644
--- a/drivers/iio/adc/ti_am335x_adc.c
+++ b/drivers/iio/adc/ti_am335x_adc.c
@@ -60,6 +60,24 @@ static u32 get_adc_step_mask(struct tiadc_device *adc_dev)
         return step_en;
 }
 
+static u32 get_adc_chan_step_mask(struct tiadc_device *adc_dev,
+                struct iio_chan_spec const *chan)
+{
+        int i;
+
+        for (i = 0; i < ARRAY_SIZE(adc_dev->channel_step); i++) {
+                if (chan->channel == adc_dev->channel_line[i]) {
+                        u32 step;
+
+                        step = adc_dev->channel_step[i];
+                        /* +1 for the charger */
+                        return 1 << (step + 1);
+                }
+        }
+        WARN_ON(1);
+        return 0;
+}
+
 static u32 get_adc_step_bit(struct tiadc_device *adc_dev, int chan)
 {
         return 1 << adc_dev->channel_step[chan];
@@ -181,7 +199,7 @@ static int tiadc_buffer_postenable(struct iio_dev *indio_dev)
                 enb |= (get_adc_step_bit(adc_dev, bit) << 1);
         adc_dev->buffer_en_ch_steps = enb;
 
-        am335x_tsc_se_set(adc_dev->mfd_tscadc, enb);
+        am335x_tsc_se_set_cache(adc_dev->mfd_tscadc, enb);
 
         tiadc_writel(adc_dev,  REG_IRQSTATUS, IRQENB_FIFO1THRES
                                 | IRQENB_FIFO1OVRRUN | IRQENB_FIFO1UNDRFLW);
@@ -199,6 +217,7 @@ static int tiadc_buffer_predisable(struct iio_dev *indio_dev)
         tiadc_writel(adc_dev, REG_IRQCLR, (IRQENB_FIFO1THRES |
                                 IRQENB_FIFO1OVRRUN | IRQENB_FIFO1UNDRFLW));
         am335x_tsc_se_clr(adc_dev->mfd_tscadc, adc_dev->buffer_en_ch_steps);
+        adc_dev->buffer_en_ch_steps = 0;
 
         /* Flush FIFO of leftover data in the time it takes to disable adc */
         fifo1count = tiadc_readl(adc_dev, REG_FIFO1CNT);
@@ -328,34 +347,43 @@ static int tiadc_read_raw(struct iio_dev *indio_dev,
         unsigned int fifo1count, read, stepid;
         bool found = false;
         u32 step_en;
-        unsigned long timeout = jiffies + usecs_to_jiffies
-                                (IDLE_TIMEOUT * adc_dev->channels);
+        unsigned long timeout;
 
         if (iio_buffer_enabled(indio_dev))
                 return -EBUSY;
 
-        step_en = get_adc_step_mask(adc_dev);
-        am335x_tsc_se_set(adc_dev->mfd_tscadc, step_en);
+        step_en = get_adc_chan_step_mask(adc_dev, chan);
+        if (!step_en)
+                return -EINVAL;
+
+        fifo1count = tiadc_readl(adc_dev, REG_FIFO1CNT);
+        while (fifo1count--)
+                tiadc_readl(adc_dev, REG_FIFO1);
+
+        am335x_tsc_se_set_once(adc_dev->mfd_tscadc, step_en);
 
-        /* Wait for ADC sequencer to complete sampling */
-        while (tiadc_readl(adc_dev, REG_ADCFSM) & SEQ_STATUS) {
-                if (time_after(jiffies, timeout))
+        timeout = jiffies + usecs_to_jiffies
+                                (IDLE_TIMEOUT * adc_dev->channels);
+        /* Wait for Fifo threshold interrupt */
+        while (1) {
+                fifo1count = tiadc_readl(adc_dev, REG_FIFO1CNT);
+                if (fifo1count)
+                        break;
+
+                if (time_after(jiffies, timeout)) {
+                        am335x_tsc_se_adc_done(adc_dev->mfd_tscadc);
                         return -EAGAIN;
                 }
+        }
         map_val = chan->channel + TOTAL_CHANNELS;
 
         /*
-         * When the sub-system is first enabled,
-         * the sequencer will always start with the
-         * lowest step (1) and continue until step (16).
-         * For ex: If we have enabled 4 ADC channels and
-         * currently use only 1 out of them, the
-         * sequencer still configures all the 4 steps,
-         * leading to 3 unwanted data.
-         * Hence we need to flush out this data.
+         * We check the complete FIFO. We programmed just one entry but in case
+         * something went wrong we left empty handed (-EAGAIN previously) and
+         * then the value apeared somehow in the FIFO we would have two entries.
+         * Therefore we read every item and keep only the latest version of the
+         * requested channel.
          */
-
-        fifo1count = tiadc_readl(adc_dev, REG_FIFO1CNT);
         for (i = 0; i < fifo1count; i++) {
                 read = tiadc_readl(adc_dev, REG_FIFO1);
                 stepid = read & FIFOREAD_CHNLID_MASK;
@@ -367,6 +395,7 @@ static int tiadc_read_raw(struct iio_dev *indio_dev,
                         *val = (u16) read;
                 }
         }
+        am335x_tsc_se_adc_done(adc_dev->mfd_tscadc);
 
         if (found == false)
                 return -EBUSY;
@@ -494,7 +523,8 @@ static int tiadc_resume(struct device *dev)
         tiadc_writel(adc_dev, REG_CTRL, restore);
 
         tiadc_step_config(indio_dev);
-
+        am335x_tsc_se_set_cache(adc_dev->mfd_tscadc,
+                        adc_dev->buffer_en_ch_steps);
         return 0;
 }
 
diff --git a/drivers/iio/adc/viperboard_adc.c b/drivers/iio/adc/viperboard_adc.c
index 09727a71e9fa..d0add8f9416b 100644
--- a/drivers/iio/adc/viperboard_adc.c
+++ b/drivers/iio/adc/viperboard_adc.c
@@ -42,12 +42,6 @@ struct vprbrd_adc {
         .indexed = 1,                                   \
         .channel = _index,                              \
         .info_mask_separate = BIT(IIO_CHAN_INFO_RAW),   \
-        .scan_index = _index,                           \
-        .scan_type = {                                  \
-                .sign = 'u',                            \
-                .realbits = 8,                          \
-                .storagebits = 8,                       \
-        },                                              \
 }
 
 static struct iio_chan_spec const vprbrd_adc_iio_channels[] = {
@@ -73,7 +67,7 @@ static int vprbrd_iio_read_raw(struct iio_dev *iio_dev,
                 mutex_lock(&vb->lock);
 
                 admsg->cmd = VPRBRD_ADC_CMD_GET;
-                admsg->chan = chan->scan_index;
+                admsg->chan = chan->channel;
                 admsg->val = 0x00;
 
                 ret = usb_control_msg(vb->usb_dev,
@@ -139,7 +133,7 @@ static int vprbrd_adc_probe(struct platform_device *pdev)
         indio_dev->channels = vprbrd_adc_iio_channels;
         indio_dev->num_channels = ARRAY_SIZE(vprbrd_adc_iio_channels);
 
-        ret = iio_device_register(indio_dev);
+        ret = devm_iio_device_register(&pdev->dev, indio_dev);
         if (ret) {
                 dev_err(&pdev->dev, "could not register iio (adc)");
                 return ret;
@@ -150,22 +144,12 @@ static int vprbrd_adc_probe(struct platform_device *pdev)
         return 0;
 }
 
-static int vprbrd_adc_remove(struct platform_device *pdev)
-{
-        struct iio_dev *indio_dev = platform_get_drvdata(pdev);
-
-        iio_device_unregister(indio_dev);
-
-        return 0;
-}
-
 static struct platform_driver vprbrd_adc_driver = {
         .driver = {
                 .name   = "viperboard-adc",
                 .owner  = THIS_MODULE,
         },
         .probe          = vprbrd_adc_probe,
-        .remove         = vprbrd_adc_remove,
 };
 
 module_platform_driver(vprbrd_adc_driver);