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

Commit 166b15d3 authored by Harry Yang's avatar Harry Yang
Browse files

qpnp-smb2: STAT pin configured auto after parallel_psy detected 



Change STAT pin config to HW auto mode only when the charger driver
detects parallel-psy, to make sure that the smb1355 does not
start charging if PMI8998 probes before parallel charger.

CRs-Fixed: 2044532
Change-Id: Ib5d87d95261564edd85fd18872027decd7be4da5
Signed-off-by: default avatarHarry Yang <harryy@codeaurora.org>
parent 05c7ab49

drivers/power/supply/qcom/qpnp-smb2.c

+0 −9
Original line number Diff line number Diff line
@@ -1647,15 +1647,6 @@ static int smb2_init_hw(struct smb2 *chip) 
		return rc;

	}



	/* disable SW STAT override */

	rc = smblib_masked_write(chg, STAT_CFG_REG,

				 STAT_SW_OVERRIDE_CFG_BIT, 0);

	if (rc < 0) {

		dev_err(chg->dev, "Couldn't disable SW STAT override rc=%d\n",

			rc);

		return rc;

	}



	/* disable h/w autonomous parallel charging control */

	rc = smblib_masked_write(chg, MISC_CFG_REG,

				 STAT_PARALLEL_1400MA_EN_CFG_BIT, 0);

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

+38 −1
Original line number Diff line number Diff line
@@ -143,6 +143,23 @@ int smblib_icl_override(struct smb_charger *chg, bool override) 
	return rc;

}



int smblib_stat_sw_override_cfg(struct smb_charger *chg, bool override)

{

	int rc;



	/* override  = 1, SW STAT override; override = 0, HW auto mode */

	rc = smblib_masked_write(chg, STAT_CFG_REG,

				STAT_SW_OVERRIDE_CFG_BIT,

				override ? STAT_SW_OVERRIDE_CFG_BIT : 0);

	if (rc < 0) {

		dev_err(chg->dev, "Couldn't configure SW STAT override rc=%d\n",

			rc);

		return rc;

	}



	return rc;

}



/********************

 * REGISTER GETTERS *

 ********************/
@@ -584,8 +601,10 @@ static int smblib_notifier_call(struct notifier_block *nb, 
			schedule_work(&chg->bms_update_work);

	}



	if (!chg->pl.psy && !strcmp(psy->desc->name, "parallel"))

	if (!chg->pl.psy && !strcmp(psy->desc->name, "parallel")) {

		chg->pl.psy = psy;

		schedule_work(&chg->pl_update_work);

	}



	return NOTIFY_OK;

}
@@ -4282,6 +4301,14 @@ static void bms_update_work(struct work_struct *work) 
		power_supply_changed(chg->batt_psy);

}



static void pl_update_work(struct work_struct *work)

{

	struct smb_charger *chg = container_of(work, struct smb_charger,

						pl_update_work);



	smblib_stat_sw_override_cfg(chg, false);

}



static void clear_hdc_work(struct work_struct *work)

{

	struct smb_charger *chg = container_of(work, struct smb_charger,
@@ -4812,6 +4839,7 @@ int smblib_init(struct smb_charger *chg) 
	mutex_init(&chg->otg_oc_lock);

	mutex_init(&chg->vconn_oc_lock);

	INIT_WORK(&chg->bms_update_work, bms_update_work);

	INIT_WORK(&chg->pl_update_work, pl_update_work);

	INIT_WORK(&chg->rdstd_cc2_detach_work, rdstd_cc2_detach_work);

	INIT_DELAYED_WORK(&chg->hvdcp_detect_work, smblib_hvdcp_detect_work);

	INIT_DELAYED_WORK(&chg->clear_hdc_work, clear_hdc_work);
@@ -4860,6 +4888,14 @@ int smblib_init(struct smb_charger *chg) 


		chg->bms_psy = power_supply_get_by_name("bms");

		chg->pl.psy = power_supply_get_by_name("parallel");

		if (chg->pl.psy) {

			rc = smblib_stat_sw_override_cfg(chg, false);

			if (rc < 0) {

				smblib_err(chg,

					"Couldn't config stat sw rc=%d\n", rc);

				return rc;

			}

		}

		break;

	case PARALLEL_SLAVE:

		break;
@@ -4876,6 +4912,7 @@ int smblib_deinit(struct smb_charger *chg) 
	switch (chg->mode) {

	case PARALLEL_MASTER:

		cancel_work_sync(&chg->bms_update_work);

		cancel_work_sync(&chg->pl_update_work);

		cancel_work_sync(&chg->rdstd_cc2_detach_work);

		cancel_delayed_work_sync(&chg->hvdcp_detect_work);

		cancel_delayed_work_sync(&chg->clear_hdc_work);

drivers/power/supply/qcom/smb-lib.h

+2 −1
Original line number Diff line number Diff line
@@ -287,6 +287,7 @@ struct smb_charger { 


	/* work */

	struct work_struct	bms_update_work;

	struct work_struct	pl_update_work;

	struct work_struct	rdstd_cc2_detach_work;

	struct delayed_work	hvdcp_detect_work;

	struct delayed_work	ps_change_timeout_work;
@@ -523,7 +524,7 @@ int smblib_get_prop_pr_swap_in_progress(struct smb_charger *chg, 
				union power_supply_propval *val);

int smblib_set_prop_pr_swap_in_progress(struct smb_charger *chg,

				const union power_supply_propval *val);



int smblib_stat_sw_override_cfg(struct smb_charger *chg, bool override);

int smblib_init(struct smb_charger *chg);

int smblib_deinit(struct smb_charger *chg);

#endif /* __SMB2_CHARGER_H */