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

Jonathan writes:

Third set of new drivers, cleanups and features for IIO in the 3.12 cycle.

New drivers

1) Bosh BMA180 accelerometer + a new sysfs abi element, power_mode to
   allow for device that trade off accuracy and power usage.

Cleanups

1) Another lot of devm_iio_device_alloc patches
2) An code ordering bug in the twl6030 driver introduced earlier in this
   cycle.

New features

1) at91 adc driver rework to support a wider range of parts and drop
   the necessity for some of the current device tree elements.  This is
   a precursor to introducing input support which is still under review.

21 files changed, 849 insertions, 188 deletions

diff --git a/Documentation/ABI/testing/sysfs-bus-iio b/Documentation/ABI/testing/sysfs-bus-iio
index 45ae709db4ff..39c8de0e53d0 100644
--- a/Documentation/ABI/testing/sysfs-bus-iio
+++ b/Documentation/ABI/testing/sysfs-bus-iio
@@ -794,6 +794,16 @@ Description:
                 This attribute is used to read the amount of quadrature error
                 present in the device at a given time.
 
+What:           /sys/.../iio:deviceX/in_accelX_power_mode
+KernelVersion:  3.11
+Contact:        linux-iio@vger.kernel.org
+Description:
+                Specifies the chip power mode.
+                low_noise: reduce noise level from ADC,
+                low_power: enable low current consumption.
+                For a list of available output power modes read
+                in_accel_power_mode_available.
+
 What:           /sys/bus/iio/devices/iio:deviceX/store_eeprom
 KernelVersion:  3.4.0
 Contact:        linux-iio@vger.kernel.org
diff --git a/Documentation/devicetree/bindings/arm/atmel-adc.txt b/Documentation/devicetree/bindings/arm/atmel-adc.txt
index 16769d9cedd6..723c205cb10d 100644
--- a/Documentation/devicetree/bindings/arm/atmel-adc.txt
+++ b/Documentation/devicetree/bindings/arm/atmel-adc.txt
@@ -1,18 +1,15 @@
 * AT91's Analog to Digital Converter (ADC)
 
 Required properties:
-  - compatible: Should be "atmel,at91sam9260-adc"
+  - compatible: Should be "atmel,<chip>-adc"
+    <chip> can be "at91sam9260", "at91sam9g45" or "at91sam9x5"
   - reg: Should contain ADC registers location and length
   - interrupts: Should contain the IRQ line for the ADC
-  - atmel,adc-channel-base: Offset of the first channel data register
   - atmel,adc-channels-used: Bitmask of the channels muxed and enable for this
     device
-  - atmel,adc-drdy-mask: Mask of the DRDY interruption in the ADC
   - atmel,adc-num-channels: Number of channels available in the ADC
   - atmel,adc-startup-time: Startup Time of the ADC in microseconds as
     defined in the datasheet
-  - atmel,adc-status-register: Offset of the Interrupt Status Register
-  - atmel,adc-trigger-register: Offset of the Trigger Register
   - atmel,adc-vref: Reference voltage in millivolts for the conversions
   - atmel,adc-res: List of resolution in bits supported by the ADC. List size
                    must be two at least.
diff --git a/Documentation/devicetree/bindings/iio/accel/bma180.txt b/Documentation/devicetree/bindings/iio/accel/bma180.txt
new file mode 100644
index 000000000000..c5933573e0f6
--- /dev/null
+++ b/Documentation/devicetree/bindings/iio/accel/bma180.txt
@@ -0,0 +1,24 @@
+* Bosch BMA180 triaxial acceleration sensor
+
+http://omapworld.com/BMA180_111_1002839.pdf
+
+Required properties:
+
+  - compatible : should be "bosch,bma180"
+  - reg : the I2C address of the sensor
+
+Optional properties:
+
+  - interrupt-parent : should be the phandle for the interrupt controller
+
+  - interrupts : interrupt mapping for GPIO IRQ, it should by configured with
+                flags IRQ_TYPE_LEVEL_HIGH | IRQ_TYPE_EDGE_RISING
+
+Example:
+
+bma180@40 {
+        compatible = "bosch,bma180";
+        reg = <0x40>;
+        interrupt-parent = <&gpio6>;
+        interrupts = <18 (IRQ_TYPE_LEVEL_HIGH | IRQ_TYPE_EDGE_RISING)>;
+};
diff --git a/arch/arm/mach-at91/include/mach/at91_adc.h b/arch/arm/mach-at91/include/mach/at91_adc.h
index 8e7ed5c90817..048a57f76bd3 100644
--- a/arch/arm/mach-at91/include/mach/at91_adc.h
+++ b/arch/arm/mach-at91/include/mach/at91_adc.h
@@ -28,9 +28,12 @@
 #define                 AT91_ADC_TRGSEL_EXTERNAL        (6 << 1)
 #define         AT91_ADC_LOWRES         (1 << 4)        /* Low Resolution */
 #define         AT91_ADC_SLEEP          (1 << 5)        /* Sleep Mode */
-#define         AT91_ADC_PRESCAL        (0x3f << 8)     /* Prescalar Rate Selection */
+#define         AT91_ADC_PRESCAL_9260   (0x3f << 8)     /* Prescalar Rate Selection */
+#define         AT91_ADC_PRESCAL_9G45   (0xff << 8)
 #define                 AT91_ADC_PRESCAL_(x)    ((x) << 8)
-#define         AT91_ADC_STARTUP        (0x1f << 16)    /* Startup Up Time */
+#define         AT91_ADC_STARTUP_9260   (0x1f << 16)    /* Startup Up Time */
+#define         AT91_ADC_STARTUP_9G45   (0x7f << 16)
+#define         AT91_ADC_STARTUP_9X5    (0xf << 16)
 #define                 AT91_ADC_STARTUP_(x)    ((x) << 16)
 #define         AT91_ADC_SHTIM          (0xf  << 24)    /* Sample & Hold Time */
 #define                 AT91_ADC_SHTIM_(x)      ((x) << 24)
@@ -48,6 +51,9 @@
 #define         AT91_ADC_ENDRX          (1 << 18)       /* End of RX Buffer */
 #define         AT91_ADC_RXFUFF         (1 << 19)       /* RX Buffer Full */
 
+#define AT91_ADC_SR_9X5         0x30            /* Status Register for 9x5 */
+#define         AT91_ADC_SR_DRDY_9X5    (1 << 24)       /* Data Ready */
+
 #define AT91_ADC_LCDR           0x20            /* Last Converted Data Register */
 #define         AT91_ADC_LDATA          (0x3ff)
 
@@ -58,4 +64,10 @@
 #define AT91_ADC_CHR(n)         (0x30 + ((n) * 4))      /* Channel Data Register N */
 #define         AT91_ADC_DATA           (0x3ff)
 
+#define AT91_ADC_CDR0_9X5       (0x50)                  /* Channel Data Register 0 for 9X5 */
+
+#define AT91_ADC_TRGR_9260      AT91_ADC_MR
+#define AT91_ADC_TRGR_9G45      0x08
+#define AT91_ADC_TRGR_9X5       0xC0
+
 #endif
diff --git a/drivers/iio/accel/Kconfig b/drivers/iio/accel/Kconfig
index 61ca7ec0f3e7..e23e50850655 100644
--- a/drivers/iio/accel/Kconfig
+++ b/drivers/iio/accel/Kconfig
@@ -5,6 +5,18 @@
 
 menu "Accelerometers"
 
+config BMA180
+        tristate "Bosch BMA180 3-Axis Accelerometer Driver"
+        depends on I2C
+        select IIO_BUFFER
+        select IIO_TRIGGERED_BUFFER
+        help
+          Say Y here if you want to build a driver for the Bosch BMA180
+          triaxial acceleration sensor.
+
+          To compile this driver as a module, choose M here: the
+          module will be called bma180.
+
 config HID_SENSOR_ACCEL_3D
         depends on HID_SENSOR_HUB
         select IIO_BUFFER
diff --git a/drivers/iio/accel/Makefile b/drivers/iio/accel/Makefile
index 2f95a3dffa47..c48d15f25616 100644
--- a/drivers/iio/accel/Makefile
+++ b/drivers/iio/accel/Makefile
@@ -3,6 +3,7 @@
 #
 
 # When adding new entries keep the list in alphabetical order
+obj-$(CONFIG_BMA180) += bma180.o
 obj-$(CONFIG_HID_SENSOR_ACCEL_3D) += hid-sensor-accel-3d.o
 obj-$(CONFIG_KXSD9)     += kxsd9.o
 
diff --git a/drivers/iio/accel/bma180.c b/drivers/iio/accel/bma180.c
new file mode 100644
index 000000000000..12e32e6b4103
--- /dev/null
+++ b/drivers/iio/accel/bma180.c
@@ -0,0 +1,676 @@
+/*
+ * bma180.c - IIO driver for Bosch BMA180 triaxial acceleration sensor
+ *
+ * Copyright 2013 Oleksandr Kravchenko <x0199363@ti.com>
+ *
+ * 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.
+ */
+
+#include <linux/module.h>
+#include <linux/i2c.h>
+#include <linux/interrupt.h>
+#include <linux/delay.h>
+#include <linux/of.h>
+#include <linux/bitops.h>
+#include <linux/slab.h>
+#include <linux/string.h>
+#include <linux/iio/iio.h>
+#include <linux/iio/sysfs.h>
+#include <linux/iio/buffer.h>
+#include <linux/iio/trigger.h>
+#include <linux/iio/trigger_consumer.h>
+#include <linux/iio/triggered_buffer.h>
+
+#define BMA180_DRV_NAME "bma180"
+#define BMA180_IRQ_NAME "bma180_event"
+
+/* Register set */
+#define BMA180_CHIP_ID          0x00 /* Need to distinguish BMA180 from other */
+#define BMA180_ACC_X_LSB        0x02 /* First of 6 registers of accel data */
+#define BMA180_CTRL_REG0        0x0d
+#define BMA180_RESET            0x10
+#define BMA180_BW_TCS           0x20
+#define BMA180_CTRL_REG3        0x21
+#define BMA180_TCO_Z            0x30
+#define BMA180_OFFSET_LSB1      0x35
+
+/* BMA180_CTRL_REG0 bits */
+#define BMA180_DIS_WAKE_UP      BIT(0) /* Disable wake up mode */
+#define BMA180_SLEEP            BIT(1) /* 1 - chip will sleep */
+#define BMA180_EE_W             BIT(4) /* Unlock writing to addr from 0x20 */
+#define BMA180_RESET_INT        BIT(6) /* Reset pending interrupts */
+
+/* BMA180_CTRL_REG3 bits */
+#define BMA180_NEW_DATA_INT     BIT(1) /* Intr every new accel data is ready */
+
+/* BMA180_OFFSET_LSB1 skipping mode bit */
+#define BMA180_SMP_SKIP         BIT(0)
+
+/* Bit masks for registers bit fields */
+#define BMA180_RANGE            0x0e /* Range of measured accel values*/
+#define BMA180_BW               0xf0 /* Accel bandwidth */
+#define BMA180_MODE_CONFIG      0x03 /* Config operation modes */
+
+/* We have to write this value in reset register to do soft reset */
+#define BMA180_RESET_VAL        0xb6
+
+#define BMA_180_ID_REG_VAL      0x03
+
+/* Chip power modes */
+#define BMA180_LOW_NOISE        0x00
+#define BMA180_LOW_POWER        0x03
+
+#define BMA180_LOW_NOISE_STR    "low_noise"
+#define BMA180_LOW_POWER_STR    "low_power"
+
+/* Defaults values */
+#define BMA180_DEF_PMODE        0
+#define BMA180_DEF_BW           20
+#define BMA180_DEF_SCALE        250
+
+/* Available values for sysfs */
+#define BMA180_FLP_FREQ_AVAILABLE \
+        "10 20 40 75 150 300"
+#define BMA180_SCALE_AVAILABLE \
+        "0.000130 0.000190 0.000250 0.000380 0.000500 0.000990 0.001980"
+
+struct bma180_data {
+        struct i2c_client *client;
+        struct iio_trigger *trig;
+        struct mutex mutex;
+        int sleep_state;
+        int scale;
+        int bw;
+        int pmode;
+        char *buff;
+};
+
+enum bma180_axis {
+        AXIS_X,
+        AXIS_Y,
+        AXIS_Z,
+};
+
+static int bw_table[] = { 10, 20, 40, 75, 150, 300 }; /* Hz */
+static int scale_table[] = { 130, 190, 250, 380, 500, 990, 1980 };
+
+static int bma180_get_acc_reg(struct bma180_data *data, enum bma180_axis axis)
+{
+        u8 reg = BMA180_ACC_X_LSB + axis * 2;
+        int ret;
+
+        if (data->sleep_state)
+                return -EBUSY;
+
+        ret = i2c_smbus_read_word_data(data->client, reg);
+        if (ret < 0)
+                dev_err(&data->client->dev,
+                        "failed to read accel_%c registers\n", 'x' + axis);
+
+        return ret;
+}
+
+static int bma180_set_bits(struct bma180_data *data, u8 reg, u8 mask, u8 val)
+{
+        int ret = i2c_smbus_read_byte_data(data->client, reg);
+        u8 reg_val = (ret & ~mask) | (val << (ffs(mask) - 1));
+
+        if (ret < 0)
+                return ret;
+
+        return i2c_smbus_write_byte_data(data->client, reg, reg_val);
+}
+
+static int bma180_reset_intr(struct bma180_data *data)
+{
+        int ret = bma180_set_bits(data, BMA180_CTRL_REG0, BMA180_RESET_INT, 1);
+
+        if (ret)
+                dev_err(&data->client->dev, "failed to reset interrupt\n");
+
+        return ret;
+}
+
+static int bma180_set_new_data_intr_state(struct bma180_data *data, int state)
+{
+        u8 reg_val = state ? BMA180_NEW_DATA_INT : 0x00;
+        int ret = i2c_smbus_write_byte_data(data->client, BMA180_CTRL_REG3,
+                        reg_val);
+
+        if (ret)
+                goto err;
+        ret = bma180_reset_intr(data);
+        if (ret)
+                goto err;
+
+        return 0;
+
+err:
+        dev_err(&data->client->dev,
+                "failed to set new data interrupt state %d\n", state);
+        return ret;
+}
+
+static int bma180_set_sleep_state(struct bma180_data *data, int state)
+{
+        int ret = bma180_set_bits(data, BMA180_CTRL_REG0, BMA180_SLEEP, state);
+
+        if (ret) {
+                dev_err(&data->client->dev,
+                        "failed to set sleep state %d\n", state);
+                return ret;
+        }
+        data->sleep_state = state;
+
+        return 0;
+}
+
+static int bma180_set_ee_writing_state(struct bma180_data *data, int state)
+{
+        int ret = bma180_set_bits(data, BMA180_CTRL_REG0, BMA180_EE_W, state);
+
+        if (ret)
+                dev_err(&data->client->dev,
+                        "failed to set ee writing state %d\n", state);
+
+        return ret;
+}
+
+static int bma180_set_bw(struct bma180_data *data, int val)
+{
+        int ret, i;
+
+        if (data->sleep_state)
+                return -EBUSY;
+
+        for (i = 0; i < ARRAY_SIZE(bw_table); ++i) {
+                if (bw_table[i] == val) {
+                        ret = bma180_set_bits(data,
+                                        BMA180_BW_TCS, BMA180_BW, i);
+                        if (ret) {
+                                dev_err(&data->client->dev,
+                                        "failed to set bandwidth\n");
+                                return ret;
+                        }
+                        data->bw = val;
+                        return 0;
+                }
+        }
+
+        return -EINVAL;
+}
+
+static int bma180_set_scale(struct bma180_data *data, int val)
+{
+        int ret, i;
+
+        if (data->sleep_state)
+                return -EBUSY;
+
+        for (i = 0; i < ARRAY_SIZE(scale_table); ++i)
+                if (scale_table[i] == val) {
+                        ret = bma180_set_bits(data,
+                                        BMA180_OFFSET_LSB1, BMA180_RANGE, i);
+                        if (ret) {
+                                dev_err(&data->client->dev,
+                                        "failed to set scale\n");
+                                return ret;
+                        }
+                        data->scale = val;
+                        return 0;
+                }
+
+        return -EINVAL;
+}
+
+static int bma180_set_pmode(struct bma180_data *data, int mode)
+{
+        u8 reg_val = mode ? BMA180_LOW_POWER : BMA180_LOW_NOISE;
+        int ret = bma180_set_bits(data, BMA180_TCO_Z, BMA180_MODE_CONFIG,
+                        reg_val);
+
+        if (ret) {
+                dev_err(&data->client->dev, "failed to set power mode\n");
+                return ret;
+        }
+        data->pmode = mode;
+
+        return 0;
+}
+
+static int bma180_soft_reset(struct bma180_data *data)
+{
+        int ret = i2c_smbus_write_byte_data(data->client,
+                        BMA180_RESET, BMA180_RESET_VAL);
+
+        if (ret)
+                dev_err(&data->client->dev, "failed to reset the chip\n");
+
+        return ret;
+}
+
+static int bma180_chip_init(struct bma180_data *data)
+{
+        /* Try to read chip_id register. It must return 0x03. */
+        int ret = i2c_smbus_read_byte_data(data->client, BMA180_CHIP_ID);
+
+        if (ret < 0)
+                goto err;
+        if (ret != BMA_180_ID_REG_VAL) {
+                ret = -ENODEV;
+                goto err;
+        }
+
+        ret = bma180_soft_reset(data);
+        if (ret)
+                goto err;
+        /*
+         * No serial transaction should occur within minimum 10 us
+         * after soft_reset command
+         */
+        msleep(20);
+
+        ret = bma180_set_bits(data, BMA180_CTRL_REG0, BMA180_DIS_WAKE_UP, 1);
+        if (ret)
+                goto err;
+        ret = bma180_set_ee_writing_state(data, 1);
+        if (ret)
+                goto err;
+        ret = bma180_set_new_data_intr_state(data, 0);
+        if (ret)
+                goto err;
+        ret = bma180_set_bits(data, BMA180_OFFSET_LSB1, BMA180_SMP_SKIP, 1);
+        if (ret)
+                goto err;
+        ret = bma180_set_pmode(data, BMA180_DEF_PMODE);
+        if (ret)
+                goto err;
+        ret = bma180_set_bw(data, BMA180_DEF_BW);
+        if (ret)
+                goto err;
+        ret = bma180_set_scale(data, BMA180_DEF_SCALE);
+        if (ret)
+                goto err;
+
+        return 0;
+
+err:
+        dev_err(&data->client->dev, "failed to init the chip\n");
+        return ret;
+}
+
+static void bma180_chip_disable(struct bma180_data *data)
+{
+        if (bma180_set_new_data_intr_state(data, 0))
+                goto err;
+        if (bma180_set_ee_writing_state(data, 0))
+                goto err;
+        if (bma180_set_sleep_state(data, 1))
+                goto err;
+
+        return;
+
+err:
+        dev_err(&data->client->dev, "failed to disable the chip\n");
+}
+
+static IIO_CONST_ATTR(in_accel_filter_low_pass_3db_frequency_available,
+                BMA180_FLP_FREQ_AVAILABLE);
+static IIO_CONST_ATTR(in_accel_scale_available, BMA180_SCALE_AVAILABLE);
+
+static struct attribute *bma180_attributes[] = {
+        &iio_const_attr_in_accel_filter_low_pass_3db_frequency_available.dev_attr.attr,
+        &iio_const_attr_in_accel_scale_available.dev_attr.attr,
+        NULL,
+};
+
+static const struct attribute_group bma180_attrs_group = {
+        .attrs = bma180_attributes,
+};
+
+static int bma180_read_raw(struct iio_dev *indio_dev,
+                struct iio_chan_spec const *chan, int *val, int *val2,
+                long mask)
+{
+        struct bma180_data *data = iio_priv(indio_dev);
+        int ret;
+
+        switch (mask) {
+        case IIO_CHAN_INFO_RAW:
+                mutex_lock(&data->mutex);
+                if (iio_buffer_enabled(indio_dev))
+                        ret = -EBUSY;
+                else
+                        ret = bma180_get_acc_reg(data, chan->scan_index);
+                mutex_unlock(&data->mutex);
+                if (ret < 0)
+                        return ret;
+                *val = (s16)ret >> chan->scan_type.shift;
+                return IIO_VAL_INT;
+        case IIO_CHAN_INFO_LOW_PASS_FILTER_3DB_FREQUENCY:
+                *val = data->bw;
+                return IIO_VAL_INT;
+        case IIO_CHAN_INFO_SCALE:
+                *val = 0;
+                *val2 = data->scale;
+                return IIO_VAL_INT_PLUS_MICRO;
+        default:
+                return -EINVAL;
+        }
+}
+
+static int bma180_write_raw(struct iio_dev *indio_dev,
+                struct iio_chan_spec const *chan, int val, int val2, long mask)
+{
+        struct bma180_data *data = iio_priv(indio_dev);
+        int ret;
+
+        switch (mask) {
+        case IIO_CHAN_INFO_SCALE:
+                if (val)
+                        return -EINVAL;
+                mutex_lock(&data->mutex);
+                ret = bma180_set_scale(data, val2);
+                mutex_unlock(&data->mutex);
+                return ret;
+        case IIO_CHAN_INFO_LOW_PASS_FILTER_3DB_FREQUENCY:
+                mutex_lock(&data->mutex);
+                ret = bma180_set_bw(data, val);
+                mutex_unlock(&data->mutex);
+                return ret;
+        default:
+                return -EINVAL;
+        }
+}
+
+static int bma180_update_scan_mode(struct iio_dev *indio_dev,
+                const unsigned long *scan_mask)
+{
+        struct bma180_data *data = iio_priv(indio_dev);
+
+        if (data->buff)
+                devm_kfree(&indio_dev->dev, data->buff);
+        data->buff = devm_kzalloc(&indio_dev->dev,
+                        indio_dev->scan_bytes, GFP_KERNEL);
+        if (!data->buff)
+                return -ENOMEM;
+
+        return 0;
+}
+
+static const struct iio_info bma180_info = {
+        .attrs                  = &bma180_attrs_group,
+        .read_raw               = bma180_read_raw,
+        .write_raw              = bma180_write_raw,
+        .update_scan_mode       = bma180_update_scan_mode,
+        .driver_module          = THIS_MODULE,
+};
+
+static const char * const bma180_power_modes[] = {
+        BMA180_LOW_NOISE_STR,
+        BMA180_LOW_POWER_STR,
+};
+
+static int bma180_get_power_mode(struct iio_dev *indio_dev,
+                const struct iio_chan_spec *chan)
+{
+        struct bma180_data *data = iio_priv(indio_dev);
+
+        return data->pmode;
+}
+
+static int bma180_set_power_mode(struct iio_dev *indio_dev,
+                const struct iio_chan_spec *chan, unsigned int mode)
+{
+        struct bma180_data *data = iio_priv(indio_dev);
+        int ret;
+
+        mutex_lock(&data->mutex);
+        ret = bma180_set_pmode(data, mode);
+        mutex_unlock(&data->mutex);
+
+        return ret;
+}
+
+static const struct iio_enum bma180_power_mode_enum = {
+        .items = bma180_power_modes,
+        .num_items = ARRAY_SIZE(bma180_power_modes),
+        .get = bma180_get_power_mode,
+        .set = bma180_set_power_mode,
+};
+
+static const struct iio_chan_spec_ext_info bma180_ext_info[] = {
+        IIO_ENUM("power_mode", true, &bma180_power_mode_enum),
+        IIO_ENUM_AVAILABLE("power_mode", &bma180_power_mode_enum),
+        { },
+};
+
+#define BMA180_CHANNEL(_index) {                                        \
+        .type = IIO_ACCEL,                                              \
+        .indexed = 1,                                                   \
+        .channel = (_index),                                            \
+        .info_mask_separate = BIT(IIO_CHAN_INFO_RAW) |                  \
+                BIT(IIO_CHAN_INFO_LOW_PASS_FILTER_3DB_FREQUENCY),       \
+        .info_mask_shared_by_type = BIT(IIO_CHAN_INFO_SCALE),           \
+        .scan_index = (_index),                                         \
+        .scan_type = IIO_ST('s', 14, 16, 2),                            \
+        .ext_info = bma180_ext_info,                                    \
+}
+
+static const struct iio_chan_spec bma180_channels[] = {
+        BMA180_CHANNEL(AXIS_X),
+        BMA180_CHANNEL(AXIS_Y),
+        BMA180_CHANNEL(AXIS_Z),
+        IIO_CHAN_SOFT_TIMESTAMP(4),
+};
+
+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);
+        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) {
+                ret = bma180_get_acc_reg(data, bit);
+                if (ret < 0) {
+                        mutex_unlock(&data->mutex);
+                        goto err;
+                }
+                ((s16 *)data->buff)[i++] = ret;
+        }
+        mutex_unlock(&data->mutex);
+
+        iio_push_to_buffers(indio_dev, (u8 *)data->buff);
+err:
+        iio_trigger_notify_done(indio_dev->trig);
+
+        return IRQ_HANDLED;
+}
+
+static int bma180_data_rdy_trigger_set_state(struct iio_trigger *trig,
+                bool state)
+{
+        struct iio_dev *indio_dev = iio_trigger_get_drvdata(trig);
+        struct bma180_data *data = iio_priv(indio_dev);
+
+        return bma180_set_new_data_intr_state(data, state);
+}
+
+static int bma180_trig_try_reen(struct iio_trigger *trig)
+{
+        struct iio_dev *indio_dev = iio_trigger_get_drvdata(trig);
+        struct bma180_data *data = iio_priv(indio_dev);
+
+        return bma180_reset_intr(data);
+}
+
+static const struct iio_trigger_ops bma180_trigger_ops = {
+        .set_trigger_state = bma180_data_rdy_trigger_set_state,
+        .try_reenable = bma180_trig_try_reen,
+        .owner = THIS_MODULE,
+};
+
+static int bma180_probe(struct i2c_client *client,
+                const struct i2c_device_id *id)
+{
+        struct bma180_data *data;
+        struct iio_dev *indio_dev;
+        struct iio_trigger *trig;
+        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;
+
+        ret = bma180_chip_init(data);
+        if (ret < 0)
+                goto err_chip_disable;
+
+        mutex_init(&data->mutex);
+
+        indio_dev->dev.parent = &client->dev;
+        indio_dev->channels = bma180_channels;
+        indio_dev->num_channels = ARRAY_SIZE(bma180_channels);
+        indio_dev->name = BMA180_DRV_NAME;
+        indio_dev->modes = INDIO_DIRECT_MODE;
+        indio_dev->info = &bma180_info;
+
+        trig = iio_trigger_alloc("%s-dev%d", indio_dev->name, indio_dev->id);
+        if (!trig) {
+                ret = -ENOMEM;
+                goto err_chip_disable;
+        }
+
+        ret = devm_request_irq(&client->dev, client->irq,
+                        iio_trigger_generic_data_rdy_poll,
+                        IRQF_TRIGGER_RISING, BMA180_IRQ_NAME, trig);
+        if (ret) {
+                dev_err(&client->dev, "unable to request IRQ\n");
+                goto err_trigger_free;
+        }
+
+        trig->dev.parent = &client->dev;
+        trig->ops = &bma180_trigger_ops;
+        iio_trigger_set_drvdata(trig, indio_dev);
+        data->trig = trig;
+        indio_dev->trig = trig;
+
+        ret = iio_trigger_register(trig);
+        if (ret)
+                goto err_trigger_free;
+
+        ret = iio_triggered_buffer_setup(indio_dev, NULL,
+                        bma180_trigger_handler, NULL);
+        if (ret < 0) {
+                dev_err(&client->dev, "unable to setup iio triggered buffer\n");
+                goto err_trigger_unregister;
+        }
+
+        ret = iio_device_register(indio_dev);
+        if (ret < 0) {
+                dev_err(&client->dev, "unable to register iio device\n");
+                goto err_buffer_cleanup;
+        }
+
+        return 0;
+
+err_buffer_cleanup:
+        iio_triggered_buffer_cleanup(indio_dev);
+err_trigger_unregister:
+        iio_trigger_unregister(trig);
+err_trigger_free:
+        iio_trigger_free(trig);
+err_chip_disable:
+        bma180_chip_disable(data);
+
+        return ret;
+}
+
+static int bma180_remove(struct i2c_client *client)
+{
+        struct iio_dev *indio_dev = i2c_get_clientdata(client);
+        struct bma180_data *data = iio_priv(indio_dev);
+
+        iio_device_unregister(indio_dev);
+        iio_triggered_buffer_cleanup(indio_dev);
+        iio_trigger_unregister(data->trig);
+        iio_trigger_free(data->trig);
+
+        mutex_lock(&data->mutex);
+        bma180_chip_disable(data);
+        mutex_unlock(&data->mutex);
+
+        return 0;
+}
+
+#ifdef CONFIG_PM_SLEEP
+static int bma180_suspend(struct device *dev)
+{
+        struct iio_dev *indio_dev = dev_to_iio_dev(dev);
+        struct bma180_data *data = iio_priv(indio_dev);
+        int ret;
+
+        mutex_lock(&data->mutex);
+        ret = bma180_set_sleep_state(data, 1);
+        mutex_unlock(&data->mutex);
+
+        return ret;
+}
+
+static int bma180_resume(struct device *dev)
+{
+        struct iio_dev *indio_dev = dev_to_iio_dev(dev);
+        struct bma180_data *data = iio_priv(indio_dev);
+        int ret;
+
+        mutex_lock(&data->mutex);
+        ret = bma180_set_sleep_state(data, 0);
+        mutex_unlock(&data->mutex);
+
+        return ret;
+}
+
+static SIMPLE_DEV_PM_OPS(bma180_pm_ops, bma180_suspend, bma180_resume);
+#define BMA180_PM_OPS (&bma180_pm_ops)
+#else
+#define BMA180_PM_OPS NULL
+#endif
+
+static struct i2c_device_id bma180_id[] = {
+        { BMA180_DRV_NAME, 0 },
+        { }
+};
+
+MODULE_DEVICE_TABLE(i2c, bma180_id);
+
+static struct i2c_driver bma180_driver = {
+        .driver = {
+                .name   = BMA180_DRV_NAME,
+                .owner  = THIS_MODULE,
+                .pm     = BMA180_PM_OPS,
+        },
+        .probe          = bma180_probe,
+        .remove         = bma180_remove,
+        .id_table       = bma180_id,
+};
+
+module_i2c_driver(bma180_driver);
+
+MODULE_AUTHOR("Kravchenko Oleksandr <x0199363@ti.com>");
+MODULE_AUTHOR("Texas Instruments, Inc.");
+MODULE_DESCRIPTION("Bosch BMA180 triaxial acceleration sensor");
+MODULE_LICENSE("GPL");
diff --git a/drivers/iio/adc/at91_adc.c b/drivers/iio/adc/at91_adc.c
index 423e079460d3..84be63bdf038 100644
--- a/drivers/iio/adc/at91_adc.c
+++ b/drivers/iio/adc/at91_adc.c
@@ -39,6 +39,10 @@
 #define at91_adc_writel(st, reg, val) \
         (writel_relaxed(val, st->reg_base + reg))
 
+struct at91_adc_caps {
+        struct at91_adc_reg_desc registers;
+};
+
 struct at91_adc_state {
         struct clk              *adc_clk;
         u16                     *buffer;
@@ -62,6 +66,7 @@ struct at91_adc_state {
         u32                     res;            /* resolution used for convertions */
         bool                    low_res;        /* the resolution corresponds to the lowest one */
         wait_queue_head_t       wq_data_avail;
+        struct at91_adc_caps    *caps;
 };
 
 static irqreturn_t at91_adc_trigger_handler(int irq, void *p)
@@ -429,6 +434,8 @@ ret:
         return ret;
 }
 
+static const struct of_device_id at91_adc_dt_ids[];
+
 static int at91_adc_probe_dt(struct at91_adc_state *st,
                              struct platform_device *pdev)
 {
@@ -441,6 +448,9 @@ static int at91_adc_probe_dt(struct at91_adc_state *st,
         if (!node)
                 return -EINVAL;
 
+        st->caps = (struct at91_adc_caps *)
+                of_match_device(at91_adc_dt_ids, &pdev->dev)->data;
+
         st->use_external = of_property_read_bool(node, "atmel,adc-use-external-triggers");
 
         if (of_property_read_u32(node, "atmel,adc-channels-used", &prop)) {
@@ -481,43 +491,7 @@ static int at91_adc_probe_dt(struct at91_adc_state *st,
         if (ret)
                 goto error_ret;
 
-        st->registers = devm_kzalloc(&idev->dev,
-                                     sizeof(struct at91_adc_reg_desc),
-                                     GFP_KERNEL);
-        if (!st->registers) {
-                dev_err(&idev->dev, "Could not allocate register memory.\n");
-                ret = -ENOMEM;
-                goto error_ret;
-        }
-
-        if (of_property_read_u32(node, "atmel,adc-channel-base", &prop)) {
-                dev_err(&idev->dev, "Missing adc-channel-base property in the DT.\n");
-                ret = -EINVAL;
-                goto error_ret;
-        }
-        st->registers->channel_base = prop;
-
-        if (of_property_read_u32(node, "atmel,adc-drdy-mask", &prop)) {
-                dev_err(&idev->dev, "Missing adc-drdy-mask property in the DT.\n");
-                ret = -EINVAL;
-                goto error_ret;
-        }
-        st->registers->drdy_mask = prop;
-
-        if (of_property_read_u32(node, "atmel,adc-status-register", &prop)) {
-                dev_err(&idev->dev, "Missing adc-status-register property in the DT.\n");
-                ret = -EINVAL;
-                goto error_ret;
-        }
-        st->registers->status_register = prop;
-
-        if (of_property_read_u32(node, "atmel,adc-trigger-register", &prop)) {
-                dev_err(&idev->dev, "Missing adc-trigger-register property in the DT.\n");
-                ret = -EINVAL;
-                goto error_ret;
-        }
-        st->registers->trigger_register = prop;
-
+        st->registers = &st->caps->registers;
         st->trigger_number = of_get_child_count(node);
         st->trigger_list = devm_kzalloc(&idev->dev, st->trigger_number *
                                         sizeof(struct at91_adc_trigger),
@@ -698,8 +672,8 @@ static int at91_adc_probe(struct platform_device *pdev)
         shtim = round_up((st->sample_hold_time * adc_clk /
                           1000000) - 1, 1);
 
-        reg = AT91_ADC_PRESCAL_(prsc) & AT91_ADC_PRESCAL;
-        reg |= AT91_ADC_STARTUP_(ticks) & AT91_ADC_STARTUP;
+        reg = AT91_ADC_PRESCAL_(prsc) & st->registers->mr_prescal_mask;
+        reg |= AT91_ADC_STARTUP_(ticks) & st->registers->mr_startup_mask;
         if (st->low_res)
                 reg |= AT91_ADC_LOWRES;
         if (st->sleep_mode)
@@ -766,8 +740,44 @@ static int at91_adc_remove(struct platform_device *pdev)
 }
 
 #ifdef CONFIG_OF
+static struct at91_adc_caps at91sam9260_caps = {
+        .registers = {
+                .channel_base = AT91_ADC_CHR(0),
+                .drdy_mask = AT91_ADC_DRDY,
+                .status_register = AT91_ADC_SR,
+                .trigger_register = AT91_ADC_TRGR_9260,
+                .mr_prescal_mask = AT91_ADC_PRESCAL_9260,
+                .mr_startup_mask = AT91_ADC_STARTUP_9260,
+        },
+};
+
+static struct at91_adc_caps at91sam9g45_caps = {
+        .registers = {
+                .channel_base = AT91_ADC_CHR(0),
+                .drdy_mask = AT91_ADC_DRDY,
+                .status_register = AT91_ADC_SR,
+                .trigger_register = AT91_ADC_TRGR_9G45,
+                .mr_prescal_mask = AT91_ADC_PRESCAL_9G45,
+                .mr_startup_mask = AT91_ADC_STARTUP_9G45,
+        },
+};
+
+static struct at91_adc_caps at91sam9x5_caps = {
+        .registers = {
+                .channel_base = AT91_ADC_CDR0_9X5,
+                .drdy_mask = AT91_ADC_SR_DRDY_9X5,
+                .status_register = AT91_ADC_SR_9X5,
+                .trigger_register = AT91_ADC_TRGR_9X5,
+                /* prescal mask is same as 9G45 */
+                .mr_prescal_mask = AT91_ADC_PRESCAL_9G45,
+                .mr_startup_mask = AT91_ADC_STARTUP_9X5,
+        },
+};
+
 static const struct of_device_id at91_adc_dt_ids[] = {
-        { .compatible = "atmel,at91sam9260-adc" },
+        { .compatible = "atmel,at91sam9260-adc", .data = &at91sam9260_caps },
+        { .compatible = "atmel,at91sam9g45-adc", .data = &at91sam9g45_caps },
+        { .compatible = "atmel,at91sam9x5-adc", .data = &at91sam9x5_caps },
         {},
 };
 MODULE_DEVICE_TABLE(of, at91_adc_dt_ids);
diff --git a/drivers/iio/adc/twl6030-gpadc.c b/drivers/iio/adc/twl6030-gpadc.c
index a558516d140d..0ea96c058c08 100644
--- a/drivers/iio/adc/twl6030-gpadc.c
+++ b/drivers/iio/adc/twl6030-gpadc.c
@@ -537,8 +537,8 @@ static int twl6030_gpadc_read_raw(struct iio_dev *indio_dev,
                 ret = -ETIMEDOUT;
                 goto err;
         } else if (timeout < 0) {
-                goto err;
                 ret = -EINTR;
+                goto err;
         }
 
         switch (mask) {
diff --git a/drivers/staging/iio/accel/adis16201_core.c b/drivers/staging/iio/accel/adis16201_core.c
index ab8ec7af88b4..2105576fa77c 100644
--- a/drivers/staging/iio/accel/adis16201_core.c
+++ b/drivers/staging/iio/accel/adis16201_core.c
@@ -182,11 +182,10 @@ static int adis16201_probe(struct spi_device *spi)
         struct iio_dev *indio_dev;
 
         /* setup the industrialio driver allocated elements */
-        indio_dev = iio_device_alloc(sizeof(*st));
-        if (indio_dev == NULL) {
-                ret = -ENOMEM;
-                goto error_ret;
-        }
+        indio_dev = devm_iio_device_alloc(&spi->dev, sizeof(*st));
+        if (!indio_dev)
+                return -ENOMEM;
+
         st = iio_priv(indio_dev);
         /* this is only used for removal purposes */
         spi_set_drvdata(spi, indio_dev);
@@ -201,10 +200,10 @@ static int adis16201_probe(struct spi_device *spi)
 
         ret = adis_init(st, indio_dev, spi, &adis16201_data);
         if (ret)
-                goto error_free_dev;
+                return ret;
         ret = adis_setup_buffer_and_trigger(st, indio_dev, NULL);
         if (ret)
-                goto error_free_dev;
+                return ret;
 
         /* Get the device into a sane initial state */
         ret = adis_initial_startup(st);
@@ -218,9 +217,6 @@ static int adis16201_probe(struct spi_device *spi)
 
 error_cleanup_buffer_trigger:
         adis_cleanup_buffer_and_trigger(st, indio_dev);
-error_free_dev:
-        iio_device_free(indio_dev);
-error_ret:
         return ret;
 }
 
@@ -231,7 +227,6 @@ static int adis16201_remove(struct spi_device *spi)
 
         iio_device_unregister(indio_dev);
         adis_cleanup_buffer_and_trigger(st, indio_dev);
-        iio_device_free(indio_dev);
 
         return 0;
 }
diff --git a/drivers/staging/iio/accel/adis16203_core.c b/drivers/staging/iio/accel/adis16203_core.c
index b08ac8fdeee2..409a28ed9043 100644
--- a/drivers/staging/iio/accel/adis16203_core.c
+++ b/drivers/staging/iio/accel/adis16203_core.c
@@ -148,11 +148,9 @@ static int adis16203_probe(struct spi_device *spi)
         struct adis *st;
 
         /* setup the industrialio driver allocated elements */
-        indio_dev = iio_device_alloc(sizeof(*st));
-        if (indio_dev == NULL) {
-                ret = -ENOMEM;
-                goto error_ret;
-        }
+        indio_dev = devm_iio_device_alloc(&spi->dev, sizeof(*st));
+        if (!indio_dev)
+                return -ENOMEM;
         st = iio_priv(indio_dev);
         /* this is only used for removal purposes */
         spi_set_drvdata(spi, indio_dev);
@@ -166,11 +164,11 @@ static int adis16203_probe(struct spi_device *spi)
 
         ret = adis_init(st, indio_dev, spi, &adis16203_data);
         if (ret)
-                goto error_free_dev;
+                return ret;
 
         ret = adis_setup_buffer_and_trigger(st, indio_dev, NULL);
         if (ret)
-                goto error_free_dev;
+                return ret;
 
         /* Get the device into a sane initial state */
         ret = adis_initial_startup(st);
@@ -185,9 +183,6 @@ static int adis16203_probe(struct spi_device *spi)
 
 error_cleanup_buffer_trigger:
         adis_cleanup_buffer_and_trigger(st, indio_dev);
-error_free_dev:
-        iio_device_free(indio_dev);
-error_ret:
         return ret;
 }
 
@@ -198,7 +193,6 @@ static int adis16203_remove(struct spi_device *spi)
 
         iio_device_unregister(indio_dev);
         adis_cleanup_buffer_and_trigger(st, indio_dev);
-        iio_device_free(indio_dev);
 
         return 0;
 }
diff --git a/drivers/staging/iio/accel/adis16204_core.c b/drivers/staging/iio/accel/adis16204_core.c
index 792ec25a50dc..b8ea76857cd6 100644
--- a/drivers/staging/iio/accel/adis16204_core.c
+++ b/drivers/staging/iio/accel/adis16204_core.c
@@ -187,11 +187,9 @@ static int adis16204_probe(struct spi_device *spi)
         struct iio_dev *indio_dev;
 
         /* setup the industrialio driver allocated elements */
-        indio_dev = iio_device_alloc(sizeof(*st));
-        if (indio_dev == NULL) {
-                ret = -ENOMEM;
-                goto error_ret;
-        }
+        indio_dev = devm_iio_device_alloc(&spi->dev, sizeof(*st));
+        if (!indio_dev)
+                return -ENOMEM;
         st = iio_priv(indio_dev);
         /* this is only used for removal purposes */
         spi_set_drvdata(spi, indio_dev);
@@ -205,11 +203,11 @@ static int adis16204_probe(struct spi_device *spi)
 
         ret = adis_init(st, indio_dev, spi, &adis16204_data);
         if (ret)
-                goto error_free_dev;
+                return ret;
 
         ret = adis_setup_buffer_and_trigger(st, indio_dev, NULL);
         if (ret)
-                goto error_free_dev;
+                return ret;
 
         /* Get the device into a sane initial state */
         ret = adis_initial_startup(st);
@@ -223,9 +221,6 @@ static int adis16204_probe(struct spi_device *spi)
 
 error_cleanup_buffer_trigger:
         adis_cleanup_buffer_and_trigger(st, indio_dev);
-error_free_dev:
-        iio_device_free(indio_dev);
-error_ret:
         return ret;
 }
 
@@ -236,7 +231,6 @@ static int adis16204_remove(struct spi_device *spi)
 
         iio_device_unregister(indio_dev);
         adis_cleanup_buffer_and_trigger(st, indio_dev);
-        iio_device_free(indio_dev);
 
         return 0;
 }
diff --git a/drivers/staging/iio/accel/adis16209_core.c b/drivers/staging/iio/accel/adis16209_core.c
index 323c169d699c..4492e51d8886 100644
--- a/drivers/staging/iio/accel/adis16209_core.c
+++ b/drivers/staging/iio/accel/adis16209_core.c
@@ -183,11 +183,9 @@ static int adis16209_probe(struct spi_device *spi)
         struct iio_dev *indio_dev;
 
         /* setup the industrialio driver allocated elements */
-        indio_dev = iio_device_alloc(sizeof(*st));
-        if (indio_dev == NULL) {
-                ret = -ENOMEM;
-                goto error_ret;
-        }
+        indio_dev = devm_iio_device_alloc(&spi->dev, sizeof(*st));
+        if (!indio_dev)
+                return -ENOMEM;
         st = iio_priv(indio_dev);
         /* this is only used for removal purposes */
         spi_set_drvdata(spi, indio_dev);
@@ -201,10 +199,10 @@ static int adis16209_probe(struct spi_device *spi)
 
         ret = adis_init(st, indio_dev, spi, &adis16209_data);
         if (ret)
-                goto error_free_dev;
+                return ret;
         ret = adis_setup_buffer_and_trigger(st, indio_dev, NULL);
         if (ret)
-                goto error_free_dev;
+                return ret;
 
         /* Get the device into a sane initial state */
         ret = adis_initial_startup(st);
@@ -218,9 +216,6 @@ static int adis16209_probe(struct spi_device *spi)
 
 error_cleanup_buffer_trigger:
         adis_cleanup_buffer_and_trigger(st, indio_dev);
-error_free_dev:
-        iio_device_free(indio_dev);
-error_ret:
         return ret;
 }
 
@@ -231,7 +226,6 @@ static int adis16209_remove(struct spi_device *spi)
 
         iio_device_unregister(indio_dev);
         adis_cleanup_buffer_and_trigger(st, indio_dev);
-        iio_device_free(indio_dev);
 
         return 0;
 }
diff --git a/drivers/staging/iio/accel/adis16220_core.c b/drivers/staging/iio/accel/adis16220_core.c
index 0e72f795ed09..5c289614357c 100644
--- a/drivers/staging/iio/accel/adis16220_core.c
+++ b/drivers/staging/iio/accel/adis16220_core.c
@@ -428,11 +428,9 @@ static int adis16220_probe(struct spi_device *spi)
         struct iio_dev *indio_dev;
 
         /* setup the industrialio driver allocated elements */
-        indio_dev = iio_device_alloc(sizeof(*st));
-        if (indio_dev == NULL) {
-                ret = -ENOMEM;
-                goto error_ret;
-        }
+        indio_dev = devm_iio_device_alloc(&spi->dev, sizeof(*st));
+        if (!indio_dev)
+                return -ENOMEM;
 
         st = iio_priv(indio_dev);
         /* this is only used for removal purposes */
@@ -447,7 +445,7 @@ static int adis16220_probe(struct spi_device *spi)
 
         ret = iio_device_register(indio_dev);
         if (ret)
-                goto error_free_dev;
+                return ret;
 
         ret = sysfs_create_bin_file(&indio_dev->dev.kobj, &accel_bin);
         if (ret)
@@ -478,9 +476,6 @@ error_rm_accel_bin:
         sysfs_remove_bin_file(&indio_dev->dev.kobj, &accel_bin);
 error_unregister_dev:
         iio_device_unregister(indio_dev);
-error_free_dev:
-        iio_device_free(indio_dev);
-error_ret:
         return ret;
 }
 
@@ -492,7 +487,6 @@ static int adis16220_remove(struct spi_device *spi)
         sysfs_remove_bin_file(&indio_dev->dev.kobj, &adc1_bin);
         sysfs_remove_bin_file(&indio_dev->dev.kobj, &accel_bin);
         iio_device_unregister(indio_dev);
-        iio_device_free(indio_dev);
 
         return 0;
 }
diff --git a/drivers/staging/iio/accel/adis16240_core.c b/drivers/staging/iio/accel/adis16240_core.c
index fd1f0fd0fba8..3a303a03d028 100644
--- a/drivers/staging/iio/accel/adis16240_core.c
+++ b/drivers/staging/iio/accel/adis16240_core.c
@@ -236,11 +236,9 @@ static int adis16240_probe(struct spi_device *spi)
         struct iio_dev *indio_dev;
 
         /* setup the industrialio driver allocated elements */
-        indio_dev = iio_device_alloc(sizeof(*st));
-        if (indio_dev == NULL) {
-                ret = -ENOMEM;
-                goto error_ret;
-        }
+        indio_dev = devm_iio_device_alloc(&spi->dev, sizeof(*st));
+        if (!indio_dev)
+                return -ENOMEM;
         st = iio_priv(indio_dev);
         /* this is only used for removal purposes */
         spi_set_drvdata(spi, indio_dev);
@@ -254,10 +252,10 @@ static int adis16240_probe(struct spi_device *spi)
 
         ret = adis_init(st, indio_dev, spi, &adis16240_data);
         if (ret)
-                goto error_free_dev;
+                return ret;
         ret = adis_setup_buffer_and_trigger(st, indio_dev, NULL);
         if (ret)
-                goto error_free_dev;
+                return ret;
 
         /* Get the device into a sane initial state */
         ret = adis_initial_startup(st);
@@ -270,9 +268,6 @@ static int adis16240_probe(struct spi_device *spi)
 
 error_cleanup_buffer_trigger:
         adis_cleanup_buffer_and_trigger(st, indio_dev);
-error_free_dev:
-        iio_device_free(indio_dev);
-error_ret:
         return ret;
 }
 
@@ -283,7 +278,6 @@ static int adis16240_remove(struct spi_device *spi)
 
         iio_device_unregister(indio_dev);
         adis_cleanup_buffer_and_trigger(st, indio_dev);
-        iio_device_free(indio_dev);
 
         return 0;
 }
diff --git a/drivers/staging/iio/accel/lis3l02dq_core.c b/drivers/staging/iio/accel/lis3l02dq_core.c
index 8ed75a94f465..bb852dc9c987 100644
--- a/drivers/staging/iio/accel/lis3l02dq_core.c
+++ b/drivers/staging/iio/accel/lis3l02dq_core.c
@@ -668,11 +668,9 @@ static int lis3l02dq_probe(struct spi_device *spi)
         struct lis3l02dq_state *st;
         struct iio_dev *indio_dev;
 
-        indio_dev = iio_device_alloc(sizeof *st);
-        if (indio_dev == NULL) {
-                ret = -ENOMEM;
-                goto error_ret;
-        }
+        indio_dev = devm_iio_device_alloc(&spi->dev, sizeof(*st));
+        if (!indio_dev)
+                return -ENOMEM;
         st = iio_priv(indio_dev);
         /* this is only used for removal purposes */
         spi_set_drvdata(spi, indio_dev);
@@ -690,7 +688,7 @@ static int lis3l02dq_probe(struct spi_device *spi)
 
         ret = lis3l02dq_configure_buffer(indio_dev);
         if (ret)
-                goto error_free_dev;
+                return ret;
 
         ret = iio_buffer_register(indio_dev,
                                   lis3l02dq_channels,
@@ -736,9 +734,6 @@ error_uninitialize_buffer:
         iio_buffer_unregister(indio_dev);
 error_unreg_buffer_funcs:
         lis3l02dq_unconfigure_buffer(indio_dev);
-error_free_dev:
-        iio_device_free(indio_dev);
-error_ret:
         return ret;
 }
 
@@ -786,8 +781,6 @@ static int lis3l02dq_remove(struct spi_device *spi)
         iio_buffer_unregister(indio_dev);
         lis3l02dq_unconfigure_buffer(indio_dev);
 
-        iio_device_free(indio_dev);
-
         return 0;
 }
 
diff --git a/drivers/staging/iio/accel/sca3000_core.c b/drivers/staging/iio/accel/sca3000_core.c
index 32950ad94857..48a25ba290f5 100644
--- a/drivers/staging/iio/accel/sca3000_core.c
+++ b/drivers/staging/iio/accel/sca3000_core.c
@@ -1135,11 +1135,9 @@ static int sca3000_probe(struct spi_device *spi)
         struct sca3000_state *st;
         struct iio_dev *indio_dev;
 
-        indio_dev = iio_device_alloc(sizeof(*st));
-        if (indio_dev == NULL) {
-                ret = -ENOMEM;
-                goto error_ret;
-        }
+        indio_dev = devm_iio_device_alloc(&spi->dev, sizeof(*st));
+        if (!indio_dev)
+                return -ENOMEM;
 
         st = iio_priv(indio_dev);
         spi_set_drvdata(spi, indio_dev);
@@ -1162,7 +1160,7 @@ static int sca3000_probe(struct spi_device *spi)
         sca3000_configure_ring(indio_dev);
         ret = iio_device_register(indio_dev);
         if (ret < 0)
-                goto error_free_dev;
+                return ret;
 
         ret = iio_buffer_register(indio_dev,
                                   sca3000_channels,
@@ -1198,10 +1196,6 @@ error_unregister_ring:
         iio_buffer_unregister(indio_dev);
 error_unregister_dev:
         iio_device_unregister(indio_dev);
-error_free_dev:
-        iio_device_free(indio_dev);
-
-error_ret:
         return ret;
 }
 
@@ -1235,7 +1229,6 @@ static int sca3000_remove(struct spi_device *spi)
         iio_device_unregister(indio_dev);
         iio_buffer_unregister(indio_dev);
         sca3000_unconfigure_ring(indio_dev);
-        iio_device_free(indio_dev);
 
         return 0;
 }
diff --git a/drivers/staging/iio/cdc/ad7150.c b/drivers/staging/iio/cdc/ad7150.c
index 687dd2c91437..f4a0341cc70c 100644
--- a/drivers/staging/iio/cdc/ad7150.c
+++ b/drivers/staging/iio/cdc/ad7150.c
@@ -558,11 +558,9 @@ static int ad7150_probe(struct i2c_client *client,
         struct ad7150_chip_info *chip;
         struct iio_dev *indio_dev;
 
-        indio_dev = iio_device_alloc(sizeof(*chip));
-        if (indio_dev == NULL) {
-                ret = -ENOMEM;
-                goto error_ret;
-        }
+        indio_dev = devm_iio_device_alloc(&client->dev, sizeof(*chip));
+        if (!indio_dev)
+                return -ENOMEM;
         chip = iio_priv(indio_dev);
         mutex_init(&chip->state_lock);
         /* this is only used for device removal purposes */
@@ -581,7 +579,7 @@ static int ad7150_probe(struct i2c_client *client,
         indio_dev->modes = INDIO_DIRECT_MODE;
 
         if (client->irq) {
-                ret = request_threaded_irq(client->irq,
+                ret = devm_request_threaded_irq(&client->dev, client->irq,
                                            NULL,
                                            &ad7150_event_handler,
                                            IRQF_TRIGGER_RISING |
@@ -590,11 +588,11 @@ static int ad7150_probe(struct i2c_client *client,
                                            "ad7150_irq1",
                                            indio_dev);
                 if (ret)
-                        goto error_free_dev;
+                        return ret;
         }
 
         if (client->dev.platform_data) {
-                ret = request_threaded_irq(*(unsigned int *)
+                ret = devm_request_threaded_irq(&client->dev, *(unsigned int *)
                                            client->dev.platform_data,
                                            NULL,
                                            &ad7150_event_handler,
@@ -604,28 +602,17 @@ static int ad7150_probe(struct i2c_client *client,
                                            "ad7150_irq2",
                                            indio_dev);
                 if (ret)
-                        goto error_free_irq;
+                        return ret;
         }
 
         ret = iio_device_register(indio_dev);
         if (ret)
-                goto error_free_irq2;
+                return ret;
 
         dev_info(&client->dev, "%s capacitive sensor registered,irq: %d\n",
                  id->name, client->irq);
 
         return 0;
-error_free_irq2:
-        if (client->dev.platform_data)
-                free_irq(*(unsigned int *)client->dev.platform_data,
-                         indio_dev);
-error_free_irq:
-        if (client->irq)
-                free_irq(client->irq, indio_dev);
-error_free_dev:
-        iio_device_free(indio_dev);
-error_ret:
-        return ret;
 }
 
 static int ad7150_remove(struct i2c_client *client)
@@ -633,13 +620,6 @@ static int ad7150_remove(struct i2c_client *client)
         struct iio_dev *indio_dev = i2c_get_clientdata(client);
 
         iio_device_unregister(indio_dev);
-        if (client->irq)
-                free_irq(client->irq, indio_dev);
-
-        if (client->dev.platform_data)
-                free_irq(*(unsigned int *)client->dev.platform_data, indio_dev);
-
-        iio_device_free(indio_dev);
 
         return 0;
 }
diff --git a/drivers/staging/iio/cdc/ad7152.c b/drivers/staging/iio/cdc/ad7152.c
index 1d7c5283a85c..f2c309d1eb59 100644
--- a/drivers/staging/iio/cdc/ad7152.c
+++ b/drivers/staging/iio/cdc/ad7152.c
@@ -481,11 +481,9 @@ static int ad7152_probe(struct i2c_client *client,
         struct ad7152_chip_info *chip;
         struct iio_dev *indio_dev;
 
-        indio_dev = iio_device_alloc(sizeof(*chip));
-        if (indio_dev == NULL) {
-                ret = -ENOMEM;
-                goto error_ret;
-        }
+        indio_dev = devm_iio_device_alloc(&client->dev, sizeof(*chip));
+        if (!indio_dev)
+                return -ENOMEM;
         chip = iio_priv(indio_dev);
         /* this is only used for device removal purposes */
         i2c_set_clientdata(client, indio_dev);
@@ -506,16 +504,11 @@ static int ad7152_probe(struct i2c_client *client,
 
         ret = iio_device_register(indio_dev);
         if (ret)
-                goto error_free_dev;
+                return ret;
 
         dev_err(&client->dev, "%s capacitive sensor registered\n", id->name);
 
         return 0;
-
-error_free_dev:
-        iio_device_free(indio_dev);
-error_ret:
-        return ret;
 }
 
 static int ad7152_remove(struct i2c_client *client)
@@ -523,7 +516,6 @@ static int ad7152_remove(struct i2c_client *client)
         struct iio_dev *indio_dev = i2c_get_clientdata(client);
 
         iio_device_unregister(indio_dev);
-        iio_device_free(indio_dev);
 
         return 0;
 }
diff --git a/drivers/staging/iio/cdc/ad7746.c b/drivers/staging/iio/cdc/ad7746.c
index 94f9ca726d1c..75a533bce021 100644
--- a/drivers/staging/iio/cdc/ad7746.c
+++ b/drivers/staging/iio/cdc/ad7746.c
@@ -699,11 +699,9 @@ static int ad7746_probe(struct i2c_client *client,
         int ret = 0;
         unsigned char regval = 0;
 
-        indio_dev = iio_device_alloc(sizeof(*chip));
-        if (indio_dev == NULL) {
-                ret = -ENOMEM;
-                goto error_ret;
-        }
+        indio_dev = devm_iio_device_alloc(&client->dev, sizeof(*chip));
+        if (!indio_dev)
+                return -ENOMEM;
         chip = iio_priv(indio_dev);
         /* this is only used for device removal purposes */
         i2c_set_clientdata(client, indio_dev);
@@ -748,20 +746,15 @@ static int ad7746_probe(struct i2c_client *client,
         ret = i2c_smbus_write_byte_data(chip->client,
                                         AD7746_REG_EXC_SETUP, regval);
         if (ret < 0)
-                goto error_free_dev;
+                return ret;
 
         ret = iio_device_register(indio_dev);
         if (ret)
-                goto error_free_dev;
+                return ret;
 
         dev_info(&client->dev, "%s capacitive sensor registered\n", id->name);
 
         return 0;
-
-error_free_dev:
-        iio_device_free(indio_dev);
-error_ret:
-        return ret;
 }
 
 static int ad7746_remove(struct i2c_client *client)
@@ -769,7 +762,6 @@ static int ad7746_remove(struct i2c_client *client)
         struct iio_dev *indio_dev = i2c_get_clientdata(client);
 
         iio_device_unregister(indio_dev);
-        iio_device_free(indio_dev);
 
         return 0;
 }
diff --git a/include/linux/platform_data/at91_adc.h b/include/linux/platform_data/at91_adc.h
index e15745b4f3a5..b3ca1e94e0c8 100644
--- a/include/linux/platform_data/at91_adc.h
+++ b/include/linux/platform_data/at91_adc.h
@@ -14,12 +14,16 @@
                         (Interruptions registers mostly)
  * @status_register:    Offset of the Interrupt Status Register
  * @trigger_register:   Offset of the Trigger setup register
+ * @mr_prescal_mask:    Mask of the PRESCAL field in the adc MR register
+ * @mr_startup_mask:    Mask of the STARTUP field in the adc MR register
  */
 struct at91_adc_reg_desc {
         u8      channel_base;
         u32     drdy_mask;
         u8      status_register;
         u8      trigger_register;
+        u32     mr_prescal_mask;
+        u32     mr_startup_mask;
 };
 
 /**