From: Jonathan Cameron <jic23@cam.ac.uk>
To: michael.hennerich@analog.com
Cc: linux-iio@vger.kernel.org, drivers@analog.com,
device-drivers-devel@blackfin.uclinux.org
Subject: Re: [PATCH 2/2] IIO-work: Add channel types IIO_CURRENT and IIO_POWER
Date: Wed, 11 May 2011 13:18:24 +0100 [thread overview]
Message-ID: <4DCA7E90.1000803@cam.ac.uk> (raw)
In-Reply-To: <1305115119-8850-2-git-send-email-michael.hennerich@analog.com>
On 05/11/11 12:58, michael.hennerich@analog.com wrote:
> From: Michael Hennerich <michael.hennerich@analog.com>
>
> Add channel types IIO_CURRENT and IIO_POWER.
> This is required for the ADE7758 driver cleanup.
Will slot this one in right before the ade7758 patches.
>
> Signed-off-by: Michael Hennerich <michael.hennerich@analog.com>
Acked-by: Jonathan Cameron <jic23@cam.ac.uk>
> ---
> drivers/staging/iio/iio.h | 2 ++
> drivers/staging/iio/industrialio-core.c | 2 ++
> 2 files changed, 4 insertions(+), 0 deletions(-)
>
> diff --git a/drivers/staging/iio/iio.h b/drivers/staging/iio/iio.h
> index d9f2692..80a81d4 100644
> --- a/drivers/staging/iio/iio.h
> +++ b/drivers/staging/iio/iio.h
> @@ -30,6 +30,8 @@
> enum iio_chan_type {
> /* real channel types */
> IIO_IN,
> + IIO_CURRENT,
> + IIO_POWER,
> IIO_ACCEL,
> IIO_IN_DIFF,
> IIO_GYRO,
> diff --git a/drivers/staging/iio/industrialio-core.c b/drivers/staging/iio/industrialio-core.c
> index faa34af..9218fee 100644
> --- a/drivers/staging/iio/industrialio-core.c
> +++ b/drivers/staging/iio/industrialio-core.c
> @@ -47,6 +47,8 @@ static const char * const iio_chan_type_name_spec_shared[] = {
> [IIO_TIMESTAMP] = "timestamp",
> [IIO_ACCEL] = "accel",
> [IIO_IN] = "in",
> + [IIO_CURRENT] = "current",
> + [IIO_POWER] = "power",
> [IIO_IN_DIFF] = "in-in",
> [IIO_GYRO] = "gyro",
> [IIO_TEMP] = "temp",
next prev parent reply other threads:[~2011-05-11 15:56 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-05-11 11:58 [PATCH 1/2] IIO-work: iio.h: add missing address in IIO_CHAN michael.hennerich
2011-05-11 11:58 ` [PATCH 2/2] IIO-work: Add channel types IIO_CURRENT and IIO_POWER michael.hennerich
2011-05-11 12:18 ` Jonathan Cameron [this message]
2011-05-11 12:14 ` [PATCH 1/2] IIO-work: iio.h: add missing address in IIO_CHAN 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=4DCA7E90.1000803@cam.ac.uk \
--to=jic23@cam.ac.uk \
--cc=device-drivers-devel@blackfin.uclinux.org \
--cc=drivers@analog.com \
--cc=linux-iio@vger.kernel.org \
--cc=michael.hennerich@analog.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.