From 66dbe70437b561c241d1117dd291c11db21072fd Mon Sep 17 00:00:00 2001 From: Jonathan Cameron Date: Fri, 2 Sep 2011 17:14:43 +0100 Subject: [PATCH] staging:iio: Add capacitance type and average_raw chan info. These are both needed for CAPADCs Signed-off-by: Jonathan Cameron Acked-by: Michael Hennerich Signed-off-by: Greg Kroah-Hartman --- drivers/staging/iio/iio.h | 3 +++ drivers/staging/iio/industrialio-core.c | 2 ++ 2 files changed, 5 insertions(+) diff --git a/drivers/staging/iio/iio.h b/drivers/staging/iio/iio.h index a59988f..742f6c6 100644 --- a/drivers/staging/iio/iio.h +++ b/drivers/staging/iio/iio.h @@ -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 { diff --git a/drivers/staging/iio/industrialio-core.c b/drivers/staging/iio/industrialio-core.c index 8c054c0..44a5be5 100644 --- a/drivers/staging/iio/industrialio-core.c +++ b/drivers/staging/iio/industrialio-core.c @@ -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", }; /** -- 2.7.4