diff options
-rw-r--r-- | Documentation/ABI/testing/sysfs-bus-iio | 7 | ||||
-rw-r--r-- | drivers/iio/industrialio-core.c | 1 | ||||
-rw-r--r-- | include/linux/iio/iio.h | 5 |
3 files changed, 13 insertions, 0 deletions
diff --git a/Documentation/ABI/testing/sysfs-bus-iio b/Documentation/ABI/testing/sysfs-bus-iio index 2ce4dadaf3f..5bc8a476c15 100644 --- a/Documentation/ABI/testing/sysfs-bus-iio +++ b/Documentation/ABI/testing/sysfs-bus-iio | |||
@@ -280,6 +280,13 @@ Description: | |||
280 | If a discrete set of scale values are available, they | 280 | If a discrete set of scale values are available, they |
281 | are listed in this attribute. | 281 | are listed in this attribute. |
282 | 282 | ||
283 | What /sys/bus/iio/devices/iio:deviceX/out_voltageY_hardwaregain | ||
284 | KernelVersion: 2.6.35 | ||
285 | Contact: linux-iio@vger.kernel.org | ||
286 | Description: | ||
287 | Hardware applied gain factor. If shared across all channels, | ||
288 | <type>_hardwaregain is used. | ||
289 | |||
283 | What: /sys/.../in_accel_filter_low_pass_3db_frequency | 290 | What: /sys/.../in_accel_filter_low_pass_3db_frequency |
284 | What: /sys/.../in_magn_filter_low_pass_3db_frequency | 291 | What: /sys/.../in_magn_filter_low_pass_3db_frequency |
285 | What: /sys/.../in_anglvel_filter_low_pass_3db_frequency | 292 | What: /sys/.../in_anglvel_filter_low_pass_3db_frequency |
diff --git a/drivers/iio/industrialio-core.c b/drivers/iio/industrialio-core.c index 425cd4cf31f..86f34600a3a 100644 --- a/drivers/iio/industrialio-core.c +++ b/drivers/iio/industrialio-core.c | |||
@@ -91,6 +91,7 @@ static const char * const iio_chan_info_postfix[] = { | |||
91 | [IIO_CHAN_INFO_SAMP_FREQ] = "sampling_frequency", | 91 | [IIO_CHAN_INFO_SAMP_FREQ] = "sampling_frequency", |
92 | [IIO_CHAN_INFO_FREQUENCY] = "frequency", | 92 | [IIO_CHAN_INFO_FREQUENCY] = "frequency", |
93 | [IIO_CHAN_INFO_PHASE] = "phase", | 93 | [IIO_CHAN_INFO_PHASE] = "phase", |
94 | [IIO_CHAN_INFO_HARDWAREGAIN] = "hardwaregain", | ||
94 | }; | 95 | }; |
95 | 96 | ||
96 | const struct iio_chan_spec | 97 | const struct iio_chan_spec |
diff --git a/include/linux/iio/iio.h b/include/linux/iio/iio.h index 6fdbdb858e3..897c6b01d78 100644 --- a/include/linux/iio/iio.h +++ b/include/linux/iio/iio.h | |||
@@ -34,6 +34,7 @@ enum iio_chan_info_enum { | |||
34 | IIO_CHAN_INFO_SAMP_FREQ, | 34 | IIO_CHAN_INFO_SAMP_FREQ, |
35 | IIO_CHAN_INFO_FREQUENCY, | 35 | IIO_CHAN_INFO_FREQUENCY, |
36 | IIO_CHAN_INFO_PHASE, | 36 | IIO_CHAN_INFO_PHASE, |
37 | IIO_CHAN_INFO_HARDWAREGAIN, | ||
37 | }; | 38 | }; |
38 | 39 | ||
39 | #define IIO_CHAN_INFO_SHARED_BIT(type) BIT(type*2) | 40 | #define IIO_CHAN_INFO_SHARED_BIT(type) BIT(type*2) |
@@ -95,6 +96,10 @@ enum iio_chan_info_enum { | |||
95 | IIO_CHAN_INFO_SEPARATE_BIT(IIO_CHAN_INFO_PHASE) | 96 | IIO_CHAN_INFO_SEPARATE_BIT(IIO_CHAN_INFO_PHASE) |
96 | #define IIO_CHAN_INFO_PHASE_SHARED_BIT \ | 97 | #define IIO_CHAN_INFO_PHASE_SHARED_BIT \ |
97 | IIO_CHAN_INFO_SHARED_BIT(IIO_CHAN_INFO_PHASE) | 98 | IIO_CHAN_INFO_SHARED_BIT(IIO_CHAN_INFO_PHASE) |
99 | #define IIO_CHAN_INFO_HARDWAREGAIN_SEPARATE_BIT \ | ||
100 | IIO_CHAN_INFO_SEPARATE_BIT(IIO_CHAN_INFO_HARDWAREGAIN) | ||
101 | #define IIO_CHAN_INFO_HARDWAREGAIN_SHARED_BIT \ | ||
102 | IIO_CHAN_INFO_SHARED_BIT(IIO_CHAN_INFO_HARDWAREGAIN) | ||
98 | 103 | ||
99 | enum iio_endian { | 104 | enum iio_endian { |
100 | IIO_CPU, | 105 | IIO_CPU, |