summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@localhost>2016-12-20 14:04:12 -0800
committerGerrit - the friendly Code Review server <code-review@localhost>2016-12-20 14:04:12 -0800
commitd6be2a8f221c62b9b1b2ca02e90e2cd5a6a2b290 (patch)
tree3fe8ec93c86be8b19587484955bdd36dee7a39a7
parent8fce1d621f70b29c22524d6d30377b2b8756af87 (diff)
parent58d7e90ef4bca9922498fc832300d029bb22afbc (diff)
Merge "power: smb1351-charger: Fix ADC timer enum value for reading BATT_THERM"
-rw-r--r--drivers/power/qcom-charger/smb1351-charger.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/power/qcom-charger/smb1351-charger.c b/drivers/power/qcom-charger/smb1351-charger.c
index 79fbe33acf5d..e9d8c0e08447 100644
--- a/drivers/power/qcom-charger/smb1351-charger.c
+++ b/drivers/power/qcom-charger/smb1351-charger.c
@@ -3087,7 +3087,7 @@ static int smb1351_main_charger_probe(struct i2c_client *client,
chip->adc_param.low_temp = chip->batt_cool_decidegc;
chip->adc_param.high_temp = chip->batt_warm_decidegc;
}
- chip->adc_param.timer_interval = ADC_MEAS2_INTERVAL_1S;
+ chip->adc_param.timer_interval = ADC_MEAS1_INTERVAL_500MS;
chip->adc_param.state_request = ADC_TM_WARM_COOL_THR_ENABLE;
chip->adc_param.btm_ctx = chip;
chip->adc_param.threshold_notification =