iio: electricalconductivity: add IIO_ELECTRICALCONDUCTIVITY type

Signed-off-by: Matt Ranostay <[email protected]>
Signed-off-by: Jonathan Cameron <[email protected]>

diff --git a/Documentation/ABI/testing/sysfs-bus-iio b/Documentation/ABI/testing/sysfs-bus-iio
index df44998e7506cc49ea54fe276bc9239a8b21d09f..e7f590c6ef8e1e8a1ec7e5eb0364b752cf9047f4 100644 (file)
--- 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:       [email protected]
+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 e6319a9346b2691e855cb5ea04920b8163f3692a..2a85bd8886190c1a63fcea803cff40e931b7dc61 100644 (file)
--- 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 b0916fc72cce733e760fb5d92b3f510c1cd25514..22e5e589a2747beff6d59f40d44ce99364c85415 100644 (file)
--- 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 {