Merge branch 'master' into tk71

[mv-sheeva.git] / drivers / staging / iio / accel / adis16240_core.c

diff --git a/drivers/staging/iio/accel/adis16240_core.c b/drivers/staging/iio/accel/adis16240_core.c
index 3e9531dd0000363a9c5796243a30a1ed9a5f3bef..d11d164207eee3b222500c3ae05f3e1e6fb4ec3f 100644 (file)
--- a/drivers/staging/iio/accel/adis16240_core.c
+++ b/drivers/staging/iio/accel/adis16240_core.c
@@ -376,11 +376,14 @@ err_ret:
        return ret;
 }
 
-static IIO_DEV_ATTR_IN_NAMED_RAW(supply, adis16240_read_10bit_unsigned,
+static IIO_DEV_ATTR_IN_NAMED_RAW(0, supply, adis16240_read_10bit_unsigned,
                ADIS16240_SUPPLY_OUT);
-static IIO_DEV_ATTR_IN_RAW(0, adis16240_read_10bit_signed,
+static IIO_DEV_ATTR_IN_RAW(1, adis16240_read_10bit_signed,
                ADIS16240_AUX_ADC);
-static IIO_CONST_ATTR(in_supply_scale, "0.00488");
+static IIO_CONST_ATTR_IN_NAMED_SCALE(0, supply, "0.00488");
+
+static IIO_CONST_ATTR_ACCEL_SCALE("0.50406181");
+static IIO_CONST_ATTR(accel_peak_scale, "6.6292954");
 static IIO_DEV_ATTR_ACCEL_X(adis16240_read_10bit_signed,
                ADIS16240_XACCL_OUT);
 static IIO_DEVICE_ATTR(accel_x_peak_raw, S_IRUGO,
@@ -400,26 +403,26 @@ static IIO_DEVICE_ATTR(accel_z_peak_raw, S_IRUGO,
 static IIO_DEVICE_ATTR(accel_xyz_squared_peak_raw, S_IRUGO,
                       adis16240_read_12bit_signed, NULL,
                       ADIS16240_XYZPEAK_OUT);
-static IIO_DEV_ATTR_ACCEL_X_OFFSET(S_IWUSR | S_IRUGO,
+static IIO_DEV_ATTR_ACCEL_X_CALIBBIAS(S_IWUSR | S_IRUGO,
                adis16240_read_10bit_signed,
                adis16240_write_16bit,
                ADIS16240_XACCL_OFF);
-static IIO_DEV_ATTR_ACCEL_Y_OFFSET(S_IWUSR | S_IRUGO,
+static IIO_DEV_ATTR_ACCEL_Y_CALIBBIAS(S_IWUSR | S_IRUGO,
                adis16240_read_10bit_signed,
                adis16240_write_16bit,
                ADIS16240_YACCL_OFF);
-static IIO_DEV_ATTR_ACCEL_Z_OFFSET(S_IWUSR | S_IRUGO,
+static IIO_DEV_ATTR_ACCEL_Z_CALIBBIAS(S_IWUSR | S_IRUGO,
                adis16240_read_10bit_signed,
                adis16240_write_16bit,
                ADIS16240_ZACCL_OFF);
 static IIO_DEV_ATTR_TEMP_RAW(adis16240_read_10bit_unsigned);
-static IIO_CONST_ATTR(temp_scale, "0.244");
+static IIO_CONST_ATTR_TEMP_SCALE("0.244");
 
 static IIO_DEVICE_ATTR(reset, S_IWUSR, NULL, adis16240_write_reset, 0);
 
-static IIO_CONST_ATTR_AVAIL_SAMP_FREQ("4096");
+static IIO_CONST_ATTR_SAMP_FREQ_AVAIL("4096");
 
-static IIO_CONST_ATTR(name, "adis16240");
+static IIO_CONST_ATTR_NAME("adis16240");
 
 static struct attribute *adis16240_event_attributes[] = {
        NULL
@@ -430,22 +433,24 @@ static struct attribute_group adis16240_event_attribute_group = {
 };
 
 static struct attribute *adis16240_attributes[] = {
-       &iio_dev_attr_in_supply_raw.dev_attr.attr,
-       &iio_const_attr_in_supply_scale.dev_attr.attr,
-       &iio_dev_attr_in0_raw.dev_attr.attr,
+       &iio_dev_attr_in0_supply_raw.dev_attr.attr,
+       &iio_const_attr_in0_supply_scale.dev_attr.attr,
+       &iio_dev_attr_in1_raw.dev_attr.attr,
+       &iio_const_attr_accel_scale.dev_attr.attr,
+       &iio_const_attr_accel_peak_scale.dev_attr.attr,
        &iio_dev_attr_accel_x_raw.dev_attr.attr,
-       &iio_dev_attr_accel_x_offset.dev_attr.attr,
+       &iio_dev_attr_accel_x_calibbias.dev_attr.attr,
        &iio_dev_attr_accel_x_peak_raw.dev_attr.attr,
        &iio_dev_attr_accel_y_raw.dev_attr.attr,
-       &iio_dev_attr_accel_y_offset.dev_attr.attr,
+       &iio_dev_attr_accel_y_calibbias.dev_attr.attr,
        &iio_dev_attr_accel_y_peak_raw.dev_attr.attr,
        &iio_dev_attr_accel_z_raw.dev_attr.attr,
-       &iio_dev_attr_accel_z_offset.dev_attr.attr,
+       &iio_dev_attr_accel_z_calibbias.dev_attr.attr,
        &iio_dev_attr_accel_z_peak_raw.dev_attr.attr,
        &iio_dev_attr_accel_xyz_squared_peak_raw.dev_attr.attr,
        &iio_dev_attr_temp_raw.dev_attr.attr,
        &iio_const_attr_temp_scale.dev_attr.attr,
-       &iio_const_attr_available_sampling_frequency.dev_attr.attr,
+       &iio_const_attr_sampling_frequency_available.dev_attr.attr,
        &iio_dev_attr_reset.dev_attr.attr,
        &iio_const_attr_name.dev_attr.attr,
        NULL