diff options
| author | Jonathan Cameron <jic23@kernel.org> | 2012-06-30 20:06:00 +0100 |
|---|---|---|
| committer | Jonathan Cameron <jic23@kernel.org> | 2012-11-10 10:17:27 +0000 |
| commit | 0464415dd21785aa8e8b12dbc939fcb5ca52f464 (patch) | |
| tree | 36a5fff19aebcf8aa5eeff66ac8d8473a01765e8 | |
| parent | 84b36ce5f79c01f792c623f14e92ed86cdccb42f (diff) | |
| download | linux-stable-0464415dd21785aa8e8b12dbc939fcb5ca52f464.tar.gz linux-stable-0464415dd21785aa8e8b12dbc939fcb5ca52f464.tar.bz2 linux-stable-0464415dd21785aa8e8b12dbc939fcb5ca52f464.zip | |
staging:iio:in kernel users: Add a data field for channel specific info.
Used to allow information about a given channel mapping to be passed
through from board files to the consumer drivers.
Signed-off-by: Jonathan Cameron <jic23@kernel.org>
| -rw-r--r-- | drivers/iio/inkern.c | 1 | ||||
| -rw-r--r-- | include/linux/iio/consumer.h | 2 | ||||
| -rw-r--r-- | include/linux/iio/machine.h | 2 |
3 files changed, 5 insertions, 0 deletions
diff --git a/drivers/iio/inkern.c b/drivers/iio/inkern.c index b394621d362c..d55e98fb300e 100644 --- a/drivers/iio/inkern.c +++ b/drivers/iio/inkern.c @@ -203,6 +203,7 @@ struct iio_channel *iio_channel_get_all(const char *name) if (name && strcmp(name, c->map->consumer_dev_name) != 0) continue; chans[mapind].indio_dev = c->indio_dev; + chans[mapind].data = c->map->consumer_data; chans[mapind].channel = iio_chan_spec_from_name(chans[mapind].indio_dev, c->map->adc_channel_label); diff --git a/include/linux/iio/consumer.h b/include/linux/iio/consumer.h index e875bcf0478f..57efee63a6da 100644 --- a/include/linux/iio/consumer.h +++ b/include/linux/iio/consumer.h @@ -18,10 +18,12 @@ struct iio_chan_spec; * struct iio_channel - everything needed for a consumer to use a channel * @indio_dev: Device on which the channel exists. * @channel: Full description of the channel. + * @data: Data about the channel used by consumer. */ struct iio_channel { struct iio_dev *indio_dev; const struct iio_chan_spec *channel; + void *data; }; /** diff --git a/include/linux/iio/machine.h b/include/linux/iio/machine.h index 809a3f08d5a5..1601a2a63a72 100644 --- a/include/linux/iio/machine.h +++ b/include/linux/iio/machine.h @@ -19,11 +19,13 @@ * @consumer_dev_name: Name to uniquely identify the consumer device. * @consumer_channel: Unique name used to identify the channel on the * consumer side. + * @consumer_data: Data about the channel for use by the consumer driver. */ struct iio_map { const char *adc_channel_label; const char *consumer_dev_name; const char *consumer_channel; + void *consumer_data; }; #endif |