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

Commit 327bca08 authored by Abhijeet Dharmapurikar's avatar Abhijeet Dharmapurikar Committed by Harry Yang
Browse files

smb138x: use chg src bit to disable parallel charger 



smb1355 doesn't have any facility to suspend input. One has to
disable charging using the chg_en command bit.

So, when parallel charging needs to be disabled, configure
the charger to ignore the chg_en input pin and instead use the
command register. The command register is always programmed to
disable charging.

When parallel charging needs to be enabled, configure it to
follow the chg_en input pin.

This will work for both smb1355 and smb1381 parallel chargers.

Change-Id: I50294f40927641c2e0a7c7e4e7d263592086d3a9
Signed-off-by: default avatarAbhijeet Dharmapurikar <adharmap@codeaurora.org>
parent 95c95088

drivers/power/supply/qcom/smb138x-charger.c

+49 −27
Original line number Diff line number Diff line
@@ -598,6 +598,26 @@ static enum power_supply_property smb1355_parallel_props[] = { 
	POWER_SUPPLY_PROP_CHARGER_TEMP_MAX,

};



static int smb138x_get_parallel_charging(struct smb138x *chip, int *disabled)

{

	struct smb_charger *chg = &chip->chg;

	int rc = 0;

	u8 cfg2;



	rc = smblib_read(chg, CHGR_CFG2_REG, &cfg2);

	if (rc < 0) {

		pr_err("Couldn't read en_cmg_reg rc=%d\n", rc);

		return rc;

	}



	if (cfg2 & CHG_EN_SRC_BIT)

		*disabled = 0;

	else

		*disabled = 1;



	return 0;

}



static int smb138x_parallel_get_prop(struct power_supply *psy,

				     enum power_supply_property prop,

				     union power_supply_propval *val)
@@ -624,7 +644,7 @@ static int smb138x_parallel_get_prop(struct power_supply *psy, 
			val->intval = !(temp & DISABLE_CHARGING_BIT);

		break;

	case POWER_SUPPLY_PROP_INPUT_SUSPEND:

		rc = smblib_get_usb_suspend(chg, &val->intval);

		rc = smb138x_get_parallel_charging(chip, &val->intval);

		break;

	case POWER_SUPPLY_PROP_INPUT_CURRENT_LIMITED:

		if ((chip->dt.pl_mode == POWER_SUPPLY_PL_USBIN_USBIN)
@@ -694,28 +714,33 @@ static int smb138x_parallel_get_prop(struct power_supply *psy, 
	return rc;

}



static int smb138x_set_parallel_suspend(struct smb138x *chip, bool suspend)

static int smb138x_set_parallel_charging(struct smb138x *chip, bool disable)

{

	struct smb_charger *chg = &chip->chg;

	int rc = 0;



	rc = smblib_masked_write(chg, WD_CFG_REG, WDOG_TIMER_EN_BIT,

				 suspend ? 0 : WDOG_TIMER_EN_BIT);

				 disable ? 0 : WDOG_TIMER_EN_BIT);

	if (rc < 0) {

		pr_err("Couldn't %s watchdog rc=%d\n",

		       suspend ? "disable" : "enable", rc);

		suspend = true;

		       disable ? "disable" : "enable", rc);

		disable = true;

	}



	rc = smblib_masked_write(chg, USBIN_CMD_IL_REG, USBIN_SUSPEND_BIT,

				 suspend ? USBIN_SUSPEND_BIT : 0);

	/*

	 * Configure charge enable for high polarity and

	 * When disabling charging set it to cmd register control(cmd bit=0)

	 * When enabling charging set it to pin control

	 */

	rc = smblib_masked_write(chg, CHGR_CFG2_REG,

			CHG_EN_POLARITY_BIT | CHG_EN_SRC_BIT,

			disable ? 0 : CHG_EN_SRC_BIT);

	if (rc < 0) {

		pr_err("Couldn't %s parallel charger rc=%d\n",

		       suspend ? "suspend" : "resume", rc);

		pr_err("Couldn't configure charge enable source rc=%d\n", rc);

		return rc;

	}



	return rc;

	return 0;

}



static int smb138x_parallel_set_prop(struct power_supply *psy,
@@ -728,7 +753,7 @@ static int smb138x_parallel_set_prop(struct power_supply *psy, 


	switch (prop) {

	case POWER_SUPPLY_PROP_INPUT_SUSPEND:

		rc = smb138x_set_parallel_suspend(chip, (bool)val->intval);

		rc = smb138x_set_parallel_charging(chip, (bool)val->intval);

		break;

	case POWER_SUPPLY_PROP_CURRENT_MAX:

		if ((chip->dt.pl_mode == POWER_SUPPLY_PL_USBIN_USBIN)
@@ -946,35 +971,32 @@ static int smb138x_init_slave_hw(struct smb138x *chip) 
		return rc;

	}



	/* suspend parallel charging */

	rc = smb138x_set_parallel_suspend(chip, true);

	/* disable the charging path when under s/w control */

	rc = smblib_masked_write(chg, CHARGING_ENABLE_CMD_REG,

				 CHARGING_ENABLE_CMD_BIT, 0);

	if (rc < 0) {

		pr_err("Couldn't suspend parallel charging rc=%d\n", rc);

		pr_err("Couldn't disable charging rc=%d\n", rc);

		return rc;

	}



	/* initialize FCC to 0 */

	rc = smblib_set_charge_param(chg, &chg->param.fcc, 0);

	/* disable parallel charging path */

	rc = smb138x_set_parallel_charging(chip, true);

	if (rc < 0) {

		pr_err("Couldn't set 0 FCC rc=%d\n", rc);

		pr_err("Couldn't disable parallel path rc=%d\n", rc);

		return rc;

	}



	/* enable the charging path */

	rc = smblib_masked_write(chg, CHARGING_ENABLE_CMD_REG,

				 CHARGING_ENABLE_CMD_BIT,

				 CHARGING_ENABLE_CMD_BIT);

	/* unsuspend parallel charging */

	rc = smblib_masked_write(chg, USBIN_CMD_IL_REG, USBIN_SUSPEND_BIT, 0);

	if (rc < 0) {

		pr_err("Couldn't enable charging rc=%d\n", rc);

		pr_err("Couldn't unsuspend parallel charging rc=%d\n", rc);

		return rc;

	}



	/* configure charge enable for software control; active high */

	rc = smblib_masked_write(chg, CHGR_CFG2_REG,

				 CHG_EN_POLARITY_BIT | CHG_EN_SRC_BIT, 0);

	/* initialize FCC to 0 */

	rc = smblib_set_charge_param(chg, &chg->param.fcc, 0);

	if (rc < 0) {

		pr_err("Couldn't configure charge enable source rc=%d\n",

			rc);

		pr_err("Couldn't set 0 FCC rc=%d\n", rc);

		return rc;

	}