staging: iio: adc add numbers to naming of all adc channels as needed to associate...

[deliverable/linux.git] / drivers / staging / iio / imu / adis16400_ring.c

diff --git a/drivers/staging/iio/imu/adis16400_ring.c b/drivers/staging/iio/imu/adis16400_ring.c
index 1de858cb8cae045bd0b002d24d6c628d28a7ea0e..33293fba9bccd062632742826275a8e1f59700ef 100644 (file)
--- a/drivers/staging/iio/imu/adis16400_ring.c
+++ b/drivers/staging/iio/imu/adis16400_ring.c
@@ -17,9 +17,9 @@
 #include "../trigger.h"
 #include "adis16400.h"
 
-static IIO_SCAN_EL_C(in_supply, ADIS16400_SCAN_SUPPLY,
+static IIO_SCAN_EL_C(in0_supply, ADIS16400_SCAN_SUPPLY,
                     ADIS16400_SUPPLY_OUT, NULL);
-static IIO_CONST_ATTR_SCAN_EL_TYPE(in_supply, u, 14, 16);
+static IIO_CONST_ATTR_SCAN_EL_TYPE(in0_supply, u, 14, 16);
 
 static IIO_SCAN_EL_C(gyro_x, ADIS16400_SCAN_GYRO_X, ADIS16400_XGYRO_OUT, NULL);
 static IIO_SCAN_EL_C(gyro_y, ADIS16400_SCAN_GYRO_Y, ADIS16400_YGYRO_OUT, NULL);
@@ -39,16 +39,16 @@ static IIO_CONST_ATTR_SCAN_EL_TYPE(magn, s, 14, 16);
 static IIO_SCAN_EL_C(temp, ADIS16400_SCAN_TEMP, ADIS16400_TEMP_OUT, NULL);
 static IIO_CONST_ATTR_SCAN_EL_TYPE(temp, s, 12, 16);
 
-static IIO_SCAN_EL_C(in0, ADIS16400_SCAN_ADC_0, ADIS16400_AUX_ADC, NULL);
-static IIO_CONST_ATTR_SCAN_EL_TYPE(in0, u, 12, 16);
+static IIO_SCAN_EL_C(in1, ADIS16400_SCAN_ADC_0, ADIS16400_AUX_ADC, NULL);
+static IIO_CONST_ATTR_SCAN_EL_TYPE(in1, u, 12, 16);
 
 static IIO_SCAN_EL_TIMESTAMP(12);
 static IIO_CONST_ATTR_SCAN_EL_TYPE(timestamp, s, 64, 64);
 
 static struct attribute *adis16400_scan_el_attrs[] = {
-       &iio_scan_el_in_supply.dev_attr.attr,
-       &iio_const_attr_in_supply_index.dev_attr.attr,
-       &iio_const_attr_in_supply_type.dev_attr.attr,
+       &iio_scan_el_in0_supply.dev_attr.attr,
+       &iio_const_attr_in0_supply_index.dev_attr.attr,
+       &iio_const_attr_in0_supply_type.dev_attr.attr,
        &iio_scan_el_gyro_x.dev_attr.attr,
        &iio_const_attr_gyro_x_index.dev_attr.attr,
        &iio_scan_el_gyro_y.dev_attr.attr,
@@ -73,9 +73,9 @@ static struct attribute *adis16400_scan_el_attrs[] = {
        &iio_scan_el_temp.dev_attr.attr,
        &iio_const_attr_temp_index.dev_attr.attr,
        &iio_const_attr_temp_type.dev_attr.attr,
-       &iio_scan_el_in0.dev_attr.attr,
-       &iio_const_attr_in0_index.dev_attr.attr,
-       &iio_const_attr_in0_type.dev_attr.attr,
+       &iio_scan_el_in1.dev_attr.attr,
+       &iio_const_attr_in1_index.dev_attr.attr,
+       &iio_const_attr_in1_type.dev_attr.attr,
        &iio_scan_el_timestamp.dev_attr.attr,
        &iio_const_attr_timestamp_index.dev_attr.attr,
        &iio_const_attr_timestamp_type.dev_attr.attr,
@@ -222,7 +222,7 @@ int adis16400_configure_ring(struct iio_dev *indio_dev)
        ring->owner = THIS_MODULE;
 
        /* Set default scan mode */
-       iio_scan_mask_set(ring, iio_scan_el_in_supply.number);
+       iio_scan_mask_set(ring, iio_scan_el_in0_supply.number);
        iio_scan_mask_set(ring, iio_scan_el_gyro_x.number);
        iio_scan_mask_set(ring, iio_scan_el_gyro_y.number);
        iio_scan_mask_set(ring, iio_scan_el_gyro_z.number);
@@ -233,7 +233,7 @@ int adis16400_configure_ring(struct iio_dev *indio_dev)
        iio_scan_mask_set(ring, iio_scan_el_magn_y.number);
        iio_scan_mask_set(ring, iio_scan_el_magn_z.number);
        iio_scan_mask_set(ring, iio_scan_el_temp.number);
-       iio_scan_mask_set(ring, iio_scan_el_in0.number);
+       iio_scan_mask_set(ring, iio_scan_el_in1.number);
 
        ret = iio_alloc_pollfunc(indio_dev, NULL, &adis16400_poll_func_th);
        if (ret)