diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2017-02-08 17:47:34 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-02-08 17:47:34 -0800 |
| commit | 52ea397825e2d63252a2d50a854987846b6ba1aa (patch) | |
| tree | 9d7f9d6d890b318732913a30fdc317ecc21fb669 /include/linux | |
| parent | 3a6de8f9a925ea2b8ec21880173f54bdadca51ad (diff) | |
| parent | 5836501ea4ceddf64f5051e97c75d9f62b0fed50 (diff) | |
Merge "iio: qcom-tadc: set all threshold comparators directions"
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/iio/consumer.h | 10 | ||||
| -rw-r--r-- | include/linux/power_supply.h | 1 |
2 files changed, 11 insertions, 0 deletions
diff --git a/include/linux/iio/consumer.h b/include/linux/iio/consumer.h index fad58671c49e..62acf17a894b 100644 --- a/include/linux/iio/consumer.h +++ b/include/linux/iio/consumer.h @@ -161,6 +161,16 @@ int iio_read_channel_processed(struct iio_channel *chan, int *val); int iio_write_channel_raw(struct iio_channel *chan, int val); /** + * iio_write_channel_processed() - write to a given channel + * @chan: The channel being queried. + * @val: Value being written. + * + * Note processed writes to iio channels are converted to raw + * values before being written. + */ +int iio_write_channel_processed(struct iio_channel *chan, int val); + +/** * iio_get_channel_type() - get the type of a channel * @channel: The channel being queried. * @type: The type of the channel. diff --git a/include/linux/power_supply.h b/include/linux/power_supply.h index 8f95c91c059a..64f5c4ca09d5 100644 --- a/include/linux/power_supply.h +++ b/include/linux/power_supply.h @@ -237,6 +237,7 @@ enum power_supply_property { POWER_SUPPLY_PROP_FCC_DELTA, POWER_SUPPLY_PROP_ICL_REDUCTION, POWER_SUPPLY_PROP_PARALLEL_MODE, + POWER_SUPPLY_PROP_CONNECTOR_THERM_ZONE, /* Local extensions of type int64_t */ POWER_SUPPLY_PROP_CHARGE_COUNTER_EXT, /* Properties of type `const char *' */ |