On 14/09/15 04:26, Matt Ranostay wrote: > Signed-off-by: Matt Ranostay <[email protected]> Applied to the togreg branch of iio.git - initially pushed out as testing for the autobuilders to play with it.
Thanks, Jonathan > --- > Documentation/ABI/testing/sysfs-bus-iio | 8 ++++++++ > drivers/iio/industrialio-core.c | 1 + > include/uapi/linux/iio/types.h | 1 + > 3 files changed, 10 insertions(+) > > diff --git a/Documentation/ABI/testing/sysfs-bus-iio > b/Documentation/ABI/testing/sysfs-bus-iio > index 682c070..a91af51 100644 > --- a/Documentation/ABI/testing/sysfs-bus-iio > +++ b/Documentation/ABI/testing/sysfs-bus-iio > @@ -1470,3 +1470,11 @@ KernelVersion: 4.3 > Contact: [email protected] > 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: [email protected] > +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 8eb6064..80439a6 100644 > --- 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 1e4c4e3..7c63bd6 100644 > --- 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 { > -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
