iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

staging:iio:light Add IIO_CHAN_INFO_RAW/PROCESSED entries to all drivers.

Browse Source 
Precursor to making value read / write attribute optional.
Note that minimal change route taken here. The read_raw callbacks
in both drivers could do fewer checks to identify the channel than
they now do.

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>
This commit is contained in:
Jonathan Cameron 2012-04-15 17:41:22 +01:00 committed by Greg Kroah-Hartman
parent a5d016d466
commit 90354d0038
2 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/staging/iio/light/isl29018.c
View File

@ -383,7 +383,8 @@ static int isl29018_read_raw(struct iio_dev *indio_dev,
mutex_lock(&chip->lock); mutex_lock(&chip->lock);
switch (mask) { switch (mask) {
case 0: case IIO_CHAN_INFO_RAW:
case IIO_CHAN_INFO_PROCESSED:
switch (chan->type) { switch (chan->type) {
case IIO_LIGHT: case IIO_LIGHT:
ret = isl29018_read_lux(client, val); ret = isl29018_read_lux(client, val);
@ -420,14 +421,17 @@ static const struct iio_chan_spec isl29018_channels[] = {
.indexed = 1, .indexed = 1,
.channel = 0, .channel = 0,
.processed_val = IIO_PROCESSED, .processed_val = IIO_PROCESSED,
.info_mask = IIO_CHAN_INFO_CALIBSCALE_SEPARATE_BIT, .info_mask = IIO_CHAN_INFO_PROCESSED_SEPARATE_BIT |
IIO_CHAN_INFO_CALIBSCALE_SEPARATE_BIT,
}, { }, {
.type = IIO_INTENSITY, .type = IIO_INTENSITY,
.modified = 1, .modified = 1,
.info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT,
.channel2 = IIO_MOD_LIGHT_IR, .channel2 = IIO_MOD_LIGHT_IR,
}, { }, {
/* Unindexed in current ABI. But perhaps it should be. */ /* Unindexed in current ABI. But perhaps it should be. */
.type = IIO_PROXIMITY, .type = IIO_PROXIMITY,
.info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT,
} }
}; };

10
drivers/staging/iio/light/tsl2563.c
View File

@ -485,7 +485,8 @@ static int tsl2563_read_raw(struct iio_dev *indio_dev,
mutex_lock(&chip->lock); mutex_lock(&chip->lock);
switch (m) { switch (m) {
case 0: case IIO_CHAN_INFO_RAW:
case IIO_CHAN_INFO_PROCESSED:
switch (chan->type) { switch (chan->type) {
case IIO_LIGHT: case IIO_LIGHT:
ret = tsl2563_get_adc(chip); ret = tsl2563_get_adc(chip);
@ -535,12 +536,14 @@ static const struct iio_chan_spec tsl2563_channels[] = {
.type = IIO_LIGHT, .type = IIO_LIGHT,
.indexed = 1, .indexed = 1,
.processed_val = 1, .processed_val = 1,
.info_mask = IIO_CHAN_INFO_PROCESSED_SEPARATE_BIT,
.channel = 0, .channel = 0,
}, { }, {
.type = IIO_INTENSITY, .type = IIO_INTENSITY,
.modified = 1, .modified = 1,
.channel2 = IIO_MOD_LIGHT_BOTH, .channel2 = IIO_MOD_LIGHT_BOTH,
.info_mask = IIO_CHAN_INFO_CALIBSCALE_SEPARATE_BIT, .info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT |
IIO_CHAN_INFO_CALIBSCALE_SEPARATE_BIT,
.event_mask = (IIO_EV_BIT(IIO_EV_TYPE_THRESH, .event_mask = (IIO_EV_BIT(IIO_EV_TYPE_THRESH,
IIO_EV_DIR_RISING) | IIO_EV_DIR_RISING) |
IIO_EV_BIT(IIO_EV_TYPE_THRESH, IIO_EV_BIT(IIO_EV_TYPE_THRESH,
@ -549,7 +552,8 @@ static const struct iio_chan_spec tsl2563_channels[] = {
.type = IIO_INTENSITY, .type = IIO_INTENSITY,
.modified = 1, .modified = 1,
.channel2 = IIO_MOD_LIGHT_IR, .channel2 = IIO_MOD_LIGHT_IR,
.info_mask = IIO_CHAN_INFO_CALIBSCALE_SEPARATE_BIT, .info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT |
IIO_CHAN_INFO_CALIBSCALE_SEPARATE_BIT,
} }
}; };