Rewind v3.13-rc3+ (78fd82238d0e5716) to v3.12

87 files changed, 1124 insertions, 5995 deletions

diff --git a/drivers/iio/accel/bma180.c b/drivers/iio/accel/bma180.c
index 28b3928..81e3dc2 100644
--- a/drivers/iio/accel/bma180.c
+++ b/drivers/iio/accel/bma180.c
@@ -471,10 +471,13 @@ static irqreturn_t bma180_trigger_handler(int irq, void *p)
 	struct iio_poll_func *pf = p;
 	struct iio_dev *indio_dev = pf->indio_dev;
 	struct bma180_data *data = iio_priv(indio_dev);
-	int64_t time_ns = iio_get_time_ns();
 	int bit, ret, i = 0;
 
 	mutex_lock(&data->mutex);
+	if (indio_dev->scan_timestamp) {
+		ret = indio_dev->scan_bytes / sizeof(s64) - 1;
+		((s64 *)data->buff)[ret] = iio_get_time_ns();
+	}
 
 	for_each_set_bit(bit, indio_dev->buffer->scan_mask,
 			 indio_dev->masklength) {
@@ -487,7 +490,7 @@ static irqreturn_t bma180_trigger_handler(int irq, void *p)
 	}
 	mutex_unlock(&data->mutex);
 
-	iio_push_to_buffers_with_timestamp(indio_dev, data->buff, time_ns);
+	iio_push_to_buffers(indio_dev, (u8 *)data->buff);
 err:
 	iio_trigger_notify_done(indio_dev->trig);
 
diff --git a/drivers/iio/accel/hid-sensor-accel-3d.c b/drivers/iio/accel/hid-sensor-accel-3d.c
index 1cae4e9..46d22f3 100644
--- a/drivers/iio/accel/hid-sensor-accel-3d.c
+++ b/drivers/iio/accel/hid-sensor-accel-3d.c
@@ -182,11 +182,10 @@ static const struct iio_info accel_3d_info = {
 };
 
 /* Function to push data to buffer */
-static void hid_sensor_push_data(struct iio_dev *indio_dev, const void *data,
-	int len)
+static void hid_sensor_push_data(struct iio_dev *indio_dev, u8 *data, int len)
 {
 	dev_dbg(&indio_dev->dev, "hid_sensor_push_data\n");
-	iio_push_to_buffers(indio_dev, data);
+	iio_push_to_buffers(indio_dev, (u8 *)data);
 }
 
 /* Callback handler to send event after all samples are received and captured */
@@ -201,7 +200,7 @@ static int accel_3d_proc_event(struct hid_sensor_hub_device *hsdev,
 				accel_state->common_attributes.data_ready);
 	if (accel_state->common_attributes.data_ready)
 		hid_sensor_push_data(indio_dev,
-				accel_state->accel_val,
+				(u8 *)accel_state->accel_val,
 				sizeof(accel_state->accel_val));
 
 	return 0;
@@ -350,7 +349,7 @@ static int hid_accel_3d_probe(struct platform_device *pdev)
 error_iio_unreg:
 	iio_device_unregister(indio_dev);
 error_remove_trigger:
-	hid_sensor_remove_trigger(&accel_state->common_attributes);
+	hid_sensor_remove_trigger(indio_dev);
 error_unreg_buffer_funcs:
 	iio_triggered_buffer_cleanup(indio_dev);
 error_free_dev_mem:
@@ -363,11 +362,10 @@ static int hid_accel_3d_remove(struct platform_device *pdev)
 {
 	struct hid_sensor_hub_device *hsdev = pdev->dev.platform_data;
 	struct iio_dev *indio_dev = platform_get_drvdata(pdev);
-	struct accel_3d_state *accel_state = iio_priv(indio_dev);
 
 	sensor_hub_remove_callback(hsdev, HID_USAGE_SENSOR_ACCEL_3D);
 	iio_device_unregister(indio_dev);
-	hid_sensor_remove_trigger(&accel_state->common_attributes);
+	hid_sensor_remove_trigger(indio_dev);
 	iio_triggered_buffer_cleanup(indio_dev);
 	kfree(indio_dev->channels);
 
diff --git a/drivers/iio/accel/kxsd9.c b/drivers/iio/accel/kxsd9.c
index 98ba761..709c132 100644
--- a/drivers/iio/accel/kxsd9.c
+++ b/drivers/iio/accel/kxsd9.c
@@ -112,10 +112,9 @@ static int kxsd9_read(struct iio_dev *indio_dev, u8 address)
 	mutex_lock(&st->buf_lock);
 	st->tx[0] = KXSD9_READ(address);
 	ret = spi_sync_transfer(st->us, xfers, ARRAY_SIZE(xfers));
-	if (!ret)
-		ret = (((u16)(st->rx[0])) << 8) | (st->rx[1] & 0xF0);
-	mutex_unlock(&st->buf_lock);
-	return ret;
+	if (ret)
+		return ret;
+	return (((u16)(st->rx[0])) << 8) | (st->rx[1] & 0xF0);
 }
 
 static IIO_CONST_ATTR(accel_scale_available,
@@ -223,6 +222,7 @@ static int kxsd9_probe(struct spi_device *spi)
 {
 	struct iio_dev *indio_dev;
 	struct kxsd9_state *st;
+	int ret;
 
 	indio_dev = devm_iio_device_alloc(&spi->dev, sizeof(*st));
 	if (!indio_dev)
@@ -244,7 +244,11 @@ static int kxsd9_probe(struct spi_device *spi)
 	spi_setup(spi);
 	kxsd9_power_up(st);
 
-	return iio_device_register(indio_dev);
+	ret = iio_device_register(indio_dev);
+	if (ret)
+		return ret;
+
+	return 0;
 }
 
 static int kxsd9_remove(struct spi_device *spi)
diff --git a/drivers/iio/accel/st_accel_buffer.c b/drivers/iio/accel/st_accel_buffer.c
index a1e642e..d9b3507 100644
--- a/drivers/iio/accel/st_accel_buffer.c
+++ b/drivers/iio/accel/st_accel_buffer.c
@@ -32,7 +32,16 @@ int st_accel_trig_set_state(struct iio_trigger *trig, bool state)
 
 static int st_accel_buffer_preenable(struct iio_dev *indio_dev)
 {
-	return st_sensors_set_enable(indio_dev, true);
+	int err;
+
+	err = st_sensors_set_enable(indio_dev, true);
+	if (err < 0)
+		goto st_accel_set_enable_error;
+
+	err = iio_sw_buffer_preenable(indio_dev);
+
+st_accel_set_enable_error:
+	return err;
 }
 
 static int st_accel_buffer_postenable(struct iio_dev *indio_dev)
diff --git a/drivers/iio/accel/st_accel_core.c b/drivers/iio/accel/st_accel_core.c
index 38caedc..1458343 100644
--- a/drivers/iio/accel/st_accel_core.c
+++ b/drivers/iio/accel/st_accel_core.c
@@ -452,9 +452,8 @@ static const struct iio_trigger_ops st_accel_trigger_ops = {
 int st_accel_common_probe(struct iio_dev *indio_dev,
 				struct st_sensors_platform_data *plat_data)
 {
-	struct st_sensor_data *adata = iio_priv(indio_dev);
-	int irq = adata->get_irq_data_ready(indio_dev);
 	int err;
+	struct st_sensor_data *adata = iio_priv(indio_dev);
 
 	indio_dev->modes = INDIO_DIRECT_MODE;
 	indio_dev->info = &accel_info;
@@ -462,7 +461,7 @@ int st_accel_common_probe(struct iio_dev *indio_dev,
 	err = st_sensors_check_device_support(indio_dev,
 				ARRAY_SIZE(st_accel_sensors), st_accel_sensors);
 	if (err < 0)
-		return err;
+		goto st_accel_common_probe_error;
 
 	adata->num_data_channels = ST_ACCEL_NUMBER_DATA_CHANNELS;
 	adata->multiread_bit = adata->sensor->multi_read_bit;
@@ -479,13 +478,13 @@ int st_accel_common_probe(struct iio_dev *indio_dev,
 
 	err = st_sensors_init_sensor(indio_dev, plat_data);
 	if (err < 0)
-		return err;
+		goto st_accel_common_probe_error;
 
-	err = st_accel_allocate_ring(indio_dev);
-	if (err < 0)
-		return err;
+	if (adata->get_irq_data_ready(indio_dev) > 0) {
+		err = st_accel_allocate_ring(indio_dev);
+		if (err < 0)
+			goto st_accel_common_probe_error;
 
-	if (irq > 0) {
 		err = st_sensors_allocate_trigger(indio_dev,
 						 ST_ACCEL_TRIGGER_OPS);
 		if (err < 0)
@@ -496,14 +495,15 @@ int st_accel_common_probe(struct iio_dev *indio_dev,
 	if (err)
 		goto st_accel_device_register_error;
 
-	return 0;
+	return err;
 
 st_accel_device_register_error:
-	if (irq > 0)
+	if (adata->get_irq_data_ready(indio_dev) > 0)
 		st_sensors_deallocate_trigger(indio_dev);
 st_accel_probe_trigger_error:
-	st_accel_deallocate_ring(indio_dev);
-
+	if (adata->get_irq_data_ready(indio_dev) > 0)
+		st_accel_deallocate_ring(indio_dev);
+st_accel_common_probe_error:
 	return err;
 }
 EXPORT_SYMBOL(st_accel_common_probe);
@@ -513,10 +513,10 @@ void st_accel_common_remove(struct iio_dev *indio_dev)
 	struct st_sensor_data *adata = iio_priv(indio_dev);
 
 	iio_device_unregister(indio_dev);
-	if (adata->get_irq_data_ready(indio_dev) > 0)
+	if (adata->get_irq_data_ready(indio_dev) > 0) {
 		st_sensors_deallocate_trigger(indio_dev);
-
-	st_accel_deallocate_ring(indio_dev);
+		st_accel_deallocate_ring(indio_dev);
+	}
 }
 EXPORT_SYMBOL(st_accel_common_remove);
 
diff --git a/drivers/iio/adc/Kconfig b/drivers/iio/adc/Kconfig
index 2209f28..09371cb 100644
--- a/drivers/iio/adc/Kconfig
+++ b/drivers/iio/adc/Kconfig
@@ -145,16 +145,6 @@ config MCP320X
 	  This driver can also be built as a module. If so, the module will be
 	  called mcp320x.
 
-config MCP3422
-	tristate "Microchip Technology MCP3422/3/4 driver"
-	depends on I2C
-	help
-	  Say yes here to build support for Microchip Technology's MCP3422,
-	  MCP3423 or MCP3424 analog to digital converters.
-
-	  This driver can also be built as a module. If so, the module will be
-	  called mcp3422.
-
 config NAU7802
 	tristate "Nuvoton NAU7802 ADC driver"
 	depends on I2C
@@ -177,8 +167,6 @@ config TI_ADC081C
 config TI_AM335X_ADC
 	tristate "TI's AM335X ADC driver"
 	depends on MFD_TI_AM335X_TSCADC
-	select IIO_BUFFER
-	select IIO_KFIFO_BUF
 	help
 	  Say yes here to build support for Texas Instruments ADC
 	  driver which is also a MFD client.
diff --git a/drivers/iio/adc/Makefile b/drivers/iio/adc/Makefile
index ba9a10a..33656ef 100644
--- a/drivers/iio/adc/Makefile
+++ b/drivers/iio/adc/Makefile
@@ -16,7 +16,6 @@ obj-$(CONFIG_EXYNOS_ADC) += exynos_adc.o
 obj-$(CONFIG_LP8788_ADC) += lp8788_adc.o
 obj-$(CONFIG_MAX1363) += max1363.o
 obj-$(CONFIG_MCP320X) += mcp320x.o
-obj-$(CONFIG_MCP3422) += mcp3422.o
 obj-$(CONFIG_NAU7802) += nau7802.o
 obj-$(CONFIG_TI_ADC081C) += ti-adc081c.o
 obj-$(CONFIG_TI_AM335X_ADC) += ti_am335x_adc.o
diff --git a/drivers/iio/adc/ad7266.c b/drivers/iio/adc/ad7266.c
index 58e9455..371731d 100644
--- a/drivers/iio/adc/ad7266.c
+++ b/drivers/iio/adc/ad7266.c
@@ -27,7 +27,7 @@
 struct ad7266_state {
 	struct spi_device	*spi;
 	struct regulator	*reg;
-	unsigned long		vref_mv;
+	unsigned long		vref_uv;
 
 	struct spi_transfer	single_xfer[3];
 	struct spi_message	single_msg;
@@ -61,7 +61,17 @@ static int ad7266_powerdown(struct ad7266_state *st)
 static int ad7266_preenable(struct iio_dev *indio_dev)
 {
 	struct ad7266_state *st = iio_priv(indio_dev);
-	return ad7266_wakeup(st);
+	int ret;
+
+	ret = ad7266_wakeup(st);
+	if (ret)
+		return ret;
+
+	ret = iio_sw_buffer_preenable(indio_dev);
+	if (ret)
+		ad7266_powerdown(st);
+
+	return ret;
 }
 
 static int ad7266_postdisable(struct iio_dev *indio_dev)
@@ -86,8 +96,9 @@ static irqreturn_t ad7266_trigger_handler(int irq, void *p)
 
 	ret = spi_read(st->spi, st->data, 4);
 	if (ret == 0) {
-		iio_push_to_buffers_with_timestamp(indio_dev, st->data,
-			    pf->timestamp);
+		if (indio_dev->scan_timestamp)
+			((s64 *)st->data)[1] = pf->timestamp;
+		iio_push_to_buffers(indio_dev, (u8 *)st->data);
 	}
 
 	iio_trigger_notify_done(indio_dev->trig);
@@ -146,7 +157,7 @@ static int ad7266_read_raw(struct iio_dev *indio_dev,
 	struct iio_chan_spec const *chan, int *val, int *val2, long m)
 {
 	struct ad7266_state *st = iio_priv(indio_dev);
-	unsigned long scale_mv;
+	unsigned long scale_uv;
 	int ret;
 
 	switch (m) {
@@ -164,15 +175,16 @@ static int ad7266_read_raw(struct iio_dev *indio_dev,
 
 		return IIO_VAL_INT;
 	case IIO_CHAN_INFO_SCALE:
-		scale_mv = st->vref_mv;
+		scale_uv = (st->vref_uv * 100);
 		if (st->mode == AD7266_MODE_DIFF)
-			scale_mv *= 2;
+			scale_uv *= 2;
 		if (st->range == AD7266_RANGE_2VREF)
-			scale_mv *= 2;
+			scale_uv *= 2;
 
-		*val = scale_mv;
-		*val2 = chan->scan_type.realbits;
-		return IIO_VAL_FRACTIONAL_LOG2;
+		scale_uv >>= chan->scan_type.realbits;
+		*val =  scale_uv / 100000;
+		*val2 = (scale_uv % 100000) * 10;
+		return IIO_VAL_INT_PLUS_MICRO;
 	case IIO_CHAN_INFO_OFFSET:
 		if (st->range == AD7266_RANGE_2VREF &&
 			st->mode != AD7266_MODE_DIFF)
@@ -281,7 +293,7 @@ static const struct iio_info ad7266_info = {
 	.driver_module = THIS_MODULE,
 };
 
-static const unsigned long ad7266_available_scan_masks[] = {
+static unsigned long ad7266_available_scan_masks[] = {
 	0x003,
 	0x00c,
 	0x030,
@@ -291,14 +303,14 @@ static const unsigned long ad7266_available_scan_masks[] = {
 	0x000,
 };
 
-static const unsigned long ad7266_available_scan_masks_diff[] = {
+static unsigned long ad7266_available_scan_masks_diff[] = {
 	0x003,
 	0x00c,
 	0x030,
 	0x000,
 };
 
-static const unsigned long ad7266_available_scan_masks_fixed[] = {
+static unsigned long ad7266_available_scan_masks_fixed[] = {
 	0x003,
 	0x000,
 };
@@ -306,7 +318,7 @@ static const unsigned long ad7266_available_scan_masks_fixed[] = {
 struct ad7266_chan_info {
 	const struct iio_chan_spec *channels;
 	unsigned int num_channels;
-	const unsigned long *scan_masks;
+	unsigned long *scan_masks;
 };
 
 #define AD7266_CHAN_INFO_INDEX(_differential, _signed, _fixed) \
@@ -403,10 +415,10 @@ static int ad7266_probe(struct spi_device *spi)
 		if (ret < 0)
 			goto error_disable_reg;
 
-		st->vref_mv = ret / 1000;
+		st->vref_uv = ret;
 	} else {
 		/* Use internal reference */
-		st->vref_mv = 2500;
+		st->vref_uv = 2500000;
 	}
 
 	if (pdata) {
diff --git a/drivers/iio/adc/ad7298.c b/drivers/iio/adc/ad7298.c
index 2a3b65c..85d1481 100644
--- a/drivers/iio/adc/ad7298.c
+++ b/drivers/iio/adc/ad7298.c
@@ -159,14 +159,20 @@ static irqreturn_t ad7298_trigger_handler(int irq, void *p)
 	struct iio_poll_func *pf = p;
 	struct iio_dev *indio_dev = pf->indio_dev;
 	struct ad7298_state *st = iio_priv(indio_dev);
+	s64 time_ns = 0;
 	int b_sent;
 
 	b_sent = spi_sync(st->spi, &st->ring_msg);
 	if (b_sent)
 		goto done;
 
-	iio_push_to_buffers_with_timestamp(indio_dev, st->rx_buf,
-		iio_get_time_ns());
+	if (indio_dev->scan_timestamp) {
+		time_ns = iio_get_time_ns();
+		memcpy((u8 *)st->rx_buf + indio_dev->scan_bytes - sizeof(s64),
+			&time_ns, sizeof(time_ns));
+	}
+
+	iio_push_to_buffers(indio_dev, (u8 *)st->rx_buf);
 
 done:
 	iio_trigger_notify_done(indio_dev->trig);
diff --git a/drivers/iio/adc/ad7476.c b/drivers/iio/adc/ad7476.c
index d141d45..6d2b1d8 100644
--- a/drivers/iio/adc/ad7476.c
+++ b/drivers/iio/adc/ad7476.c
@@ -64,14 +64,19 @@ static irqreturn_t ad7476_trigger_handler(int irq, void  *p)
 	struct iio_poll_func *pf = p;
 	struct iio_dev *indio_dev = pf->indio_dev;
 	struct ad7476_state *st = iio_priv(indio_dev);
+	s64 time_ns;
 	int b_sent;
 
 	b_sent = spi_sync(st->spi, &st->msg);
 	if (b_sent < 0)
 		goto done;
 
-	iio_push_to_buffers_with_timestamp(indio_dev, st->data,
-		iio_get_time_ns());
+	time_ns = iio_get_time_ns();
+
+	if (indio_dev->scan_timestamp)
+		((s64 *)st->data)[1] = time_ns;
+
+	iio_push_to_buffers(indio_dev, st->data);
 done:
 	iio_trigger_notify_done(indio_dev->trig);
 
@@ -127,9 +132,10 @@ static int ad7476_read_raw(struct iio_dev *indio_dev,
 		} else {
 			scale_uv = st->chip_info->int_vref_uv;
 		}
-		*val = scale_uv / 1000;
-		*val2 = chan->scan_type.realbits;
-		return IIO_VAL_FRACTIONAL_LOG2;
+		scale_uv >>= chan->scan_type.realbits;
+		*val =  scale_uv / 1000;
+		*val2 = (scale_uv % 1000) * 1000;
+		return IIO_VAL_INT_PLUS_MICRO;
 	}
 	return -EINVAL;
 }
diff --git a/drivers/iio/adc/ad7791.c b/drivers/iio/adc/ad7791.c
index c19f8fd..c202035 100644
--- a/drivers/iio/adc/ad7791.c
+++ b/drivers/iio/adc/ad7791.c
@@ -202,6 +202,7 @@ static int ad7791_read_raw(struct iio_dev *indio_dev,
 {
 	struct ad7791_state *st = iio_priv(indio_dev);
 	bool unipolar = !!(st->mode & AD7791_MODE_UNIPOLAR);
+	unsigned long long scale_pv;
 
 	switch (info) {
 	case IIO_CHAN_INFO_RAW:
@@ -219,26 +220,23 @@ static int ad7791_read_raw(struct iio_dev *indio_dev,
 	case IIO_CHAN_INFO_SCALE:
 		/* The monitor channel uses an internal reference. */
 		if (chan->address == AD7791_CH_AVDD_MONITOR) {
-			/*
-			 * The signal is attenuated by a factor of 5 and
-			 * compared against a 1.17V internal reference.
-			 */
-			*val = 1170 * 5;
+			scale_pv = 5850000000000ULL;
 		} else {
 			int voltage_uv;
 
 			voltage_uv = regulator_get_voltage(st->reg);
 			if (voltage_uv < 0)
 				return voltage_uv;
-
-			*val = voltage_uv / 1000;
+			scale_pv = (unsigned long long)voltage_uv * 1000000;
 		}
 		if (unipolar)
-			*val2 = chan->scan_type.realbits;
+			scale_pv >>= chan->scan_type.realbits;
 		else
-			*val2 = chan->scan_type.realbits - 1;
+			scale_pv >>= chan->scan_type.realbits - 1;
+		*val2 = do_div(scale_pv, 1000000000);
+		*val = scale_pv;
 
-		return IIO_VAL_FRACTIONAL_LOG2;
+		return IIO_VAL_INT_PLUS_NANO;
 	}
 
 	return -EINVAL;
diff --git a/drivers/iio/adc/ad7887.c b/drivers/iio/adc/ad7887.c
index acb7f90..9dd077b 100644
--- a/drivers/iio/adc/ad7887.c
+++ b/drivers/iio/adc/ad7887.c
@@ -78,6 +78,11 @@ enum ad7887_supported_device_ids {
 static int ad7887_ring_preenable(struct iio_dev *indio_dev)
 {
 	struct ad7887_state *st = iio_priv(indio_dev);
+	int ret;
+
+	ret = iio_sw_buffer_preenable(indio_dev);
+	if (ret < 0)
+		return ret;
 
 	/* We know this is a single long so can 'cheat' */
 	switch (*indio_dev->active_scan_mask) {
@@ -116,14 +121,20 @@ static irqreturn_t ad7887_trigger_handler(int irq, void *p)
 	struct iio_poll_func *pf = p;
 	struct iio_dev *indio_dev = pf->indio_dev;
 	struct ad7887_state *st = iio_priv(indio_dev);
+	s64 time_ns;
 	int b_sent;
 
 	b_sent = spi_sync(st->spi, st->ring_msg);
 	if (b_sent)
 		goto done;
 
-	iio_push_to_buffers_with_timestamp(indio_dev, st->data,
-		iio_get_time_ns());
+	time_ns = iio_get_time_ns();
+
+	if (indio_dev->scan_timestamp)
+		memcpy(st->data + indio_dev->scan_bytes - sizeof(s64),
+		       &time_ns, sizeof(time_ns));
+
+	iio_push_to_buffers(indio_dev, st->data);
 done:
 	iio_trigger_notify_done(indio_dev->trig);
 
diff --git a/drivers/iio/adc/ad7923.c b/drivers/iio/adc/ad7923.c
index 28732c2..4108dbb 100644
--- a/drivers/iio/adc/ad7923.c
+++ b/drivers/iio/adc/ad7923.c
@@ -174,14 +174,20 @@ static irqreturn_t ad7923_trigger_handler(int irq, void *p)
 	struct iio_poll_func *pf = p;
 	struct iio_dev *indio_dev = pf->indio_dev;
 	struct ad7923_state *st = iio_priv(indio_dev);
+	s64 time_ns = 0;
 	int b_sent;
 
 	b_sent = spi_sync(st->spi, &st->ring_msg);
 	if (b_sent)
 		goto done;
 
-	iio_push_to_buffers_with_timestamp(indio_dev, st->rx_buf,
-		iio_get_time_ns());
+	if (indio_dev->scan_timestamp) {
+		time_ns = iio_get_time_ns();
+		memcpy((u8 *)st->rx_buf + indio_dev->scan_bytes - sizeof(s64),
+			&time_ns, sizeof(time_ns));
+	}
+
+	iio_push_to_buffers(indio_dev, (u8 *)st->rx_buf);
 
 done:
 	iio_trigger_notify_done(indio_dev->trig);
diff --git a/drivers/iio/adc/ad_sigma_delta.c b/drivers/iio/adc/ad_sigma_delta.c
index 9a4e0e3..f0d6335 100644
--- a/drivers/iio/adc/ad_sigma_delta.c
+++ b/drivers/iio/adc/ad_sigma_delta.c
@@ -188,7 +188,7 @@ static int ad_sd_calibrate(struct ad_sigma_delta *sigma_delta,
 
 	spi_bus_lock(sigma_delta->spi->master);
 	sigma_delta->bus_locked = true;
-	reinit_completion(&sigma_delta->completion);
+	INIT_COMPLETION(sigma_delta->completion);
 
 	ret = ad_sigma_delta_set_mode(sigma_delta, mode);
 	if (ret < 0)
@@ -259,7 +259,7 @@ int ad_sigma_delta_single_conversion(struct iio_dev *indio_dev,
 
 	spi_bus_lock(sigma_delta->spi->master);
 	sigma_delta->bus_locked = true;
-	reinit_completion(&sigma_delta->completion);
+	INIT_COMPLETION(sigma_delta->completion);
 
 	ad_sigma_delta_set_mode(sigma_delta, AD_SD_MODE_SINGLE);
 
@@ -343,7 +343,7 @@ static int ad_sd_buffer_postdisable(struct iio_dev *indio_dev)
 {
 	struct ad_sigma_delta *sigma_delta = iio_device_get_drvdata(indio_dev);
 
-	reinit_completion(&sigma_delta->completion);
+	INIT_COMPLETION(sigma_delta->completion);
 	wait_for_completion_timeout(&sigma_delta->completion, HZ);
 
 	if (!sigma_delta->irq_dis) {
@@ -368,6 +368,10 @@ 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);
@@ -387,7 +391,7 @@ static irqreturn_t ad_sd_trigger_handler(int irq, void *p)
 		break;
 	}
 
-	iio_push_to_buffers_with_timestamp(indio_dev, data, pf->timestamp);
+	iio_push_to_buffers(indio_dev, (uint8_t *)data);
 
 	iio_trigger_notify_done(indio_dev->trig);
 	sigma_delta->irq_dis = false;
@@ -397,6 +401,7 @@ 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,
diff --git a/drivers/iio/adc/at91_adc.c b/drivers/iio/adc/at91_adc.c
index 5b1aa02..0f16b55 100644
--- a/drivers/iio/adc/at91_adc.c
+++ b/drivers/iio/adc/at91_adc.c
@@ -11,7 +11,6 @@
 #include <linux/clk.h>
 #include <linux/err.h>
 #include <linux/io.h>
-#include <linux/input.h>
 #include <linux/interrupt.h>
 #include <linux/jiffies.h>
 #include <linux/kernel.h>
@@ -40,36 +39,10 @@
 #define at91_adc_writel(st, reg, val) \
 	(writel_relaxed(val, st->reg_base + reg))
 
-#define DRIVER_NAME		"at91_adc"
-#define MAX_POS_BITS		12
-
-#define TOUCH_SAMPLE_PERIOD_US		2000	/* 2ms */
-#define TOUCH_PEN_DETECT_DEBOUNCE_US	200
-
 struct at91_adc_caps {
-	bool	has_ts;		/* Support touch screen */
-	bool	has_tsmr;	/* only at91sam9x5, sama5d3 have TSMR reg */
-	/*
-	 * Numbers of sampling data will be averaged. Can be 0~3.
-	 * Hardware can average (2 ^ ts_filter_average) sample data.
-	 */
-	u8	ts_filter_average;
-	/* Pen Detection input pull-up resistor, can be 0~3 */
-	u8	ts_pen_detect_sensitivity;
-
-	/* startup time calculate function */
-	u32 (*calc_startup_ticks)(u8 startup_time, u32 adc_clk_khz);
-
-	u8	num_channels;
 	struct at91_adc_reg_desc registers;
 };
 
-enum atmel_adc_ts_type {
-	ATMEL_ADC_TOUCHSCREEN_NONE = 0,
-	ATMEL_ADC_TOUCHSCREEN_4WIRE = 4,
-	ATMEL_ADC_TOUCHSCREEN_5WIRE = 5,
-};
-
 struct at91_adc_state {
 	struct clk		*adc_clk;
 	u16			*buffer;
@@ -94,26 +67,6 @@ struct at91_adc_state {
 	bool			low_res;	/* the resolution corresponds to the lowest one */
 	wait_queue_head_t	wq_data_avail;
 	struct at91_adc_caps	*caps;
-
-	/*
-	 * Following ADC channels are shared by touchscreen:
-	 *
-	 * CH0 -- Touch screen XP/UL
-	 * CH1 -- Touch screen XM/UR
-	 * CH2 -- Touch screen YP/LL
-	 * CH3 -- Touch screen YM/Sense
-	 * CH4 -- Touch screen LR(5-wire only)
-	 *
-	 * The bitfields below represents the reserved channel in the
-	 * touchscreen mode.
-	 */
-#define CHAN_MASK_TOUCHSCREEN_4WIRE	(0xf << 0)
-#define CHAN_MASK_TOUCHSCREEN_5WIRE	(0x1f << 0)
-	enum atmel_adc_ts_type	touchscreen_type;
-	struct input_dev	*ts_input;
-
-	u16			ts_sample_period_val;
-	u32			ts_pressure_threshold;
 };
 
 static irqreturn_t at91_adc_trigger_handler(int irq, void *p)
@@ -130,7 +83,13 @@ static irqreturn_t at91_adc_trigger_handler(int irq, void *p)
 		j++;
 	}
 
-	iio_push_to_buffers_with_timestamp(idev, st->buffer, pf->timestamp);
+	if (idev->scan_timestamp) {
+		s64 *timestamp = (s64 *)((u8 *)st->buffer +
+					ALIGN(j, sizeof(s64)));
+		*timestamp = pf->timestamp;
+	}
+
+	iio_push_to_buffers(idev, (u8 *)st->buffer);
 
 	iio_trigger_notify_done(idev->trig);
 
@@ -142,10 +101,14 @@ static irqreturn_t at91_adc_trigger_handler(int irq, void *p)
 	return IRQ_HANDLED;
 }
 
-/* Handler for classic adc channel eoc trigger */
-void handle_adc_eoc_trigger(int irq, struct iio_dev *idev)
+static irqreturn_t at91_adc_eoc_trigger(int irq, void *private)
 {
+	struct iio_dev *idev = private;
 	struct at91_adc_state *st = iio_priv(idev);
+	u32 status = at91_adc_readl(st, st->registers->status_register);
+
+	if (!(status & st->registers->drdy_mask))
+		return IRQ_HANDLED;
 
 	if (iio_buffer_enabled(idev)) {
 		disable_irq_nosync(irq);
@@ -155,115 +118,6 @@ void handle_adc_eoc_trigger(int irq, struct iio_dev *idev)
 		st->done = true;
 		wake_up_interruptible(&st->wq_data_avail);
 	}
-}
-
-static int at91_ts_sample(struct at91_adc_state *st)
-{
-	unsigned int xscale, yscale, reg, z1, z2;
-	unsigned int x, y, pres, xpos, ypos;
-	unsigned int rxp = 1;
-	unsigned int factor = 1000;
-	struct iio_dev *idev = iio_priv_to_dev(st);
-
-	unsigned int xyz_mask_bits = st->res;
-	unsigned int xyz_mask = (1 << xyz_mask_bits) - 1;
-
-	/* calculate position */
-	/* x position = (x / xscale) * max, max = 2^MAX_POS_BITS - 1 */
-	reg = at91_adc_readl(st, AT91_ADC_TSXPOSR);
-	xpos = reg & xyz_mask;
-	x = (xpos << MAX_POS_BITS) - xpos;
-	xscale = (reg >> 16) & xyz_mask;
-	if (xscale == 0) {
-		dev_err(&idev->dev, "Error: xscale == 0!\n");
-		return -1;
-	}
-	x /= xscale;
-
-	/* y position = (y / yscale) * max, max = 2^MAX_POS_BITS - 1 */
-	reg = at91_adc_readl(st, AT91_ADC_TSYPOSR);
-	ypos = reg & xyz_mask;
-	y = (ypos << MAX_POS_BITS) - ypos;
-	yscale = (reg >> 16) & xyz_mask;
-	if (yscale == 0) {
-		dev_err(&idev->dev, "Error: yscale == 0!\n");
-		return -1;
-	}
-	y /= yscale;
-
-	/* calculate the pressure */
-	reg = at91_adc_readl(st, AT91_ADC_TSPRESSR);
-	z1 = reg & xyz_mask;
-	z2 = (reg >> 16) & xyz_mask;
-
-	if (z1 != 0)
-		pres = rxp * (x * factor / 1024) * (z2 * factor / z1 - factor)
-			/ factor;
-	else
-		pres = st->ts_pressure_threshold;	/* no pen contacted */
-
-	dev_dbg(&idev->dev, "xpos = %d, xscale = %d, ypos = %d, yscale = %d, z1 = %d, z2 = %d, press = %d\n",
-				xpos, xscale, ypos, yscale, z1, z2, pres);
-
-	if (pres < st->ts_pressure_threshold) {
-		dev_dbg(&idev->dev, "x = %d, y = %d, pressure = %d\n",
-					x, y, pres / factor);
-		input_report_abs(st->ts_input, ABS_X, x);
-		input_report_abs(st->ts_input, ABS_Y, y);
-		input_report_abs(st->ts_input, ABS_PRESSURE, pres);
-		input_report_key(st->ts_input, BTN_TOUCH, 1);
-		input_sync(st->ts_input);
-	} else {
-		dev_dbg(&idev->dev, "pressure too low: not reporting\n");
-	}
-
-	return 0;
-}
-
-static irqreturn_t at91_adc_interrupt(int irq, void *private)
-{
-	struct iio_dev *idev = private;
-	struct at91_adc_state *st = iio_priv(idev);
-	u32 status = at91_adc_readl(st, st->registers->status_register);
-	const uint32_t ts_data_irq_mask =
-		AT91_ADC_IER_XRDY |
-		AT91_ADC_IER_YRDY |
-		AT91_ADC_IER_PRDY;
-
-	if (status & st->registers->drdy_mask)
-		handle_adc_eoc_trigger(irq, idev);
-
-	if (status & AT91_ADC_IER_PEN) {
-		at91_adc_writel(st, AT91_ADC_IDR, AT91_ADC_IER_PEN);
-		at91_adc_writel(st, AT91_ADC_IER, AT91_ADC_IER_NOPEN |
-			ts_data_irq_mask);
-		/* Set up period trigger for sampling */
-		at91_adc_writel(st, st->registers->trigger_register,
-			AT91_ADC_TRGR_MOD_PERIOD_TRIG |
-			AT91_ADC_TRGR_TRGPER_(st->ts_sample_period_val));
-	} else if (status & AT91_ADC_IER_NOPEN) {
-		at91_adc_writel(st, st->registers->trigger_register, 0);
-		at91_adc_writel(st, AT91_ADC_IDR, AT91_ADC_IER_NOPEN |
-			ts_data_irq_mask);
-		at91_adc_writel(st, AT91_ADC_IER, AT91_ADC_IER_PEN);
-
-		input_report_key(st->ts_input, BTN_TOUCH, 0);
-		input_sync(st->ts_input);
-	} else if ((status & ts_data_irq_mask) == ts_data_irq_mask) {
-		/* Now all touchscreen data is ready */
-
-		if (status & AT91_ADC_ISR_PENS) {
-			/* validate data by pen contact */
-			at91_ts_sample(st);
-		} else {
-			/* triggered by event that is no pen contact, just read
-			 * them to clean the interrupt and discard all.
-			 */
-			at91_adc_readl(st, AT91_ADC_TSXPOSR);
-			at91_adc_readl(st, AT91_ADC_TSYPOSR);
-			at91_adc_readl(st, AT91_ADC_TSPRESSR);
-		}
-	}
 
 	return IRQ_HANDLED;
 }
@@ -273,16 +127,6 @@ static int at91_adc_channel_init(struct iio_dev *idev)
 	struct at91_adc_state *st = iio_priv(idev);
 	struct iio_chan_spec *chan_array, *timestamp;
 	int bit, idx = 0;
-	unsigned long rsvd_mask = 0;
-
-	/* If touchscreen is enable, then reserve the adc channels */
-	if (st->touchscreen_type == ATMEL_ADC_TOUCHSCREEN_4WIRE)
-		rsvd_mask = CHAN_MASK_TOUCHSCREEN_4WIRE;
-	else if (st->touchscreen_type == ATMEL_ADC_TOUCHSCREEN_5WIRE)
-		rsvd_mask = CHAN_MASK_TOUCHSCREEN_5WIRE;
-
-	/* set up the channel mask to reserve touchscreen channels */
-	st->channels_mask &= ~rsvd_mask;
 
 	idev->num_channels = bitmap_weight(&st->channels_mask,
 					   st->num_channels) + 1;
@@ -435,7 +279,7 @@ static int at91_adc_trigger_init(struct iio_dev *idev)
 	int i, ret;
 
 	st->trig = devm_kzalloc(&idev->dev,
-				st->trigger_number * sizeof(*st->trig),
+				st->trigger_number * sizeof(st->trig),
 				GFP_KERNEL);
 
 	if (st->trig == NULL) {
@@ -528,9 +372,9 @@ static int at91_adc_read_raw(struct iio_dev *idev,
 		return IIO_VAL_INT;
 
 	case IIO_CHAN_INFO_SCALE:
-		*val = st->vref_mv;
-		*val2 = chan->scan_type.realbits;
-		return IIO_VAL_FRACTIONAL_LOG2;
+		*val = (st->vref_mv * 1000) >> chan->scan_type.realbits;
+		*val2 = 0;
+		return IIO_VAL_INT_PLUS_MICRO;
 	default:
 		break;
 	}
@@ -590,80 +434,8 @@ ret:
 	return ret;
 }
 
-static u32 calc_startup_ticks_9260(u8 startup_time, u32 adc_clk_khz)
-{
-	/*
-	 * Number of ticks needed to cover the startup time of the ADC
-	 * as defined in the electrical characteristics of the board,
-	 * divided by 8. The formula thus is :
-	 *   Startup Time = (ticks + 1) * 8 / ADC Clock
-	 */
-	return round_up((startup_time * adc_clk_khz / 1000) - 1, 8) / 8;
-}
-
-static u32 calc_startup_ticks_9x5(u8 startup_time, u32 adc_clk_khz)
-{
-	/*
-	 * For sama5d3x and at91sam9x5, the formula changes to:
-	 * Startup Time = <lookup_table_value> / ADC Clock
-	 */
-	const int startup_lookup[] = {
-		0  , 8  , 16 , 24 ,
-		64 , 80 , 96 , 112,
-		512, 576, 640, 704,
-		768, 832, 896, 960
-		};
-	int i, size = ARRAY_SIZE(startup_lookup);
-	unsigned int ticks;
-
-	ticks = startup_time * adc_clk_khz / 1000;
-	for (i = 0; i < size; i++)
-		if (ticks < startup_lookup[i])
-			break;
-
-	ticks = i;
-	if (ticks == size)
-		/* Reach the end of lookup table */
-		ticks = size - 1;
-
-	return ticks;
-}
-
 static const struct of_device_id at91_adc_dt_ids[];
 
-static int at91_adc_probe_dt_ts(struct device_node *node,
-	struct at91_adc_state *st, struct device *dev)
-{
-	int ret;
-	u32 prop;
-
-	ret = of_property_read_u32(node, "atmel,adc-ts-wires", &prop);
-	if (ret) {
-		dev_info(dev, "ADC Touch screen is disabled.\n");
-		return 0;
-	}
-
-	switch (prop) {
-	case 4:
-	case 5:
-		st->touchscreen_type = prop;
-		break;
-	default:
-		dev_err(dev, "Unsupported number of touchscreen wires (%d). Should be 4 or 5.\n", prop);
-		return -EINVAL;
-	}
-
-	prop = 0;
-	of_property_read_u32(node, "atmel,adc-ts-pressure-threshold", &prop);
-	st->ts_pressure_threshold = prop;
-	if (st->ts_pressure_threshold) {
-		return 0;
-	} else {
-		dev_err(dev, "Invalid pressure threshold for the touchscreen\n");
-		return -EINVAL;
-	}
-}
-
 static int at91_adc_probe_dt(struct at91_adc_state *st,
 			     struct platform_device *pdev)
 {
@@ -688,6 +460,13 @@ static int at91_adc_probe_dt(struct at91_adc_state *st,
 	}
 	st->channels_mask = prop;
 
+	if (of_property_read_u32(node, "atmel,adc-num-channels", &prop)) {
+		dev_err(&idev->dev, "Missing adc-num-channels property in the DT.\n");
+		ret = -EINVAL;
+		goto error_ret;
+	}
+	st->num_channels = prop;
+
 	st->sleep_mode = of_property_read_bool(node, "atmel,adc-sleep-mode");
 
 	if (of_property_read_u32(node, "atmel,adc-startup-time", &prop)) {
@@ -713,7 +492,6 @@ static int at91_adc_probe_dt(struct at91_adc_state *st,
 		goto error_ret;
 
 	st->registers = &st->caps->registers;
-	st->num_channels = st->caps->num_channels;
 	st->trigger_number = of_get_child_count(node);
 	st->trigger_list = devm_kzalloc(&idev->dev, st->trigger_number *
 					sizeof(struct at91_adc_trigger),
@@ -745,12 +523,6 @@ static int at91_adc_probe_dt(struct at91_adc_state *st,
 		i++;
 	}
 
-	/* Check if touchscreen is supported. */
-	if (st->caps->has_ts)
-		return at91_adc_probe_dt_ts(node, st, &idev->dev);
-	else
-		dev_info(&idev->dev, "not support touchscreen in the adc compatible string.\n");
-
 	return 0;
 
 error_ret:
@@ -782,114 +554,6 @@ static const struct iio_info at91_adc_info = {
 	.read_raw = &at91_adc_read_raw,
 };
 
-/* Touchscreen related functions */
-static int atmel_ts_open(struct input_dev *dev)
-{
-	struct at91_adc_state *st = input_get_drvdata(dev);
-
-	at91_adc_writel(st, AT91_ADC_IER, AT91_ADC_IER_PEN);
-	return 0;
-}
-
-static void atmel_ts_close(struct input_dev *dev)
-{
-	struct at91_adc_state *st = input_get_drvdata(dev);
-
-	at91_adc_writel(st, AT91_ADC_IDR, AT91_ADC_IER_PEN);
-}
-
-static int at91_ts_hw_init(struct at91_adc_state *st, u32 adc_clk_khz)
-{
-	u32 reg = 0, pendbc;
-	int i = 0;
-
-	if (st->touchscreen_type == ATMEL_ADC_TOUCHSCREEN_4WIRE)
-		reg = AT91_ADC_TSMR_TSMODE_4WIRE_PRESS;
-	else
-		reg = AT91_ADC_TSMR_TSMODE_5WIRE;
-
-	/* a Pen Detect Debounce Time is necessary for the ADC Touch to avoid
-	 * pen detect noise.
-	 * The formula is : Pen Detect Debounce Time = (2 ^ pendbc) / ADCClock
-	 */
-	pendbc = round_up(TOUCH_PEN_DETECT_DEBOUNCE_US * adc_clk_khz / 1000, 1);
-
-	while (pendbc >> ++i)
-		;	/* Empty! Find the shift offset */
-	if (abs(pendbc - (1 << i)) < abs(pendbc - (1 << (i - 1))))
-		pendbc = i;
-	else
-		pendbc = i - 1;
-
-	if (st->caps->has_tsmr) {
-		reg |= AT91_ADC_TSMR_TSAV_(st->caps->ts_filter_average)
-				& AT91_ADC_TSMR_TSAV;
-		reg |= AT91_ADC_TSMR_PENDBC_(pendbc) & AT91_ADC_TSMR_PENDBC;
-		reg |= AT91_ADC_TSMR_NOTSDMA;
-		reg |= AT91_ADC_TSMR_PENDET_ENA;
-		reg |= 0x03 << 8;	/* TSFREQ, need bigger than TSAV */
-
-		at91_adc_writel(st, AT91_ADC_TSMR, reg);
-	} else {
-		/* TODO: for 9g45 which has no TSMR */
-	}
-
-	/* Change adc internal resistor value for better pen detection,
-	 * default value is 100 kOhm.
-	 * 0 = 200 kOhm, 1 = 150 kOhm, 2 = 100 kOhm, 3 = 50 kOhm
-	 * option only available on ES2 and higher
-	 */
-	at91_adc_writel(st, AT91_ADC_ACR, st->caps->ts_pen_detect_sensitivity
-			& AT91_ADC_ACR_PENDETSENS);
-
-	/* Sample Peroid Time = (TRGPER + 1) / ADCClock */
-	st->ts_sample_period_val = round_up((TOUCH_SAMPLE_PERIOD_US *
-			adc_clk_khz / 1000) - 1, 1);
-
-	return 0;
-}
-
-static int at91_ts_register(struct at91_adc_state *st,
-		struct platform_device *pdev)
-{
-	struct input_dev *input;
-	struct iio_dev *idev = iio_priv_to_dev(st);
-	int ret;
-
-	input = input_allocate_device();
-	if (!input) {
-		dev_err(&idev->dev, "Failed to allocate TS device!\n");
-		return -ENOMEM;
-	}
-
-	input->name = DRIVER_NAME;
-	input->id.bustype = BUS_HOST;
-	input->dev.parent = &pdev->dev;
-	input->open = atmel_ts_open;
-	input->close = atmel_ts_close;
-
-	__set_bit(EV_ABS, input->evbit);
-	__set_bit(EV_KEY, input->evbit);
-	__set_bit(BTN_TOUCH, input->keybit);
-	input_set_abs_params(input, ABS_X, 0, (1 << MAX_POS_BITS) - 1, 0, 0);
-	input_set_abs_params(input, ABS_Y, 0, (1 << MAX_POS_BITS) - 1, 0, 0);
-	input_set_abs_params(input, ABS_PRESSURE, 0, 0xffffff, 0, 0);
-
-	st->ts_input = input;
-	input_set_drvdata(input, st);
-
-	ret = input_register_device(input);
-	if (ret)
-		input_free_device(st->ts_input);
-
-	return ret;
-}
-
-static void at91_ts_unregister(struct at91_adc_state *st)
-{
-	input_unregister_device(st->ts_input);
-}
-
 static int at91_adc_probe(struct platform_device *pdev)
 {
 	unsigned int prsc, mstrclk, ticks, adc_clk, adc_clk_khz, shtim;
@@ -941,7 +605,7 @@ static int at91_adc_probe(struct platform_device *pdev)
 	at91_adc_writel(st, AT91_ADC_CR, AT91_ADC_SWRST);
 	at91_adc_writel(st, AT91_ADC_IDR, 0xFFFFFFFF);
 	ret = request_irq(st->irq,
-			  at91_adc_interrupt,
+			  at91_adc_eoc_trigger,
 			  0,
 			  pdev->dev.driver->name,
 			  idev);
@@ -986,10 +650,6 @@ static int at91_adc_probe(struct platform_device *pdev)
 	mstrclk = clk_get_rate(st->clk);
 	adc_clk = clk_get_rate(st->adc_clk);
 	adc_clk_khz = adc_clk / 1000;
-
-	dev_dbg(&pdev->dev, "Master clock is set as: %d Hz, adc_clk should set as: %d Hz\n",
-		mstrclk, adc_clk);
-
 	prsc = (mstrclk / (2 * adc_clk)) - 1;
 
 	if (!st->startup_time) {
@@ -997,9 +657,15 @@ static int at91_adc_probe(struct platform_device *pdev)
 		ret = -EINVAL;
 		goto error_disable_adc_clk;
 	}
-	ticks = (*st->caps->calc_startup_ticks)(st->startup_time, adc_clk_khz);
 
 	/*
+	 * Number of ticks needed to cover the startup time of the ADC as
+	 * defined in the electrical characteristics of the board, divided by 8.
+	 * The formula thus is : Startup Time = (ticks + 1) * 8 / ADC Clock
+	 */
+	ticks = round_up((st->startup_time * adc_clk_khz /
+			  1000) - 1, 8) / 8;
+	/*
 	 * a minimal Sample and Hold Time is necessary for the ADC to guarantee
 	 * the best converted final value between two channels selection
 	 * The formula thus is : Sample and Hold Time = (shtim + 1) / ADCClock
@@ -1026,53 +692,30 @@ static int at91_adc_probe(struct platform_device *pdev)
 	init_waitqueue_head(&st->wq_data_avail);
 	mutex_init(&st->lock);
 
-	/*
-	 * Since touch screen will set trigger register as period trigger. So
-	 * when touch screen is enabled, then we have to disable hardware
-	 * trigger for classic adc.
-	 */
-	if (!st->touchscreen_type) {
-		ret = at91_adc_buffer_init(idev);
-		if (ret < 0) {
-			dev_err(&pdev->dev, "Couldn't initialize the buffer.\n");
-			goto error_disable_adc_clk;
-		}
-
-		ret = at91_adc_trigger_init(idev);
-		if (ret < 0) {
-			dev_err(&pdev->dev, "Couldn't setup the triggers.\n");
-			at91_adc_buffer_remove(idev);
-			goto error_disable_adc_clk;
-		}
-	} else {
-		if (!st->caps->has_tsmr) {
-			dev_err(&pdev->dev, "We don't support non-TSMR adc\n");
-			ret = -ENODEV;
-			goto error_disable_adc_clk;
-		}
-
-		ret = at91_ts_register(st, pdev);
-		if (ret)
-			goto error_disable_adc_clk;
+	ret = at91_adc_buffer_init(idev);
+	if (ret < 0) {
+		dev_err(&pdev->dev, "Couldn't initialize the buffer.\n");
+		goto error_disable_adc_clk;
+	}
 
-		at91_ts_hw_init(st, adc_clk_khz);
+	ret = at91_adc_trigger_init(idev);
+	if (ret < 0) {
+		dev_err(&pdev->dev, "Couldn't setup the triggers.\n");
+		goto error_unregister_buffer;
 	}
 
 	ret = iio_device_register(idev);
 	if (ret < 0) {
 		dev_err(&pdev->dev, "Couldn't register the device.\n");
-		goto error_iio_device_register;
+		goto error_remove_triggers;
 	}
 
 	return 0;
 
-error_iio_device_register:
-	if (!st->touchscreen_type) {
-		at91_adc_trigger_remove(idev);
-		at91_adc_buffer_remove(idev);
-	} else {
-		at91_ts_unregister(st);
-	}
+error_remove_triggers:
+	at91_adc_trigger_remove(idev);
+error_unregister_buffer:
+	at91_adc_buffer_remove(idev);
 error_disable_adc_clk:
 	clk_disable_unprepare(st->adc_clk);
 error_disable_clk:
@@ -1088,12 +731,8 @@ static int at91_adc_remove(struct platform_device *pdev)
 	struct at91_adc_state *st = iio_priv(idev);
 
 	iio_device_unregister(idev);
-	if (!st->touchscreen_type) {
-		at91_adc_trigger_remove(idev);
-		at91_adc_buffer_remove(idev);
-	} else {
-		at91_ts_unregister(st);
-	}
+	at91_adc_trigger_remove(idev);
+	at91_adc_buffer_remove(idev);
 	clk_disable_unprepare(st->adc_clk);
 	clk_disable_unprepare(st->clk);
 	free_irq(st->irq, idev);
@@ -1103,8 +742,6 @@ static int at91_adc_remove(struct platform_device *pdev)
 
 #ifdef CONFIG_OF
 static struct at91_adc_caps at91sam9260_caps = {
-	.calc_startup_ticks = calc_startup_ticks_9260,
-	.num_channels = 4,
 	.registers = {
 		.channel_base = AT91_ADC_CHR(0),
 		.drdy_mask = AT91_ADC_DRDY,
@@ -1116,9 +753,6 @@ static struct at91_adc_caps at91sam9260_caps = {
 };
 
 static struct at91_adc_caps at91sam9g45_caps = {
-	.has_ts = true,
-	.calc_startup_ticks = calc_startup_ticks_9260,	/* same as 9260 */
-	.num_channels = 8,
 	.registers = {
 		.channel_base = AT91_ADC_CHR(0),
 		.drdy_mask = AT91_ADC_DRDY,
@@ -1130,12 +764,6 @@ static struct at91_adc_caps at91sam9g45_caps = {
 };
 
 static struct at91_adc_caps at91sam9x5_caps = {
-	.has_ts = true,
-	.has_tsmr = true,
-	.ts_filter_average = 3,
-	.ts_pen_detect_sensitivity = 2,
-	.calc_startup_ticks = calc_startup_ticks_9x5,
-	.num_channels = 12,
 	.registers = {
 		.channel_base = AT91_ADC_CDR0_9X5,
 		.drdy_mask = AT91_ADC_SR_DRDY_9X5,
@@ -1160,7 +788,7 @@ static struct platform_driver at91_adc_driver = {
 	.probe = at91_adc_probe,
 	.remove = at91_adc_remove,
 	.driver = {
-		   .name = DRIVER_NAME,
+		   .name = "at91_adc",
 		   .of_match_table = of_match_ptr(at91_adc_dt_ids),
 	},
 };
diff --git a/drivers/iio/adc/max1363.c b/drivers/iio/adc/max1363.c
index 6118dce..4fb35d1 100644
--- a/drivers/iio/adc/max1363.c
+++ b/drivers/iio/adc/max1363.c
@@ -165,8 +165,6 @@ struct max1363_chip_info {
  * @thresh_low:		low threshold values
  * @vref:		Reference voltage regulator
  * @vref_uv:		Actual (external or internal) reference voltage
- * @send:		function used to send data to the chip
- * @recv:		function used to receive data from the chip
  */
 struct max1363_state {
 	struct i2c_client		*client;
@@ -188,10 +186,6 @@ struct max1363_state {
 	s16				thresh_low[8];
 	struct regulator		*vref;
 	u32				vref_uv;
-	int				(*send)(const struct i2c_client *client,
-						const char *buf, int count);
-	int				(*recv)(const struct i2c_client *client,
-						char *buf, int count);
 };
 
 #define MAX1363_MODE_SINGLE(_num, _mask) {				\
@@ -317,37 +311,13 @@ static const struct max1363_mode
 	return NULL;
 }
 
-static int max1363_smbus_send(const struct i2c_client *client, const char *buf,
-		int count)
+static int max1363_write_basic_config(struct i2c_client *client,
+				      unsigned char d1,
+				      unsigned char d2)
 {
-	int i, err;
+	u8 tx_buf[2] = {d1, d2};
 
-	for (i = err = 0; err == 0 && i < count; ++i)
-		err = i2c_smbus_write_byte(client, buf[i]);
-
-	return err ? err : count;
-}
-
-static int max1363_smbus_recv(const struct i2c_client *client, char *buf,
-		int count)
-{
-	int i, ret;
-
-	for (i = 0; i < count; ++i) {
-		ret = i2c_smbus_read_byte(client);
-		if (ret < 0)
-			return ret;
-		buf[i] = ret;
-	}
-
-	return count;
-}
-
-static int max1363_write_basic_config(struct max1363_state *st)
-{
-	u8 tx_buf[2] = { st->setupbyte, st->configbyte };
-
-	return st->send(st->client, tx_buf, 2);
+	return i2c_master_send(client, tx_buf, 2);
 }
 
 static int max1363_set_scan_mode(struct max1363_state *st)
@@ -357,7 +327,9 @@ static int max1363_set_scan_mode(struct max1363_state *st)
 			    | MAX1363_SE_DE_MASK);
 	st->configbyte |= st->current_mode->conf;
 
-	return max1363_write_basic_config(st);
+	return max1363_write_basic_config(st->client,
+					  st->setupbyte,
+					  st->configbyte);
 }
 
 static int max1363_read_single_chan(struct iio_dev *indio_dev,
@@ -394,7 +366,7 @@ static int max1363_read_single_chan(struct iio_dev *indio_dev,
 	}
 	if (st->chip_info->bits != 8) {
 		/* Get reading */
-		data = st->recv(client, rxbuf, 2);
+		data = i2c_master_recv(client, rxbuf, 2);
 		if (data < 0) {
 			ret = data;
 			goto error_ret;
@@ -403,7 +375,7 @@ static int max1363_read_single_chan(struct iio_dev *indio_dev,
 		  ((1 << st->chip_info->bits) - 1);
 	} else {
 		/* Get reading */
-		data = st->recv(client, rxbuf, 1);
+		data = i2c_master_recv(client, rxbuf, 1);
 		if (data < 0) {
 			ret = data;
 			goto error_ret;
@@ -425,6 +397,7 @@ static int max1363_read_raw(struct iio_dev *indio_dev,
 {
 	struct max1363_state *st = iio_priv(indio_dev);
 	int ret;
+	unsigned long scale_uv;
 
 	switch (m) {
 	case IIO_CHAN_INFO_RAW:
@@ -433,9 +406,10 @@ static int max1363_read_raw(struct iio_dev *indio_dev,
 			return ret;
 		return IIO_VAL_INT;
 	case IIO_CHAN_INFO_SCALE:
-		*val = st->vref_uv / 1000;
-		*val2 = st->chip_info->bits;
-		return IIO_VAL_FRACTIONAL_LOG2;
+		scale_uv = st->vref_uv >> st->chip_info->bits;
+		*val = scale_uv / 1000;
+		*val2 = (scale_uv % 1000) * 1000;
+		return IIO_VAL_INT_PLUS_MICRO;
 	default:
 		return -EINVAL;
 	}
@@ -450,21 +424,11 @@ static const enum max1363_modes max1363_mode_list[] = {
 	d0m1to2m3, d1m0to3m2,
 };
 
-static const struct iio_event_spec max1363_events[] = {
-	{
-		.type = IIO_EV_TYPE_THRESH,
-		.dir = IIO_EV_DIR_RISING,
-		.mask_separate = BIT(IIO_EV_INFO_VALUE) |
-			BIT(IIO_EV_INFO_ENABLE),
-	}, {
-		.type = IIO_EV_TYPE_THRESH,
-		.dir = IIO_EV_DIR_FALLING,
-		.mask_separate = BIT(IIO_EV_INFO_VALUE) |
-			BIT(IIO_EV_INFO_ENABLE),
-	},
-};
+#define MAX1363_EV_M						\
+	(IIO_EV_BIT(IIO_EV_TYPE_THRESH, IIO_EV_DIR_RISING)	\
+	 | IIO_EV_BIT(IIO_EV_TYPE_THRESH, IIO_EV_DIR_FALLING))
 
-#define MAX1363_CHAN_U(num, addr, si, bits, ev_spec, num_ev_spec)	\
+#define MAX1363_CHAN_U(num, addr, si, bits, evmask)			\
 	{								\
 		.type = IIO_VOLTAGE,					\
 		.indexed = 1,						\
@@ -480,12 +444,11 @@ static const struct iio_event_spec max1363_events[] = {
 			.endianness = IIO_BE,				\
 		},							\
 		.scan_index = si,					\
-		.event_spec = ev_spec,					\
-		.num_event_specs = num_ev_spec,				\
+		.event_mask = evmask,					\
 	}
 
 /* bipolar channel */
-#define MAX1363_CHAN_B(num, num2, addr, si, bits, ev_spec, num_ev_spec)	\
+#define MAX1363_CHAN_B(num, num2, addr, si, bits, evmask)		\
 	{								\
 		.type = IIO_VOLTAGE,					\
 		.differential = 1,					\
@@ -503,32 +466,28 @@ static const struct iio_event_spec max1363_events[] = {
 			.endianness = IIO_BE,				\
 		},							\
 		.scan_index = si,					\
-		.event_spec = ev_spec,					\
-		.num_event_specs = num_ev_spec,				\
+		.event_mask = evmask,					\
 	}
 
-#define MAX1363_4X_CHANS(bits, ev_spec, num_ev_spec) {			\
-	MAX1363_CHAN_U(0, _s0, 0, bits, ev_spec, num_ev_spec),		\
-	MAX1363_CHAN_U(1, _s1, 1, bits, ev_spec, num_ev_spec),		\
-	MAX1363_CHAN_U(2, _s2, 2, bits, ev_spec, num_ev_spec),		\
-	MAX1363_CHAN_U(3, _s3, 3, bits, ev_spec, num_ev_spec),		\
-	MAX1363_CHAN_B(0, 1, d0m1, 4, bits, ev_spec, num_ev_spec),	\
-	MAX1363_CHAN_B(2, 3, d2m3, 5, bits, ev_spec, num_ev_spec),	\
-	MAX1363_CHAN_B(1, 0, d1m0, 6, bits, ev_spec, num_ev_spec),	\
-	MAX1363_CHAN_B(3, 2, d3m2, 7, bits, ev_spec, num_ev_spec),	\
-	IIO_CHAN_SOFT_TIMESTAMP(8)					\
+#define MAX1363_4X_CHANS(bits, em) {			\
+	MAX1363_CHAN_U(0, _s0, 0, bits, em),		\
+	MAX1363_CHAN_U(1, _s1, 1, bits, em),		\
+	MAX1363_CHAN_U(2, _s2, 2, bits, em),		\
+	MAX1363_CHAN_U(3, _s3, 3, bits, em),		\
+	MAX1363_CHAN_B(0, 1, d0m1, 4, bits, em),	\
+	MAX1363_CHAN_B(2, 3, d2m3, 5, bits, em),	\
+	MAX1363_CHAN_B(1, 0, d1m0, 6, bits, em),	\
+	MAX1363_CHAN_B(3, 2, d3m2, 7, bits, em),	\
+	IIO_CHAN_SOFT_TIMESTAMP(8)			\
 	}
 
-static const struct iio_chan_spec max1036_channels[] =
-	MAX1363_4X_CHANS(8, NULL, 0);
-static const struct iio_chan_spec max1136_channels[] =
-	MAX1363_4X_CHANS(10, NULL, 0);
-static const struct iio_chan_spec max1236_channels[] =
-	MAX1363_4X_CHANS(12, NULL, 0);
+static const struct iio_chan_spec max1036_channels[] = MAX1363_4X_CHANS(8, 0);
+static const struct iio_chan_spec max1136_channels[] = MAX1363_4X_CHANS(10, 0);
+static const struct iio_chan_spec max1236_channels[] = MAX1363_4X_CHANS(12, 0);
 static const struct iio_chan_spec max1361_channels[] =
-	MAX1363_4X_CHANS(10, max1363_events, ARRAY_SIZE(max1363_events));
+	MAX1363_4X_CHANS(10, MAX1363_EV_M);
 static const struct iio_chan_spec max1363_channels[] =
-	MAX1363_4X_CHANS(12, max1363_events, ARRAY_SIZE(max1363_events));
+	MAX1363_4X_CHANS(12, MAX1363_EV_M);
 
 /* Applies to max1236, max1237 */
 static const enum max1363_modes max1236_mode_list[] = {
@@ -552,32 +511,32 @@ static const enum max1363_modes max1238_mode_list[] = {
 	d6m7to8m9, d6m7to10m11, d7m6to9m8, d7m6to11m10,
 };
 
-#define MAX1363_12X_CHANS(bits) {				\
-	MAX1363_CHAN_U(0, _s0, 0, bits, NULL, 0),		\
-	MAX1363_CHAN_U(1, _s1, 1, bits, NULL, 0),		\
-	MAX1363_CHAN_U(2, _s2, 2, bits, NULL, 0),		\
-	MAX1363_CHAN_U(3, _s3, 3, bits, NULL, 0),		\
-	MAX1363_CHAN_U(4, _s4, 4, bits, NULL, 0),		\
-	MAX1363_CHAN_U(5, _s5, 5, bits, NULL, 0),		\
-	MAX1363_CHAN_U(6, _s6, 6, bits, NULL, 0),		\
-	MAX1363_CHAN_U(7, _s7, 7, bits, NULL, 0),		\
-	MAX1363_CHAN_U(8, _s8, 8, bits, NULL, 0),		\
-	MAX1363_CHAN_U(9, _s9, 9, bits, NULL, 0),		\
-	MAX1363_CHAN_U(10, _s10, 10, bits, NULL, 0),		\
-	MAX1363_CHAN_U(11, _s11, 11, bits, NULL, 0),		\
-	MAX1363_CHAN_B(0, 1, d0m1, 12, bits, NULL, 0),		\
-	MAX1363_CHAN_B(2, 3, d2m3, 13, bits, NULL, 0),		\
-	MAX1363_CHAN_B(4, 5, d4m5, 14, bits, NULL, 0),		\
-	MAX1363_CHAN_B(6, 7, d6m7, 15, bits, NULL, 0),		\
-	MAX1363_CHAN_B(8, 9, d8m9, 16, bits, NULL, 0),		\
-	MAX1363_CHAN_B(10, 11, d10m11, 17, bits, NULL, 0),	\
-	MAX1363_CHAN_B(1, 0, d1m0, 18, bits, NULL, 0),		\
-	MAX1363_CHAN_B(3, 2, d3m2, 19, bits, NULL, 0),		\
-	MAX1363_CHAN_B(5, 4, d5m4, 20, bits, NULL, 0),		\
-	MAX1363_CHAN_B(7, 6, d7m6, 21, bits, NULL, 0),		\
-	MAX1363_CHAN_B(9, 8, d9m8, 22, bits, NULL, 0),		\
-	MAX1363_CHAN_B(11, 10, d11m10, 23, bits, NULL, 0),	\
-	IIO_CHAN_SOFT_TIMESTAMP(24)				\
+#define MAX1363_12X_CHANS(bits) {			\
+	MAX1363_CHAN_U(0, _s0, 0, bits, 0),		\
+	MAX1363_CHAN_U(1, _s1, 1, bits, 0),		\
+	MAX1363_CHAN_U(2, _s2, 2, bits, 0),		\
+	MAX1363_CHAN_U(3, _s3, 3, bits, 0),		\
+	MAX1363_CHAN_U(4, _s4, 4, bits, 0),		\
+	MAX1363_CHAN_U(5, _s5, 5, bits, 0),		\
+	MAX1363_CHAN_U(6, _s6, 6, bits, 0),		\
+	MAX1363_CHAN_U(7, _s7, 7, bits, 0),		\
+	MAX1363_CHAN_U(8, _s8, 8, bits, 0),		\
+	MAX1363_CHAN_U(9, _s9, 9, bits, 0),		\
+	MAX1363_CHAN_U(10, _s10, 10, bits, 0),		\
+	MAX1363_CHAN_U(11, _s11, 11, bits, 0),		\
+	MAX1363_CHAN_B(0, 1, d0m1, 12, bits, 0),	\
+	MAX1363_CHAN_B(2, 3, d2m3, 13, bits, 0),	\
+	MAX1363_CHAN_B(4, 5, d4m5, 14, bits, 0),	\
+	MAX1363_CHAN_B(6, 7, d6m7, 15, bits, 0),	\
+	MAX1363_CHAN_B(8, 9, d8m9, 16, bits, 0),	\
+	MAX1363_CHAN_B(10, 11, d10m11, 17, bits, 0),	\
+	MAX1363_CHAN_B(1, 0, d1m0, 18, bits, 0),	\
+	MAX1363_CHAN_B(3, 2, d3m2, 19, bits, 0),	\
+	MAX1363_CHAN_B(5, 4, d5m4, 20, bits, 0),	\
+	MAX1363_CHAN_B(7, 6, d7m6, 21, bits, 0),	\
+	MAX1363_CHAN_B(9, 8, d9m8, 22, bits, 0),	\
+	MAX1363_CHAN_B(11, 10, d11m10, 23, bits, 0),	\
+	IIO_CHAN_SOFT_TIMESTAMP(24)			\
 	}
 static const struct iio_chan_spec max1038_channels[] = MAX1363_12X_CHANS(8);
 static const struct iio_chan_spec max1138_channels[] = MAX1363_12X_CHANS(10);
@@ -602,22 +561,22 @@ static const enum max1363_modes max11608_mode_list[] = {
 };
 
 #define MAX1363_8X_CHANS(bits) {			\
-	MAX1363_CHAN_U(0, _s0, 0, bits, NULL, 0),	\
-	MAX1363_CHAN_U(1, _s1, 1, bits, NULL, 0),	\
-	MAX1363_CHAN_U(2, _s2, 2, bits, NULL, 0),	\
-	MAX1363_CHAN_U(3, _s3, 3, bits, NULL, 0),	\
-	MAX1363_CHAN_U(4, _s4, 4, bits, NULL, 0),	\
-	MAX1363_CHAN_U(5, _s5, 5, bits, NULL, 0),	\
-	MAX1363_CHAN_U(6, _s6, 6, bits, NULL, 0),	\
-	MAX1363_CHAN_U(7, _s7, 7, bits, NULL, 0),	\
-	MAX1363_CHAN_B(0, 1, d0m1, 8, bits, NULL, 0),	\
-	MAX1363_CHAN_B(2, 3, d2m3, 9, bits, NULL, 0),	\
-	MAX1363_CHAN_B(4, 5, d4m5, 10, bits, NULL, 0),	\
-	MAX1363_CHAN_B(6, 7, d6m7, 11, bits, NULL, 0),	\
-	MAX1363_CHAN_B(1, 0, d1m0, 12, bits, NULL, 0),	\
-	MAX1363_CHAN_B(3, 2, d3m2, 13, bits, NULL, 0),	\
-	MAX1363_CHAN_B(5, 4, d5m4, 14, bits, NULL, 0),	\
-	MAX1363_CHAN_B(7, 6, d7m6, 15, bits, NULL, 0),	\
+	MAX1363_CHAN_U(0, _s0, 0, bits, 0),		\
+	MAX1363_CHAN_U(1, _s1, 1, bits, 0),		\
+	MAX1363_CHAN_U(2, _s2, 2, bits, 0),		\
+	MAX1363_CHAN_U(3, _s3, 3, bits, 0),		\
+	MAX1363_CHAN_U(4, _s4, 4, bits, 0),		\
+	MAX1363_CHAN_U(5, _s5, 5, bits, 0),		\
+	MAX1363_CHAN_U(6, _s6, 6, bits, 0),		\
+	MAX1363_CHAN_U(7, _s7, 7, bits, 0),		\
+	MAX1363_CHAN_B(0, 1, d0m1, 8, bits, 0),	\
+	MAX1363_CHAN_B(2, 3, d2m3, 9, bits, 0),	\
+	MAX1363_CHAN_B(4, 5, d4m5, 10, bits, 0),	\
+	MAX1363_CHAN_B(6, 7, d6m7, 11, bits, 0),	\
+	MAX1363_CHAN_B(1, 0, d1m0, 12, bits, 0),	\
+	MAX1363_CHAN_B(3, 2, d3m2, 13, bits, 0),	\
+	MAX1363_CHAN_B(5, 4, d5m4, 14, bits, 0),	\
+	MAX1363_CHAN_B(7, 6, d7m6, 15, bits, 0),	\
 	IIO_CHAN_SOFT_TIMESTAMP(16)			\
 }
 static const struct iio_chan_spec max11602_channels[] = MAX1363_8X_CHANS(8);
@@ -629,10 +588,10 @@ static const enum max1363_modes max11644_mode_list[] = {
 };
 
 #define MAX1363_2X_CHANS(bits) {			\
-	MAX1363_CHAN_U(0, _s0, 0, bits, NULL, 0),	\
-	MAX1363_CHAN_U(1, _s1, 1, bits, NULL, 0),	\
-	MAX1363_CHAN_B(0, 1, d0m1, 2, bits, NULL, 0),	\
-	MAX1363_CHAN_B(1, 0, d1m0, 3, bits, NULL, 0),	\
+	MAX1363_CHAN_U(0, _s0, 0, bits, 0),		\
+	MAX1363_CHAN_U(1, _s1, 1, bits, 0),		\
+	MAX1363_CHAN_B(0, 1, d0m1, 2, bits, 0),	\
+	MAX1363_CHAN_B(1, 0, d1m0, 3, bits, 0),	\
 	IIO_CHAN_SOFT_TIMESTAMP(4)			\
 	}
 
@@ -727,22 +686,20 @@ static IIO_CONST_ATTR(sampling_frequency_available,
 		"133000 665000 33300 16600 8300 4200 2000 1000");
 
 static int max1363_read_thresh(struct iio_dev *indio_dev,
-	const struct iio_chan_spec *chan, enum iio_event_type type,
-	enum iio_event_direction dir, enum iio_event_info info, int *val,
-	int *val2)
+			       u64 event_code,
+			       int *val)
 {
 	struct max1363_state *st = iio_priv(indio_dev);
-	if (dir == IIO_EV_DIR_FALLING)
-		*val = st->thresh_low[chan->channel];
+	if (IIO_EVENT_CODE_EXTRACT_DIR(event_code) == IIO_EV_DIR_FALLING)
+		*val = st->thresh_low[IIO_EVENT_CODE_EXTRACT_CHAN(event_code)];
 	else
-		*val = st->thresh_high[chan->channel];
-	return IIO_VAL_INT;
+		*val = st->thresh_high[IIO_EVENT_CODE_EXTRACT_CHAN(event_code)];
+	return 0;
 }
 
 static int max1363_write_thresh(struct iio_dev *indio_dev,
-	const struct iio_chan_spec *chan, enum iio_event_type type,
-	enum iio_event_direction dir, enum iio_event_info info, int val,
-	int val2)
+				u64 event_code,
+				int val)
 {
 	struct max1363_state *st = iio_priv(indio_dev);
 	/* make it handle signed correctly as well */
@@ -757,15 +714,13 @@ static int max1363_write_thresh(struct iio_dev *indio_dev,
 		break;
 	}
 
-	switch (dir) {
+	switch (IIO_EVENT_CODE_EXTRACT_DIR(event_code)) {
 	case IIO_EV_DIR_FALLING:
-		st->thresh_low[chan->channel] = val;
+		st->thresh_low[IIO_EVENT_CODE_EXTRACT_CHAN(event_code)] = val;
 		break;
 	case IIO_EV_DIR_RISING:
-		st->thresh_high[chan->channel] = val;
+		st->thresh_high[IIO_EVENT_CODE_EXTRACT_CHAN(event_code)] = val;
 		break;
-	default:
-		return -EINVAL;
 	}
 
 	return 0;
@@ -800,25 +755,24 @@ static irqreturn_t max1363_event_handler(int irq, void *private)
 	u8 tx[2] = { st->setupbyte,
 		     MAX1363_MON_INT_ENABLE | (st->monitor_speed << 1) | 0xF0 };
 
-	st->recv(st->client, &rx, 1);
+	i2c_master_recv(st->client, &rx, 1);
 	mask = rx;
 	for_each_set_bit(loc, &mask, 8)
 		iio_push_event(indio_dev, max1363_event_codes[loc], timestamp);
-	st->send(st->client, tx, 2);
+	i2c_master_send(st->client, tx, 2);
 
 	return IRQ_HANDLED;
 }
 
 static int max1363_read_event_config(struct iio_dev *indio_dev,
-	const struct iio_chan_spec *chan, enum iio_event_type type,
-	enum iio_event_direction dir)
+				     u64 event_code)
 {
 	struct max1363_state *st = iio_priv(indio_dev);
 	int val;
-	int number = chan->channel;
+	int number = IIO_EVENT_CODE_EXTRACT_CHAN(event_code);
 
 	mutex_lock(&indio_dev->mlock);
-	if (dir == IIO_EV_DIR_FALLING)
+	if (IIO_EVENT_CODE_EXTRACT_DIR(event_code) == IIO_EV_DIR_FALLING)
 		val = (1 << number) & st->mask_low;
 	else
 		val = (1 << number) & st->mask_high;
@@ -840,7 +794,9 @@ static int max1363_monitor_mode_update(struct max1363_state *st, int enabled)
 		st->setupbyte &= ~MAX1363_SETUP_MONITOR_SETUP;
 		st->configbyte &= ~MAX1363_SCAN_MASK;
 		st->monitor_on = false;
-		return max1363_write_basic_config(st);
+		return max1363_write_basic_config(st->client,
+						st->setupbyte,
+						st->configbyte);
 	}
 
 	/* Ensure we are in the relevant mode */
@@ -902,7 +858,7 @@ static int max1363_monitor_mode_update(struct max1363_state *st, int enabled)
 		}
 
 
-	ret = st->send(st->client, tx_buf, len);
+	ret = i2c_master_send(st->client, tx_buf, len);
 	if (ret < 0)
 		goto error_ret;
 	if (ret != len) {
@@ -919,7 +875,7 @@ static int max1363_monitor_mode_update(struct max1363_state *st, int enabled)
 	 */
 	tx_buf[0] = st->setupbyte;
 	tx_buf[1] = MAX1363_MON_INT_ENABLE | (st->monitor_speed << 1) | 0xF0;
-	ret = st->send(st->client, tx_buf, 2);
+	ret = i2c_master_send(st->client, tx_buf, 2);
 	if (ret < 0)
 		goto error_ret;
 	if (ret != 2) {
@@ -961,17 +917,17 @@ error_ret:
 }
 
 static int max1363_write_event_config(struct iio_dev *indio_dev,
-	const struct iio_chan_spec *chan, enum iio_event_type type,
-	enum iio_event_direction dir, int state)
+				      u64 event_code,
+				      int state)
 {
 	int ret = 0;
 	struct max1363_state *st = iio_priv(indio_dev);
 	u16 unifiedmask;
-	int number = chan->channel;
+	int number = IIO_EVENT_CODE_EXTRACT_CHAN(event_code);
 
 	mutex_lock(&indio_dev->mlock);
 	unifiedmask = st->mask_low | st->mask_high;
-	if (dir == IIO_EV_DIR_FALLING) {
+	if (IIO_EVENT_CODE_EXTRACT_DIR(event_code) == IIO_EV_DIR_FALLING) {
 
 		if (state == 0)
 			st->mask_low &= ~(1 << number);
@@ -1039,10 +995,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,
@@ -1480,6 +1436,7 @@ static irqreturn_t max1363_trigger_handler(int irq, void *p)
 	struct iio_poll_func *pf = p;
 	struct iio_dev *indio_dev = pf->indio_dev;
 	struct max1363_state *st = iio_priv(indio_dev);
+	s64 time_ns;
 	__u8 *rxbuf;
 	int b_sent;
 	size_t d_size;
@@ -1507,13 +1464,17 @@ static irqreturn_t max1363_trigger_handler(int irq, void *p)
 	if (rxbuf == NULL)
 		goto done;
 	if (st->chip_info->bits != 8)
-		b_sent = st->recv(st->client, rxbuf, numvals * 2);
+		b_sent = i2c_master_recv(st->client, rxbuf, numvals*2);
 	else
-		b_sent = st->recv(st->client, rxbuf, numvals);
+		b_sent = i2c_master_recv(st->client, rxbuf, numvals);
 	if (b_sent < 0)
 		goto done_free;
 
-	iio_push_to_buffers_with_timestamp(indio_dev, rxbuf, iio_get_time_ns());
+	time_ns = iio_get_time_ns();
+
+	if (indio_dev->scan_timestamp)
+		memcpy(rxbuf + d_size - sizeof(s64), &time_ns, sizeof(time_ns));
+	iio_push_to_buffers(indio_dev, rxbuf);
 
 done_free:
 	kfree(rxbuf);
@@ -1523,6 +1484,12 @@ done:
 	return IRQ_HANDLED;
 }
 
+static const struct iio_buffer_setup_ops max1363_buffered_setup_ops = {
+	.postenable = &iio_triggered_buffer_postenable,
+	.preenable = &iio_sw_buffer_preenable,
+	.predisable = &iio_triggered_buffer_predisable,
+};
+
 static int max1363_probe(struct i2c_client *client,
 			 const struct i2c_device_id *id)
 {
@@ -1576,18 +1543,6 @@ static int max1363_probe(struct i2c_client *client,
 		st->vref_uv = vref_uv;
 	}
 
-	if (i2c_check_functionality(client->adapter, I2C_FUNC_I2C)) {
-		st->send = i2c_master_send;
-		st->recv = i2c_master_recv;
-	} else if (i2c_check_functionality(client->adapter, I2C_FUNC_SMBUS_BYTE)
-			&& st->chip_info->bits == 8) {
-		st->send = max1363_smbus_send;
-		st->recv = max1363_smbus_recv;
-	} else {
-		ret = -EOPNOTSUPP;
-		goto error_disable_reg;
-	}
-
 	ret = max1363_alloc_scan_masks(indio_dev);
 	if (ret)
 		goto error_disable_reg;
@@ -1604,7 +1559,7 @@ static int max1363_probe(struct i2c_client *client,
 		goto error_disable_reg;
 
 	ret = iio_triggered_buffer_setup(indio_dev, NULL,
-		&max1363_trigger_handler, NULL);
+		&max1363_trigger_handler, &max1363_buffered_setup_ops);
 	if (ret)
 		goto error_disable_reg;
 
diff --git a/drivers/iio/adc/mcp3422.c b/drivers/iio/adc/mcp3422.c
deleted file mode 100644
index c8c1baa..0000000
--- a/drivers/iio/adc/mcp3422.c
+++ /dev/null
@@ -1,410 +0,0 @@
-/*
- * mcp3422.c - driver for the Microchip mcp3422/3/4 chip family
- *
- * Copyright (C) 2013, Angelo Compagnucci
- * Author: Angelo Compagnucci <angelo.compagnucci@gmail.com>
- *
- * Datasheet: http://ww1.microchip.com/downloads/en/devicedoc/22088b.pdf
- *
- * This driver exports the value of analog input voltage to sysfs, the
- * voltage unit is nV.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- */
-
-#include <linux/err.h>
-#include <linux/i2c.h>
-#include <linux/module.h>
-#include <linux/delay.h>
-#include <linux/sysfs.h>
-#include <linux/of.h>
-
-#include <linux/iio/iio.h>
-#include <linux/iio/sysfs.h>
-
-/* Masks */
-#define MCP3422_CHANNEL_MASK	0x60
-#define MCP3422_PGA_MASK	0x03
-#define MCP3422_SRATE_MASK	0x0C
-#define MCP3422_SRATE_240	0x0
-#define MCP3422_SRATE_60	0x1
-#define MCP3422_SRATE_15	0x2
-#define MCP3422_SRATE_3	0x3
-#define MCP3422_PGA_1	0
-#define MCP3422_PGA_2	1
-#define MCP3422_PGA_4	2
-#define MCP3422_PGA_8	3
-#define MCP3422_CONT_SAMPLING	0x10
-
-#define MCP3422_CHANNEL(config)	(((config) & MCP3422_CHANNEL_MASK) >> 5)
-#define MCP3422_PGA(config)	((config) & MCP3422_PGA_MASK)
-#define MCP3422_SAMPLE_RATE(config)	(((config) & MCP3422_SRATE_MASK) >> 2)
-
-#define MCP3422_CHANNEL_VALUE(value) (((value) << 5) & MCP3422_CHANNEL_MASK)
-#define MCP3422_PGA_VALUE(value) ((value) & MCP3422_PGA_MASK)
-#define MCP3422_SAMPLE_RATE_VALUE(value) ((value << 2) & MCP3422_SRATE_MASK)
-
-#define MCP3422_CHAN(_index) \
-	{ \
-		.type = IIO_VOLTAGE, \
-		.indexed = 1, \
-		.channel = _index, \
-		.info_mask_separate = BIT(IIO_CHAN_INFO_RAW) \
-				| BIT(IIO_CHAN_INFO_SCALE), \
-		.info_mask_shared_by_type = BIT(IIO_CHAN_INFO_SAMP_FREQ), \
-	}
-
-/* LSB is in nV to eliminate floating point */
-static const u32 rates_to_lsb[] = {1000000, 250000, 62500, 15625};
-
-/*
- *  scales calculated as:
- *  rates_to_lsb[sample_rate] / (1 << pga);
- *  pga is 1 for 0, 2
- */
-
-static const int mcp3422_scales[4][4] = {
-	{ 1000000, 250000, 62500, 15625 },
-	{ 500000 , 125000, 31250, 7812 },
-	{ 250000 , 62500 , 15625, 3906 },
-	{ 125000 , 31250 , 7812 , 1953 } };
-
-/* Constant msleep times for data acquisitions */
-static const int mcp3422_read_times[4] = {
-	[MCP3422_SRATE_240] = 1000 / 240,
-	[MCP3422_SRATE_60] = 1000 / 60,
-	[MCP3422_SRATE_15] = 1000 / 15,
-	[MCP3422_SRATE_3] = 1000 / 3 };
-
-/* sample rates to integer conversion table */
-static const int mcp3422_sample_rates[4] = {
-	[MCP3422_SRATE_240] = 240,
-	[MCP3422_SRATE_60] = 60,
-	[MCP3422_SRATE_15] = 15,
-	[MCP3422_SRATE_3] = 3 };
-
-/* sample rates to sign extension table */
-static const int mcp3422_sign_extend[4] = {
-	[MCP3422_SRATE_240] = 11,
-	[MCP3422_SRATE_60] = 13,
-	[MCP3422_SRATE_15] = 15,
-	[MCP3422_SRATE_3] = 17 };
-
-/* Client data (each client gets its own) */
-struct mcp3422 {
-	struct i2c_client *i2c;
-	u8 config;
-	u8 pga[4];
-	struct mutex lock;
-};
-
-static int mcp3422_update_config(struct mcp3422 *adc, u8 newconfig)
-{
-	int ret;
-
-	mutex_lock(&adc->lock);
-
-	ret = i2c_master_send(adc->i2c, &newconfig, 1);
-	if (ret > 0) {
-		adc->config = newconfig;
-		ret = 0;
-	}
-
-	mutex_unlock(&adc->lock);
-
-	return ret;
-}
-
-static int mcp3422_read(struct mcp3422 *adc, int *value, u8 *config)
-{
-	int ret = 0;
-	u8 sample_rate = MCP3422_SAMPLE_RATE(adc->config);
-	u8 buf[4] = {0, 0, 0, 0};
-	u32 temp;
-
-	if (sample_rate == MCP3422_SRATE_3) {
-		ret = i2c_master_recv(adc->i2c, buf, 4);
-		temp = buf[0] << 16 | buf[1] << 8 | buf[2];
-		*config = buf[3];
-	} else {
-		ret = i2c_master_recv(adc->i2c, buf, 3);
-		temp = buf[0] << 8 | buf[1];
-		*config = buf[2];
-	}
-
-	*value = sign_extend32(temp, mcp3422_sign_extend[sample_rate]);
-
-	return ret;
-}
-
-static int mcp3422_read_channel(struct mcp3422 *adc,
-				struct iio_chan_spec const *channel, int *value)
-{
-	int ret;
-	u8 config;
-	u8 req_channel = channel->channel;
-
-	if (req_channel != MCP3422_CHANNEL(adc->config)) {
-		config = adc->config;
-		config &= ~MCP3422_CHANNEL_MASK;
-		config |= MCP3422_CHANNEL_VALUE(req_channel);
-		config &= ~MCP3422_PGA_MASK;
-		config |= MCP3422_PGA_VALUE(adc->pga[req_channel]);
-		ret = mcp3422_update_config(adc, config);
-		if (ret < 0)
-			return ret;
-		msleep(mcp3422_read_times[MCP3422_SAMPLE_RATE(adc->config)]);
-	}
-
-	return mcp3422_read(adc, value, &config);
-}
-
-static int mcp3422_read_raw(struct iio_dev *iio,
-			struct iio_chan_spec const *channel, int *val1,
-			int *val2, long mask)
-{
-	struct mcp3422 *adc = iio_priv(iio);
-	int err;
-
-	u8 sample_rate = MCP3422_SAMPLE_RATE(adc->config);
-	u8 pga		 = MCP3422_PGA(adc->config);
-
-	switch (mask) {
-	case IIO_CHAN_INFO_RAW:
-		err = mcp3422_read_channel(adc, channel, val1);
-		if (err < 0)
-			return -EINVAL;
-		return IIO_VAL_INT;
-
-	case IIO_CHAN_INFO_SCALE:
-
-		*val1 = 0;
-		*val2 = mcp3422_scales[sample_rate][pga];
-		return IIO_VAL_INT_PLUS_NANO;
-
-	case IIO_CHAN_INFO_SAMP_FREQ:
-		*val1 = mcp3422_sample_rates[MCP3422_SAMPLE_RATE(adc->config)];
-		return IIO_VAL_INT;
-
-	default:
-		break;
-	}
-
-	return -EINVAL;
-}
-
-static int mcp3422_write_raw(struct iio_dev *iio,
-			struct iio_chan_spec const *channel, int val1,
-			int val2, long mask)
-{
-	struct mcp3422 *adc = iio_priv(iio);
-	u8 temp;
-	u8 config = adc->config;
-	u8 req_channel = channel->channel;
-	u8 sample_rate = MCP3422_SAMPLE_RATE(config);
-	u8 i;
-
-	switch (mask) {
-	case IIO_CHAN_INFO_SCALE:
-		if (val1 != 0)
-			return -EINVAL;
-
-		for (i = 0; i < ARRAY_SIZE(mcp3422_scales[0]); i++) {
-			if (val2 == mcp3422_scales[sample_rate][i]) {
-				adc->pga[req_channel] = i;
-
-				config &= ~MCP3422_CHANNEL_MASK;
-				config |= MCP3422_CHANNEL_VALUE(req_channel);
-				config &= ~MCP3422_PGA_MASK;
-				config |= MCP3422_PGA_VALUE(adc->pga[req_channel]);
-
-				return mcp3422_update_config(adc, config);
-			}
-		}
-		return -EINVAL;
-
-	case IIO_CHAN_INFO_SAMP_FREQ:
-		switch (val1) {
-		case 240:
-			temp = MCP3422_SRATE_240;
-			break;
-		case 60:
-			temp = MCP3422_SRATE_60;
-			break;
-		case 15:
-			temp = MCP3422_SRATE_15;
-			break;
-		case 3:
-			temp = MCP3422_SRATE_3;
-			break;
-		default:
-			return -EINVAL;
-		}
-
-		config &= ~MCP3422_CHANNEL_MASK;
-		config |= MCP3422_CHANNEL_VALUE(req_channel);
-		config &= ~MCP3422_SRATE_MASK;
-		config |= MCP3422_SAMPLE_RATE_VALUE(temp);
-
-		return mcp3422_update_config(adc, config);
-
-	default:
-		break;
-	}
-
-	return -EINVAL;
-}
-
-static int mcp3422_write_raw_get_fmt(struct iio_dev *indio_dev,
-		struct iio_chan_spec const *chan, long mask)
-{
-	switch (mask) {
-	case IIO_CHAN_INFO_SCALE:
-		return IIO_VAL_INT_PLUS_NANO;
-	case IIO_CHAN_INFO_SAMP_FREQ:
-		return IIO_VAL_INT_PLUS_MICRO;
-	default:
-		return -EINVAL;
-	}
-}
-
-static ssize_t mcp3422_show_scales(struct device *dev,
-		struct device_attribute *attr, char *buf)
-{
-	struct mcp3422 *adc = iio_priv(dev_to_iio_dev(dev));
-	u8 sample_rate = MCP3422_SAMPLE_RATE(adc->config);
-
-	return sprintf(buf, "0.%09u 0.%09u 0.%09u 0.%09u\n",
-		mcp3422_scales[sample_rate][0],
-		mcp3422_scales[sample_rate][1],
-		mcp3422_scales[sample_rate][2],
-		mcp3422_scales[sample_rate][3]);
-}
-
-static IIO_CONST_ATTR_SAMP_FREQ_AVAIL("240 60 15 3");
-static IIO_DEVICE_ATTR(in_voltage_scale_available, S_IRUGO,
-		mcp3422_show_scales, NULL, 0);
-
-static struct attribute *mcp3422_attributes[] = {
-	&iio_const_attr_sampling_frequency_available.dev_attr.attr,
-	&iio_dev_attr_in_voltage_scale_available.dev_attr.attr,
-	NULL,
-};
-
-static const struct attribute_group mcp3422_attribute_group = {
-	.attrs = mcp3422_attributes,
-};
-
-static const struct iio_chan_spec mcp3422_channels[] = {
-	MCP3422_CHAN(0),
-	MCP3422_CHAN(1),
-};
-
-static const struct iio_chan_spec mcp3424_channels[] = {
-	MCP3422_CHAN(0),
-	MCP3422_CHAN(1),
-	MCP3422_CHAN(2),
-	MCP3422_CHAN(3),
-};
-
-static const struct iio_info mcp3422_info = {
-	.read_raw = mcp3422_read_raw,
-	.write_raw = mcp3422_write_raw,
-	.write_raw_get_fmt = mcp3422_write_raw_get_fmt,
-	.attrs = &mcp3422_attribute_group,
-	.driver_module = THIS_MODULE,
-};
-
-static int mcp3422_probe(struct i2c_client *client,
-			 const struct i2c_device_id *id)
-{
-	struct iio_dev *indio_dev;
-	struct mcp3422 *adc;
-	int err;
-	u8 config;
-
-	if (!i2c_check_functionality(client->adapter, I2C_FUNC_I2C))
-		return -ENODEV;
-
-	indio_dev = devm_iio_device_alloc(&client->dev, sizeof(*adc));
-	if (!indio_dev)
-		return -ENOMEM;
-
-	adc = iio_priv(indio_dev);
-	adc->i2c = client;
-
-	mutex_init(&adc->lock);
-
-	indio_dev->dev.parent = &client->dev;
-	indio_dev->name = dev_name(&client->dev);
-	indio_dev->modes = INDIO_DIRECT_MODE;
-	indio_dev->info = &mcp3422_info;
-
-	switch ((unsigned int)(id->driver_data)) {
-	case 2:
-	case 3:
-		indio_dev->channels = mcp3422_channels;
-		indio_dev->num_channels = ARRAY_SIZE(mcp3422_channels);
-		break;
-	case 4:
-		indio_dev->channels = mcp3424_channels;
-		indio_dev->num_channels = ARRAY_SIZE(mcp3424_channels);
-		break;
-	}
-
-	/* meaningful default configuration */
-	config = (MCP3422_CONT_SAMPLING
-		| MCP3422_CHANNEL_VALUE(1)
-		| MCP3422_PGA_VALUE(MCP3422_PGA_1)
-		| MCP3422_SAMPLE_RATE_VALUE(MCP3422_SRATE_240));
-	mcp3422_update_config(adc, config);
-
-	err = iio_device_register(indio_dev);
-	if (err < 0)
-		return err;
-
-	i2c_set_clientdata(client, indio_dev);
-
-	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 },
-	{ "mcp3424", 4 },
-	{ }
-};
-MODULE_DEVICE_TABLE(i2c, mcp3422_id);
-
-#ifdef CONFIG_OF
-static const struct of_device_id mcp3422_of_match[] = {
-	{ .compatible = "mcp3422" },
-	{ }
-};
-MODULE_DEVICE_TABLE(of, mcp3422_of_match);
-#endif
-
-static struct i2c_driver mcp3422_driver = {
-	.driver = {
-		.name = "mcp3422",
-		.owner = THIS_MODULE,
-		.of_match_table = of_match_ptr(mcp3422_of_match),
-	},
-	.probe = mcp3422_probe,
-	.remove = mcp3422_remove,
-	.id_table = mcp3422_id,
-};
-module_i2c_driver(mcp3422_driver);
-
-MODULE_AUTHOR("Angelo Compagnucci <angelo.compagnucci@gmail.com>");
-MODULE_DESCRIPTION("Microchip mcp3422/3/4 driver");
-MODULE_LICENSE("GPL v2");
diff --git a/drivers/iio/adc/nau7802.c b/drivers/iio/adc/nau7802.c
index e525aa6..bdf0346 100644
--- a/drivers/iio/adc/nau7802.c
+++ b/drivers/iio/adc/nau7802.c
@@ -12,7 +12,6 @@
 #include <linux/module.h>
 #include <linux/wait.h>
 #include <linux/log2.h>
-#include <linux/of.h>
 
 #include <linux/iio/iio.h>
 #include <linux/iio/sysfs.h>
@@ -190,7 +189,7 @@ static int nau7802_read_irq(struct iio_dev *indio_dev,
 	struct nau7802_state *st = iio_priv(indio_dev);
 	int ret;
 
-	reinit_completion(&st->value_ok);
+	INIT_COMPLETION(st->value_ok);
 	enable_irq(st->client->irq);
 
 	nau7802_sync(st);
@@ -570,7 +569,7 @@ static struct i2c_driver nau7802_driver = {
 	.id_table = nau7802_i2c_id,
 	.driver = {
 		   .name = "nau7802",
-		   .of_match_table = nau7802_dt_ids,
+		   .of_match_table = of_match_ptr(nau7802_dt_ids),
 	},
 };
 
diff --git a/drivers/iio/adc/ti-adc081c.c b/drivers/iio/adc/ti-adc081c.c
index b3a82b4..ee5f72b 100644
--- a/drivers/iio/adc/ti-adc081c.c
+++ b/drivers/iio/adc/ti-adc081c.c
@@ -9,7 +9,6 @@
 #include <linux/err.h>
 #include <linux/i2c.h>
 #include <linux/module.h>
-#include <linux/of.h>
 
 #include <linux/iio/iio.h>
 #include <linux/regulator/consumer.h>
diff --git a/drivers/iio/adc/ti_am335x_adc.c b/drivers/iio/adc/ti_am335x_adc.c
index d4d7482..a952538 100644
--- a/drivers/iio/adc/ti_am335x_adc.c
+++ b/drivers/iio/adc/ti_am335x_adc.c
@@ -28,16 +28,12 @@
 #include <linux/iio/driver.h>
 
 #include <linux/mfd/ti_am335x_tscadc.h>
-#include <linux/iio/buffer.h>
-#include <linux/iio/kfifo_buf.h>
 
 struct tiadc_device {
 	struct ti_tscadc_dev *mfd_tscadc;
 	int channels;
 	u8 channel_line[8];
 	u8 channel_step[8];
-	int buffer_en_ch_steps;
-	u16 data[8];
 };
 
 static unsigned int tiadc_readl(struct tiadc_device *adc, unsigned int reg)
@@ -60,14 +56,8 @@ static u32 get_adc_step_mask(struct tiadc_device *adc_dev)
 	return step_en;
 }
 
-static u32 get_adc_step_bit(struct tiadc_device *adc_dev, int chan)
+static void tiadc_step_config(struct tiadc_device *adc_dev)
 {
-	return 1 << adc_dev->channel_step[chan];
-}
-
-static void tiadc_step_config(struct iio_dev *indio_dev)
-{
-	struct tiadc_device *adc_dev = iio_priv(indio_dev);
 	unsigned int stepconfig;
 	int i, steps;
 
@@ -82,11 +72,7 @@ static void tiadc_step_config(struct iio_dev *indio_dev)
 	 */
 
 	steps = TOTAL_STEPS - adc_dev->channels;
-	if (iio_buffer_enabled(indio_dev))
-		stepconfig = STEPCONFIG_AVG_16 | STEPCONFIG_FIFO1
-					| STEPCONFIG_MODE_SWCNT;
-	else
-		stepconfig = STEPCONFIG_AVG_16 | STEPCONFIG_FIFO1;
+	stepconfig = STEPCONFIG_AVG_16 | STEPCONFIG_FIFO1;
 
 	for (i = 0; i < adc_dev->channels; i++) {
 		int chan;
@@ -99,178 +85,9 @@ static void tiadc_step_config(struct iio_dev *indio_dev)
 		adc_dev->channel_step[i] = steps;
 		steps++;
 	}
-}
-
-static irqreturn_t tiadc_irq_h(int irq, void *private)
-{
-	struct iio_dev *indio_dev = private;
-	struct tiadc_device *adc_dev = iio_priv(indio_dev);
-	unsigned int status, config;
-	status = tiadc_readl(adc_dev, REG_IRQSTATUS);
-
-	/*
-	 * ADC and touchscreen share the IRQ line.
-	 * FIFO0 interrupts are used by TSC. Handle FIFO1 IRQs here only
-	 */
-	if (status & IRQENB_FIFO1OVRRUN) {
-		/* FIFO Overrun. Clear flag. Disable/Enable ADC to recover */
-		config = tiadc_readl(adc_dev, REG_CTRL);
-		config &= ~(CNTRLREG_TSCSSENB);
-		tiadc_writel(adc_dev, REG_CTRL, config);
-		tiadc_writel(adc_dev, REG_IRQSTATUS, IRQENB_FIFO1OVRRUN
-				| IRQENB_FIFO1UNDRFLW | IRQENB_FIFO1THRES);
-		tiadc_writel(adc_dev, REG_CTRL, (config | CNTRLREG_TSCSSENB));
-		return IRQ_HANDLED;
-	} else if (status & IRQENB_FIFO1THRES) {
-		/* Disable irq and wake worker thread */
-		tiadc_writel(adc_dev, REG_IRQCLR, IRQENB_FIFO1THRES);
-		return IRQ_WAKE_THREAD;
-	}
-
-	return IRQ_NONE;
-}
-
-static irqreturn_t tiadc_worker_h(int irq, void *private)
-{
-	struct iio_dev *indio_dev = private;
-	struct tiadc_device *adc_dev = iio_priv(indio_dev);
-	int i, k, fifo1count, read;
-	u16 *data = adc_dev->data;
-
-	fifo1count = tiadc_readl(adc_dev, REG_FIFO1CNT);
-	for (k = 0; k < fifo1count; k = k + i) {
-		for (i = 0; i < (indio_dev->scan_bytes)/2; i++) {
-			read = tiadc_readl(adc_dev, REG_FIFO1);
-			data[i] = read & FIFOREAD_DATA_MASK;
-		}
-		iio_push_to_buffers(indio_dev, (u8 *) data);
-	}
-
-	tiadc_writel(adc_dev, REG_IRQSTATUS, IRQENB_FIFO1THRES);
-	tiadc_writel(adc_dev, REG_IRQENABLE, IRQENB_FIFO1THRES);
-
-	return IRQ_HANDLED;
-}
-
-static int tiadc_buffer_preenable(struct iio_dev *indio_dev)
-{
-	struct tiadc_device *adc_dev = iio_priv(indio_dev);
-	int i, fifo1count, read;
-
-	tiadc_writel(adc_dev, REG_IRQCLR, (IRQENB_FIFO1THRES |
-				IRQENB_FIFO1OVRRUN |
-				IRQENB_FIFO1UNDRFLW));
-
-	/* Flush FIFO. Needed in corner cases in simultaneous tsc/adc use */
-	fifo1count = tiadc_readl(adc_dev, REG_FIFO1CNT);
-	for (i = 0; i < fifo1count; i++)
-		read = tiadc_readl(adc_dev, REG_FIFO1);
-
-	return 0;
-}
-
-static int tiadc_buffer_postenable(struct iio_dev *indio_dev)
-{
-	struct tiadc_device *adc_dev = iio_priv(indio_dev);
-	struct iio_buffer *buffer = indio_dev->buffer;
-	unsigned int enb = 0;
-	u8 bit;
-
-	tiadc_step_config(indio_dev);
-	for_each_set_bit(bit, buffer->scan_mask, adc_dev->channels)
-		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);
-
-	tiadc_writel(adc_dev,  REG_IRQSTATUS, IRQENB_FIFO1THRES
-				| IRQENB_FIFO1OVRRUN | IRQENB_FIFO1UNDRFLW);
-	tiadc_writel(adc_dev,  REG_IRQENABLE, IRQENB_FIFO1THRES
-				| IRQENB_FIFO1OVRRUN);
-
-	return 0;
-}
-
-static int tiadc_buffer_predisable(struct iio_dev *indio_dev)
-{
-	struct tiadc_device *adc_dev = iio_priv(indio_dev);
-	int fifo1count, i, read;
-
-	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);
-
-	/* Flush FIFO of leftover data in the time it takes to disable adc */
-	fifo1count = tiadc_readl(adc_dev, REG_FIFO1CNT);
-	for (i = 0; i < fifo1count; i++)
-		read = tiadc_readl(adc_dev, REG_FIFO1);
-
-	return 0;
-}
-
-static int tiadc_buffer_postdisable(struct iio_dev *indio_dev)
-{
-	tiadc_step_config(indio_dev);
-
-	return 0;
-}
-
-static const struct iio_buffer_setup_ops tiadc_buffer_setup_ops = {
-	.preenable = &tiadc_buffer_preenable,
-	.postenable = &tiadc_buffer_postenable,
-	.predisable = &tiadc_buffer_predisable,
-	.postdisable = &tiadc_buffer_postdisable,
-};
-
-static int tiadc_iio_buffered_hardware_setup(struct iio_dev *indio_dev,
-	irqreturn_t (*pollfunc_bh)(int irq, void *p),
-	irqreturn_t (*pollfunc_th)(int irq, void *p),
-	int irq,
-	unsigned long flags,
-	const struct iio_buffer_setup_ops *setup_ops)
-{
-	struct iio_buffer *buffer;
-	int ret;
-
-	buffer = iio_kfifo_allocate(indio_dev);
-	if (!buffer)
-		return -ENOMEM;
-
-	iio_device_attach_buffer(indio_dev, buffer);
-
-	ret = request_threaded_irq(irq,	pollfunc_th, pollfunc_bh,
-				flags, indio_dev->name, indio_dev);
-	if (ret)
-		goto error_kfifo_free;
 
-	indio_dev->setup_ops = setup_ops;
-	indio_dev->modes |= INDIO_BUFFER_HARDWARE;
-
-	ret = iio_buffer_register(indio_dev,
-				  indio_dev->channels,
-				  indio_dev->num_channels);
-	if (ret)
-		goto error_free_irq;
-
-	return 0;
-
-error_free_irq:
-	free_irq(irq, indio_dev);
-error_kfifo_free:
-	iio_kfifo_free(indio_dev->buffer);
-	return ret;
 }
 
-static void tiadc_iio_buffered_hardware_remove(struct iio_dev *indio_dev)
-{
-	struct tiadc_device *adc_dev = iio_priv(indio_dev);
-
-	free_irq(adc_dev->mfd_tscadc->irq, indio_dev);
-	iio_kfifo_free(indio_dev->buffer);
-	iio_buffer_unregister(indio_dev);
-}
-
-
 static const char * const chan_name_ain[] = {
 	"AIN0",
 	"AIN1",
@@ -303,10 +120,9 @@ static int tiadc_channel_init(struct iio_dev *indio_dev, int channels)
 		chan->channel = adc_dev->channel_line[i];
 		chan->info_mask_separate = BIT(IIO_CHAN_INFO_RAW);
 		chan->datasheet_name = chan_name_ain[chan->channel];
-		chan->scan_index = i;
 		chan->scan_type.sign = 'u';
 		chan->scan_type.realbits = 12;
-		chan->scan_type.storagebits = 16;
+		chan->scan_type.storagebits = 32;
 	}
 
 	indio_dev->channels = chan_array;
@@ -326,14 +142,11 @@ static int tiadc_read_raw(struct iio_dev *indio_dev,
 	struct tiadc_device *adc_dev = iio_priv(indio_dev);
 	int i, map_val;
 	unsigned int fifo1count, read, stepid;
+	u32 step = UINT_MAX;
 	bool found = false;
 	u32 step_en;
 	unsigned long timeout = jiffies + usecs_to_jiffies
 				(IDLE_TIMEOUT * adc_dev->channels);
-
-	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);
 
@@ -355,6 +168,15 @@ static int tiadc_read_raw(struct iio_dev *indio_dev,
 	 * Hence we need to flush out this data.
 	 */
 
+	for (i = 0; i < ARRAY_SIZE(adc_dev->channel_step); i++) {
+		if (chan->channel == adc_dev->channel_line[i]) {
+			step = adc_dev->channel_step[i];
+			break;
+		}
+	}
+	if (WARN_ON_ONCE(step == UINT_MAX))
+		return -EINVAL;
+
 	fifo1count = tiadc_readl(adc_dev, REG_FIFO1CNT);
 	for (i = 0; i < fifo1count; i++) {
 		read = tiadc_readl(adc_dev, REG_FIFO1);
@@ -364,7 +186,7 @@ static int tiadc_read_raw(struct iio_dev *indio_dev,
 		if (stepid == map_val) {
 			read = read & FIFOREAD_DATA_MASK;
 			found = true;
-			*val = (u16) read;
+			*val = read;
 		}
 	}
 
@@ -415,33 +237,20 @@ static int tiadc_probe(struct platform_device *pdev)
 	indio_dev->modes = INDIO_DIRECT_MODE;
 	indio_dev->info = &tiadc_info;
 
-	tiadc_step_config(indio_dev);
-	tiadc_writel(adc_dev, REG_FIFO1THR, FIFO1_THRESHOLD);
+	tiadc_step_config(adc_dev);
 
 	err = tiadc_channel_init(indio_dev, adc_dev->channels);
 	if (err < 0)
 		return err;
 
-	err = tiadc_iio_buffered_hardware_setup(indio_dev,
-		&tiadc_worker_h,
-		&tiadc_irq_h,
-		adc_dev->mfd_tscadc->irq,
-		IRQF_SHARED,
-		&tiadc_buffer_setup_ops);
-
-	if (err)
-		goto err_free_channels;
-
 	err = iio_device_register(indio_dev);
 	if (err)
-		goto err_buffer_unregister;
+		goto err_free_channels;
 
 	platform_set_drvdata(pdev, indio_dev);
 
 	return 0;
 
-err_buffer_unregister:
-	tiadc_iio_buffered_hardware_remove(indio_dev);
 err_free_channels:
 	tiadc_channels_remove(indio_dev);
 	return err;
@@ -454,7 +263,6 @@ static int tiadc_remove(struct platform_device *pdev)
 	u32 step_en;
 
 	iio_device_unregister(indio_dev);
-	tiadc_iio_buffered_hardware_remove(indio_dev);
 	tiadc_channels_remove(indio_dev);
 
 	step_en = get_adc_step_mask(adc_dev);
@@ -493,7 +301,7 @@ static int tiadc_resume(struct device *dev)
 	restore &= ~(CNTRLREG_POWERDOWN);
 	tiadc_writel(adc_dev, REG_CTRL, restore);
 
-	tiadc_step_config(indio_dev);
+	tiadc_step_config(adc_dev);
 
 	return 0;
 }
@@ -518,7 +326,7 @@ static struct platform_driver tiadc_driver = {
 		.name   = "TI-am335x-adc",
 		.owner	= THIS_MODULE,
 		.pm	= TIADC_PM_OPS,
-		.of_match_table = ti_adc_dt_ids,
+		.of_match_table = of_match_ptr(ti_adc_dt_ids),
 	},
 	.probe	= tiadc_probe,
 	.remove	= tiadc_remove,
diff --git a/drivers/iio/adc/twl6030-gpadc.c b/drivers/iio/adc/twl6030-gpadc.c
index 53e1c64..0ea96c0 100644
--- a/drivers/iio/adc/twl6030-gpadc.c
+++ b/drivers/iio/adc/twl6030-gpadc.c
@@ -887,7 +887,7 @@ static int twl6030_gpadc_probe(struct platform_device *pdev)
 	int irq;
 	int ret;
 
-	match = of_match_device(of_twl6030_match_tbl, dev);
+	match = of_match_device(of_match_ptr(of_twl6030_match_tbl), dev);
 	if (!match)
 		return -EINVAL;
 
@@ -948,7 +948,9 @@ static int twl6030_gpadc_probe(struct platform_device *pdev)
 	indio_dev->channels = pdata->iio_channels;
 	indio_dev->num_channels = pdata->nchannels;
 
-	return iio_device_register(indio_dev);
+	ret = iio_device_register(indio_dev);
+
+	return ret;
 }
 
 static int twl6030_gpadc_remove(struct platform_device *pdev)
diff --git a/drivers/iio/buffer_cb.c b/drivers/iio/buffer_cb.c
index 2d9c6f8..415f3c6 100644
--- a/drivers/iio/buffer_cb.c
+++ b/drivers/iio/buffer_cb.c
@@ -7,36 +7,26 @@
 
 struct iio_cb_buffer {
 	struct iio_buffer buffer;
-	int (*cb)(const void *data, void *private);
+	int (*cb)(u8 *data, void *private);
 	void *private;
 	struct iio_channel *channels;
 };
 
-static struct iio_cb_buffer *buffer_to_cb_buffer(struct iio_buffer *buffer)
+static int iio_buffer_cb_store_to(struct iio_buffer *buffer, u8 *data)
 {
-	return container_of(buffer, struct iio_cb_buffer, buffer);
-}
+	struct iio_cb_buffer *cb_buff = container_of(buffer,
+						     struct iio_cb_buffer,
+						     buffer);
 
-static int iio_buffer_cb_store_to(struct iio_buffer *buffer, const void *data)
-{
-	struct iio_cb_buffer *cb_buff = buffer_to_cb_buffer(buffer);
 	return cb_buff->cb(data, cb_buff->private);
 }
 
-static void iio_buffer_cb_release(struct iio_buffer *buffer)
-{
-	struct iio_cb_buffer *cb_buff = buffer_to_cb_buffer(buffer);
-	kfree(cb_buff->buffer.scan_mask);
-	kfree(cb_buff);
-}
-
-static const struct iio_buffer_access_funcs iio_cb_access = {
+static struct iio_buffer_access_funcs iio_cb_access = {
 	.store_to = &iio_buffer_cb_store_to,
-	.release = &iio_buffer_cb_release,
 };
 
 struct iio_cb_buffer *iio_channel_get_all_cb(struct device *dev,
-					     int (*cb)(const void *data,
+					     int (*cb)(u8 *data,
 						       void *private),
 					     void *private)
 {
@@ -114,8 +104,9 @@ EXPORT_SYMBOL_GPL(iio_channel_stop_all_cb);
 
 void iio_channel_release_all_cb(struct iio_cb_buffer *cb_buff)
 {
+	kfree(cb_buff->buffer.scan_mask);
 	iio_channel_release_all(cb_buff->channels);
-	iio_buffer_put(&cb_buff->buffer);
+	kfree(cb_buff);
 }
 EXPORT_SYMBOL_GPL(iio_channel_release_all_cb);
 
diff --git a/drivers/iio/common/hid-sensors/Kconfig b/drivers/iio/common/hid-sensors/Kconfig
index 39188b7..1178121 100644
--- a/drivers/iio/common/hid-sensors/Kconfig
+++ b/drivers/iio/common/hid-sensors/Kconfig
@@ -25,4 +25,13 @@ config HID_SENSOR_IIO_TRIGGER
 	  If this driver is compiled as a module, it will be named
 	  hid-sensor-trigger.
 
+config HID_SENSOR_ENUM_BASE_QUIRKS
+	bool "ENUM base quirks for HID Sensor IIO drivers"
+	depends on HID_SENSOR_IIO_COMMON
+	help
+	  Say yes here to build support for sensor hub FW using
+	  enumeration, which is using 1 as base instead of 0.
+	  Since logical minimum is still set 0 instead of 1,
+	  there is no easy way to differentiate.
+
 endmenu
diff --git a/drivers/iio/common/hid-sensors/hid-sensor-trigger.c b/drivers/iio/common/hid-sensors/hid-sensor-trigger.c
index 7dcf839..87419c4 100644
--- a/drivers/iio/common/hid-sensors/hid-sensor-trigger.c
+++ b/drivers/iio/common/hid-sensors/hid-sensor-trigger.c
@@ -33,42 +33,27 @@ static int hid_sensor_data_rdy_trigger_set_state(struct iio_trigger *trig,
 {
 	struct hid_sensor_common *st = iio_trigger_get_drvdata(trig);
 	int state_val;
-	int report_val;
-
-	if (state) {
-		if (sensor_hub_device_open(st->hsdev))
-			return -EIO;
-		state_val =
-		HID_USAGE_SENSOR_PROP_POWER_STATE_D0_FULL_POWER_ENUM;
-		report_val =
-		HID_USAGE_SENSOR_PROP_REPORTING_STATE_ALL_EVENTS_ENUM;
-
-	} else {
-		sensor_hub_device_close(st->hsdev);
-		state_val =
-		HID_USAGE_SENSOR_PROP_POWER_STATE_D4_POWER_OFF_ENUM;
-		report_val =
-		HID_USAGE_SENSOR_PROP_REPORTING_STATE_NO_EVENTS_ENUM;
-	}
 
+	state_val = state ? 1 : 0;
+	if (IS_ENABLED(CONFIG_HID_SENSOR_ENUM_BASE_QUIRKS))
+		++state_val;
 	st->data_ready = state;
-	state_val += st->power_state.logical_minimum;
-	report_val += st->report_state.logical_minimum;
 	sensor_hub_set_feature(st->hsdev, st->power_state.report_id,
 					st->power_state.index,
 					(s32)state_val);
 
 	sensor_hub_set_feature(st->hsdev, st->report_state.report_id,
 					st->report_state.index,
-					(s32)report_val);
+					(s32)state_val);
 
 	return 0;
 }
 
-void hid_sensor_remove_trigger(struct hid_sensor_common *attrb)
+void hid_sensor_remove_trigger(struct iio_dev *indio_dev)
 {
-	iio_trigger_unregister(attrb->trigger);
-	iio_trigger_free(attrb->trigger);
+	iio_trigger_unregister(indio_dev->trig);
+	iio_trigger_free(indio_dev->trig);
+	indio_dev->trig = NULL;
 }
 EXPORT_SYMBOL(hid_sensor_remove_trigger);
 
@@ -99,7 +84,7 @@ int hid_sensor_setup_trigger(struct iio_dev *indio_dev, const char *name,
 		dev_err(&indio_dev->dev, "Trigger Register Failed\n");
 		goto error_free_trig;
 	}
-	indio_dev->trig = attrb->trigger = trig;
+	indio_dev->trig = trig;
 
 	return ret;
 
diff --git a/drivers/iio/common/hid-sensors/hid-sensor-trigger.h b/drivers/iio/common/hid-sensors/hid-sensor-trigger.h
index ca02f78..9a87314 100644
--- a/drivers/iio/common/hid-sensors/hid-sensor-trigger.h
+++ b/drivers/iio/common/hid-sensors/hid-sensor-trigger.h
@@ -21,6 +21,6 @@
 
 int hid_sensor_setup_trigger(struct iio_dev *indio_dev, const char *name,
 				struct hid_sensor_common *attrb);
-void hid_sensor_remove_trigger(struct hid_sensor_common *attrb);
+void hid_sensor_remove_trigger(struct iio_dev *indio_dev);
 
 #endif
diff --git a/drivers/iio/common/st_sensors/st_sensors_buffer.c b/drivers/iio/common/st_sensors/st_sensors_buffer.c
index 1665c8e..71a2c5f 100644
--- a/drivers/iio/common/st_sensors/st_sensors_buffer.c
+++ b/drivers/iio/common/st_sensors/st_sensors_buffer.c
@@ -113,8 +113,11 @@ irqreturn_t st_sensors_trigger_handler(int irq, void *p)
 	if (len < 0)
 		goto st_sensors_get_buffer_element_error;
 
-	iio_push_to_buffers_with_timestamp(indio_dev, sdata->buffer_data,
-		pf->timestamp);
+	if (indio_dev->scan_timestamp)
+		*(s64 *)((u8 *)sdata->buffer_data +
+				ALIGN(len, sizeof(s64))) = pf->timestamp;
+
+	iio_push_to_buffers(indio_dev, sdata->buffer_data);
 
 st_sensors_get_buffer_element_error:
 	iio_trigger_notify_done(indio_dev->trig);
diff --git a/drivers/iio/common/st_sensors/st_sensors_core.c b/drivers/iio/common/st_sensors/st_sensors_core.c
index 7ba1ef2..965ee22 100644
--- a/drivers/iio/common/st_sensors/st_sensors_core.c
+++ b/drivers/iio/common/st_sensors/st_sensors_core.c
@@ -198,17 +198,21 @@ int st_sensors_set_axis_enable(struct iio_dev *indio_dev, u8 axis_enable)
 }
 EXPORT_SYMBOL(st_sensors_set_axis_enable);
 
-static int st_sensors_set_drdy_int_pin(struct iio_dev *indio_dev,
-				       struct st_sensors_platform_data *pdata)
+int st_sensors_init_sensor(struct iio_dev *indio_dev,
+					struct st_sensors_platform_data *pdata)
 {
+	int err;
 	struct st_sensor_data *sdata = iio_priv(indio_dev);
 
+	mutex_init(&sdata->tb.buf_lock);
+
 	switch (pdata->drdy_int_pin) {
 	case 1:
 		if (sdata->sensor->drdy_irq.mask_int1 == 0) {
 			dev_err(&indio_dev->dev,
 					"DRDY on INT1 not available.\n");
-			return -EINVAL;
+			err = -EINVAL;
+			goto init_error;
 		}
 		sdata->drdy_int_pin = 1;
 		break;
@@ -216,53 +220,39 @@ static int st_sensors_set_drdy_int_pin(struct iio_dev *indio_dev,
 		if (sdata->sensor->drdy_irq.mask_int2 == 0) {
 			dev_err(&indio_dev->dev,
 					"DRDY on INT2 not available.\n");
-			return -EINVAL;
+			err = -EINVAL;
+			goto init_error;
 		}
 		sdata->drdy_int_pin = 2;
 		break;
 	default:
 		dev_err(&indio_dev->dev, "DRDY on pdata not valid.\n");
-		return -EINVAL;
+		err = -EINVAL;
+		goto init_error;
 	}
 
-	return 0;
-}
-
-int st_sensors_init_sensor(struct iio_dev *indio_dev,
-					struct st_sensors_platform_data *pdata)
-{
-	struct st_sensor_data *sdata = iio_priv(indio_dev);
-	int err = 0;
-
-	mutex_init(&sdata->tb.buf_lock);
-
-	if (pdata)
-		err = st_sensors_set_drdy_int_pin(indio_dev, pdata);
-
 	err = st_sensors_set_enable(indio_dev, false);
 	if (err < 0)
-		return err;
+		goto init_error;
 
-	if (sdata->current_fullscale) {
-		err = st_sensors_set_fullscale(indio_dev,
-					       sdata->current_fullscale->num);
-		if (err < 0)
-			return err;
-	} else
-		dev_info(&indio_dev->dev, "Full-scale not possible\n");
+	err = st_sensors_set_fullscale(indio_dev,
+						sdata->current_fullscale->num);
+	if (err < 0)
+		goto init_error;
 
 	err = st_sensors_set_odr(indio_dev, sdata->odr);
 	if (err < 0)
-		return err;
+		goto init_error;
 
 	/* set BDU */
 	err = st_sensors_write_data_with_mask(indio_dev,
 			sdata->sensor->bdu.addr, sdata->sensor->bdu.mask, true);
 	if (err < 0)
-		return err;
+		goto init_error;
 
 	err = st_sensors_set_axis_enable(indio_dev, ST_SENSORS_ENABLE_ALL_AXIS);
 
+init_error:
 	return err;
 }
 EXPORT_SYMBOL(st_sensors_init_sensor);
@@ -273,9 +263,6 @@ int st_sensors_set_dataready_irq(struct iio_dev *indio_dev, bool enable)
 	u8 drdy_mask;
 	struct st_sensor_data *sdata = iio_priv(indio_dev);
 
-	if (!sdata->sensor->drdy_irq.addr)
-		return 0;
-
 	/* Enable/Disable the interrupt generator 1. */
 	if (sdata->sensor->drdy_irq.ig1.en_addr > 0) {
 		err = st_sensors_write_data_with_mask(indio_dev,
@@ -331,8 +318,10 @@ static int st_sensors_read_axis_data(struct iio_dev *indio_dev,
 	unsigned int byte_for_channel = ch->scan_type.storagebits >> 3;
 
 	outdata = kmalloc(byte_for_channel, GFP_KERNEL);
-	if (!outdata)
-		return -ENOMEM;
+	if (!outdata) {
+		err = -EINVAL;
+		goto st_sensors_read_axis_data_error;
+	}
 
 	err = sdata->tf->read_multiple_byte(&sdata->tb, sdata->dev,
 				ch->address, byte_for_channel,
@@ -347,7 +336,7 @@ static int st_sensors_read_axis_data(struct iio_dev *indio_dev,
 
 st_sensors_free_memory:
 	kfree(outdata);
-
+st_sensors_read_axis_data_error:
 	return err;
 }
 
@@ -360,25 +349,28 @@ int st_sensors_read_info_raw(struct iio_dev *indio_dev,
 	mutex_lock(&indio_dev->mlock);
 	if (indio_dev->currentmode == INDIO_BUFFER_TRIGGERED) {
 		err = -EBUSY;
-		goto out;
+		goto read_error;
 	} else {
 		err = st_sensors_set_enable(indio_dev, true);
 		if (err < 0)
-			goto out;
+			goto read_error;
 
 		msleep((sdata->sensor->bootime * 1000) / sdata->odr);
 		err = st_sensors_read_axis_data(indio_dev, ch, val);
 		if (err < 0)
-			goto out;
+			goto read_error;
 
 		*val = *val >> ch->scan_type.shift;
 
 		err = st_sensors_set_enable(indio_dev, false);
 	}
-out:
 	mutex_unlock(&indio_dev->mlock);
 
 	return err;
+
+read_error:
+	mutex_unlock(&indio_dev->mlock);
+	return err;
 }
 EXPORT_SYMBOL(st_sensors_read_info_raw);
 
diff --git a/drivers/iio/dac/Kconfig b/drivers/iio/dac/Kconfig
index f378ca8..3c6a78a 100644
--- a/drivers/iio/dac/Kconfig
+++ b/drivers/iio/dac/Kconfig
@@ -57,7 +57,7 @@ config AD5446
 	  Say yes here to build support for Analog Devices AD5300, AD5301, AD5310,
 	  AD5311, AD5320, AD5321, AD5444, AD5446, AD5450, AD5451, AD5452, AD5453,
 	  AD5512A, AD5541A, AD5542A, AD5543, AD5553, AD5601, AD5602, AD5611, AD5612,
-	  AD5620, AD5621, AD5622, AD5640, AD5641, AD5660, AD5662 DACs.
+	  AD5620, AD5621, AD5622, AD5640, AD5660, AD5662 DACs.
 
 	  To compile this driver as a module, choose M here: the
 	  module will be called ad5446.
diff --git a/drivers/iio/dac/ad5064.c b/drivers/iio/dac/ad5064.c
index cb9c636..a3a52be 100644
--- a/drivers/iio/dac/ad5064.c
+++ b/drivers/iio/dac/ad5064.c
@@ -239,9 +239,10 @@ static int ad5064_read_raw(struct iio_dev *indio_dev,
 		if (scale_uv < 0)
 			return scale_uv;
 
-		*val = scale_uv / 1000;
-		*val2 = chan->scan_type.realbits;
-		return IIO_VAL_FRACTIONAL_LOG2;
+		scale_uv = (scale_uv * 100) >> chan->scan_type.realbits;
+		*val =  scale_uv / 100000;
+		*val2 = (scale_uv % 100000) * 10;
+		return IIO_VAL_INT_PLUS_MICRO;
 	default:
 		break;
 	}
@@ -284,9 +285,8 @@ static const struct iio_chan_spec_ext_info ad5064_ext_info[] = {
 		.name = "powerdown",
 		.read = ad5064_read_dac_powerdown,
 		.write = ad5064_write_dac_powerdown,
-		.shared = IIO_SEPARATE,
 	},
-	IIO_ENUM("powerdown_mode", IIO_SEPARATE, &ad5064_powerdown_mode_enum),
+	IIO_ENUM("powerdown_mode", false, &ad5064_powerdown_mode_enum),
 	IIO_ENUM_AVAILABLE("powerdown_mode", &ad5064_powerdown_mode_enum),
 	{ },
 };
diff --git a/drivers/iio/dac/ad5360.c b/drivers/iio/dac/ad5360.c
index b968af5..d2da71e 100644
--- a/drivers/iio/dac/ad5360.c
+++ b/drivers/iio/dac/ad5360.c
@@ -379,14 +379,15 @@ static int ad5360_read_raw(struct iio_dev *indio_dev,
 		*val = ret >> chan->scan_type.shift;
 		return IIO_VAL_INT;
 	case IIO_CHAN_INFO_SCALE:
-		scale_uv = ad5360_get_channel_vref(st, chan->channel);
+		/* vout = 4 * vref * dac_code */
+		scale_uv = ad5360_get_channel_vref(st, chan->channel) * 4 * 100;
 		if (scale_uv < 0)
 			return scale_uv;
 
-		/* vout = 4 * vref * dac_code */
-		*val = scale_uv * 4 / 1000;
-		*val2 = chan->scan_type.realbits;
-		return IIO_VAL_FRACTIONAL_LOG2;
+		scale_uv >>= (chan->scan_type.realbits);
+		*val =  scale_uv / 100000;
+		*val2 = (scale_uv % 100000) * 10;
+		return IIO_VAL_INT_PLUS_MICRO;
 	case IIO_CHAN_INFO_CALIBBIAS:
 		ret = ad5360_read(indio_dev, AD5360_READBACK_OFFSET,
 			chan->address);
diff --git a/drivers/iio/dac/ad5380.c b/drivers/iio/dac/ad5380.c
index a59ff0e..1c44ae3 100644
--- a/drivers/iio/dac/ad5380.c
+++ b/drivers/iio/dac/ad5380.c
@@ -204,6 +204,7 @@ static int ad5380_read_raw(struct iio_dev *indio_dev,
 	struct iio_chan_spec const *chan, int *val, int *val2, long info)
 {
 	struct ad5380_state *st = iio_priv(indio_dev);
+	unsigned long scale_uv;
 	int ret;
 
 	switch (info) {
@@ -224,9 +225,10 @@ static int ad5380_read_raw(struct iio_dev *indio_dev,
 		val -= (1 << chan->scan_type.realbits) / 2;
 		return IIO_VAL_INT;
 	case IIO_CHAN_INFO_SCALE:
-		*val = 2 * st->vref;
-		*val2 = chan->scan_type.realbits;
-		return IIO_VAL_FRACTIONAL_LOG2;
+		scale_uv = ((2 * st->vref) >> chan->scan_type.realbits) * 100;
+		*val =  scale_uv / 100000;
+		*val2 = (scale_uv % 100000) * 10;
+		return IIO_VAL_INT_PLUS_MICRO;
 	default:
 		break;
 	}
@@ -245,10 +247,8 @@ static struct iio_chan_spec_ext_info ad5380_ext_info[] = {
 		.name = "powerdown",
 		.read = ad5380_read_dac_powerdown,
 		.write = ad5380_write_dac_powerdown,
-		.shared = IIO_SEPARATE,
 	},
-	IIO_ENUM("powerdown_mode", IIO_SHARED_BY_TYPE,
-		 &ad5380_powerdown_mode_enum),
+	IIO_ENUM("powerdown_mode", true, &ad5380_powerdown_mode_enum),
 	IIO_ENUM_AVAILABLE("powerdown_mode", &ad5380_powerdown_mode_enum),
 	{ },
 };
@@ -269,72 +269,72 @@ static const struct ad5380_chip_info ad5380_chip_info_tbl[] = {
 	[ID_AD5380_3] = {
 		.channel_template = AD5380_CHANNEL(14),
 		.num_channels = 40,
-		.int_vref = 1250,
+		.int_vref = 1250000,
 	},
 	[ID_AD5380_5] = {
 		.channel_template = AD5380_CHANNEL(14),
 		.num_channels = 40,
-		.int_vref = 2500,
+		.int_vref = 2500000,
 	},
 	[ID_AD5381_3] = {
 		.channel_template = AD5380_CHANNEL(12),
 		.num_channels = 16,
-		.int_vref = 1250,
+		.int_vref = 1250000,
 	},
 	[ID_AD5381_5] = {
 		.channel_template = AD5380_CHANNEL(12),
 		.num_channels = 16,
-		.int_vref = 2500,
+		.int_vref = 2500000,
 	},
 	[ID_AD5382_3] = {
 		.channel_template = AD5380_CHANNEL(14),
 		.num_channels = 32,
-		.int_vref = 1250,
+		.int_vref = 1250000,
 	},
 	[ID_AD5382_5] = {
 		.channel_template = AD5380_CHANNEL(14),
 		.num_channels = 32,
-		.int_vref = 2500,
+		.int_vref = 2500000,
 	},
 	[ID_AD5383_3] = {
 		.channel_template = AD5380_CHANNEL(12),
 		.num_channels = 32,
-		.int_vref = 1250,
+		.int_vref = 1250000,
 	},
 	[ID_AD5383_5] = {
 		.channel_template = AD5380_CHANNEL(12),
 		.num_channels = 32,
-		.int_vref = 2500,
+		.int_vref = 2500000,
 	},
 	[ID_AD5390_3] = {
 		.channel_template = AD5380_CHANNEL(14),
 		.num_channels = 16,
-		.int_vref = 1250,
+		.int_vref = 1250000,
 	},
 	[ID_AD5390_5] = {
 		.channel_template = AD5380_CHANNEL(14),
 		.num_channels = 16,
-		.int_vref = 2500,
+		.int_vref = 2500000,
 	},
 	[ID_AD5391_3] = {
 		.channel_template = AD5380_CHANNEL(12),
 		.num_channels = 16,
-		.int_vref = 1250,
+		.int_vref = 1250000,
 	},
 	[ID_AD5391_5] = {
 		.channel_template = AD5380_CHANNEL(12),
 		.num_channels = 16,
-		.int_vref = 2500,
+		.int_vref = 2500000,
 	},
 	[ID_AD5392_3] = {
 		.channel_template = AD5380_CHANNEL(14),
 		.num_channels = 8,
-		.int_vref = 1250,
+		.int_vref = 1250000,
 	},
 	[ID_AD5392_5] = {
 		.channel_template = AD5380_CHANNEL(14),
 		.num_channels = 8,
-		.int_vref = 2500,
+		.int_vref = 2500000,
 	},
 };
 
@@ -393,7 +393,7 @@ static int ad5380_probe(struct device *dev, struct regmap *regmap,
 		return ret;
 	}
 
-	if (st->chip_info->int_vref == 2500)
+	if (st->chip_info->int_vref == 2500000)
 		ctrl |= AD5380_CTRL_INT_VREF_2V5;
 
 	st->vref_reg = devm_regulator_get(dev, "vref");
@@ -409,7 +409,7 @@ static int ad5380_probe(struct device *dev, struct regmap *regmap,
 		if (ret < 0)
 			goto error_disable_reg;
 
-		st->vref = ret / 1000;
+		st->vref = ret;
 	} else {
 		st->vref = st->chip_info->int_vref;
 		ctrl |= AD5380_CTRL_INT_VREF_EN;
diff --git a/drivers/iio/dac/ad5421.c b/drivers/iio/dac/ad5421.c
index 3eeaa82..1f78b14 100644
--- a/drivers/iio/dac/ad5421.c
+++ b/drivers/iio/dac/ad5421.c
@@ -80,29 +80,6 @@ struct ad5421_state {
 	} data[2] ____cacheline_aligned;
 };
 
-static const struct iio_event_spec ad5421_current_event[] = {
-	{
-		.type = IIO_EV_TYPE_THRESH,
-		.dir = IIO_EV_DIR_RISING,
-		.mask_separate = BIT(IIO_EV_INFO_VALUE) |
-			BIT(IIO_EV_INFO_ENABLE),
-	}, {
-		.type = IIO_EV_TYPE_THRESH,
-		.dir = IIO_EV_DIR_FALLING,
-		.mask_separate = BIT(IIO_EV_INFO_VALUE) |
-			BIT(IIO_EV_INFO_ENABLE),
-	},
-};
-
-static const struct iio_event_spec ad5421_temp_event[] = {
-	{
-		.type = IIO_EV_TYPE_THRESH,
-		.dir = IIO_EV_DIR_RISING,
-		.mask_separate = BIT(IIO_EV_INFO_VALUE) |
-			BIT(IIO_EV_INFO_ENABLE),
-	},
-};
-
 static const struct iio_chan_spec ad5421_channels[] = {
 	{
 		.type = IIO_CURRENT,
@@ -115,14 +92,13 @@ static const struct iio_chan_spec ad5421_channels[] = {
 		.info_mask_shared_by_type = BIT(IIO_CHAN_INFO_SCALE) |
 			BIT(IIO_CHAN_INFO_OFFSET),
 		.scan_type = IIO_ST('u', 16, 16, 0),
-		.event_spec = ad5421_current_event,
-		.num_event_specs = ARRAY_SIZE(ad5421_current_event),
+		.event_mask = IIO_EV_BIT(IIO_EV_TYPE_THRESH, IIO_EV_DIR_RISING) |
+			IIO_EV_BIT(IIO_EV_TYPE_THRESH, IIO_EV_DIR_FALLING),
 	},
 	{
 		.type = IIO_TEMP,
 		.channel = -1,
-		.event_spec = ad5421_temp_event,
-		.num_event_specs = ARRAY_SIZE(ad5421_temp_event),
+		.event_mask = IIO_EV_BIT(IIO_EV_TYPE_THRESH, IIO_EV_DIR_RISING),
 	},
 };
 
@@ -305,11 +281,18 @@ static inline unsigned int ad5421_get_offset(struct ad5421_state *st)
 	return (min * (1 << 16)) / (max - min);
 }
 
+static inline unsigned int ad5421_get_scale(struct ad5421_state *st)
+{
+	unsigned int min, max;
+
+	ad5421_get_current_min_max(st, &min, &max);
+	return ((max - min) * 1000) / (1 << 16);
+}
+
 static int ad5421_read_raw(struct iio_dev *indio_dev,
 	struct iio_chan_spec const *chan, int *val, int *val2, long m)
 {
 	struct ad5421_state *st = iio_priv(indio_dev);
-	unsigned int min, max;
 	int ret;
 
 	if (chan->type != IIO_CURRENT)
@@ -323,10 +306,9 @@ static int ad5421_read_raw(struct iio_dev *indio_dev,
 		*val = ret;
 		return IIO_VAL_INT;
 	case IIO_CHAN_INFO_SCALE:
-		ad5421_get_current_min_max(st, &min, &max);
-		*val = max - min;
-		*val2 = (1 << 16) * 1000;
-		return IIO_VAL_FRACTIONAL;
+		*val = 0;
+		*val2 = ad5421_get_scale(st);
+		return IIO_VAL_INT_PLUS_MICRO;
 	case IIO_CHAN_INFO_OFFSET:
 		*val = ad5421_get_offset(st);
 		return IIO_VAL_INT;
@@ -377,15 +359,15 @@ static int ad5421_write_raw(struct iio_dev *indio_dev,
 }
 
 static int ad5421_write_event_config(struct iio_dev *indio_dev,
-	const struct iio_chan_spec *chan, enum iio_event_type type,
-	enum iio_event_direction dir, int state)
+	u64 event_code, int state)
 {
 	struct ad5421_state *st = iio_priv(indio_dev);
 	unsigned int mask;
 
-	switch (chan->type) {
+	switch (IIO_EVENT_CODE_EXTRACT_CHAN_TYPE(event_code)) {
 	case IIO_CURRENT:
-		if (dir == IIO_EV_DIR_RISING)
+		if (IIO_EVENT_CODE_EXTRACT_DIR(event_code) ==
+			IIO_EV_DIR_RISING)
 			mask = AD5421_FAULT_OVER_CURRENT;
 		else
 			mask = AD5421_FAULT_UNDER_CURRENT;
@@ -408,15 +390,15 @@ static int ad5421_write_event_config(struct iio_dev *indio_dev,
 }
 
 static int ad5421_read_event_config(struct iio_dev *indio_dev,
-	const struct iio_chan_spec *chan, enum iio_event_type type,
-	enum iio_event_direction dir)
+	u64 event_code)
 {
 	struct ad5421_state *st = iio_priv(indio_dev);
 	unsigned int mask;
 
-	switch (chan->type) {
+	switch (IIO_EVENT_CODE_EXTRACT_CHAN_TYPE(event_code)) {
 	case IIO_CURRENT:
-		if (dir == IIO_EV_DIR_RISING)
+		if (IIO_EVENT_CODE_EXTRACT_DIR(event_code) ==
+			IIO_EV_DIR_RISING)
 			mask = AD5421_FAULT_OVER_CURRENT;
 		else
 			mask = AD5421_FAULT_UNDER_CURRENT;
@@ -431,14 +413,12 @@ static int ad5421_read_event_config(struct iio_dev *indio_dev,
 	return (bool)(st->fault_mask & mask);
 }
 
-static int ad5421_read_event_value(struct iio_dev *indio_dev,
-	const struct iio_chan_spec *chan, enum iio_event_type type,
-	enum iio_event_direction dir, enum iio_event_info info, int *val,
-	int *val2)
+static int ad5421_read_event_value(struct iio_dev *indio_dev, u64 event_code,
+	int *val)
 {
 	int ret;
 
-	switch (chan->type) {
+	switch (IIO_EVENT_CODE_EXTRACT_CHAN_TYPE(event_code)) {
 	case IIO_CURRENT:
 		ret = ad5421_read(indio_dev, AD5421_REG_DAC_DATA);
 		if (ret < 0)
@@ -452,15 +432,15 @@ static int ad5421_read_event_value(struct iio_dev *indio_dev,
 		return -EINVAL;
 	}
 
-	return IIO_VAL_INT;
+	return 0;
 }
 
 static const struct iio_info ad5421_info = {
 	.read_raw =		ad5421_read_raw,
 	.write_raw =		ad5421_write_raw,
-	.read_event_config_new = ad5421_read_event_config,
-	.write_event_config_new = ad5421_write_event_config,
-	.read_event_value_new =	ad5421_read_event_value,
+	.read_event_config =	ad5421_read_event_config,
+	.write_event_config =	ad5421_write_event_config,
+	.read_event_value =	ad5421_read_event_value,
 	.driver_module =	THIS_MODULE,
 };
 
@@ -514,7 +494,13 @@ static int ad5421_probe(struct spi_device *spi)
 			return ret;
 	}
 
-	return iio_device_register(indio_dev);
+	ret = iio_device_register(indio_dev);
+	if (ret) {
+		dev_err(&spi->dev, "Failed to register iio device: %d\n", ret);
+		return ret;
+	}
+
+	return 0;
 }
 
 static int ad5421_remove(struct spi_device *spi)
diff --git a/drivers/iio/dac/ad5446.c b/drivers/iio/dac/ad5446.c
index 1263b0e..96e9ed4 100644
--- a/drivers/iio/dac/ad5446.c
+++ b/drivers/iio/dac/ad5446.c
@@ -132,9 +132,8 @@ static const struct iio_chan_spec_ext_info ad5446_ext_info_powerdown[] = {
 		.name = "powerdown",
 		.read = ad5446_read_dac_powerdown,
 		.write = ad5446_write_dac_powerdown,
-		.shared = IIO_SEPARATE,
 	},
-	IIO_ENUM("powerdown_mode", IIO_SEPARATE, &ad5446_powerdown_mode_enum),
+	IIO_ENUM("powerdown_mode", false, &ad5446_powerdown_mode_enum),
 	IIO_ENUM_AVAILABLE("powerdown_mode", &ad5446_powerdown_mode_enum),
 	{ },
 };
@@ -163,15 +162,18 @@ static int ad5446_read_raw(struct iio_dev *indio_dev,
 			   long m)
 {
 	struct ad5446_state *st = iio_priv(indio_dev);
+	unsigned long scale_uv;
 
 	switch (m) {
 	case IIO_CHAN_INFO_RAW:
 		*val = st->cached_val;
 		return IIO_VAL_INT;
 	case IIO_CHAN_INFO_SCALE:
-		*val = st->vref_mv;
-		*val2 = chan->scan_type.realbits;
-		return IIO_VAL_FRACTIONAL_LOG2;
+		scale_uv = (st->vref_mv * 1000) >> chan->scan_type.realbits;
+		*val =  scale_uv / 1000;
+		*val2 = (scale_uv % 1000) * 1000;
+		return IIO_VAL_INT_PLUS_MICRO;
+
 	}
 	return -EINVAL;
 }
@@ -327,7 +329,6 @@ enum ad5446_supported_spi_device_ids {
 	ID_AD5601,
 	ID_AD5611,
 	ID_AD5621,
-	ID_AD5641,
 	ID_AD5620_2500,
 	ID_AD5620_1250,
 	ID_AD5640_2500,
@@ -390,10 +391,6 @@ static const struct ad5446_chip_info ad5446_spi_chip_info[] = {
 		.channel = AD5446_CHANNEL_POWERDOWN(12, 16, 2),
 		.write = ad5446_write,
 	},
-	[ID_AD5641] = {
-		.channel = AD5446_CHANNEL_POWERDOWN(14, 16, 0),
-		.write = ad5446_write,
-	},
 	[ID_AD5620_2500] = {
 		.channel = AD5446_CHANNEL_POWERDOWN(12, 16, 2),
 		.int_vref_mv = 2500,
@@ -448,7 +445,6 @@ static const struct spi_device_id ad5446_spi_ids[] = {
 	{"ad5601", ID_AD5601},
 	{"ad5611", ID_AD5611},
 	{"ad5621", ID_AD5621},
-	{"ad5641", ID_AD5641},
 	{"ad5620-2500", ID_AD5620_2500}, /* AD5620/40/60: */
 	{"ad5620-1250", ID_AD5620_1250}, /* part numbers may look differently */
 	{"ad5640-2500", ID_AD5640_2500},
diff --git a/drivers/iio/dac/ad5449.c b/drivers/iio/dac/ad5449.c
index 82e208f..fff7d07 100644
--- a/drivers/iio/dac/ad5449.c
+++ b/drivers/iio/dac/ad5449.c
@@ -101,6 +101,7 @@ static int ad5449_read(struct iio_dev *indio_dev, unsigned int addr,
 {
 	struct ad5449 *st = iio_priv(indio_dev);
 	int ret;
+	struct spi_message msg;
 	struct spi_transfer t[] = {
 		{
 			.tx_buf = &st->data[0],
@@ -113,11 +114,15 @@ static int ad5449_read(struct iio_dev *indio_dev, unsigned int addr,
 		},
 	};
 
+	spi_message_init(&msg);
+	spi_message_add_tail(&t[0], &msg);
+	spi_message_add_tail(&t[1], &msg);
+
 	mutex_lock(&indio_dev->mlock);
 	st->data[0] = cpu_to_be16(addr << 12);
 	st->data[1] = cpu_to_be16(AD5449_CMD_NOOP);
 
-	ret = spi_sync_transfer(st->spi, t, ARRAY_SIZE(t));
+	ret = spi_sync(st->spi, &msg);
 	if (ret < 0)
 		goto out_unlock;
 
diff --git a/drivers/iio/dac/ad5504.c b/drivers/iio/dac/ad5504.c
index c0957a9..caffb16 100644
--- a/drivers/iio/dac/ad5504.c
+++ b/drivers/iio/dac/ad5504.c
@@ -100,6 +100,7 @@ static int ad5504_read_raw(struct iio_dev *indio_dev,
 			   long m)
 {
 	struct ad5504_state *st = iio_priv(indio_dev);
+	unsigned long scale_uv;
 	int ret;
 
 	switch (m) {
@@ -112,9 +113,11 @@ static int ad5504_read_raw(struct iio_dev *indio_dev,
 
 		return IIO_VAL_INT;
 	case IIO_CHAN_INFO_SCALE:
-		*val = st->vref_mv;
-		*val2 = chan->scan_type.realbits;
-		return IIO_VAL_FRACTIONAL_LOG2;
+		scale_uv = (st->vref_mv * 1000) >> chan->scan_type.realbits;
+		*val =  scale_uv / 1000;
+		*val2 = (scale_uv % 1000) * 1000;
+		return IIO_VAL_INT_PLUS_MICRO;
+
 	}
 	return -EINVAL;
 }
@@ -245,10 +248,8 @@ static const struct iio_chan_spec_ext_info ad5504_ext_info[] = {
 		.name = "powerdown",
 		.read = ad5504_read_dac_powerdown,
 		.write = ad5504_write_dac_powerdown,
-		.shared = IIO_SEPARATE,
 	},
-	IIO_ENUM("powerdown_mode", IIO_SHARED_BY_TYPE,
-		 &ad5504_powerdown_mode_enum),
+	IIO_ENUM("powerdown_mode", true, &ad5504_powerdown_mode_enum),
 	IIO_ENUM_AVAILABLE("powerdown_mode", &ad5504_powerdown_mode_enum),
 	{ },
 };
diff --git a/drivers/iio/dac/ad5624r_spi.c b/drivers/iio/dac/ad5624r_spi.c
index 774dd96..714af75 100644
--- a/drivers/iio/dac/ad5624r_spi.c
+++ b/drivers/iio/dac/ad5624r_spi.c
@@ -50,12 +50,15 @@ static int ad5624r_read_raw(struct iio_dev *indio_dev,
 			   long m)
 {
 	struct ad5624r_state *st = iio_priv(indio_dev);
+	unsigned long scale_uv;
 
 	switch (m) {
 	case IIO_CHAN_INFO_SCALE:
-		*val = st->vref_mv;
-		*val2 = chan->scan_type.realbits;
-		return IIO_VAL_FRACTIONAL_LOG2;
+		scale_uv = (st->vref_mv * 1000) >> chan->scan_type.realbits;
+		*val =  scale_uv / 1000;
+		*val2 = (scale_uv % 1000) * 1000;
+		return IIO_VAL_INT_PLUS_MICRO;
+
 	}
 	return -EINVAL;
 }
@@ -160,10 +163,8 @@ static const struct iio_chan_spec_ext_info ad5624r_ext_info[] = {
 		.name = "powerdown",
 		.read = ad5624r_read_dac_powerdown,
 		.write = ad5624r_write_dac_powerdown,
-		.shared = IIO_SEPARATE,
 	},
-	IIO_ENUM("powerdown_mode", IIO_SHARED_BY_TYPE,
-		 &ad5624r_powerdown_mode_enum),
+	IIO_ENUM("powerdown_mode", true, &ad5624r_powerdown_mode_enum),
 	IIO_ENUM_AVAILABLE("powerdown_mode", &ad5624r_powerdown_mode_enum),
 	{ },
 };
diff --git a/drivers/iio/dac/ad5686.c b/drivers/iio/dac/ad5686.c
index 30e506e..57825ea 100644
--- a/drivers/iio/dac/ad5686.c
+++ b/drivers/iio/dac/ad5686.c
@@ -201,6 +201,7 @@ static int ad5686_read_raw(struct iio_dev *indio_dev,
 			   long m)
 {
 	struct ad5686_state *st = iio_priv(indio_dev);
+	unsigned long scale_uv;
 	int ret;
 
 	switch (m) {
@@ -212,10 +213,14 @@ static int ad5686_read_raw(struct iio_dev *indio_dev,
 			return ret;
 		*val = ret;
 		return IIO_VAL_INT;
+		break;
 	case IIO_CHAN_INFO_SCALE:
-		*val = st->vref_mv;
-		*val2 = chan->scan_type.realbits;
-		return IIO_VAL_FRACTIONAL_LOG2;
+		scale_uv = (st->vref_mv * 100000)
+			>> (chan->scan_type.realbits);
+		*val =  scale_uv / 100000;
+		*val2 = (scale_uv % 100000) * 10;
+		return IIO_VAL_INT_PLUS_MICRO;
+
 	}
 	return -EINVAL;
 }
@@ -260,9 +265,8 @@ static const struct iio_chan_spec_ext_info ad5686_ext_info[] = {
 		.name = "powerdown",
 		.read = ad5686_read_dac_powerdown,
 		.write = ad5686_write_dac_powerdown,
-		.shared = IIO_SEPARATE,
 	},
-	IIO_ENUM("powerdown_mode", IIO_SEPARATE, &ad5686_powerdown_mode_enum),
+	IIO_ENUM("powerdown_mode", false, &ad5686_powerdown_mode_enum),
 	IIO_ENUM_AVAILABLE("powerdown_mode", &ad5686_powerdown_mode_enum),
 	{ },
 };
diff --git a/drivers/iio/dac/ad5755.c b/drivers/iio/dac/ad5755.c
index 9a78d5a..36a4361 100644
--- a/drivers/iio/dac/ad5755.c
+++ b/drivers/iio/dac/ad5755.c
@@ -253,6 +253,15 @@ static inline int ad5755_get_offset(struct ad5755_state *st,
 	return (min * (1 << chan->scan_type.realbits)) / (max - min);
 }
 
+static inline int ad5755_get_scale(struct ad5755_state *st,
+	struct iio_chan_spec const *chan)
+{
+	int min, max;
+
+	ad5755_get_min_max(st, chan, &min, &max);
+	return ((max - min) * 1000000000ULL) >> chan->scan_type.realbits;
+}
+
 static int ad5755_chan_reg_info(struct ad5755_state *st,
 	struct iio_chan_spec const *chan, long info, bool write,
 	unsigned int *reg, unsigned int *shift, unsigned int *offset)
@@ -294,15 +303,13 @@ static int ad5755_read_raw(struct iio_dev *indio_dev,
 {
 	struct ad5755_state *st = iio_priv(indio_dev);
 	unsigned int reg, shift, offset;
-	int min, max;
 	int ret;
 
 	switch (info) {
 	case IIO_CHAN_INFO_SCALE:
-		ad5755_get_min_max(st, chan, &min, &max);
-		*val = max - min;
-		*val2 = chan->scan_type.realbits;
-		return IIO_VAL_FRACTIONAL_LOG2;
+		*val = 0;
+		*val2 = ad5755_get_scale(st, chan);
+		return IIO_VAL_INT_PLUS_NANO;
 	case IIO_CHAN_INFO_OFFSET:
 		*val = ad5755_get_offset(st, chan);
 		return IIO_VAL_INT;
@@ -379,7 +386,6 @@ static const struct iio_chan_spec_ext_info ad5755_ext_info[] = {
 		.name = "powerdown",
 		.read = ad5755_read_powerdown,
 		.write = ad5755_write_powerdown,
-		.shared = IIO_SEPARATE,
 	},
 	{ },
 };
@@ -589,7 +595,13 @@ static int ad5755_probe(struct spi_device *spi)
 	if (ret)
 		return ret;
 
-	return iio_device_register(indio_dev);
+	ret = iio_device_register(indio_dev);
+	if (ret) {
+		dev_err(&spi->dev, "Failed to register iio device: %d\n", ret);
+		return ret;
+	}
+
+	return 0;
 }
 
 static int ad5755_remove(struct spi_device *spi)
diff --git a/drivers/iio/dac/ad5764.c b/drivers/iio/dac/ad5764.c
index a8ff5b2..df7e028 100644
--- a/drivers/iio/dac/ad5764.c
+++ b/drivers/iio/dac/ad5764.c
@@ -217,6 +217,7 @@ static int ad5764_read_raw(struct iio_dev *indio_dev,
 	struct iio_chan_spec const *chan, int *val, int *val2, long info)
 {
 	struct ad5764_state *st = iio_priv(indio_dev);
+	unsigned long scale_uv;
 	unsigned int reg;
 	int vref;
 	int ret;
@@ -244,14 +245,15 @@ static int ad5764_read_raw(struct iio_dev *indio_dev,
 		*val = sign_extend32(*val, 5);
 		return IIO_VAL_INT;
 	case IIO_CHAN_INFO_SCALE:
-		/* vout = 4 * vref + ((dac_code / 65536) - 0.5) */
+		/* vout = 4 * vref + ((dac_code / 65535) - 0.5) */
 		vref = ad5764_get_channel_vref(st, chan->channel);
 		if (vref < 0)
 			return vref;
 
-		*val = vref * 4 / 1000;
-		*val2 = chan->scan_type.realbits;
-		return IIO_VAL_FRACTIONAL_LOG2;
+		scale_uv = (vref * 4 * 100) >> chan->scan_type.realbits;
+		*val = scale_uv / 100000;
+		*val2 = (scale_uv % 100000) * 10;
+		return IIO_VAL_INT_PLUS_MICRO;
 	case IIO_CHAN_INFO_OFFSET:
 		*val = -(1 << chan->scan_type.realbits) / 2;
 		return IIO_VAL_INT;
diff --git a/drivers/iio/dac/ad5791.c b/drivers/iio/dac/ad5791.c
index d64acbd..ce74589 100644
--- a/drivers/iio/dac/ad5791.c
+++ b/drivers/iio/dac/ad5791.c
@@ -270,9 +270,9 @@ static int ad5791_read_raw(struct iio_dev *indio_dev,
 		*val >>= chan->scan_type.shift;
 		return IIO_VAL_INT;
 	case IIO_CHAN_INFO_SCALE:
-		*val = st->vref_mv;
-		*val2 = (1 << chan->scan_type.realbits) - 1;
-		return IIO_VAL_FRACTIONAL;
+		*val = 0;
+		*val2 = (((u64)st->vref_mv) * 1000000ULL) >> chan->scan_type.realbits;
+		return IIO_VAL_INT_PLUS_MICRO;
 	case IIO_CHAN_INFO_OFFSET:
 		val64 = (((u64)st->vref_neg_mv) << chan->scan_type.realbits);
 		do_div(val64, st->vref_mv);
@@ -287,12 +287,11 @@ static int ad5791_read_raw(struct iio_dev *indio_dev,
 static const struct iio_chan_spec_ext_info ad5791_ext_info[] = {
 	{
 		.name = "powerdown",
-		.shared = IIO_SHARED_BY_TYPE,
+		.shared = true,
 		.read = ad5791_read_dac_powerdown,
 		.write = ad5791_write_dac_powerdown,
 	},
-	IIO_ENUM("powerdown_mode", IIO_SHARED_BY_TYPE,
-		 &ad5791_powerdown_mode_enum),
+	IIO_ENUM("powerdown_mode", true, &ad5791_powerdown_mode_enum),
 	IIO_ENUM_AVAILABLE("powerdown_mode", &ad5791_powerdown_mode_enum),
 	{ },
 };
diff --git a/drivers/iio/dac/ad7303.c b/drivers/iio/dac/ad7303.c
index d0505fd..ed2d276 100644
--- a/drivers/iio/dac/ad7303.c
+++ b/drivers/iio/dac/ad7303.c
@@ -169,7 +169,6 @@ static const struct iio_chan_spec_ext_info ad7303_ext_info[] = {
 		.name = "powerdown",
 		.read = ad7303_read_dac_powerdown,
 		.write = ad7303_write_dac_powerdown,
-		.shared = IIO_SEPARATE,
 	},
 	{ },
 };
diff --git a/drivers/iio/dac/max517.c b/drivers/iio/dac/max517.c
index 6e19035..83adcbf 100644
--- a/drivers/iio/dac/max517.c
+++ b/drivers/iio/dac/max517.c
@@ -82,13 +82,15 @@ static int max517_read_raw(struct iio_dev *indio_dev,
 			   long m)
 {
 	struct max517_data *data = iio_priv(indio_dev);
+	unsigned int scale_uv;
 
 	switch (m) {
 	case IIO_CHAN_INFO_SCALE:
 		/* Corresponds to Vref / 2^(bits) */
-		*val = data->vref_mv[chan->channel];
-		*val2 = 8;
-		return IIO_VAL_FRACTIONAL_LOG2;
+		scale_uv = (data->vref_mv[chan->channel] * 1000) >> 8;
+		*val =  scale_uv / 1000000;
+		*val2 = scale_uv % 1000000;
+		return IIO_VAL_INT_PLUS_MICRO;
 	default:
 		break;
 	}
@@ -160,6 +162,7 @@ static int max517_probe(struct i2c_client *client,
 	struct max517_data *data;
 	struct iio_dev *indio_dev;
 	struct max517_platform_data *platform_data = client->dev.platform_data;
+	int err;
 
 	indio_dev = devm_iio_device_alloc(&client->dev, sizeof(*data));
 	if (!indio_dev)
@@ -191,7 +194,13 @@ static int max517_probe(struct i2c_client *client,
 		data->vref_mv[1] = platform_data->vref_mv[1];
 	}
 
-	return iio_device_register(indio_dev);
+	err = iio_device_register(indio_dev);
+	if (err)
+		return err;
+
+	dev_info(&client->dev, "DAC registered\n");
+
+	return 0;
 }
 
 static int max517_remove(struct i2c_client *client)
diff --git a/drivers/iio/dac/mcp4725.c b/drivers/iio/dac/mcp4725.c
index 9f57ae8..1397b6e 100644
--- a/drivers/iio/dac/mcp4725.c
+++ b/drivers/iio/dac/mcp4725.c
@@ -195,9 +195,8 @@ static const struct iio_chan_spec_ext_info mcp4725_ext_info[] = {
 		.name = "powerdown",
 		.read = mcp4725_read_powerdown,
 		.write = mcp4725_write_powerdown,
-		.shared = IIO_SEPARATE,
 	},
-	IIO_ENUM("powerdown_mode", IIO_SEPARATE, &mcp4725_powerdown_mode_enum),
+	IIO_ENUM("powerdown_mode", false, &mcp4725_powerdown_mode_enum),
 	IIO_ENUM_AVAILABLE("powerdown_mode", &mcp4725_powerdown_mode_enum),
 	{ },
 };
@@ -239,15 +238,17 @@ static int mcp4725_read_raw(struct iio_dev *indio_dev,
 			   int *val, int *val2, long mask)
 {
 	struct mcp4725_data *data = iio_priv(indio_dev);
+	unsigned long scale_uv;
 
 	switch (mask) {
 	case IIO_CHAN_INFO_RAW:
 		*val = data->dac_value;
 		return IIO_VAL_INT;
 	case IIO_CHAN_INFO_SCALE:
-		*val = data->vref_mv;
-		*val2 = 12;
-		return IIO_VAL_FRACTIONAL_LOG2;
+		scale_uv = (data->vref_mv * 1000) >> 12;
+		*val =  scale_uv / 1000000;
+		*val2 = scale_uv % 1000000;
+		return IIO_VAL_INT_PLUS_MICRO;
 	}
 	return -EINVAL;
 }
@@ -320,7 +321,13 @@ static int mcp4725_probe(struct i2c_client *client,
 	data->powerdown_mode = pd ? pd-1 : 2; /* 500kohm_to_gnd */
 	data->dac_value = (inbuf[1] << 4) | (inbuf[2] >> 4);
 
-	return iio_device_register(indio_dev);
+	err = iio_device_register(indio_dev);
+	if (err)
+		return err;
+
+	dev_info(&client->dev, "MCP4725 DAC registered\n");
+
+	return 0;
 }
 
 static int mcp4725_remove(struct i2c_client *client)
diff --git a/drivers/iio/frequency/adf4350.c b/drivers/iio/frequency/adf4350.c
index 63a25d9..52605c0 100644
--- a/drivers/iio/frequency/adf4350.c
+++ b/drivers/iio/frequency/adf4350.c
@@ -351,7 +351,6 @@ static ssize_t adf4350_read(struct iio_dev *indio_dev,
 	.read = adf4350_read, \
 	.write = adf4350_write, \
 	.private = _ident, \
-	.shared = IIO_SEPARATE, \
 }
 
 static const struct iio_chan_spec_ext_info adf4350_ext_info[] = {
diff --git a/drivers/iio/gyro/adis16080.c b/drivers/iio/gyro/adis16080.c
index add5098..e9ec022 100644
--- a/drivers/iio/gyro/adis16080.c
+++ b/drivers/iio/gyro/adis16080.c
@@ -51,6 +51,7 @@ static int adis16080_read_sample(struct iio_dev *indio_dev,
 		u16 addr, int *val)
 {
 	struct adis16080_state *st = iio_priv(indio_dev);
+	struct spi_message m;
 	int ret;
 	struct spi_transfer	t[] = {
 		{
@@ -65,7 +66,11 @@ static int adis16080_read_sample(struct iio_dev *indio_dev,
 
 	st->buf = cpu_to_be16(addr | ADIS16080_DIN_WRITE);
 
-	ret = spi_sync_transfer(st->us, t, ARRAY_SIZE(t));
+	spi_message_init(&m);
+	spi_message_add_tail(&t[0], &m);
+	spi_message_add_tail(&t[1], &m);
+
+	ret = spi_sync(st->us, &m);
 	if (ret == 0)
 		*val = sign_extend32(be16_to_cpu(st->buf), 11);
 
diff --git a/drivers/iio/gyro/adis16130.c b/drivers/iio/gyro/adis16130.c
index 445c2ae..ac66fc1 100644
--- a/drivers/iio/gyro/adis16130.c
+++ b/drivers/iio/gyro/adis16130.c
@@ -47,6 +47,7 @@ static int adis16130_spi_read(struct iio_dev *indio_dev, u8 reg_addr, u32 *val)
 {
 	int ret;
 	struct adis16130_state *st = iio_priv(indio_dev);
+	struct spi_message msg;
 	struct spi_transfer xfer = {
 		.tx_buf = st->buf,
 		.rx_buf = st->buf,
@@ -58,7 +59,10 @@ static int adis16130_spi_read(struct iio_dev *indio_dev, u8 reg_addr, u32 *val)
 	st->buf[0] = ADIS16130_CON_RD | reg_addr;
 	st->buf[1] = st->buf[2] = st->buf[3] = 0;
 
-	ret = spi_sync_transfer(st->us, &xfer, 1);
+	spi_message_init(&msg);
+	spi_message_add_tail(&xfer, &msg);
+	ret = spi_sync(st->us, &msg);
+
 	if (ret == 0)
 		*val = (st->buf[1] << 16) | (st->buf[2] << 8) | st->buf[3];
 	mutex_unlock(&st->buf_lock);
@@ -99,6 +103,7 @@ static int adis16130_read_raw(struct iio_dev *indio_dev,
 		default:
 			return -EINVAL;
 		}
+		break;
 	case IIO_CHAN_INFO_OFFSET:
 		switch (chan->type) {
 		case IIO_ANGL_VEL:
@@ -110,6 +115,7 @@ static int adis16130_read_raw(struct iio_dev *indio_dev,
 		default:
 			return -EINVAL;
 		}
+		break;
 	}
 
 	return -EINVAL;
diff --git a/drivers/iio/gyro/adis16260.c b/drivers/iio/gyro/adis16260.c
index 22b6fb8..0654116 100644
--- a/drivers/iio/gyro/adis16260.c
+++ b/drivers/iio/gyro/adis16260.c
@@ -239,6 +239,7 @@ static int adis16260_read_raw(struct iio_dev *indio_dev,
 		default:
 			return -EINVAL;
 		}
+		break;
 	case IIO_CHAN_INFO_OFFSET:
 		*val = 250000 / 1453; /* 25 C = 0x00 */
 		return IIO_VAL_INT;
diff --git a/drivers/iio/gyro/adxrs450.c b/drivers/iio/gyro/adxrs450.c
index 1e546ba..6dab299 100644
--- a/drivers/iio/gyro/adxrs450.c
+++ b/drivers/iio/gyro/adxrs450.c
@@ -90,6 +90,7 @@ static int adxrs450_spi_read_reg_16(struct iio_dev *indio_dev,
 				    u8 reg_address,
 				    u16 *val)
 {
+	struct spi_message msg;
 	struct adxrs450_state *st = iio_priv(indio_dev);
 	u32 tx;
 	int ret;
@@ -113,7 +114,10 @@ static int adxrs450_spi_read_reg_16(struct iio_dev *indio_dev,
 		tx |= ADXRS450_P;
 
 	st->tx = cpu_to_be32(tx);
-	ret = spi_sync_transfer(st->us, xfers, ARRAY_SIZE(xfers));
+	spi_message_init(&msg);
+	spi_message_add_tail(&xfers[0], &msg);
+	spi_message_add_tail(&xfers[1], &msg);
+	ret = spi_sync(st->us, &msg);
 	if (ret) {
 		dev_err(&st->us->dev, "problem while reading 16 bit register 0x%02x\n",
 				reg_address);
@@ -165,6 +169,7 @@ static int adxrs450_spi_write_reg_16(struct iio_dev *indio_dev,
  **/
 static int adxrs450_spi_sensor_data(struct iio_dev *indio_dev, s16 *val)
 {
+	struct spi_message msg;
 	struct adxrs450_state *st = iio_priv(indio_dev);
 	int ret;
 	struct spi_transfer xfers[] = {
@@ -183,7 +188,10 @@ static int adxrs450_spi_sensor_data(struct iio_dev *indio_dev, s16 *val)
 	mutex_lock(&st->buf_lock);
 	st->tx = cpu_to_be32(ADXRS450_SENSOR_DATA);
 
-	ret = spi_sync_transfer(st->us, xfers, ARRAY_SIZE(xfers));
+	spi_message_init(&msg);
+	spi_message_add_tail(&xfers[0], &msg);
+	spi_message_add_tail(&xfers[1], &msg);
+	ret = spi_sync(st->us, &msg);
 	if (ret) {
 		dev_err(&st->us->dev, "Problem while reading sensor data\n");
 		goto error_ret;
@@ -346,6 +354,7 @@ static int adxrs450_read_raw(struct iio_dev *indio_dev,
 		default:
 			return -EINVAL;
 		}
+		break;
 	case IIO_CHAN_INFO_QUADRATURE_CORRECTION_RAW:
 		ret = adxrs450_spi_read_reg_16(indio_dev, ADXRS450_QUAD1, &t);
 		if (ret)
diff --git a/drivers/iio/gyro/hid-sensor-gyro-3d.c b/drivers/iio/gyro/hid-sensor-gyro-3d.c
index e54f0f4..c688d97 100644
--- a/drivers/iio/gyro/hid-sensor-gyro-3d.c
+++ b/drivers/iio/gyro/hid-sensor-gyro-3d.c
@@ -182,11 +182,10 @@ static const struct iio_info gyro_3d_info = {
 };
 
 /* Function to push data to buffer */
-static void hid_sensor_push_data(struct iio_dev *indio_dev, const void *data,
-	int len)
+static void hid_sensor_push_data(struct iio_dev *indio_dev, u8 *data, int len)
 {
 	dev_dbg(&indio_dev->dev, "hid_sensor_push_data\n");
-	iio_push_to_buffers(indio_dev, data);
+	iio_push_to_buffers(indio_dev, (u8 *)data);
 }
 
 /* Callback handler to send event after all samples are received and captured */
@@ -201,7 +200,7 @@ static int gyro_3d_proc_event(struct hid_sensor_hub_device *hsdev,
 				gyro_state->common_attributes.data_ready);
 	if (gyro_state->common_attributes.data_ready)
 		hid_sensor_push_data(indio_dev,
-				gyro_state->gyro_val,
+				(u8 *)gyro_state->gyro_val,
 				sizeof(gyro_state->gyro_val));
 
 	return 0;
@@ -348,7 +347,7 @@ static int hid_gyro_3d_probe(struct platform_device *pdev)
 error_iio_unreg:
 	iio_device_unregister(indio_dev);
 error_remove_trigger:
-	hid_sensor_remove_trigger(&gyro_state->common_attributes);
+	hid_sensor_remove_trigger(indio_dev);
 error_unreg_buffer_funcs:
 	iio_triggered_buffer_cleanup(indio_dev);
 error_free_dev_mem:
@@ -361,11 +360,10 @@ static int hid_gyro_3d_remove(struct platform_device *pdev)
 {
 	struct hid_sensor_hub_device *hsdev = pdev->dev.platform_data;
 	struct iio_dev *indio_dev = platform_get_drvdata(pdev);
-	struct gyro_3d_state *gyro_state = iio_priv(indio_dev);
 
 	sensor_hub_remove_callback(hsdev, HID_USAGE_SENSOR_GYRO_3D);
 	iio_device_unregister(indio_dev);
-	hid_sensor_remove_trigger(&gyro_state->common_attributes);
+	hid_sensor_remove_trigger(indio_dev);
 	iio_triggered_buffer_cleanup(indio_dev);
 	kfree(indio_dev->channels);
 
diff --git a/drivers/iio/gyro/itg3200_buffer.c b/drivers/iio/gyro/itg3200_buffer.c
index e3b3c50..6c43af9 100644
--- a/drivers/iio/gyro/itg3200_buffer.c
+++ b/drivers/iio/gyro/itg3200_buffer.c
@@ -55,8 +55,11 @@ static irqreturn_t itg3200_trigger_handler(int irq, void *p)
 	if (ret < 0)
 		goto error_ret;
 
-	iio_push_to_buffers_with_timestamp(indio_dev, buf, pf->timestamp);
+	if (indio_dev->scan_timestamp)
+		memcpy(buf + indio_dev->scan_bytes - sizeof(s64),
+				&pf->timestamp, sizeof(pf->timestamp));
 
+	iio_push_to_buffers(indio_dev, (u8 *)buf);
 	iio_trigger_notify_done(indio_dev->trig);
 
 error_ret:
diff --git a/drivers/iio/gyro/st_gyro_buffer.c b/drivers/iio/gyro/st_gyro_buffer.c
index d67b17b..69017c7 100644
--- a/drivers/iio/gyro/st_gyro_buffer.c
+++ b/drivers/iio/gyro/st_gyro_buffer.c
@@ -32,7 +32,16 @@ int st_gyro_trig_set_state(struct iio_trigger *trig, bool state)
 
 static int st_gyro_buffer_preenable(struct iio_dev *indio_dev)
 {
-	return st_sensors_set_enable(indio_dev, true);
+	int err;
+
+	err = st_sensors_set_enable(indio_dev, true);
+	if (err < 0)
+		goto st_gyro_set_enable_error;
+
+	err = iio_sw_buffer_preenable(indio_dev);
+
+st_gyro_set_enable_error:
+	return err;
 }
 
 static int st_gyro_buffer_postenable(struct iio_dev *indio_dev)
diff --git a/drivers/iio/gyro/st_gyro_core.c b/drivers/iio/gyro/st_gyro_core.c
index d53d91a..e13c2b0 100644
--- a/drivers/iio/gyro/st_gyro_core.c
+++ b/drivers/iio/gyro/st_gyro_core.c
@@ -305,9 +305,8 @@ static const struct iio_trigger_ops st_gyro_trigger_ops = {
 int st_gyro_common_probe(struct iio_dev *indio_dev,
 					struct st_sensors_platform_data *pdata)
 {
-	struct st_sensor_data *gdata = iio_priv(indio_dev);
-	int irq = gdata->get_irq_data_ready(indio_dev);
 	int err;
+	struct st_sensor_data *gdata = iio_priv(indio_dev);
 
 	indio_dev->modes = INDIO_DIRECT_MODE;
 	indio_dev->info = &gyro_info;
@@ -315,7 +314,7 @@ int st_gyro_common_probe(struct iio_dev *indio_dev,
 	err = st_sensors_check_device_support(indio_dev,
 				ARRAY_SIZE(st_gyro_sensors), st_gyro_sensors);
 	if (err < 0)
-		return err;
+		goto st_gyro_common_probe_error;
 
 	gdata->num_data_channels = ST_GYRO_NUMBER_DATA_CHANNELS;
 	gdata->multiread_bit = gdata->sensor->multi_read_bit;
@@ -328,13 +327,13 @@ int st_gyro_common_probe(struct iio_dev *indio_dev,
 
 	err = st_sensors_init_sensor(indio_dev, pdata);
 	if (err < 0)
-		return err;
+		goto st_gyro_common_probe_error;
 
-	err = st_gyro_allocate_ring(indio_dev);
-	if (err < 0)
-		return err;
+	if (gdata->get_irq_data_ready(indio_dev) > 0) {
+		err = st_gyro_allocate_ring(indio_dev);
+		if (err < 0)
+			goto st_gyro_common_probe_error;
 
-	if (irq > 0) {
 		err = st_sensors_allocate_trigger(indio_dev,
 						  ST_GYRO_TRIGGER_OPS);
 		if (err < 0)
@@ -345,14 +344,15 @@ int st_gyro_common_probe(struct iio_dev *indio_dev,
 	if (err)
 		goto st_gyro_device_register_error;
 
-	return 0;
+	return err;
 
 st_gyro_device_register_error:
-	if (irq > 0)
+	if (gdata->get_irq_data_ready(indio_dev) > 0)
 		st_sensors_deallocate_trigger(indio_dev);
 st_gyro_probe_trigger_error:
-	st_gyro_deallocate_ring(indio_dev);
-
+	if (gdata->get_irq_data_ready(indio_dev) > 0)
+		st_gyro_deallocate_ring(indio_dev);
+st_gyro_common_probe_error:
 	return err;
 }
 EXPORT_SYMBOL(st_gyro_common_probe);
@@ -362,10 +362,10 @@ void st_gyro_common_remove(struct iio_dev *indio_dev)
 	struct st_sensor_data *gdata = iio_priv(indio_dev);
 
 	iio_device_unregister(indio_dev);
-	if (gdata->get_irq_data_ready(indio_dev) > 0)
+	if (gdata->get_irq_data_ready(indio_dev) > 0) {
 		st_sensors_deallocate_trigger(indio_dev);
-
-	st_gyro_deallocate_ring(indio_dev);
+		st_gyro_deallocate_ring(indio_dev);
+	}
 }
 EXPORT_SYMBOL(st_gyro_common_remove);
 
diff --git a/drivers/iio/iio_core.h b/drivers/iio/iio_core.h
index f6db6af..9b32253 100644
--- a/drivers/iio/iio_core.h
+++ b/drivers/iio/iio_core.h
@@ -30,12 +30,9 @@ int __iio_add_chan_devattr(const char *postfix,
 						const char *buf,
 						size_t len),
 			   u64 mask,
-			   enum iio_shared_by shared_by,
+			   bool generic,
 			   struct device *dev,
 			   struct list_head *attr_list);
-void iio_free_chan_devattr_list(struct list_head *attr_list);
-
-ssize_t iio_format_value(char *buf, unsigned int type, int val, int val2);
 
 /* Event interface flags */
 #define IIO_BUSY_BIT_POS 1
@@ -53,7 +50,6 @@ ssize_t iio_buffer_read_first_n_outer(struct file *filp, char __user *buf,
 #define iio_buffer_read_first_n_outer_addr (&iio_buffer_read_first_n_outer)
 
 void iio_disable_all_buffers(struct iio_dev *indio_dev);
-void iio_buffer_wakeup_poll(struct iio_dev *indio_dev);
 
 #else
 
@@ -61,13 +57,11 @@ void iio_buffer_wakeup_poll(struct iio_dev *indio_dev);
 #define iio_buffer_read_first_n_outer_addr NULL
 
 static inline void iio_disable_all_buffers(struct iio_dev *indio_dev) {}
-static inline void iio_buffer_wakeup_poll(struct iio_dev *indio_dev) {}
 
 #endif
 
 int iio_device_register_eventset(struct iio_dev *indio_dev);
 void iio_device_unregister_eventset(struct iio_dev *indio_dev);
-void iio_device_wakeup_eventset(struct iio_dev *indio_dev);
 int iio_event_getfd(struct iio_dev *indio_dev);
 
 #endif
diff --git a/drivers/iio/imu/adis16400_buffer.c b/drivers/iio/imu/adis16400_buffer.c
index f2cf829..054c01d 100644
--- a/drivers/iio/imu/adis16400_buffer.c
+++ b/drivers/iio/imu/adis16400_buffer.c
@@ -82,8 +82,13 @@ irqreturn_t adis16400_trigger_handler(int irq, void *p)
 		spi_setup(st->adis.spi);
 	}
 
-	iio_push_to_buffers_with_timestamp(indio_dev, adis->buffer,
-		pf->timestamp);
+	/* Guaranteed to be aligned with 8 byte boundary */
+	if (indio_dev->scan_timestamp) {
+		void *b = adis->buffer + indio_dev->scan_bytes - sizeof(s64);
+		*(s64 *)b = pf->timestamp;
+	}
+
+	iio_push_to_buffers(indio_dev, adis->buffer);
 
 	iio_trigger_notify_done(indio_dev->trig);
 
diff --git a/drivers/iio/imu/adis_buffer.c b/drivers/iio/imu/adis_buffer.c
index cb32b59..99d8e0b 100644
--- a/drivers/iio/imu/adis_buffer.c
+++ b/drivers/iio/imu/adis_buffer.c
@@ -102,8 +102,13 @@ static irqreturn_t adis_trigger_handler(int irq, void *p)
 		mutex_unlock(&adis->txrx_lock);
 	}
 
-	iio_push_to_buffers_with_timestamp(indio_dev, adis->buffer,
-		pf->timestamp);
+	/* Guaranteed to be aligned with 8 byte boundary */
+	if (indio_dev->scan_timestamp) {
+		void *b = adis->buffer + indio_dev->scan_bytes - sizeof(s64);
+		*(s64 *)b = pf->timestamp;
+	}
+
+	iio_push_to_buffers(indio_dev, adis->buffer);
 
 	iio_trigger_notify_done(indio_dev->trig);
 
diff --git a/drivers/iio/imu/inv_mpu6050/inv_mpu_ring.c b/drivers/iio/imu/inv_mpu6050/inv_mpu_ring.c
index 4295171..7da0832 100644
--- a/drivers/iio/imu/inv_mpu6050/inv_mpu_ring.c
+++ b/drivers/iio/imu/inv_mpu6050/inv_mpu_ring.c
@@ -124,6 +124,7 @@ irqreturn_t inv_mpu6050_read_fifo(int irq, void *p)
 	u8 data[INV_MPU6050_OUTPUT_DATA_SIZE];
 	u16 fifo_count;
 	s64 timestamp;
+	u64 *tmp;
 
 	mutex_lock(&indio_dev->mlock);
 	if (!(st->chip_config.accl_fifo_enable |
@@ -169,8 +170,9 @@ irqreturn_t inv_mpu6050_read_fifo(int irq, void *p)
 		if (0 == result)
 			timestamp = 0;
 
-		result = iio_push_to_buffers_with_timestamp(indio_dev, data,
-			timestamp);
+		tmp = (u64 *)data;
+		tmp[DIV_ROUND_UP(bytes_per_datum, 8)] = timestamp;
+		result = iio_push_to_buffers(indio_dev, data);
 		if (result)
 			goto flush_fifo;
 		fifo_count -= bytes_per_datum;
diff --git a/drivers/iio/industrialio-buffer.c b/drivers/iio/industrialio-buffer.c
index 7f9152c..2db7dcd 100644
--- a/drivers/iio/industrialio-buffer.c
+++ b/drivers/iio/industrialio-buffer.c
@@ -20,7 +20,6 @@
 #include <linux/cdev.h>
 #include <linux/slab.h>
 #include <linux/poll.h>
-#include <linux/sched.h>
 
 #include <linux/iio/iio.h>
 #include "iio_core.h"
@@ -32,9 +31,16 @@ static const char * const iio_endian_prefix[] = {
 	[IIO_LE] = "le",
 };
 
-static bool iio_buffer_is_active(struct iio_buffer *buf)
+static bool iio_buffer_is_active(struct iio_dev *indio_dev,
+				 struct iio_buffer *buf)
 {
-	return !list_empty(&buf->buffer_list);
+	struct list_head *p;
+
+	list_for_each(p, &indio_dev->buffer_list)
+		if (p == &buf->buffer_list)
+			return true;
+
+	return false;
 }
 
 /**
@@ -49,9 +55,6 @@ ssize_t iio_buffer_read_first_n_outer(struct file *filp, char __user *buf,
 	struct iio_dev *indio_dev = filp->private_data;
 	struct iio_buffer *rb = indio_dev->buffer;
 
-	if (!indio_dev->info)
-		return -ENODEV;
-
 	if (!rb || !rb->access->read_first_n)
 		return -EINVAL;
 	return rb->access->read_first_n(rb, n, buf);
@@ -66,9 +69,6 @@ unsigned int iio_buffer_poll(struct file *filp,
 	struct iio_dev *indio_dev = filp->private_data;
 	struct iio_buffer *rb = indio_dev->buffer;
 
-	if (!indio_dev->info)
-		return -ENODEV;
-
 	poll_wait(filp, &rb->pollq, wait);
 	if (rb->stufftoread)
 		return POLLIN | POLLRDNORM;
@@ -76,27 +76,10 @@ unsigned int iio_buffer_poll(struct file *filp,
 	return 0;
 }
 
-/**
- * iio_buffer_wakeup_poll - Wakes up the buffer waitqueue
- * @indio_dev: The IIO device
- *
- * Wakes up the event waitqueue used for poll(). Should usually
- * be called when the device is unregistered.
- */
-void iio_buffer_wakeup_poll(struct iio_dev *indio_dev)
-{
-	if (!indio_dev->buffer)
-		return;
-
-	wake_up(&indio_dev->buffer->pollq);
-}
-
 void iio_buffer_init(struct iio_buffer *buffer)
 {
 	INIT_LIST_HEAD(&buffer->demux_list);
-	INIT_LIST_HEAD(&buffer->buffer_list);
 	init_waitqueue_head(&buffer->pollq);
-	kref_init(&buffer->ref);
 }
 EXPORT_SYMBOL(iio_buffer_init);
 
@@ -163,7 +146,7 @@ static ssize_t iio_scan_el_store(struct device *dev,
 	if (ret < 0)
 		return ret;
 	mutex_lock(&indio_dev->mlock);
-	if (iio_buffer_is_active(indio_dev->buffer)) {
+	if (iio_buffer_is_active(indio_dev, indio_dev->buffer)) {
 		ret = -EBUSY;
 		goto error_ret;
 	}
@@ -209,7 +192,7 @@ static ssize_t iio_scan_el_ts_store(struct device *dev,
 		return ret;
 
 	mutex_lock(&indio_dev->mlock);
-	if (iio_buffer_is_active(indio_dev->buffer)) {
+	if (iio_buffer_is_active(indio_dev, indio_dev->buffer)) {
 		ret = -EBUSY;
 		goto error_ret;
 	}
@@ -231,7 +214,7 @@ static int iio_buffer_add_channel_sysfs(struct iio_dev *indio_dev,
 				     &iio_show_scan_index,
 				     NULL,
 				     0,
-				     IIO_SEPARATE,
+				     0,
 				     &indio_dev->dev,
 				     &buffer->scan_el_dev_attr_list);
 	if (ret)
@@ -266,14 +249,29 @@ static int iio_buffer_add_channel_sysfs(struct iio_dev *indio_dev,
 					     0,
 					     &indio_dev->dev,
 					     &buffer->scan_el_dev_attr_list);
-	if (ret)
-		goto error_ret;
 	attrcount++;
 	ret = attrcount;
 error_ret:
 	return ret;
 }
 
+static void iio_buffer_remove_and_free_scan_dev_attr(struct iio_dev *indio_dev,
+						     struct iio_dev_attr *p)
+{
+	kfree(p->dev_attr.attr.name);
+	kfree(p);
+}
+
+static void __iio_buffer_attr_cleanup(struct iio_dev *indio_dev)
+{
+	struct iio_dev_attr *p, *n;
+	struct iio_buffer *buffer = indio_dev->buffer;
+
+	list_for_each_entry_safe(p, n,
+				 &buffer->scan_el_dev_attr_list, l)
+		iio_buffer_remove_and_free_scan_dev_attr(indio_dev, p);
+}
+
 static const char * const iio_scan_elements_group_name = "scan_elements";
 
 int iio_buffer_register(struct iio_dev *indio_dev,
@@ -350,7 +348,7 @@ int iio_buffer_register(struct iio_dev *indio_dev,
 error_free_scan_mask:
 	kfree(buffer->scan_mask);
 error_cleanup_dynamic:
-	iio_free_chan_devattr_list(&buffer->scan_el_dev_attr_list);
+	__iio_buffer_attr_cleanup(indio_dev);
 
 	return ret;
 }
@@ -360,7 +358,7 @@ void iio_buffer_unregister(struct iio_dev *indio_dev)
 {
 	kfree(indio_dev->buffer->scan_mask);
 	kfree(indio_dev->buffer->scan_el_group.attrs);
-	iio_free_chan_devattr_list(&indio_dev->buffer->scan_el_dev_attr_list);
+	__iio_buffer_attr_cleanup(indio_dev);
 }
 EXPORT_SYMBOL(iio_buffer_unregister);
 
@@ -398,7 +396,7 @@ ssize_t iio_buffer_write_length(struct device *dev,
 			return len;
 
 	mutex_lock(&indio_dev->mlock);
-	if (iio_buffer_is_active(indio_dev->buffer)) {
+	if (iio_buffer_is_active(indio_dev, indio_dev->buffer)) {
 		ret = -EBUSY;
 	} else {
 		if (buffer->access->set_length)
@@ -416,11 +414,13 @@ ssize_t iio_buffer_show_enable(struct device *dev,
 			       char *buf)
 {
 	struct iio_dev *indio_dev = dev_to_iio_dev(dev);
-	return sprintf(buf, "%d\n", iio_buffer_is_active(indio_dev->buffer));
+	return sprintf(buf, "%d\n",
+		       iio_buffer_is_active(indio_dev,
+					    indio_dev->buffer));
 }
 EXPORT_SYMBOL(iio_buffer_show_enable);
 
-/* Note NULL used as error indicator as it doesn't make sense. */
+/* note NULL used as error indicator as it doesn't make sense. */
 static const unsigned long *iio_scan_mask_match(const unsigned long *av_masks,
 					  unsigned int masklength,
 					  const unsigned long *mask)
@@ -435,8 +435,8 @@ static const unsigned long *iio_scan_mask_match(const unsigned long *av_masks,
 	return NULL;
 }
 
-static int iio_compute_scan_bytes(struct iio_dev *indio_dev,
-				const unsigned long *mask, bool timestamp)
+static int iio_compute_scan_bytes(struct iio_dev *indio_dev, const long *mask,
+				  bool timestamp)
 {
 	const struct iio_chan_spec *ch;
 	unsigned bytes = 0;
@@ -460,19 +460,6 @@ static int iio_compute_scan_bytes(struct iio_dev *indio_dev,
 	return bytes;
 }
 
-static void iio_buffer_activate(struct iio_dev *indio_dev,
-	struct iio_buffer *buffer)
-{
-	iio_buffer_get(buffer);
-	list_add(&buffer->buffer_list, &indio_dev->buffer_list);
-}
-
-static void iio_buffer_deactivate(struct iio_buffer *buffer)
-{
-	list_del_init(&buffer->buffer_list);
-	iio_buffer_put(buffer);
-}
-
 void iio_disable_all_buffers(struct iio_dev *indio_dev)
 {
 	struct iio_buffer *buffer, *_buffer;
@@ -485,7 +472,7 @@ void iio_disable_all_buffers(struct iio_dev *indio_dev)
 
 	list_for_each_entry_safe(buffer, _buffer,
 			&indio_dev->buffer_list, buffer_list)
-		iio_buffer_deactivate(buffer);
+		list_del_init(&buffer->buffer_list);
 
 	indio_dev->currentmode = INDIO_DIRECT_MODE;
 	if (indio_dev->setup_ops->postdisable)
@@ -495,21 +482,7 @@ void iio_disable_all_buffers(struct iio_dev *indio_dev)
 		kfree(indio_dev->active_scan_mask);
 }
 
-static void iio_buffer_update_bytes_per_datum(struct iio_dev *indio_dev,
-	struct iio_buffer *buffer)
-{
-	unsigned int bytes;
-
-	if (!buffer->access->set_bytes_per_datum)
-		return;
-
-	bytes = iio_compute_scan_bytes(indio_dev, buffer->scan_mask,
-		buffer->scan_timestamp);
-
-	buffer->access->set_bytes_per_datum(buffer, bytes);
-}
-
-static int __iio_update_buffers(struct iio_dev *indio_dev,
+int iio_update_buffers(struct iio_dev *indio_dev,
 		       struct iio_buffer *insert_buffer,
 		       struct iio_buffer *remove_buffer)
 {
@@ -539,9 +512,9 @@ static int __iio_update_buffers(struct iio_dev *indio_dev,
 		indio_dev->active_scan_mask = NULL;
 
 	if (remove_buffer)
-		iio_buffer_deactivate(remove_buffer);
+		list_del(&remove_buffer->buffer_list);
 	if (insert_buffer)
-		iio_buffer_activate(indio_dev, insert_buffer);
+		list_add(&insert_buffer->buffer_list, &indio_dev->buffer_list);
 
 	/* If no buffers in list, we are done */
 	if (list_empty(&indio_dev->buffer_list)) {
@@ -551,7 +524,7 @@ static int __iio_update_buffers(struct iio_dev *indio_dev,
 		return 0;
 	}
 
-	/* What scan mask do we actually have? */
+	/* What scan mask do we actually have ?*/
 	compound_mask = kcalloc(BITS_TO_LONGS(indio_dev->masklength),
 				sizeof(long), GFP_KERNEL);
 	if (compound_mask == NULL) {
@@ -576,7 +549,7 @@ static int __iio_update_buffers(struct iio_dev *indio_dev,
 			 * Roll back.
 			 * Note can only occur when adding a buffer.
 			 */
-			iio_buffer_deactivate(insert_buffer);
+			list_del(&insert_buffer->buffer_list);
 			if (old_mask) {
 				indio_dev->active_scan_mask = old_mask;
 				success = -EINVAL;
@@ -606,8 +579,7 @@ static int __iio_update_buffers(struct iio_dev *indio_dev,
 		iio_compute_scan_bytes(indio_dev,
 				       indio_dev->active_scan_mask,
 				       indio_dev->scan_timestamp);
-	list_for_each_entry(buffer, &indio_dev->buffer_list, buffer_list) {
-		iio_buffer_update_bytes_per_datum(indio_dev, buffer);
+	list_for_each_entry(buffer, &indio_dev->buffer_list, buffer_list)
 		if (buffer->access->request_update) {
 			ret = buffer->access->request_update(buffer);
 			if (ret) {
@@ -616,7 +588,6 @@ static int __iio_update_buffers(struct iio_dev *indio_dev,
 				goto error_run_postdisable;
 			}
 		}
-	}
 	if (indio_dev->info->update_scan_mode) {
 		ret = indio_dev->info
 			->update_scan_mode(indio_dev,
@@ -626,7 +597,7 @@ static int __iio_update_buffers(struct iio_dev *indio_dev,
 			goto error_run_postdisable;
 		}
 	}
-	/* Definitely possible for devices to support both of these. */
+	/* Definitely possible for devices to support both of these.*/
 	if (indio_dev->modes & INDIO_BUFFER_TRIGGERED) {
 		if (!indio_dev->trig) {
 			printk(KERN_INFO "Buffer not started: no trigger\n");
@@ -637,7 +608,7 @@ static int __iio_update_buffers(struct iio_dev *indio_dev,
 		indio_dev->currentmode = INDIO_BUFFER_TRIGGERED;
 	} else if (indio_dev->modes & INDIO_BUFFER_HARDWARE) {
 		indio_dev->currentmode = INDIO_BUFFER_HARDWARE;
-	} else { /* Should never be reached */
+	} else { /* should never be reached */
 		ret = -EINVAL;
 		goto error_run_postdisable;
 	}
@@ -669,50 +640,13 @@ error_run_postdisable:
 error_remove_inserted:
 
 	if (insert_buffer)
-		iio_buffer_deactivate(insert_buffer);
+		list_del(&insert_buffer->buffer_list);
 	indio_dev->active_scan_mask = old_mask;
 	kfree(compound_mask);
 error_ret:
 
 	return ret;
 }
-
-int iio_update_buffers(struct iio_dev *indio_dev,
-		       struct iio_buffer *insert_buffer,
-		       struct iio_buffer *remove_buffer)
-{
-	int ret;
-
-	if (insert_buffer == remove_buffer)
-		return 0;
-
-	mutex_lock(&indio_dev->info_exist_lock);
-	mutex_lock(&indio_dev->mlock);
-
-	if (insert_buffer && iio_buffer_is_active(insert_buffer))
-		insert_buffer = NULL;
-
-	if (remove_buffer && !iio_buffer_is_active(remove_buffer))
-		remove_buffer = NULL;
-
-	if (!insert_buffer && !remove_buffer) {
-		ret = 0;
-		goto out_unlock;
-	}
-
-	if (indio_dev->info == NULL) {
-		ret = -ENODEV;
-		goto out_unlock;
-	}
-
-	ret = __iio_update_buffers(indio_dev, insert_buffer, remove_buffer);
-
-out_unlock:
-	mutex_unlock(&indio_dev->mlock);
-	mutex_unlock(&indio_dev->info_exist_lock);
-
-	return ret;
-}
 EXPORT_SYMBOL_GPL(iio_update_buffers);
 
 ssize_t iio_buffer_store_enable(struct device *dev,
@@ -723,6 +657,7 @@ ssize_t iio_buffer_store_enable(struct device *dev,
 	int ret;
 	bool requested_state;
 	struct iio_dev *indio_dev = dev_to_iio_dev(dev);
+	struct iio_buffer *pbuf = indio_dev->buffer;
 	bool inlist;
 
 	ret = strtobool(buf, &requested_state);
@@ -732,16 +667,16 @@ ssize_t iio_buffer_store_enable(struct device *dev,
 	mutex_lock(&indio_dev->mlock);
 
 	/* Find out if it is in the list */
-	inlist = iio_buffer_is_active(indio_dev->buffer);
+	inlist = iio_buffer_is_active(indio_dev, pbuf);
 	/* Already in desired state */
 	if (inlist == requested_state)
 		goto done;
 
 	if (requested_state)
-		ret = __iio_update_buffers(indio_dev,
+		ret = iio_update_buffers(indio_dev,
 					 indio_dev->buffer, NULL);
 	else
-		ret = __iio_update_buffers(indio_dev,
+		ret = iio_update_buffers(indio_dev,
 					 NULL, indio_dev->buffer);
 
 	if (ret < 0)
@@ -752,6 +687,24 @@ done:
 }
 EXPORT_SYMBOL(iio_buffer_store_enable);
 
+int iio_sw_buffer_preenable(struct iio_dev *indio_dev)
+{
+	struct iio_buffer *buffer;
+	unsigned bytes;
+	dev_dbg(&indio_dev->dev, "%s\n", __func__);
+
+	list_for_each_entry(buffer, &indio_dev->buffer_list, buffer_list)
+		if (buffer->access->set_bytes_per_datum) {
+			bytes = iio_compute_scan_bytes(indio_dev,
+						       buffer->scan_mask,
+						       buffer->scan_timestamp);
+
+			buffer->access->set_bytes_per_datum(buffer, bytes);
+		}
+	return 0;
+}
+EXPORT_SYMBOL(iio_sw_buffer_preenable);
+
 /**
  * iio_validate_scan_mask_onehot() - Validates that exactly one channel is selected
  * @indio_dev: the iio device
@@ -779,7 +732,6 @@ static bool iio_validate_scan_mask(struct iio_dev *indio_dev,
 
 /**
  * iio_scan_mask_set() - set particular bit in the scan mask
- * @indio_dev: the iio device
  * @buffer: the buffer whose scan mask we are interested in
  * @bit: the bit to be set.
  *
@@ -800,7 +752,7 @@ int iio_scan_mask_set(struct iio_dev *indio_dev,
 	if (trialmask == NULL)
 		return -ENOMEM;
 	if (!indio_dev->masklength) {
-		WARN_ON("Trying to set scanmask prior to registering buffer\n");
+		WARN_ON("trying to set scanmask prior to registering buffer\n");
 		goto err_invalid_mask;
 	}
 	bitmap_copy(trialmask, buffer->scan_mask, indio_dev->masklength);
@@ -855,8 +807,8 @@ struct iio_demux_table {
 	struct list_head l;
 };
 
-static const void *iio_demux(struct iio_buffer *buffer,
-				 const void *datain)
+static unsigned char *iio_demux(struct iio_buffer *buffer,
+				 unsigned char *datain)
 {
 	struct iio_demux_table *t;
 
@@ -869,9 +821,9 @@ static const void *iio_demux(struct iio_buffer *buffer,
 	return buffer->demux_bounce;
 }
 
-static int iio_push_to_buffer(struct iio_buffer *buffer, const void *data)
+static int iio_push_to_buffer(struct iio_buffer *buffer, unsigned char *data)
 {
-	const void *dataout = iio_demux(buffer, data);
+	unsigned char *dataout = iio_demux(buffer, data);
 
 	return buffer->access->store_to(buffer, dataout);
 }
@@ -886,7 +838,7 @@ static void iio_buffer_demux_free(struct iio_buffer *buffer)
 }
 
 
-int iio_push_to_buffers(struct iio_dev *indio_dev, const void *data)
+int iio_push_to_buffers(struct iio_dev *indio_dev, unsigned char *data)
 {
 	int ret;
 	struct iio_buffer *buf;
@@ -1009,45 +961,3 @@ error_clear_mux_table:
 	return ret;
 }
 EXPORT_SYMBOL_GPL(iio_update_demux);
-
-/**
- * iio_buffer_release() - Free a buffer's resources
- * @ref: Pointer to the kref embedded in the iio_buffer struct
- *
- * This function is called when the last reference to the buffer has been
- * dropped. It will typically free all resources allocated by the buffer. Do not
- * call this function manually, always use iio_buffer_put() when done using a
- * buffer.
- */
-static void iio_buffer_release(struct kref *ref)
-{
-	struct iio_buffer *buffer = container_of(ref, struct iio_buffer, ref);
-
-	buffer->access->release(buffer);
-}
-
-/**
- * iio_buffer_get() - Grab a reference to the buffer
- * @buffer: The buffer to grab a reference for, may be NULL
- *
- * Returns the pointer to the buffer that was passed into the function.
- */
-struct iio_buffer *iio_buffer_get(struct iio_buffer *buffer)
-{
-	if (buffer)
-		kref_get(&buffer->ref);
-
-	return buffer;
-}
-EXPORT_SYMBOL_GPL(iio_buffer_get);
-
-/**
- * iio_buffer_put() - Release the reference to the buffer
- * @buffer: The buffer to release the reference for, may be NULL
- */
-void iio_buffer_put(struct iio_buffer *buffer)
-{
-	if (buffer)
-		kref_put(&buffer->ref, iio_buffer_release);
-}
-EXPORT_SYMBOL_GPL(iio_buffer_put);
diff --git a/drivers/iio/industrialio-core.c b/drivers/iio/industrialio-core.c
index 18f72e3..f95c697 100644
--- a/drivers/iio/industrialio-core.c
+++ b/drivers/iio/industrialio-core.c
@@ -9,8 +9,6 @@
  * Based on elements of hwmon and input subsystems.
  */
 
-#define pr_fmt(fmt) "iio-core: " fmt
-
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/idr.h>
@@ -30,7 +28,6 @@
 #include "iio_core_trigger.h"
 #include <linux/iio/sysfs.h>
 #include <linux/iio/events.h>
-#include <linux/iio/buffer.h>
 
 /* IDA to assign each registered device a unique id */
 static DEFINE_IDA(iio_ida);
@@ -104,7 +101,6 @@ static const char * const iio_chan_info_postfix[] = {
 	[IIO_CHAN_INFO_PHASE] = "phase",
 	[IIO_CHAN_INFO_HARDWAREGAIN] = "hardwaregain",
 	[IIO_CHAN_INFO_HYSTERESIS] = "hysteresis",
-	[IIO_CHAN_INFO_INT_TIME] = "integration_time",
 };
 
 const struct iio_chan_spec
@@ -134,13 +130,16 @@ static int __init iio_init(void)
 	/* Register sysfs bus */
 	ret  = bus_register(&iio_bus_type);
 	if (ret < 0) {
-		pr_err("could not register bus type\n");
+		printk(KERN_ERR
+		       "%s could not register bus type\n",
+			__FILE__);
 		goto error_nothing;
 	}
 
 	ret = alloc_chrdev_region(&iio_devt, 0, IIO_DEV_MAX, "iio");
 	if (ret < 0) {
-		pr_err("failed to allocate char dev region\n");
+		printk(KERN_ERR "%s: failed to allocate char dev region\n",
+		       __FILE__);
 		goto error_unregister_bus_type;
 	}
 
@@ -362,20 +361,22 @@ ssize_t iio_enum_write(struct iio_dev *indio_dev,
 }
 EXPORT_SYMBOL_GPL(iio_enum_write);
 
-/**
- * iio_format_value() - Formats a IIO value into its string representation
- * @buf: The buffer to which the formated value gets written
- * @type: One of the IIO_VAL_... constants. This decides how the val and val2
- *        parameters are formatted.
- * @val: First part of the value, exact meaning depends on the type parameter.
- * @val2: Second part of the value, exact meaning depends on the type parameter.
- */
-ssize_t iio_format_value(char *buf, unsigned int type, int val, int val2)
+static ssize_t iio_read_channel_info(struct device *dev,
+				     struct device_attribute *attr,
+				     char *buf)
 {
+	struct iio_dev *indio_dev = dev_to_iio_dev(dev);
+	struct iio_dev_attr *this_attr = to_iio_dev_attr(attr);
 	unsigned long long tmp;
+	int val, val2;
 	bool scale_db = false;
+	int ret = indio_dev->info->read_raw(indio_dev, this_attr->c,
+					    &val, &val2, this_attr->address);
+
+	if (ret < 0)
+		return ret;
 
-	switch (type) {
+	switch (ret) {
 	case IIO_VAL_INT:
 		return sprintf(buf, "%d\n", val);
 	case IIO_VAL_INT_PLUS_MICRO_DB:
@@ -407,22 +408,6 @@ ssize_t iio_format_value(char *buf, unsigned int type, int val, int val2)
 	}
 }
 
-static ssize_t iio_read_channel_info(struct device *dev,
-				     struct device_attribute *attr,
-				     char *buf)
-{
-	struct iio_dev *indio_dev = dev_to_iio_dev(dev);
-	struct iio_dev_attr *this_attr = to_iio_dev_attr(attr);
-	int val, val2;
-	int ret = indio_dev->info->read_raw(indio_dev, this_attr->c,
-					    &val, &val2, this_attr->address);
-
-	if (ret < 0)
-		return ret;
-
-	return iio_format_value(buf, ret, val, val2);
-}
-
 /**
  * iio_str_to_fixpoint() - Parse a fixed-point number from a string
  * @str: The string to parse
@@ -531,15 +516,14 @@ int __iio_device_attr_init(struct device_attribute *dev_attr,
 						struct device_attribute *attr,
 						const char *buf,
 						size_t len),
-			   enum iio_shared_by shared_by)
+			   bool generic)
 {
-	int ret = 0;
-	char *name_format = NULL;
-	char *full_postfix;
+	int ret;
+	char *name_format, *full_postfix;
 	sysfs_attr_init(&dev_attr->attr);
 
 	/* Build up postfix of <extend_name>_<modifier>_postfix */
-	if (chan->modified && (shared_by == IIO_SEPARATE)) {
+	if (chan->modified && !generic) {
 		if (chan->extend_name)
 			full_postfix = kasprintf(GFP_KERNEL, "%s_%s_%s",
 						 iio_modifier_names[chan
@@ -560,78 +544,53 @@ int __iio_device_attr_init(struct device_attribute *dev_attr,
 						 chan->extend_name,
 						 postfix);
 	}
-	if (full_postfix == NULL)
-		return -ENOMEM;
+	if (full_postfix == NULL) {
+		ret = -ENOMEM;
+		goto error_ret;
+	}
 
 	if (chan->differential) { /* Differential can not have modifier */
-		switch (shared_by) {
-		case IIO_SHARED_BY_ALL:
-			name_format = kasprintf(GFP_KERNEL, "%s", full_postfix);
-			break;
-		case IIO_SHARED_BY_DIR:
-			name_format = kasprintf(GFP_KERNEL, "%s_%s",
-						iio_direction[chan->output],
-						full_postfix);
-			break;
-		case IIO_SHARED_BY_TYPE:
+		if (generic)
 			name_format
 				= kasprintf(GFP_KERNEL, "%s_%s-%s_%s",
 					    iio_direction[chan->output],
 					    iio_chan_type_name_spec[chan->type],
 					    iio_chan_type_name_spec[chan->type],
 					    full_postfix);
-			break;
-		case IIO_SEPARATE:
-			if (!chan->indexed) {
-				WARN_ON("Differential channels must be indexed\n");
-				ret = -EINVAL;
-				goto error_free_full_postfix;
-			}
+		else if (chan->indexed)
 			name_format
-				= kasprintf(GFP_KERNEL,
-					    "%s_%s%d-%s%d_%s",
+				= kasprintf(GFP_KERNEL, "%s_%s%d-%s%d_%s",
 					    iio_direction[chan->output],
 					    iio_chan_type_name_spec[chan->type],
 					    chan->channel,
 					    iio_chan_type_name_spec[chan->type],
 					    chan->channel2,
 					    full_postfix);
-			break;
+		else {
+			WARN_ON("Differential channels must be indexed\n");
+			ret = -EINVAL;
+			goto error_free_full_postfix;
 		}
 	} else { /* Single ended */
-		switch (shared_by) {
-		case IIO_SHARED_BY_ALL:
-			name_format = kasprintf(GFP_KERNEL, "%s", full_postfix);
-			break;
-		case IIO_SHARED_BY_DIR:
-			name_format = kasprintf(GFP_KERNEL, "%s_%s",
-						iio_direction[chan->output],
-						full_postfix);
-			break;
-		case IIO_SHARED_BY_TYPE:
+		if (generic)
+			name_format
+				= kasprintf(GFP_KERNEL, "%s_%s_%s",
+					    iio_direction[chan->output],
+					    iio_chan_type_name_spec[chan->type],
+					    full_postfix);
+		else if (chan->indexed)
+			name_format
+				= kasprintf(GFP_KERNEL, "%s_%s%d_%s",
+					    iio_direction[chan->output],
+					    iio_chan_type_name_spec[chan->type],
+					    chan->channel,
+					    full_postfix);
+		else
 			name_format
 				= kasprintf(GFP_KERNEL, "%s_%s_%s",
 					    iio_direction[chan->output],
 					    iio_chan_type_name_spec[chan->type],
 					    full_postfix);
-			break;
-
-		case IIO_SEPARATE:
-			if (chan->indexed)
-				name_format
-					= kasprintf(GFP_KERNEL, "%s_%s%d_%s",
-						    iio_direction[chan->output],
-						    iio_chan_type_name_spec[chan->type],
-						    chan->channel,
-						    full_postfix);
-			else
-				name_format
-					= kasprintf(GFP_KERNEL, "%s_%s_%s",
-						    iio_direction[chan->output],
-						    iio_chan_type_name_spec[chan->type],
-						    full_postfix);
-			break;
-		}
 	}
 	if (name_format == NULL) {
 		ret = -ENOMEM;
@@ -655,11 +614,16 @@ int __iio_device_attr_init(struct device_attribute *dev_attr,
 		dev_attr->attr.mode |= S_IWUSR;
 		dev_attr->store = writefunc;
 	}
+	kfree(name_format);
+	kfree(full_postfix);
+
+	return 0;
+
 error_free_name_format:
 	kfree(name_format);
 error_free_full_postfix:
 	kfree(full_postfix);
-
+error_ret:
 	return ret;
 }
 
@@ -678,21 +642,21 @@ int __iio_add_chan_devattr(const char *postfix,
 						const char *buf,
 						size_t len),
 			   u64 mask,
-			   enum iio_shared_by shared_by,
+			   bool generic,
 			   struct device *dev,
 			   struct list_head *attr_list)
 {
 	int ret;
 	struct iio_dev_attr *iio_attr, *t;
 
-	iio_attr = kzalloc(sizeof(*iio_attr), GFP_KERNEL);
+	iio_attr = kzalloc(sizeof *iio_attr, GFP_KERNEL);
 	if (iio_attr == NULL) {
 		ret = -ENOMEM;
 		goto error_ret;
 	}
 	ret = __iio_device_attr_init(&iio_attr->dev_attr,
 				     postfix, chan,
-				     readfunc, writefunc, shared_by);
+				     readfunc, writefunc, generic);
 	if (ret)
 		goto error_iio_dev_attr_free;
 	iio_attr->c = chan;
@@ -700,7 +664,7 @@ int __iio_add_chan_devattr(const char *postfix,
 	list_for_each_entry(t, attr_list, l)
 		if (strcmp(t->dev_attr.attr.name,
 			   iio_attr->dev_attr.attr.name) == 0) {
-			if (shared_by == IIO_SEPARATE)
+			if (!generic)
 				dev_err(dev, "tried to double register : %s\n",
 					t->dev_attr.attr.name);
 			ret = -EBUSY;
@@ -718,68 +682,46 @@ error_ret:
 	return ret;
 }
 
-static int iio_device_add_info_mask_type(struct iio_dev *indio_dev,
-					 struct iio_chan_spec const *chan,
-					 enum iio_shared_by shared_by,
-					 const long *infomask)
+static int iio_device_add_channel_sysfs(struct iio_dev *indio_dev,
+					struct iio_chan_spec const *chan)
 {
-	int i, ret, attrcount = 0;
+	int ret, attrcount = 0;
+	int i;
+	const struct iio_chan_spec_ext_info *ext_info;
 
-	for_each_set_bit(i, infomask, sizeof(infomask)*8) {
+	if (chan->channel < 0)
+		return 0;
+	for_each_set_bit(i, &chan->info_mask_separate, sizeof(long)*8) {
 		ret = __iio_add_chan_devattr(iio_chan_info_postfix[i],
 					     chan,
 					     &iio_read_channel_info,
 					     &iio_write_channel_info,
 					     i,
-					     shared_by,
+					     0,
 					     &indio_dev->dev,
 					     &indio_dev->channel_attr_list);
-		if ((ret == -EBUSY) && (shared_by != IIO_SEPARATE))
+		if (ret < 0)
+			goto error_ret;
+		attrcount++;
+	}
+	for_each_set_bit(i, &chan->info_mask_shared_by_type, sizeof(long)*8) {
+		ret = __iio_add_chan_devattr(iio_chan_info_postfix[i],
+					     chan,
+					     &iio_read_channel_info,
+					     &iio_write_channel_info,
+					     i,
+					     1,
+					     &indio_dev->dev,
+					     &indio_dev->channel_attr_list);
+		if (ret == -EBUSY) {
+			ret = 0;
 			continue;
-		else if (ret < 0)
-			return ret;
+		} else if (ret < 0) {
+			goto error_ret;
+		}
 		attrcount++;
 	}
 
-	return attrcount;
-}
-
-static int iio_device_add_channel_sysfs(struct iio_dev *indio_dev,
-					struct iio_chan_spec const *chan)
-{
-	int ret, attrcount = 0;
-	const struct iio_chan_spec_ext_info *ext_info;
-
-	if (chan->channel < 0)
-		return 0;
-	ret = iio_device_add_info_mask_type(indio_dev, chan,
-					    IIO_SEPARATE,
-					    &chan->info_mask_separate);
-	if (ret < 0)
-		return ret;
-	attrcount += ret;
-
-	ret = iio_device_add_info_mask_type(indio_dev, chan,
-					    IIO_SHARED_BY_TYPE,
-					    &chan->info_mask_shared_by_type);
-	if (ret < 0)
-		return ret;
-	attrcount += ret;
-
-	ret = iio_device_add_info_mask_type(indio_dev, chan,
-					    IIO_SHARED_BY_DIR,
-					    &chan->info_mask_shared_by_dir);
-	if (ret < 0)
-		return ret;
-	attrcount += ret;
-
-	ret = iio_device_add_info_mask_type(indio_dev, chan,
-					    IIO_SHARED_BY_ALL,
-					    &chan->info_mask_shared_by_all);
-	if (ret < 0)
-		return ret;
-	attrcount += ret;
-
 	if (chan->ext_info) {
 		unsigned int i = 0;
 		for (ext_info = chan->ext_info; ext_info->name; ext_info++) {
@@ -798,31 +740,22 @@ static int iio_device_add_channel_sysfs(struct iio_dev *indio_dev,
 				continue;
 
 			if (ret)
-				return ret;
+				goto error_ret;
 
 			attrcount++;
 		}
 	}
 
-	return attrcount;
+	ret = attrcount;
+error_ret:
+	return ret;
 }
 
-/**
- * iio_free_chan_devattr_list() - Free a list of IIO device attributes
- * @attr_list: List of IIO device attributes
- *
- * This function frees the memory allocated for each of the IIO device
- * attributes in the list. Note: if you want to reuse the list after calling
- * this function you have to reinitialize it using INIT_LIST_HEAD().
- */
-void iio_free_chan_devattr_list(struct list_head *attr_list)
+static void iio_device_remove_and_free_read_attr(struct iio_dev *indio_dev,
+						 struct iio_dev_attr *p)
 {
-	struct iio_dev_attr *p, *n;
-
-	list_for_each_entry_safe(p, n, attr_list, l) {
-		kfree(p->dev_attr.attr.name);
-		kfree(p);
-	}
+	kfree(p->dev_attr.attr.name);
+	kfree(p);
 }
 
 static ssize_t iio_show_dev_name(struct device *dev,
@@ -838,7 +771,7 @@ static DEVICE_ATTR(name, S_IRUGO, iio_show_dev_name, NULL);
 static int iio_device_register_sysfs(struct iio_dev *indio_dev)
 {
 	int i, ret = 0, attrcount, attrn, attrcount_orig = 0;
-	struct iio_dev_attr *p;
+	struct iio_dev_attr *p, *n;
 	struct attribute **attr;
 
 	/* First count elements in any existing group */
@@ -891,7 +824,11 @@ static int iio_device_register_sysfs(struct iio_dev *indio_dev)
 	return 0;
 
 error_clear_attrs:
-	iio_free_chan_devattr_list(&indio_dev->channel_attr_list);
+	list_for_each_entry_safe(p, n,
+				 &indio_dev->channel_attr_list, l) {
+		list_del(&p->l);
+		iio_device_remove_and_free_read_attr(indio_dev, p);
+	}
 
 	return ret;
 }
@@ -899,7 +836,12 @@ error_clear_attrs:
 static void iio_device_unregister_sysfs(struct iio_dev *indio_dev)
 {
 
-	iio_free_chan_devattr_list(&indio_dev->channel_attr_list);
+	struct iio_dev_attr *p, *n;
+
+	list_for_each_entry_safe(p, n, &indio_dev->channel_attr_list, l) {
+		list_del(&p->l);
+		iio_device_remove_and_free_read_attr(indio_dev, p);
+	}
 	kfree(indio_dev->chan_attr_group.attrs);
 }
 
@@ -911,8 +853,6 @@ static void iio_dev_release(struct device *device)
 	iio_device_unregister_eventset(indio_dev);
 	iio_device_unregister_sysfs(indio_dev);
 
-	iio_buffer_put(indio_dev->buffer);
-
 	ida_simple_remove(&iio_ida, indio_dev->id);
 	kfree(indio_dev);
 }
@@ -950,7 +890,7 @@ struct iio_dev *iio_device_alloc(int sizeof_priv)
 		dev->id = ida_simple_get(&iio_ida, 0, 0, GFP_KERNEL);
 		if (dev->id < 0) {
 			/* cannot use a dev_err as the name isn't available */
-			pr_err("failed to get device id\n");
+			printk(KERN_ERR "Failed to get id\n");
 			kfree(dev);
 			return NULL;
 		}
@@ -1055,9 +995,6 @@ static long iio_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
 	int __user *ip = (int __user *)arg;
 	int fd;
 
-	if (!indio_dev->info)
-		return -ENODEV;
-
 	if (cmd == IIO_GET_EVENT_FD_IOCTL) {
 		fd = iio_event_getfd(indio_dev);
 		if (copy_to_user(ip, &fd, sizeof(fd)))
@@ -1154,10 +1091,6 @@ void iio_device_unregister(struct iio_dev *indio_dev)
 	iio_disable_all_buffers(indio_dev);
 
 	indio_dev->info = NULL;
-
-	iio_device_wakeup_eventset(indio_dev);
-	iio_buffer_wakeup_poll(indio_dev);
-
 	mutex_unlock(&indio_dev->info_exist_lock);
 }
 EXPORT_SYMBOL(iio_device_unregister);
diff --git a/drivers/iio/industrialio-event.c b/drivers/iio/industrialio-event.c
index c10eab6..6be65ef 100644
--- a/drivers/iio/industrialio-event.c
+++ b/drivers/iio/industrialio-event.c
@@ -56,7 +56,7 @@ int iio_push_event(struct iio_dev *indio_dev, u64 ev_code, s64 timestamp)
 		ev.id = ev_code;
 		ev.timestamp = timestamp;
 
-		copied = kfifo_put(&ev_int->det_events, ev);
+		copied = kfifo_put(&ev_int->det_events, &ev);
 		if (copied != 0)
 			wake_up_locked_poll(&ev_int->wait, POLLIN);
 	}
@@ -76,9 +76,6 @@ static unsigned int iio_event_poll(struct file *filep,
 	struct iio_event_interface *ev_int = indio_dev->event_interface;
 	unsigned int events = 0;
 
-	if (!indio_dev->info)
-		return -ENODEV;
-
 	poll_wait(filep, &ev_int->wait, wait);
 
 	spin_lock_irq(&ev_int->wait.lock);
@@ -99,9 +96,6 @@ static ssize_t iio_event_chrdev_read(struct file *filep,
 	unsigned int copied;
 	int ret;
 
-	if (!indio_dev->info)
-		return -ENODEV;
-
 	if (count < sizeof(struct iio_event_data))
 		return -EINVAL;
 
@@ -113,14 +107,9 @@ static ssize_t iio_event_chrdev_read(struct file *filep,
 		}
 		/* Blocking on device; waiting for something to be there */
 		ret = wait_event_interruptible_locked_irq(ev_int->wait,
-					!kfifo_is_empty(&ev_int->det_events) ||
-					indio_dev->info == NULL);
+					!kfifo_is_empty(&ev_int->det_events));
 		if (ret)
 			goto error_unlock;
-		if (indio_dev->info == NULL) {
-			ret = -ENODEV;
-			goto error_unlock;
-		}
 		/* Single access device so no one else can get the data */
 	}
 
@@ -177,7 +166,7 @@ int iio_event_getfd(struct iio_dev *indio_dev)
 	iio_device_get(indio_dev);
 
 	fd = anon_inode_getfd("iio:event", &iio_event_chrdev_fileops,
-				indio_dev, O_RDONLY | O_CLOEXEC);
+				indio_dev, O_RDONLY);
 	if (fd < 0) {
 		spin_lock_irq(&ev_int->wait.lock);
 		__clear_bit(IIO_BUSY_BIT_POS, &ev_int->flags);
@@ -201,27 +190,6 @@ static const char * const iio_ev_dir_text[] = {
 	[IIO_EV_DIR_FALLING] = "falling"
 };
 
-static const char * const iio_ev_info_text[] = {
-	[IIO_EV_INFO_ENABLE] = "en",
-	[IIO_EV_INFO_VALUE] = "value",
-	[IIO_EV_INFO_HYSTERESIS] = "hysteresis",
-};
-
-static enum iio_event_direction iio_ev_attr_dir(struct iio_dev_attr *attr)
-{
-	return attr->c->event_spec[attr->address & 0xffff].dir;
-}
-
-static enum iio_event_type iio_ev_attr_type(struct iio_dev_attr *attr)
-{
-	return attr->c->event_spec[attr->address & 0xffff].type;
-}
-
-static enum iio_event_info iio_ev_attr_info(struct iio_dev_attr *attr)
-{
-	return (attr->address >> 16) & 0xffff;
-}
-
 static ssize_t iio_ev_state_store(struct device *dev,
 				  struct device_attribute *attr,
 				  const char *buf,
@@ -236,14 +204,9 @@ static ssize_t iio_ev_state_store(struct device *dev,
 	if (ret < 0)
 		return ret;
 
-	if (indio_dev->info->write_event_config)
-		ret = indio_dev->info->write_event_config(indio_dev,
-			this_attr->address, val);
-	else
-		ret = indio_dev->info->write_event_config_new(indio_dev,
-			this_attr->c, iio_ev_attr_type(this_attr),
-			iio_ev_attr_dir(this_attr), val);
-
+	ret = indio_dev->info->write_event_config(indio_dev,
+						  this_attr->address,
+						  val);
 	return (ret < 0) ? ret : len;
 }
 
@@ -253,15 +216,9 @@ static ssize_t iio_ev_state_show(struct device *dev,
 {
 	struct iio_dev *indio_dev = dev_to_iio_dev(dev);
 	struct iio_dev_attr *this_attr = to_iio_dev_attr(attr);
-	int val;
+	int val = indio_dev->info->read_event_config(indio_dev,
+						     this_attr->address);
 
-	if (indio_dev->info->read_event_config)
-		val = indio_dev->info->read_event_config(indio_dev,
-			this_attr->address);
-	else
-		val = indio_dev->info->read_event_config_new(indio_dev,
-			this_attr->c, iio_ev_attr_type(this_attr),
-			iio_ev_attr_dir(this_attr));
 	if (val < 0)
 		return val;
 	else
@@ -274,24 +231,14 @@ static ssize_t iio_ev_value_show(struct device *dev,
 {
 	struct iio_dev *indio_dev = dev_to_iio_dev(dev);
 	struct iio_dev_attr *this_attr = to_iio_dev_attr(attr);
-	int val, val2;
-	int ret;
+	int val, ret;
 
-	if (indio_dev->info->read_event_value) {
-		ret = indio_dev->info->read_event_value(indio_dev,
-			this_attr->address, &val);
-		if (ret < 0)
-			return ret;
-		return sprintf(buf, "%d\n", val);
-	} else {
-		ret = indio_dev->info->read_event_value_new(indio_dev,
-			this_attr->c, iio_ev_attr_type(this_attr),
-			iio_ev_attr_dir(this_attr), iio_ev_attr_info(this_attr),
-			&val, &val2);
-		if (ret < 0)
-			return ret;
-		return iio_format_value(buf, ret, val, val2);
-	}
+	ret = indio_dev->info->read_event_value(indio_dev,
+						this_attr->address, &val);
+	if (ret < 0)
+		return ret;
+
+	return sprintf(buf, "%d\n", val);
 }
 
 static ssize_t iio_ev_value_store(struct device *dev,
@@ -301,120 +248,25 @@ static ssize_t iio_ev_value_store(struct device *dev,
 {
 	struct iio_dev *indio_dev = dev_to_iio_dev(dev);
 	struct iio_dev_attr *this_attr = to_iio_dev_attr(attr);
-	int val, val2;
+	int val;
 	int ret;
 
-	if (!indio_dev->info->write_event_value &&
-		!indio_dev->info->write_event_value_new)
+	if (!indio_dev->info->write_event_value)
 		return -EINVAL;
 
-	if (indio_dev->info->write_event_value) {
-		ret = kstrtoint(buf, 10, &val);
-		if (ret)
-			return ret;
-		ret = indio_dev->info->write_event_value(indio_dev,
-			this_attr->address, val);
-	} else {
-		ret = iio_str_to_fixpoint(buf, 100000, &val, &val2);
-		if (ret)
-			return ret;
-		ret = indio_dev->info->write_event_value_new(indio_dev,
-			this_attr->c, iio_ev_attr_type(this_attr),
-			iio_ev_attr_dir(this_attr), iio_ev_attr_info(this_attr),
-			val, val2);
-	}
+	ret = kstrtoint(buf, 10, &val);
+	if (ret)
+		return ret;
+
+	ret = indio_dev->info->write_event_value(indio_dev, this_attr->address,
+						 val);
 	if (ret < 0)
 		return ret;
 
 	return len;
 }
 
-static int iio_device_add_event(struct iio_dev *indio_dev,
-	const struct iio_chan_spec *chan, unsigned int spec_index,
-	enum iio_event_type type, enum iio_event_direction dir,
-	enum iio_shared_by shared_by, const unsigned long *mask)
-{
-	ssize_t (*show)(struct device *, struct device_attribute *, char *);
-	ssize_t (*store)(struct device *, struct device_attribute *,
-		const char *, size_t);
-	unsigned int attrcount = 0;
-	unsigned int i;
-	char *postfix;
-	int ret;
-
-	for_each_set_bit(i, mask, sizeof(*mask)) {
-		postfix = kasprintf(GFP_KERNEL, "%s_%s_%s",
-				iio_ev_type_text[type], iio_ev_dir_text[dir],
-				iio_ev_info_text[i]);
-		if (postfix == NULL)
-			return -ENOMEM;
-
-		if (i == IIO_EV_INFO_ENABLE) {
-			show = iio_ev_state_show;
-			store = iio_ev_state_store;
-		} else {
-			show = iio_ev_value_show;
-			store = iio_ev_value_store;
-		}
-
-		ret = __iio_add_chan_devattr(postfix, chan, show, store,
-			 (i << 16) | spec_index, shared_by, &indio_dev->dev,
-			&indio_dev->event_interface->dev_attr_list);
-		kfree(postfix);
-
-		if (ret)
-			return ret;
-
-		attrcount++;
-	}
-
-	return attrcount;
-}
-
-static int iio_device_add_event_sysfs_new(struct iio_dev *indio_dev,
-	struct iio_chan_spec const *chan)
-{
-	int ret = 0, i, attrcount = 0;
-	enum iio_event_direction dir;
-	enum iio_event_type type;
-
-	for (i = 0; i < chan->num_event_specs; i++) {
-		type = chan->event_spec[i].type;
-		dir = chan->event_spec[i].dir;
-
-		ret = iio_device_add_event(indio_dev, chan, i, type, dir,
-			IIO_SEPARATE, &chan->event_spec[i].mask_separate);
-		if (ret < 0)
-			goto error_ret;
-		attrcount += ret;
-
-		ret = iio_device_add_event(indio_dev, chan, i, type, dir,
-			IIO_SHARED_BY_TYPE,
-			&chan->event_spec[i].mask_shared_by_type);
-		if (ret < 0)
-			goto error_ret;
-		attrcount += ret;
-
-		ret = iio_device_add_event(indio_dev, chan, i, type, dir,
-			IIO_SHARED_BY_DIR,
-			&chan->event_spec[i].mask_shared_by_dir);
-		if (ret < 0)
-			goto error_ret;
-		attrcount += ret;
-
-		ret = iio_device_add_event(indio_dev, chan, i, type, dir,
-			IIO_SHARED_BY_ALL,
-			&chan->event_spec[i].mask_shared_by_all);
-		if (ret < 0)
-			goto error_ret;
-		attrcount += ret;
-	}
-	ret = attrcount;
-error_ret:
-	return ret;
-}
-
-static int iio_device_add_event_sysfs_old(struct iio_dev *indio_dev,
+static int iio_device_add_event_sysfs(struct iio_dev *indio_dev,
 				      struct iio_chan_spec const *chan)
 {
 	int ret = 0, i, attrcount = 0;
@@ -487,14 +339,15 @@ error_ret:
 	return ret;
 }
 
-
-static int iio_device_add_event_sysfs(struct iio_dev *indio_dev,
-				      struct iio_chan_spec const *chan)
+static inline void __iio_remove_event_config_attrs(struct iio_dev *indio_dev)
 {
-	if (chan->event_mask)
-		return iio_device_add_event_sysfs_old(indio_dev, chan);
-	else
-		return iio_device_add_event_sysfs_new(indio_dev, chan);
+	struct iio_dev_attr *p, *n;
+	list_for_each_entry_safe(p, n,
+				 &indio_dev->event_interface->
+				 dev_attr_list, l) {
+		kfree(p->dev_attr.attr.name);
+		kfree(p);
+	}
 }
 
 static inline int __iio_add_event_config_attrs(struct iio_dev *indio_dev)
@@ -516,12 +369,9 @@ static bool iio_check_for_dynamic_events(struct iio_dev *indio_dev)
 {
 	int j;
 
-	for (j = 0; j < indio_dev->num_channels; j++) {
+	for (j = 0; j < indio_dev->num_channels; j++)
 		if (indio_dev->channels[j].event_mask != 0)
 			return true;
-		if (indio_dev->channels[j].num_event_specs != 0)
-			return true;
-	}
 	return false;
 }
 
@@ -591,32 +441,18 @@ int iio_device_register_eventset(struct iio_dev *indio_dev)
 	return 0;
 
 error_free_setup_event_lines:
-	iio_free_chan_devattr_list(&indio_dev->event_interface->dev_attr_list);
+	__iio_remove_event_config_attrs(indio_dev);
 	kfree(indio_dev->event_interface);
 error_ret:
 
 	return ret;
 }
 
-/**
- * iio_device_wakeup_eventset - Wakes up the event waitqueue
- * @indio_dev: The IIO device
- *
- * Wakes up the event waitqueue used for poll() and blocking read().
- * Should usually be called when the device is unregistered.
- */
-void iio_device_wakeup_eventset(struct iio_dev *indio_dev)
-{
-	if (indio_dev->event_interface == NULL)
-		return;
-	wake_up(&indio_dev->event_interface->wait);
-}
-
 void iio_device_unregister_eventset(struct iio_dev *indio_dev)
 {
 	if (indio_dev->event_interface == NULL)
 		return;
-	iio_free_chan_devattr_list(&indio_dev->event_interface->dev_attr_list);
+	__iio_remove_event_config_attrs(indio_dev);
 	kfree(indio_dev->event_interface->group.attrs);
 	kfree(indio_dev->event_interface);
 }
diff --git a/drivers/iio/industrialio-triggered-buffer.c b/drivers/iio/industrialio-triggered-buffer.c
index d6f54930..46c619b 100644
--- a/drivers/iio/industrialio-triggered-buffer.c
+++ b/drivers/iio/industrialio-triggered-buffer.c
@@ -17,6 +17,7 @@
 #include <linux/iio/trigger_consumer.h>
 
 static const struct iio_buffer_setup_ops iio_triggered_buffer_setup_ops = {
+	.preenable = &iio_sw_buffer_preenable,
 	.postenable = &iio_triggered_buffer_postenable,
 	.predisable = &iio_triggered_buffer_predisable,
 };
@@ -46,17 +47,14 @@ int iio_triggered_buffer_setup(struct iio_dev *indio_dev,
 	irqreturn_t (*pollfunc_th)(int irq, void *p),
 	const struct iio_buffer_setup_ops *setup_ops)
 {
-	struct iio_buffer *buffer;
 	int ret;
 
-	buffer = iio_kfifo_allocate(indio_dev);
-	if (!buffer) {
+	indio_dev->buffer = iio_kfifo_allocate(indio_dev);
+	if (!indio_dev->buffer) {
 		ret = -ENOMEM;
 		goto error_ret;
 	}
 
-	iio_device_attach_buffer(indio_dev, buffer);
-
 	indio_dev->pollfunc = iio_alloc_pollfunc(pollfunc_bh,
 						 pollfunc_th,
 						 IRQF_ONESHOT,
diff --git a/drivers/iio/kfifo_buf.c b/drivers/iio/kfifo_buf.c
index 95c6fc8..a923c78 100644
--- a/drivers/iio/kfifo_buf.c
+++ b/drivers/iio/kfifo_buf.c
@@ -7,12 +7,10 @@
 #include <linux/mutex.h>
 #include <linux/iio/kfifo_buf.h>
 #include <linux/sched.h>
-#include <linux/poll.h>
 
 struct iio_kfifo {
 	struct iio_buffer buffer;
 	struct kfifo kf;
-	struct mutex user_lock;
 	int update_needed;
 };
 
@@ -33,18 +31,13 @@ static int iio_request_update_kfifo(struct iio_buffer *r)
 	int ret = 0;
 	struct iio_kfifo *buf = iio_to_kfifo(r);
 
-	mutex_lock(&buf->user_lock);
-	if (buf->update_needed) {
-		kfifo_free(&buf->kf);
-		ret = __iio_allocate_kfifo(buf, buf->buffer.bytes_per_datum,
+	if (!buf->update_needed)
+		goto error_ret;
+	kfifo_free(&buf->kf);
+	ret = __iio_allocate_kfifo(buf, buf->buffer.bytes_per_datum,
 				   buf->buffer.length);
-		buf->update_needed = false;
-	} else {
-		kfifo_reset_out(&buf->kf);
-	}
 	r->stufftoread = false;
-	mutex_unlock(&buf->user_lock);
-
+error_ret:
 	return ret;
 }
 
@@ -101,7 +94,7 @@ static int iio_set_length_kfifo(struct iio_buffer *r, int length)
 }
 
 static int iio_store_to_kfifo(struct iio_buffer *r,
-			      const void *data)
+			      u8 *data)
 {
 	int ret;
 	struct iio_kfifo *kf = iio_to_kfifo(r);
@@ -109,7 +102,7 @@ static int iio_store_to_kfifo(struct iio_buffer *r,
 	if (ret != 1)
 		return -EBUSY;
 	r->stufftoread = true;
-	wake_up_interruptible_poll(&r->pollq, POLLIN | POLLRDNORM);
+	wake_up_interruptible(&r->pollq);
 
 	return 0;
 }
@@ -120,13 +113,12 @@ static int iio_read_first_n_kfifo(struct iio_buffer *r,
 	int ret, copied;
 	struct iio_kfifo *kf = iio_to_kfifo(r);
 
-	if (mutex_lock_interruptible(&kf->user_lock))
-		return -ERESTARTSYS;
+	if (n < r->bytes_per_datum || r->bytes_per_datum == 0)
+		return -EINVAL;
 
-	if (!kfifo_initialized(&kf->kf) || n < kfifo_esize(&kf->kf))
-		ret = -EINVAL;
-	else
-		ret = kfifo_to_user(&kf->kf, buf, n, &copied);
+	ret = kfifo_to_user(&kf->kf, buf, n, &copied);
+	if (ret < 0)
+		return ret;
 
 	if (kfifo_is_empty(&kf->kf))
 		r->stufftoread = false;
@@ -134,22 +126,9 @@ static int iio_read_first_n_kfifo(struct iio_buffer *r,
 	if (!kfifo_is_empty(&kf->kf))
 		r->stufftoread = true;
 
-	mutex_unlock(&kf->user_lock);
-	if (ret < 0)
-		return ret;
-
 	return copied;
 }
 
-static void iio_kfifo_buffer_release(struct iio_buffer *buffer)
-{
-	struct iio_kfifo *kf = iio_to_kfifo(buffer);
-
-	mutex_destroy(&kf->user_lock);
-	kfifo_free(&kf->kf);
-	kfree(kf);
-}
-
 static const struct iio_buffer_access_funcs kfifo_access_funcs = {
 	.store_to = &iio_store_to_kfifo,
 	.read_first_n = &iio_read_first_n_kfifo,
@@ -158,7 +137,6 @@ static const struct iio_buffer_access_funcs kfifo_access_funcs = {
 	.set_bytes_per_datum = &iio_set_bytes_per_datum_kfifo,
 	.get_length = &iio_get_length_kfifo,
 	.set_length = &iio_set_length_kfifo,
-	.release = &iio_kfifo_buffer_release,
 };
 
 struct iio_buffer *iio_kfifo_allocate(struct iio_dev *indio_dev)
@@ -173,14 +151,13 @@ struct iio_buffer *iio_kfifo_allocate(struct iio_dev *indio_dev)
 	kf->buffer.attrs = &iio_kfifo_attribute_group;
 	kf->buffer.access = &kfifo_access_funcs;
 	kf->buffer.length = 2;
-	mutex_init(&kf->user_lock);
 	return &kf->buffer;
 }
 EXPORT_SYMBOL(iio_kfifo_allocate);
 
 void iio_kfifo_free(struct iio_buffer *r)
 {
-	iio_buffer_put(r);
+	kfree(iio_to_kfifo(r));
 }
 EXPORT_SYMBOL(iio_kfifo_free);
 
diff --git a/drivers/iio/light/Kconfig b/drivers/iio/light/Kconfig
index a022f27..bf9fa0d 100644
--- a/drivers/iio/light/Kconfig
+++ b/drivers/iio/light/Kconfig
@@ -27,30 +27,6 @@ config APDS9300
 	 To compile this driver as a module, choose M here: the
 	 module will be called apds9300.
 
-config CM36651
-	depends on I2C
-	tristate "CM36651 driver"
-	help
-	 Say Y here if you use cm36651.
-	 This option enables proximity & RGB sensor using
-	 Capella cm36651 device driver.
-
-	 To compile this driver as a module, choose M here:
-	 the module will be called cm36651.
-
-config GP2AP020A00F
-	tristate "Sharp GP2AP020A00F Proximity/ALS sensor"
-	depends on I2C
-	select IIO_BUFFER
-	select IIO_TRIGGERED_BUFFER
-	select IRQ_WORK
-	help
-	  Say Y here if you have a Sharp GP2AP020A00F proximity/ALS combo-chip
-	  hooked to an I2C bus.
-
-	  To compile this driver as a module, choose M here: the
-	  module will be called gp2ap020a00f.
-
 config HID_SENSOR_ALS
 	depends on HID_SENSOR_HUB
 	select IIO_BUFFER
@@ -79,18 +55,6 @@ config SENSORS_LM3533
 	  changes. The ALS-control output values can be set per zone for the
 	  three current output channels.
 
-config TCS3472
-	tristate "TAOS TCS3472 color light-to-digital converter"
-	depends on I2C
-	select IIO_BUFFER
-	select IIO_TRIGGERED_BUFFER
-	help
-	 If you say yes here you get support for the TAOS TCS3472
-	 family of color light-to-digital converters with IR filter.
-
-	 This driver can also be built as a module.  If so, the module
-	 will be called tcs3472.
-
 config SENSORS_TSL2563
 	tristate "TAOS TSL2560, TSL2561, TSL2562 and TSL2563 ambient light sensors"
 	depends on I2C
@@ -101,16 +65,6 @@ config SENSORS_TSL2563
 	 This driver can also be built as a module.  If so, the module
 	 will be called tsl2563.
 
-config TSL4531
-	tristate "TAOS TSL4531 ambient light sensors"
-	depends on I2C
-	help
-	 Say Y here if you want to build a driver for the TAOS TSL4531 family
-	 of ambient light sensors with direct lux output.
-
-	 To compile this driver as a module, choose M here: the
-	 module will be called tsl4531.
-
 config VCNL4000
 	tristate "VCNL4000 combined ALS and proximity sensor"
 	depends on I2C
diff --git a/drivers/iio/light/Makefile b/drivers/iio/light/Makefile
index daa327f..354ee9a 100644
--- a/drivers/iio/light/Makefile
+++ b/drivers/iio/light/Makefile
@@ -5,11 +5,7 @@
 # When adding new entries keep the list in alphabetical order
 obj-$(CONFIG_ADJD_S311)		+= adjd_s311.o
 obj-$(CONFIG_APDS9300)		+= apds9300.o
-obj-$(CONFIG_CM36651)		+= cm36651.o
-obj-$(CONFIG_GP2AP020A00F)	+= gp2ap020a00f.o
 obj-$(CONFIG_HID_SENSOR_ALS)	+= hid-sensor-als.o
 obj-$(CONFIG_SENSORS_LM3533)	+= lm3533-als.o
 obj-$(CONFIG_SENSORS_TSL2563)	+= tsl2563.o
-obj-$(CONFIG_TCS3472)		+= tcs3472.o
-obj-$(CONFIG_TSL4531)		+= tsl4531.o
 obj-$(CONFIG_VCNL4000)		+= vcnl4000.o
diff --git a/drivers/iio/light/adjd_s311.c b/drivers/iio/light/adjd_s311.c
index 83d15c5..23cff79 100644
--- a/drivers/iio/light/adjd_s311.c
+++ b/drivers/iio/light/adjd_s311.c
@@ -114,6 +114,43 @@ static int adjd_s311_read_data(struct iio_dev *indio_dev, u8 reg, int *val)
 	return 0;
 }
 
+static ssize_t adjd_s311_read_int_time(struct iio_dev *indio_dev,
+	uintptr_t private, const struct iio_chan_spec *chan, char *buf)
+{
+	struct adjd_s311_data *data = iio_priv(indio_dev);
+	s32 ret;
+
+	ret = i2c_smbus_read_word_data(data->client,
+		ADJD_S311_INT_REG(chan->address));
+	if (ret < 0)
+		return ret;
+
+	return sprintf(buf, "%d\n", ret & ADJD_S311_INT_MASK);
+}
+
+static ssize_t adjd_s311_write_int_time(struct iio_dev *indio_dev,
+	 uintptr_t private, const struct iio_chan_spec *chan, const char *buf,
+	 size_t len)
+{
+	struct adjd_s311_data *data = iio_priv(indio_dev);
+	unsigned long int_time;
+	int ret;
+
+	ret = kstrtoul(buf, 10, &int_time);
+	if (ret)
+		return ret;
+
+	if (int_time > ADJD_S311_INT_MASK)
+		return -EINVAL;
+
+	ret = i2c_smbus_write_word_data(data->client,
+		ADJD_S311_INT_REG(chan->address), int_time);
+	if (ret < 0)
+		return ret;
+
+	return len;
+}
+
 static irqreturn_t adjd_s311_trigger_handler(int irq, void *p)
 {
 	struct iio_poll_func *pf = p;
@@ -138,7 +175,10 @@ static irqreturn_t adjd_s311_trigger_handler(int irq, void *p)
 		len += 2;
 	}
 
-	iio_push_to_buffers_with_timestamp(indio_dev, data->buffer, time_ns);
+	if (indio_dev->scan_timestamp)
+		*(s64 *)((u8 *)data->buffer + ALIGN(len, sizeof(s64)))
+			= time_ns;
+	iio_push_to_buffers(indio_dev, (u8 *)data->buffer);
 
 done:
 	iio_trigger_notify_done(indio_dev->trig);
@@ -146,16 +186,25 @@ done:
 	return IRQ_HANDLED;
 }
 
+static const struct iio_chan_spec_ext_info adjd_s311_ext_info[] = {
+	{
+		.name = "integration_time",
+		.read = adjd_s311_read_int_time,
+		.write = adjd_s311_write_int_time,
+	},
+	{ }
+};
+
 #define ADJD_S311_CHANNEL(_color, _scan_idx) { \
 	.type = IIO_INTENSITY, \
 	.modified = 1, \
 	.address = (IDX_##_color), \
 	.info_mask_separate = BIT(IIO_CHAN_INFO_RAW) | \
-		BIT(IIO_CHAN_INFO_HARDWAREGAIN) | \
-		BIT(IIO_CHAN_INFO_INT_TIME), \
+		BIT(IIO_CHAN_INFO_HARDWAREGAIN), \
 	.channel2 = (IIO_MOD_LIGHT_##_color), \
 	.scan_index = (_scan_idx), \
 	.scan_type = IIO_ST('u', 10, 16, 0), \
+	.ext_info = adjd_s311_ext_info, \
 }
 
 static const struct iio_chan_spec adjd_s311_channels[] = {
@@ -187,18 +236,6 @@ static int adjd_s311_read_raw(struct iio_dev *indio_dev,
 			return ret;
 		*val = ret & ADJD_S311_CAP_MASK;
 		return IIO_VAL_INT;
-	case IIO_CHAN_INFO_INT_TIME:
-		ret = i2c_smbus_read_word_data(data->client,
-			ADJD_S311_INT_REG(chan->address));
-		if (ret < 0)
-			return ret;
-		*val = 0;
-		/*
-		 * not documented, based on measurement:
-		 * 4095 LSBs correspond to roughly 4 ms
-		 */
-		*val2 = ret & ADJD_S311_INT_MASK;
-		return IIO_VAL_INT_PLUS_MICRO;
 	}
 	return -EINVAL;
 }
@@ -208,20 +245,16 @@ static int adjd_s311_write_raw(struct iio_dev *indio_dev,
 			       int val, int val2, long mask)
 {
 	struct adjd_s311_data *data = iio_priv(indio_dev);
+	int ret;
 
 	switch (mask) {
 	case IIO_CHAN_INFO_HARDWAREGAIN:
 		if (val < 0 || val > ADJD_S311_CAP_MASK)
 			return -EINVAL;
 
-		return i2c_smbus_write_byte_data(data->client,
+		ret = i2c_smbus_write_byte_data(data->client,
 			ADJD_S311_CAP_REG(chan->address), val);
-	case IIO_CHAN_INFO_INT_TIME:
-		if (val != 0 || val2 < 0 || val2 > ADJD_S311_INT_MASK)
-			return -EINVAL;
-
-		return i2c_smbus_write_word_data(data->client,
-			ADJD_S311_INT_REG(chan->address), val2);
+		return ret;
 	}
 	return -EINVAL;
 }
diff --git a/drivers/iio/light/apds9300.c b/drivers/iio/light/apds9300.c
index 51097bb..66a58bd 100644
--- a/drivers/iio/light/apds9300.c
+++ b/drivers/iio/light/apds9300.c
@@ -273,14 +273,12 @@ static int apds9300_read_raw(struct iio_dev *indio_dev,
 	return ret;
 }
 
-static int apds9300_read_thresh(struct iio_dev *indio_dev,
-		const struct iio_chan_spec *chan, enum iio_event_type type,
-		enum iio_event_direction dir, enum iio_event_info info,
-		int *val, int *val2)
+static int apds9300_read_thresh(struct iio_dev *indio_dev, u64 event_code,
+		int *val)
 {
 	struct apds9300_data *data = iio_priv(indio_dev);
 
-	switch (dir) {
+	switch (IIO_EVENT_CODE_EXTRACT_DIR(event_code)) {
 	case IIO_EV_DIR_RISING:
 		*val = data->thresh_hi;
 		break;
@@ -291,19 +289,17 @@ static int apds9300_read_thresh(struct iio_dev *indio_dev,
 		return -EINVAL;
 	}
 
-	return IIO_VAL_INT;
+	return 0;
 }
 
-static int apds9300_write_thresh(struct iio_dev *indio_dev,
-		const struct iio_chan_spec *chan, enum iio_event_type type,
-		enum iio_event_direction dir, enum iio_event_info info, int val,
-		int val2)
+static int apds9300_write_thresh(struct iio_dev *indio_dev, u64 event_code,
+		int val)
 {
 	struct apds9300_data *data = iio_priv(indio_dev);
 	int ret;
 
 	mutex_lock(&data->mutex);
-	if (dir == IIO_EV_DIR_RISING)
+	if (IIO_EVENT_CODE_EXTRACT_DIR(event_code) == IIO_EV_DIR_RISING)
 		ret = apds9300_set_thresh_hi(data, val);
 	else
 		ret = apds9300_set_thresh_low(data, val);
@@ -313,9 +309,7 @@ static int apds9300_write_thresh(struct iio_dev *indio_dev,
 }
 
 static int apds9300_read_interrupt_config(struct iio_dev *indio_dev,
-		const struct iio_chan_spec *chan,
-		enum iio_event_type type,
-		enum iio_event_direction dir)
+		u64 event_code)
 {
 	struct apds9300_data *data = iio_priv(indio_dev);
 
@@ -323,8 +317,7 @@ static int apds9300_read_interrupt_config(struct iio_dev *indio_dev,
 }
 
 static int apds9300_write_interrupt_config(struct iio_dev *indio_dev,
-		const struct iio_chan_spec *chan, enum iio_event_type type,
-		enum iio_event_direction dir, int state)
+		u64 event_code, int state)
 {
 	struct apds9300_data *data = iio_priv(indio_dev);
 	int ret;
@@ -344,24 +337,10 @@ static const struct iio_info apds9300_info_no_irq = {
 static const struct iio_info apds9300_info = {
 	.driver_module		= THIS_MODULE,
 	.read_raw		= apds9300_read_raw,
-	.read_event_value_new	= apds9300_read_thresh,
-	.write_event_value_new	= apds9300_write_thresh,
-	.read_event_config_new	= apds9300_read_interrupt_config,
-	.write_event_config_new	= apds9300_write_interrupt_config,
-};
-
-static const struct iio_event_spec apds9300_event_spec[] = {
-	{
-		.type = IIO_EV_TYPE_THRESH,
-		.dir = IIO_EV_DIR_RISING,
-		.mask_separate = BIT(IIO_EV_INFO_VALUE) |
-			BIT(IIO_EV_INFO_ENABLE),
-	}, {
-		.type = IIO_EV_TYPE_THRESH,
-		.dir = IIO_EV_DIR_FALLING,
-		.mask_separate = BIT(IIO_EV_INFO_VALUE) |
-			BIT(IIO_EV_INFO_ENABLE),
-	},
+	.read_event_value	= apds9300_read_thresh,
+	.write_event_value	= apds9300_write_thresh,
+	.read_event_config	= apds9300_read_interrupt_config,
+	.write_event_config	= apds9300_write_interrupt_config,
 };
 
 static const struct iio_chan_spec apds9300_channels[] = {
@@ -376,8 +355,10 @@ static const struct iio_chan_spec apds9300_channels[] = {
 		.channel2 = IIO_MOD_LIGHT_BOTH,
 		.indexed = true,
 		.info_mask_separate = BIT(IIO_CHAN_INFO_RAW),
-		.event_spec = apds9300_event_spec,
-		.num_event_specs = ARRAY_SIZE(apds9300_event_spec),
+		.event_mask = (IIO_EV_BIT(IIO_EV_TYPE_THRESH,
+					  IIO_EV_DIR_RISING) |
+			       IIO_EV_BIT(IIO_EV_TYPE_THRESH,
+					  IIO_EV_DIR_FALLING)),
 	}, {
 		.type = IIO_INTENSITY,
 		.channel = 1,
diff --git a/drivers/iio/light/cm36651.c b/drivers/iio/light/cm36651.c
deleted file mode 100644
index 21df571..0000000
--- a/drivers/iio/light/cm36651.c
+++ /dev/null
@@ -1,708 +0,0 @@
-/*
- * Copyright (C) 2013 Samsung Electronics Co., Ltd.
- * Author: Beomho Seo <beomho.seo@samsung.com>
- *
- * 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 <linux/delay.h>
-#include <linux/err.h>
-#include <linux/i2c.h>
-#include <linux/mutex.h>
-#include <linux/module.h>
-#include <linux/interrupt.h>
-#include <linux/regulator/consumer.h>
-#include <linux/iio/iio.h>
-#include <linux/iio/sysfs.h>
-#include <linux/iio/events.h>
-
-/* Slave address 0x19 for PS of 7 bit addressing protocol for I2C */
-#define CM36651_I2C_ADDR_PS		0x19
-/* Alert Response Address */
-#define CM36651_ARA			0x0C
-
-/* Ambient light sensor */
-#define CM36651_CS_CONF1		0x00
-#define CM36651_CS_CONF2		0x01
-#define CM36651_ALS_WH_M		0x02
-#define CM36651_ALS_WH_L		0x03
-#define CM36651_ALS_WL_M		0x04
-#define CM36651_ALS_WL_L		0x05
-#define CM36651_CS_CONF3		0x06
-#define CM36651_CS_CONF_REG_NUM		0x02
-
-/* Proximity sensor */
-#define CM36651_PS_CONF1		0x00
-#define CM36651_PS_THD			0x01
-#define CM36651_PS_CANC			0x02
-#define CM36651_PS_CONF2		0x03
-#define CM36651_PS_REG_NUM		0x04
-
-/* CS_CONF1 command code */
-#define CM36651_ALS_ENABLE		0x00
-#define CM36651_ALS_DISABLE		0x01
-#define CM36651_ALS_INT_EN		0x02
-#define CM36651_ALS_THRES		0x04
-
-/* CS_CONF2 command code */
-#define CM36651_CS_CONF2_DEFAULT_BIT	0x08
-
-/* CS_CONF3 channel integration time */
-#define CM36651_CS_IT1			0x00 /* Integration time 80000 usec */
-#define CM36651_CS_IT2			0x40 /* Integration time 160000 usec */
-#define CM36651_CS_IT3			0x80 /* Integration time 320000 usec */
-#define CM36651_CS_IT4			0xC0 /* Integration time 640000 usec */
-
-/* PS_CONF1 command code */
-#define CM36651_PS_ENABLE		0x00
-#define CM36651_PS_DISABLE		0x01
-#define CM36651_PS_INT_EN		0x02
-#define CM36651_PS_PERS2		0x04
-#define CM36651_PS_PERS3		0x08
-#define CM36651_PS_PERS4		0x0C
-
-/* PS_CONF1 command code: integration time */
-#define CM36651_PS_IT1			0x00 /* Integration time 320 usec */
-#define CM36651_PS_IT2			0x10 /* Integration time 420 usec */
-#define CM36651_PS_IT3			0x20 /* Integration time 520 usec */
-#define CM36651_PS_IT4			0x30 /* Integration time 640 usec */
-
-/* PS_CONF1 command code: duty ratio */
-#define CM36651_PS_DR1			0x00 /* Duty ratio 1/80 */
-#define CM36651_PS_DR2			0x40 /* Duty ratio 1/160 */
-#define CM36651_PS_DR3			0x80 /* Duty ratio 1/320 */
-#define CM36651_PS_DR4			0xC0 /* Duty ratio 1/640 */
-
-/* PS_THD command code */
-#define CM36651_PS_INITIAL_THD		0x05
-
-/* PS_CANC command code */
-#define CM36651_PS_CANC_DEFAULT		0x00
-
-/* PS_CONF2 command code */
-#define CM36651_PS_HYS1			0x00
-#define CM36651_PS_HYS2			0x01
-#define CM36651_PS_SMART_PERS_EN	0x02
-#define CM36651_PS_DIR_INT		0x04
-#define CM36651_PS_MS			0x10
-
-#define CM36651_CS_COLOR_NUM		4
-
-#define CM36651_CLOSE_PROXIMITY		0x32
-#define CM36651_FAR_PROXIMITY			0x33
-
-#define CM36651_CS_INT_TIME_AVAIL	"80000 160000 320000 640000"
-#define CM36651_PS_INT_TIME_AVAIL	"320 420 520 640"
-
-enum cm36651_operation_mode {
-	CM36651_LIGHT_EN,
-	CM36651_PROXIMITY_EN,
-	CM36651_PROXIMITY_EV_EN,
-};
-
-enum cm36651_light_channel_idx {
-	CM36651_LIGHT_CHANNEL_IDX_RED,
-	CM36651_LIGHT_CHANNEL_IDX_GREEN,
-	CM36651_LIGHT_CHANNEL_IDX_BLUE,
-	CM36651_LIGHT_CHANNEL_IDX_CLEAR,
-};
-
-enum cm36651_command {
-	CM36651_CMD_READ_RAW_LIGHT,
-	CM36651_CMD_READ_RAW_PROXIMITY,
-	CM36651_CMD_PROX_EV_EN,
-	CM36651_CMD_PROX_EV_DIS,
-};
-
-static const u8 cm36651_cs_reg[CM36651_CS_CONF_REG_NUM] = {
-	CM36651_CS_CONF1,
-	CM36651_CS_CONF2,
-};
-
-static const u8 cm36651_ps_reg[CM36651_PS_REG_NUM] = {
-	CM36651_PS_CONF1,
-	CM36651_PS_THD,
-	CM36651_PS_CANC,
-	CM36651_PS_CONF2,
-};
-
-struct cm36651_data {
-	const struct cm36651_platform_data *pdata;
-	struct i2c_client *client;
-	struct i2c_client *ps_client;
-	struct i2c_client *ara_client;
-	struct mutex lock;
-	struct regulator *vled_reg;
-	unsigned long flags;
-	int cs_int_time[CM36651_CS_COLOR_NUM];
-	int ps_int_time;
-	u8 cs_ctrl_regs[CM36651_CS_CONF_REG_NUM];
-	u8 ps_ctrl_regs[CM36651_PS_REG_NUM];
-	u16 color[CM36651_CS_COLOR_NUM];
-};
-
-static int cm36651_setup_reg(struct cm36651_data *cm36651)
-{
-	struct i2c_client *client = cm36651->client;
-	struct i2c_client *ps_client = cm36651->ps_client;
-	int i, ret;
-
-	/* CS initialization */
-	cm36651->cs_ctrl_regs[CM36651_CS_CONF1] = CM36651_ALS_ENABLE |
-							     CM36651_ALS_THRES;
-	cm36651->cs_ctrl_regs[CM36651_CS_CONF2] = CM36651_CS_CONF2_DEFAULT_BIT;
-
-	for (i = 0; i < CM36651_CS_CONF_REG_NUM; i++) {
-		ret = i2c_smbus_write_byte_data(client, cm36651_cs_reg[i],
-						     cm36651->cs_ctrl_regs[i]);
-		if (ret < 0)
-			return ret;
-	}
-
-	/* PS initialization */
-	cm36651->ps_ctrl_regs[CM36651_PS_CONF1] = CM36651_PS_ENABLE |
-								CM36651_PS_IT2;
-	cm36651->ps_ctrl_regs[CM36651_PS_THD] = CM36651_PS_INITIAL_THD;
-	cm36651->ps_ctrl_regs[CM36651_PS_CANC] = CM36651_PS_CANC_DEFAULT;
-	cm36651->ps_ctrl_regs[CM36651_PS_CONF2] = CM36651_PS_HYS2 |
-				CM36651_PS_DIR_INT | CM36651_PS_SMART_PERS_EN;
-
-	for (i = 0; i < CM36651_PS_REG_NUM; i++) {
-		ret = i2c_smbus_write_byte_data(ps_client, cm36651_ps_reg[i],
-						     cm36651->ps_ctrl_regs[i]);
-		if (ret < 0)
-			return ret;
-	}
-
-	/* Set shutdown mode */
-	ret = i2c_smbus_write_byte_data(client, CM36651_CS_CONF1,
-							  CM36651_ALS_DISABLE);
-	if (ret < 0)
-		return ret;
-
-	ret = i2c_smbus_write_byte_data(cm36651->ps_client,
-					 CM36651_PS_CONF1, CM36651_PS_DISABLE);
-	if (ret < 0)
-		return ret;
-
-	return 0;
-}
-
-static int cm36651_read_output(struct cm36651_data *cm36651,
-				struct iio_chan_spec const *chan, int *val)
-{
-	struct i2c_client *client = cm36651->client;
-	int ret = -EINVAL;
-
-	switch (chan->type) {
-	case IIO_LIGHT:
-		*val = i2c_smbus_read_word_data(client, chan->address);
-		if (*val < 0)
-			return ret;
-
-		ret = i2c_smbus_write_byte_data(client, CM36651_CS_CONF1,
-							CM36651_ALS_DISABLE);
-		if (ret < 0)
-			return ret;
-
-		ret = IIO_VAL_INT;
-		break;
-	case IIO_PROXIMITY:
-		*val = i2c_smbus_read_byte(cm36651->ps_client);
-		if (*val < 0)
-			return ret;
-
-		if (!test_bit(CM36651_PROXIMITY_EV_EN, &cm36651->flags)) {
-			ret = i2c_smbus_write_byte_data(cm36651->ps_client,
-					CM36651_PS_CONF1, CM36651_PS_DISABLE);
-			if (ret < 0)
-				return ret;
-		}
-
-		ret = IIO_VAL_INT;
-		break;
-	default:
-		break;
-	}
-
-	return ret;
-}
-
-static irqreturn_t cm36651_irq_handler(int irq, void *data)
-{
-	struct iio_dev *indio_dev = data;
-	struct cm36651_data *cm36651 = iio_priv(indio_dev);
-	struct i2c_client *client = cm36651->client;
-	int ev_dir, ret;
-	u64 ev_code;
-
-	/*
-	 * The PS INT pin is an active low signal that PS INT move logic low
-	 * when the object is detect. Once the MCU host received the PS INT
-	 * "LOW" signal, the Host needs to read the data at Alert Response
-	 * Address(ARA) to clear the PS INT signal. After clearing the PS
-	 * INT pin, the PS INT signal toggles from low to high.
-	 */
-	ret = i2c_smbus_read_byte(cm36651->ara_client);
-	if (ret < 0) {
-		dev_err(&client->dev,
-				"%s: Data read failed: %d\n", __func__, ret);
-		return IRQ_HANDLED;
-	}
-	switch (ret) {
-	case CM36651_CLOSE_PROXIMITY:
-		ev_dir = IIO_EV_DIR_RISING;
-		break;
-	case CM36651_FAR_PROXIMITY:
-		ev_dir = IIO_EV_DIR_FALLING;
-		break;
-	default:
-		dev_err(&client->dev,
-			"%s: Data read wrong: %d\n", __func__, ret);
-		return IRQ_HANDLED;
-	}
-
-	ev_code = IIO_UNMOD_EVENT_CODE(IIO_PROXIMITY,
-				CM36651_CMD_READ_RAW_PROXIMITY,
-				IIO_EV_TYPE_THRESH, ev_dir);
-
-	iio_push_event(indio_dev, ev_code, iio_get_time_ns());
-
-	return IRQ_HANDLED;
-}
-
-static int cm36651_set_operation_mode(struct cm36651_data *cm36651, int cmd)
-{
-	struct i2c_client *client = cm36651->client;
-	struct i2c_client *ps_client = cm36651->ps_client;
-	int ret = -EINVAL;
-
-	switch (cmd) {
-	case CM36651_CMD_READ_RAW_LIGHT:
-		ret = i2c_smbus_write_byte_data(client, CM36651_CS_CONF1,
-				cm36651->cs_ctrl_regs[CM36651_CS_CONF1]);
-		break;
-	case CM36651_CMD_READ_RAW_PROXIMITY:
-		if (test_bit(CM36651_PROXIMITY_EV_EN, &cm36651->flags))
-			return CM36651_PROXIMITY_EV_EN;
-
-		ret = i2c_smbus_write_byte_data(ps_client, CM36651_PS_CONF1,
-				cm36651->ps_ctrl_regs[CM36651_PS_CONF1]);
-		break;
-	case CM36651_CMD_PROX_EV_EN:
-		if (test_bit(CM36651_PROXIMITY_EV_EN, &cm36651->flags)) {
-			dev_err(&client->dev,
-				"Already proximity event enable state\n");
-			return ret;
-		}
-		set_bit(CM36651_PROXIMITY_EV_EN, &cm36651->flags);
-
-		ret = i2c_smbus_write_byte_data(ps_client,
-			cm36651_ps_reg[CM36651_PS_CONF1],
-			CM36651_PS_INT_EN | CM36651_PS_PERS2 | CM36651_PS_IT2);
-
-		if (ret < 0) {
-			dev_err(&client->dev, "Proximity enable event failed\n");
-			return ret;
-		}
-		break;
-	case CM36651_CMD_PROX_EV_DIS:
-		if (!test_bit(CM36651_PROXIMITY_EV_EN, &cm36651->flags)) {
-			dev_err(&client->dev,
-				"Already proximity event disable state\n");
-			return ret;
-		}
-		clear_bit(CM36651_PROXIMITY_EV_EN, &cm36651->flags);
-		ret = i2c_smbus_write_byte_data(ps_client,
-					CM36651_PS_CONF1, CM36651_PS_DISABLE);
-		break;
-	}
-
-	if (ret < 0)
-		dev_err(&client->dev, "Write register failed\n");
-
-	return ret;
-}
-
-static int cm36651_read_channel(struct cm36651_data *cm36651,
-				struct iio_chan_spec const *chan, int *val)
-{
-	struct i2c_client *client = cm36651->client;
-	int cmd, ret;
-
-	if (chan->type == IIO_LIGHT)
-		cmd = CM36651_CMD_READ_RAW_LIGHT;
-	else if (chan->type == IIO_PROXIMITY)
-		cmd = CM36651_CMD_READ_RAW_PROXIMITY;
-	else
-		return -EINVAL;
-
-	ret = cm36651_set_operation_mode(cm36651, cmd);
-	if (ret < 0) {
-		dev_err(&client->dev, "CM36651 set operation mode failed\n");
-		return ret;
-	}
-	/* Delay for work after enable operation */
-	msleep(50);
-	ret = cm36651_read_output(cm36651, chan, val);
-	if (ret < 0) {
-		dev_err(&client->dev, "CM36651 read output failed\n");
-		return ret;
-	}
-
-	return ret;
-}
-
-static int cm36651_read_int_time(struct cm36651_data *cm36651,
-				struct iio_chan_spec const *chan, int *val)
-{
-	switch (chan->type) {
-	case IIO_LIGHT:
-		if (cm36651->cs_int_time[chan->address] == CM36651_CS_IT1)
-			*val = 80000;
-		else if (cm36651->cs_int_time[chan->address] == CM36651_CS_IT2)
-			*val = 160000;
-		else if (cm36651->cs_int_time[chan->address] == CM36651_CS_IT3)
-			*val = 320000;
-		else if (cm36651->cs_int_time[chan->address] == CM36651_CS_IT4)
-			*val = 640000;
-		else
-			return -EINVAL;
-		break;
-	case IIO_PROXIMITY:
-		if (cm36651->ps_int_time == CM36651_PS_IT1)
-			*val = 320;
-		else if (cm36651->ps_int_time == CM36651_PS_IT2)
-			*val = 420;
-		else if (cm36651->ps_int_time == CM36651_PS_IT3)
-			*val = 520;
-		else if (cm36651->ps_int_time == CM36651_PS_IT4)
-			*val = 640;
-		else
-			return -EINVAL;
-		break;
-	default:
-		return -EINVAL;
-	}
-
-	return IIO_VAL_INT_PLUS_MICRO;
-}
-
-static int cm36651_write_int_time(struct cm36651_data *cm36651,
-				struct iio_chan_spec const *chan, int val)
-{
-	struct i2c_client *client = cm36651->client;
-	struct i2c_client *ps_client = cm36651->ps_client;
-	int int_time, ret;
-
-	switch (chan->type) {
-	case IIO_LIGHT:
-		if (val == 80000)
-			int_time = CM36651_CS_IT1;
-		else if (val == 160000)
-			int_time = CM36651_CS_IT2;
-		else if (val == 320000)
-			int_time = CM36651_CS_IT3;
-		else if (val == 640000)
-			int_time = CM36651_CS_IT4;
-		else
-			return -EINVAL;
-
-		ret = i2c_smbus_write_byte_data(client, CM36651_CS_CONF3,
-					   int_time >> 2 * (chan->address));
-		if (ret < 0) {
-			dev_err(&client->dev, "CS integration time write failed\n");
-			return ret;
-		}
-		cm36651->cs_int_time[chan->address] = int_time;
-		break;
-	case IIO_PROXIMITY:
-		if (val == 320)
-			int_time = CM36651_PS_IT1;
-		else if (val == 420)
-			int_time = CM36651_PS_IT2;
-		else if (val == 520)
-			int_time = CM36651_PS_IT3;
-		else if (val == 640)
-			int_time = CM36651_PS_IT4;
-		else
-			return -EINVAL;
-
-		ret = i2c_smbus_write_byte_data(ps_client,
-						CM36651_PS_CONF1, int_time);
-		if (ret < 0) {
-			dev_err(&client->dev, "PS integration time write failed\n");
-			return ret;
-		}
-		cm36651->ps_int_time = int_time;
-		break;
-	default:
-		return -EINVAL;
-	}
-
-	return ret;
-}
-
-static int cm36651_read_raw(struct iio_dev *indio_dev,
-			    struct iio_chan_spec const *chan,
-			    int *val, int *val2, long mask)
-{
-	struct cm36651_data *cm36651 = iio_priv(indio_dev);
-	int ret;
-
-	mutex_lock(&cm36651->lock);
-
-	switch (mask) {
-	case IIO_CHAN_INFO_RAW:
-		ret = cm36651_read_channel(cm36651, chan, val);
-		break;
-	case IIO_CHAN_INFO_INT_TIME:
-		ret = cm36651_read_int_time(cm36651, chan, val);
-		break;
-	default:
-		ret = -EINVAL;
-	}
-
-	mutex_unlock(&cm36651->lock);
-
-	return ret;
-}
-
-static int cm36651_write_raw(struct iio_dev *indio_dev,
-			     struct iio_chan_spec const *chan,
-			     int val, int val2, long mask)
-{
-	struct cm36651_data *cm36651 = iio_priv(indio_dev);
-	struct i2c_client *client = cm36651->client;
-	int ret = -EINVAL;
-
-	if (mask == IIO_CHAN_INFO_INT_TIME) {
-		ret = cm36651_write_int_time(cm36651, chan, val);
-		if (ret < 0)
-			dev_err(&client->dev, "Integration time write failed\n");
-	}
-
-	return ret;
-}
-
-static int cm36651_read_prox_thresh(struct iio_dev *indio_dev,
-					u64 event_code, int *val)
-{
-	struct cm36651_data *cm36651 = iio_priv(indio_dev);
-
-	*val = cm36651->ps_ctrl_regs[CM36651_PS_THD];
-
-	return 0;
-}
-
-static int cm36651_write_prox_thresh(struct iio_dev *indio_dev,
-					u64 event_code, int val)
-{
-	struct cm36651_data *cm36651 = iio_priv(indio_dev);
-	struct i2c_client *client = cm36651->client;
-	int ret;
-
-	if (val < 3 || val > 255)
-		return -EINVAL;
-
-	cm36651->ps_ctrl_regs[CM36651_PS_THD] = val;
-	ret = i2c_smbus_write_byte_data(cm36651->ps_client, CM36651_PS_THD,
-					cm36651->ps_ctrl_regs[CM36651_PS_THD]);
-
-	if (ret < 0) {
-		dev_err(&client->dev, "PS threshold write failed: %d\n", ret);
-		return ret;
-	}
-
-	return 0;
-}
-
-static int cm36651_write_prox_event_config(struct iio_dev *indio_dev,
-					u64 event_code, int state)
-{
-	struct cm36651_data *cm36651 = iio_priv(indio_dev);
-	int cmd, ret = -EINVAL;
-
-	mutex_lock(&cm36651->lock);
-
-	cmd = state ? CM36651_CMD_PROX_EV_EN : CM36651_CMD_PROX_EV_DIS;
-	ret = cm36651_set_operation_mode(cm36651, cmd);
-
-	mutex_unlock(&cm36651->lock);
-
-	return ret;
-}
-
-static int cm36651_read_prox_event_config(struct iio_dev *indio_dev,
-							u64 event_code)
-{
-	struct cm36651_data *cm36651 = iio_priv(indio_dev);
-	int event_en;
-
-	mutex_lock(&cm36651->lock);
-
-	event_en = test_bit(CM36651_PROXIMITY_EV_EN, &cm36651->flags);
-
-	mutex_unlock(&cm36651->lock);
-
-	return event_en;
-}
-
-#define CM36651_LIGHT_CHANNEL(_color, _idx) {		\
-	.type = IIO_LIGHT,				\
-	.info_mask_separate = BIT(IIO_CHAN_INFO_RAW) |	\
-			BIT(IIO_CHAN_INFO_INT_TIME),	\
-	.address = _idx,				\
-	.modified = 1,					\
-	.channel2 = IIO_MOD_LIGHT_##_color,		\
-}							\
-
-static const struct iio_chan_spec cm36651_channels[] = {
-	{
-		.type = IIO_PROXIMITY,
-		.info_mask_separate = BIT(IIO_CHAN_INFO_RAW) |
-				BIT(IIO_CHAN_INFO_INT_TIME),
-		.event_mask = IIO_EV_BIT(IIO_EV_TYPE_THRESH, IIO_EV_DIR_EITHER)
-	},
-	CM36651_LIGHT_CHANNEL(RED, CM36651_LIGHT_CHANNEL_IDX_RED),
-	CM36651_LIGHT_CHANNEL(GREEN, CM36651_LIGHT_CHANNEL_IDX_GREEN),
-	CM36651_LIGHT_CHANNEL(BLUE, CM36651_LIGHT_CHANNEL_IDX_BLUE),
-	CM36651_LIGHT_CHANNEL(CLEAR, CM36651_LIGHT_CHANNEL_IDX_CLEAR),
-};
-
-static IIO_CONST_ATTR(in_illuminance_integration_time_available,
-					CM36651_CS_INT_TIME_AVAIL);
-static IIO_CONST_ATTR(in_proximity_integration_time_available,
-					CM36651_PS_INT_TIME_AVAIL);
-
-static struct attribute *cm36651_attributes[] = {
-	&iio_const_attr_in_illuminance_integration_time_available.dev_attr.attr,
-	&iio_const_attr_in_proximity_integration_time_available.dev_attr.attr,
-	NULL,
-};
-
-static const struct attribute_group cm36651_attribute_group = {
-	.attrs = cm36651_attributes
-};
-
-static const struct iio_info cm36651_info = {
-	.driver_module		= THIS_MODULE,
-	.read_raw		= &cm36651_read_raw,
-	.write_raw		= &cm36651_write_raw,
-	.read_event_value	= &cm36651_read_prox_thresh,
-	.write_event_value	= &cm36651_write_prox_thresh,
-	.read_event_config	= &cm36651_read_prox_event_config,
-	.write_event_config	= &cm36651_write_prox_event_config,
-	.attrs			= &cm36651_attribute_group,
-};
-
-static int cm36651_probe(struct i2c_client *client,
-			     const struct i2c_device_id *id)
-{
-	struct cm36651_data *cm36651;
-	struct iio_dev *indio_dev;
-	int ret;
-
-	indio_dev = devm_iio_device_alloc(&client->dev, sizeof(*cm36651));
-	if (!indio_dev)
-		return -ENOMEM;
-
-	cm36651 = iio_priv(indio_dev);
-
-	cm36651->vled_reg = devm_regulator_get(&client->dev, "vled");
-	if (IS_ERR(cm36651->vled_reg)) {
-		dev_err(&client->dev, "get regulator vled failed\n");
-		return PTR_ERR(cm36651->vled_reg);
-	}
-
-	ret = regulator_enable(cm36651->vled_reg);
-	if (ret) {
-		dev_err(&client->dev, "enable regulator vled failed\n");
-		return ret;
-	}
-
-	i2c_set_clientdata(client, indio_dev);
-
-	cm36651->client = client;
-	cm36651->ps_client = i2c_new_dummy(client->adapter,
-						     CM36651_I2C_ADDR_PS);
-	cm36651->ara_client = i2c_new_dummy(client->adapter, CM36651_ARA);
-	mutex_init(&cm36651->lock);
-	indio_dev->dev.parent = &client->dev;
-	indio_dev->channels = cm36651_channels;
-	indio_dev->num_channels = ARRAY_SIZE(cm36651_channels);
-	indio_dev->info = &cm36651_info;
-	indio_dev->name = id->name;
-	indio_dev->modes = INDIO_DIRECT_MODE;
-
-	ret = cm36651_setup_reg(cm36651);
-	if (ret) {
-		dev_err(&client->dev, "%s: register setup failed\n", __func__);
-		goto error_disable_reg;
-	}
-
-	ret = request_threaded_irq(client->irq, NULL, cm36651_irq_handler,
-					IRQF_TRIGGER_FALLING | IRQF_ONESHOT,
-							"cm36651", indio_dev);
-	if (ret) {
-		dev_err(&client->dev, "%s: request irq failed\n", __func__);
-		goto error_disable_reg;
-	}
-
-	ret = iio_device_register(indio_dev);
-	if (ret) {
-		dev_err(&client->dev, "%s: regist device failed\n", __func__);
-		goto error_free_irq;
-	}
-
-	return 0;
-
-error_free_irq:
-	free_irq(client->irq, indio_dev);
-error_disable_reg:
-	regulator_disable(cm36651->vled_reg);
-	return ret;
-}
-
-static int cm36651_remove(struct i2c_client *client)
-{
-	struct iio_dev *indio_dev = i2c_get_clientdata(client);
-	struct cm36651_data *cm36651 = iio_priv(indio_dev);
-
-	iio_device_unregister(indio_dev);
-	regulator_disable(cm36651->vled_reg);
-	free_irq(client->irq, indio_dev);
-
-	return 0;
-}
-
-static const struct i2c_device_id cm36651_id[] = {
-	{ "cm36651", 0 },
-	{ }
-};
-
-MODULE_DEVICE_TABLE(i2c, cm36651_id);
-
-static const struct of_device_id cm36651_of_match[] = {
-	{ .compatible = "capella,cm36651" },
-	{ }
-};
-
-static struct i2c_driver cm36651_driver = {
-	.driver = {
-		.name	= "cm36651",
-		.of_match_table = of_match_ptr(cm36651_of_match),
-		.owner	= THIS_MODULE,
-	},
-	.probe		= cm36651_probe,
-	.remove		= cm36651_remove,
-	.id_table	= cm36651_id,
-};
-
-module_i2c_driver(cm36651_driver);
-
-MODULE_AUTHOR("Beomho Seo <beomho.seo@samsung.com>");
-MODULE_DESCRIPTION("CM36651 proximity/ambient light sensor driver");
-MODULE_LICENSE("GPL v2");
diff --git a/drivers/iio/light/gp2ap020a00f.c b/drivers/iio/light/gp2ap020a00f.c
deleted file mode 100644
index dc79835..0000000
--- a/drivers/iio/light/gp2ap020a00f.c
+++ /dev/null
@@ -1,1654 +0,0 @@
-/*
- * Copyright (C) 2013 Samsung Electronics Co., Ltd.
- * Author: Jacek Anaszewski <j.anaszewski@samsung.com>
- *
- * IIO features supported by the driver:
- *
- * Read-only raw channels:
- *   - illiminance_clear [lux]
- *   - illiminance_ir
- *   - proximity
- *
- * Triggered buffer:
- *   - illiminance_clear
- *   - illiminance_ir
- *   - proximity
- *
- * Events:
- *   - illuminance_clear (rising and falling)
- *   - proximity (rising and falling)
- *     - both falling and rising thresholds for the proximity events
- *       must be set to the values greater than 0.
- *
- * The driver supports triggered buffers for all the three
- * channels as well as high and low threshold events for the
- * illuminance_clear and proxmimity channels. Triggers
- * can be enabled simultaneously with both illuminance_clear
- * events. Proximity events cannot be enabled simultaneously
- * with any triggers or illuminance events. Enabling/disabling
- * one of the proximity events automatically enables/disables
- * the other one.
- *
- * 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 <linux/debugfs.h>
-#include <linux/delay.h>
-#include <linux/i2c.h>
-#include <linux/interrupt.h>
-#include <linux/irq.h>
-#include <linux/irq_work.h>
-#include <linux/module.h>
-#include <linux/mutex.h>
-#include <linux/of.h>
-#include <linux/regmap.h>
-#include <linux/regulator/consumer.h>
-#include <linux/slab.h>
-#include <linux/iio/buffer.h>
-#include <linux/iio/events.h>
-#include <linux/iio/iio.h>
-#include <linux/iio/sysfs.h>
-#include <linux/iio/trigger.h>
-#include <linux/iio/trigger_consumer.h>
-#include <linux/iio/triggered_buffer.h>
-
-#define GP2A_I2C_NAME "gp2ap020a00f"
-
-/* Registers */
-#define GP2AP020A00F_OP_REG	0x00 /* Basic operations */
-#define GP2AP020A00F_ALS_REG	0x01 /* ALS related settings */
-#define GP2AP020A00F_PS_REG	0x02 /* PS related settings */
-#define GP2AP020A00F_LED_REG	0x03 /* LED reg */
-#define GP2AP020A00F_TL_L_REG	0x04 /* ALS: Threshold low LSB */
-#define GP2AP020A00F_TL_H_REG	0x05 /* ALS: Threshold low MSB */
-#define GP2AP020A00F_TH_L_REG	0x06 /* ALS: Threshold high LSB */
-#define GP2AP020A00F_TH_H_REG	0x07 /* ALS: Threshold high MSB */
-#define GP2AP020A00F_PL_L_REG	0x08 /* PS: Threshold low LSB */
-#define GP2AP020A00F_PL_H_REG	0x09 /* PS: Threshold low MSB */
-#define GP2AP020A00F_PH_L_REG	0x0a /* PS: Threshold high LSB */
-#define GP2AP020A00F_PH_H_REG	0x0b /* PS: Threshold high MSB */
-#define GP2AP020A00F_D0_L_REG	0x0c /* ALS result: Clear/Illuminance LSB */
-#define GP2AP020A00F_D0_H_REG	0x0d /* ALS result: Clear/Illuminance MSB */
-#define GP2AP020A00F_D1_L_REG	0x0e /* ALS result: IR LSB */
-#define GP2AP020A00F_D1_H_REG	0x0f /* ALS result: IR LSB */
-#define GP2AP020A00F_D2_L_REG	0x10 /* PS result LSB */
-#define GP2AP020A00F_D2_H_REG	0x11 /* PS result MSB */
-#define GP2AP020A00F_NUM_REGS	0x12 /* Number of registers */
-
-/* OP_REG bits */
-#define GP2AP020A00F_OP3_MASK		0x80 /* Software shutdown */
-#define GP2AP020A00F_OP3_SHUTDOWN	0x00
-#define GP2AP020A00F_OP3_OPERATION	0x80
-#define GP2AP020A00F_OP2_MASK		0x40 /* Auto shutdown/Continuous mode */
-#define GP2AP020A00F_OP2_AUTO_SHUTDOWN	0x00
-#define GP2AP020A00F_OP2_CONT_OPERATION	0x40
-#define GP2AP020A00F_OP_MASK		0x30 /* Operating mode selection  */
-#define GP2AP020A00F_OP_ALS_AND_PS	0x00
-#define GP2AP020A00F_OP_ALS		0x10
-#define GP2AP020A00F_OP_PS		0x20
-#define GP2AP020A00F_OP_DEBUG		0x30
-#define GP2AP020A00F_PROX_MASK		0x08 /* PS: detection/non-detection */
-#define GP2AP020A00F_PROX_NON_DETECT	0x00
-#define GP2AP020A00F_PROX_DETECT	0x08
-#define GP2AP020A00F_FLAG_P		0x04 /* PS: interrupt result  */
-#define GP2AP020A00F_FLAG_A		0x02 /* ALS: interrupt result  */
-#define GP2AP020A00F_TYPE_MASK		0x01 /* Output data type selection */
-#define GP2AP020A00F_TYPE_MANUAL_CALC	0x00
-#define GP2AP020A00F_TYPE_AUTO_CALC	0x01
-
-/* ALS_REG bits */
-#define GP2AP020A00F_PRST_MASK		0xc0 /* Number of measurement cycles */
-#define GP2AP020A00F_PRST_ONCE		0x00
-#define GP2AP020A00F_PRST_4_CYCLES	0x40
-#define GP2AP020A00F_PRST_8_CYCLES	0x80
-#define GP2AP020A00F_PRST_16_CYCLES	0xc0
-#define GP2AP020A00F_RES_A_MASK		0x38 /* ALS: Resolution */
-#define GP2AP020A00F_RES_A_800ms	0x00
-#define GP2AP020A00F_RES_A_400ms	0x08
-#define GP2AP020A00F_RES_A_200ms	0x10
-#define GP2AP020A00F_RES_A_100ms	0x18
-#define GP2AP020A00F_RES_A_25ms		0x20
-#define GP2AP020A00F_RES_A_6_25ms	0x28
-#define GP2AP020A00F_RES_A_1_56ms	0x30
-#define GP2AP020A00F_RES_A_0_39ms	0x38
-#define GP2AP020A00F_RANGE_A_MASK	0x07 /* ALS: Max measurable range */
-#define GP2AP020A00F_RANGE_A_x1		0x00
-#define GP2AP020A00F_RANGE_A_x2		0x01
-#define GP2AP020A00F_RANGE_A_x4		0x02
-#define GP2AP020A00F_RANGE_A_x8		0x03
-#define GP2AP020A00F_RANGE_A_x16	0x04
-#define GP2AP020A00F_RANGE_A_x32	0x05
-#define GP2AP020A00F_RANGE_A_x64	0x06
-#define GP2AP020A00F_RANGE_A_x128	0x07
-
-/* PS_REG bits */
-#define GP2AP020A00F_ALC_MASK		0x80 /* Auto light cancel */
-#define GP2AP020A00F_ALC_ON		0x80
-#define GP2AP020A00F_ALC_OFF		0x00
-#define GP2AP020A00F_INTTYPE_MASK	0x40 /* Interrupt type setting */
-#define GP2AP020A00F_INTTYPE_LEVEL	0x00
-#define GP2AP020A00F_INTTYPE_PULSE	0x40
-#define GP2AP020A00F_RES_P_MASK		0x38 /* PS: Resolution */
-#define GP2AP020A00F_RES_P_800ms_x2	0x00
-#define GP2AP020A00F_RES_P_400ms_x2	0x08
-#define GP2AP020A00F_RES_P_200ms_x2	0x10
-#define GP2AP020A00F_RES_P_100ms_x2	0x18
-#define GP2AP020A00F_RES_P_25ms_x2	0x20
-#define GP2AP020A00F_RES_P_6_25ms_x2	0x28
-#define GP2AP020A00F_RES_P_1_56ms_x2	0x30
-#define GP2AP020A00F_RES_P_0_39ms_x2	0x38
-#define GP2AP020A00F_RANGE_P_MASK	0x07 /* PS: Max measurable range */
-#define GP2AP020A00F_RANGE_P_x1		0x00
-#define GP2AP020A00F_RANGE_P_x2		0x01
-#define GP2AP020A00F_RANGE_P_x4		0x02
-#define GP2AP020A00F_RANGE_P_x8		0x03
-#define GP2AP020A00F_RANGE_P_x16	0x04
-#define GP2AP020A00F_RANGE_P_x32	0x05
-#define GP2AP020A00F_RANGE_P_x64	0x06
-#define GP2AP020A00F_RANGE_P_x128	0x07
-
-/* LED reg bits */
-#define GP2AP020A00F_INTVAL_MASK	0xc0 /* Intermittent operating */
-#define GP2AP020A00F_INTVAL_0		0x00
-#define GP2AP020A00F_INTVAL_4		0x40
-#define GP2AP020A00F_INTVAL_8		0x80
-#define GP2AP020A00F_INTVAL_16		0xc0
-#define GP2AP020A00F_IS_MASK		0x30 /* ILED drive peak current */
-#define GP2AP020A00F_IS_13_8mA		0x00
-#define GP2AP020A00F_IS_27_5mA		0x10
-#define GP2AP020A00F_IS_55mA		0x20
-#define GP2AP020A00F_IS_110mA		0x30
-#define GP2AP020A00F_PIN_MASK		0x0c /* INT terminal setting */
-#define GP2AP020A00F_PIN_ALS_OR_PS	0x00
-#define GP2AP020A00F_PIN_ALS		0x04
-#define GP2AP020A00F_PIN_PS		0x08
-#define GP2AP020A00F_PIN_PS_DETECT	0x0c
-#define GP2AP020A00F_FREQ_MASK		0x02 /* LED modulation frequency */
-#define GP2AP020A00F_FREQ_327_5kHz	0x00
-#define GP2AP020A00F_FREQ_81_8kHz	0x02
-#define GP2AP020A00F_RST		0x01 /* Software reset */
-
-#define GP2AP020A00F_SCAN_MODE_LIGHT_CLEAR	0
-#define GP2AP020A00F_SCAN_MODE_LIGHT_IR		1
-#define GP2AP020A00F_SCAN_MODE_PROXIMITY	2
-#define GP2AP020A00F_CHAN_TIMESTAMP		3
-
-#define GP2AP020A00F_DATA_READY_TIMEOUT		msecs_to_jiffies(1000)
-#define GP2AP020A00F_DATA_REG(chan)		(GP2AP020A00F_D0_L_REG + \
-							(chan) * 2)
-#define GP2AP020A00F_THRESH_REG(th_val_id)	(GP2AP020A00F_TL_L_REG + \
-							(th_val_id) * 2)
-#define GP2AP020A00F_THRESH_VAL_ID(reg_addr)	((reg_addr - 4) / 2)
-
-#define GP2AP020A00F_SUBTRACT_MODE	0
-#define GP2AP020A00F_ADD_MODE		1
-
-#define GP2AP020A00F_MAX_CHANNELS	3
-
-enum gp2ap020a00f_opmode {
-	GP2AP020A00F_OPMODE_READ_RAW_CLEAR,
-	GP2AP020A00F_OPMODE_READ_RAW_IR,
-	GP2AP020A00F_OPMODE_READ_RAW_PROXIMITY,
-	GP2AP020A00F_OPMODE_ALS,
-	GP2AP020A00F_OPMODE_PS,
-	GP2AP020A00F_OPMODE_ALS_AND_PS,
-	GP2AP020A00F_OPMODE_PROX_DETECT,
-	GP2AP020A00F_OPMODE_SHUTDOWN,
-	GP2AP020A00F_NUM_OPMODES,
-};
-
-enum gp2ap020a00f_cmd {
-	GP2AP020A00F_CMD_READ_RAW_CLEAR,
-	GP2AP020A00F_CMD_READ_RAW_IR,
-	GP2AP020A00F_CMD_READ_RAW_PROXIMITY,
-	GP2AP020A00F_CMD_TRIGGER_CLEAR_EN,
-	GP2AP020A00F_CMD_TRIGGER_CLEAR_DIS,
-	GP2AP020A00F_CMD_TRIGGER_IR_EN,
-	GP2AP020A00F_CMD_TRIGGER_IR_DIS,
-	GP2AP020A00F_CMD_TRIGGER_PROX_EN,
-	GP2AP020A00F_CMD_TRIGGER_PROX_DIS,
-	GP2AP020A00F_CMD_ALS_HIGH_EV_EN,
-	GP2AP020A00F_CMD_ALS_HIGH_EV_DIS,
-	GP2AP020A00F_CMD_ALS_LOW_EV_EN,
-	GP2AP020A00F_CMD_ALS_LOW_EV_DIS,
-	GP2AP020A00F_CMD_PROX_HIGH_EV_EN,
-	GP2AP020A00F_CMD_PROX_HIGH_EV_DIS,
-	GP2AP020A00F_CMD_PROX_LOW_EV_EN,
-	GP2AP020A00F_CMD_PROX_LOW_EV_DIS,
-};
-
-enum gp2ap020a00f_flags {
-	GP2AP020A00F_FLAG_ALS_CLEAR_TRIGGER,
-	GP2AP020A00F_FLAG_ALS_IR_TRIGGER,
-	GP2AP020A00F_FLAG_PROX_TRIGGER,
-	GP2AP020A00F_FLAG_PROX_RISING_EV,
-	GP2AP020A00F_FLAG_PROX_FALLING_EV,
-	GP2AP020A00F_FLAG_ALS_RISING_EV,
-	GP2AP020A00F_FLAG_ALS_FALLING_EV,
-	GP2AP020A00F_FLAG_LUX_MODE_HI,
-	GP2AP020A00F_FLAG_DATA_READY,
-};
-
-enum gp2ap020a00f_thresh_val_id {
-	GP2AP020A00F_THRESH_TL,
-	GP2AP020A00F_THRESH_TH,
-	GP2AP020A00F_THRESH_PL,
-	GP2AP020A00F_THRESH_PH,
-};
-
-struct gp2ap020a00f_data {
-	const struct gp2ap020a00f_platform_data *pdata;
-	struct i2c_client *client;
-	struct mutex lock;
-	char *buffer;
-	struct regulator *vled_reg;
-	unsigned long flags;
-	enum gp2ap020a00f_opmode cur_opmode;
-	struct iio_trigger *trig;
-	struct regmap *regmap;
-	unsigned int thresh_val[4];
-	u8 debug_reg_addr;
-	struct irq_work work;
-	wait_queue_head_t data_ready_queue;
-};
-
-static const u8 gp2ap020a00f_reg_init_tab[] = {
-	[GP2AP020A00F_OP_REG] = GP2AP020A00F_OP3_SHUTDOWN,
-	[GP2AP020A00F_ALS_REG] = GP2AP020A00F_RES_A_25ms |
-				 GP2AP020A00F_RANGE_A_x8,
-	[GP2AP020A00F_PS_REG] = GP2AP020A00F_ALC_ON |
-				GP2AP020A00F_RES_P_1_56ms_x2 |
-				GP2AP020A00F_RANGE_P_x4,
-	[GP2AP020A00F_LED_REG] = GP2AP020A00F_INTVAL_0 |
-				 GP2AP020A00F_IS_110mA |
-				 GP2AP020A00F_FREQ_327_5kHz,
-	[GP2AP020A00F_TL_L_REG] = 0,
-	[GP2AP020A00F_TL_H_REG] = 0,
-	[GP2AP020A00F_TH_L_REG] = 0,
-	[GP2AP020A00F_TH_H_REG] = 0,
-	[GP2AP020A00F_PL_L_REG] = 0,
-	[GP2AP020A00F_PL_H_REG] = 0,
-	[GP2AP020A00F_PH_L_REG] = 0,
-	[GP2AP020A00F_PH_H_REG] = 0,
-};
-
-static bool gp2ap020a00f_is_volatile_reg(struct device *dev, unsigned int reg)
-{
-	switch (reg) {
-	case GP2AP020A00F_OP_REG:
-	case GP2AP020A00F_D0_L_REG:
-	case GP2AP020A00F_D0_H_REG:
-	case GP2AP020A00F_D1_L_REG:
-	case GP2AP020A00F_D1_H_REG:
-	case GP2AP020A00F_D2_L_REG:
-	case GP2AP020A00F_D2_H_REG:
-		return true;
-	default:
-		return false;
-	}
-}
-
-static const struct regmap_config gp2ap020a00f_regmap_config = {
-	.reg_bits = 8,
-	.val_bits = 8,
-
-	.max_register = GP2AP020A00F_D2_H_REG,
-	.cache_type = REGCACHE_RBTREE,
-
-	.volatile_reg = gp2ap020a00f_is_volatile_reg,
-};
-
-static const struct gp2ap020a00f_mutable_config_regs {
-	u8 op_reg;
-	u8 als_reg;
-	u8 ps_reg;
-	u8 led_reg;
-} opmode_regs_settings[GP2AP020A00F_NUM_OPMODES] = {
-	[GP2AP020A00F_OPMODE_READ_RAW_CLEAR] = {
-		GP2AP020A00F_OP_ALS | GP2AP020A00F_OP2_CONT_OPERATION
-		| GP2AP020A00F_OP3_OPERATION
-		| GP2AP020A00F_TYPE_AUTO_CALC,
-		GP2AP020A00F_PRST_ONCE,
-		GP2AP020A00F_INTTYPE_LEVEL,
-		GP2AP020A00F_PIN_ALS
-	},
-	[GP2AP020A00F_OPMODE_READ_RAW_IR] = {
-		GP2AP020A00F_OP_ALS | GP2AP020A00F_OP2_CONT_OPERATION
-		| GP2AP020A00F_OP3_OPERATION
-		| GP2AP020A00F_TYPE_MANUAL_CALC,
-		GP2AP020A00F_PRST_ONCE,
-		GP2AP020A00F_INTTYPE_LEVEL,
-		GP2AP020A00F_PIN_ALS
-	},
-	[GP2AP020A00F_OPMODE_READ_RAW_PROXIMITY] = {
-		GP2AP020A00F_OP_PS | GP2AP020A00F_OP2_CONT_OPERATION
-		| GP2AP020A00F_OP3_OPERATION
-		| GP2AP020A00F_TYPE_MANUAL_CALC,
-		GP2AP020A00F_PRST_ONCE,
-		GP2AP020A00F_INTTYPE_LEVEL,
-		GP2AP020A00F_PIN_PS
-	},
-	[GP2AP020A00F_OPMODE_PROX_DETECT] = {
-		GP2AP020A00F_OP_PS | GP2AP020A00F_OP2_CONT_OPERATION
-		| GP2AP020A00F_OP3_OPERATION
-		| GP2AP020A00F_TYPE_MANUAL_CALC,
-		GP2AP020A00F_PRST_4_CYCLES,
-		GP2AP020A00F_INTTYPE_PULSE,
-		GP2AP020A00F_PIN_PS_DETECT
-	},
-	[GP2AP020A00F_OPMODE_ALS] = {
-		GP2AP020A00F_OP_ALS | GP2AP020A00F_OP2_CONT_OPERATION
-		| GP2AP020A00F_OP3_OPERATION
-		| GP2AP020A00F_TYPE_AUTO_CALC,
-		GP2AP020A00F_PRST_ONCE,
-		GP2AP020A00F_INTTYPE_LEVEL,
-		GP2AP020A00F_PIN_ALS
-	},
-	[GP2AP020A00F_OPMODE_PS] = {
-		GP2AP020A00F_OP_PS | GP2AP020A00F_OP2_CONT_OPERATION
-		| GP2AP020A00F_OP3_OPERATION
-		| GP2AP020A00F_TYPE_MANUAL_CALC,
-		GP2AP020A00F_PRST_4_CYCLES,
-		GP2AP020A00F_INTTYPE_LEVEL,
-		GP2AP020A00F_PIN_PS
-	},
-	[GP2AP020A00F_OPMODE_ALS_AND_PS] = {
-		GP2AP020A00F_OP_ALS_AND_PS
-		| GP2AP020A00F_OP2_CONT_OPERATION
-		| GP2AP020A00F_OP3_OPERATION
-		| GP2AP020A00F_TYPE_AUTO_CALC,
-		GP2AP020A00F_PRST_4_CYCLES,
-		GP2AP020A00F_INTTYPE_LEVEL,
-		GP2AP020A00F_PIN_ALS_OR_PS
-	},
-	[GP2AP020A00F_OPMODE_SHUTDOWN] = { GP2AP020A00F_OP3_SHUTDOWN, },
-};
-
-static int gp2ap020a00f_set_operation_mode(struct gp2ap020a00f_data *data,
-					enum gp2ap020a00f_opmode op)
-{
-	unsigned int op_reg_val;
-	int err;
-
-	if (op != GP2AP020A00F_OPMODE_SHUTDOWN) {
-		err = regmap_read(data->regmap, GP2AP020A00F_OP_REG,
-					&op_reg_val);
-		if (err < 0)
-			return err;
-		/*
-		 * Shutdown the device if the operation being executed entails
-		 * mode transition.
-		 */
-		if ((opmode_regs_settings[op].op_reg & GP2AP020A00F_OP_MASK) !=
-		    (op_reg_val & GP2AP020A00F_OP_MASK)) {
-			/* set shutdown mode */
-			err = regmap_update_bits(data->regmap,
-				GP2AP020A00F_OP_REG, GP2AP020A00F_OP3_MASK,
-				GP2AP020A00F_OP3_SHUTDOWN);
-			if (err < 0)
-				return err;
-		}
-
-		err = regmap_update_bits(data->regmap, GP2AP020A00F_ALS_REG,
-			GP2AP020A00F_PRST_MASK, opmode_regs_settings[op]
-								.als_reg);
-		if (err < 0)
-			return err;
-
-		err = regmap_update_bits(data->regmap, GP2AP020A00F_PS_REG,
-			GP2AP020A00F_INTTYPE_MASK, opmode_regs_settings[op]
-								.ps_reg);
-		if (err < 0)
-			return err;
-
-		err = regmap_update_bits(data->regmap, GP2AP020A00F_LED_REG,
-			GP2AP020A00F_PIN_MASK, opmode_regs_settings[op]
-								.led_reg);
-		if (err < 0)
-			return err;
-	}
-
-	/* Set OP_REG and apply operation mode (power on / off) */
-	err = regmap_update_bits(data->regmap,
-				 GP2AP020A00F_OP_REG,
-				 GP2AP020A00F_OP_MASK | GP2AP020A00F_OP2_MASK |
-				 GP2AP020A00F_OP3_MASK | GP2AP020A00F_TYPE_MASK,
-				 opmode_regs_settings[op].op_reg);
-	if (err < 0)
-		return err;
-
-	data->cur_opmode = op;
-
-	return 0;
-}
-
-static bool gp2ap020a00f_als_enabled(struct gp2ap020a00f_data *data)
-{
-	return test_bit(GP2AP020A00F_FLAG_ALS_CLEAR_TRIGGER, &data->flags) ||
-	       test_bit(GP2AP020A00F_FLAG_ALS_IR_TRIGGER, &data->flags) ||
-	       test_bit(GP2AP020A00F_FLAG_ALS_RISING_EV, &data->flags) ||
-	       test_bit(GP2AP020A00F_FLAG_ALS_FALLING_EV, &data->flags);
-}
-
-static bool gp2ap020a00f_prox_detect_enabled(struct gp2ap020a00f_data *data)
-{
-	return test_bit(GP2AP020A00F_FLAG_PROX_RISING_EV, &data->flags) ||
-	       test_bit(GP2AP020A00F_FLAG_PROX_FALLING_EV, &data->flags);
-}
-
-static int gp2ap020a00f_write_event_threshold(struct gp2ap020a00f_data *data,
-				enum gp2ap020a00f_thresh_val_id th_val_id,
-				bool enable)
-{
-	__le16 thresh_buf = 0;
-	unsigned int thresh_reg_val;
-
-	if (!enable)
-		thresh_reg_val = 0;
-	else if (test_bit(GP2AP020A00F_FLAG_LUX_MODE_HI, &data->flags) &&
-		 th_val_id != GP2AP020A00F_THRESH_PL &&
-		 th_val_id != GP2AP020A00F_THRESH_PH)
-		/*
-		 * For the high lux mode ALS threshold has to be scaled down
-		 * to allow for proper comparison with the output value.
-		 */
-		thresh_reg_val = data->thresh_val[th_val_id] / 16;
-	else
-		thresh_reg_val = data->thresh_val[th_val_id] > 16000 ?
-					16000 :
-					data->thresh_val[th_val_id];
-
-	thresh_buf = cpu_to_le16(thresh_reg_val);
-
-	return regmap_bulk_write(data->regmap,
-				 GP2AP020A00F_THRESH_REG(th_val_id),
-				 (u8 *)&thresh_buf, 2);
-}
-
-static int gp2ap020a00f_alter_opmode(struct gp2ap020a00f_data *data,
-			enum gp2ap020a00f_opmode diff_mode, int add_sub)
-{
-	enum gp2ap020a00f_opmode new_mode;
-
-	if (diff_mode != GP2AP020A00F_OPMODE_ALS &&
-	    diff_mode != GP2AP020A00F_OPMODE_PS)
-		return -EINVAL;
-
-	if (add_sub == GP2AP020A00F_ADD_MODE) {
-		if (data->cur_opmode == GP2AP020A00F_OPMODE_SHUTDOWN)
-			new_mode =  diff_mode;
-		else
-			new_mode = GP2AP020A00F_OPMODE_ALS_AND_PS;
-	} else {
-		if (data->cur_opmode == GP2AP020A00F_OPMODE_ALS_AND_PS)
-			new_mode = (diff_mode == GP2AP020A00F_OPMODE_ALS) ?
-					GP2AP020A00F_OPMODE_PS :
-					GP2AP020A00F_OPMODE_ALS;
-		else
-			new_mode = GP2AP020A00F_OPMODE_SHUTDOWN;
-	}
-
-	return gp2ap020a00f_set_operation_mode(data, new_mode);
-}
-
-static int gp2ap020a00f_exec_cmd(struct gp2ap020a00f_data *data,
-					enum gp2ap020a00f_cmd cmd)
-{
-	int err = 0;
-
-	switch (cmd) {
-	case GP2AP020A00F_CMD_READ_RAW_CLEAR:
-		if (data->cur_opmode != GP2AP020A00F_OPMODE_SHUTDOWN)
-			return -EBUSY;
-		err = gp2ap020a00f_set_operation_mode(data,
-					GP2AP020A00F_OPMODE_READ_RAW_CLEAR);
-		break;
-	case GP2AP020A00F_CMD_READ_RAW_IR:
-		if (data->cur_opmode != GP2AP020A00F_OPMODE_SHUTDOWN)
-			return -EBUSY;
-		err = gp2ap020a00f_set_operation_mode(data,
-					GP2AP020A00F_OPMODE_READ_RAW_IR);
-		break;
-	case GP2AP020A00F_CMD_READ_RAW_PROXIMITY:
-		if (data->cur_opmode != GP2AP020A00F_OPMODE_SHUTDOWN)
-			return -EBUSY;
-		err = gp2ap020a00f_set_operation_mode(data,
-					GP2AP020A00F_OPMODE_READ_RAW_PROXIMITY);
-		break;
-	case GP2AP020A00F_CMD_TRIGGER_CLEAR_EN:
-		if (data->cur_opmode == GP2AP020A00F_OPMODE_PROX_DETECT)
-			return -EBUSY;
-		if (!gp2ap020a00f_als_enabled(data))
-			err = gp2ap020a00f_alter_opmode(data,
-						GP2AP020A00F_OPMODE_ALS,
-						GP2AP020A00F_ADD_MODE);
-		set_bit(GP2AP020A00F_FLAG_ALS_CLEAR_TRIGGER, &data->flags);
-		break;
-	case GP2AP020A00F_CMD_TRIGGER_CLEAR_DIS:
-		clear_bit(GP2AP020A00F_FLAG_ALS_CLEAR_TRIGGER, &data->flags);
-		if (gp2ap020a00f_als_enabled(data))
-			break;
-		err = gp2ap020a00f_alter_opmode(data,
-						GP2AP020A00F_OPMODE_ALS,
-						GP2AP020A00F_SUBTRACT_MODE);
-		break;
-	case GP2AP020A00F_CMD_TRIGGER_IR_EN:
-		if (data->cur_opmode == GP2AP020A00F_OPMODE_PROX_DETECT)
-			return -EBUSY;
-		if (!gp2ap020a00f_als_enabled(data))
-			err = gp2ap020a00f_alter_opmode(data,
-						GP2AP020A00F_OPMODE_ALS,
-						GP2AP020A00F_ADD_MODE);
-		set_bit(GP2AP020A00F_FLAG_ALS_IR_TRIGGER, &data->flags);
-		break;
-	case GP2AP020A00F_CMD_TRIGGER_IR_DIS:
-		clear_bit(GP2AP020A00F_FLAG_ALS_IR_TRIGGER, &data->flags);
-		if (gp2ap020a00f_als_enabled(data))
-			break;
-		err = gp2ap020a00f_alter_opmode(data,
-						GP2AP020A00F_OPMODE_ALS,
-						GP2AP020A00F_SUBTRACT_MODE);
-		break;
-	case GP2AP020A00F_CMD_TRIGGER_PROX_EN:
-		if (data->cur_opmode == GP2AP020A00F_OPMODE_PROX_DETECT)
-			return -EBUSY;
-		err = gp2ap020a00f_alter_opmode(data,
-						GP2AP020A00F_OPMODE_PS,
-						GP2AP020A00F_ADD_MODE);
-		set_bit(GP2AP020A00F_FLAG_PROX_TRIGGER, &data->flags);
-		break;
-	case GP2AP020A00F_CMD_TRIGGER_PROX_DIS:
-		clear_bit(GP2AP020A00F_FLAG_PROX_TRIGGER, &data->flags);
-		err = gp2ap020a00f_alter_opmode(data,
-						GP2AP020A00F_OPMODE_PS,
-						GP2AP020A00F_SUBTRACT_MODE);
-		break;
-	case GP2AP020A00F_CMD_ALS_HIGH_EV_EN:
-		if (test_bit(GP2AP020A00F_FLAG_ALS_RISING_EV, &data->flags))
-			return 0;
-		if (data->cur_opmode == GP2AP020A00F_OPMODE_PROX_DETECT)
-			return -EBUSY;
-		if (!gp2ap020a00f_als_enabled(data)) {
-			err = gp2ap020a00f_alter_opmode(data,
-						GP2AP020A00F_OPMODE_ALS,
-						GP2AP020A00F_ADD_MODE);
-			if (err < 0)
-				return err;
-		}
-		set_bit(GP2AP020A00F_FLAG_ALS_RISING_EV, &data->flags);
-		err =  gp2ap020a00f_write_event_threshold(data,
-					GP2AP020A00F_THRESH_TH, true);
-		break;
-	case GP2AP020A00F_CMD_ALS_HIGH_EV_DIS:
-		if (!test_bit(GP2AP020A00F_FLAG_ALS_RISING_EV, &data->flags))
-			return 0;
-		clear_bit(GP2AP020A00F_FLAG_ALS_RISING_EV, &data->flags);
-		if (!gp2ap020a00f_als_enabled(data)) {
-			err = gp2ap020a00f_alter_opmode(data,
-						GP2AP020A00F_OPMODE_ALS,
-						GP2AP020A00F_SUBTRACT_MODE);
-			if (err < 0)
-				return err;
-		}
-		err =  gp2ap020a00f_write_event_threshold(data,
-					GP2AP020A00F_THRESH_TH, false);
-		break;
-	case GP2AP020A00F_CMD_ALS_LOW_EV_EN:
-		if (test_bit(GP2AP020A00F_FLAG_ALS_FALLING_EV, &data->flags))
-			return 0;
-		if (data->cur_opmode == GP2AP020A00F_OPMODE_PROX_DETECT)
-			return -EBUSY;
-		if (!gp2ap020a00f_als_enabled(data)) {
-			err = gp2ap020a00f_alter_opmode(data,
-						GP2AP020A00F_OPMODE_ALS,
-						GP2AP020A00F_ADD_MODE);
-			if (err < 0)
-				return err;
-		}
-		set_bit(GP2AP020A00F_FLAG_ALS_FALLING_EV, &data->flags);
-		err =  gp2ap020a00f_write_event_threshold(data,
-					GP2AP020A00F_THRESH_TL, true);
-		break;
-	case GP2AP020A00F_CMD_ALS_LOW_EV_DIS:
-		if (!test_bit(GP2AP020A00F_FLAG_ALS_FALLING_EV, &data->flags))
-			return 0;
-		clear_bit(GP2AP020A00F_FLAG_ALS_FALLING_EV, &data->flags);
-		if (!gp2ap020a00f_als_enabled(data)) {
-			err = gp2ap020a00f_alter_opmode(data,
-						GP2AP020A00F_OPMODE_ALS,
-						GP2AP020A00F_SUBTRACT_MODE);
-			if (err < 0)
-				return err;
-		}
-		err =  gp2ap020a00f_write_event_threshold(data,
-					GP2AP020A00F_THRESH_TL, false);
-		break;
-	case GP2AP020A00F_CMD_PROX_HIGH_EV_EN:
-		if (test_bit(GP2AP020A00F_FLAG_PROX_RISING_EV, &data->flags))
-			return 0;
-		if (gp2ap020a00f_als_enabled(data) ||
-		    data->cur_opmode == GP2AP020A00F_OPMODE_PS)
-			return -EBUSY;
-		if (!gp2ap020a00f_prox_detect_enabled(data)) {
-			err = gp2ap020a00f_set_operation_mode(data,
-					GP2AP020A00F_OPMODE_PROX_DETECT);
-			if (err < 0)
-				return err;
-		}
-		set_bit(GP2AP020A00F_FLAG_PROX_RISING_EV, &data->flags);
-		err =  gp2ap020a00f_write_event_threshold(data,
-					GP2AP020A00F_THRESH_PH, true);
-		break;
-	case GP2AP020A00F_CMD_PROX_HIGH_EV_DIS:
-		if (!test_bit(GP2AP020A00F_FLAG_PROX_RISING_EV, &data->flags))
-			return 0;
-		clear_bit(GP2AP020A00F_FLAG_PROX_RISING_EV, &data->flags);
-		err = gp2ap020a00f_set_operation_mode(data,
-					GP2AP020A00F_OPMODE_SHUTDOWN);
-		if (err < 0)
-			return err;
-		err =  gp2ap020a00f_write_event_threshold(data,
-					GP2AP020A00F_THRESH_PH, false);
-		break;
-	case GP2AP020A00F_CMD_PROX_LOW_EV_EN:
-		if (test_bit(GP2AP020A00F_FLAG_PROX_FALLING_EV, &data->flags))
-			return 0;
-		if (gp2ap020a00f_als_enabled(data) ||
-		    data->cur_opmode == GP2AP020A00F_OPMODE_PS)
-			return -EBUSY;
-		if (!gp2ap020a00f_prox_detect_enabled(data)) {
-			err = gp2ap020a00f_set_operation_mode(data,
-					GP2AP020A00F_OPMODE_PROX_DETECT);
-			if (err < 0)
-				return err;
-		}
-		set_bit(GP2AP020A00F_FLAG_PROX_FALLING_EV, &data->flags);
-		err =  gp2ap020a00f_write_event_threshold(data,
-					GP2AP020A00F_THRESH_PL, true);
-		break;
-	case GP2AP020A00F_CMD_PROX_LOW_EV_DIS:
-		if (!test_bit(GP2AP020A00F_FLAG_PROX_FALLING_EV, &data->flags))
-			return 0;
-		clear_bit(GP2AP020A00F_FLAG_PROX_FALLING_EV, &data->flags);
-		err = gp2ap020a00f_set_operation_mode(data,
-					GP2AP020A00F_OPMODE_SHUTDOWN);
-		if (err < 0)
-			return err;
-		err =  gp2ap020a00f_write_event_threshold(data,
-					GP2AP020A00F_THRESH_PL, false);
-		break;
-	}
-
-	return err;
-}
-
-static int wait_conversion_complete_irq(struct gp2ap020a00f_data *data)
-{
-	int ret;
-
-	ret = wait_event_timeout(data->data_ready_queue,
-				 test_bit(GP2AP020A00F_FLAG_DATA_READY,
-					  &data->flags),
-				 GP2AP020A00F_DATA_READY_TIMEOUT);
-	clear_bit(GP2AP020A00F_FLAG_DATA_READY, &data->flags);
-
-	return ret > 0 ? 0 : -ETIME;
-}
-
-static int gp2ap020a00f_read_output(struct gp2ap020a00f_data *data,
-					unsigned int output_reg, int *val)
-{
-	u8 reg_buf[2];
-	int err;
-
-	err = wait_conversion_complete_irq(data);
-	if (err < 0)
-		dev_dbg(&data->client->dev, "data ready timeout\n");
-
-	err = regmap_bulk_read(data->regmap, output_reg, reg_buf, 2);
-	if (err < 0)
-		return err;
-
-	*val = le16_to_cpup((__le16 *)reg_buf);
-
-	return err;
-}
-
-static bool gp2ap020a00f_adjust_lux_mode(struct gp2ap020a00f_data *data,
-				 int output_val)
-{
-	u8 new_range = 0xff;
-	int err;
-
-	if (!test_bit(GP2AP020A00F_FLAG_LUX_MODE_HI, &data->flags)) {
-		if (output_val > 16000) {
-			set_bit(GP2AP020A00F_FLAG_LUX_MODE_HI, &data->flags);
-			new_range = GP2AP020A00F_RANGE_A_x128;
-		}
-	} else {
-		if (output_val < 1000) {
-			clear_bit(GP2AP020A00F_FLAG_LUX_MODE_HI, &data->flags);
-			new_range = GP2AP020A00F_RANGE_A_x8;
-		}
-	}
-
-	if (new_range != 0xff) {
-		/* Clear als threshold registers to avoid spurious
-		 * events caused by lux mode transition.
-		 */
-		err =  gp2ap020a00f_write_event_threshold(data,
-					GP2AP020A00F_THRESH_TH, false);
-		if (err < 0) {
-			dev_err(&data->client->dev,
-				"Clearing als threshold register failed.\n");
-			return false;
-		}
-
-		err =  gp2ap020a00f_write_event_threshold(data,
-					GP2AP020A00F_THRESH_TL, false);
-		if (err < 0) {
-			dev_err(&data->client->dev,
-				"Clearing als threshold register failed.\n");
-			return false;
-		}
-
-		/* Change lux mode */
-		err = regmap_update_bits(data->regmap,
-			GP2AP020A00F_OP_REG,
-			GP2AP020A00F_OP3_MASK,
-			GP2AP020A00F_OP3_SHUTDOWN);
-
-		if (err < 0) {
-			dev_err(&data->client->dev,
-				"Shutting down the device failed.\n");
-			return false;
-		}
-
-		err = regmap_update_bits(data->regmap,
-			GP2AP020A00F_ALS_REG,
-			GP2AP020A00F_RANGE_A_MASK,
-			new_range);
-
-		if (err < 0) {
-			dev_err(&data->client->dev,
-				"Adjusting device lux mode failed.\n");
-			return false;
-		}
-
-		err = regmap_update_bits(data->regmap,
-			GP2AP020A00F_OP_REG,
-			GP2AP020A00F_OP3_MASK,
-			GP2AP020A00F_OP3_OPERATION);
-
-		if (err < 0) {
-			dev_err(&data->client->dev,
-				"Powering up the device failed.\n");
-			return false;
-		}
-
-		/* Adjust als threshold register values to the new lux mode */
-		if (test_bit(GP2AP020A00F_FLAG_ALS_RISING_EV, &data->flags)) {
-			err =  gp2ap020a00f_write_event_threshold(data,
-					GP2AP020A00F_THRESH_TH, true);
-			if (err < 0) {
-				dev_err(&data->client->dev,
-				"Adjusting als threshold value failed.\n");
-				return false;
-			}
-		}
-
-		if (test_bit(GP2AP020A00F_FLAG_ALS_FALLING_EV, &data->flags)) {
-			err =  gp2ap020a00f_write_event_threshold(data,
-					GP2AP020A00F_THRESH_TL, true);
-			if (err < 0) {
-				dev_err(&data->client->dev,
-				"Adjusting als threshold value failed.\n");
-				return false;
-			}
-		}
-
-		return true;
-	}
-
-	return false;
-}
-
-static void gp2ap020a00f_output_to_lux(struct gp2ap020a00f_data *data,
-						int *output_val)
-{
-	if (test_bit(GP2AP020A00F_FLAG_LUX_MODE_HI, &data->flags))
-		*output_val *= 16;
-}
-
-static void gp2ap020a00f_iio_trigger_work(struct irq_work *work)
-{
-	struct gp2ap020a00f_data *data =
-		container_of(work, struct gp2ap020a00f_data, work);
-
-	iio_trigger_poll(data->trig, 0);
-}
-
-static irqreturn_t gp2ap020a00f_prox_sensing_handler(int irq, void *data)
-{
-	struct iio_dev *indio_dev = data;
-	struct gp2ap020a00f_data *priv = iio_priv(indio_dev);
-	unsigned int op_reg_val;
-	int ret;
-
-	/* Read interrupt flags */
-	ret = regmap_read(priv->regmap, GP2AP020A00F_OP_REG, &op_reg_val);
-	if (ret < 0)
-		return IRQ_HANDLED;
-
-	if (gp2ap020a00f_prox_detect_enabled(priv)) {
-		if (op_reg_val & GP2AP020A00F_PROX_DETECT) {
-			iio_push_event(indio_dev,
-			       IIO_UNMOD_EVENT_CODE(
-				    IIO_PROXIMITY,
-				    GP2AP020A00F_SCAN_MODE_PROXIMITY,
-				    IIO_EV_TYPE_ROC,
-				    IIO_EV_DIR_RISING),
-			       iio_get_time_ns());
-		} else {
-			iio_push_event(indio_dev,
-			       IIO_UNMOD_EVENT_CODE(
-				    IIO_PROXIMITY,
-				    GP2AP020A00F_SCAN_MODE_PROXIMITY,
-				    IIO_EV_TYPE_ROC,
-				    IIO_EV_DIR_FALLING),
-			       iio_get_time_ns());
-		}
-	}
-
-	return IRQ_HANDLED;
-}
-
-static irqreturn_t gp2ap020a00f_thresh_event_handler(int irq, void *data)
-{
-	struct iio_dev *indio_dev = data;
-	struct gp2ap020a00f_data *priv = iio_priv(indio_dev);
-	u8 op_reg_flags, d0_reg_buf[2];
-	unsigned int output_val, op_reg_val;
-	int thresh_val_id, ret;
-
-	/* Read interrupt flags */
-	ret = regmap_read(priv->regmap, GP2AP020A00F_OP_REG,
-							&op_reg_val);
-	if (ret < 0)
-		goto done;
-
-	op_reg_flags = op_reg_val & (GP2AP020A00F_FLAG_A | GP2AP020A00F_FLAG_P
-					| GP2AP020A00F_PROX_DETECT);
-
-	op_reg_val &= (~GP2AP020A00F_FLAG_A & ~GP2AP020A00F_FLAG_P
-					& ~GP2AP020A00F_PROX_DETECT);
-
-	/* Clear interrupt flags (if not in INTTYPE_PULSE mode) */
-	if (priv->cur_opmode != GP2AP020A00F_OPMODE_PROX_DETECT) {
-		ret = regmap_write(priv->regmap, GP2AP020A00F_OP_REG,
-								op_reg_val);
-		if (ret < 0)
-			goto done;
-	}
-
-	if (op_reg_flags & GP2AP020A00F_FLAG_A) {
-		/* Check D0 register to assess if the lux mode
-		 * transition is required.
-		 */
-		ret = regmap_bulk_read(priv->regmap, GP2AP020A00F_D0_L_REG,
-							d0_reg_buf, 2);
-		if (ret < 0)
-			goto done;
-
-		output_val = le16_to_cpup((__le16 *)d0_reg_buf);
-
-		if (gp2ap020a00f_adjust_lux_mode(priv, output_val))
-			goto done;
-
-		gp2ap020a00f_output_to_lux(priv, &output_val);
-
-		/*
-		 * We need to check output value to distinguish
-		 * between high and low ambient light threshold event.
-		 */
-		if (test_bit(GP2AP020A00F_FLAG_ALS_RISING_EV, &priv->flags)) {
-			thresh_val_id =
-			    GP2AP020A00F_THRESH_VAL_ID(GP2AP020A00F_TH_L_REG);
-			if (output_val > priv->thresh_val[thresh_val_id])
-				iio_push_event(indio_dev,
-				       IIO_MOD_EVENT_CODE(
-					    IIO_LIGHT,
-					    GP2AP020A00F_SCAN_MODE_LIGHT_CLEAR,
-					    IIO_MOD_LIGHT_CLEAR,
-					    IIO_EV_TYPE_THRESH,
-					    IIO_EV_DIR_RISING),
-				       iio_get_time_ns());
-		}
-
-		if (test_bit(GP2AP020A00F_FLAG_ALS_FALLING_EV, &priv->flags)) {
-			thresh_val_id =
-			    GP2AP020A00F_THRESH_VAL_ID(GP2AP020A00F_TL_L_REG);
-			if (output_val < priv->thresh_val[thresh_val_id])
-				iio_push_event(indio_dev,
-				       IIO_MOD_EVENT_CODE(
-					    IIO_LIGHT,
-					    GP2AP020A00F_SCAN_MODE_LIGHT_CLEAR,
-					    IIO_MOD_LIGHT_CLEAR,
-					    IIO_EV_TYPE_THRESH,
-					    IIO_EV_DIR_FALLING),
-				       iio_get_time_ns());
-		}
-	}
-
-	if (priv->cur_opmode == GP2AP020A00F_OPMODE_READ_RAW_CLEAR ||
-	    priv->cur_opmode == GP2AP020A00F_OPMODE_READ_RAW_IR ||
-	    priv->cur_opmode == GP2AP020A00F_OPMODE_READ_RAW_PROXIMITY) {
-		set_bit(GP2AP020A00F_FLAG_DATA_READY, &priv->flags);
-		wake_up(&priv->data_ready_queue);
-		goto done;
-	}
-
-	if (test_bit(GP2AP020A00F_FLAG_ALS_CLEAR_TRIGGER, &priv->flags) ||
-	    test_bit(GP2AP020A00F_FLAG_ALS_IR_TRIGGER, &priv->flags) ||
-	    test_bit(GP2AP020A00F_FLAG_PROX_TRIGGER, &priv->flags))
-		/* This fires off the trigger. */
-		irq_work_queue(&priv->work);
-
-done:
-	return IRQ_HANDLED;
-}
-
-static irqreturn_t gp2ap020a00f_trigger_handler(int irq, void *data)
-{
-	struct iio_poll_func *pf = data;
-	struct iio_dev *indio_dev = pf->indio_dev;
-	struct gp2ap020a00f_data *priv = iio_priv(indio_dev);
-	size_t d_size = 0;
-	__le32 light_lux;
-	int i, out_val, ret;
-
-	for_each_set_bit(i, indio_dev->active_scan_mask,
-		indio_dev->masklength) {
-		ret = regmap_bulk_read(priv->regmap,
-				GP2AP020A00F_DATA_REG(i),
-				&priv->buffer[d_size], 2);
-		if (ret < 0)
-			goto done;
-
-		if (i == GP2AP020A00F_SCAN_MODE_LIGHT_CLEAR ||
-		    i == GP2AP020A00F_SCAN_MODE_LIGHT_IR) {
-			out_val = le16_to_cpup((__le16 *)&priv->buffer[d_size]);
-			gp2ap020a00f_output_to_lux(priv, &out_val);
-			light_lux = cpu_to_le32(out_val);
-			memcpy(&priv->buffer[d_size], (u8 *)&light_lux, 4);
-			d_size += 4;
-		} else {
-			d_size += 2;
-		}
-	}
-
-	iio_push_to_buffers_with_timestamp(indio_dev, priv->buffer,
-		pf->timestamp);
-done:
-	iio_trigger_notify_done(indio_dev->trig);
-
-	return IRQ_HANDLED;
-}
-
-static u8 gp2ap020a00f_get_thresh_reg(const struct iio_chan_spec *chan,
-					     enum iio_event_direction event_dir)
-{
-	switch (chan->type) {
-	case IIO_PROXIMITY:
-		if (event_dir == IIO_EV_DIR_RISING)
-			return GP2AP020A00F_PH_L_REG;
-		else
-			return GP2AP020A00F_PL_L_REG;
-	case IIO_LIGHT:
-		if (event_dir == IIO_EV_DIR_RISING)
-			return GP2AP020A00F_TH_L_REG;
-		else
-			return GP2AP020A00F_TL_L_REG;
-	default:
-		break;
-	}
-
-	return -EINVAL;
-}
-
-static int gp2ap020a00f_write_event_val(struct iio_dev *indio_dev,
-					const struct iio_chan_spec *chan,
-					enum iio_event_type type,
-					enum iio_event_direction dir,
-					enum iio_event_info info,
-					int val, int val2)
-{
-	struct gp2ap020a00f_data *data = iio_priv(indio_dev);
-	bool event_en = false;
-	u8 thresh_val_id;
-	u8 thresh_reg_l;
-	int err = 0;
-
-	mutex_lock(&data->lock);
-
-	thresh_reg_l = gp2ap020a00f_get_thresh_reg(chan, dir);
-	thresh_val_id = GP2AP020A00F_THRESH_VAL_ID(thresh_reg_l);
-
-	if (thresh_val_id > GP2AP020A00F_THRESH_PH) {
-		err = -EINVAL;
-		goto error_unlock;
-	}
-
-	switch (thresh_reg_l) {
-	case GP2AP020A00F_TH_L_REG:
-		event_en = test_bit(GP2AP020A00F_FLAG_ALS_RISING_EV,
-							&data->flags);
-		break;
-	case GP2AP020A00F_TL_L_REG:
-		event_en = test_bit(GP2AP020A00F_FLAG_ALS_FALLING_EV,
-							&data->flags);
-		break;
-	case GP2AP020A00F_PH_L_REG:
-		if (val == 0) {
-			err = -EINVAL;
-			goto error_unlock;
-		}
-		event_en = test_bit(GP2AP020A00F_FLAG_PROX_RISING_EV,
-							&data->flags);
-		break;
-	case GP2AP020A00F_PL_L_REG:
-		if (val == 0) {
-			err = -EINVAL;
-			goto error_unlock;
-		}
-		event_en = test_bit(GP2AP020A00F_FLAG_PROX_FALLING_EV,
-							&data->flags);
-		break;
-	}
-
-	data->thresh_val[thresh_val_id] = val;
-	err =  gp2ap020a00f_write_event_threshold(data, thresh_val_id,
-							event_en);
-error_unlock:
-	mutex_unlock(&data->lock);
-
-	return err;
-}
-
-static int gp2ap020a00f_read_event_val(struct iio_dev *indio_dev,
-				       const struct iio_chan_spec *chan,
-				       enum iio_event_type type,
-				       enum iio_event_direction dir,
-				       enum iio_event_info info,
-				       int *val, int *val2)
-{
-	struct gp2ap020a00f_data *data = iio_priv(indio_dev);
-	u8 thresh_reg_l;
-	int err = IIO_VAL_INT;
-
-	mutex_lock(&data->lock);
-
-	thresh_reg_l = gp2ap020a00f_get_thresh_reg(chan, dir);
-
-	if (thresh_reg_l > GP2AP020A00F_PH_L_REG) {
-		err = -EINVAL;
-		goto error_unlock;
-	}
-
-	*val = data->thresh_val[GP2AP020A00F_THRESH_VAL_ID(thresh_reg_l)];
-
-error_unlock:
-	mutex_unlock(&data->lock);
-
-	return err;
-}
-
-static int gp2ap020a00f_write_prox_event_config(struct iio_dev *indio_dev,
-						int state)
-{
-	struct gp2ap020a00f_data *data = iio_priv(indio_dev);
-	enum gp2ap020a00f_cmd cmd_high_ev, cmd_low_ev;
-	int err;
-
-	cmd_high_ev = state ? GP2AP020A00F_CMD_PROX_HIGH_EV_EN :
-			      GP2AP020A00F_CMD_PROX_HIGH_EV_DIS;
-	cmd_low_ev = state ? GP2AP020A00F_CMD_PROX_LOW_EV_EN :
-			     GP2AP020A00F_CMD_PROX_LOW_EV_DIS;
-
-	/*
-	 * In order to enable proximity detection feature in the device
-	 * both high and low threshold registers have to be written
-	 * with different values, greater than zero.
-	 */
-	if (state) {
-		if (data->thresh_val[GP2AP020A00F_THRESH_PL] == 0)
-			return -EINVAL;
-
-		if (data->thresh_val[GP2AP020A00F_THRESH_PH] == 0)
-			return -EINVAL;
-	}
-
-	err = gp2ap020a00f_exec_cmd(data, cmd_high_ev);
-	if (err < 0)
-		return err;
-
-	err = gp2ap020a00f_exec_cmd(data, cmd_low_ev);
-	if (err < 0)
-		return err;
-
-	free_irq(data->client->irq, indio_dev);
-
-	if (state)
-		err = request_threaded_irq(data->client->irq, NULL,
-					   &gp2ap020a00f_prox_sensing_handler,
-					   IRQF_TRIGGER_RISING |
-					   IRQF_TRIGGER_FALLING |
-					   IRQF_ONESHOT,
-					   "gp2ap020a00f_prox_sensing",
-					   indio_dev);
-	else {
-		err = request_threaded_irq(data->client->irq, NULL,
-					   &gp2ap020a00f_thresh_event_handler,
-					   IRQF_TRIGGER_FALLING |
-					   IRQF_ONESHOT,
-					   "gp2ap020a00f_thresh_event",
-					   indio_dev);
-	}
-
-	return err;
-}
-
-static int gp2ap020a00f_write_event_config(struct iio_dev *indio_dev,
-					   const struct iio_chan_spec *chan,
-					   enum iio_event_type type,
-					   enum iio_event_direction dir,
-					   int state)
-{
-	struct gp2ap020a00f_data *data = iio_priv(indio_dev);
-	enum gp2ap020a00f_cmd cmd;
-	int err;
-
-	mutex_lock(&data->lock);
-
-	switch (chan->type) {
-	case IIO_PROXIMITY:
-		err = gp2ap020a00f_write_prox_event_config(indio_dev, state);
-		break;
-	case IIO_LIGHT:
-		if (dir == IIO_EV_DIR_RISING) {
-			cmd = state ? GP2AP020A00F_CMD_ALS_HIGH_EV_EN :
-				      GP2AP020A00F_CMD_ALS_HIGH_EV_DIS;
-			err = gp2ap020a00f_exec_cmd(data, cmd);
-		} else {
-			cmd = state ? GP2AP020A00F_CMD_ALS_LOW_EV_EN :
-				      GP2AP020A00F_CMD_ALS_LOW_EV_DIS;
-			err = gp2ap020a00f_exec_cmd(data, cmd);
-		}
-		break;
-	default:
-		err = -EINVAL;
-	}
-
-	mutex_unlock(&data->lock);
-
-	return err;
-}
-
-static int gp2ap020a00f_read_event_config(struct iio_dev *indio_dev,
-					   const struct iio_chan_spec *chan,
-					   enum iio_event_type type,
-					   enum iio_event_direction dir)
-{
-	struct gp2ap020a00f_data *data = iio_priv(indio_dev);
-	int event_en = 0;
-
-	mutex_lock(&data->lock);
-
-	switch (chan->type) {
-	case IIO_PROXIMITY:
-		if (dir == IIO_EV_DIR_RISING)
-			event_en = test_bit(GP2AP020A00F_FLAG_PROX_RISING_EV,
-								&data->flags);
-		else
-			event_en = test_bit(GP2AP020A00F_FLAG_PROX_FALLING_EV,
-								&data->flags);
-		break;
-	case IIO_LIGHT:
-		if (dir == IIO_EV_DIR_RISING)
-			event_en = test_bit(GP2AP020A00F_FLAG_ALS_RISING_EV,
-								&data->flags);
-		else
-			event_en = test_bit(GP2AP020A00F_FLAG_ALS_FALLING_EV,
-								&data->flags);
-		break;
-	default:
-		event_en = -EINVAL;
-		break;
-	}
-
-	mutex_unlock(&data->lock);
-
-	return event_en;
-}
-
-static int gp2ap020a00f_read_channel(struct gp2ap020a00f_data *data,
-				struct iio_chan_spec const *chan, int *val)
-{
-	enum gp2ap020a00f_cmd cmd;
-	int err;
-
-	switch (chan->scan_index) {
-	case GP2AP020A00F_SCAN_MODE_LIGHT_CLEAR:
-		cmd = GP2AP020A00F_CMD_READ_RAW_CLEAR;
-		break;
-	case GP2AP020A00F_SCAN_MODE_LIGHT_IR:
-		cmd = GP2AP020A00F_CMD_READ_RAW_IR;
-		break;
-	case GP2AP020A00F_SCAN_MODE_PROXIMITY:
-		cmd = GP2AP020A00F_CMD_READ_RAW_PROXIMITY;
-		break;
-	default:
-		return -EINVAL;
-	}
-
-	err = gp2ap020a00f_exec_cmd(data, cmd);
-	if (err < 0) {
-		dev_err(&data->client->dev,
-			"gp2ap020a00f_exec_cmd failed\n");
-		goto error_ret;
-	}
-
-	err = gp2ap020a00f_read_output(data, chan->address, val);
-	if (err < 0)
-		dev_err(&data->client->dev,
-			"gp2ap020a00f_read_output failed\n");
-
-	err = gp2ap020a00f_set_operation_mode(data,
-					GP2AP020A00F_OPMODE_SHUTDOWN);
-	if (err < 0)
-		dev_err(&data->client->dev,
-			"Failed to shut down the device.\n");
-
-	if (cmd == GP2AP020A00F_CMD_READ_RAW_CLEAR ||
-	    cmd == GP2AP020A00F_CMD_READ_RAW_IR)
-		gp2ap020a00f_output_to_lux(data, val);
-
-error_ret:
-	return err;
-}
-
-static int gp2ap020a00f_read_raw(struct iio_dev *indio_dev,
-			   struct iio_chan_spec const *chan,
-			   int *val, int *val2,
-			   long mask)
-{
-	struct gp2ap020a00f_data *data = iio_priv(indio_dev);
-	int err = -EINVAL;
-
-	mutex_lock(&data->lock);
-
-	switch (mask) {
-	case IIO_CHAN_INFO_RAW:
-		if (iio_buffer_enabled(indio_dev)) {
-			err = -EBUSY;
-			goto error_unlock;
-		}
-
-		err = gp2ap020a00f_read_channel(data, chan, val);
-		break;
-	}
-
-error_unlock:
-	mutex_unlock(&data->lock);
-
-	return err < 0 ? err : IIO_VAL_INT;
-}
-
-static const struct iio_event_spec gp2ap020a00f_event_spec_light[] = {
-	{
-		.type = IIO_EV_TYPE_THRESH,
-		.dir = IIO_EV_DIR_RISING,
-		.mask_separate = BIT(IIO_EV_INFO_VALUE) |
-			BIT(IIO_EV_INFO_ENABLE),
-	}, {
-		.type = IIO_EV_TYPE_THRESH,
-		.dir = IIO_EV_DIR_FALLING,
-		.mask_separate = BIT(IIO_EV_INFO_VALUE) |
-			BIT(IIO_EV_INFO_ENABLE),
-	},
-};
-
-static const struct iio_event_spec gp2ap020a00f_event_spec_prox[] = {
-	{
-		.type = IIO_EV_TYPE_ROC,
-		.dir = IIO_EV_DIR_RISING,
-		.mask_separate = BIT(IIO_EV_INFO_VALUE) |
-			BIT(IIO_EV_INFO_ENABLE),
-	}, {
-		.type = IIO_EV_TYPE_ROC,
-		.dir = IIO_EV_DIR_FALLING,
-		.mask_separate = BIT(IIO_EV_INFO_VALUE) |
-			BIT(IIO_EV_INFO_ENABLE),
-	},
-};
-
-static const struct iio_chan_spec gp2ap020a00f_channels[] = {
-	{
-		.type = IIO_LIGHT,
-		.channel2 = IIO_MOD_LIGHT_CLEAR,
-		.modified = 1,
-		.info_mask_separate = BIT(IIO_CHAN_INFO_RAW),
-		.scan_type = {
-			.sign = 'u',
-			.realbits = 24,
-			.shift = 0,
-			.storagebits = 32,
-			.endianness = IIO_LE,
-		},
-		.scan_index = GP2AP020A00F_SCAN_MODE_LIGHT_CLEAR,
-		.address = GP2AP020A00F_D0_L_REG,
-		.event_spec = gp2ap020a00f_event_spec_light,
-		.num_event_specs = ARRAY_SIZE(gp2ap020a00f_event_spec_light),
-	},
-	{
-		.type = IIO_LIGHT,
-		.channel2 = IIO_MOD_LIGHT_IR,
-		.modified = 1,
-		.info_mask_separate = BIT(IIO_CHAN_INFO_RAW),
-		.scan_type = {
-			.sign = 'u',
-			.realbits = 24,
-			.shift = 0,
-			.storagebits = 32,
-			.endianness = IIO_LE,
-		},
-		.scan_index = GP2AP020A00F_SCAN_MODE_LIGHT_IR,
-		.address = GP2AP020A00F_D1_L_REG,
-	},
-	{
-		.type = IIO_PROXIMITY,
-		.modified = 0,
-		.info_mask_separate = BIT(IIO_CHAN_INFO_RAW),
-		.scan_type = {
-			.sign = 'u',
-			.realbits = 16,
-			.shift = 0,
-			.storagebits = 16,
-			.endianness = IIO_LE,
-		},
-		.scan_index = GP2AP020A00F_SCAN_MODE_PROXIMITY,
-		.address = GP2AP020A00F_D2_L_REG,
-		.event_spec = gp2ap020a00f_event_spec_prox,
-		.num_event_specs = ARRAY_SIZE(gp2ap020a00f_event_spec_prox),
-	},
-	IIO_CHAN_SOFT_TIMESTAMP(GP2AP020A00F_CHAN_TIMESTAMP),
-};
-
-static const struct iio_info gp2ap020a00f_info = {
-	.read_raw = &gp2ap020a00f_read_raw,
-	.read_event_value_new = &gp2ap020a00f_read_event_val,
-	.read_event_config_new = &gp2ap020a00f_read_event_config,
-	.write_event_value_new = &gp2ap020a00f_write_event_val,
-	.write_event_config_new = &gp2ap020a00f_write_event_config,
-	.driver_module = THIS_MODULE,
-};
-
-static int gp2ap020a00f_buffer_postenable(struct iio_dev *indio_dev)
-{
-	struct gp2ap020a00f_data *data = iio_priv(indio_dev);
-	int i, err = 0;
-
-	mutex_lock(&data->lock);
-
-	/*
-	 * Enable triggers according to the scan_mask. Enabling either
-	 * LIGHT_CLEAR or LIGHT_IR scan mode results in enabling ALS
-	 * module in the device, which generates samples in both D0 (clear)
-	 * and D1 (ir) registers. As the two registers are bound to the
-	 * two separate IIO channels they are treated in the driver logic
-	 * as if they were controlled independently.
-	 */
-	for_each_set_bit(i, indio_dev->active_scan_mask,
-		indio_dev->masklength) {
-		switch (i) {
-		case GP2AP020A00F_SCAN_MODE_LIGHT_CLEAR:
-			err = gp2ap020a00f_exec_cmd(data,
-					GP2AP020A00F_CMD_TRIGGER_CLEAR_EN);
-			break;
-		case GP2AP020A00F_SCAN_MODE_LIGHT_IR:
-			err = gp2ap020a00f_exec_cmd(data,
-					GP2AP020A00F_CMD_TRIGGER_IR_EN);
-			break;
-		case GP2AP020A00F_SCAN_MODE_PROXIMITY:
-			err = gp2ap020a00f_exec_cmd(data,
-					GP2AP020A00F_CMD_TRIGGER_PROX_EN);
-			break;
-		}
-	}
-
-	if (err < 0)
-		goto error_unlock;
-
-	data->buffer = kmalloc(indio_dev->scan_bytes, GFP_KERNEL);
-	if (!data->buffer) {
-		err = -ENOMEM;
-		goto error_unlock;
-	}
-
-	err = iio_triggered_buffer_postenable(indio_dev);
-
-error_unlock:
-	mutex_unlock(&data->lock);
-
-	return err;
-}
-
-static int gp2ap020a00f_buffer_predisable(struct iio_dev *indio_dev)
-{
-	struct gp2ap020a00f_data *data = iio_priv(indio_dev);
-	int i, err;
-
-	mutex_lock(&data->lock);
-
-	err = iio_triggered_buffer_predisable(indio_dev);
-	if (err < 0)
-		goto error_unlock;
-
-	for_each_set_bit(i, indio_dev->active_scan_mask,
-		indio_dev->masklength) {
-		switch (i) {
-		case GP2AP020A00F_SCAN_MODE_LIGHT_CLEAR:
-			err = gp2ap020a00f_exec_cmd(data,
-					GP2AP020A00F_CMD_TRIGGER_CLEAR_DIS);
-			break;
-		case GP2AP020A00F_SCAN_MODE_LIGHT_IR:
-			err = gp2ap020a00f_exec_cmd(data,
-					GP2AP020A00F_CMD_TRIGGER_IR_DIS);
-			break;
-		case GP2AP020A00F_SCAN_MODE_PROXIMITY:
-			err = gp2ap020a00f_exec_cmd(data,
-					GP2AP020A00F_CMD_TRIGGER_PROX_DIS);
-			break;
-		}
-	}
-
-	if (err == 0)
-		kfree(data->buffer);
-
-error_unlock:
-	mutex_unlock(&data->lock);
-
-	return err;
-}
-
-static const struct iio_buffer_setup_ops gp2ap020a00f_buffer_setup_ops = {
-	.postenable = &gp2ap020a00f_buffer_postenable,
-	.predisable = &gp2ap020a00f_buffer_predisable,
-};
-
-static const struct iio_trigger_ops gp2ap020a00f_trigger_ops = {
-	.owner = THIS_MODULE,
-};
-
-static int gp2ap020a00f_probe(struct i2c_client *client,
-				const struct i2c_device_id *id)
-{
-	struct gp2ap020a00f_data *data;
-	struct iio_dev *indio_dev;
-	struct regmap *regmap;
-	int err;
-
-	indio_dev = devm_iio_device_alloc(&client->dev, sizeof(*data));
-	if (!indio_dev)
-		return -ENOMEM;
-
-	data = iio_priv(indio_dev);
-
-	data->vled_reg = devm_regulator_get(&client->dev, "vled");
-	if (IS_ERR(data->vled_reg))
-		return PTR_ERR(data->vled_reg);
-
-	err = regulator_enable(data->vled_reg);
-	if (err)
-		return err;
-
-	regmap = devm_regmap_init_i2c(client, &gp2ap020a00f_regmap_config);
-	if (IS_ERR(regmap)) {
-		dev_err(&client->dev, "Regmap initialization failed.\n");
-		err = PTR_ERR(regmap);
-		goto error_regulator_disable;
-	}
-
-	/* Initialize device registers */
-	err = regmap_bulk_write(regmap, GP2AP020A00F_OP_REG,
-			gp2ap020a00f_reg_init_tab,
-			ARRAY_SIZE(gp2ap020a00f_reg_init_tab));
-
-	if (err < 0) {
-		dev_err(&client->dev, "Device initialization failed.\n");
-		goto error_regulator_disable;
-	}
-
-	i2c_set_clientdata(client, indio_dev);
-
-	data->client = client;
-	data->cur_opmode = GP2AP020A00F_OPMODE_SHUTDOWN;
-	data->regmap = regmap;
-	init_waitqueue_head(&data->data_ready_queue);
-
-	mutex_init(&data->lock);
-	indio_dev->dev.parent = &client->dev;
-	indio_dev->channels = gp2ap020a00f_channels;
-	indio_dev->num_channels = ARRAY_SIZE(gp2ap020a00f_channels);
-	indio_dev->info = &gp2ap020a00f_info;
-	indio_dev->name = id->name;
-	indio_dev->modes = INDIO_DIRECT_MODE;
-
-	/* Allocate buffer */
-	err = iio_triggered_buffer_setup(indio_dev, &iio_pollfunc_store_time,
-		&gp2ap020a00f_trigger_handler, &gp2ap020a00f_buffer_setup_ops);
-	if (err < 0)
-		goto error_regulator_disable;
-
-	/* Allocate trigger */
-	data->trig = devm_iio_trigger_alloc(&client->dev, "%s-trigger",
-							indio_dev->name);
-	if (data->trig == NULL) {
-		err = -ENOMEM;
-		dev_err(&indio_dev->dev, "Failed to allocate iio trigger.\n");
-		goto error_uninit_buffer;
-	}
-
-	/* This needs to be requested here for read_raw calls to work. */
-	err = request_threaded_irq(client->irq, NULL,
-				   &gp2ap020a00f_thresh_event_handler,
-				   IRQF_TRIGGER_FALLING |
-				   IRQF_ONESHOT,
-				   "gp2ap020a00f_als_event",
-				   indio_dev);
-	if (err < 0) {
-		dev_err(&client->dev, "Irq request failed.\n");
-		goto error_uninit_buffer;
-	}
-
-	data->trig->ops = &gp2ap020a00f_trigger_ops;
-	data->trig->dev.parent = &data->client->dev;
-
-	init_irq_work(&data->work, gp2ap020a00f_iio_trigger_work);
-
-	err = iio_trigger_register(data->trig);
-	if (err < 0) {
-		dev_err(&client->dev, "Failed to register iio trigger.\n");
-		goto error_free_irq;
-	}
-
-	err = iio_device_register(indio_dev);
-	if (err < 0)
-		goto error_trigger_unregister;
-
-	return 0;
-
-error_trigger_unregister:
-	iio_trigger_unregister(data->trig);
-error_free_irq:
-	free_irq(client->irq, indio_dev);
-error_uninit_buffer:
-	iio_triggered_buffer_cleanup(indio_dev);
-error_regulator_disable:
-	regulator_disable(data->vled_reg);
-
-	return err;
-}
-
-static int gp2ap020a00f_remove(struct i2c_client *client)
-{
-	struct iio_dev *indio_dev = i2c_get_clientdata(client);
-	struct gp2ap020a00f_data *data = iio_priv(indio_dev);
-	int err;
-
-	err = gp2ap020a00f_set_operation_mode(data,
-					GP2AP020A00F_OPMODE_SHUTDOWN);
-	if (err < 0)
-		dev_err(&indio_dev->dev, "Failed to power off the device.\n");
-
-	iio_device_unregister(indio_dev);
-	iio_trigger_unregister(data->trig);
-	free_irq(client->irq, indio_dev);
-	iio_triggered_buffer_cleanup(indio_dev);
-	regulator_disable(data->vled_reg);
-
-	return 0;
-}
-
-static const struct i2c_device_id gp2ap020a00f_id[] = {
-	{ GP2A_I2C_NAME, 0 },
-	{ }
-};
-
-MODULE_DEVICE_TABLE(i2c, gp2ap020a00f_id);
-
-#ifdef CONFIG_OF
-static const struct of_device_id gp2ap020a00f_of_match[] = {
-	{ .compatible = "sharp,gp2ap020a00f" },
-	{ }
-};
-#endif
-
-static struct i2c_driver gp2ap020a00f_driver = {
-	.driver = {
-		.name	= GP2A_I2C_NAME,
-		.of_match_table = of_match_ptr(gp2ap020a00f_of_match),
-		.owner	= THIS_MODULE,
-	},
-	.probe		= gp2ap020a00f_probe,
-	.remove		= gp2ap020a00f_remove,
-	.id_table	= gp2ap020a00f_id,
-};
-
-module_i2c_driver(gp2ap020a00f_driver);
-
-MODULE_AUTHOR("Jacek Anaszewski <j.anaszewski@samsung.com>");
-MODULE_DESCRIPTION("Sharp GP2AP020A00F Proximity/ALS sensor driver");
-MODULE_LICENSE("GPL v2");
diff --git a/drivers/iio/light/hid-sensor-als.c b/drivers/iio/light/hid-sensor-als.c
index 8e8b9d7..e59d00c 100644
--- a/drivers/iio/light/hid-sensor-als.c
+++ b/drivers/iio/light/hid-sensor-als.c
@@ -161,11 +161,10 @@ static const struct iio_info als_info = {
 };
 
 /* Function to push data to buffer */
-static void hid_sensor_push_data(struct iio_dev *indio_dev, const void *data,
-					int len)
+static void hid_sensor_push_data(struct iio_dev *indio_dev, u8 *data, int len)
 {
 	dev_dbg(&indio_dev->dev, "hid_sensor_push_data\n");
-	iio_push_to_buffers(indio_dev, data);
+	iio_push_to_buffers(indio_dev, (u8 *)data);
 }
 
 /* Callback handler to send event after all samples are received and captured */
@@ -180,7 +179,7 @@ static int als_proc_event(struct hid_sensor_hub_device *hsdev,
 				als_state->common_attributes.data_ready);
 	if (als_state->common_attributes.data_ready)
 		hid_sensor_push_data(indio_dev,
-				&als_state->illum,
+				(u8 *)&als_state->illum,
 				sizeof(als_state->illum));
 
 	return 0;
@@ -314,7 +313,7 @@ static int hid_als_probe(struct platform_device *pdev)
 error_iio_unreg:
 	iio_device_unregister(indio_dev);
 error_remove_trigger:
-	hid_sensor_remove_trigger(&als_state->common_attributes);
+	hid_sensor_remove_trigger(indio_dev);
 error_unreg_buffer_funcs:
 	iio_triggered_buffer_cleanup(indio_dev);
 error_free_dev_mem:
@@ -327,11 +326,10 @@ static int hid_als_remove(struct platform_device *pdev)
 {
 	struct hid_sensor_hub_device *hsdev = pdev->dev.platform_data;
 	struct iio_dev *indio_dev = platform_get_drvdata(pdev);
-	struct als_state *als_state = iio_priv(indio_dev);
 
 	sensor_hub_remove_callback(hsdev, HID_USAGE_SENSOR_ALS);
 	iio_device_unregister(indio_dev);
-	hid_sensor_remove_trigger(&als_state->common_attributes);
+	hid_sensor_remove_trigger(indio_dev);
 	iio_triggered_buffer_cleanup(indio_dev);
 	kfree(indio_dev->channels);
 
diff --git a/drivers/iio/light/tcs3472.c b/drivers/iio/light/tcs3472.c
deleted file mode 100644
index 45df220..0000000
--- a/drivers/iio/light/tcs3472.c
+++ /dev/null
@@ -1,367 +0,0 @@
-/*
- * tcs3472.c - Support for TAOS TCS3472 color light-to-digital converter
- *
- * Copyright (c) 2013 Peter Meerwald <pmeerw@pmeerw.net>
- *
- * This file is subject to the terms and conditions of version 2 of
- * the GNU General Public License.  See the file COPYING in the main
- * directory of this archive for more details.
- *
- * Color light sensor with 16-bit channels for red, green, blue, clear);
- * 7-bit I2C slave address 0x39 (TCS34721, TCS34723) or 0x29 (TCS34725,
- * TCS34727)
- *
- * TODO: interrupt support, thresholds, wait time
- */
-
-#include <linux/module.h>
-#include <linux/i2c.h>
-#include <linux/delay.h>
-#include <linux/pm.h>
-
-#include <linux/iio/iio.h>
-#include <linux/iio/sysfs.h>
-#include <linux/iio/trigger_consumer.h>
-#include <linux/iio/buffer.h>
-#include <linux/iio/triggered_buffer.h>
-
-#define TCS3472_DRV_NAME "tcs3472"
-
-#define TCS3472_COMMAND BIT(7)
-#define TCS3472_AUTO_INCR BIT(5)
-
-#define TCS3472_ENABLE (TCS3472_COMMAND | 0x00)
-#define TCS3472_ATIME (TCS3472_COMMAND | 0x01)
-#define TCS3472_WTIME (TCS3472_COMMAND | 0x03)
-#define TCS3472_AILT (TCS3472_COMMAND | 0x04)
-#define TCS3472_AIHT (TCS3472_COMMAND | 0x06)
-#define TCS3472_PERS (TCS3472_COMMAND | 0x0c)
-#define TCS3472_CONFIG (TCS3472_COMMAND | 0x0d)
-#define TCS3472_CONTROL (TCS3472_COMMAND | 0x0f)
-#define TCS3472_ID (TCS3472_COMMAND | 0x12)
-#define TCS3472_STATUS (TCS3472_COMMAND | 0x13)
-#define TCS3472_CDATA (TCS3472_COMMAND | TCS3472_AUTO_INCR | 0x14)
-#define TCS3472_RDATA (TCS3472_COMMAND | TCS3472_AUTO_INCR | 0x16)
-#define TCS3472_GDATA (TCS3472_COMMAND | TCS3472_AUTO_INCR | 0x18)
-#define TCS3472_BDATA (TCS3472_COMMAND | TCS3472_AUTO_INCR | 0x1a)
-
-#define TCS3472_STATUS_AVALID BIT(0)
-#define TCS3472_ENABLE_AEN BIT(1)
-#define TCS3472_ENABLE_PON BIT(0)
-#define TCS3472_CONTROL_AGAIN_MASK (BIT(0) | BIT(1))
-
-struct tcs3472_data {
-	struct i2c_client *client;
-	u8 enable;
-	u8 control;
-	u8 atime;
-	u16 buffer[8]; /* 4 16-bit channels + 64-bit timestamp */
-};
-
-#define TCS3472_CHANNEL(_color, _si, _addr) { \
-	.type = IIO_INTENSITY, \
-	.modified = 1, \
-	.info_mask_separate = BIT(IIO_CHAN_INFO_RAW), \
-	.info_mask_shared_by_type = BIT(IIO_CHAN_INFO_CALIBSCALE) | \
-		BIT(IIO_CHAN_INFO_INT_TIME), \
-	.channel2 = IIO_MOD_LIGHT_##_color, \
-	.address = _addr, \
-	.scan_index = _si, \
-	.scan_type = IIO_ST('u', 16, 16, 0), \
-}
-
-static const int tcs3472_agains[] = { 1, 4, 16, 60 };
-
-static const struct iio_chan_spec tcs3472_channels[] = {
-	TCS3472_CHANNEL(CLEAR, 0, TCS3472_CDATA),
-	TCS3472_CHANNEL(RED, 1, TCS3472_RDATA),
-	TCS3472_CHANNEL(GREEN, 2, TCS3472_GDATA),
-	TCS3472_CHANNEL(BLUE, 3, TCS3472_BDATA),
-	IIO_CHAN_SOFT_TIMESTAMP(4),
-};
-
-static int tcs3472_req_data(struct tcs3472_data *data)
-{
-	int tries = 50;
-	int ret;
-
-	while (tries--) {
-		ret = i2c_smbus_read_byte_data(data->client, TCS3472_STATUS);
-		if (ret < 0)
-			return ret;
-		if (ret & TCS3472_STATUS_AVALID)
-			break;
-		msleep(20);
-	}
-
-	if (tries < 0) {
-		dev_err(&data->client->dev, "data not ready\n");
-		return -EIO;
-	}
-
-	return 0;
-}
-
-static int tcs3472_read_raw(struct iio_dev *indio_dev,
-			   struct iio_chan_spec const *chan,
-			   int *val, int *val2, long mask)
-{
-	struct tcs3472_data *data = iio_priv(indio_dev);
-	int ret;
-
-	switch (mask) {
-	case IIO_CHAN_INFO_RAW:
-		ret = tcs3472_req_data(data);
-		if (ret < 0)
-			return ret;
-		ret = i2c_smbus_read_word_data(data->client, chan->address);
-		if (ret < 0)
-			return ret;
-		*val = ret;
-		return IIO_VAL_INT;
-	case IIO_CHAN_INFO_CALIBSCALE:
-		*val = tcs3472_agains[data->control &
-			TCS3472_CONTROL_AGAIN_MASK];
-		return IIO_VAL_INT;
-	case IIO_CHAN_INFO_INT_TIME:
-		*val = 0;
-		*val2 = (256 - data->atime) * 2400;
-		return IIO_VAL_INT_PLUS_MICRO;
-	}
-	return -EINVAL;
-}
-
-static int tcs3472_write_raw(struct iio_dev *indio_dev,
-			       struct iio_chan_spec const *chan,
-			       int val, int val2, long mask)
-{
-	struct tcs3472_data *data = iio_priv(indio_dev);
-	int i;
-
-	switch (mask) {
-	case IIO_CHAN_INFO_CALIBSCALE:
-		if (val2 != 0)
-			return -EINVAL;
-		for (i = 0; i < ARRAY_SIZE(tcs3472_agains); i++) {
-			if (val == tcs3472_agains[i]) {
-				data->control &= ~TCS3472_CONTROL_AGAIN_MASK;
-				data->control |= i;
-				return i2c_smbus_write_byte_data(
-					data->client, TCS3472_CONTROL,
-					data->control);
-			}
-		}
-		return -EINVAL;
-	case IIO_CHAN_INFO_INT_TIME:
-		if (val != 0)
-			return -EINVAL;
-		for (i = 0; i < 256; i++) {
-			if (val2 == (256 - i) * 2400) {
-				data->atime = i;
-				return i2c_smbus_write_word_data(
-					data->client, TCS3472_ATIME,
-					data->atime);
-			}
-
-		}
-		return -EINVAL;
-	}
-	return -EINVAL;
-}
-
-static irqreturn_t tcs3472_trigger_handler(int irq, void *p)
-{
-	struct iio_poll_func *pf = p;
-	struct iio_dev *indio_dev = pf->indio_dev;
-	struct tcs3472_data *data = iio_priv(indio_dev);
-	int len = 0;
-	int i, j = 0;
-
-	int ret = tcs3472_req_data(data);
-	if (ret < 0)
-		goto done;
-
-	for_each_set_bit(i, indio_dev->active_scan_mask,
-		indio_dev->masklength) {
-		ret = i2c_smbus_read_word_data(data->client,
-			TCS3472_CDATA + 2*i);
-		if (ret < 0)
-			goto done;
-
-		data->buffer[j++] = ret;
-		len += 2;
-	}
-
-	iio_push_to_buffers_with_timestamp(indio_dev, data->buffer,
-		iio_get_time_ns());
-
-done:
-	iio_trigger_notify_done(indio_dev->trig);
-
-	return IRQ_HANDLED;
-}
-
-static ssize_t tcs3472_show_int_time_available(struct device *dev,
-					struct device_attribute *attr,
-					char *buf)
-{
-	size_t len = 0;
-	int i;
-
-	for (i = 1; i <= 256; i++)
-		len += scnprintf(buf + len, PAGE_SIZE - len, "0.%06d ",
-			2400 * i);
-
-	/* replace trailing space by newline */
-	buf[len - 1] = '\n';
-
-	return len;
-}
-
-static IIO_CONST_ATTR(calibscale_available, "1 4 16 60");
-static IIO_DEV_ATTR_INT_TIME_AVAIL(tcs3472_show_int_time_available);
-
-static struct attribute *tcs3472_attributes[] = {
-	&iio_const_attr_calibscale_available.dev_attr.attr,
-	&iio_dev_attr_integration_time_available.dev_attr.attr,
-	NULL
-};
-
-static const struct attribute_group tcs3472_attribute_group = {
-	.attrs = tcs3472_attributes,
-};
-
-static const struct iio_info tcs3472_info = {
-	.read_raw = tcs3472_read_raw,
-	.write_raw = tcs3472_write_raw,
-	.attrs = &tcs3472_attribute_group,
-	.driver_module = THIS_MODULE,
-};
-
-static int tcs3472_probe(struct i2c_client *client,
-			   const struct i2c_device_id *id)
-{
-	struct tcs3472_data *data;
-	struct iio_dev *indio_dev;
-	int ret;
-
-	indio_dev = devm_iio_device_alloc(&client->dev, sizeof(*data));
-	if (indio_dev == NULL)
-		return -ENOMEM;
-
-	data = iio_priv(indio_dev);
-	i2c_set_clientdata(client, indio_dev);
-	data->client = client;
-
-	indio_dev->dev.parent = &client->dev;
-	indio_dev->info = &tcs3472_info;
-	indio_dev->name = TCS3472_DRV_NAME;
-	indio_dev->channels = tcs3472_channels;
-	indio_dev->num_channels = ARRAY_SIZE(tcs3472_channels);
-	indio_dev->modes = INDIO_DIRECT_MODE;
-
-	ret = i2c_smbus_read_byte_data(data->client, TCS3472_ID);
-	if (ret < 0)
-		return ret;
-
-	if (ret == 0x44)
-		dev_info(&client->dev, "TCS34721/34725 found\n");
-	else if (ret == 0x4d)
-		dev_info(&client->dev, "TCS34723/34727 found\n");
-	else
-		return -ENODEV;
-
-	ret = i2c_smbus_read_byte_data(data->client, TCS3472_CONTROL);
-	if (ret < 0)
-		return ret;
-	data->control = ret;
-
-	ret = i2c_smbus_read_byte_data(data->client, TCS3472_ATIME);
-	if (ret < 0)
-		return ret;
-	data->atime = ret;
-
-	ret = i2c_smbus_read_byte_data(data->client, TCS3472_ENABLE);
-	if (ret < 0)
-		return ret;
-
-	/* enable device */
-	data->enable = ret | TCS3472_ENABLE_PON | TCS3472_ENABLE_AEN;
-	ret = i2c_smbus_write_byte_data(data->client, TCS3472_ENABLE,
-		data->enable);
-	if (ret < 0)
-		return ret;
-
-	ret = iio_triggered_buffer_setup(indio_dev, NULL,
-		tcs3472_trigger_handler, NULL);
-	if (ret < 0)
-		return ret;
-
-	ret = iio_device_register(indio_dev);
-	if (ret < 0)
-		goto buffer_cleanup;
-
-	return 0;
-
-buffer_cleanup:
-	iio_triggered_buffer_cleanup(indio_dev);
-	return ret;
-}
-
-static int tcs3472_powerdown(struct tcs3472_data *data)
-{
-	return i2c_smbus_write_byte_data(data->client, TCS3472_ENABLE,
-		data->enable & ~(TCS3472_ENABLE_AEN | TCS3472_ENABLE_PON));
-}
-
-static int tcs3472_remove(struct i2c_client *client)
-{
-	struct iio_dev *indio_dev = i2c_get_clientdata(client);
-
-	iio_device_unregister(indio_dev);
-	iio_triggered_buffer_cleanup(indio_dev);
-	tcs3472_powerdown(iio_priv(indio_dev));
-
-	return 0;
-}
-
-#ifdef CONFIG_PM_SLEEP
-static int tcs3472_suspend(struct device *dev)
-{
-	struct tcs3472_data *data = iio_priv(i2c_get_clientdata(
-		to_i2c_client(dev)));
-	return tcs3472_powerdown(data);
-}
-
-static int tcs3472_resume(struct device *dev)
-{
-	struct tcs3472_data *data = iio_priv(i2c_get_clientdata(
-		to_i2c_client(dev)));
-	return i2c_smbus_write_byte_data(data->client, TCS3472_ENABLE,
-		data->enable | (TCS3472_ENABLE_AEN | TCS3472_ENABLE_PON));
-}
-#endif
-
-static SIMPLE_DEV_PM_OPS(tcs3472_pm_ops, tcs3472_suspend, tcs3472_resume);
-
-static const struct i2c_device_id tcs3472_id[] = {
-	{ "tcs3472", 0 },
-	{ }
-};
-MODULE_DEVICE_TABLE(i2c, tcs3472_id);
-
-static struct i2c_driver tcs3472_driver = {
-	.driver = {
-		.name	= TCS3472_DRV_NAME,
-		.pm	= &tcs3472_pm_ops,
-		.owner	= THIS_MODULE,
-	},
-	.probe		= tcs3472_probe,
-	.remove		= tcs3472_remove,
-	.id_table	= tcs3472_id,
-};
-module_i2c_driver(tcs3472_driver);
-
-MODULE_AUTHOR("Peter Meerwald <pmeerw@pmeerw.net>");
-MODULE_DESCRIPTION("TCS3472 color light sensors driver");
-MODULE_LICENSE("GPL");
diff --git a/drivers/iio/light/tsl2563.c b/drivers/iio/light/tsl2563.c
index 5e5d9de..ebb962c 100644
--- a/drivers/iio/light/tsl2563.c
+++ b/drivers/iio/light/tsl2563.c
@@ -526,20 +526,6 @@ error_ret:
 	return ret;
 }
 
-static const struct iio_event_spec tsl2563_events[] = {
-	{
-		.type = IIO_EV_TYPE_THRESH,
-		.dir = IIO_EV_DIR_RISING,
-		.mask_separate = BIT(IIO_EV_INFO_VALUE) |
-				BIT(IIO_EV_INFO_ENABLE),
-	}, {
-		.type = IIO_EV_TYPE_THRESH,
-		.dir = IIO_EV_DIR_FALLING,
-		.mask_separate = BIT(IIO_EV_INFO_VALUE) |
-				BIT(IIO_EV_INFO_ENABLE),
-	},
-};
-
 static const struct iio_chan_spec tsl2563_channels[] = {
 	{
 		.type = IIO_LIGHT,
@@ -552,8 +538,10 @@ static const struct iio_chan_spec tsl2563_channels[] = {
 		.channel2 = IIO_MOD_LIGHT_BOTH,
 		.info_mask_separate = BIT(IIO_CHAN_INFO_RAW) |
 		BIT(IIO_CHAN_INFO_CALIBSCALE),
-		.event_spec = tsl2563_events,
-		.num_event_specs = ARRAY_SIZE(tsl2563_events),
+		.event_mask = (IIO_EV_BIT(IIO_EV_TYPE_THRESH,
+					  IIO_EV_DIR_RISING) |
+			       IIO_EV_BIT(IIO_EV_TYPE_THRESH,
+					  IIO_EV_DIR_FALLING)),
 	}, {
 		.type = IIO_INTENSITY,
 		.modified = 1,
@@ -564,13 +552,12 @@ static const struct iio_chan_spec tsl2563_channels[] = {
 };
 
 static int tsl2563_read_thresh(struct iio_dev *indio_dev,
-	const struct iio_chan_spec *chan, enum iio_event_type type,
-	enum iio_event_direction dir, enum iio_event_info info, int *val,
-	int *val2)
+			       u64 event_code,
+			       int *val)
 {
 	struct tsl2563_chip *chip = iio_priv(indio_dev);
 
-	switch (dir) {
+	switch (IIO_EVENT_CODE_EXTRACT_DIR(event_code)) {
 	case IIO_EV_DIR_RISING:
 		*val = chip->high_thres;
 		break;
@@ -581,19 +568,18 @@ static int tsl2563_read_thresh(struct iio_dev *indio_dev,
 		return -EINVAL;
 	}
 
-	return IIO_VAL_INT;
+	return 0;
 }
 
 static int tsl2563_write_thresh(struct iio_dev *indio_dev,
-	const struct iio_chan_spec *chan, enum iio_event_type type,
-	enum iio_event_direction dir, enum iio_event_info info, int val,
-	int val2)
+				  u64 event_code,
+				  int val)
 {
 	struct tsl2563_chip *chip = iio_priv(indio_dev);
 	int ret;
 	u8 address;
 
-	if (dir == IIO_EV_DIR_RISING)
+	if (IIO_EVENT_CODE_EXTRACT_DIR(event_code) == IIO_EV_DIR_RISING)
 		address = TSL2563_REG_HIGHLOW;
 	else
 		address = TSL2563_REG_LOWLOW;
@@ -605,7 +591,7 @@ static int tsl2563_write_thresh(struct iio_dev *indio_dev,
 	ret = i2c_smbus_write_byte_data(chip->client,
 					TSL2563_CMD | (address + 1),
 					(val >> 8) & 0xFF);
-	if (dir == IIO_EV_DIR_RISING)
+	if (IIO_EVENT_CODE_EXTRACT_DIR(event_code) == IIO_EV_DIR_RISING)
 		chip->high_thres = val;
 	else
 		chip->low_thres = val;
@@ -634,8 +620,8 @@ static irqreturn_t tsl2563_event_handler(int irq, void *private)
 }
 
 static int tsl2563_write_interrupt_config(struct iio_dev *indio_dev,
-	const struct iio_chan_spec *chan, enum iio_event_type type,
-	enum iio_event_direction dir, int state)
+					  u64 event_code,
+					  int state)
 {
 	struct tsl2563_chip *chip = iio_priv(indio_dev);
 	int ret = 0;
@@ -676,8 +662,7 @@ out:
 }
 
 static int tsl2563_read_interrupt_config(struct iio_dev *indio_dev,
-	const struct iio_chan_spec *chan, enum iio_event_type type,
-	enum iio_event_direction dir)
+					 u64 event_code)
 {
 	struct tsl2563_chip *chip = iio_priv(indio_dev);
 	int ret;
@@ -702,10 +687,10 @@ static const struct iio_info tsl2563_info = {
 	.driver_module = THIS_MODULE,
 	.read_raw = &tsl2563_read_raw,
 	.write_raw = &tsl2563_write_raw,
-	.read_event_value_new = &tsl2563_read_thresh,
-	.write_event_value_new = &tsl2563_write_thresh,
-	.read_event_config_new = &tsl2563_read_interrupt_config,
-	.write_event_config_new = &tsl2563_write_interrupt_config,
+	.read_event_value = &tsl2563_read_thresh,
+	.write_event_value = &tsl2563_write_thresh,
+	.read_event_config = &tsl2563_read_interrupt_config,
+	.write_event_config = &tsl2563_write_interrupt_config,
 };
 
 static int tsl2563_probe(struct i2c_client *client,
diff --git a/drivers/iio/light/tsl4531.c b/drivers/iio/light/tsl4531.c
deleted file mode 100644
index a15006e..0000000
--- a/drivers/iio/light/tsl4531.c
+++ /dev/null
@@ -1,258 +0,0 @@
-/*
- * tsl4531.c - Support for TAOS TSL4531 ambient light sensor
- *
- * Copyright 2013 Peter Meerwald <pmeerw@pmeerw.net>
- *
- * This file is subject to the terms and conditions of version 2 of
- * the GNU General Public License.  See the file COPYING in the main
- * directory of this archive for more details.
- *
- * IIO driver for the TSL4531x family
- *   TSL45311/TSL45313: 7-bit I2C slave address 0x39
- *   TSL45315/TSL45317: 7-bit I2C slave address 0x29
- *
- * TODO: single cycle measurement
- */
-
-#include <linux/module.h>
-#include <linux/i2c.h>
-#include <linux/err.h>
-#include <linux/delay.h>
-
-#include <linux/iio/iio.h>
-#include <linux/iio/sysfs.h>
-
-#define TSL4531_DRV_NAME "tsl4531"
-
-#define TCS3472_COMMAND BIT(7)
-
-#define TSL4531_CONTROL (TCS3472_COMMAND | 0x00)
-#define TSL4531_CONFIG (TCS3472_COMMAND | 0x01)
-#define TSL4531_DATA (TCS3472_COMMAND | 0x04)
-#define TSL4531_ID (TCS3472_COMMAND | 0x0a)
-
-/* operating modes in control register */
-#define TSL4531_MODE_POWERDOWN 0x00
-#define TSL4531_MODE_SINGLE_ADC 0x02
-#define TSL4531_MODE_NORMAL 0x03
-
-/* integration time control in config register */
-#define TSL4531_TCNTRL_400MS 0x00
-#define TSL4531_TCNTRL_200MS 0x01
-#define TSL4531_TCNTRL_100MS 0x02
-
-/* part number in id register */
-#define TSL45311_ID 0x8
-#define TSL45313_ID 0x9
-#define TSL45315_ID 0xa
-#define TSL45317_ID 0xb
-#define TSL4531_ID_SHIFT 4
-
-struct tsl4531_data {
-	struct i2c_client *client;
-	struct mutex lock;
-	int int_time;
-};
-
-static IIO_CONST_ATTR_INT_TIME_AVAIL("0.1 0.2 0.4");
-
-static struct attribute *tsl4531_attributes[] = {
-	&iio_const_attr_integration_time_available.dev_attr.attr,
-	NULL
-};
-
-static const struct attribute_group tsl4531_attribute_group = {
-	.attrs = tsl4531_attributes,
-};
-
-static const struct iio_chan_spec tsl4531_channels[] = {
-	{
-		.type = IIO_LIGHT,
-		.info_mask_separate = BIT(IIO_CHAN_INFO_RAW) |
-			BIT(IIO_CHAN_INFO_SCALE) |
-			BIT(IIO_CHAN_INFO_INT_TIME)
-	}
-};
-
-static int tsl4531_read_raw(struct iio_dev *indio_dev,
-				struct iio_chan_spec const *chan,
-				int *val, int *val2, long mask)
-{
-	struct tsl4531_data *data = iio_priv(indio_dev);
-	int ret;
-
-	switch (mask) {
-	case IIO_CHAN_INFO_RAW:
-		ret = i2c_smbus_read_word_data(data->client,
-			TSL4531_DATA);
-		if (ret < 0)
-			return ret;
-		*val = ret;
-		return IIO_VAL_INT;
-	case IIO_CHAN_INFO_SCALE:
-		/* 0.. 1x, 1 .. 2x, 2 .. 4x */
-		*val = 1 << data->int_time;
-		return IIO_VAL_INT;
-	case IIO_CHAN_INFO_INT_TIME:
-		if (data->int_time == 0)
-			*val2 = 400000;
-		else if (data->int_time == 1)
-			*val2 = 200000;
-		else if (data->int_time == 2)
-			*val2 = 100000;
-		else
-			return -EINVAL;
-		*val = 0;
-		return IIO_VAL_INT_PLUS_MICRO;
-	default:
-		return -EINVAL;
-	}
-}
-
-static int tsl4531_write_raw(struct iio_dev *indio_dev,
-			     struct iio_chan_spec const *chan,
-			     int val, int val2, long mask)
-{
-	struct tsl4531_data *data = iio_priv(indio_dev);
-	int int_time, ret;
-
-	switch (mask) {
-	case IIO_CHAN_INFO_INT_TIME:
-		if (val != 0)
-			return -EINVAL;
-		if (val2 == 400000)
-			int_time = 0;
-		else if (val2 == 200000)
-			int_time = 1;
-		else if (val2 == 100000)
-			int_time = 2;
-		else
-			return -EINVAL;
-		mutex_lock(&data->lock);
-		ret = i2c_smbus_write_byte_data(data->client,
-			TSL4531_CONFIG, int_time);
-		if (ret >= 0)
-			data->int_time = int_time;
-		mutex_unlock(&data->lock);
-		return ret;
-	default:
-		return -EINVAL;
-	}
-}
-
-static const struct iio_info tsl4531_info = {
-	.read_raw = tsl4531_read_raw,
-	.write_raw = tsl4531_write_raw,
-	.attrs = &tsl4531_attribute_group,
-	.driver_module = THIS_MODULE,
-};
-
-static int tsl4531_check_id(struct i2c_client *client)
-{
-	int ret = i2c_smbus_read_byte_data(client, TSL4531_ID);
-	if (ret < 0)
-		return ret;
-
-	switch (ret >> TSL4531_ID_SHIFT) {
-	case TSL45311_ID:
-	case TSL45313_ID:
-	case TSL45315_ID:
-	case TSL45317_ID:
-		return 1;
-	default:
-		return 0;
-	}
-}
-
-static int tsl4531_probe(struct i2c_client *client,
-			  const struct i2c_device_id *id)
-{
-	struct tsl4531_data *data;
-	struct iio_dev *indio_dev;
-	int ret;
-
-	indio_dev = devm_iio_device_alloc(&client->dev, sizeof(*data));
-	if (!indio_dev)
-		return -ENOMEM;
-
-	data = iio_priv(indio_dev);
-	i2c_set_clientdata(client, indio_dev);
-	data->client = client;
-	mutex_init(&data->lock);
-
-	if (!tsl4531_check_id(client)) {
-		dev_err(&client->dev, "no TSL4531 sensor\n");
-		return -ENODEV;
-	}
-
-	ret = i2c_smbus_write_byte_data(data->client, TSL4531_CONTROL,
-		TSL4531_MODE_NORMAL);
-	if (ret < 0)
-		return ret;
-
-	ret = i2c_smbus_write_byte_data(data->client, TSL4531_CONFIG,
-		TSL4531_TCNTRL_400MS);
-	if (ret < 0)
-		return ret;
-
-	indio_dev->dev.parent = &client->dev;
-	indio_dev->info = &tsl4531_info;
-	indio_dev->channels = tsl4531_channels;
-	indio_dev->num_channels = ARRAY_SIZE(tsl4531_channels);
-	indio_dev->name = TSL4531_DRV_NAME;
-	indio_dev->modes = INDIO_DIRECT_MODE;
-
-	return iio_device_register(indio_dev);
-}
-
-static int tsl4531_powerdown(struct i2c_client *client)
-{
-	return i2c_smbus_write_byte_data(client, TSL4531_CONTROL,
-		TSL4531_MODE_POWERDOWN);
-}
-
-static int tsl4531_remove(struct i2c_client *client)
-{
-	iio_device_unregister(i2c_get_clientdata(client));
-	tsl4531_powerdown(client);
-
-	return 0;
-}
-
-#ifdef CONFIG_PM_SLEEP
-static int tsl4531_suspend(struct device *dev)
-{
-	return tsl4531_powerdown(to_i2c_client(dev));
-}
-
-static int tsl4531_resume(struct device *dev)
-{
-	return i2c_smbus_write_byte_data(to_i2c_client(dev), TSL4531_CONTROL,
-		TSL4531_MODE_NORMAL);
-}
-#endif
-
-static SIMPLE_DEV_PM_OPS(tsl4531_pm_ops, tsl4531_suspend, tsl4531_resume);
-
-static const struct i2c_device_id tsl4531_id[] = {
-	{ "tsl4531", 0 },
-	{ }
-};
-MODULE_DEVICE_TABLE(i2c, tsl4531_id);
-
-static struct i2c_driver tsl4531_driver = {
-	.driver = {
-		.name   = TSL4531_DRV_NAME,
-		.pm	= &tsl4531_pm_ops,
-		.owner  = THIS_MODULE,
-	},
-	.probe  = tsl4531_probe,
-	.remove = tsl4531_remove,
-	.id_table = tsl4531_id,
-};
-
-module_i2c_driver(tsl4531_driver);
-
-MODULE_AUTHOR("Peter Meerwald <pmeerw@pmeerw.net>");
-MODULE_DESCRIPTION("TAOS TSL4531 ambient light sensors driver");
-MODULE_LICENSE("GPL");
diff --git a/drivers/iio/light/vcnl4000.c b/drivers/iio/light/vcnl4000.c
index ecb3341..2bb3042 100644
--- a/drivers/iio/light/vcnl4000.c
+++ b/drivers/iio/light/vcnl4000.c
@@ -179,7 +179,11 @@ static int vcnl4000_probe(struct i2c_client *client,
 	indio_dev->name = VCNL4000_DRV_NAME;
 	indio_dev->modes = INDIO_DIRECT_MODE;
 
-	return iio_device_register(indio_dev);
+	ret = iio_device_register(indio_dev);
+	if (ret < 0)
+		return ret;
+
+	return 0;
 }
 
 static int vcnl4000_remove(struct i2c_client *client)
diff --git a/drivers/iio/magnetometer/Kconfig b/drivers/iio/magnetometer/Kconfig
index d86d226..4fa923f 100644
--- a/drivers/iio/magnetometer/Kconfig
+++ b/drivers/iio/magnetometer/Kconfig
@@ -16,18 +16,6 @@ config AK8975
 	  To compile this driver as a module, choose M here: the module
 	  will be called ak8975.
 
-config MAG3110
-	tristate "Freescale MAG3110 3-Axis Magnetometer"
-	depends on I2C
-	select IIO_BUFFER
-	select IIO_TRIGGERED_BUFFER
-	help
-	  Say yes here to build support for the Freescale MAG3110 3-Axis
-	  magnetometer.
-
-	  To compile this driver as a module, choose M here: the module
-	  will be called mag3110.
-
 config HID_SENSOR_MAGNETOMETER_3D
 	depends on HID_SENSOR_HUB
 	select IIO_BUFFER
diff --git a/drivers/iio/magnetometer/Makefile b/drivers/iio/magnetometer/Makefile
index 0f5d3c9..f91b1b6 100644
--- a/drivers/iio/magnetometer/Makefile
+++ b/drivers/iio/magnetometer/Makefile
@@ -4,7 +4,6 @@
 
 # When adding new entries keep the list in alphabetical order
 obj-$(CONFIG_AK8975)	+= ak8975.o
-obj-$(CONFIG_MAG3110)	+= mag3110.o
 obj-$(CONFIG_HID_SENSOR_MAGNETOMETER_3D) += hid-sensor-magn-3d.o
 
 obj-$(CONFIG_IIO_ST_MAGN_3AXIS) += st_magn.o
diff --git a/drivers/iio/magnetometer/ak8975.c b/drivers/iio/magnetometer/ak8975.c
index ff284e5..7105f22 100644
--- a/drivers/iio/magnetometer/ak8975.c
+++ b/drivers/iio/magnetometer/ak8975.c
@@ -263,7 +263,7 @@ static int ak8975_setup(struct i2c_client *client)
  *
  * HuT = H * 1229/4096, or roughly, 3/10.
  *
- * Since 1uT = 0.01 gauss, our final scale factor becomes:
+ * Since 1uT = 100 gauss, our final scale factor becomes:
  *
  * Hadj = H * ((ASA + 128) / 256) * 3/10 * 100
  * Hadj = H * ((ASA + 128) * 30 / 256
diff --git a/drivers/iio/magnetometer/hid-sensor-magn-3d.c b/drivers/iio/magnetometer/hid-sensor-magn-3d.c
index b26e102..a98460b 100644
--- a/drivers/iio/magnetometer/hid-sensor-magn-3d.c
+++ b/drivers/iio/magnetometer/hid-sensor-magn-3d.c
@@ -183,11 +183,10 @@ static const struct iio_info magn_3d_info = {
 };
 
 /* Function to push data to buffer */
-static void hid_sensor_push_data(struct iio_dev *indio_dev, const void *data,
-	int len)
+static void hid_sensor_push_data(struct iio_dev *indio_dev, u8 *data, int len)
 {
 	dev_dbg(&indio_dev->dev, "hid_sensor_push_data\n");
-	iio_push_to_buffers(indio_dev, data);
+	iio_push_to_buffers(indio_dev, (u8 *)data);
 }
 
 /* Callback handler to send event after all samples are received and captured */
@@ -202,7 +201,7 @@ static int magn_3d_proc_event(struct hid_sensor_hub_device *hsdev,
 				magn_state->common_attributes.data_ready);
 	if (magn_state->common_attributes.data_ready)
 		hid_sensor_push_data(indio_dev,
-				magn_state->magn_val,
+				(u8 *)magn_state->magn_val,
 				sizeof(magn_state->magn_val));
 
 	return 0;
@@ -351,7 +350,7 @@ static int hid_magn_3d_probe(struct platform_device *pdev)
 error_iio_unreg:
 	iio_device_unregister(indio_dev);
 error_remove_trigger:
-	hid_sensor_remove_trigger(&magn_state->common_attributes);
+	hid_sensor_remove_trigger(indio_dev);
 error_unreg_buffer_funcs:
 	iio_triggered_buffer_cleanup(indio_dev);
 error_free_dev_mem:
@@ -364,11 +363,10 @@ static int hid_magn_3d_remove(struct platform_device *pdev)
 {
 	struct hid_sensor_hub_device *hsdev = pdev->dev.platform_data;
 	struct iio_dev *indio_dev = platform_get_drvdata(pdev);
-	struct magn_3d_state *magn_state = iio_priv(indio_dev);
 
 	sensor_hub_remove_callback(hsdev, HID_USAGE_SENSOR_COMPASS_3D);
 	iio_device_unregister(indio_dev);
-	hid_sensor_remove_trigger(&magn_state->common_attributes);
+	hid_sensor_remove_trigger(indio_dev);
 	iio_triggered_buffer_cleanup(indio_dev);
 	kfree(indio_dev->channels);
 
diff --git a/drivers/iio/magnetometer/mag3110.c b/drivers/iio/magnetometer/mag3110.c
deleted file mode 100644
index becf544..0000000
--- a/drivers/iio/magnetometer/mag3110.c
+++ /dev/null
@@ -1,406 +0,0 @@
-/*
- * mag3110.c - Support for Freescale MAG3110 magnetometer sensor
- *
- * Copyright (c) 2013 Peter Meerwald <pmeerw@pmeerw.net>
- *
- * This file is subject to the terms and conditions of version 2 of
- * the GNU General Public License.  See the file COPYING in the main
- * directory of this archive for more details.
- *
- * (7-bit I2C slave address 0x0e)
- *
- * TODO: irq, user offset, oversampling, continuous mode
- */
-
-#include <linux/module.h>
-#include <linux/i2c.h>
-#include <linux/iio/iio.h>
-#include <linux/iio/sysfs.h>
-#include <linux/iio/trigger_consumer.h>
-#include <linux/iio/buffer.h>
-#include <linux/iio/triggered_buffer.h>
-#include <linux/delay.h>
-
-#define MAG3110_STATUS 0x00
-#define MAG3110_OUT_X 0x01 /* MSB first */
-#define MAG3110_OUT_Y 0x03
-#define MAG3110_OUT_Z 0x05
-#define MAG3110_WHO_AM_I 0x07
-#define MAG3110_OFF_X 0x09 /* MSB first */
-#define MAG3110_OFF_Y 0x0b
-#define MAG3110_OFF_Z 0x0d
-#define MAG3110_DIE_TEMP 0x0f
-#define MAG3110_CTRL_REG1 0x10
-#define MAG3110_CTRL_REG2 0x11
-
-#define MAG3110_STATUS_DRDY (BIT(2) | BIT(1) | BIT(0))
-
-#define MAG3110_CTRL_DR_MASK (BIT(7) | BIT(6) | BIT(5))
-#define MAG3110_CTRL_DR_SHIFT 5
-#define MAG3110_CTRL_DR_DEFAULT 0
-
-#define MAG3110_CTRL_TM BIT(1) /* trigger single measurement */
-#define MAG3110_CTRL_AC BIT(0) /* continuous measurements */
-
-#define MAG3110_CTRL_AUTO_MRST_EN BIT(7) /* magnetic auto-reset */
-#define MAG3110_CTRL_RAW BIT(5) /* measurements not user-offset corrected */
-
-#define MAG3110_DEVICE_ID 0xc4
-
-/* Each client has this additional data */
-struct mag3110_data {
-	struct i2c_client *client;
-	struct mutex lock;
-	u8 ctrl_reg1;
-};
-
-static int mag3110_request(struct mag3110_data *data)
-{
-	int ret, tries = 150;
-
-	/* trigger measurement */
-	ret = i2c_smbus_write_byte_data(data->client, MAG3110_CTRL_REG1,
-		data->ctrl_reg1 | MAG3110_CTRL_TM);
-	if (ret < 0)
-		return ret;
-
-	while (tries-- > 0) {
-		ret = i2c_smbus_read_byte_data(data->client, MAG3110_STATUS);
-		if (ret < 0)
-			return ret;
-		/* wait for data ready */
-		if ((ret & MAG3110_STATUS_DRDY) == MAG3110_STATUS_DRDY)
-			break;
-		msleep(20);
-	}
-
-	if (tries < 0) {
-		dev_err(&data->client->dev, "data not ready\n");
-		return -EIO;
-	}
-
-	return 0;
-}
-
-static int mag3110_read(struct mag3110_data *data, __be16 buf[3])
-{
-	int ret;
-
-	mutex_lock(&data->lock);
-	ret = mag3110_request(data);
-	if (ret < 0) {
-		mutex_unlock(&data->lock);
-		return ret;
-	}
-	ret = i2c_smbus_read_i2c_block_data(data->client,
-		MAG3110_OUT_X, 3 * sizeof(__be16), (u8 *) buf);
-	mutex_unlock(&data->lock);
-
-	return ret;
-}
-
-static ssize_t mag3110_show_int_plus_micros(char *buf,
-	const int (*vals)[2], int n)
-{
-	size_t len = 0;
-
-	while (n-- > 0)
-		len += scnprintf(buf + len, PAGE_SIZE - len,
-			"%d.%d ", vals[n][0], vals[n][1]);
-
-	/* replace trailing space by newline */
-	buf[len - 1] = '\n';
-
-	return len;
-}
-
-static int mag3110_get_int_plus_micros_index(const int (*vals)[2], int n,
-					int val, int val2)
-{
-	while (n-- > 0)
-		if (val == vals[n][0] && val2 == vals[n][1])
-			return n;
-
-	return -EINVAL;
-}
-
-static const int mag3110_samp_freq[8][2] = {
-	{80, 0}, {40, 0}, {20, 0}, {10, 0}, {5, 0}, {2, 500000},
-	{1, 250000}, {0, 625000}
-};
-
-static ssize_t mag3110_show_samp_freq_avail(struct device *dev,
-				struct device_attribute *attr, char *buf)
-{
-	return mag3110_show_int_plus_micros(buf, mag3110_samp_freq, 8);
-}
-
-static IIO_DEV_ATTR_SAMP_FREQ_AVAIL(mag3110_show_samp_freq_avail);
-
-static int mag3110_get_samp_freq_index(struct mag3110_data *data,
-	int val, int val2)
-{
-	return mag3110_get_int_plus_micros_index(mag3110_samp_freq, 8, val,
-		val2);
-}
-
-static int mag3110_read_raw(struct iio_dev *indio_dev,
-			    struct iio_chan_spec const *chan,
-			    int *val, int *val2, long mask)
-{
-	struct mag3110_data *data = iio_priv(indio_dev);
-	__be16 buffer[3];
-	int i, ret;
-
-	switch (mask) {
-	case IIO_CHAN_INFO_RAW:
-		switch (chan->type) {
-		case IIO_MAGN: /* in 0.1 uT / LSB */
-			ret = mag3110_read(data, buffer);
-			if (ret < 0)
-				return ret;
-			*val = sign_extend32(
-				be16_to_cpu(buffer[chan->scan_index]), 15);
-			return IIO_VAL_INT;
-		case IIO_TEMP: /* in 1 C / LSB */
-			mutex_lock(&data->lock);
-			ret = mag3110_request(data);
-			if (ret < 0) {
-				mutex_unlock(&data->lock);
-				return ret;
-			}
-			ret = i2c_smbus_read_byte_data(data->client,
-				MAG3110_DIE_TEMP);
-			mutex_unlock(&data->lock);
-			if (ret < 0)
-				return ret;
-			*val = sign_extend32(ret, 7);
-			return IIO_VAL_INT;
-		default:
-			return -EINVAL;
-		}
-	case IIO_CHAN_INFO_SCALE:
-		*val = 0;
-		*val2 = 1000;
-		return IIO_VAL_INT_PLUS_MICRO;
-	case IIO_CHAN_INFO_SAMP_FREQ:
-		i = data->ctrl_reg1 >> MAG3110_CTRL_DR_SHIFT;
-		*val = mag3110_samp_freq[i][0];
-		*val2 = mag3110_samp_freq[i][1];
-		return IIO_VAL_INT_PLUS_MICRO;
-	}
-	return -EINVAL;
-}
-
-static int mag3110_write_raw(struct iio_dev *indio_dev,
-			     struct iio_chan_spec const *chan,
-			     int val, int val2, long mask)
-{
-	struct mag3110_data *data = iio_priv(indio_dev);
-	int rate;
-
-	switch (mask) {
-	case IIO_CHAN_INFO_SAMP_FREQ:
-		rate = mag3110_get_samp_freq_index(data, val, val2);
-		if (rate < 0)
-			return -EINVAL;
-
-		data->ctrl_reg1 &= ~MAG3110_CTRL_DR_MASK;
-		data->ctrl_reg1 |= rate << MAG3110_CTRL_DR_SHIFT;
-		return i2c_smbus_write_byte_data(data->client,
-			MAG3110_CTRL_REG1, data->ctrl_reg1);
-	default:
-		return -EINVAL;
-	}
-}
-
-static irqreturn_t mag3110_trigger_handler(int irq, void *p)
-{
-	struct iio_poll_func *pf = p;
-	struct iio_dev *indio_dev = pf->indio_dev;
-	struct mag3110_data *data = iio_priv(indio_dev);
-	u8 buffer[16]; /* 3 16-bit channels + 1 byte temp + padding + ts */
-	int ret;
-
-	ret = mag3110_read(data, (__be16 *) buffer);
-	if (ret < 0)
-		goto done;
-
-	if (test_bit(3, indio_dev->active_scan_mask)) {
-		ret = i2c_smbus_read_byte_data(data->client,
-			MAG3110_DIE_TEMP);
-		if (ret < 0)
-			goto done;
-		buffer[6] = ret;
-	}
-
-	iio_push_to_buffers_with_timestamp(indio_dev, buffer,
-		iio_get_time_ns());
-
-done:
-	iio_trigger_notify_done(indio_dev->trig);
-	return IRQ_HANDLED;
-}
-
-#define MAG3110_CHANNEL(axis, idx) { \
-	.type = IIO_MAGN, \
-	.modified = 1, \
-	.channel2 = IIO_MOD_##axis, \
-	.info_mask_separate = BIT(IIO_CHAN_INFO_RAW), \
-	.info_mask_shared_by_type = BIT(IIO_CHAN_INFO_SAMP_FREQ) | \
-		BIT(IIO_CHAN_INFO_SCALE), \
-	.scan_index = idx, \
-	.scan_type = { \
-		.sign = 's', \
-		.realbits = 16, \
-		.storagebits = 16, \
-		.endianness = IIO_BE, \
-	}, \
-}
-
-static const struct iio_chan_spec mag3110_channels[] = {
-	MAG3110_CHANNEL(X, 0),
-	MAG3110_CHANNEL(Y, 1),
-	MAG3110_CHANNEL(Z, 2),
-	{
-		.type = IIO_TEMP,
-		.info_mask_separate = BIT(IIO_CHAN_INFO_RAW),
-		.scan_index = 3,
-		.scan_type = IIO_ST('s', 8, 8, 0),
-	},
-	IIO_CHAN_SOFT_TIMESTAMP(4),
-};
-
-static struct attribute *mag3110_attributes[] = {
-	&iio_dev_attr_sampling_frequency_available.dev_attr.attr,
-	NULL
-};
-
-static const struct attribute_group mag3110_group = {
-	.attrs = mag3110_attributes,
-};
-
-static const struct iio_info mag3110_info = {
-	.attrs = &mag3110_group,
-	.read_raw = &mag3110_read_raw,
-	.write_raw = &mag3110_write_raw,
-	.driver_module = THIS_MODULE,
-};
-
-static const unsigned long mag3110_scan_masks[] = {0x7, 0xf, 0};
-
-static int mag3110_probe(struct i2c_client *client,
-			 const struct i2c_device_id *id)
-{
-	struct mag3110_data *data;
-	struct iio_dev *indio_dev;
-	int ret;
-
-	ret = i2c_smbus_read_byte_data(client, MAG3110_WHO_AM_I);
-	if (ret < 0)
-		return ret;
-	if (ret != MAG3110_DEVICE_ID)
-		return -ENODEV;
-
-	indio_dev = devm_iio_device_alloc(&client->dev, sizeof(*data));
-	if (!indio_dev)
-		return -ENOMEM;
-
-	data = iio_priv(indio_dev);
-	data->client = client;
-	mutex_init(&data->lock);
-
-	i2c_set_clientdata(client, indio_dev);
-	indio_dev->info = &mag3110_info;
-	indio_dev->name = id->name;
-	indio_dev->dev.parent = &client->dev;
-	indio_dev->modes = INDIO_DIRECT_MODE;
-	indio_dev->channels = mag3110_channels;
-	indio_dev->num_channels = ARRAY_SIZE(mag3110_channels);
-	indio_dev->available_scan_masks = mag3110_scan_masks;
-
-	data->ctrl_reg1 = MAG3110_CTRL_DR_DEFAULT;
-	ret = i2c_smbus_write_byte_data(client, MAG3110_CTRL_REG1,
-		data->ctrl_reg1);
-	if (ret < 0)
-		return ret;
-
-	ret = i2c_smbus_write_byte_data(client, MAG3110_CTRL_REG2,
-		MAG3110_CTRL_AUTO_MRST_EN | MAG3110_CTRL_RAW);
-	if (ret < 0)
-		return ret;
-
-	ret = iio_triggered_buffer_setup(indio_dev, NULL,
-		mag3110_trigger_handler, NULL);
-	if (ret < 0)
-		return ret;
-
-	ret = iio_device_register(indio_dev);
-	if (ret < 0)
-		goto buffer_cleanup;
-	return 0;
-
-buffer_cleanup:
-	iio_triggered_buffer_cleanup(indio_dev);
-	return ret;
-}
-
-static int mag3110_standby(struct mag3110_data *data)
-{
-	return i2c_smbus_write_byte_data(data->client, MAG3110_CTRL_REG1,
-		data->ctrl_reg1 & ~MAG3110_CTRL_AC);
-}
-
-static int mag3110_remove(struct i2c_client *client)
-{
-	struct iio_dev *indio_dev = i2c_get_clientdata(client);
-
-	iio_device_unregister(indio_dev);
-	iio_triggered_buffer_cleanup(indio_dev);
-	mag3110_standby(iio_priv(indio_dev));
-
-	return 0;
-}
-
-#ifdef CONFIG_PM_SLEEP
-static int mag3110_suspend(struct device *dev)
-{
-	return mag3110_standby(iio_priv(i2c_get_clientdata(
-		to_i2c_client(dev))));
-}
-
-static int mag3110_resume(struct device *dev)
-{
-	struct mag3110_data *data = iio_priv(i2c_get_clientdata(
-		to_i2c_client(dev)));
-
-	return i2c_smbus_write_byte_data(data->client, MAG3110_CTRL_REG1,
-		data->ctrl_reg1);
-}
-
-static SIMPLE_DEV_PM_OPS(mag3110_pm_ops, mag3110_suspend, mag3110_resume);
-#define MAG3110_PM_OPS (&mag3110_pm_ops)
-#else
-#define MAG3110_PM_OPS NULL
-#endif
-
-static const struct i2c_device_id mag3110_id[] = {
-	{ "mag3110", 0 },
-	{ }
-};
-MODULE_DEVICE_TABLE(i2c, mag3110_id);
-
-static struct i2c_driver mag3110_driver = {
-	.driver = {
-		.name	= "mag3110",
-		.pm	= MAG3110_PM_OPS,
-	},
-	.probe = mag3110_probe,
-	.remove = mag3110_remove,
-	.id_table = mag3110_id,
-};
-module_i2c_driver(mag3110_driver);
-
-MODULE_AUTHOR("Peter Meerwald <pmeerw@pmeerw.net>");
-MODULE_DESCRIPTION("Freescale MAG3110 magnetometer driver");
-MODULE_LICENSE("GPL");
diff --git a/drivers/iio/magnetometer/st_magn_buffer.c b/drivers/iio/magnetometer/st_magn_buffer.c
index bf427dc..708857b 100644
--- a/drivers/iio/magnetometer/st_magn_buffer.c
+++ b/drivers/iio/magnetometer/st_magn_buffer.c
@@ -25,7 +25,16 @@
 
 static int st_magn_buffer_preenable(struct iio_dev *indio_dev)
 {
-	return st_sensors_set_enable(indio_dev, true);
+	int err;
+
+	err = st_sensors_set_enable(indio_dev, true);
+	if (err < 0)
+		goto st_magn_set_enable_error;
+
+	err = iio_sw_buffer_preenable(indio_dev);
+
+st_magn_set_enable_error:
+	return err;
 }
 
 static int st_magn_buffer_postenable(struct iio_dev *indio_dev)
diff --git a/drivers/iio/magnetometer/st_magn_core.c b/drivers/iio/magnetometer/st_magn_core.c
index 52bbcfa..cab3bc7 100644
--- a/drivers/iio/magnetometer/st_magn_core.c
+++ b/drivers/iio/magnetometer/st_magn_core.c
@@ -348,9 +348,8 @@ static const struct iio_info magn_info = {
 int st_magn_common_probe(struct iio_dev *indio_dev,
 					struct st_sensors_platform_data *pdata)
 {
-	struct st_sensor_data *mdata = iio_priv(indio_dev);
-	int irq = mdata->get_irq_data_ready(indio_dev);
 	int err;
+	struct st_sensor_data *mdata = iio_priv(indio_dev);
 
 	indio_dev->modes = INDIO_DIRECT_MODE;
 	indio_dev->info = &magn_info;
@@ -358,7 +357,7 @@ int st_magn_common_probe(struct iio_dev *indio_dev,
 	err = st_sensors_check_device_support(indio_dev,
 				ARRAY_SIZE(st_magn_sensors), st_magn_sensors);
 	if (err < 0)
-		return err;
+		goto st_magn_common_probe_error;
 
 	mdata->num_data_channels = ST_MAGN_NUMBER_DATA_CHANNELS;
 	mdata->multiread_bit = mdata->sensor->multi_read_bit;
@@ -371,13 +370,12 @@ int st_magn_common_probe(struct iio_dev *indio_dev,
 
 	err = st_sensors_init_sensor(indio_dev, pdata);
 	if (err < 0)
-		return err;
-
-	err = st_magn_allocate_ring(indio_dev);
-	if (err < 0)
-		return err;
+		goto st_magn_common_probe_error;
 
-	if (irq > 0) {
+	if (mdata->get_irq_data_ready(indio_dev) > 0) {
+		err = st_magn_allocate_ring(indio_dev);
+		if (err < 0)
+			goto st_magn_common_probe_error;
 		err = st_sensors_allocate_trigger(indio_dev, NULL);
 		if (err < 0)
 			goto st_magn_probe_trigger_error;
@@ -387,14 +385,15 @@ int st_magn_common_probe(struct iio_dev *indio_dev,
 	if (err)
 		goto st_magn_device_register_error;
 
-	return 0;
+	return err;
 
 st_magn_device_register_error:
-	if (irq > 0)
+	if (mdata->get_irq_data_ready(indio_dev) > 0)
 		st_sensors_deallocate_trigger(indio_dev);
 st_magn_probe_trigger_error:
-	st_magn_deallocate_ring(indio_dev);
-
+	if (mdata->get_irq_data_ready(indio_dev) > 0)
+		st_magn_deallocate_ring(indio_dev);
+st_magn_common_probe_error:
 	return err;
 }
 EXPORT_SYMBOL(st_magn_common_probe);
@@ -404,10 +403,10 @@ void st_magn_common_remove(struct iio_dev *indio_dev)
 	struct st_sensor_data *mdata = iio_priv(indio_dev);
 
 	iio_device_unregister(indio_dev);
-	if (mdata->get_irq_data_ready(indio_dev) > 0)
+	if (mdata->get_irq_data_ready(indio_dev) > 0) {
 		st_sensors_deallocate_trigger(indio_dev);
-
-	st_magn_deallocate_ring(indio_dev);
+		st_magn_deallocate_ring(indio_dev);
+	}
 }
 EXPORT_SYMBOL(st_magn_common_remove);
 
diff --git a/drivers/iio/pressure/Kconfig b/drivers/iio/pressure/Kconfig
index 4f2e0f9..26fdc0b 100644
--- a/drivers/iio/pressure/Kconfig
+++ b/drivers/iio/pressure/Kconfig
@@ -14,7 +14,7 @@ config IIO_ST_PRESS
 	select IIO_TRIGGERED_BUFFER if (IIO_BUFFER)
 	help
 	  Say yes here to build support for STMicroelectronics pressure
-	  sensors: LPS001WP, LPS331AP.
+	  sensors: LPS331AP.
 
 	  This driver can also be built as a module. If so, these modules
 	  will be created:
diff --git a/drivers/iio/pressure/st_pressure.h b/drivers/iio/pressure/st_pressure.h
index 049c21a..b0b6306 100644
--- a/drivers/iio/pressure/st_pressure.h
+++ b/drivers/iio/pressure/st_pressure.h
@@ -14,7 +14,6 @@
 #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_buffer.c b/drivers/iio/pressure/st_pressure_buffer.c
index b37b1c9..f877ef8 100644
--- a/drivers/iio/pressure/st_pressure_buffer.c
+++ b/drivers/iio/pressure/st_pressure_buffer.c
@@ -32,7 +32,16 @@ int st_press_trig_set_state(struct iio_trigger *trig, bool state)
 
 static int st_press_buffer_preenable(struct iio_dev *indio_dev)
 {
-	return st_sensors_set_enable(indio_dev, true);
+	int err;
+
+	err = st_sensors_set_enable(indio_dev, true);
+	if (err < 0)
+		goto st_press_set_enable_error;
+
+	err = iio_sw_buffer_preenable(indio_dev);
+
+st_press_set_enable_error:
+	return err;
 }
 
 static int st_press_buffer_postenable(struct iio_dev *indio_dev)
diff --git a/drivers/iio/pressure/st_pressure_core.c b/drivers/iio/pressure/st_pressure_core.c
index 58083f9..ceebd3c 100644
--- a/drivers/iio/pressure/st_pressure_core.c
+++ b/drivers/iio/pressure/st_pressure_core.c
@@ -23,7 +23,6 @@
 #include <linux/iio/sysfs.h>
 #include <linux/iio/trigger.h>
 #include <linux/iio/buffer.h>
-#include <linux/regulator/consumer.h>
 #include <asm/unaligned.h>
 
 #include <linux/iio/common/st_sensors.h>
@@ -37,200 +36,94 @@
 						 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 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 =
+/* 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,
 			BIT(IIO_CHAN_INFO_RAW) | BIT(IIO_CHAN_INFO_SCALE),
-		.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,
-	},
+			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),
 	IIO_CHAN_SOFT_TIMESTAMP(1)
 };
 
 static const struct st_sensors st_press_sensors[] = {
 	{
-		.wai = ST_PRESS_LPS331AP_WAI_EXP,
+		.wai = ST_PRESS_1_WAI_EXP,
 		.sensors_supported = {
 			[0] = LPS331AP_PRESS_DEV_NAME,
 		},
-		.ch = (struct iio_chan_spec *)st_press_lps331ap_channels,
-		.num_ch = ARRAY_SIZE(st_press_lps331ap_channels),
+		.ch = (struct iio_chan_spec *)st_press_channels,
 		.odr = {
-			.addr = ST_PRESS_LPS331AP_ODR_ADDR,
-			.mask = ST_PRESS_LPS331AP_ODR_MASK,
+			.addr = ST_PRESS_1_ODR_ADDR,
+			.mask = ST_PRESS_1_ODR_MASK,
 			.odr_avl = {
-				{ 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, },
+				{ 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, },
 			},
 		},
 		.pw = {
-			.addr = ST_PRESS_LPS331AP_PW_ADDR,
-			.mask = ST_PRESS_LPS331AP_PW_MASK,
+			.addr = ST_PRESS_1_PW_ADDR,
+			.mask = ST_PRESS_1_PW_MASK,
 			.value_on = ST_SENSORS_DEFAULT_POWER_ON_VALUE,
 			.value_off = ST_SENSORS_DEFAULT_POWER_OFF_VALUE,
 		},
 		.fs = {
-			.addr = ST_PRESS_LPS331AP_FS_ADDR,
-			.mask = ST_PRESS_LPS331AP_FS_MASK,
+			.addr = ST_PRESS_1_FS_ADDR,
+			.mask = ST_PRESS_1_FS_MASK,
 			.fs_avl = {
 				[0] = {
 					.num = ST_PRESS_FS_AVL_1260MB,
-					.value = ST_PRESS_LPS331AP_FS_AVL_1260_VAL,
-					.gain = ST_PRESS_LPS331AP_FS_AVL_1260_GAIN,
-					.gain2 = ST_PRESS_LPS331AP_FS_AVL_TEMP_GAIN,
+					.value = ST_PRESS_1_FS_AVL_1260_VAL,
+					.gain = ST_PRESS_1_FS_AVL_1260_GAIN,
+					.gain2 = ST_PRESS_1_FS_AVL_TEMP_GAIN,
 				},
 			},
 		},
 		.bdu = {
-			.addr = ST_PRESS_LPS331AP_BDU_ADDR,
-			.mask = ST_PRESS_LPS331AP_BDU_MASK,
+			.addr = ST_PRESS_1_BDU_ADDR,
+			.mask = ST_PRESS_1_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,
+			.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,
 		},
-		.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 = 0,
-		},
-		.multi_read_bit = ST_PRESS_LPS001WP_MULTIREAD_BIT,
+		.multi_read_bit = ST_PRESS_1_MULTIREAD_BIT,
 		.bootime = 2,
 	},
 };
@@ -314,85 +207,44 @@ static const struct iio_trigger_ops st_press_trigger_ops = {
 #define ST_PRESS_TRIGGER_OPS NULL
 #endif
 
-static void st_press_power_enable(struct iio_dev *indio_dev)
-{
-	struct st_sensor_data *pdata = iio_priv(indio_dev);
-	int err;
-
-	/* Regulators not mandatory, but if requested we should enable them. */
-	pdata->vdd = devm_regulator_get_optional(&indio_dev->dev, "vdd");
-	if (!IS_ERR(pdata->vdd)) {
-		err = regulator_enable(pdata->vdd);
-		if (err != 0)
-			dev_warn(&indio_dev->dev,
-				 "Failed to enable specified Vdd supply\n");
-	}
-
-	pdata->vdd_io = devm_regulator_get_optional(&indio_dev->dev, "vddio");
-	if (!IS_ERR(pdata->vdd_io)) {
-		err = regulator_enable(pdata->vdd_io);
-		if (err != 0)
-			dev_warn(&indio_dev->dev,
-				 "Failed to enable specified Vdd_IO supply\n");
-	}
-}
-
-static void st_press_power_disable(struct iio_dev *indio_dev)
-{
-	struct st_sensor_data *pdata = iio_priv(indio_dev);
-
-	if (!IS_ERR(pdata->vdd))
-		regulator_disable(pdata->vdd);
-
-	if (!IS_ERR(pdata->vdd_io))
-		regulator_disable(pdata->vdd_io);
-}
-
 int st_press_common_probe(struct iio_dev *indio_dev,
 				struct st_sensors_platform_data *plat_data)
 {
-	struct st_sensor_data *pdata = iio_priv(indio_dev);
-	int irq = pdata->get_irq_data_ready(indio_dev);
 	int err;
+	struct st_sensor_data *pdata = iio_priv(indio_dev);
 
 	indio_dev->modes = INDIO_DIRECT_MODE;
 	indio_dev->info = &press_info;
 
-	st_press_power_enable(indio_dev);
-
 	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)
-		return err;
+		goto st_press_common_probe_error;
 
 	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  = 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->multiread_bit = pdata->sensor->multi_read_bit;
+	indio_dev->channels = pdata->sensor->ch;
+	indio_dev->num_channels = ARRAY_SIZE(st_press_channels);
 
+	pdata->current_fullscale = (struct st_sensor_fullscale_avl *)
+						&pdata->sensor->fs.fs_avl[0];
 	pdata->odr = pdata->sensor->odr.odr_avl[0].hz;
 
-	/* Some devices don't support a data ready pin. */
-	if (!plat_data && pdata->sensor->drdy_irq.addr)
+	if (!plat_data)
 		plat_data =
 			(struct st_sensors_platform_data *)&default_press_pdata;
 
 	err = st_sensors_init_sensor(indio_dev, plat_data);
 	if (err < 0)
-		return err;
+		goto st_press_common_probe_error;
 
-	err = st_press_allocate_ring(indio_dev);
-	if (err < 0)
-		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;
 
-	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;
 	}
@@ -404,11 +256,12 @@ int st_press_common_probe(struct iio_dev *indio_dev,
 	return err;
 
 st_press_device_register_error:
-	if (irq > 0)
+	if (pdata->get_irq_data_ready(indio_dev) > 0)
 		st_sensors_deallocate_trigger(indio_dev);
 st_press_probe_trigger_error:
-	st_press_deallocate_ring(indio_dev);
-
+	if (pdata->get_irq_data_ready(indio_dev) > 0)
+		st_press_deallocate_ring(indio_dev);
+st_press_common_probe_error:
 	return err;
 }
 EXPORT_SYMBOL(st_press_common_probe);
@@ -417,13 +270,11 @@ void st_press_common_remove(struct iio_dev *indio_dev)
 {
 	struct st_sensor_data *pdata = iio_priv(indio_dev);
 
-	st_press_power_disable(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 51eab7f..08aac5e 100644
--- a/drivers/iio/pressure/st_pressure_i2c.c
+++ b/drivers/iio/pressure/st_pressure_i2c.c
@@ -49,7 +49,6 @@ 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 },
 	{},
 };
diff --git a/drivers/iio/pressure/st_pressure_spi.c b/drivers/iio/pressure/st_pressure_spi.c
index 27322af..399a29b 100644
--- a/drivers/iio/pressure/st_pressure_spi.c
+++ b/drivers/iio/pressure/st_pressure_spi.c
@@ -48,7 +48,6 @@ static int st_press_spi_remove(struct spi_device *spi)
 }
 
 static const struct spi_device_id st_press_id_table[] = {
-	{ LPS001WP_PRESS_DEV_NAME },
 	{ LPS331AP_PRESS_DEV_NAME },
 	{},
 };
diff --git a/drivers/iio/temperature/tmp006.c b/drivers/iio/temperature/tmp006.c
index 84a0789..6d63883 100644
--- a/drivers/iio/temperature/tmp006.c
+++ b/drivers/iio/temperature/tmp006.c
@@ -70,16 +70,12 @@ static int tmp006_read_measurement(struct tmp006_data *data, u8 reg)
 	return i2c_smbus_read_word_swapped(data->client, reg);
 }
 
-static const int tmp006_freqs[5][2] = { {4, 0}, {2, 0}, {1, 0},
-					{0, 500000}, {0, 250000} };
-
 static int tmp006_read_raw(struct iio_dev *indio_dev,
 			    struct iio_chan_spec const *channel, int *val,
 			    int *val2, long mask)
 {
 	struct tmp006_data *data = iio_priv(indio_dev);
 	s32 ret;
-	int cr;
 
 	switch (mask) {
 	case IIO_CHAN_INFO_RAW:
@@ -110,12 +106,6 @@ static int tmp006_read_raw(struct iio_dev *indio_dev,
 			break;
 		}
 		return IIO_VAL_INT_PLUS_MICRO;
-	case IIO_CHAN_INFO_SAMP_FREQ:
-		cr = (data->config & TMP006_CONFIG_CR_MASK)
-			>> TMP006_CONFIG_CR_SHIFT;
-		*val = tmp006_freqs[cr][0];
-		*val2 = tmp006_freqs[cr][1];
-		return IIO_VAL_INT_PLUS_MICRO;
 	default:
 		break;
 	}
@@ -123,32 +113,48 @@ static int tmp006_read_raw(struct iio_dev *indio_dev,
 	return -EINVAL;
 }
 
-static int tmp006_write_raw(struct iio_dev *indio_dev,
-			    struct iio_chan_spec const *chan,
-			    int val,
-			    int val2,
-			    long mask)
+static const char * const tmp006_freqs[] = { "4", "2", "1", "0.5", "0.25" };
+
+static ssize_t tmp006_show_freq(struct device *dev,
+				struct device_attribute *attr, char *buf)
+{
+	struct tmp006_data *data = iio_priv(dev_to_iio_dev(dev));
+	int cr = (data->config & TMP006_CONFIG_CR_MASK)
+		>> TMP006_CONFIG_CR_SHIFT;
+	return sprintf(buf, "%s\n", tmp006_freqs[cr]);
+}
+
+static ssize_t tmp006_store_freq(struct device *dev,
+				 struct device_attribute *attr,
+				 const char *buf, size_t len)
 {
+	struct iio_dev *indio_dev = dev_to_iio_dev(dev);
 	struct tmp006_data *data = iio_priv(indio_dev);
 	int i;
+	bool found = false;
 
 	for (i = 0; i < ARRAY_SIZE(tmp006_freqs); i++)
-		if ((val == tmp006_freqs[i][0]) &&
-		    (val2 == tmp006_freqs[i][1])) {
-			data->config &= ~TMP006_CONFIG_CR_MASK;
-			data->config |= i << TMP006_CONFIG_CR_SHIFT;
+		if (sysfs_streq(buf, tmp006_freqs[i])) {
+			found = true;
+			break;
+		}
+	if (!found)
+		return -EINVAL;
 
-			return i2c_smbus_write_word_swapped(data->client,
-							    TMP006_CONFIG,
-							    data->config);
+	data->config &= ~TMP006_CONFIG_CR_MASK;
+	data->config |= i << TMP006_CONFIG_CR_SHIFT;
 
-		}
-	return -EINVAL;
+	return i2c_smbus_write_word_swapped(data->client, TMP006_CONFIG,
+		data->config);
 }
 
+static IIO_DEV_ATTR_SAMP_FREQ(S_IRUGO | S_IWUSR,
+			tmp006_show_freq, tmp006_store_freq);
+
 static IIO_CONST_ATTR(sampling_frequency_available, "4 2 1 0.5 0.25");
 
 static struct attribute *tmp006_attributes[] = {
+	&iio_dev_attr_sampling_frequency.dev_attr.attr,
 	&iio_const_attr_sampling_frequency_available.dev_attr.attr,
 	NULL
 };
@@ -162,19 +168,16 @@ static const struct iio_chan_spec tmp006_channels[] = {
 		.type = IIO_VOLTAGE,
 		.info_mask_separate = BIT(IIO_CHAN_INFO_RAW) |
 			BIT(IIO_CHAN_INFO_SCALE),
-		.info_mask_shared_by_all = BIT(IIO_CHAN_INFO_SAMP_FREQ),
 	},
 	{
 		.type = IIO_TEMP,
 		.info_mask_separate = BIT(IIO_CHAN_INFO_RAW) |
 			BIT(IIO_CHAN_INFO_SCALE),
-		.info_mask_shared_by_all = BIT(IIO_CHAN_INFO_SAMP_FREQ),
 	}
 };
 
 static const struct iio_info tmp006_info = {
 	.read_raw = tmp006_read_raw,
-	.write_raw = tmp006_write_raw,
 	.attrs = &tmp006_attribute_group,
 	.driver_module = THIS_MODULE,
 };
diff --git a/drivers/iio/trigger/iio-trig-sysfs.c b/drivers/iio/trigger/iio-trig-sysfs.c
index 15e3b85..effcd0a 100644
--- a/drivers/iio/trigger/iio-trig-sysfs.c
+++ b/drivers/iio/trigger/iio-trig-sysfs.c
@@ -23,7 +23,7 @@ struct iio_sysfs_trig {
 };
 
 static LIST_HEAD(iio_sysfs_trig_list);
-static DEFINE_MUTEX(iio_sysfs_trig_list_mut);
+static DEFINE_MUTEX(iio_syfs_trig_list_mut);
 
 static int iio_sysfs_trigger_probe(int id);
 static ssize_t iio_sysfs_trig_add(struct device *dev,
@@ -135,7 +135,7 @@ static int iio_sysfs_trigger_probe(int id)
 	struct iio_sysfs_trig *t;
 	int ret;
 	bool foundit = false;
-	mutex_lock(&iio_sysfs_trig_list_mut);
+	mutex_lock(&iio_syfs_trig_list_mut);
 	list_for_each_entry(t, &iio_sysfs_trig_list, l)
 		if (id == t->id) {
 			foundit = true;
@@ -169,7 +169,7 @@ static int iio_sysfs_trigger_probe(int id)
 		goto out2;
 	list_add(&t->l, &iio_sysfs_trig_list);
 	__module_get(THIS_MODULE);
-	mutex_unlock(&iio_sysfs_trig_list_mut);
+	mutex_unlock(&iio_syfs_trig_list_mut);
 	return 0;
 
 out2:
@@ -177,7 +177,7 @@ out2:
 free_t:
 	kfree(t);
 out1:
-	mutex_unlock(&iio_sysfs_trig_list_mut);
+	mutex_unlock(&iio_syfs_trig_list_mut);
 	return ret;
 }
 
@@ -185,14 +185,14 @@ static int iio_sysfs_trigger_remove(int id)
 {
 	bool foundit = false;
 	struct iio_sysfs_trig *t;
-	mutex_lock(&iio_sysfs_trig_list_mut);
+	mutex_lock(&iio_syfs_trig_list_mut);
 	list_for_each_entry(t, &iio_sysfs_trig_list, l)
 		if (id == t->id) {
 			foundit = true;
 			break;
 		}
 	if (!foundit) {
-		mutex_unlock(&iio_sysfs_trig_list_mut);
+		mutex_unlock(&iio_syfs_trig_list_mut);
 		return -EINVAL;
 	}
 
@@ -202,7 +202,7 @@ static int iio_sysfs_trigger_remove(int id)
 	list_del(&t->l);
 	kfree(t);
 	module_put(THIS_MODULE);
-	mutex_unlock(&iio_sysfs_trig_list_mut);
+	mutex_unlock(&iio_syfs_trig_list_mut);
 	return 0;
 }