summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJonathan Cameron <jic23@cam.ac.uk>2011-05-18 14:41:57 +0100
committerGreg Kroah-Hartman <gregkh@suse.de>2011-05-19 16:14:57 -0700
commiteb7fea53e53ed47e82b4cc9911dd8fdc7f953de5 (patch)
treea168b17e7bf6ab2787689ef40c586b5d497c17a1
parent1e8fa5b8631a0965065d621240c0eafe879ac5d0 (diff)
downloadop-kernel-dev-eb7fea53e53ed47e82b4cc9911dd8fdc7f953de5.zip
op-kernel-dev-eb7fea53e53ed47e82b4cc9911dd8fdc7f953de5.tar.gz
staging:iio: Add chan info support for 'peak_raw' attributes.
Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r--drivers/staging/iio/iio.h6
-rw-r--r--drivers/staging/iio/industrialio-core.c2
2 files changed, 7 insertions, 1 deletions
diff --git a/drivers/staging/iio/iio.h b/drivers/staging/iio/iio.h
index c6b471cf..1a6bedc 100644
--- a/drivers/staging/iio/iio.h
+++ b/drivers/staging/iio/iio.h
@@ -73,7 +73,11 @@ enum iio_chan_info_enum {
IIO_CHAN_INFO_CALIBSCALE_SHARED,
IIO_CHAN_INFO_CALIBSCALE_SEPARATE,
IIO_CHAN_INFO_CALIBBIAS_SHARED,
- IIO_CHAN_INFO_CALIBBIAS_SEPARATE
+ IIO_CHAN_INFO_CALIBBIAS_SEPARATE,
+ IIO_CHAN_INFO_PEAK_SHARED,
+ IIO_CHAN_INFO_PEAK_SEPARATE,
+ IIO_CHAN_INFO_PEAK_SCALE_SHARED,
+ IIO_CHAN_INFO_PEAK_SCALE_SEPARATE,
};
/**
diff --git a/drivers/staging/iio/industrialio-core.c b/drivers/staging/iio/industrialio-core.c
index e943dac..e3582c9 100644
--- a/drivers/staging/iio/industrialio-core.c
+++ b/drivers/staging/iio/industrialio-core.c
@@ -80,6 +80,8 @@ static const char * const iio_chan_info_postfix[] = {
[IIO_CHAN_INFO_OFFSET_SHARED/2] = "offset",
[IIO_CHAN_INFO_CALIBSCALE_SHARED/2] = "calibscale",
[IIO_CHAN_INFO_CALIBBIAS_SHARED/2] = "calibbias",
+ [IIO_CHAN_INFO_PEAK_SHARED/2] = "peak_raw",
+ [IIO_CHAN_INFO_PEAK_SCALE_SHARED/2] = "peak_scale",
};
int iio_push_event(struct iio_dev *dev_info,
OpenPOWER on IntegriCloud