staging:iio: Add channel types IIO_CURRENT and IIO_POWER.
authorMichael Hennerich <michael.hennerich@analog.com>
Wed, 18 May 2011 13:42:02 +0000 (14:42 +0100)
committerGreg Kroah-Hartman <gregkh@suse.de>
Thu, 19 May 2011 23:14:58 +0000 (16:14 -0700)
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>
drivers/staging/iio/iio.h
drivers/staging/iio/industrialio-core.c

index 1a6bedc01f4c141d98426732032652a6e4afb52c..c6fda58b4bd104a4a392dd3fc7bf485aa3916dd4 100644 (file)
@@ -36,6 +36,8 @@ enum iio_chan_type {
 
        /* real channel types */
        IIO_IN,
+       IIO_CURRENT,
+       IIO_POWER,
        IIO_ACCEL,
        IIO_IN_DIFF,
        IIO_GYRO,
index e3582c9e18c14ad0acfdca3e8e446cc1e8bca66c..fc20a06a2a1bc9ad3ee86d02c64426020c567854 100644 (file)
@@ -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",