All of lore.kernel.org
 help / color / mirror / Atom feed
From: Jonathan Cameron <jic23@cam.ac.uk>
To: michael.hennerich@analog.com
Cc: jic23@kernel.org, linux-iio@vger.kernel.org,
	device-drivers-devel@blackfin.uclinux.org
Subject: Re: [PATCH 2/4] iio: core: Introduce IIO_ALTVOLTAGE and appropriate channel info elements
Date: Thu, 26 Apr 2012 14:09:28 +0100	[thread overview]
Message-ID: <4F994908.8030200@cam.ac.uk> (raw)
In-Reply-To: <1335443643-20439-2-git-send-email-michael.hennerich@analog.com>

On 4/26/2012 1:34 PM, michael.hennerich@analog.com wrote:
> From: Michael Hennerich<michael.hennerich@analog.com>
>
> Signed-off-by: Michael Hennerich<michael.hennerich@analog.com>
Acked-by: Jonathan Cameron <jic23@kernel.org>
> ---
>   drivers/iio/industrialio-core.c |    3 +++
>   include/linux/iio/iio.h         |   10 ++++++++++
>   include/linux/iio/types.h       |    1 +
>   3 files changed, 14 insertions(+), 0 deletions(-)
>
> diff --git a/drivers/iio/industrialio-core.c b/drivers/iio/industrialio-core.c
> index dd1a6a2..1c55d2b 100644
> --- a/drivers/iio/industrialio-core.c
> +++ b/drivers/iio/industrialio-core.c
> @@ -63,6 +63,7 @@ static const char * const iio_chan_type_name_spec[] = {
>   	[IIO_ANGL] = "angl",
>   	[IIO_TIMESTAMP] = "timestamp",
>   	[IIO_CAPACITANCE] = "capacitance",
> +	[IIO_ALTVOLTAGE] = "altvoltage",
>   };
>
>   static const char * const iio_modifier_names[] = {
> @@ -88,6 +89,8 @@ static const char * const iio_chan_info_postfix[] = {
>   	[IIO_CHAN_INFO_LOW_PASS_FILTER_3DB_FREQUENCY]
>   	= "filter_low_pass_3db_frequency",
>   	[IIO_CHAN_INFO_SAMP_FREQ] = "sampling_frequency",
> +	[IIO_CHAN_INFO_FREQUENCY] = "frequency",
> +	[IIO_CHAN_INFO_PHASE] = "phase",
>   };
>
>   const struct iio_chan_spec
> diff --git a/include/linux/iio/iio.h b/include/linux/iio/iio.h
> index 9c0908a..0e826af 100644
> --- a/include/linux/iio/iio.h
> +++ b/include/linux/iio/iio.h
> @@ -32,6 +32,8 @@ enum iio_chan_info_enum {
>   	IIO_CHAN_INFO_AVERAGE_RAW,
>   	IIO_CHAN_INFO_LOW_PASS_FILTER_3DB_FREQUENCY,
>   	IIO_CHAN_INFO_SAMP_FREQ,
> +	IIO_CHAN_INFO_FREQUENCY,
> +	IIO_CHAN_INFO_PHASE,
>   };
>
>   #define IIO_CHAN_INFO_SHARED_BIT(type) BIT(type*2)
> @@ -85,6 +87,14 @@ enum iio_chan_info_enum {
>   	IIO_CHAN_INFO_SEPARATE_BIT(IIO_CHAN_INFO_SAMP_FREQ)
>   #define IIO_CHAN_INFO_SAMP_FREQ_SHARED_BIT			\
>   	IIO_CHAN_INFO_SHARED_BIT(IIO_CHAN_INFO_SAMP_FREQ)
> +#define IIO_CHAN_INFO_FREQUENCY_SEPARATE_BIT			\
> +	IIO_CHAN_INFO_SEPARATE_BIT(IIO_CHAN_INFO_FREQUENCY)
> +#define IIO_CHAN_INFO_FREQUENCY_SHARED_BIT			\
> +	IIO_CHAN_INFO_SHARED_BIT(IIO_CHAN_INFO_FREQUENCY)
> +#define IIO_CHAN_INFO_PHASE_SEPARATE_BIT			\
> +	IIO_CHAN_INFO_SEPARATE_BIT(IIO_CHAN_INFO_PHASE)
> +#define IIO_CHAN_INFO_PHASE_SHARED_BIT			\
> +	IIO_CHAN_INFO_SHARED_BIT(IIO_CHAN_INFO_PHASE)
>
>   enum iio_endian {
>   	IIO_CPU,
> diff --git a/include/linux/iio/types.h b/include/linux/iio/types.h
> index 0c32136..a471fd5 100644
> --- a/include/linux/iio/types.h
> +++ b/include/linux/iio/types.h
> @@ -27,6 +27,7 @@ enum iio_chan_type {
>   	IIO_ANGL,
>   	IIO_TIMESTAMP,
>   	IIO_CAPACITANCE,
> +	IIO_ALTVOLTAGE,
>   };
>
>   enum iio_modifier {


  reply	other threads:[~2012-04-26 13:09 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-04-26 12:34 [PATCH 1/4] iio: Rename iio/dds to iio/frequency michael.hennerich
2012-04-26 12:34 ` [PATCH 2/4] iio: core: Introduce IIO_ALTVOLTAGE and appropriate channel info elements michael.hennerich
2012-04-26 13:09   ` Jonathan Cameron [this message]
2012-04-26 12:34 ` [PATCH 3/4] iio: frequency: Update DDS drivers to use new channel naming convention michael.hennerich
2012-04-26 13:46   ` Jonathan Cameron
2012-04-26 12:34 ` [PATCH 4/4] iio: core: iio_chan_spec_ext_info: Add private handle michael.hennerich
2012-04-27  7:55   ` Hennerich, Michael
2012-04-27  8:25     ` Jonathan Cameron
2012-04-26 13:08 ` [PATCH 1/4] iio: Rename iio/dds to iio/frequency Jonathan Cameron
2012-04-26 16:11   ` Hennerich, Michael
2012-04-26 16:14     ` Jonathan Cameron
  -- strict thread matches above, loose matches on Subject: below --
2012-04-27  8:58 michael.hennerich
2012-04-27  8:58 ` [PATCH 2/4] iio: core: Introduce IIO_ALTVOLTAGE and appropriate channel info elements michael.hennerich

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=4F994908.8030200@cam.ac.uk \
    --to=jic23@cam.ac.uk \
    --cc=device-drivers-devel@blackfin.uclinux.org \
    --cc=jic23@kernel.org \
    --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.