staging:iio:adc:ad7291: don't swab results twice and introduce more register defines
[pandora-kernel.git] / drivers / staging / iio / adc / ad7291.c
index 96cbb17..9d1af0e 100644 (file)
 /*
- * AD7291 digital temperature sensor driver supporting AD7291
+ * AD7291 8-Channel, I2C, 12-Bit SAR ADC with Temperature Sensor
  *
- * Copyright 2010 Analog Devices Inc.
+ * Copyright 2010-2011 Analog Devices Inc.
  *
  * Licensed under the GPL-2 or later.
  */
 
 #include <linux/interrupt.h>
-#include <linux/gpio.h>
 #include <linux/device.h>
 #include <linux/kernel.h>
 #include <linux/slab.h>
 #include <linux/sysfs.h>
-#include <linux/list.h>
 #include <linux/i2c.h>
+#include <linux/module.h>
+#include <linux/mutex.h>
+#include <linux/regulator/consumer.h>
+#include <linux/err.h>
 
 #include "../iio.h"
 #include "../sysfs.h"
 
+/*
+ * Simplified handling
+ *
+ * If no events enabled - single polled channel read
+ * If event enabled direct reads disable unless channel
+ * is in the read mask.
+ *
+ * The noise-delayed bit as per datasheet suggestion is always enabled.
+ *
+ */
+
 /*
  * AD7291 registers definition
  */
-#define AD7291_COMMAND                 0
-#define AD7291_VOLTAGE                 1
-#define AD7291_T_SENSE                 2
-#define AD7291_T_AVERAGE               3
-#define AD7291_VOLTAGE_LIMIT_BASE      4
-#define AD7291_VOLTAGE_LIMIT_COUNT     8
-#define AD7291_T_SENSE_HIGH            0x1c
-#define AD7291_T_SENSE_LOW             0x1d
-#define AD7291_T_SENSE_HYST            0x1e
-#define AD7291_VOLTAGE_ALERT_STATUS    0x1f
+#define AD7291_COMMAND                 0x00
+#define AD7291_VOLTAGE                 0x01
+#define AD7291_T_SENSE                 0x02
+#define AD7291_T_AVERAGE               0x03
+#define AD7291_CH0_DATA_HIGH           0x04
+#define AD7291_CH0_DATA_LOW            0x05
+#define AD7291_CH0_HYST                        0x06
+#define AD7291_CH1_DATA_HIGH           0x07
+#define AD7291_CH1_DATA_LOW            0x08
+#define AD7291_CH1_HYST                        0x09
+#define AD7291_CH2_DATA_HIGH           0x0A
+#define AD7291_CH2_DATA_LOW            0x0B
+#define AD7291_CH2_HYST                        0x0C
+#define AD7291_CH3_DATA_HIGH           0x0D
+#define AD7291_CH3_DATA_LOW            0x0E
+#define AD7291_CH3_HYST                        0x0F
+#define AD7291_CH4_DATA_HIGH           0x10
+#define AD7291_CH4_DATA_LOW            0x11
+#define AD7291_CH4_HYST                        0x12
+#define AD7291_CH5_DATA_HIGH           0x13
+#define AD7291_CH5_DATA_LOW            0x14
+#define AD7291_CH5_HYST                        0x15
+#define AD7291_CH6_DATA_HIGH           0x16
+#define AD7291_CH6_DATA_LOW            0x17
+#define AD7291_CH6_HYST                        0x18
+#define AD7291_CH7_DATA_HIGH           0x19
+#define AD7291_CH7_DATA_LOW            0x1A
+#define AD7291_CH7_HYST                        0x2B
+#define AD7291_T_SENSE_HIGH            0x1C
+#define AD7291_T_SENSE_LOW             0x1D
+#define AD7291_T_SENSE_HYST            0x1E
+#define AD7291_VOLTAGE_ALERT_STATUS    0x1F
 #define AD7291_T_ALERT_STATUS          0x20
 
+#define AD7291_VOLTAGE_LIMIT_COUNT     8
+
+
 /*
  * AD7291 command
  */
-#define AD7291_AUTOCYCLE               0x1
-#define AD7291_RESET                   0x2
-#define AD7291_ALART_CLEAR             0x4
-#define AD7291_ALART_POLARITY          0x8
-#define AD7291_EXT_REF                 0x10
-#define AD7291_NOISE_DELAY             0x20
-#define AD7291_T_SENSE_MASK            0x40
-#define AD7291_VOLTAGE_MASK            0xff00
+#define AD7291_AUTOCYCLE               (1 << 0)
+#define AD7291_RESET                   (1 << 1)
+#define AD7291_ALERT_CLEAR             (1 << 2)
+#define AD7291_ALERT_POLARITY          (1 << 3)
+#define AD7291_EXT_REF                 (1 << 4)
+#define AD7291_NOISE_DELAY             (1 << 5)
+#define AD7291_T_SENSE_MASK            (1 << 7)
+#define AD7291_VOLTAGE_MASK            0xFF00
 #define AD7291_VOLTAGE_OFFSET          0x8
 
 /*
  * AD7291 value masks
  */
-#define AD7291_CHANNEL_MASK            0xf000
-#define AD7291_VALUE_MASK              0xfff
+#define AD7291_CHANNEL_MASK            0xF000
+#define AD7291_BITS                    12
+#define AD7291_VALUE_MASK              0xFFF
 #define AD7291_T_VALUE_SIGN            0x400
 #define AD7291_T_VALUE_FLOAT_OFFSET    2
 #define AD7291_T_VALUE_FLOAT_MASK      0x2
 
-/*
- * struct ad7291_chip_info - chip specifc information
- */
+#define AD7291_BITS                    12
 
 struct ad7291_chip_info {
-       struct i2c_client *client;
-       u16 command;
-       u8  channels;   /* Active voltage channels */
+       struct i2c_client       *client;
+       struct regulator        *reg;
+       u16                     int_vref_mv;
+       u16                     command;
+       u8                      c_mask; /* Active voltage channels for events */
+       struct mutex            state_lock;
 };
 
-/*
- * struct ad7291_chip_info - chip specifc information
- */
-
-struct ad7291_limit_regs {
-       u16     data_high;
-       u16     data_low;
-       u16     hysteresis;
-};
-
-/*
- * ad7291 register access by I2C
- */
 static int ad7291_i2c_read(struct ad7291_chip_info *chip, u8 reg, u16 *data)
 {
        struct i2c_client *client = chip->client;
@@ -96,111 +123,9 @@ static int ad7291_i2c_read(struct ad7291_chip_info *chip, u8 reg, u16 *data)
 
 static int ad7291_i2c_write(struct ad7291_chip_info *chip, u8 reg, u16 data)
 {
-       struct i2c_client *client = chip->client;
-       int ret = 0;
-
-       ret = i2c_smbus_write_word_data(client, reg, swab16(data));
-       if (ret < 0)
-               dev_err(&client->dev, "I2C write error\n");
-
-       return ret;
-}
-
-/* Returns negative errno, or else the number of words read. */
-static int ad7291_i2c_read_data(struct ad7291_chip_info *chip, u8 reg, u16 *data)
-{
-       struct i2c_client *client = chip->client;
-       u8 commands[4];
-       int ret = 0;
-       int i, count;
-
-       if (reg == AD7291_T_SENSE || reg == AD7291_T_AVERAGE)
-               count = 2;
-       else if (reg == AD7291_VOLTAGE) {
-               if (!chip->channels) {
-                       dev_err(&client->dev, "No voltage channel is selected.\n");
-                       return -EINVAL;
-               }
-               count = 2 + chip->channels * 2;
-       } else {
-               dev_err(&client->dev, "I2C wrong data register\n");
-               return -EINVAL;
-       }
-
-       commands[0] = 0;
-       commands[1] = (chip->command >> 8) & 0xff;
-       commands[2] = chip->command & 0xff;
-       commands[3] = reg;
-
-       ret = i2c_master_send(client, commands, 4);
-       if (ret < 0) {
-               dev_err(&client->dev, "I2C master send error\n");
-               return ret;
-       }
-
-       ret = i2c_master_recv(client, (u8 *)data, count);
-       if (ret < 0) {
-               dev_err(&client->dev, "I2C master receive error\n");
-               return ret;
-       }
-       ret >>= 2;
-
-       for (i = 0; i < ret; i++)
-               data[i] = swab16(data[i]);
-
-       return ret;
-}
-
-static ssize_t ad7291_show_mode(struct device *dev,
-               struct device_attribute *attr,
-               char *buf)
-{
-       struct iio_dev *dev_info = dev_get_drvdata(dev);
-       struct ad7291_chip_info *chip = iio_priv(dev_info);
-
-       if (chip->command & AD7291_AUTOCYCLE)
-               return sprintf(buf, "autocycle\n");
-       else
-               return sprintf(buf, "command\n");
-}
-
-static ssize_t ad7291_store_mode(struct device *dev,
-               struct device_attribute *attr,
-               const char *buf,
-               size_t len)
-{
-       struct iio_dev *dev_info = dev_get_drvdata(dev);
-       struct ad7291_chip_info *chip = iio_priv(dev_info);
-       u16 command;
-       int ret;
-
-       command = chip->command & (~AD7291_AUTOCYCLE);
-       if (strcmp(buf, "autocycle"))
-               command |= AD7291_AUTOCYCLE;
-
-       ret = ad7291_i2c_write(chip, AD7291_COMMAND, command);
-       if (ret)
-               return -EIO;
-
-       chip->command = command;
-
-       return ret;
-}
-
-static IIO_DEVICE_ATTR(mode, S_IRUGO | S_IWUSR,
-               ad7291_show_mode,
-               ad7291_store_mode,
-               0);
-
-static ssize_t ad7291_show_available_modes(struct device *dev,
-               struct device_attribute *attr,
-               char *buf)
-{
-       return sprintf(buf, "command\nautocycle\n");
+       return i2c_smbus_write_word_data(chip->client, reg, swab16(data));
 }
 
-static IIO_DEVICE_ATTR(available_modes, S_IRUGO, ad7291_show_available_modes, NULL, 0);
-
 static ssize_t ad7291_store_reset(struct device *dev,
                struct device_attribute *attr,
                const char *buf,
@@ -208,240 +133,15 @@ static ssize_t ad7291_store_reset(struct device *dev,
 {
        struct iio_dev *dev_info = dev_get_drvdata(dev);
        struct ad7291_chip_info *chip = iio_priv(dev_info);
-       u16 command;
-       int ret;
-
-       command = chip->command | AD7291_RESET;
-
-       ret = ad7291_i2c_write(chip, AD7291_COMMAND, command);
-       if (ret)
-               return -EIO;
-
-       return ret;
-}
-
-static IIO_DEVICE_ATTR(reset, S_IWUSR,
-               NULL,
-               ad7291_store_reset,
-               0);
-
-static ssize_t ad7291_show_ext_ref(struct device *dev,
-               struct device_attribute *attr,
-               char *buf)
-{
-       struct iio_dev *dev_info = dev_get_drvdata(dev);
-       struct ad7291_chip_info *chip = iio_priv(dev_info);
-
-       return sprintf(buf, "%d\n", !!(chip->command & AD7291_EXT_REF));
-}
-
-static ssize_t ad7291_store_ext_ref(struct device *dev,
-               struct device_attribute *attr,
-               const char *buf,
-               size_t len)
-{
-       struct iio_dev *dev_info = dev_get_drvdata(dev);
-       struct ad7291_chip_info *chip = iio_priv(dev_info);
-       u16 command;
-       int ret;
-
-       command = chip->command & (~AD7291_EXT_REF);
-       if (strcmp(buf, "1"))
-               command |= AD7291_EXT_REF;
-
-       ret = ad7291_i2c_write(chip, AD7291_COMMAND, command);
-       if (ret)
-               return -EIO;
-
-       chip->command = command;
-
-       return ret;
-}
-
-static IIO_DEVICE_ATTR(ext_ref, S_IRUGO | S_IWUSR,
-               ad7291_show_ext_ref,
-               ad7291_store_ext_ref,
-               0);
-
-static ssize_t ad7291_show_noise_delay(struct device *dev,
-               struct device_attribute *attr,
-               char *buf)
-{
-       struct iio_dev *dev_info = dev_get_drvdata(dev);
-       struct ad7291_chip_info *chip = iio_priv(dev_info);
-
-       return sprintf(buf, "%d\n", !!(chip->command & AD7291_NOISE_DELAY));
-}
-
-static ssize_t ad7291_store_noise_delay(struct device *dev,
-               struct device_attribute *attr,
-               const char *buf,
-               size_t len)
-{
-       struct iio_dev *dev_info = dev_get_drvdata(dev);
-       struct ad7291_chip_info *chip = iio_priv(dev_info);
-       u16 command;
-       int ret;
-
-       command = chip->command & (~AD7291_NOISE_DELAY);
-       if (strcmp(buf, "1"))
-               command |= AD7291_NOISE_DELAY;
-
-       ret = ad7291_i2c_write(chip, AD7291_COMMAND, command);
-       if (ret)
-               return -EIO;
-
-       chip->command = command;
-
-       return ret;
-}
-
-static IIO_DEVICE_ATTR(noise_delay, S_IRUGO | S_IWUSR,
-               ad7291_show_noise_delay,
-               ad7291_store_noise_delay,
-               0);
-
-static ssize_t ad7291_show_t_sense(struct device *dev,
-               struct device_attribute *attr,
-               char *buf)
-{
-       struct iio_dev *dev_info = dev_get_drvdata(dev);
-       struct ad7291_chip_info *chip = iio_priv(dev_info);
-       u16 data;
-       char sign = ' ';
-       int ret;
-
-       ret = ad7291_i2c_read_data(chip, AD7291_T_SENSE, &data);
-       if (ret)
-               return -EIO;
-
-       if (data & AD7291_T_VALUE_SIGN) {
-               /* convert supplement to positive value */
-               data = (AD7291_T_VALUE_SIGN << 1) - data;
-               sign = '-';
-       }
-
-       return sprintf(buf, "%c%d.%.2d\n", sign,
-               (data >> AD7291_T_VALUE_FLOAT_OFFSET),
-               (data & AD7291_T_VALUE_FLOAT_MASK) * 25);
-}
-
-static IIO_DEVICE_ATTR(t_sense, S_IRUGO, ad7291_show_t_sense, NULL, 0);
-
-static ssize_t ad7291_show_t_average(struct device *dev,
-               struct device_attribute *attr,
-               char *buf)
-{
-       struct iio_dev *dev_info = dev_get_drvdata(dev);
-       struct ad7291_chip_info *chip = iio_priv(dev_info);
-       u16 data;
-       char sign = ' ';
-       int ret;
-
-       ret = ad7291_i2c_read_data(chip, AD7291_T_AVERAGE, &data);
-       if (ret)
-               return -EIO;
-
-       if (data & AD7291_T_VALUE_SIGN) {
-               /* convert supplement to positive value */
-               data = (AD7291_T_VALUE_SIGN << 1) - data;
-               sign = '-';
-       }
-
-       return sprintf(buf, "%c%d.%.2d\n", sign,
-               (data >> AD7291_T_VALUE_FLOAT_OFFSET),
-               (data & AD7291_T_VALUE_FLOAT_MASK) * 25);
-}
-
-static IIO_DEVICE_ATTR(t_average, S_IRUGO, ad7291_show_t_average, NULL, 0);
-
-static ssize_t ad7291_show_voltage(struct device *dev,
-               struct device_attribute *attr,
-               char *buf)
-{
-       struct iio_dev *dev_info = dev_get_drvdata(dev);
-       struct ad7291_chip_info *chip = iio_priv(dev_info);
-       u16 data[AD7291_VOLTAGE_LIMIT_COUNT];
-       int i, size, ret;
-
-       ret = ad7291_i2c_read_data(chip, AD7291_VOLTAGE, data);
-       if (ret)
-               return -EIO;
-
-       for (i = 0; i < AD7291_VOLTAGE_LIMIT_COUNT; i++) {
-               if (chip->command & (AD7291_T_SENSE_MASK << i)) {
-                       ret = sprintf(buf, "channel[%d]=%d\n", i,
-                                       data[i] & AD7291_VALUE_MASK);
-                       if (ret < 0)
-                               break;
-                       buf += ret;
-                       size += ret;
-               }
-       }
-
-       return size;
-}
-
-static IIO_DEVICE_ATTR(voltage, S_IRUGO, ad7291_show_voltage, NULL, 0);
-
-static ssize_t ad7291_show_channel_mask(struct device *dev,
-               struct device_attribute *attr,
-               char *buf)
-{
-       struct iio_dev *dev_info = dev_get_drvdata(dev);
-       struct ad7291_chip_info *chip = iio_priv(dev_info);
-
-       return sprintf(buf, "0x%x\n", (chip->command & AD7291_VOLTAGE_MASK) >>
-                       AD7291_VOLTAGE_OFFSET);
-}
-
-static ssize_t ad7291_store_channel_mask(struct device *dev,
-               struct device_attribute *attr,
-               const char *buf,
-               size_t len)
-{
-       struct iio_dev *dev_info = dev_get_drvdata(dev);
-       struct ad7291_chip_info *chip = iio_priv(dev_info);
-       u16 command;
-       unsigned long data;
-       int i, ret;
-
-       ret = strict_strtoul(buf, 16, &data);
-       if (ret || data > 0xff)
-               return -EINVAL;
-
-       command = chip->command & (~AD7291_VOLTAGE_MASK);
-       command |= data << AD7291_VOLTAGE_OFFSET;
 
-       ret = ad7291_i2c_write(chip, AD7291_COMMAND, command);
-       if (ret)
-               return -EIO;
-
-       chip->command = command;
-
-       for (i = 0, chip->channels = 0; i < AD7291_VOLTAGE_LIMIT_COUNT; i++) {
-               if (chip->command & (AD7291_T_SENSE_MASK << i))
-                       chip->channels++;
-       }
-
-       return ret;
+       return ad7291_i2c_write(chip, AD7291_COMMAND,
+                               chip->command | AD7291_RESET);
 }
 
-static IIO_DEVICE_ATTR(channel_mask, S_IRUGO | S_IWUSR,
-               ad7291_show_channel_mask,
-               ad7291_store_channel_mask,
-               0);
+static IIO_DEVICE_ATTR(reset, S_IWUSR, NULL, ad7291_store_reset, 0);
 
 static struct attribute *ad7291_attributes[] = {
-       &iio_dev_attr_available_modes.dev_attr.attr,
-       &iio_dev_attr_mode.dev_attr.attr,
        &iio_dev_attr_reset.dev_attr.attr,
-       &iio_dev_attr_ext_ref.dev_attr.attr,
-       &iio_dev_attr_noise_delay.dev_attr.attr,
-       &iio_dev_attr_t_sense.dev_attr.attr,
-       &iio_dev_attr_t_average.dev_attr.attr,
-       &iio_dev_attr_voltage.dev_attr.attr,
-       &iio_dev_attr_channel_mask.dev_attr.attr,
        NULL,
 };
 
@@ -449,10 +149,6 @@ static const struct attribute_group ad7291_attribute_group = {
        .attrs = ad7291_attributes,
 };
 
-/*
- * temperature bound events
- */
-
 static irqreturn_t ad7291_event_handler(int irq, void *private)
 {
        struct iio_dev *indio_dev = private;
@@ -471,35 +167,22 @@ static irqreturn_t ad7291_event_handler(int irq, void *private)
        if (!(t_status || v_status))
                return IRQ_HANDLED;
 
-       command = chip->command | AD7291_ALART_CLEAR;
+       command = chip->command | AD7291_ALERT_CLEAR;
        ad7291_i2c_write(chip, AD7291_COMMAND, command);
 
-       command = chip->command & ~AD7291_ALART_CLEAR;
+       command = chip->command & ~AD7291_ALERT_CLEAR;
        ad7291_i2c_write(chip, AD7291_COMMAND, command);
 
-       if (t_status & (1 << 0))
-               iio_push_event(indio_dev, 0,
-                              IIO_UNMOD_EVENT_CODE(IIO_TEMP,
-                                                   0,
-                                                   IIO_EV_TYPE_THRESH,
-                                                   IIO_EV_DIR_FALLING),
-                              timestamp);
-       if (t_status & (1 << 1))
-               iio_push_event(indio_dev, 0,
-                              IIO_UNMOD_EVENT_CODE(IIO_TEMP,
-                                                   0,
-                                                   IIO_EV_TYPE_THRESH,
-                                                   IIO_EV_DIR_RISING),
-                              timestamp);
-       if (t_status & (1 << 2))
-               iio_push_event(indio_dev, 0,
+       /* For now treat t_sense and t_sense_average the same */
+       if ((t_status & (1 << 0)) || (t_status & (1 << 2)))
+               iio_push_event(indio_dev,
                               IIO_UNMOD_EVENT_CODE(IIO_TEMP,
                                                    0,
                                                    IIO_EV_TYPE_THRESH,
                                                    IIO_EV_DIR_FALLING),
                               timestamp);
-       if (t_status & (1 << 3))
-               iio_push_event(indio_dev, 0,
+       if ((t_status & (1 << 1)) || (t_status & (1 << 3)))
+               iio_push_event(indio_dev,
                               IIO_UNMOD_EVENT_CODE(IIO_TEMP,
                                                    0,
                                                    IIO_EV_TYPE_THRESH,
@@ -508,14 +191,14 @@ static irqreturn_t ad7291_event_handler(int irq, void *private)
 
        for (i = 0; i < AD7291_VOLTAGE_LIMIT_COUNT*2; i += 2) {
                if (v_status & (1 << i))
-                       iio_push_event(indio_dev, 0,
+                       iio_push_event(indio_dev,
                                       IIO_UNMOD_EVENT_CODE(IIO_IN,
                                                            i/2,
                                                            IIO_EV_TYPE_THRESH,
                                                            IIO_EV_DIR_FALLING),
                                       timestamp);
                if (v_status & (1 << (i + 1)))
-                       iio_push_event(indio_dev, 0,
+                       iio_push_event(indio_dev,
                                       IIO_UNMOD_EVENT_CODE(IIO_IN,
                                                            i/2,
                                                            IIO_EV_TYPE_THRESH,
@@ -526,7 +209,7 @@ static irqreturn_t ad7291_event_handler(int irq, void *private)
        return IRQ_HANDLED;
 }
 
-static inline ssize_t ad7291_show_t_bound(struct device *dev,
+static inline ssize_t ad7291_show_hyst(struct device *dev,
                struct device_attribute *attr,
                char *buf)
 {
@@ -534,243 +217,332 @@ static inline ssize_t ad7291_show_t_bound(struct device *dev,
        struct ad7291_chip_info *chip = iio_priv(dev_info);
        struct iio_dev_attr *this_attr = to_iio_dev_attr(attr);
        u16 data;
-       char sign = ' ';
        int ret;
 
        ret = ad7291_i2c_read(chip, this_attr->address, &data);
-       if (ret)
-               return -EIO;
-
-       data &= AD7291_VALUE_MASK;
-       if (data & AD7291_T_VALUE_SIGN) {
-               /* convert supplement to positive value */
-               data = (AD7291_T_VALUE_SIGN << 1) - data;
-               sign = '-';
-       }
+       if (ret < 0)
+               return ret;
 
-       return sprintf(buf, "%c%d.%.2d\n", sign,
-                       data >> AD7291_T_VALUE_FLOAT_OFFSET,
-                       (data & AD7291_T_VALUE_FLOAT_MASK) * 25);
+       return sprintf(buf, "%d\n", data & AD7291_VALUE_MASK);
 }
 
-static inline ssize_t ad7291_set_t_bound(struct device *dev,
-               struct device_attribute *attr,
-               const char *buf,
-               size_t len)
+static inline ssize_t ad7291_set_hyst(struct device *dev,
+                                     struct device_attribute *attr,
+                                     const char *buf,
+                                     size_t len)
 {
        struct iio_dev *dev_info = dev_get_drvdata(dev);
        struct ad7291_chip_info *chip = iio_priv(dev_info);
        struct iio_dev_attr *this_attr = to_iio_dev_attr(attr);
-       long tmp1, tmp2;
        u16 data;
-       char *pos;
        int ret;
 
-       pos = strchr(buf, '.');
-
-       ret = strict_strtol(buf, 10, &tmp1);
+       ret = kstrtou16(buf, 10, &data);
 
-       if (ret || tmp1 > 127 || tmp1 < -128)
+       if (ret < 0)
+               return ret;
+       if (data < 4096)
                return -EINVAL;
 
-       if (pos) {
-               len = strlen(pos);
-               if (len > AD7291_T_VALUE_FLOAT_OFFSET)
-                       len = AD7291_T_VALUE_FLOAT_OFFSET;
-               pos[len] = 0;
-               ret = strict_strtol(pos, 10, &tmp2);
+       return ad7291_i2c_write(chip, this_attr->address, data);
+}
 
-               if (!ret)
-                       tmp2 = (tmp2 / 25) * 25;
-       }
+static IIO_DEVICE_ATTR(in_temp0_thresh_both_hyst_raw,
+                      S_IRUGO | S_IWUSR,
+                      ad7291_show_hyst, ad7291_set_hyst,
+                      AD7291_T_SENSE_HYST);
+static IIO_DEVICE_ATTR(in_voltage0_thresh_both_hyst_raw,
+                      S_IRUGO | S_IWUSR,
+                      ad7291_show_hyst, ad7291_set_hyst, AD7291_CH0_HYST);
+static IIO_DEVICE_ATTR(in_voltage1_thresh_both_hyst_raw,
+                      S_IRUGO | S_IWUSR,
+                      ad7291_show_hyst, ad7291_set_hyst, AD7291_CH1_HYST);
+static IIO_DEVICE_ATTR(in_voltage2_thresh_both_hyst_raw,
+                      S_IRUGO | S_IWUSR,
+                      ad7291_show_hyst, ad7291_set_hyst, AD7291_CH2_HYST);
+static IIO_DEVICE_ATTR(in_voltage3_thresh_both_hyst_raw,
+                      S_IRUGO | S_IWUSR,
+                      ad7291_show_hyst, ad7291_set_hyst, AD7291_CH3_HYST);
+static IIO_DEVICE_ATTR(in_voltage4_thresh_both_hyst_raw,
+                      S_IRUGO | S_IWUSR,
+                      ad7291_show_hyst, ad7291_set_hyst, AD7291_CH4_HYST);
+static IIO_DEVICE_ATTR(in_voltage5_thresh_both_hyst_raw,
+                      S_IRUGO | S_IWUSR,
+                      ad7291_show_hyst, ad7291_set_hyst, AD7291_CH5_HYST);
+static IIO_DEVICE_ATTR(in_voltage6_thresh_both_hyst_raw,
+                      S_IRUGO | S_IWUSR,
+                      ad7291_show_hyst, ad7291_set_hyst, AD7291_CH6_HYST);
+static IIO_DEVICE_ATTR(in_voltage7_thresh_both_hyst_raw,
+                      S_IRUGO | S_IWUSR,
+                      ad7291_show_hyst, ad7291_set_hyst, AD7291_CH7_HYST);
 
-       if (tmp1 < 0)
-               data = (u16)(-tmp1);
-       else
-               data = (u16)tmp1;
-       data = (data << AD7291_T_VALUE_FLOAT_OFFSET) |
-               (tmp2 & AD7291_T_VALUE_FLOAT_MASK);
-       if (tmp1 < 0)
-               /* convert positive value to supplyment */
-               data = (AD7291_T_VALUE_SIGN << 1) - data;
-
-       ret = ad7291_i2c_write(chip, this_attr->address, data);
-       if (ret)
-               return -EIO;
+static struct attribute *ad7291_event_attributes[] = {
+       &iio_dev_attr_in_temp0_thresh_both_hyst_raw.dev_attr.attr,
+       &iio_dev_attr_in_voltage0_thresh_both_hyst_raw.dev_attr.attr,
+       &iio_dev_attr_in_voltage1_thresh_both_hyst_raw.dev_attr.attr,
+       &iio_dev_attr_in_voltage2_thresh_both_hyst_raw.dev_attr.attr,
+       &iio_dev_attr_in_voltage3_thresh_both_hyst_raw.dev_attr.attr,
+       &iio_dev_attr_in_voltage4_thresh_both_hyst_raw.dev_attr.attr,
+       &iio_dev_attr_in_voltage5_thresh_both_hyst_raw.dev_attr.attr,
+       &iio_dev_attr_in_voltage6_thresh_both_hyst_raw.dev_attr.attr,
+       &iio_dev_attr_in_voltage7_thresh_both_hyst_raw.dev_attr.attr,
+       NULL,
+};
 
-       return ret;
-}
+/* high / low */
+static u8 ad7291_limit_regs[9][2] = {
+       { AD7291_CH0_DATA_HIGH, AD7291_CH0_DATA_LOW },
+       { AD7291_CH1_DATA_HIGH, AD7291_CH1_DATA_LOW },
+       { AD7291_CH2_DATA_HIGH, AD7291_CH2_DATA_LOW },
+       { AD7291_CH3_DATA_HIGH, AD7291_CH3_DATA_LOW }, /* FIXME: ? */
+       { AD7291_CH4_DATA_HIGH, AD7291_CH4_DATA_LOW },
+       { AD7291_CH5_DATA_HIGH, AD7291_CH5_DATA_LOW },
+       { AD7291_CH6_DATA_HIGH, AD7291_CH6_DATA_LOW },
+       { AD7291_CH7_DATA_HIGH, AD7291_CH7_DATA_LOW },
+       /* temp */
+       { AD7291_T_SENSE_HIGH, AD7291_T_SENSE_LOW },
+};
 
-static inline ssize_t ad7291_show_v_bound(struct device *dev,
-               struct device_attribute *attr,
-               u8 bound_reg,
-               char *buf)
+static int ad7291_read_event_value(struct iio_dev *indio_dev,
+                                  u64 event_code,
+                                  int *val)
 {
-       struct iio_dev *dev_info = dev_get_drvdata(dev);
-       struct ad7291_chip_info *chip = iio_priv(dev_info);
-       u16 data;
-       int ret;
+       struct ad7291_chip_info *chip = iio_priv(indio_dev);
 
-       if (bound_reg < AD7291_VOLTAGE_LIMIT_BASE ||
-               bound_reg >= AD7291_VOLTAGE_LIMIT_BASE +
-               AD7291_VOLTAGE_LIMIT_COUNT)
+       int ret;
+       u8 reg;
+       u16 uval;
+       s16 signval;
+
+       switch (IIO_EVENT_CODE_EXTRACT_TYPE(event_code)) {
+       case IIO_VOLTAGE:
+               reg = ad7291_limit_regs[IIO_EVENT_CODE_EXTRACT_NUM(event_code)]
+                       [!(IIO_EVENT_CODE_EXTRACT_DIR(event_code) ==
+                          IIO_EV_DIR_RISING)];
+
+               ret = ad7291_i2c_read(chip, reg, &uval);
+               if (ret < 0)
+                       return ret;
+               *val = uval & AD7291_VALUE_MASK;
+               return 0;
+
+       case IIO_TEMP:
+               reg = ad7291_limit_regs[8]
+                       [!(IIO_EVENT_CODE_EXTRACT_DIR(event_code) ==
+                          IIO_EV_DIR_RISING)];
+
+               ret = ad7291_i2c_read(chip, reg, &signval);
+               if (ret < 0)
+                       return ret;
+               signval = (s16)((signval & AD7291_VALUE_MASK) << 4) >> 4;
+               *val = signval;
+               return 0;
+       default:
                return -EINVAL;
-
-       ret = ad7291_i2c_read(chip, bound_reg, &data);
-       if (ret)
-               return -EIO;
-
-       data &= AD7291_VALUE_MASK;
-
-       return sprintf(buf, "%d\n", data);
+       };
 }
 
-static inline ssize_t ad7291_set_v_bound(struct device *dev,
-               struct device_attribute *attr,
-               u8 bound_reg,
-               const char *buf,
-               size_t len)
+static int ad7291_write_event_value(struct iio_dev *indio_dev,
+                                   u64 event_code,
+                                   int val)
 {
-       struct iio_dev *dev_info = dev_get_drvdata(dev);
-       struct ad7291_chip_info *chip = iio_priv(dev_info);
-       unsigned long value;
-       u16 data;
-       int ret;
+       struct ad7291_chip_info *chip = iio_priv(indio_dev);
+       u8 reg;
+       s16 signval;
 
-       if (bound_reg < AD7291_VOLTAGE_LIMIT_BASE ||
-               bound_reg >= AD7291_VOLTAGE_LIMIT_BASE +
-               AD7291_VOLTAGE_LIMIT_COUNT)
+       switch (IIO_EVENT_CODE_EXTRACT_TYPE(event_code)) {
+       case IIO_VOLTAGE:
+               if (val > 0xFFF || val < 0)
+                       return -EINVAL;
+               reg = ad7291_limit_regs[IIO_EVENT_CODE_EXTRACT_NUM(event_code)]
+                       [!(IIO_EVENT_CODE_EXTRACT_DIR(event_code) ==
+                          IIO_EV_DIR_RISING)];
+               return ad7291_i2c_write(chip, reg, val);
+       case IIO_TEMP:
+               if (val > 2047 || val < -2048)
+                       return -EINVAL;
+               reg = ad7291_limit_regs[8]
+                       [!(IIO_EVENT_CODE_EXTRACT_DIR(event_code) ==
+                          IIO_EV_DIR_RISING)];
+               signval = val;
+               return ad7291_i2c_write(chip, reg, *(u16 *)&signval);
+       default:
                return -EINVAL;
+       };
+}
 
-       ret = strict_strtoul(buf, 10, &value);
-
-       if (ret || value >= 4096)
+static int ad7291_read_event_config(struct iio_dev *indio_dev,
+                                   u64 event_code)
+{
+       struct ad7291_chip_info *chip = iio_priv(indio_dev);
+       /* To be enabled the channel must simply be on. If any are enabled
+          we are in continuous sampling mode */
+
+       switch (IIO_EVENT_CODE_EXTRACT_TYPE(event_code)) {
+       case IIO_VOLTAGE:
+               if (chip->c_mask &
+                   (1 << IIO_EVENT_CODE_EXTRACT_NUM(event_code)))
+                       return 1;
+               else
+                       return 0;
+       case IIO_TEMP:
+               /* always on */
+               return 1;
+       default:
                return -EINVAL;
+       }
 
-       data = (u16)value;
-       ret = ad7291_i2c_write(chip, bound_reg, data);
-       if (ret)
-               return -EIO;
+}
 
+static int ad7291_write_event_config(struct iio_dev *indio_dev,
+                                    u64 event_code,
+                                    int state)
+{
+       int ret = 0;
+       struct ad7291_chip_info *chip = iio_priv(indio_dev);
+       u16 regval;
+
+       mutex_lock(&chip->state_lock);
+       regval = chip->command;
+       /*
+        * To be enabled the channel must simply be on. If any are enabled
+        * use continuous sampling mode.
+        * Possible to disable temp as well but that makes single read tricky.
+        */
+
+       switch (IIO_EVENT_CODE_EXTRACT_TYPE(event_code)) {
+       case IIO_VOLTAGE:
+               if ((!state) && (chip->c_mask &
+                              (1 << IIO_EVENT_CODE_EXTRACT_NUM(event_code))))
+                       chip->c_mask &=
+                               ~(1 << IIO_EVENT_CODE_EXTRACT_NUM(event_code));
+               else if (state && (!(chip->c_mask &
+                               (1 << IIO_EVENT_CODE_EXTRACT_NUM(event_code)))))
+                       chip->c_mask &=
+                               (1 << IIO_EVENT_CODE_EXTRACT_NUM(event_code));
+               else
+                       break;
+
+               regval &= ~AD7291_AUTOCYCLE;
+               regval |= ((u16)chip->c_mask << 8);
+               if (chip->c_mask) /* Enable autocycle? */
+                       regval |= AD7291_AUTOCYCLE;
+
+               ret = ad7291_i2c_write(chip, AD7291_COMMAND, regval);
+               if (ret < 0)
+                       goto error_ret;
+
+               chip->command = regval;
+               break;
+       default:
+               ret = -EINVAL;
+       }
+
+error_ret:
+       mutex_unlock(&chip->state_lock);
        return ret;
 }
 
-static IIO_DEVICE_ATTR(t_sense_high_value,
-                      S_IRUGO | S_IWUSR,
-                      ad7291_show_t_bound, ad7291_set_t_bound,
-                      AD7291_T_SENSE_HIGH);
-static IIO_DEVICE_ATTR(t_sense_low_value,
-                      S_IRUGO | S_IWUSR,
-                      ad7291_show_t_bound, ad7291_set_t_bound,
-                      AD7291_T_SENSE_LOW);
-static IIO_DEVICE_ATTR(t_sense_hyst_value,
-                      S_IRUGO | S_IWUSR,
-                      ad7291_show_t_bound, ad7291_set_t_bound,
-                      AD7291_T_SENSE_HYST);
-static IIO_DEVICE_ATTR(v0_high,
-                      S_IRUGO | S_IWUSR,
-                      ad7291_show_t_bound, ad7291_set_t_bound, 0x04);
-static IIO_DEVICE_ATTR(v0_low,
-                      S_IRUGO | S_IWUSR,
-                      ad7291_show_t_bound, ad7291_set_t_bound, 0x05);
-static IIO_DEVICE_ATTR(v0_hyst,
-                      S_IRUGO | S_IWUSR,
-                      ad7291_show_t_bound, ad7291_set_t_bound, 0x06);
-static IIO_DEVICE_ATTR(v1_high,
-                      S_IRUGO | S_IWUSR,
-                      ad7291_show_t_bound, ad7291_set_t_bound, 0x07);
-static IIO_DEVICE_ATTR(v1_low,
-                      S_IRUGO | S_IWUSR,
-                      ad7291_show_t_bound, ad7291_set_t_bound, 0x08);
-static IIO_DEVICE_ATTR(v1_hyst,
-                      S_IRUGO | S_IWUSR,
-                      ad7291_show_t_bound, ad7291_set_t_bound, 0x09);
-static IIO_DEVICE_ATTR(v2_high,
-                      S_IRUGO | S_IWUSR,
-                      ad7291_show_t_bound, ad7291_set_t_bound, 0x0A);
-static IIO_DEVICE_ATTR(v2_low,
-                      S_IRUGO | S_IWUSR,
-                      ad7291_show_t_bound, ad7291_set_t_bound, 0x0B);
-static IIO_DEVICE_ATTR(v2_hyst,
-                      S_IRUGO | S_IWUSR,
-                      ad7291_show_t_bound, ad7291_set_t_bound, 0x0C);
-static IIO_DEVICE_ATTR(v3_high,
-                      S_IRUGO | S_IWUSR,
-                      /* Datasheet suggests this one and this one only
-                         has the registers in different order */
-                      ad7291_show_t_bound, ad7291_set_t_bound, 0x0E);
-static IIO_DEVICE_ATTR(v3_low,
-                      S_IRUGO | S_IWUSR,
-                      ad7291_show_t_bound, ad7291_set_t_bound, 0x0D);
-static IIO_DEVICE_ATTR(v3_hyst,
-                      S_IRUGO | S_IWUSR,
-                      ad7291_show_t_bound, ad7291_set_t_bound, 0x0F);
-static IIO_DEVICE_ATTR(v4_high,
-                      S_IRUGO | S_IWUSR,
-                      ad7291_show_t_bound, ad7291_set_t_bound, 0x10);
-static IIO_DEVICE_ATTR(v4_low,
-                      S_IRUGO | S_IWUSR,
-                      ad7291_show_t_bound, ad7291_set_t_bound, 0x11);
-static IIO_DEVICE_ATTR(v4_hyst,
-                      S_IRUGO | S_IWUSR,
-                      ad7291_show_t_bound, ad7291_set_t_bound, 0x12);
-static IIO_DEVICE_ATTR(v5_high,
-                      S_IRUGO | S_IWUSR,
-                      ad7291_show_t_bound, ad7291_set_t_bound, 0x13);
-static IIO_DEVICE_ATTR(v5_low,
-                      S_IRUGO | S_IWUSR,
-                      ad7291_show_t_bound, ad7291_set_t_bound, 0x14);
-static IIO_DEVICE_ATTR(v5_hyst,
-                      S_IRUGO | S_IWUSR,
-                      ad7291_show_t_bound, ad7291_set_t_bound, 0x15);
-static IIO_DEVICE_ATTR(v6_high,
-                      S_IRUGO | S_IWUSR,
-                      ad7291_show_t_bound, ad7291_set_t_bound, 0x16);
-static IIO_DEVICE_ATTR(v6_low,
-                      S_IRUGO | S_IWUSR,
-                      ad7291_show_t_bound, ad7291_set_t_bound, 0x17);
-static IIO_DEVICE_ATTR(v6_hyst,
-                      S_IRUGO | S_IWUSR,
-                      ad7291_show_t_bound, ad7291_set_t_bound, 0x18);
-static IIO_DEVICE_ATTR(v7_high,
-                      S_IRUGO | S_IWUSR,
-                      ad7291_show_t_bound, ad7291_set_t_bound, 0x19);
-static IIO_DEVICE_ATTR(v7_low,
-                      S_IRUGO | S_IWUSR,
-                      ad7291_show_t_bound, ad7291_set_t_bound, 0x1A);
-static IIO_DEVICE_ATTR(v7_hyst,
-                      S_IRUGO | S_IWUSR,
-                      ad7291_show_t_bound, ad7291_set_t_bound, 0x1B);
+static int ad7291_read_raw(struct iio_dev *indio_dev,
+                          struct iio_chan_spec const *chan,
+                          int *val,
+                          int *val2,
+                          long mask)
+{
+       int ret;
+       struct ad7291_chip_info *chip = iio_priv(indio_dev);
+       unsigned int scale_uv;
+       u16 regval;
+       s16 signval;
+
+       switch (mask) {
+       case 0:
+               switch (chan->type) {
+               case IIO_VOLTAGE:
+                       mutex_lock(&chip->state_lock);
+                       /* If in autocycle mode drop through */
+                       if (chip->command & 0x1) {
+                               mutex_unlock(&chip->state_lock);
+                               return -EBUSY;
+                       }
+                       /* Enable this channel alone */
+                       regval = chip->command & (~AD7291_VOLTAGE_MASK);
+                       regval |= 1 << (15 - chan->channel);
+                       ret = ad7291_i2c_write(chip, AD7291_COMMAND, regval);
+                       if (ret < 0) {
+                               mutex_unlock(&chip->state_lock);
+                               return ret;
+                       }
+                       /* Read voltage */
+                       ret = i2c_smbus_read_word_data(chip->client,
+                                                      AD7291_VOLTAGE);
+                       if (ret < 0) {
+                               mutex_unlock(&chip->state_lock);
+                               return ret;
+                       }
+                       *val = swab16((u16)ret) & AD7291_VALUE_MASK;
+                       mutex_unlock(&chip->state_lock);
+                       return IIO_VAL_INT;
+               case IIO_TEMP:
+                       /* Assumes tsense bit of command register always set */
+                       ret = i2c_smbus_read_word_data(chip->client,
+                                                      AD7291_T_SENSE);
+                       if (ret < 0)
+                               return ret;
+                       signval = (s16)((swab16((u16)ret) &
+                               AD7291_VALUE_MASK) << 4) >> 4;
+                       *val = signval;
+                       return IIO_VAL_INT;
+               default:
+                       return -EINVAL;
+               }
+       case (1 << IIO_CHAN_INFO_AVERAGE_RAW_SEPARATE):
+               ret = i2c_smbus_read_word_data(chip->client,
+                                              AD7291_T_AVERAGE);
+                       if (ret < 0)
+                               return ret;
+                       signval = (s16)((swab16((u16)ret) &
+                               AD7291_VALUE_MASK) << 4) >> 4;
+                       *val = signval;
+                       return IIO_VAL_INT;
+       case (1 << IIO_CHAN_INFO_SCALE_SHARED):
+               scale_uv = (chip->int_vref_mv * 1000) >> AD7291_BITS;
+               *val =  scale_uv / 1000;
+               *val2 = (scale_uv % 1000) * 1000;
+               return IIO_VAL_INT_PLUS_MICRO;
+       default:
+               return -EINVAL;
+       }
+}
 
-static struct attribute *ad7291_event_attributes[] = {
-       &iio_dev_attr_t_sense_high_value.dev_attr.attr,
-       &iio_dev_attr_t_sense_low_value.dev_attr.attr,
-       &iio_dev_attr_t_sense_hyst_value.dev_attr.attr,
-       &iio_dev_attr_v0_high.dev_attr.attr,
-       &iio_dev_attr_v0_low.dev_attr.attr,
-       &iio_dev_attr_v0_hyst.dev_attr.attr,
-       &iio_dev_attr_v1_high.dev_attr.attr,
-       &iio_dev_attr_v1_low.dev_attr.attr,
-       &iio_dev_attr_v1_hyst.dev_attr.attr,
-       &iio_dev_attr_v2_high.dev_attr.attr,
-       &iio_dev_attr_v2_low.dev_attr.attr,
-       &iio_dev_attr_v2_hyst.dev_attr.attr,
-       &iio_dev_attr_v3_high.dev_attr.attr,
-       &iio_dev_attr_v3_low.dev_attr.attr,
-       &iio_dev_attr_v3_hyst.dev_attr.attr,
-       &iio_dev_attr_v4_high.dev_attr.attr,
-       &iio_dev_attr_v4_low.dev_attr.attr,
-       &iio_dev_attr_v4_hyst.dev_attr.attr,
-       &iio_dev_attr_v5_high.dev_attr.attr,
-       &iio_dev_attr_v5_low.dev_attr.attr,
-       &iio_dev_attr_v5_hyst.dev_attr.attr,
-       &iio_dev_attr_v6_high.dev_attr.attr,
-       &iio_dev_attr_v6_low.dev_attr.attr,
-       &iio_dev_attr_v6_hyst.dev_attr.attr,
-       &iio_dev_attr_v7_high.dev_attr.attr,
-       &iio_dev_attr_v7_low.dev_attr.attr,
-       &iio_dev_attr_v7_hyst.dev_attr.attr,
-       NULL,
+#define AD7291_VOLTAGE_CHAN(_chan)                                     \
+{                                                                      \
+       .type = IIO_VOLTAGE,                                            \
+       .info_mask = (1 << IIO_CHAN_INFO_SCALE_SHARED),                 \
+       .indexed = 1,                                                   \
+       .channel = _chan,                                               \
+       .event_mask = IIO_EV_BIT(IIO_EV_TYPE_THRESH, IIO_EV_DIR_RISING)|\
+       IIO_EV_BIT(IIO_EV_TYPE_THRESH, IIO_EV_DIR_FALLING)              \
+}
+
+static const struct iio_chan_spec ad7291_channels[] = {
+       AD7291_VOLTAGE_CHAN(0),
+       AD7291_VOLTAGE_CHAN(1),
+       AD7291_VOLTAGE_CHAN(2),
+       AD7291_VOLTAGE_CHAN(3),
+       AD7291_VOLTAGE_CHAN(4),
+       AD7291_VOLTAGE_CHAN(5),
+       AD7291_VOLTAGE_CHAN(6),
+       AD7291_VOLTAGE_CHAN(7),
+       {
+               .type = IIO_TEMP,
+               .info_mask = (1 << IIO_CHAN_INFO_AVERAGE_RAW_SEPARATE),
+               .indexed = 1,
+               .channel = 0,
+               .event_mask =
+               IIO_EV_BIT(IIO_EV_TYPE_THRESH, IIO_EV_DIR_RISING)|
+               IIO_EV_BIT(IIO_EV_TYPE_THRESH, IIO_EV_DIR_FALLING)
+       }
 };
 
 static struct attribute_group ad7291_event_attribute_group = {
@@ -779,20 +551,20 @@ static struct attribute_group ad7291_event_attribute_group = {
 
 static const struct iio_info ad7291_info = {
        .attrs = &ad7291_attribute_group,
-       .num_interrupt_lines = 1,
+       .read_raw = &ad7291_read_raw,
+       .read_event_config = &ad7291_read_event_config,
+       .write_event_config = &ad7291_write_event_config,
+       .read_event_value = &ad7291_read_event_value,
+       .write_event_value = &ad7291_write_event_value,
        .event_attrs = &ad7291_event_attribute_group,
 };
 
-/*
- * device probe and remove
- */
-
 static int __devinit ad7291_probe(struct i2c_client *client,
                const struct i2c_device_id *id)
 {
        struct ad7291_chip_info *chip;
        struct iio_dev *indio_dev;
-       int ret = 0;
+       int ret = 0, voltage_uv = 0;
 
        indio_dev = iio_allocate_device(sizeof(*chip));
        if (indio_dev == NULL) {
@@ -800,21 +572,38 @@ static int __devinit ad7291_probe(struct i2c_client *client,
                goto error_ret;
        }
        chip = iio_priv(indio_dev);
+
+       chip->reg = regulator_get(&client->dev, "vcc");
+       if (!IS_ERR(chip->reg)) {
+               ret = regulator_enable(chip->reg);
+               if (ret)
+                       goto error_put_reg;
+               voltage_uv = regulator_get_voltage(chip->reg);
+       }
+
+       mutex_init(&chip->state_lock);
        /* this is only used for device removal purposes */
        i2c_set_clientdata(client, indio_dev);
 
        chip->client = client;
+       /* Tsense always enabled */
        chip->command = AD7291_NOISE_DELAY | AD7291_T_SENSE_MASK;
 
+       if (voltage_uv) {
+               chip->int_vref_mv = voltage_uv / 1000;
+               chip->command |= AD7291_EXT_REF;
+       } else {
+               chip->int_vref_mv = 2500; /* Build-in ref */
+       }
+
        indio_dev->name = id->name;
+       indio_dev->channels = ad7291_channels;
+       indio_dev->num_channels = ARRAY_SIZE(ad7291_channels);
+
        indio_dev->dev.parent = &client->dev;
        indio_dev->info = &ad7291_info;
        indio_dev->modes = INDIO_DIRECT_MODE;
 
-       ret = iio_device_register(indio_dev);
-       if (ret)
-               goto error_free_dev;
-
        if (client->irq > 0) {
                ret = request_threaded_irq(client->irq,
                                           NULL,
@@ -823,10 +612,10 @@ static int __devinit ad7291_probe(struct i2c_client *client,
                                           id->name,
                                           indio_dev);
                if (ret)
-                       goto error_unreg_dev;
+                       goto error_disable_reg;
 
                /* set irq polarity low level */
-               chip->command |= AD7291_ALART_POLARITY;
+               chip->command |= AD7291_ALERT_POLARITY;
        }
 
        ret = ad7291_i2c_write(chip, AD7291_COMMAND, chip->command);
@@ -835,16 +624,25 @@ static int __devinit ad7291_probe(struct i2c_client *client,
                goto error_unreg_irq;
        }
 
-       dev_info(&client->dev, "%s temperature sensor registered.\n",
+       ret = iio_device_register(indio_dev);
+       if (ret)
+               goto error_unreg_irq;
+
+       dev_info(&client->dev, "%s ADC registered.\n",
                         id->name);
 
        return 0;
 
 error_unreg_irq:
-       free_irq(client->irq, indio_dev);
-error_unreg_dev:
-       iio_device_unregister(indio_dev);
-error_free_dev:
+       if (client->irq)
+               free_irq(client->irq, indio_dev);
+error_disable_reg:
+       if (!IS_ERR(chip->reg))
+               regulator_disable(chip->reg);
+error_put_reg:
+       if (!IS_ERR(chip->reg))
+               regulator_put(chip->reg);
+
        iio_free_device(indio_dev);
 error_ret:
        return ret;
@@ -853,11 +651,17 @@ error_ret:
 static int __devexit ad7291_remove(struct i2c_client *client)
 {
        struct iio_dev *indio_dev = i2c_get_clientdata(client);
+       struct ad7291_chip_info *chip = iio_priv(indio_dev);
 
        if (client->irq)
                free_irq(client->irq, indio_dev);
+
+       if (!IS_ERR(chip->reg)) {
+               regulator_disable(chip->reg);
+               regulator_put(chip->reg);
+       }
+
        iio_device_unregister(indio_dev);
-       iio_free_device(indio_dev);
 
        return 0;
 }