aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorMichael Hennerich <michael.hennerich@analog.com>2012-04-27 04:58:34 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-04-29 21:26:17 -0400
commita6b12855b58bff429f3961e2577b8bbbb48fe470 (patch)
tree0898c015521acee7f9c4b64e8eb080fffdb54f87 /include
parente4e8d1ce81bad2c39cf738186ec559b0bebbbdde (diff)
iio: core: Introduce IIO_ALTVOLTAGE and appropriate channel info elements
Signed-off-by: Michael Hennerich <michael.hennerich@analog.com> Acked-by: Jonathan Cameron <jic23@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'include')
-rw-r--r--include/linux/iio/iio.h10
-rw-r--r--include/linux/iio/types.h1
2 files changed, 11 insertions, 0 deletions
diff --git a/include/linux/iio/iio.h b/include/linux/iio/iio.h
index d21833909327..43002b2b1e38 100644
--- a/include/linux/iio/iio.h
+++ b/include/linux/iio/iio.h
@@ -32,6 +32,8 @@ enum iio_chan_info_enum {
32 IIO_CHAN_INFO_AVERAGE_RAW, 32 IIO_CHAN_INFO_AVERAGE_RAW,
33 IIO_CHAN_INFO_LOW_PASS_FILTER_3DB_FREQUENCY, 33 IIO_CHAN_INFO_LOW_PASS_FILTER_3DB_FREQUENCY,
34 IIO_CHAN_INFO_SAMP_FREQ, 34 IIO_CHAN_INFO_SAMP_FREQ,
35 IIO_CHAN_INFO_FREQUENCY,
36 IIO_CHAN_INFO_PHASE,
35}; 37};
36 38
37#define IIO_CHAN_INFO_SHARED_BIT(type) BIT(type*2) 39#define IIO_CHAN_INFO_SHARED_BIT(type) BIT(type*2)
@@ -85,6 +87,14 @@ enum iio_chan_info_enum {
85 IIO_CHAN_INFO_SEPARATE_BIT(IIO_CHAN_INFO_SAMP_FREQ) 87 IIO_CHAN_INFO_SEPARATE_BIT(IIO_CHAN_INFO_SAMP_FREQ)
86#define IIO_CHAN_INFO_SAMP_FREQ_SHARED_BIT \ 88#define IIO_CHAN_INFO_SAMP_FREQ_SHARED_BIT \
87 IIO_CHAN_INFO_SHARED_BIT(IIO_CHAN_INFO_SAMP_FREQ) 89 IIO_CHAN_INFO_SHARED_BIT(IIO_CHAN_INFO_SAMP_FREQ)
90#define IIO_CHAN_INFO_FREQUENCY_SEPARATE_BIT \
91 IIO_CHAN_INFO_SEPARATE_BIT(IIO_CHAN_INFO_FREQUENCY)
92#define IIO_CHAN_INFO_FREQUENCY_SHARED_BIT \
93 IIO_CHAN_INFO_SHARED_BIT(IIO_CHAN_INFO_FREQUENCY)
94#define IIO_CHAN_INFO_PHASE_SEPARATE_BIT \
95 IIO_CHAN_INFO_SEPARATE_BIT(IIO_CHAN_INFO_PHASE)
96#define IIO_CHAN_INFO_PHASE_SHARED_BIT \
97 IIO_CHAN_INFO_SHARED_BIT(IIO_CHAN_INFO_PHASE)
88 98
89enum iio_endian { 99enum iio_endian {
90 IIO_CPU, 100 IIO_CPU,
diff --git a/include/linux/iio/types.h b/include/linux/iio/types.h
index 0c3213666901..a471fd5a4d95 100644
--- a/include/linux/iio/types.h
+++ b/include/linux/iio/types.h
@@ -27,6 +27,7 @@ enum iio_chan_type {
27 IIO_ANGL, 27 IIO_ANGL,
28 IIO_TIMESTAMP, 28 IIO_TIMESTAMP,
29 IIO_CAPACITANCE, 29 IIO_CAPACITANCE,
30 IIO_ALTVOLTAGE,
30}; 31};
31 32
32enum iio_modifier { 33enum iio_modifier {