| From 7323d59862802ca109451eeda9777024a7625509 Mon Sep 17 00:00:00 2001 |
| From: Paul Cercueil <paul.cercueil@analog.com> |
| Date: Fri, 15 May 2015 17:18:35 +0200 |
| Subject: iio: adis16400: Use != channel indices for the two voltage channels |
| |
| From: Paul Cercueil <paul.cercueil@analog.com> |
| |
| commit 7323d59862802ca109451eeda9777024a7625509 upstream. |
| |
| Previously, the two voltage channels had the same ID, which didn't cause |
| conflicts in sysfs only because one channel is named and the other isn't; |
| this is still violating the spec though, two indexed channels should never |
| have the same index. |
| |
| Signed-off-by: Paul Cercueil <paul.cercueil@analog.com> |
| Signed-off-by: Lars-Peter Clausen <lars@metafoo.de> |
| Signed-off-by: Jonathan Cameron <jic23@kernel.org> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| drivers/iio/imu/adis16400_core.c | 8 ++++---- |
| 1 file changed, 4 insertions(+), 4 deletions(-) |
| |
| --- a/drivers/iio/imu/adis16400_core.c |
| +++ b/drivers/iio/imu/adis16400_core.c |
| @@ -459,10 +459,10 @@ static int adis16400_read_raw(struct iio |
| } |
| } |
| |
| -#define ADIS16400_VOLTAGE_CHAN(addr, bits, name, si) { \ |
| +#define ADIS16400_VOLTAGE_CHAN(addr, bits, name, si, chn) { \ |
| .type = IIO_VOLTAGE, \ |
| .indexed = 1, \ |
| - .channel = 0, \ |
| + .channel = chn, \ |
| .extend_name = name, \ |
| .info_mask_separate = BIT(IIO_CHAN_INFO_RAW) | \ |
| BIT(IIO_CHAN_INFO_SCALE), \ |
| @@ -479,10 +479,10 @@ static int adis16400_read_raw(struct iio |
| } |
| |
| #define ADIS16400_SUPPLY_CHAN(addr, bits) \ |
| - ADIS16400_VOLTAGE_CHAN(addr, bits, "supply", ADIS16400_SCAN_SUPPLY) |
| + ADIS16400_VOLTAGE_CHAN(addr, bits, "supply", ADIS16400_SCAN_SUPPLY, 0) |
| |
| #define ADIS16400_AUX_ADC_CHAN(addr, bits) \ |
| - ADIS16400_VOLTAGE_CHAN(addr, bits, NULL, ADIS16400_SCAN_ADC) |
| + ADIS16400_VOLTAGE_CHAN(addr, bits, NULL, ADIS16400_SCAN_ADC, 1) |
| |
| #define ADIS16400_GYRO_CHAN(mod, addr, bits) { \ |
| .type = IIO_ANGL_VEL, \ |
