Commit 554ae981 authored by Jonathan Cameron's avatar Jonathan Cameron Committed by Greg Kroah-Hartman

staging:iio:accel:adis16203 unwind use of IIO_CHAN macro.

This macro is being removed to simplify ongoing maintenance
so we need to unwind and remaining users.
Signed-off-by: default avatarJonathan Cameron <jic23@kernel.org>
Acked-by: default avatarLars-Peter Clausen <lars@metafoo.de>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent e81dafe9
...@@ -372,29 +372,70 @@ static int adis16203_read_raw(struct iio_dev *indio_dev, ...@@ -372,29 +372,70 @@ static int adis16203_read_raw(struct iio_dev *indio_dev,
} }
static struct iio_chan_spec adis16203_channels[] = { static struct iio_chan_spec adis16203_channels[] = {
IIO_CHAN(IIO_VOLTAGE, 0, 1, 0, "supply", 0, 0, {
IIO_CHAN_INFO_SCALE_SEPARATE_BIT, .type = IIO_VOLTAGE,
in_supply, ADIS16203_SCAN_SUPPLY, .indexed = 1,
IIO_ST('u', 12, 16, 0), 0), .channel = 0,
IIO_CHAN(IIO_VOLTAGE, 0, 1, 0, NULL, 1, 0, .extend_name = "supply",
IIO_CHAN_INFO_SCALE_SEPARATE_BIT, .info_mask = IIO_CHAN_INFO_SCALE_SEPARATE_BIT,
in_aux, ADIS16203_SCAN_AUX_ADC, .address = in_supply,
IIO_ST('u', 12, 16, 0), 0), .scan_index = ADIS16203_SCAN_SUPPLY,
IIO_CHAN(IIO_INCLI, 1, 0, 0, NULL, 0, IIO_MOD_X, .scan_type = {
IIO_CHAN_INFO_SCALE_SHARED_BIT | .sign = 'u',
IIO_CHAN_INFO_CALIBBIAS_SEPARATE_BIT, .realbits = 12,
incli_x, ADIS16203_SCAN_INCLI_X, .storagebits = 16,
IIO_ST('s', 14, 16, 0), 0), },
/* Fixme: Not what it appears to be - see data sheet */ }, {
IIO_CHAN(IIO_INCLI, 1, 0, 0, NULL, 0, IIO_MOD_Y, .type = IIO_VOLTAGE,
IIO_CHAN_INFO_SCALE_SHARED_BIT, .indexed = 1,
incli_y, ADIS16203_SCAN_INCLI_Y, .channel = 1,
IIO_ST('s', 14, 16, 0), 0), .info_mask = IIO_CHAN_INFO_SCALE_SEPARATE_BIT,
IIO_CHAN(IIO_TEMP, 0, 1, 0, NULL, 0, 0, .address = in_aux,
IIO_CHAN_INFO_SCALE_SEPARATE_BIT | .scan_index = ADIS16203_SCAN_AUX_ADC,
IIO_CHAN_INFO_OFFSET_SEPARATE_BIT, .scan_type = {
temp, ADIS16203_SCAN_TEMP, .sign = 'u',
IIO_ST('u', 12, 16, 0), 0), .realbits = 12,
.storagebits = 16,
},
}, {
.type = IIO_INCLI,
.modified = 1,
.channel2 = IIO_MOD_X,
.info_mask = IIO_CHAN_INFO_SCALE_SHARED_BIT |
IIO_CHAN_INFO_CALIBBIAS_SEPARATE_BIT,
.address = incli_x,
.scan_index = ADIS16203_SCAN_INCLI_X,
.scan_type = {
.sign = 's',
.realbits = 14,
.storagebits = 16,
},
}, { /* Fixme: Not what it appears to be - see data sheet */
.type = IIO_INCLI,
.modified = 1,
.channel2 = IIO_MOD_Y,
.info_mask = IIO_CHAN_INFO_SCALE_SHARED_BIT,
.address = incli_y,
.scan_index = ADIS16203_SCAN_INCLI_Y,
.scan_type = {
.sign = 's',
.realbits = 14,
.storagebits = 16,
},
}, {
.type = IIO_TEMP,
.indexed = 1,
.channel = 0,
.info_mask = IIO_CHAN_INFO_SCALE_SEPARATE_BIT |
IIO_CHAN_INFO_OFFSET_SEPARATE_BIT,
.address = temp,
.scan_index = ADIS16203_SCAN_TEMP,
.scan_type = {
.sign = 'u',
.realbits = 12,
.storagebits = 16,
},
},
IIO_CHAN_SOFT_TIMESTAMP(5), IIO_CHAN_SOFT_TIMESTAMP(5),
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment