diff options
author | Michael Hennerich <michael.hennerich@analog.com> | 2011-05-18 14:42:02 +0100 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-05-19 16:14:58 -0700 |
commit | faf290e867fd51e227165d0bef113b022520a58f (patch) | |
tree | eab531271bfd8e83c595029e5e029c756e8c50fe | |
parent | e61181d0a3e6788d57de9c1ae305d1c6f5fabade (diff) | |
download | op-kernel-dev-faf290e867fd51e227165d0bef113b022520a58f.zip op-kernel-dev-faf290e867fd51e227165d0bef113b022520a58f.tar.gz |
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>
-rw-r--r-- | drivers/staging/iio/iio.h | 2 | ||||
-rw-r--r-- | drivers/staging/iio/industrialio-core.c | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/drivers/staging/iio/iio.h b/drivers/staging/iio/iio.h index 1a6bedc..c6fda58 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 e3582c9..fc20a06 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", |