aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Hennerich <[email protected]>2011-05-18 14:42:02 +0100
committerGreg Kroah-Hartman <[email protected]>2011-05-19 16:14:58 -0700
commitfaf290e867fd51e227165d0bef113b022520a58f (patch)
treeeab531271bfd8e83c595029e5e029c756e8c50fe
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 <[email protected]> Acked-by: Jonathan Cameron <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
-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 {
/* real channel types */
IIO_IN,
+ IIO_CURRENT,
+ IIO_POWER,
IIO_ACCEL,
IIO_IN_DIFF,
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[] = {
[IIO_TIMESTAMP] = "timestamp",
[IIO_ACCEL] = "accel",
[IIO_IN] = "in",
+ [IIO_CURRENT] = "current",
+ [IIO_POWER] = "power",
[IIO_IN_DIFF] = "in-in",
[IIO_GYRO] = "gyro",
[IIO_TEMP] = "temp",