diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2016-07-27 19:27:04 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-07-27 19:27:03 -0700 |
| commit | af23db40984e1e3d30941102cd02bab8ac3dd89e (patch) | |
| tree | 865d67da8e78025d70ceac46075df2f177606d5a /include/linux | |
| parent | f81c63bdae73c99bdb77a581bee90d3533a7d32e (diff) | |
| parent | b1b5d0af4690335d2b440ed83fc0ac04f12f2a5f (diff) | |
Merge "thermal: qpnp-adc-tm: Update reverse threshold and notification"
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/qpnp/qpnp-adc.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/linux/qpnp/qpnp-adc.h b/include/linux/qpnp/qpnp-adc.h index 8d51ddcd4246..af25f0c01369 100644 --- a/include/linux/qpnp/qpnp-adc.h +++ b/include/linux/qpnp/qpnp-adc.h @@ -242,6 +242,7 @@ enum qpnp_iadc_channels { #define QPNP_ADC_HWMON_NAME_LENGTH 64 #define QPNP_MAX_PROP_NAME_LEN 32 #define QPNP_THERMALNODE_NAME_LENGTH 25 +#define QPNP_ADC_1P25_UV 1250000 /* Structure device for qpnp vadc */ struct qpnp_vadc_chip; @@ -950,6 +951,7 @@ enum qpnp_state_request { * @low_temp: Low temperature threshold for which notification is requested. * @high_thr_voltage: High voltage for which notification is requested. * @low_thr_voltage: Low voltage for which notification is requested. + * @adc_tm_hc: Represents the refreshed BTM register design. * @state_request: Enable/disable the corresponding high and low temperature * thresholds. * @timer_interval1: Select polling rate from qpnp_adc_meas_timer_1 type. @@ -972,6 +974,7 @@ struct qpnp_adc_tm_btm_param { int32_t low_thr; int32_t gain_num; int32_t gain_den; + bool adc_tm_hc; enum qpnp_vadc_channels channel; enum qpnp_state_request state_request; enum qpnp_adc_meas_timer_1 timer_interval; |