mirror of
https://github.com/torvalds/linux
synced 2024-10-28 14:18:20 +00:00
staging:iio:adis16400: Fix ADIS163xx AUX_ADC address
The ADIS163xx variants use a different register address for the auxiliary ADC channel than the ADIS16400. This patch fixes them to use the correct address. Signed-off-by: Lars-Peter Clausen <lars@metafoo.de> Acked-by: Jonathan Cameron <jic23@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
bb7cf8bc52
commit
07a8329c48
|
@ -43,6 +43,7 @@
|
|||
|
||||
#define ADIS16300_PITCH_OUT 0x12 /* X axis inclinometer output measurement */
|
||||
#define ADIS16300_ROLL_OUT 0x14 /* Y axis inclinometer output measurement */
|
||||
#define ADIS16300_AUX_ADC 0x16 /* Auxiliary ADC measurement */
|
||||
|
||||
/* Calibration parameters */
|
||||
#define ADIS16400_XGYRO_OFF 0x1A /* X-axis gyroscope bias offset factor */
|
||||
|
|
|
@ -472,11 +472,12 @@ enum adis16400_chan {
|
|||
temp,
|
||||
temp0, temp1, temp2,
|
||||
in1,
|
||||
in2,
|
||||
incli_x,
|
||||
incli_y,
|
||||
};
|
||||
|
||||
static u8 adis16400_addresses[17][2] = {
|
||||
static u8 adis16400_addresses[18][2] = {
|
||||
[in_supply] = { ADIS16400_SUPPLY_OUT },
|
||||
[gyro_x] = { ADIS16400_XGYRO_OUT, ADIS16400_XGYRO_OFF },
|
||||
[gyro_y] = { ADIS16400_YGYRO_OUT, ADIS16400_YGYRO_OFF },
|
||||
|
@ -491,7 +492,8 @@ static u8 adis16400_addresses[17][2] = {
|
|||
[temp0] = { ADIS16350_XTEMP_OUT },
|
||||
[temp1] = { ADIS16350_YTEMP_OUT },
|
||||
[temp2] = { ADIS16350_ZTEMP_OUT },
|
||||
[in1] = { ADIS16400_AUX_ADC },
|
||||
[in1] = { ADIS16300_AUX_ADC },
|
||||
[in2] = { ADIS16400_AUX_ADC },
|
||||
[incli_x] = { ADIS16300_PITCH_OUT },
|
||||
[incli_y] = { ADIS16300_ROLL_OUT }
|
||||
};
|
||||
|
@ -752,7 +754,7 @@ static struct iio_chan_spec adis16400_channels[] = {
|
|||
.channel = 1,
|
||||
.info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT |
|
||||
IIO_CHAN_INFO_SCALE_SEPARATE_BIT,
|
||||
.address = in1,
|
||||
.address = in2,
|
||||
.scan_index = ADIS16400_SCAN_ADC_0,
|
||||
.scan_type = IIO_ST('s', 12, 16, 0),
|
||||
},
|
||||
|
|
Loading…
Reference in a new issue