From: Jonathan Cameron <jic23@kernel.org>
To: Matt Ranostay <mranostay@gmail.com>
Cc: linux-iio@vger.kernel.org
Subject: Re: [PATCH v5 2/3] iio: ph: add IIO_PH channel type
Date: Sat, 30 Jan 2016 16:17:24 +0000 [thread overview]
Message-ID: <56ACE214.3090908@kernel.org> (raw)
In-Reply-To: <1453862071-1610-3-git-send-email-mranostay@gmail.com>
On 27/01/16 02:34, Matt Ranostay wrote:
> Signed-off-by: Matt Ranostay <mranostay@gmail.com>
Applied.
> ---
> 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 0439c2a..86ba8d6 100644
> --- a/Documentation/ABI/testing/sysfs-bus-iio
> +++ b/Documentation/ABI/testing/sysfs-bus-iio
> @@ -1491,3 +1491,10 @@ Description:
> This ABI is especially applicable for humidity sensors
> to heatup the device and get rid of any condensation
> in some humidity environment
> +
> +What: /sys/bus/iio/devices/iio:deviceX/in_ph_raw
> +KernelVersion: 4.5
> +Contact: linux-iio@vger.kernel.org
> +Description:
> + Raw (unscaled no offset etc.) pH reading of a substance as a negative
> + base-10 logarithm of hydrodium ions in a litre of water.
> diff --git a/drivers/iio/industrialio-core.c b/drivers/iio/industrialio-core.c
> index af7cc1e..70cb7eb 100644
> --- a/drivers/iio/industrialio-core.c
> +++ b/drivers/iio/industrialio-core.c
> @@ -77,6 +77,7 @@ static const char * const iio_chan_type_name_spec[] = {
> [IIO_VELOCITY] = "velocity",
> [IIO_CONCENTRATION] = "concentration",
> [IIO_RESISTANCE] = "resistance",
> + [IIO_PH] = "ph",
> };
>
> static const char * const iio_modifier_names[] = {
> diff --git a/include/uapi/linux/iio/types.h b/include/uapi/linux/iio/types.h
> index 7c63bd6..c077617 100644
> --- a/include/uapi/linux/iio/types.h
> +++ b/include/uapi/linux/iio/types.h
> @@ -37,6 +37,7 @@ enum iio_chan_type {
> IIO_VELOCITY,
> IIO_CONCENTRATION,
> IIO_RESISTANCE,
> + IIO_PH,
> };
>
> enum iio_modifier {
>
next prev parent reply other threads:[~2016-01-30 16:17 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-01-27 2:34 [PATCH v5 0/3] iio: chemical: add Atlas pH-SM sensor support Matt Ranostay
2016-01-27 2:34 ` [PATCH v5 1/3] devicetree: add Atlas Scientific LLC vendor prefix Matt Ranostay
2016-01-30 16:17 ` Jonathan Cameron
2016-01-27 2:34 ` [PATCH v5 2/3] iio: ph: add IIO_PH channel type Matt Ranostay
2016-01-30 16:17 ` Jonathan Cameron [this message]
2016-01-27 2:34 ` [PATCH v5 3/3] iio: chemical: add Atlas pH-SM sensor support Matt Ranostay
2016-01-30 16:18 ` Jonathan Cameron
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=56ACE214.3090908@kernel.org \
--to=jic23@kernel.org \
--cc=linux-iio@vger.kernel.org \
--cc=mranostay@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.