staging:iio:adc Add IIO_CHAN_INFO_RAW entries to all drivers.

Precursor to making value read / write attribute optional.
No processed values for adc's.

Updated to include the spear adc driver (hence introducing a
dependency on the patch that adds that driver).

Signed-off-by: Jonathan Cameron <jic23@kernel.org>
Acked-by: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/iio/adc/ad7192.c b/drivers/staging/iio/adc/ad7192.c
index 9fd6d63d29997c8bb09ab9d9e8e30b23dacf0c2a..feb81f639447066bf7644a8505859264c99f07da 100644 (file)
--- a/drivers/staging/iio/adc/ad7192.c
+++ b/drivers/staging/iio/adc/ad7192.c
@@ -849,7 +849,7 @@ static int ad7192_read_raw(struct iio_dev *indio_dev,
        bool unipolar = !!(st->conf & AD7192_CONF_UNIPOLAR);
 
        switch (m) {
-       case 0:
+       case IIO_CHAN_INFO_RAW:
                mutex_lock(&indio_dev->mlock);
                if (iio_buffer_enabled(indio_dev))
                        ret = -EBUSY;
@@ -981,7 +981,8 @@ static const struct iio_info ad7195_info = {
          .extend_name = _name,                                         \
          .channel = _chan,                                             \
          .channel2 = _chan2,                                           \
-         .info_mask = IIO_CHAN_INFO_SCALE_SHARED_BIT,          \
+         .info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT |                 \
+         IIO_CHAN_INFO_SCALE_SHARED_BIT,                               \
          .address = _address,                                          \
          .scan_index = _si,                                            \
          .scan_type =  IIO_ST('s', 24, 32, 0)}
@@ -990,7 +991,8 @@ static const struct iio_info ad7195_info = {
        { .type = IIO_VOLTAGE,                                          \
          .indexed = 1,                                                 \
          .channel = _chan,                                             \
-         .info_mask = IIO_CHAN_INFO_SCALE_SHARED_BIT,          \
+         .info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT |                 \
+         IIO_CHAN_INFO_SCALE_SHARED_BIT,                               \
          .address = _address,                                          \
          .scan_index = _si,                                            \
          .scan_type =  IIO_ST('s', 24, 32, 0)}
@@ -999,7 +1001,8 @@ static const struct iio_info ad7195_info = {
        { .type = IIO_TEMP,                                             \
          .indexed = 1,                                                 \
          .channel = _chan,                                             \
-         .info_mask = IIO_CHAN_INFO_SCALE_SEPARATE_BIT,                \
+         .info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT |                 \
+         IIO_CHAN_INFO_SCALE_SEPARATE_BIT,                             \
          .address = _address,                                          \
          .scan_index = _si,                                            \
          .scan_type =  IIO_ST('s', 24, 32, 0)}

diff --git a/drivers/staging/iio/adc/ad7280a.c b/drivers/staging/iio/adc/ad7280a.c
index 7dbd6812c24061407044b45edd9bebdcaff536dc..f0c0c72a1b07b0a6ba4a9c6fa130062be4d6e079 100644 (file)
--- a/drivers/staging/iio/adc/ad7280a.c
+++ b/drivers/staging/iio/adc/ad7280a.c
@@ -508,6 +508,7 @@ static int ad7280_channel_init(struct ad7280_state *st)
                        }
                        st->channels[cnt].indexed = 1;
                        st->channels[cnt].info_mask =
+                               IIO_CHAN_INFO_RAW_SEPARATE_BIT |
                                IIO_CHAN_INFO_SCALE_SHARED_BIT;
                        st->channels[cnt].address =
                                AD7280A_DEVADDR(dev) << 8 | ch;
@@ -524,7 +525,9 @@ static int ad7280_channel_init(struct ad7280_state *st)
        st->channels[cnt].channel2 = dev * 6;
        st->channels[cnt].address = AD7280A_ALL_CELLS;
        st->channels[cnt].indexed = 1;
-       st->channels[cnt].info_mask = IIO_CHAN_INFO_SCALE_SHARED_BIT;
+       st->channels[cnt].info_mask =
+               IIO_CHAN_INFO_RAW_SEPARATE_BIT |
+               IIO_CHAN_INFO_SCALE_SHARED_BIT;
        st->channels[cnt].scan_index = cnt;
        st->channels[cnt].scan_type.sign = 'u';
        st->channels[cnt].scan_type.realbits = 32;
@@ -788,7 +791,7 @@ static int ad7280_read_raw(struct iio_dev *indio_dev,
        int ret;
 
        switch (m) {
-       case 0:
+       case IIO_CHAN_INFO_RAW:
                mutex_lock(&indio_dev->mlock);
                if (chan->address == AD7280A_ALL_CELLS)
                        ret = ad7280_read_all_channels(st, st->scan_cnt, NULL);

diff --git a/drivers/staging/iio/adc/ad7291.c b/drivers/staging/iio/adc/ad7291.c
index 81d6b6128cb009b83f09238a624b248989f44048..298249f3988723f578499226f95dc542c2c26f8c 100644 (file)
--- a/drivers/staging/iio/adc/ad7291.c
+++ b/drivers/staging/iio/adc/ad7291.c
@@ -461,7 +461,7 @@ static int ad7291_read_raw(struct iio_dev *indio_dev,
        s16 signval;
 
        switch (mask) {
-       case 0:
+       case IIO_CHAN_INFO_RAW:
                switch (chan->type) {
                case IIO_VOLTAGE:
                        mutex_lock(&chip->state_lock);
@@ -536,7 +536,8 @@ static int ad7291_read_raw(struct iio_dev *indio_dev,
 #define AD7291_VOLTAGE_CHAN(_chan)                                     \
 {                                                                      \
        .type = IIO_VOLTAGE,                                            \
-       .info_mask = IIO_CHAN_INFO_SCALE_SHARED_BIT,                    \
+       .info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT |                   \
+       IIO_CHAN_INFO_SCALE_SHARED_BIT,                                 \
        .indexed = 1,                                                   \
        .channel = _chan,                                               \
        .event_mask = IIO_EV_BIT(IIO_EV_TYPE_THRESH, IIO_EV_DIR_RISING)|\
@@ -554,7 +555,8 @@ static const struct iio_chan_spec ad7291_channels[] = {
        AD7291_VOLTAGE_CHAN(7),
        {
                .type = IIO_TEMP,
-               .info_mask = IIO_CHAN_INFO_AVERAGE_RAW_SEPARATE_BIT |
+               .info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT |
+                               IIO_CHAN_INFO_AVERAGE_RAW_SEPARATE_BIT |
                                IIO_CHAN_INFO_SCALE_SEPARATE_BIT,
                .indexed = 1,
                .channel = 0,

diff --git a/drivers/staging/iio/adc/ad7298_core.c b/drivers/staging/iio/adc/ad7298_core.c
index 0cdde186b91c23ecd1d5659ec62d829f001a5df8..5d54a795a389ddb1b4136742af4a44c3eb7a1c14 100644 (file)
--- a/drivers/staging/iio/adc/ad7298_core.c
+++ b/drivers/staging/iio/adc/ad7298_core.c
@@ -27,7 +27,8 @@
                .type = IIO_VOLTAGE,                                    \
                .indexed = 1,                                           \
                .channel = index,                                       \
-               .info_mask = IIO_CHAN_INFO_SCALE_SHARED_BIT,            \
+               .info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT |           \
+               IIO_CHAN_INFO_SCALE_SHARED_BIT,                         \
                .address = index,                                       \
                .scan_index = index,                                    \
                .scan_type = {                                          \
@@ -42,7 +43,8 @@ static struct iio_chan_spec ad7298_channels[] = {
                .type = IIO_TEMP,
                .indexed = 1,
                .channel = 0,
-               .info_mask = IIO_CHAN_INFO_SCALE_SEPARATE_BIT,
+               .info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT |
+               IIO_CHAN_INFO_SCALE_SEPARATE_BIT,
                .address = 9,
                .scan_index = AD7298_CH_TEMP,
                .scan_type = {
@@ -130,7 +132,7 @@ static int ad7298_read_raw(struct iio_dev *indio_dev,
        unsigned int scale_uv;
 
        switch (m) {
-       case 0:
+       case IIO_CHAN_INFO_RAW:
                mutex_lock(&indio_dev->mlock);
                if (indio_dev->currentmode == INDIO_BUFFER_TRIGGERED) {
                        ret = -EBUSY;

diff --git a/drivers/staging/iio/adc/ad7476_core.c b/drivers/staging/iio/adc/ad7476_core.c
index 694b5084136efb37e558c93285221d4a3a09b2b5..ce715225eff37be125731901019de5bf116de1a6 100644 (file)
--- a/drivers/staging/iio/adc/ad7476_core.c
+++ b/drivers/staging/iio/adc/ad7476_core.c
@@ -43,7 +43,7 @@ static int ad7476_read_raw(struct iio_dev *indio_dev,
        unsigned int scale_uv;
 
        switch (m) {
-       case 0:
+       case IIO_CHAN_INFO_RAW:
                mutex_lock(&indio_dev->mlock);
                if (iio_buffer_enabled(indio_dev))
                        ret = -EBUSY;
@@ -70,7 +70,8 @@ static int ad7476_read_raw(struct iio_dev *indio_dev,
        {                                                       \
        .type = IIO_VOLTAGE,                                    \
        .indexed = 1,                                           \
-       .info_mask = IIO_CHAN_INFO_SCALE_SHARED_BIT,            \
+       .info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT |           \
+       IIO_CHAN_INFO_SCALE_SHARED_BIT,                         \
        .scan_type = {                                          \
                .sign = 'u',                                    \
                .realbits = bits,                               \

diff --git a/drivers/staging/iio/adc/ad7606_core.c b/drivers/staging/iio/adc/ad7606_core.c
index 97e8d3d4471e77b6109d79d92c20acdfa009ee61..802cdaf538f218b47e5b14775801edf6e0de0e12 100644 (file)
--- a/drivers/staging/iio/adc/ad7606_core.c
+++ b/drivers/staging/iio/adc/ad7606_core.c
@@ -88,7 +88,7 @@ static int ad7606_read_raw(struct iio_dev *indio_dev,
        unsigned int scale_uv;
 
        switch (m) {
-       case 0:
+       case IIO_CHAN_INFO_RAW:
                mutex_lock(&indio_dev->mlock);
                if (iio_buffer_enabled(indio_dev))
                        ret = -EBUSY;
@@ -229,14 +229,15 @@ static const struct attribute_group ad7606_attribute_group_range = {
        .attrs = ad7606_attributes_range,
 };
 
-#define AD7606_CHANNEL(num)                            \
-       {                                               \
-               .type = IIO_VOLTAGE,                    \
-               .indexed = 1,                           \
-               .channel = num,                         \
-               .address = num,                         \
-               .scan_index = num,                      \
-               .scan_type = IIO_ST('s', 16, 16, 0),    \
+#define AD7606_CHANNEL(num)                                    \
+       {                                                       \
+               .type = IIO_VOLTAGE,                            \
+               .indexed = 1,                                   \
+               .channel = num,                                 \
+               .address = num,                                 \
+               .info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT,    \
+               .scan_index = num,                              \
+               .scan_type = IIO_ST('s', 16, 16, 0),            \
        }
 
 static struct iio_chan_spec ad7606_8_channels[] = {

diff --git a/drivers/staging/iio/adc/ad7780.c b/drivers/staging/iio/adc/ad7780.c
index 4f0a6c9fbf947a17b4fe6021ebb8f91b55671f40..eeedbdb05a95e243e8343dd8dd99c293fe14f054 100644 (file)
--- a/drivers/staging/iio/adc/ad7780.c
+++ b/drivers/staging/iio/adc/ad7780.c
@@ -94,7 +94,7 @@ static int ad7780_read_raw(struct iio_dev *indio_dev,
        unsigned long scale_uv;
 
        switch (m) {
-       case 0:
+       case IIO_CHAN_INFO_RAW:
                mutex_lock(&indio_dev->mlock);
                ret = ad7780_read(st, &smpl);
                mutex_unlock(&indio_dev->mlock);
@@ -130,7 +130,8 @@ static const struct ad7780_chip_info ad7780_chip_info_tbl[] = {
                        .type = IIO_VOLTAGE,
                        .indexed = 1,
                        .channel = 0,
-                       .info_mask = IIO_CHAN_INFO_SCALE_SHARED_BIT,
+                       .info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT |
+                       IIO_CHAN_INFO_SCALE_SHARED_BIT,
                        .scan_type = {
                                .sign = 's',
                                .realbits = 24,
@@ -144,7 +145,8 @@ static const struct ad7780_chip_info ad7780_chip_info_tbl[] = {
                        .type = IIO_VOLTAGE,
                        .indexed = 1,
                        .channel = 0,
-                       .info_mask = IIO_CHAN_INFO_SCALE_SHARED_BIT,
+                       .info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT |
+                       IIO_CHAN_INFO_SCALE_SHARED_BIT,
                        .scan_type = {
                                .sign = 's',
                                .realbits = 20,

diff --git a/drivers/staging/iio/adc/ad7793.c b/drivers/staging/iio/adc/ad7793.c
index 84ecde1ad042221832bbd9bc8bd46c5e0fbd0fd2..9d21e394012fd4b9e01fb72059124b866e8cc4de 100644 (file)
--- a/drivers/staging/iio/adc/ad7793.c
+++ b/drivers/staging/iio/adc/ad7793.c
@@ -630,7 +630,7 @@ static int ad7793_read_raw(struct iio_dev *indio_dev,
        bool unipolar = !!(st->conf & AD7793_CONF_UNIPOLAR);
 
        switch (m) {
-       case 0:
+       case IIO_CHAN_INFO_RAW:
                mutex_lock(&indio_dev->mlock);
                if (iio_buffer_enabled(indio_dev))
                        ret = -EBUSY;
@@ -760,7 +760,8 @@ static const struct ad7793_chip_info ad7793_chip_info_tbl[] = {
                        .channel = 0,
                        .channel2 = 0,
                        .address = AD7793_CH_AIN1P_AIN1M,
-                       .info_mask = IIO_CHAN_INFO_SCALE_SHARED_BIT,
+                       .info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT |
+                       IIO_CHAN_INFO_SCALE_SHARED_BIT,
                        .scan_index = 0,
                        .scan_type = IIO_ST('s', 24, 32, 0)
                },
@@ -771,7 +772,8 @@ static const struct ad7793_chip_info ad7793_chip_info_tbl[] = {
                        .channel = 1,
                        .channel2 = 1,
                        .address = AD7793_CH_AIN2P_AIN2M,
-                       .info_mask = IIO_CHAN_INFO_SCALE_SHARED_BIT,
+                       .info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT |
+                       IIO_CHAN_INFO_SCALE_SHARED_BIT,
                        .scan_index = 1,
                        .scan_type = IIO_ST('s', 24, 32, 0)
                },
@@ -782,7 +784,8 @@ static const struct ad7793_chip_info ad7793_chip_info_tbl[] = {
                        .channel = 2,
                        .channel2 = 2,
                        .address = AD7793_CH_AIN3P_AIN3M,
-                       .info_mask = IIO_CHAN_INFO_SCALE_SHARED_BIT,
+                       .info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT |
+                       IIO_CHAN_INFO_SCALE_SHARED_BIT,
                        .scan_index = 2,
                        .scan_type = IIO_ST('s', 24, 32, 0)
                },
@@ -794,7 +797,8 @@ static const struct ad7793_chip_info ad7793_chip_info_tbl[] = {
                        .channel = 2,
                        .channel2 = 2,
                        .address = AD7793_CH_AIN1M_AIN1M,
-                       .info_mask = IIO_CHAN_INFO_SCALE_SHARED_BIT,
+                       .info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT |
+                       IIO_CHAN_INFO_SCALE_SHARED_BIT,
                        .scan_index = 2,
                        .scan_type = IIO_ST('s', 24, 32, 0)
                },
@@ -803,7 +807,8 @@ static const struct ad7793_chip_info ad7793_chip_info_tbl[] = {
                        .indexed = 1,
                        .channel = 0,
                        .address = AD7793_CH_TEMP,
-                       .info_mask = IIO_CHAN_INFO_SCALE_SEPARATE_BIT,
+                       .info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT |
+                       IIO_CHAN_INFO_SCALE_SEPARATE_BIT,
                        .scan_index = 4,
                        .scan_type = IIO_ST('s', 24, 32, 0),
                },
@@ -813,7 +818,8 @@ static const struct ad7793_chip_info ad7793_chip_info_tbl[] = {
                        .indexed = 1,
                        .channel = 4,
                        .address = AD7793_CH_AVDD_MONITOR,
-                       .info_mask = IIO_CHAN_INFO_SCALE_SEPARATE_BIT,
+                       .info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT |
+                       IIO_CHAN_INFO_SCALE_SEPARATE_BIT,
                        .scan_index = 5,
                        .scan_type = IIO_ST('s', 24, 32, 0),
                },
@@ -827,7 +833,8 @@ static const struct ad7793_chip_info ad7793_chip_info_tbl[] = {
                        .channel = 0,
                        .channel2 = 0,
                        .address = AD7793_CH_AIN1P_AIN1M,
-                       .info_mask = IIO_CHAN_INFO_SCALE_SHARED_BIT,
+                       .info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT |
+                       IIO_CHAN_INFO_SCALE_SHARED_BIT,
                        .scan_index = 0,
                        .scan_type = IIO_ST('s', 16, 32, 0)
                },
@@ -838,7 +845,8 @@ static const struct ad7793_chip_info ad7793_chip_info_tbl[] = {
                        .channel = 1,
                        .channel2 = 1,
                        .address = AD7793_CH_AIN2P_AIN2M,
-                       .info_mask = IIO_CHAN_INFO_SCALE_SHARED_BIT,
+                       .info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT |
+                       IIO_CHAN_INFO_SCALE_SHARED_BIT,
                        .scan_index = 1,
                        .scan_type = IIO_ST('s', 16, 32, 0)
                },
@@ -849,7 +857,8 @@ static const struct ad7793_chip_info ad7793_chip_info_tbl[] = {
                        .channel = 2,
                        .channel2 = 2,
                        .address = AD7793_CH_AIN3P_AIN3M,
-                       .info_mask = IIO_CHAN_INFO_SCALE_SHARED_BIT,
+                       .info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT |
+                       IIO_CHAN_INFO_SCALE_SHARED_BIT,
                        .scan_index = 2,
                        .scan_type = IIO_ST('s', 16, 32, 0)
                },
@@ -861,7 +870,8 @@ static const struct ad7793_chip_info ad7793_chip_info_tbl[] = {
                        .channel = 2,
                        .channel2 = 2,
                        .address = AD7793_CH_AIN1M_AIN1M,
-                       .info_mask = IIO_CHAN_INFO_SCALE_SHARED_BIT,
+                       .info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT |
+                       IIO_CHAN_INFO_SCALE_SHARED_BIT,
                        .scan_index = 2,
                        .scan_type = IIO_ST('s', 16, 32, 0)
                },
@@ -870,7 +880,8 @@ static const struct ad7793_chip_info ad7793_chip_info_tbl[] = {
                        .indexed = 1,
                        .channel = 0,
                        .address = AD7793_CH_TEMP,
-                       .info_mask = IIO_CHAN_INFO_SCALE_SEPARATE_BIT,
+                       .info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT |
+                       IIO_CHAN_INFO_SCALE_SEPARATE_BIT,
                        .scan_index = 4,
                        .scan_type = IIO_ST('s', 16, 32, 0),
                },
@@ -880,7 +891,8 @@ static const struct ad7793_chip_info ad7793_chip_info_tbl[] = {
                        .indexed = 1,
                        .channel = 4,
                        .address = AD7793_CH_AVDD_MONITOR,
-                       .info_mask = IIO_CHAN_INFO_SCALE_SEPARATE_BIT,
+                       .info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT |
+                       IIO_CHAN_INFO_SCALE_SEPARATE_BIT,
                        .scan_index = 5,
                        .scan_type = IIO_ST('s', 16, 32, 0),
                },

diff --git a/drivers/staging/iio/adc/ad7887_core.c b/drivers/staging/iio/adc/ad7887_core.c
index e9bbc3eed15d9a72af9f05fd4f25a8ecc980c528..2cce09f36b74dc7be9c04ca4972a0a8b82696f89 100644 (file)
--- a/drivers/staging/iio/adc/ad7887_core.c
+++ b/drivers/staging/iio/adc/ad7887_core.c
@@ -42,7 +42,7 @@ static int ad7887_read_raw(struct iio_dev *indio_dev,
        unsigned int scale_uv;
 
        switch (m) {
-       case 0:
+       case IIO_CHAN_INFO_RAW:
                mutex_lock(&indio_dev->mlock);
                if (iio_buffer_enabled(indio_dev))
                        ret = -EBUSY;
@@ -75,7 +75,8 @@ static const struct ad7887_chip_info ad7887_chip_info_tbl[] = {
                        .type = IIO_VOLTAGE,
                        .indexed = 1,
                        .channel = 1,
-                       .info_mask = IIO_CHAN_INFO_SCALE_SHARED_BIT,
+                       .info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT |
+                       IIO_CHAN_INFO_SCALE_SHARED_BIT,
                        .address = 1,
                        .scan_index = 1,
                        .scan_type = IIO_ST('u', 12, 16, 0),
@@ -84,7 +85,8 @@ static const struct ad7887_chip_info ad7887_chip_info_tbl[] = {
                        .type = IIO_VOLTAGE,
                        .indexed = 1,
                        .channel = 0,
-                       .info_mask = IIO_CHAN_INFO_SCALE_SHARED_BIT,
+                       .info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT |
+                       IIO_CHAN_INFO_SCALE_SHARED_BIT,
                        .address = 0,
                        .scan_index = 0,
                        .scan_type = IIO_ST('u', 12, 16, 0),

diff --git a/drivers/staging/iio/adc/ad799x_core.c b/drivers/staging/iio/adc/ad799x_core.c
index a8458669350fbb7190aa64b8ac9466bb727b979f..429fb414f2eaa6e6c27805f65a114a5dfd1c9b0a 100644 (file)
--- a/drivers/staging/iio/adc/ad799x_core.c
+++ b/drivers/staging/iio/adc/ad799x_core.c
@@ -148,7 +148,7 @@ static int ad799x_read_raw(struct iio_dev *indio_dev,
        unsigned int scale_uv;
 
        switch (m) {
-       case 0:
+       case IIO_CHAN_INFO_RAW:
                mutex_lock(&indio_dev->mlock);
                if (iio_buffer_enabled(indio_dev))
                        ret = -EBUSY;
@@ -454,6 +454,7 @@ static const struct ad799x_chip_info ad799x_chip_info_tbl[] = {
                                .type = IIO_VOLTAGE,
                                .indexed = 1,
                                .channel = 0,
+                               .info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT,
                                .scan_index = 0,
                                .scan_type = IIO_ST('u', 12, 16, 0),
                        },
@@ -461,6 +462,7 @@ static const struct ad799x_chip_info ad799x_chip_info_tbl[] = {
                                .type = IIO_VOLTAGE,
                                .indexed = 1,
                                .channel = 1,
+                               .info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT,
                                .scan_index = 1,
                                .scan_type = IIO_ST('u', 12, 16, 0),
                        },
@@ -468,6 +470,7 @@ static const struct ad799x_chip_info ad799x_chip_info_tbl[] = {
                                .type = IIO_VOLTAGE,
                                .indexed = 1,
                                .channel = 2,
+                               .info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT,
                                .scan_index = 2,
                                .scan_type = IIO_ST('u', 12, 16, 0),
                        },
@@ -475,6 +478,7 @@ static const struct ad799x_chip_info ad799x_chip_info_tbl[] = {
                                .type = IIO_VOLTAGE,
                                .indexed = 1,
                                .channel = 3,
+                               .info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT,
                                .scan_index = 3,
                                .scan_type = IIO_ST('u', 12, 16, 0),
                        },
@@ -490,6 +494,7 @@ static const struct ad799x_chip_info ad799x_chip_info_tbl[] = {
                                .type = IIO_VOLTAGE,
                                .indexed = 1,
                                .channel = 0,
+                               .info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT,
                                .scan_index = 0,
                                .scan_type = IIO_ST('u', 10, 16, 2),
                        },
@@ -497,6 +502,7 @@ static const struct ad799x_chip_info ad799x_chip_info_tbl[] = {
                                .type = IIO_VOLTAGE,
                                .indexed = 1,
                                .channel = 1,
+                               .info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT,
                                .scan_index = 1,
                                .scan_type = IIO_ST('u', 10, 16, 2),
                        },
@@ -504,6 +510,7 @@ static const struct ad799x_chip_info ad799x_chip_info_tbl[] = {
                                .type = IIO_VOLTAGE,
                                .indexed = 1,
                                .channel = 2,
+                               .info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT,
                                .scan_index = 2,
                                .scan_type = IIO_ST('u', 10, 16, 2),
                        },
@@ -511,6 +518,7 @@ static const struct ad799x_chip_info ad799x_chip_info_tbl[] = {
                                .type = IIO_VOLTAGE,
                                .indexed = 1,
                                .channel = 3,
+                               .info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT,
                                .scan_index = 3,
                                .scan_type = IIO_ST('u', 10, 16, 2),
                        },
@@ -526,6 +534,7 @@ static const struct ad799x_chip_info ad799x_chip_info_tbl[] = {
                                .type = IIO_VOLTAGE,
                                .indexed = 1,
                                .channel = 0,
+                               .info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT,
                                .scan_index = 0,
                                .scan_type = IIO_ST('u', 8, 16, 4),
                        },
@@ -533,6 +542,7 @@ static const struct ad799x_chip_info ad799x_chip_info_tbl[] = {
                                .type = IIO_VOLTAGE,
                                .indexed = 1,
                                .channel = 1,
+                               .info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT,
                                .scan_index = 1,
                                .scan_type = IIO_ST('u', 8, 16, 4),
                        },
@@ -540,6 +550,7 @@ static const struct ad799x_chip_info ad799x_chip_info_tbl[] = {
                                .type = IIO_VOLTAGE,
                                .indexed = 1,
                                .channel = 2,
+                               .info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT,
                                .scan_index = 2,
                                .scan_type = IIO_ST('u', 8, 16, 4),
                        },
@@ -547,6 +558,7 @@ static const struct ad799x_chip_info ad799x_chip_info_tbl[] = {
                                .type = IIO_VOLTAGE,
                                .indexed = 1,
                                .channel = 3,
+                               .info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT,
                                .scan_index = 3,
                                .scan_type = IIO_ST('u', 8, 16, 4),
                        },
@@ -562,6 +574,7 @@ static const struct ad799x_chip_info ad799x_chip_info_tbl[] = {
                                .type = IIO_VOLTAGE,
                                .indexed = 1,
                                .channel = 0,
+                               .info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT,
                                .scan_index = 0,
                                .scan_type = IIO_ST('u', 12, 16, 0),
                                .event_mask = AD799X_EV_MASK,
@@ -570,6 +583,7 @@ static const struct ad799x_chip_info ad799x_chip_info_tbl[] = {
                                .type = IIO_VOLTAGE,
                                .indexed = 1,
                                .channel = 1,
+                               .info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT,
                                .scan_index = 1,
                                .scan_type = IIO_ST('u', 12, 16, 0),
                                .event_mask = AD799X_EV_MASK,
@@ -587,6 +601,7 @@ static const struct ad799x_chip_info ad799x_chip_info_tbl[] = {
                                .type = IIO_VOLTAGE,
                                .indexed = 1,
                                .channel = 0,
+                               .info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT,
                                .scan_index = 0,
                                .scan_type = IIO_ST('u', 10, 16, 2),
                                .event_mask = AD799X_EV_MASK,
@@ -596,6 +611,7 @@ static const struct ad799x_chip_info ad799x_chip_info_tbl[] = {
                                .indexed = 1,
                                .channel = 1,
                                .scan_index = 1,
+                               .info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT,
                                .scan_type = IIO_ST('u', 10, 16, 2),
                                .event_mask = AD799X_EV_MASK,
                        },
@@ -603,6 +619,7 @@ static const struct ad799x_chip_info ad799x_chip_info_tbl[] = {
                                .type = IIO_VOLTAGE,
                                .indexed = 1,
                                .channel = 2,
+                               .info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT,
                                .scan_index = 2,
                                .scan_type = IIO_ST('u', 10, 16, 2),
                                .event_mask = AD799X_EV_MASK,
@@ -611,6 +628,7 @@ static const struct ad799x_chip_info ad799x_chip_info_tbl[] = {
                                .type = IIO_VOLTAGE,
                                .indexed = 1,
                                .channel = 3,
+                               .info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT,
                                .scan_index = 3,
                                .scan_type = IIO_ST('u', 10, 16, 2),
                                .event_mask = AD799X_EV_MASK,
@@ -628,6 +646,7 @@ static const struct ad799x_chip_info ad799x_chip_info_tbl[] = {
                                .type = IIO_VOLTAGE,
                                .indexed = 1,
                                .channel = 0,
+                               .info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT,
                                .scan_index = 0,
                                .scan_type = IIO_ST('u', 12, 16, 0),
                                .event_mask = AD799X_EV_MASK,
@@ -636,6 +655,7 @@ static const struct ad799x_chip_info ad799x_chip_info_tbl[] = {
                                .type = IIO_VOLTAGE,
                                .indexed = 1,
                                .channel = 1,
+                               .info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT,
                                .scan_index = 1,
                                .scan_type = IIO_ST('u', 12, 16, 0),
                                .event_mask = AD799X_EV_MASK,
@@ -644,6 +664,7 @@ static const struct ad799x_chip_info ad799x_chip_info_tbl[] = {
                                .type = IIO_VOLTAGE,
                                .indexed = 1,
                                .channel = 2,
+                               .info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT,
                                .scan_index = 2,
                                .scan_type = IIO_ST('u', 12, 16, 0),
                                .event_mask = AD799X_EV_MASK,
@@ -652,6 +673,7 @@ static const struct ad799x_chip_info ad799x_chip_info_tbl[] = {
                                .type = IIO_VOLTAGE,
                                .indexed = 1,
                                .channel = 3,
+                               .info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT,
                                .scan_index = 3,
                                .scan_type = IIO_ST('u', 12, 16, 0),
                                .event_mask = AD799X_EV_MASK,
@@ -669,6 +691,7 @@ static const struct ad799x_chip_info ad799x_chip_info_tbl[] = {
                                .type = IIO_VOLTAGE,
                                .indexed = 1,
                                .channel = 0,
+                               .info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT,
                                .scan_index = 0,
                                .scan_type = IIO_ST('u', 10, 16, 2),
                                .event_mask = AD799X_EV_MASK,
@@ -677,6 +700,7 @@ static const struct ad799x_chip_info ad799x_chip_info_tbl[] = {
                                .type = IIO_VOLTAGE,
                                .indexed = 1,
                                .channel = 1,
+                               .info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT,
                                .scan_index = 1,
                                .scan_type = IIO_ST('u', 10, 16, 2),
                                .event_mask = AD799X_EV_MASK,
@@ -685,6 +709,7 @@ static const struct ad799x_chip_info ad799x_chip_info_tbl[] = {
                                .type = IIO_VOLTAGE,
                                .indexed = 1,
                                .channel = 2,
+                               .info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT,
                                .scan_index = 2,
                                .scan_type = IIO_ST('u', 10, 16, 2),
                                .event_mask = AD799X_EV_MASK,
@@ -693,6 +718,7 @@ static const struct ad799x_chip_info ad799x_chip_info_tbl[] = {
                                .type = IIO_VOLTAGE,
                                .indexed = 1,
                                .channel = 3,
+                               .info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT,
                                .scan_index = 3,
                                .scan_type = IIO_ST('u', 10, 16, 2),
                                .event_mask = AD799X_EV_MASK,
@@ -701,6 +727,7 @@ static const struct ad799x_chip_info ad799x_chip_info_tbl[] = {
                                .type = IIO_VOLTAGE,
                                .indexed = 1,
                                .channel = 4,
+                               .info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT,
                                .scan_index = 4,
                                .scan_type = IIO_ST('u', 10, 16, 2),
                        },
@@ -708,6 +735,7 @@ static const struct ad799x_chip_info ad799x_chip_info_tbl[] = {
                                .type = IIO_VOLTAGE,
                                .indexed = 1,
                                .channel = 5,
+                               .info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT,
                                .scan_index = 5,
                                .scan_type = IIO_ST('u', 10, 16, 2),
                        },
@@ -715,6 +743,7 @@ static const struct ad799x_chip_info ad799x_chip_info_tbl[] = {
                                .type = IIO_VOLTAGE,
                                .indexed = 1,
                                .channel = 6,
+                               .info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT,
                                .scan_index = 6,
                                .scan_type = IIO_ST('u', 10, 16, 2),
                        },
@@ -722,6 +751,7 @@ static const struct ad799x_chip_info ad799x_chip_info_tbl[] = {
                                .type = IIO_VOLTAGE,
                                .indexed = 1,
                                .channel = 7,
+                               .info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT,
                                .scan_index = 7,
                                .scan_type = IIO_ST('u', 10, 16, 2),
                        },
@@ -738,6 +768,7 @@ static const struct ad799x_chip_info ad799x_chip_info_tbl[] = {
                                .type = IIO_VOLTAGE,
                                .indexed = 1,
                                .channel = 0,
+                               .info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT,
                                .scan_index = 0,
                                .scan_type = IIO_ST('u', 12, 16, 0),
                                .event_mask = AD799X_EV_MASK,
@@ -746,6 +777,7 @@ static const struct ad799x_chip_info ad799x_chip_info_tbl[] = {
                                .type = IIO_VOLTAGE,
                                .indexed = 1,
                                .channel = 1,
+                               .info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT,
                                .scan_index = 1,
                                .scan_type = IIO_ST('u', 12, 16, 0),
                                .event_mask = AD799X_EV_MASK,
@@ -754,6 +786,7 @@ static const struct ad799x_chip_info ad799x_chip_info_tbl[] = {
                                .type = IIO_VOLTAGE,
                                .indexed = 1,
                                .channel = 2,
+                               .info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT,
                                .scan_index = 2,
                                .scan_type = IIO_ST('u', 12, 16, 0),
                                .event_mask = AD799X_EV_MASK,
@@ -762,6 +795,7 @@ static const struct ad799x_chip_info ad799x_chip_info_tbl[] = {
                                .type = IIO_VOLTAGE,
                                .indexed = 1,
                                .channel = 3,
+                               .info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT,
                                .scan_index = 3,
                                .scan_type = IIO_ST('u', 12, 16, 0),
                                .event_mask = AD799X_EV_MASK,
@@ -770,6 +804,7 @@ static const struct ad799x_chip_info ad799x_chip_info_tbl[] = {
                                .type = IIO_VOLTAGE,
                                .indexed = 1,
                                .channel = 4,
+                               .info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT,
                                .scan_index = 4,
                                .scan_type = IIO_ST('u', 12, 16, 0),
                        },
@@ -777,6 +812,7 @@ static const struct ad799x_chip_info ad799x_chip_info_tbl[] = {
                                .type = IIO_VOLTAGE,
                                .indexed = 1,
                                .channel = 5,
+                               .info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT,
                                .scan_index = 5,
                                .scan_type = IIO_ST('u', 12, 16, 0),
                        },
@@ -784,6 +820,7 @@ static const struct ad799x_chip_info ad799x_chip_info_tbl[] = {
                                .type = IIO_VOLTAGE,
                                .indexed = 1,
                                .channel = 6,
+                               .info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT,
                                .scan_index = 6,
                                .scan_type = IIO_ST('u', 12, 16, 0),
                        },
@@ -791,6 +828,7 @@ static const struct ad799x_chip_info ad799x_chip_info_tbl[] = {
                                .type = IIO_VOLTAGE,
                                .indexed = 1,
                                .channel = 7,
+                               .info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT,
                                .scan_index = 7,
                                .scan_type = IIO_ST('u', 12, 16, 0),
                        },

diff --git a/drivers/staging/iio/adc/lpc32xx_adc.c b/drivers/staging/iio/adc/lpc32xx_adc.c
index dfc9033843a37bb1b3efcea64ab265dda64c4434..ce9320bb9e621196201170de0f6c7134ccbca62f 100644 (file)
--- a/drivers/staging/iio/adc/lpc32xx_adc.c
+++ b/drivers/staging/iio/adc/lpc32xx_adc.c
@@ -73,7 +73,7 @@ static int lpc32xx_read_raw(struct iio_dev *indio_dev,
 {
        struct lpc32xx_adc_info *info = iio_priv(indio_dev);
 
-       if (mask == 0) {
+       if (mask == IIO_CHAN_INFO_RAW) {
                mutex_lock(&indio_dev->mlock);
                clk_enable(info->clk);
                /* Measurement setup */
@@ -98,12 +98,13 @@ static const struct iio_info lpc32xx_adc_iio_info = {
        .driver_module = THIS_MODULE,
 };
 
-#define LPC32XX_ADC_CHANNEL(_index) {          \
-       .type = IIO_VOLTAGE,                    \
-       .indexed = 1,                           \
-       .channel = _index,                      \
-       .address = AD_IN * _index,              \
-       .scan_index = _index,                   \
+#define LPC32XX_ADC_CHANNEL(_index) {                  \
+       .type = IIO_VOLTAGE,                            \
+       .indexed = 1,                                   \
+       .channel = _index,                              \
+       .info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT,    \
+       .address = AD_IN * _index,                      \
+       .scan_index = _index,                           \
 }
 
 static struct iio_chan_spec lpc32xx_adc_iio_channels[] = {

diff --git a/drivers/staging/iio/adc/max1363_core.c b/drivers/staging/iio/adc/max1363_core.c
index 9d7db7f70bd23abfdf2718b065c6c704160e56bf..1a7a0274751d84cfb50f84f6376fe6b53772e263 100644 (file)
--- a/drivers/staging/iio/adc/max1363_core.c
+++ b/drivers/staging/iio/adc/max1363_core.c
@@ -249,7 +249,7 @@ static int max1363_read_raw(struct iio_dev *indio_dev,
        struct max1363_state *st = iio_priv(indio_dev);
        int ret;
        switch (m) {
-       case 0:
+       case IIO_CHAN_INFO_RAW:
                ret = max1363_read_single_chan(indio_dev, chan, val, m);
                if (ret < 0)
                        return ret;
@@ -282,7 +282,8 @@ static const enum max1363_modes max1363_mode_list[] = {
 #define MAX1363_EV_M                                           \
        (IIO_EV_BIT(IIO_EV_TYPE_THRESH, IIO_EV_DIR_RISING)      \
         | IIO_EV_BIT(IIO_EV_TYPE_THRESH, IIO_EV_DIR_FALLING))
-#define MAX1363_INFO_MASK IIO_CHAN_INFO_SCALE_SHARED_BIT
+#define MAX1363_INFO_MASK (IIO_CHAN_INFO_RAW_SEPARATE_BIT |    \
+                          IIO_CHAN_INFO_SCALE_SHARED_BIT)
 #define MAX1363_CHAN_U(num, addr, si, bits, evmask)                    \
        {                                                               \
                .type = IIO_VOLTAGE,                                    \

diff --git a/drivers/staging/iio/adc/spear_adc.c b/drivers/staging/iio/adc/spear_adc.c
index bea577804e1ad22cf3c62279e6f21f46c0ebf1a4..3ca5cc9814eb9b494d7d57e7f79c9f08eae87b3c 100644 (file)
--- a/drivers/staging/iio/adc/spear_adc.c
+++ b/drivers/staging/iio/adc/spear_adc.c
@@ -150,7 +150,7 @@ static int spear_read_raw(struct iio_dev *indio_dev,
        u32 status;
 
        switch (mask) {
-       case 0:
+       case IIO_CHAN_INFO_RAW:
                mutex_lock(&indio_dev->mlock);
 
                status = CHANNEL_NUM(chan->channel) |
@@ -180,7 +180,8 @@ static int spear_read_raw(struct iio_dev *indio_dev,
 #define SPEAR_ADC_CHAN(idx) {                          \
        .type = IIO_VOLTAGE,                            \
        .indexed = 1,                                   \
-       .info_mask = IIO_CHAN_INFO_SCALE_SHARED_BIT,    \
+       .info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT |   \
+       IIO_CHAN_INFO_SCALE_SHARED_BIT,                 \
        .channel = idx,                                 \
        .scan_type = {                                  \
                .sign = 'u',                            \