From: Jonathan Cameron <jic23@kernel.org>
To: Peter Meerwald <pmeerw@pmeerw.net>, linux-iio@vger.kernel.org
Subject: Re: [PATCH 1/3] iio: Add TEMP_AMBIENT and TEMP_OBJECT channel modifiers
Date: Sat, 03 May 2014 11:39:04 +0100 [thread overview]
Message-ID: <5364C748.6010601@kernel.org> (raw)
In-Reply-To: <1399046226-6673-2-git-send-email-pmeerw@pmeerw.net>
On 02/05/14 16:57, Peter Meerwald wrote:
> useful for contactless temperature sensors to distinguish
> between the ambient temperature and the temperature of the object
>
> Signed-off-by: Peter Meerwald <pmeerw@pmeerw.net>
Applied to the togreg branch of iio.git
Thanks
> ---
> drivers/iio/industrialio-core.c | 2 ++
> include/linux/iio/types.h | 2 ++
> 2 files changed, 4 insertions(+)
>
> diff --git a/drivers/iio/industrialio-core.c b/drivers/iio/industrialio-core.c
> index de8b1c2..4b1f375 100644
> --- a/drivers/iio/industrialio-core.c
> +++ b/drivers/iio/industrialio-core.c
> @@ -85,6 +85,8 @@ static const char * const iio_modifier_names[] = {
> [IIO_MOD_LIGHT_GREEN] = "green",
> [IIO_MOD_LIGHT_BLUE] = "blue",
> [IIO_MOD_QUATERNION] = "quaternion",
> + [IIO_MOD_TEMP_AMBIENT] = "ambient",
> + [IIO_MOD_TEMP_OBJECT] = "object",
> };
>
> /* relies on pairs of these shared then separate */
> diff --git a/include/linux/iio/types.h b/include/linux/iio/types.h
> index 4fdab2e..d480631 100644
> --- a/include/linux/iio/types.h
> +++ b/include/linux/iio/types.h
> @@ -54,6 +54,8 @@ enum iio_modifier {
> IIO_MOD_LIGHT_GREEN,
> IIO_MOD_LIGHT_BLUE,
> IIO_MOD_QUATERNION,
> + IIO_MOD_TEMP_AMBIENT,
> + IIO_MOD_TEMP_OBJECT,
> };
>
> enum iio_event_type {
>
next prev parent reply other threads:[~2014-05-03 10:37 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-05-02 15:57 [PATCH 0/3] iio: mlx90614, take 2 Peter Meerwald
2014-05-02 15:57 ` [PATCH 1/3] iio: Add TEMP_AMBIENT and TEMP_OBJECT channel modifiers Peter Meerwald
2014-05-03 10:39 ` Jonathan Cameron [this message]
2014-05-02 15:57 ` [PATCH 2/3] iio: Add ABI documentation for object and ambient modifiers Peter Meerwald
2014-05-03 10:39 ` Jonathan Cameron
2014-05-02 15:57 ` [PATCH 3/3] iio: Add Melexis mlx90614 contact-less infrared temperature sensor driver Peter Meerwald
2014-05-03 10:38 ` 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=5364C748.6010601@kernel.org \
--to=jic23@kernel.org \
--cc=linux-iio@vger.kernel.org \
--cc=pmeerw@pmeerw.net \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).