iio: electricalconductivity: add IIO_ELECTRICALCONDUCTIVITY type

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

3 files changed, 9 insertions, 0 deletions

diff --git a/Documentation/ABI/testing/sysfs-bus-iio b/Documentation/ABI/testing/sysfs-bus-iio
index df44998e7506..e7f590c6ef8e 100644
--- a/Documentation/ABI/testing/sysfs-bus-iio
+++ b/Documentation/ABI/testing/sysfs-bus-iio
@@ -1565,3 +1565,10 @@ Description:
                 * X is in the plane of the propellers, perpendicular to Y axis,
                   and positive towards the starboard side of the UAV ;
                 * Z is perpendicular to propellers plane and positive upwards.
+
+What:           /sys/bus/iio/devices/iio:deviceX/in_electricalconductivity_raw
+KernelVersion:  4.8
+Contact:        linux-iio@vger.kernel.org
+Description:
+                Raw (unscaled no offset etc.) electric conductivity reading that
+                can be processed to siemens per meter.
diff --git a/drivers/iio/industrialio-core.c b/drivers/iio/industrialio-core.c
index e6319a9346b2..2a85bd888619 100644
--- a/drivers/iio/industrialio-core.c
+++ b/drivers/iio/industrialio-core.c
@@ -80,6 +80,7 @@ static const char * const iio_chan_type_name_spec[] = {
         [IIO_RESISTANCE] = "resistance",
         [IIO_PH] = "ph",
         [IIO_UVINDEX] = "uvindex",
+        [IIO_ELECTRICALCONDUCTIVITY] = "electricalconductivity",
 };
 
 static const char * const iio_modifier_names[] = {
diff --git a/include/uapi/linux/iio/types.h b/include/uapi/linux/iio/types.h
index b0916fc72cce..22e5e589a274 100644
--- a/include/uapi/linux/iio/types.h
+++ b/include/uapi/linux/iio/types.h
@@ -39,6 +39,7 @@ enum iio_chan_type {
         IIO_RESISTANCE,
         IIO_PH,
         IIO_UVINDEX,
+        IIO_ELECTRICALCONDUCTIVITY,
 };
 
 enum iio_modifier {