diff options
| author | Jonathan Cameron | 2010-05-07 16:38:55 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2010-05-11 23:33:24 +0200 |
| commit | a1169c5a0bfec75730a080a5f5d668e65144d1d1 (patch) | |
| tree | d85f47c2849fab0287df2f16167a6060470e410e /drivers/staging/iio/imu | |
| parent | staging: iio: Documentation fixes (diff) | |
| download | kernel-qcow2-linux-a1169c5a0bfec75730a080a5f5d668e65144d1d1.tar.gz kernel-qcow2-linux-a1169c5a0bfec75730a080a5f5d668e65144d1d1.tar.xz kernel-qcow2-linux-a1169c5a0bfec75730a080a5f5d668e65144d1d1.zip | |
staging: iio: Break up gyro.h and move to new abi
Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/iio/imu')
| -rw-r--r-- | drivers/staging/iio/imu/adis16300_core.c | 11 | ||||
| -rw-r--r-- | drivers/staging/iio/imu/adis16400_core.c | 16 |
2 files changed, 14 insertions, 13 deletions
diff --git a/drivers/staging/iio/imu/adis16300_core.c b/drivers/staging/iio/imu/adis16300_core.c index 9f5f8cb850dd..b923eccf7bb7 100644 --- a/drivers/staging/iio/imu/adis16300_core.c +++ b/drivers/staging/iio/imu/adis16300_core.c @@ -21,6 +21,7 @@ #include "../iio.h" #include "../sysfs.h" #include "../accel/accel.h" +#include "../accel/inclinometer.h" #include "../gyro/gyro.h" #include "../adc/adc.h" @@ -613,7 +614,7 @@ static IIO_DEV_ATTR_INCLI_Y(adis16300_read_13bit_signed, ADIS16300_YINCLI_OUT); static IIO_CONST_ATTR(incli_scale, "0.044 d"); -static IIO_DEV_ATTR_TEMP(adis16300_read_12bit_signed); +static IIO_DEV_ATTR_TEMP_RAW(adis16300_read_12bit_signed); static IIO_CONST_ATTR(temp_offset, "198.16 K"); static IIO_CONST_ATTR(temp_scale, "0.14 K"); @@ -645,16 +646,16 @@ static struct attribute *adis16300_attributes[] = { &iio_dev_attr_accel_z_offset.dev_attr.attr, &iio_dev_attr_in_supply_raw.dev_attr.attr, &iio_const_attr_in_supply_scale.dev_attr.attr, - &iio_dev_attr_gyro_x.dev_attr.attr, + &iio_dev_attr_gyro_x_raw.dev_attr.attr, &iio_const_attr_gyro_scale.dev_attr.attr, &iio_dev_attr_accel_x_raw.dev_attr.attr, &iio_dev_attr_accel_y_raw.dev_attr.attr, &iio_dev_attr_accel_z_raw.dev_attr.attr, &iio_const_attr_accel_scale.dev_attr.attr, - &iio_dev_attr_incli_x.dev_attr.attr, - &iio_dev_attr_incli_y.dev_attr.attr, + &iio_dev_attr_incli_x_raw.dev_attr.attr, + &iio_dev_attr_incli_y_raw.dev_attr.attr, &iio_const_attr_incli_scale.dev_attr.attr, - &iio_dev_attr_temp.dev_attr.attr, + &iio_dev_attr_temp_raw.dev_attr.attr, &iio_const_attr_temp_offset.dev_attr.attr, &iio_const_attr_temp_scale.dev_attr.attr, &iio_dev_attr_in0_raw.dev_attr.attr, diff --git a/drivers/staging/iio/imu/adis16400_core.c b/drivers/staging/iio/imu/adis16400_core.c index 27e4a7348075..868c52658a5a 100644 --- a/drivers/staging/iio/imu/adis16400_core.c +++ b/drivers/staging/iio/imu/adis16400_core.c @@ -626,7 +626,7 @@ static IIO_DEV_ATTR_MAGN_Z(adis16400_read_14bit_signed, static IIO_CONST_ATTR(magn_scale, "0.0005 Gs"); -static IIO_DEV_ATTR_TEMP(adis16400_read_12bit_signed); +static IIO_DEV_ATTR_TEMP_RAW(adis16400_read_12bit_signed); static IIO_CONST_ATTR(temp_offset, "198.16 K"); static IIO_CONST_ATTR(temp_scale, "0.14 K"); @@ -658,19 +658,19 @@ static struct attribute *adis16400_attributes[] = { &iio_dev_attr_accel_z_offset.dev_attr.attr, &iio_dev_attr_in_supply_raw.dev_attr.attr, &iio_const_attr_in_supply_scale.dev_attr.attr, - &iio_dev_attr_gyro_x.dev_attr.attr, - &iio_dev_attr_gyro_y.dev_attr.attr, - &iio_dev_attr_gyro_z.dev_attr.attr, + &iio_dev_attr_gyro_x_raw.dev_attr.attr, + &iio_dev_attr_gyro_y_raw.dev_attr.attr, + &iio_dev_attr_gyro_z_raw.dev_attr.attr, &iio_const_attr_gyro_scale.dev_attr.attr, &iio_dev_attr_accel_x_raw.dev_attr.attr, &iio_dev_attr_accel_y_raw.dev_attr.attr, &iio_dev_attr_accel_z_raw.dev_attr.attr, &iio_const_attr_accel_scale.dev_attr.attr, - &iio_dev_attr_magn_x.dev_attr.attr, - &iio_dev_attr_magn_y.dev_attr.attr, - &iio_dev_attr_magn_z.dev_attr.attr, + &iio_dev_attr_magn_x_raw.dev_attr.attr, + &iio_dev_attr_magn_y_raw.dev_attr.attr, + &iio_dev_attr_magn_z_raw.dev_attr.attr, &iio_const_attr_magn_scale.dev_attr.attr, - &iio_dev_attr_temp.dev_attr.attr, + &iio_dev_attr_temp_raw.dev_attr.attr, &iio_const_attr_temp_offset.dev_attr.attr, &iio_const_attr_temp_scale.dev_attr.attr, &iio_dev_attr_in0_raw.dev_attr.attr, |