diff options
author | Jonathan Cameron <jic23@cam.ac.uk> | 2010-05-07 10:38:55 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-05-11 17:33:24 -0400 |
commit | a1169c5a0bfec75730a080a5f5d668e65144d1d1 (patch) | |
tree | d85f47c2849fab0287df2f16167a6060470e410e | |
parent | 85798ec85ec6146bff3af886c06d72cc66940a05 (diff) |
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>
-rw-r--r-- | drivers/staging/iio/accel/inclinometer.h | 23 | ||||
-rw-r--r-- | drivers/staging/iio/gyro/gyro.h | 43 | ||||
-rw-r--r-- | drivers/staging/iio/imu/adis16300_core.c | 11 | ||||
-rw-r--r-- | drivers/staging/iio/imu/adis16400_core.c | 16 | ||||
-rw-r--r-- | drivers/staging/iio/magnetometer/magnet.h | 12 |
5 files changed, 47 insertions, 58 deletions
diff --git a/drivers/staging/iio/accel/inclinometer.h b/drivers/staging/iio/accel/inclinometer.h new file mode 100644 index 00000000000..5b49f835eac --- /dev/null +++ b/drivers/staging/iio/accel/inclinometer.h | |||
@@ -0,0 +1,23 @@ | |||
1 | /* | ||
2 | * Inclinometer related attributes | ||
3 | */ | ||
4 | #include "../sysfs.h" | ||
5 | |||
6 | #define IIO_DEV_ATTR_INCLI_X(_show, _addr) \ | ||
7 | IIO_DEVICE_ATTR(incli_x_raw, S_IRUGO, _show, NULL, _addr) | ||
8 | |||
9 | #define IIO_DEV_ATTR_INCLI_Y(_show, _addr) \ | ||
10 | IIO_DEVICE_ATTR(incli_y_raw, S_IRUGO, _show, NULL, _addr) | ||
11 | |||
12 | #define IIO_DEV_ATTR_INCLI_Z(_show, _addr) \ | ||
13 | IIO_DEVICE_ATTR(incli_z_raw, S_IRUGO, _show, NULL, _addr) | ||
14 | |||
15 | #define IIO_DEV_ATTR_INCLI_X_OFFSET(_mode, _show, _store, _addr) \ | ||
16 | IIO_DEVICE_ATTR(incli_x_offset, _mode, _show, _store, _addr) | ||
17 | |||
18 | #define IIO_DEV_ATTR_INCLI_Y_OFFSET(_mode, _show, _store, _addr) \ | ||
19 | IIO_DEVICE_ATTR(incli_y_offset, _mode, _show, _store, _addr) | ||
20 | |||
21 | #define IIO_DEV_ATTR_INCLI_Z_OFFSET(_mode, _show, _store, _addr) \ | ||
22 | IIO_DEVICE_ATTR(incli_z_offset, _mode, _show, _store, _addr) | ||
23 | |||
diff --git a/drivers/staging/iio/gyro/gyro.h b/drivers/staging/iio/gyro/gyro.h index 7c4dcf2f4a6..16f6ffa039b 100644 --- a/drivers/staging/iio/gyro/gyro.h +++ b/drivers/staging/iio/gyro/gyro.h | |||
@@ -28,49 +28,14 @@ | |||
28 | IIO_DEVICE_ATTR(gyro_scale, S_IRUGO, _show, _store, _addr) | 28 | IIO_DEVICE_ATTR(gyro_scale, S_IRUGO, _show, _store, _addr) |
29 | 29 | ||
30 | #define IIO_DEV_ATTR_GYRO(_show, _addr) \ | 30 | #define IIO_DEV_ATTR_GYRO(_show, _addr) \ |
31 | IIO_DEVICE_ATTR(gyro, S_IRUGO, _show, NULL, _addr) | 31 | IIO_DEVICE_ATTR(gyro_raw, S_IRUGO, _show, NULL, _addr) |
32 | 32 | ||
33 | #define IIO_DEV_ATTR_GYRO_X(_show, _addr) \ | 33 | #define IIO_DEV_ATTR_GYRO_X(_show, _addr) \ |
34 | IIO_DEVICE_ATTR(gyro_x, S_IRUGO, _show, NULL, _addr) | 34 | IIO_DEVICE_ATTR(gyro_x_raw, S_IRUGO, _show, NULL, _addr) |
35 | 35 | ||
36 | #define IIO_DEV_ATTR_GYRO_Y(_show, _addr) \ | 36 | #define IIO_DEV_ATTR_GYRO_Y(_show, _addr) \ |
37 | IIO_DEVICE_ATTR(gyro_y, S_IRUGO, _show, NULL, _addr) | 37 | IIO_DEVICE_ATTR(gyro_y_raw, S_IRUGO, _show, NULL, _addr) |
38 | 38 | ||
39 | #define IIO_DEV_ATTR_GYRO_Z(_show, _addr) \ | 39 | #define IIO_DEV_ATTR_GYRO_Z(_show, _addr) \ |
40 | IIO_DEVICE_ATTR(gyro_z, S_IRUGO, _show, NULL, _addr) | 40 | IIO_DEVICE_ATTR(gyro_z_raw, S_IRUGO, _show, NULL, _addr) |
41 | 41 | ||
42 | #define IIO_DEV_ATTR_TEMP_X(_show, _addr) \ | ||
43 | IIO_DEVICE_ATTR(temp_x, S_IRUGO, _show, NULL, _addr) | ||
44 | |||
45 | #define IIO_DEV_ATTR_TEMP_Y(_show, _addr) \ | ||
46 | IIO_DEVICE_ATTR(temp_y, S_IRUGO, _show, NULL, _addr) | ||
47 | |||
48 | #define IIO_DEV_ATTR_TEMP_Z(_show, _addr) \ | ||
49 | IIO_DEVICE_ATTR(temp_z, S_IRUGO, _show, NULL, _addr) | ||
50 | |||
51 | #define IIO_DEV_ATTR_INCLI_X(_show, _addr) \ | ||
52 | IIO_DEVICE_ATTR(incli_x, S_IRUGO, _show, NULL, _addr) | ||
53 | |||
54 | #define IIO_DEV_ATTR_INCLI_Y(_show, _addr) \ | ||
55 | IIO_DEVICE_ATTR(incli_y, S_IRUGO, _show, NULL, _addr) | ||
56 | |||
57 | #define IIO_DEV_ATTR_INCLI_Z(_show, _addr) \ | ||
58 | IIO_DEVICE_ATTR(incli_z, S_IRUGO, _show, NULL, _addr) | ||
59 | |||
60 | #define IIO_DEV_ATTR_INCLI_X_OFFSET(_mode, _show, _store, _addr) \ | ||
61 | IIO_DEVICE_ATTR(incli_x_offset, _mode, _show, _store, _addr) | ||
62 | |||
63 | #define IIO_DEV_ATTR_INCLI_Y_OFFSET(_mode, _show, _store, _addr) \ | ||
64 | IIO_DEVICE_ATTR(incli_y_offset, _mode, _show, _store, _addr) | ||
65 | |||
66 | #define IIO_DEV_ATTR_INCLI_Z_OFFSET(_mode, _show, _store, _addr) \ | ||
67 | IIO_DEVICE_ATTR(incli_z_offset, _mode, _show, _store, _addr) | ||
68 | |||
69 | #define IIO_DEV_ATTR_ROT(_show, _addr) \ | ||
70 | IIO_DEVICE_ATTR(rot, S_IRUGO, _show, NULL, _addr) | ||
71 | |||
72 | #define IIO_DEV_ATTR_ROT_OFFSET(_mode, _show, _store, _addr) \ | ||
73 | IIO_DEVICE_ATTR(rot_offset, _mode, _show, _store, _addr) | ||
74 | |||
75 | #define IIO_DEV_ATTR_ANGL(_show, _addr) \ | ||
76 | IIO_DEVICE_ATTR(angl, S_IRUGO, _show, NULL, _addr) | ||
diff --git a/drivers/staging/iio/imu/adis16300_core.c b/drivers/staging/iio/imu/adis16300_core.c index 9f5f8cb850d..b923eccf7bb 100644 --- a/drivers/staging/iio/imu/adis16300_core.c +++ b/drivers/staging/iio/imu/adis16300_core.c | |||
@@ -21,6 +21,7 @@ | |||
21 | #include "../iio.h" | 21 | #include "../iio.h" |
22 | #include "../sysfs.h" | 22 | #include "../sysfs.h" |
23 | #include "../accel/accel.h" | 23 | #include "../accel/accel.h" |
24 | #include "../accel/inclinometer.h" | ||
24 | #include "../gyro/gyro.h" | 25 | #include "../gyro/gyro.h" |
25 | #include "../adc/adc.h" | 26 | #include "../adc/adc.h" |
26 | 27 | ||
@@ -613,7 +614,7 @@ static IIO_DEV_ATTR_INCLI_Y(adis16300_read_13bit_signed, | |||
613 | ADIS16300_YINCLI_OUT); | 614 | ADIS16300_YINCLI_OUT); |
614 | static IIO_CONST_ATTR(incli_scale, "0.044 d"); | 615 | static IIO_CONST_ATTR(incli_scale, "0.044 d"); |
615 | 616 | ||
616 | static IIO_DEV_ATTR_TEMP(adis16300_read_12bit_signed); | 617 | static IIO_DEV_ATTR_TEMP_RAW(adis16300_read_12bit_signed); |
617 | static IIO_CONST_ATTR(temp_offset, "198.16 K"); | 618 | static IIO_CONST_ATTR(temp_offset, "198.16 K"); |
618 | static IIO_CONST_ATTR(temp_scale, "0.14 K"); | 619 | static IIO_CONST_ATTR(temp_scale, "0.14 K"); |
619 | 620 | ||
@@ -645,16 +646,16 @@ static struct attribute *adis16300_attributes[] = { | |||
645 | &iio_dev_attr_accel_z_offset.dev_attr.attr, | 646 | &iio_dev_attr_accel_z_offset.dev_attr.attr, |
646 | &iio_dev_attr_in_supply_raw.dev_attr.attr, | 647 | &iio_dev_attr_in_supply_raw.dev_attr.attr, |
647 | &iio_const_attr_in_supply_scale.dev_attr.attr, | 648 | &iio_const_attr_in_supply_scale.dev_attr.attr, |
648 | &iio_dev_attr_gyro_x.dev_attr.attr, | 649 | &iio_dev_attr_gyro_x_raw.dev_attr.attr, |
649 | &iio_const_attr_gyro_scale.dev_attr.attr, | 650 | &iio_const_attr_gyro_scale.dev_attr.attr, |
650 | &iio_dev_attr_accel_x_raw.dev_attr.attr, | 651 | &iio_dev_attr_accel_x_raw.dev_attr.attr, |
651 | &iio_dev_attr_accel_y_raw.dev_attr.attr, | 652 | &iio_dev_attr_accel_y_raw.dev_attr.attr, |
652 | &iio_dev_attr_accel_z_raw.dev_attr.attr, | 653 | &iio_dev_attr_accel_z_raw.dev_attr.attr, |
653 | &iio_const_attr_accel_scale.dev_attr.attr, | 654 | &iio_const_attr_accel_scale.dev_attr.attr, |
654 | &iio_dev_attr_incli_x.dev_attr.attr, | 655 | &iio_dev_attr_incli_x_raw.dev_attr.attr, |
655 | &iio_dev_attr_incli_y.dev_attr.attr, | 656 | &iio_dev_attr_incli_y_raw.dev_attr.attr, |
656 | &iio_const_attr_incli_scale.dev_attr.attr, | 657 | &iio_const_attr_incli_scale.dev_attr.attr, |
657 | &iio_dev_attr_temp.dev_attr.attr, | 658 | &iio_dev_attr_temp_raw.dev_attr.attr, |
658 | &iio_const_attr_temp_offset.dev_attr.attr, | 659 | &iio_const_attr_temp_offset.dev_attr.attr, |
659 | &iio_const_attr_temp_scale.dev_attr.attr, | 660 | &iio_const_attr_temp_scale.dev_attr.attr, |
660 | &iio_dev_attr_in0_raw.dev_attr.attr, | 661 | &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 27e4a734807..868c52658a5 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, | |||
626 | static IIO_CONST_ATTR(magn_scale, "0.0005 Gs"); | 626 | static IIO_CONST_ATTR(magn_scale, "0.0005 Gs"); |
627 | 627 | ||
628 | 628 | ||
629 | static IIO_DEV_ATTR_TEMP(adis16400_read_12bit_signed); | 629 | static IIO_DEV_ATTR_TEMP_RAW(adis16400_read_12bit_signed); |
630 | static IIO_CONST_ATTR(temp_offset, "198.16 K"); | 630 | static IIO_CONST_ATTR(temp_offset, "198.16 K"); |
631 | static IIO_CONST_ATTR(temp_scale, "0.14 K"); | 631 | static IIO_CONST_ATTR(temp_scale, "0.14 K"); |
632 | 632 | ||
@@ -658,19 +658,19 @@ static struct attribute *adis16400_attributes[] = { | |||
658 | &iio_dev_attr_accel_z_offset.dev_attr.attr, | 658 | &iio_dev_attr_accel_z_offset.dev_attr.attr, |
659 | &iio_dev_attr_in_supply_raw.dev_attr.attr, | 659 | &iio_dev_attr_in_supply_raw.dev_attr.attr, |
660 | &iio_const_attr_in_supply_scale.dev_attr.attr, | 660 | &iio_const_attr_in_supply_scale.dev_attr.attr, |
661 | &iio_dev_attr_gyro_x.dev_attr.attr, | 661 | &iio_dev_attr_gyro_x_raw.dev_attr.attr, |
662 | &iio_dev_attr_gyro_y.dev_attr.attr, | 662 | &iio_dev_attr_gyro_y_raw.dev_attr.attr, |
663 | &iio_dev_attr_gyro_z.dev_attr.attr, | 663 | &iio_dev_attr_gyro_z_raw.dev_attr.attr, |
664 | &iio_const_attr_gyro_scale.dev_attr.attr, | 664 | &iio_const_attr_gyro_scale.dev_attr.attr, |
665 | &iio_dev_attr_accel_x_raw.dev_attr.attr, | 665 | &iio_dev_attr_accel_x_raw.dev_attr.attr, |
666 | &iio_dev_attr_accel_y_raw.dev_attr.attr, | 666 | &iio_dev_attr_accel_y_raw.dev_attr.attr, |
667 | &iio_dev_attr_accel_z_raw.dev_attr.attr, | 667 | &iio_dev_attr_accel_z_raw.dev_attr.attr, |
668 | &iio_const_attr_accel_scale.dev_attr.attr, | 668 | &iio_const_attr_accel_scale.dev_attr.attr, |
669 | &iio_dev_attr_magn_x.dev_attr.attr, | 669 | &iio_dev_attr_magn_x_raw.dev_attr.attr, |
670 | &iio_dev_attr_magn_y.dev_attr.attr, | 670 | &iio_dev_attr_magn_y_raw.dev_attr.attr, |
671 | &iio_dev_attr_magn_z.dev_attr.attr, | 671 | &iio_dev_attr_magn_z_raw.dev_attr.attr, |
672 | &iio_const_attr_magn_scale.dev_attr.attr, | 672 | &iio_const_attr_magn_scale.dev_attr.attr, |
673 | &iio_dev_attr_temp.dev_attr.attr, | 673 | &iio_dev_attr_temp_raw.dev_attr.attr, |
674 | &iio_const_attr_temp_offset.dev_attr.attr, | 674 | &iio_const_attr_temp_offset.dev_attr.attr, |
675 | &iio_const_attr_temp_scale.dev_attr.attr, | 675 | &iio_const_attr_temp_scale.dev_attr.attr, |
676 | &iio_dev_attr_in0_raw.dev_attr.attr, | 676 | &iio_dev_attr_in0_raw.dev_attr.attr, |
diff --git a/drivers/staging/iio/magnetometer/magnet.h b/drivers/staging/iio/magnetometer/magnet.h index 6f6c6ed91fa..64338301f8d 100644 --- a/drivers/staging/iio/magnetometer/magnet.h +++ b/drivers/staging/iio/magnetometer/magnet.h | |||
@@ -21,11 +21,11 @@ | |||
21 | #define IIO_DEV_ATTR_MAGN_Z_GAIN(_mode, _show, _store, _addr) \ | 21 | #define IIO_DEV_ATTR_MAGN_Z_GAIN(_mode, _show, _store, _addr) \ |
22 | IIO_DEVICE_ATTR(magn_z_gain, _mode, _show, _store, _addr) | 22 | IIO_DEVICE_ATTR(magn_z_gain, _mode, _show, _store, _addr) |
23 | 23 | ||
24 | #define IIO_DEV_ATTR_MAGN_X(_show, _addr) \ | 24 | #define IIO_DEV_ATTR_MAGN_X(_show, _addr) \ |
25 | IIO_DEVICE_ATTR(magn_x, S_IRUGO, _show, NULL, _addr) | 25 | IIO_DEVICE_ATTR(magn_x_raw, S_IRUGO, _show, NULL, _addr) |
26 | 26 | ||
27 | #define IIO_DEV_ATTR_MAGN_Y(_show, _addr) \ | 27 | #define IIO_DEV_ATTR_MAGN_Y(_show, _addr) \ |
28 | IIO_DEVICE_ATTR(magn_y, S_IRUGO, _show, NULL, _addr) | 28 | IIO_DEVICE_ATTR(magn_y_raw, S_IRUGO, _show, NULL, _addr) |
29 | 29 | ||
30 | #define IIO_DEV_ATTR_MAGN_Z(_show, _addr) \ | 30 | #define IIO_DEV_ATTR_MAGN_Z(_show, _addr) \ |
31 | IIO_DEVICE_ATTR(magn_z, S_IRUGO, _show, NULL, _addr) | 31 | IIO_DEVICE_ATTR(magn_z_raw, S_IRUGO, _show, NULL, _addr) |