Commit 5ccb3adb authored by Jonathan Cameron's avatar Jonathan Cameron Committed by Greg Kroah-Hartman
Browse files

staging:iio: add a raw and processed elements to info_mask 



This will allow us to have drivers where the channel value
may not be read or written but other information is available.
Also adds the ability to have both processed and raw access
to a given channel, though in most cases this doesn't make
sense.

Ultimately will lead to simpler code by allowing us to drop
the special case handling for the value reading cases.

Signed-off-by: default avatarJonathan Cameron <jic23@kernel.org>
Acked-by: default avatarLars-Peter Clausen <lars@metafoo.de>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 35a36e65

drivers/staging/iio/iio.h

+7 −2
Original line number Diff line number Diff line
@@ -26,8 +26,9 @@ enum iio_data_type { 


/* Could add the raw attributes as well - allowing buffer only devices */

enum iio_chan_info_enum {

	/* 0 is reserved for raw attributes */

	IIO_CHAN_INFO_SCALE = 1,

	IIO_CHAN_INFO_RAW = 0,

	IIO_CHAN_INFO_PROCESSED,

	IIO_CHAN_INFO_SCALE,

	IIO_CHAN_INFO_OFFSET,

	IIO_CHAN_INFO_CALIBSCALE,

	IIO_CHAN_INFO_CALIBBIAS,
@@ -42,6 +43,10 @@ enum iio_chan_info_enum { 
#define IIO_CHAN_INFO_SHARED_BIT(type) BIT(type*2)

#define IIO_CHAN_INFO_SEPARATE_BIT(type) BIT(type*2 + 1)



#define IIO_CHAN_INFO_RAW_SEPARATE_BIT			\

	IIO_CHAN_INFO_SEPARATE_BIT(IIO_CHAN_INFO_RAW)

#define IIO_CHAN_INFO_PROCESSED_SEPARATE_BIT			\

	IIO_CHAN_INFO_SEPARATE_BIT(IIO_CHAN_INFO_PROCESSED)

#define IIO_CHAN_INFO_SCALE_SEPARATE_BIT		\

	IIO_CHAN_INFO_SEPARATE_BIT(IIO_CHAN_INFO_SCALE)

#define IIO_CHAN_INFO_SCALE_SHARED_BIT			\

drivers/staging/iio/industrialio-core.c

+3 −2
Original line number Diff line number Diff line
@@ -576,7 +576,8 @@ int __iio_add_chan_devattr(const char *postfix, 
static int iio_device_add_channel_sysfs(struct iio_dev *indio_dev,

					struct iio_chan_spec const *chan)

{

	int ret, i, attrcount = 0;

	int ret, attrcount = 0;

	int i = 4;

	const struct iio_chan_spec_ext_info *ext_info;



	if (chan->channel < 0)
@@ -595,7 +596,7 @@ static int iio_device_add_channel_sysfs(struct iio_dev *indio_dev, 
		goto error_ret;

	attrcount++;



	for_each_set_bit(i, &chan->info_mask, sizeof(long)*8) {

	for_each_set_bit_from(i, &chan->info_mask, sizeof(long)*8) {

		ret = __iio_add_chan_devattr(iio_chan_info_postfix[i/2],

					     chan,

					     &iio_read_channel_info,