Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 93e6d568 authored by Anirudh Ghayal's avatar Anirudh Ghayal Committed by Fenglin Wu
Browse files

power: qpnp-smbcharger: Re-run APSD if incorrect charger is detected 



If PMI detects SDP and the USB driver fails to enumerate it as a
SDP, rerun APSD as it could be a case of slow-insertion.

Change-Id: I16f52a41264e870935bc930d5af7c6cd2a755f20
Signed-off-by: default avatarAnirudh Ghayal <aghayal@codeaurora.org>
parent 9a140cb5

drivers/power/qpnp-smbcharger.c

+88 −59
Original line number Diff line number Diff line
@@ -3719,65 +3719,6 @@ static void check_battery_type(struct smbchg_chip *chip) 
	}

}



static void smbchg_external_power_changed(struct power_supply *psy)

{

	struct smbchg_chip *chip = container_of(psy,

				struct smbchg_chip, batt_psy);

	union power_supply_propval prop = {0,};

	int rc, current_limit = 0, soc;

	enum power_supply_type usb_supply_type;

	char *usb_type_name = "null";



	if (chip->bms_psy_name)

		chip->bms_psy =

			power_supply_get_by_name((char *)chip->bms_psy_name);



	smbchg_aicl_deglitch_wa_check(chip);

	if (chip->bms_psy) {

		check_battery_type(chip);

		soc = get_prop_batt_capacity(chip);

		if (chip->previous_soc != soc) {

			chip->previous_soc = soc;

			smbchg_soc_changed(chip);

		}



		rc = smbchg_config_chg_battery_type(chip);

		if (rc)

			pr_smb(PR_MISC,

				"Couldn't update charger configuration rc=%d\n",

									rc);

	}



	rc = chip->usb_psy->get_property(chip->usb_psy,

				POWER_SUPPLY_PROP_CHARGING_ENABLED, &prop);

	if (rc == 0)

		vote(chip->usb_suspend_votable, POWER_SUPPLY_EN_VOTER,

				!prop.intval, 0);



	rc = chip->usb_psy->get_property(chip->usb_psy,

				POWER_SUPPLY_PROP_CURRENT_MAX, &prop);

	if (rc == 0)

		current_limit = prop.intval / 1000;



	read_usb_type(chip, &usb_type_name, &usb_supply_type);



	if (usb_supply_type != POWER_SUPPLY_TYPE_USB)

		goto  skip_current_for_non_sdp;



	pr_smb(PR_MISC, "usb type = %s current_limit = %d\n",

			usb_type_name, current_limit);



	rc = vote(chip->usb_icl_votable, PSY_ICL_VOTER, true,

				current_limit);

	if (rc < 0)

		pr_err("Couldn't update USB PSY ICL vote rc=%d\n", rc);



skip_current_for_non_sdp:

	smbchg_vfloat_adjust_check(chip);



	power_supply_changed(&chip->batt_psy);

}



static int smbchg_otg_regulator_enable(struct regulator_dev *rdev)

{

	int rc = 0;
@@ -5788,6 +5729,94 @@ static int smbchg_get_iusb(struct smbchg_chip *chip) 
	return iusb_ua;

}



static void smbchg_external_power_changed(struct power_supply *psy)

{

	struct smbchg_chip *chip = container_of(psy,

				struct smbchg_chip, batt_psy);

	union power_supply_propval prop = {0,};

	int rc, current_limit = 0, soc;

	enum power_supply_type usb_supply_type;

	char *usb_type_name = "null";



	if (chip->bms_psy_name)

		chip->bms_psy =

			power_supply_get_by_name((char *)chip->bms_psy_name);



	smbchg_aicl_deglitch_wa_check(chip);

	if (chip->bms_psy) {

		check_battery_type(chip);

		soc = get_prop_batt_capacity(chip);

		if (chip->previous_soc != soc) {

			chip->previous_soc = soc;

			smbchg_soc_changed(chip);

		}



		rc = smbchg_config_chg_battery_type(chip);

		if (rc)

			pr_smb(PR_MISC,

				"Couldn't update charger configuration rc=%d\n",

									rc);

	}



	rc = chip->usb_psy->get_property(chip->usb_psy,

				POWER_SUPPLY_PROP_CHARGING_ENABLED, &prop);

	if (rc == 0)

		vote(chip->usb_suspend_votable, POWER_SUPPLY_EN_VOTER,

				!prop.intval, 0);



	rc = chip->usb_psy->get_property(chip->usb_psy,

				POWER_SUPPLY_PROP_CURRENT_MAX, &prop);

	if (rc == 0)

		current_limit = prop.intval / 1000;



	rc = chip->usb_psy->get_property(chip->usb_psy,

				POWER_SUPPLY_PROP_TYPE, &prop);



	read_usb_type(chip, &usb_type_name, &usb_supply_type);



	if (!rc && usb_supply_type == POWER_SUPPLY_TYPE_USB &&

			prop.intval != POWER_SUPPLY_TYPE_USB &&

			is_usb_present(chip)) {

		/* incorrect type detected */

		pr_smb(PR_MISC,

			"Incorrect charger type detetced - rerun APSD\n");

		chip->hvdcp_3_det_ignore_uv = true;

		pr_smb(PR_MISC, "setting usb psy dp=f dm=f\n");

		power_supply_set_dp_dm(chip->usb_psy,

				POWER_SUPPLY_DP_DM_DPF_DMF);

		rc = rerun_apsd(chip);

		if (rc)

			pr_err("APSD re-run failed\n");

		chip->hvdcp_3_det_ignore_uv = false;

		if (!is_src_detect_high(chip)) {

			pr_smb(PR_MISC, "Charger removed - force removal\n");

			update_usb_status(chip, is_usb_present(chip), true);

			return;

		}



		read_usb_type(chip, &usb_type_name, &usb_supply_type);

		if (usb_supply_type == POWER_SUPPLY_TYPE_USB_DCP)

			schedule_delayed_work(&chip->hvdcp_det_work,

				msecs_to_jiffies(HVDCP_NOTIFY_MS));

	}



	if (usb_supply_type != POWER_SUPPLY_TYPE_USB)

		goto  skip_current_for_non_sdp;



	pr_smb(PR_MISC, "usb type = %s current_limit = %d\n",

			usb_type_name, current_limit);



	rc = vote(chip->usb_icl_votable, PSY_ICL_VOTER, true,

				current_limit);

	if (rc < 0)

		pr_err("Couldn't update USB PSY ICL vote rc=%d\n", rc);



skip_current_for_non_sdp:

	smbchg_vfloat_adjust_check(chip);



	power_supply_changed(&chip->batt_psy);

}



static enum power_supply_property smbchg_battery_properties[] = {

	POWER_SUPPLY_PROP_STATUS,

	POWER_SUPPLY_PROP_PRESENT,