Merge "power: qpnp-linear-charger: Do not configure ADC_BTM for fake_battery" (731cefeb) · Commits · e / devices / android_kernel_fairphone_FP3

drivers/power/supply/qcom/qpnp-linear-charger.c

+8 −5

Original line number	Diff line number	Diff line
		@@ -1472,6 +1472,9 @@ static int qpnp_lbc_configure_jeita(struct qpnp_lbc_chip *chip,
		return -EINVAL;
		}

		if (chip->cfg_use_fake_battery)
		return 0;

		mutex_lock(&chip->jeita_configure_lock);
		switch (psp) {
		case POWER_SUPPLY_PROP_COOL_TEMP:
		@@ -2635,14 +2638,14 @@ static irqreturn_t qpnp_lbc_batt_pres_irq_handler(int irq, void *_chip)

		if ((chip->cfg_cool_bat_decidegc
		\|\| chip->cfg_warm_bat_decidegc)
		&& batt_present) {
		&& batt_present && !chip->cfg_use_fake_battery) {
		pr_debug("enabling vadc notifications\n");
		if (qpnp_adc_tm_channel_measure(chip->adc_tm_dev,
		&chip->adc_param))
		pr_err("request ADC error\n");
		} else if ((chip->cfg_cool_bat_decidegc
		\|\| chip->cfg_warm_bat_decidegc)
		&& !batt_present) {
		&& !batt_present && !chip->cfg_use_fake_battery) {
		qpnp_adc_tm_disable_chan_meas(chip->adc_tm_dev,
		&chip->adc_param);
		pr_debug("disabling vadc notifications\n");
		@@ -3398,7 +3401,7 @@ static int qpnp_lbc_main_probe(struct platform_device *pdev)
		}

		if ((chip->cfg_cool_bat_decidegc \|\| chip->cfg_warm_bat_decidegc)
		&& chip->bat_if_base) {
		&& chip->bat_if_base && !chip->cfg_use_fake_battery) {
		chip->adc_param.low_temp = chip->cfg_cool_bat_decidegc;
		chip->adc_param.high_temp = chip->cfg_warm_bat_decidegc;
		chip->adc_param.timer_interval = ADC_MEAS1_INTERVAL_1S;