On 07/09/2012 09:22 PM, srinivas pandruvada wrote:
> Added hysteresis to the list of channel info enumeration, shared
> /separate bit defines and to postfix channel info strings.
>
> Signed-off-by: srinivas pandruvada <srinivas.pandruvada@xxxxxxxxx>
I'm fine with this, but typically we only merge these sorts of things
in the same patch series as the first driver to use them (make it
much more obvious what the point is!)
Jonathan
> ---
> drivers/iio/industrialio-core.c | 1 +
> include/linux/iio/iio.h | 5 +++++
> 2 files changed, 6 insertions(+), 0 deletions(-)
>
> diff --git a/drivers/iio/industrialio-core.c b/drivers/iio/industrialio-core.c
> index 1ddd886..ceb5d90 100644
> --- a/drivers/iio/industrialio-core.c
> +++ b/drivers/iio/industrialio-core.c
> @@ -92,6 +92,7 @@ static const char * const iio_chan_info_postfix[] = {
> [IIO_CHAN_INFO_FREQUENCY] = "frequency",
> [IIO_CHAN_INFO_PHASE] = "phase",
> [IIO_CHAN_INFO_HARDWAREGAIN] = "hardwaregain",
> + [IIO_CHAN_INFO_HYSTERESIS] = "hysteresis",
> };
>
> const struct iio_chan_spec
> diff --git a/include/linux/iio/iio.h b/include/linux/iio/iio.h
> index 3a4f6a3..9ed1063 100644
> --- a/include/linux/iio/iio.h
> +++ b/include/linux/iio/iio.h
> @@ -35,6 +35,7 @@ enum iio_chan_info_enum {
> IIO_CHAN_INFO_FREQUENCY,
> IIO_CHAN_INFO_PHASE,
> IIO_CHAN_INFO_HARDWAREGAIN,
> + IIO_CHAN_INFO_HYSTERESIS,
> };
>
> #define IIO_CHAN_INFO_SHARED_BIT(type) BIT(type*2)
> @@ -100,6 +101,10 @@ enum iio_chan_info_enum {
> IIO_CHAN_INFO_SEPARATE_BIT(IIO_CHAN_INFO_HARDWAREGAIN)
> #define IIO_CHAN_INFO_HARDWAREGAIN_SHARED_BIT \
> IIO_CHAN_INFO_SHARED_BIT(IIO_CHAN_INFO_HARDWAREGAIN)
> +#define IIO_CHAN_INFO_HYSTERESIS_SEPARATE_BIT \
> + IIO_CHAN_INFO_SEPARATE_BIT(IIO_CHAN_INFO_HYSTERESIS)
> +#define IIO_CHAN_INFO_HYSTERESIS_SHARED_BIT \
> + IIO_CHAN_INFO_SHARED_BIT(IIO_CHAN_INFO_HYSTERESIS)
>
> enum iio_endian {
> IIO_CPU,
>
--
To unsubscribe from this list: send the line "unsubscribe linux-iio" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
