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

Commit 287f2168 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "power: smb5: update APSD result in USBIN_PLUGIN IRQ"

parents fab00d0c 91a5042e

drivers/power/supply/qcom/smb5-lib.c

+6 −3
Original line number Diff line number Diff line
@@ -894,9 +894,10 @@ int smblib_set_icl_current(struct smb_charger *chg, int icl_ua) 
		goto set_mode;



	/* configure current */

	if (((chg->typec_mode == POWER_SUPPLY_TYPEC_SOURCE_DEFAULT)

		|| (chg->connector_type == POWER_SUPPLY_CONNECTOR_MICRO_USB))

		&& (chg->real_charger_type == POWER_SUPPLY_TYPE_USB)) {

	if (chg->real_charger_type == POWER_SUPPLY_TYPE_USB

		&& (chg->typec_legacy

		|| chg->typec_mode == POWER_SUPPLY_TYPEC_SOURCE_DEFAULT

		|| chg->connector_type == POWER_SUPPLY_CONNECTOR_MICRO_USB)) {

		rc = set_sdp_current(chg, icl_ua);

		if (rc < 0) {

			smblib_err(chg, "Couldn't set SDP ICL rc=%d\n", rc);
@@ -2789,6 +2790,8 @@ void smblib_usb_plugin_locked(struct smb_charger *chg) 
		rc = smblib_request_dpdm(chg, false);

		if (rc < 0)

			smblib_err(chg, "Couldn't disable DPDM rc=%d\n", rc);



		smblib_update_usb_type(chg);

	}



	if (chg->connector_type == POWER_SUPPLY_CONNECTOR_MICRO_USB)