arm: imx6: defconfig: update tx6 defconfigs

[karo-tx-linux.git] / drivers / iio / adc / ad_sigma_delta.c

diff --git a/drivers/iio/adc/ad_sigma_delta.c b/drivers/iio/adc/ad_sigma_delta.c
index f0d6335ae08760d418f56ced0eaec227772fa1ce..e6fbd3e70981fca1a4d93d2c03891fcf1efde6c0 100644 (file)
--- a/drivers/iio/adc/ad_sigma_delta.c
+++ b/drivers/iio/adc/ad_sigma_delta.c
@@ -368,10 +368,6 @@ static irqreturn_t ad_sd_trigger_handler(int irq, void *p)
 
        memset(data, 0x00, 16);
 
-       /* Guaranteed to be aligned with 8 byte boundary */
-       if (indio_dev->scan_timestamp)
-               ((s64 *)data)[1] = pf->timestamp;
-
        reg_size = indio_dev->channels[0].scan_type.realbits +
                        indio_dev->channels[0].scan_type.shift;
        reg_size = DIV_ROUND_UP(reg_size, 8);
@@ -391,7 +387,7 @@ static irqreturn_t ad_sd_trigger_handler(int irq, void *p)
                break;
        }
 
-       iio_push_to_buffers(indio_dev, (uint8_t *)data);
+       iio_push_to_buffers_with_timestamp(indio_dev, data, pf->timestamp);
 
        iio_trigger_notify_done(indio_dev->trig);
        sigma_delta->irq_dis = false;
@@ -401,7 +397,6 @@ static irqreturn_t ad_sd_trigger_handler(int irq, void *p)
 }
 
 static const struct iio_buffer_setup_ops ad_sd_buffer_setup_ops = {
-       .preenable = &iio_sw_buffer_preenable,
        .postenable = &ad_sd_buffer_postenable,
        .predisable = &iio_triggered_buffer_predisable,
        .postdisable = &ad_sd_buffer_postdisable,