evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "icnss: Add support for disabling vbatt notification"

Browse source
This commit is contained in:
Linux Build Service Account 2016-09-30 18:23:51 -07:00 • committed by Gerrit - the friendly Code Review server
commit 7d60e8e05c
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
drivers/soc/qcom/icnss.c
View file

@ -244,9 +244,10 @@ enum icnss_debug_quirks {
RECOVERY_DISABLE, RECOVERY_DISABLE,
SSR_ONLY, SSR_ONLY,
PDR_ONLY, PDR_ONLY,
VBATT_DISABLE,
}; };
#define ICNSS_QUIRKS_DEFAULT 0 #define ICNSS_QUIRKS_DEFAULT BIT(VBATT_DISABLE)
unsigned long quirks = ICNSS_QUIRKS_DEFAULT; unsigned long quirks = ICNSS_QUIRKS_DEFAULT;
module_param(quirks, ulong, 0600); module_param(quirks, ulong, 0600);
@ -755,6 +756,9 @@ static int icnss_init_vph_monitor(struct icnss_priv *priv)
{ {
int ret = 0; int ret = 0;
if (test_bit(VBATT_DISABLE, &quirks))
goto out;
ret = icnss_get_phone_power(priv, &priv->vph_pwr); ret = icnss_get_phone_power(priv, &priv->vph_pwr);
if (ret) if (ret)
goto out; goto out;
@ -2288,7 +2292,7 @@ static int icnss_driver_event_server_exit(void *data)
icnss_pr_info("QMI Service Disconnected: 0x%lx\n", penv->state); icnss_pr_info("QMI Service Disconnected: 0x%lx\n", penv->state);
if (penv->adc_tm_dev) if (!test_bit(VBATT_DISABLE, &quirks) && penv->adc_tm_dev)
qpnp_adc_tm_disable_chan_meas(penv->adc_tm_dev, qpnp_adc_tm_disable_chan_meas(penv->adc_tm_dev,
&penv->vph_monitor_params); &penv->vph_monitor_params);