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

Commit 8f66dead authored by Abhijeet Dharmapurikar's avatar Abhijeet Dharmapurikar
Browse files

power: qpnp-smbcharger: reset allowance to 5V_UNREG_9V setting 



The power on default is set to 5V_UNREG_9V setting. The driver should
reset back to that option when the adapter is removed.

CRs-Fixed: 948903
Change-Id: Ie273cddd62cfb740ad7edaa5745adf4107de2252
Signed-off-by: default avatarAbhijeet Dharmapurikar <adharmap@codeaurora.org>
parent b5604a13

drivers/power/qpnp-smbcharger.c

+4 −3
Original line number Original line Diff line number Diff line
@@ -3545,6 +3545,7 @@ struct regulator_ops smbchg_otg_reg_ops = { 
#define ADAPTER_ALLOWANCE_MASK		0x7

#define ADAPTER_ALLOWANCE_MASK		0x7

#define USBIN_ADAPTER_9V		0x3

#define USBIN_ADAPTER_9V		0x3

#define USBIN_ADAPTER_5V_9V_CONT	0x2

#define USBIN_ADAPTER_5V_9V_CONT	0x2

#define USBIN_ADAPTER_5V_UNREGULATED_9V	0x5

#define HVDCP_EN_BIT			BIT(3)

#define HVDCP_EN_BIT			BIT(3)

static int smbchg_external_otg_regulator_enable(struct regulator_dev *rdev)

static int smbchg_external_otg_regulator_enable(struct regulator_dev *rdev)

{

{
@@ -4367,10 +4368,10 @@ static void restore_from_hvdcp_detection(struct smbchg_chip *chip) 
	if (rc < 0)

	if (rc < 0)

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

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





	/* allow 5 to 9V chargers */

	/* Reset back to 5V unregulated */

	rc = smbchg_sec_masked_write(chip,

	rc = smbchg_sec_masked_write(chip,

		chip->usb_chgpth_base + USBIN_CHGR_CFG,

		chip->usb_chgpth_base + USBIN_CHGR_CFG,

			ADAPTER_ALLOWANCE_MASK, USBIN_ADAPTER_5V_9V_CONT);

		ADAPTER_ALLOWANCE_MASK, USBIN_ADAPTER_5V_UNREGULATED_9V);

	if (rc < 0)

	if (rc < 0)

		pr_err("Couldn't write usb allowance rc=%d\n", rc);

		pr_err("Couldn't write usb allowance rc=%d\n", rc);