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

Commit bb6cb858 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "power: smb1398-charger: Toggle UVLO-config on USB removal and shutdown"

parents 815c4533 8de4f290

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

+39 −0
Original line number Original line Diff line number Diff line
@@ -177,6 +177,9 @@ 
#define PERPH0_CFG_SDCDC_REG		0x267A

#define PERPH0_CFG_SDCDC_REG		0x267A

#define EN_WIN_UV_BIT			BIT(7)

#define EN_WIN_UV_BIT			BIT(7)





#define PERPH0_SOVP_CFG0_REG		0x2680

#define CFG_OVP_IGNORE_UVLO		BIT(5)



#define PERPH0_SSUPPLY_CFG0_REG		0x2682

#define PERPH0_SSUPPLY_CFG0_REG		0x2682

#define EN_HV_OV_OPTION2_BIT		BIT(7)

#define EN_HV_OV_OPTION2_BIT		BIT(7)

#define EN_MV_OV_OPTION2_BIT		BIT(5)

#define EN_MV_OV_OPTION2_BIT		BIT(5)
@@ -347,6 +350,7 @@ struct smb1398_chip { 
	bool			slave_en;

	bool			slave_en;

	bool			in_suspend;

	bool			in_suspend;

	bool			disabled;

	bool			disabled;

	bool			usb_present;

};

};





static int smb1398_read(struct smb1398_chip *chip, u16 reg, u8 *val)

static int smb1398_read(struct smb1398_chip *chip, u16 reg, u8 *val)
@@ -879,6 +883,23 @@ static void smb1398_toggle_switcher(struct smb1398_chip *chip) 
		dev_err(chip->dev, "Couldn't disable EN_ILIM_DET, rc=%d\n", rc);

		dev_err(chip->dev, "Couldn't disable EN_ILIM_DET, rc=%d\n", rc);

}

}





static int smb1398_toggle_uvlo(struct smb1398_chip *chip)

{

	int rc;



	rc = smb1398_masked_write(chip, PERPH0_SOVP_CFG0_REG,

				CFG_OVP_IGNORE_UVLO, CFG_OVP_IGNORE_UVLO);

	if (rc < 0)

		dev_err(chip->dev, "Couldn't write IGNORE_UVLO rc=%d\n", rc);



	rc = smb1398_masked_write(chip, PERPH0_SOVP_CFG0_REG,

				CFG_OVP_IGNORE_UVLO, 0);

	if (rc < 0)

		dev_err(chip->dev, "Couldn't write IGNORE_UVLO, rc=%d\n", rc);



	return rc;

}



static enum power_supply_property div2_cp_master_props[] = {

static enum power_supply_property div2_cp_master_props[] = {

	POWER_SUPPLY_PROP_CP_STATUS1,

	POWER_SUPPLY_PROP_CP_STATUS1,

	POWER_SUPPLY_PROP_CP_STATUS2,

	POWER_SUPPLY_PROP_CP_STATUS2,
@@ -1656,6 +1677,20 @@ static void smb1398_status_change_work(struct work_struct *work) 
	if (!is_cutoff_soc_reached(chip))

	if (!is_cutoff_soc_reached(chip))

		vote(chip->div2_cp_disable_votable, CUTOFF_SOC_VOTER, false, 0);

		vote(chip->div2_cp_disable_votable, CUTOFF_SOC_VOTER, false, 0);





	rc = power_supply_get_property(chip->usb_psy,

			POWER_SUPPLY_PROP_PRESENT, &pval);

	if (rc < 0) {

		dev_err(chip->dev,

			"Couldn't get USB PRESENT status, rc=%d\n", rc);

		goto out;

	}



	if (chip->usb_present != !!pval.intval) {

		chip->usb_present = !!pval.intval;

		if (!chip->usb_present) /* USB has been removed */

			smb1398_toggle_uvlo(chip);

	}



	rc = power_supply_get_property(chip->usb_psy,

	rc = power_supply_get_property(chip->usb_psy,

			POWER_SUPPLY_PROP_SMB_EN_MODE, &pval);

			POWER_SUPPLY_PROP_SMB_EN_MODE, &pval);

	if (rc < 0) {

	if (rc < 0) {
@@ -2669,6 +2704,10 @@ static void smb1398_shutdown(struct platform_device *pdev) 
	rc = smb1398_div2_cp_switcher_en(chip, 0);

	rc = smb1398_div2_cp_switcher_en(chip, 0);

	if (rc < 0)

	if (rc < 0)

		dev_err(chip->dev, "Couldn't disable chip rc= %d\n", rc);

		dev_err(chip->dev, "Couldn't disable chip rc= %d\n", rc);



	rc = smb1398_toggle_uvlo(chip);

	if (rc < 0)

		dev_err(chip->dev, "Couldn't toggle uvlo rc= %d\n", rc);

}

}





static const struct dev_pm_ops smb1398_pm_ops = {

static const struct dev_pm_ops smb1398_pm_ops = {