staging:iio: Add capacitance type and average_raw chan info.
authorJonathan Cameron <jic23@cam.ac.uk>
Fri, 2 Sep 2011 16:14:43 +0000 (17:14 +0100)
committerGreg Kroah-Hartman <gregkh@suse.de>
Tue, 6 Sep 2011 23:02:02 +0000 (16:02 -0700)
These are both needed for CAPADCs

Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk>
Acked-by: Michael Hennerich <Michael.Hennerich@analog.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
drivers/staging/iio/iio.h
drivers/staging/iio/industrialio-core.c

index a59988fd8364796933649f12333bd19aaf7b227f..742f6c659a713ac334d1ba5a7f042176491b8fe7 100644 (file)
@@ -42,6 +42,7 @@ enum iio_chan_type {
        IIO_ROT,
        IIO_ANGL,
        IIO_TIMESTAMP,
+       IIO_CAPACITANCE,
 };
 
 /* Nasty hack to avoid massive churn */
@@ -81,6 +82,8 @@ enum iio_chan_info_enum {
        IIO_CHAN_INFO_PEAK_SCALE_SEPARATE,
        IIO_CHAN_INFO_QUADRATURE_CORRECTION_RAW_SHARED,
        IIO_CHAN_INFO_QUADRATURE_CORRECTION_RAW_SEPARATE,
+       IIO_CHAN_INFO_AVERAGE_RAW_SHARED,
+       IIO_CHAN_INFO_AVERAGE_RAW_SEPARATE,
 };
 
 enum iio_endian {
index 8c054c0a715b2599c7ba68a5af41030321efa30d..44a5be56208c87b02e02001b1493163b34c8757e 100644 (file)
@@ -65,6 +65,7 @@ static const char * const iio_chan_type_name_spec_shared[] = {
        [IIO_ROT] = "rot",
        [IIO_ANGL] = "angl",
        [IIO_TIMESTAMP] = "timestamp",
+       [IIO_CAPACITANCE] = "capacitance",
 };
 
 static const char * const iio_chan_type_name_spec_complex[] = {
@@ -89,6 +90,7 @@ static const char * const iio_chan_info_postfix[] = {
        [IIO_CHAN_INFO_PEAK_SCALE_SHARED/2] = "peak_scale",
        [IIO_CHAN_INFO_QUADRATURE_CORRECTION_RAW_SHARED/2]
        = "quadrature_correction_raw",
+       [IIO_CHAN_INFO_AVERAGE_RAW_SHARED/2] = "mean_raw",
 };
 
 /**