aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorMichael Hennerich <michael.hennerich@analog.com>2011-05-18 09:42:02 -0400
committerGreg Kroah-Hartman <gregkh@suse.de>2011-05-19 19:14:58 -0400
commitfaf290e867fd51e227165d0bef113b022520a58f (patch)
treeeab531271bfd8e83c595029e5e029c756e8c50fe /drivers
parente61181d0a3e6788d57de9c1ae305d1c6f5fabade (diff)
staging:iio: Add channel types IIO_CURRENT and IIO_POWER.
This is required for the ADE7758 driver cleanup. Signed-off-by: Michael Hennerich <michael.hennerich@analog.com> Acked-by: Jonathan Cameron <jic23@cam.ac.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/staging/iio/iio.h2
-rw-r--r--drivers/staging/iio/industrialio-core.c2
2 files changed, 4 insertions, 0 deletions
diff --git a/drivers/staging/iio/iio.h b/drivers/staging/iio/iio.h
index 1a6bedc01f4c..c6fda58b4bd1 100644
--- a/drivers/staging/iio/iio.h
+++ b/drivers/staging/iio/iio.h
@@ -36,6 +36,8 @@ enum iio_chan_type {
36 36
37 /* real channel types */ 37 /* real channel types */
38 IIO_IN, 38 IIO_IN,
39 IIO_CURRENT,
40 IIO_POWER,
39 IIO_ACCEL, 41 IIO_ACCEL,
40 IIO_IN_DIFF, 42 IIO_IN_DIFF,
41 IIO_GYRO, 43 IIO_GYRO,
diff --git a/drivers/staging/iio/industrialio-core.c b/drivers/staging/iio/industrialio-core.c
index e3582c9e18c1..fc20a06a2a1b 100644
--- a/drivers/staging/iio/industrialio-core.c
+++ b/drivers/staging/iio/industrialio-core.c
@@ -48,6 +48,8 @@ static const char * const iio_chan_type_name_spec_shared[] = {
48 [IIO_TIMESTAMP] = "timestamp", 48 [IIO_TIMESTAMP] = "timestamp",
49 [IIO_ACCEL] = "accel", 49 [IIO_ACCEL] = "accel",
50 [IIO_IN] = "in", 50 [IIO_IN] = "in",
51 [IIO_CURRENT] = "current",
52 [IIO_POWER] = "power",
51 [IIO_IN_DIFF] = "in-in", 53 [IIO_IN_DIFF] = "in-in",
52 [IIO_GYRO] = "gyro", 54 [IIO_GYRO] = "gyro",
53 [IIO_TEMP] = "temp", 55 [IIO_TEMP] = "temp",