On Sun, May 22, 2016 at 12:47 PM, Jonathan Cameron <jic23@xxxxxxxxxx> wrote:
> On 20/05/16 02:53, Matt Ranostay wrote:
>> Signed-off-by: Matt Ranostay <mranostay@xxxxxxxxx>
>> ---
>> Documentation/ABI/testing/sysfs-bus-iio | 7 +++++++
>> drivers/iio/industrialio-core.c | 1 +
>> include/uapi/linux/iio/types.h | 1 +
>> 3 files changed, 9 insertions(+)
>>
>> diff --git a/Documentation/ABI/testing/sysfs-bus-iio b/Documentation/ABI/testing/sysfs-bus-iio
>> index df44998..adfdf95 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@xxxxxxxxxxxxxxx
>> +Description:
>> + Raw (unscaled no offset etc.) electric conductivity reading that
>> + maps to microsiemens per centimeter.
> Rather than seimens per m? Seems like the units are a mess when measuring this and
> we do in theory aim for the basic SI units where possible...
>
Yeah seems most meters output this when they mean EC to be
microsiemens per cm....
I have no issue making this a siemens per meter and update the scaling
in the other patchset.
Thoughts?
> Otherwise, this looks fine to me.
>
>> diff --git a/drivers/iio/industrialio-core.c b/drivers/iio/industrialio-core.c
>> index e6319a9..2a85bd8 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 b0916fc..22e5e58 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 {
>>
>
--
To unsubscribe from this list: send the line "unsubscribe linux-iio" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
