aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJonathan Cameron <jic23@kernel.org>2013-02-27 14:29:52 -0500
committerJonathan Cameron <jic23@kernel.org>2013-03-17 15:49:35 -0400
commit606f9067b573183035a0300c4595261ec9575c7d (patch)
tree1c3174fe2e34f533c6112cde8451c87a9ebe9d30
parent89352e9638109f91ab6fc4be3a98f0c8d9789826 (diff)
iio:gyro:adis16136 move to info_mask_(shared_by_type/separate)
The original info_mask is going away in favour of the broken out versions. Signed-off-by: Jonathan Cameron <jic23@kernel.org> Acked-by: Lars-Peter Clausen <lars@metafoo.de>
-rw-r--r--drivers/iio/gyro/adis16136.c13
1 files changed, 7 insertions, 6 deletions
diff --git a/drivers/iio/gyro/adis16136.c b/drivers/iio/gyro/adis16136.c
index 8cb0bcbfd609..058e6d5c955f 100644
--- a/drivers/iio/gyro/adis16136.c
+++ b/drivers/iio/gyro/adis16136.c
@@ -357,10 +357,11 @@ static const struct iio_chan_spec adis16136_channels[] = {
357 .type = IIO_ANGL_VEL, 357 .type = IIO_ANGL_VEL,
358 .modified = 1, 358 .modified = 1,
359 .channel2 = IIO_MOD_X, 359 .channel2 = IIO_MOD_X,
360 .info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT | 360 .info_mask_separate = BIT(IIO_CHAN_INFO_RAW) |
361 IIO_CHAN_INFO_CALIBBIAS_SEPARATE_BIT | 361 BIT(IIO_CHAN_INFO_CALIBBIAS) |
362 IIO_CHAN_INFO_SCALE_SHARED_BIT | 362 BIT(IIO_CHAN_INFO_LOW_PASS_FILTER_3DB_FREQUENCY),
363 IIO_CHAN_INFO_LOW_PASS_FILTER_3DB_FREQUENCY_SEPARATE_BIT, 363 .info_mask_shared_by_type = BIT(IIO_CHAN_INFO_SCALE),
364
364 .address = ADIS16136_REG_GYRO_OUT2, 365 .address = ADIS16136_REG_GYRO_OUT2,
365 .scan_index = ADIS16136_SCAN_GYRO, 366 .scan_index = ADIS16136_SCAN_GYRO,
366 .scan_type = { 367 .scan_type = {
@@ -373,8 +374,8 @@ static const struct iio_chan_spec adis16136_channels[] = {
373 .type = IIO_TEMP, 374 .type = IIO_TEMP,
374 .indexed = 1, 375 .indexed = 1,
375 .channel = 0, 376 .channel = 0,
376 .info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT | 377 .info_mask_separate = BIT(IIO_CHAN_INFO_RAW) |
377 IIO_CHAN_INFO_SCALE_SEPARATE_BIT, 378 BIT(IIO_CHAN_INFO_SCALE),
378 .address = ADIS16136_REG_TEMP_OUT, 379 .address = ADIS16136_REG_TEMP_OUT,
379 .scan_index = ADIS16136_SCAN_TEMP, 380 .scan_index = ADIS16136_SCAN_TEMP,
380 .scan_type = { 381 .scan_type = {