iio: resistance: add IIO_RESISTANCE channel type

Signed-off-by: Matt Ranostay <mranostay@gmail.com>
Signed-off-by: Jonathan Cameron <jic23@kernel.org>

diff --git a/Documentation/ABI/testing/sysfs-bus-iio b/Documentation/ABI/testing/sysfs-bus-iio
index 08903b940957d6dce8c9b489d99e84743b40dad3..8ce14c85156db860461a9df780fb427832b60f03 100644 (file)
--- a/Documentation/ABI/testing/sysfs-bus-iio
+++ b/Documentation/ABI/testing/sysfs-bus-iio
@@ -1471,3 +1471,11 @@ KernelVersion:   4.3
 Contact:       linux-iio@vger.kernel.org
 Description:
                Raw (unscaled no offset etc.) percentage reading of a substance.
+
+What:          /sys/bus/iio/devices/iio:deviceX/in_resistance_raw
+What:          /sys/bus/iio/devices/iio:deviceX/in_resistanceX_raw
+KernelVersion: 4.3
+Contact:       linux-iio@vger.kernel.org
+Description:
+               Raw (unscaled no offset etc.) resistance reading that can be processed
+               into an ohm value.

diff --git a/drivers/iio/industrialio-core.c b/drivers/iio/industrialio-core.c
index ee09a945a2c7abb5f5593b8fec1a58dba501f5e8..208358f9e7e36582152cad8c4f4924d9667a58cc 100644 (file)
--- a/drivers/iio/industrialio-core.c
+++ b/drivers/iio/industrialio-core.c
@@ -76,6 +76,7 @@ static const char * const iio_chan_type_name_spec[] = {
        [IIO_DISTANCE] = "distance",
        [IIO_VELOCITY] = "velocity",
        [IIO_CONCENTRATION] = "concentration",
+       [IIO_RESISTANCE] = "resistance",
 };
 
 static const char * const iio_modifier_names[] = {

diff --git a/include/uapi/linux/iio/types.h b/include/uapi/linux/iio/types.h
index 1e4c4e346ffbadd18453d5910f57d2ff95c2c4c4..7c63bd67c36e274f933a857b23ee00e5e1c2daed 100644 (file)
--- a/include/uapi/linux/iio/types.h
+++ b/include/uapi/linux/iio/types.h
@@ -36,6 +36,7 @@ enum iio_chan_type {
        IIO_DISTANCE,
        IIO_VELOCITY,
        IIO_CONCENTRATION,
+       IIO_RESISTANCE,
 };
 
 enum iio_modifier {