Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4b9d2090 authored by Matt Ranostay's avatar Matt Ranostay Committed by Jonathan Cameron
Browse files

iio: electricalconductivity: add IIO_ELECTRICALCONDUCTIVITY type 



Signed-off-by: default avatarMatt Ranostay <mranostay@gmail.com>
Signed-off-by: default avatarJonathan Cameron <jic23@kernel.org>
parent 7103b99b

Documentation/ABI/testing/sysfs-bus-iio

+7 −0
Original line number Diff line number Diff line
@@ -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.

drivers/iio/industrialio-core.c

+1 −0
Original line number Diff line number Diff line
@@ -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[] = {

include/uapi/linux/iio/types.h

+1 −0
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ enum iio_chan_type { 
	IIO_RESISTANCE,

	IIO_PH,

	IIO_UVINDEX,

	IIO_ELECTRICALCONDUCTIVITY,

};



enum iio_modifier {