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

Commit b3101011 authored by Ashay Jaiswal's avatar Ashay Jaiswal Committed by Harry Yang
Browse files

qcom: smb-lib: fix adapter allowance for PM660 



PM660 only supports VBUS voltage upto 9V, add
support to limit adapter allowance to maximum 9V for
PM660.

Change-Id: I283d5b1105cd9ad397a484982d674acf97f31f8a
Signed-off-by: default avatarAshay Jaiswal <ashayj@codeaurora.org>
parent dcfc8666

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

+37 −7
Original line number Diff line number Diff line
@@ -473,6 +473,36 @@ int smblib_set_dc_suspend(struct smb_charger *chg, bool suspend) 
	return rc;

}



static int smblib_set_adapter_allowance(struct smb_charger *chg,

					u8 allowed_voltage)

{

	int rc = 0;



	switch (allowed_voltage) {

	case USBIN_ADAPTER_ALLOW_12V:

	case USBIN_ADAPTER_ALLOW_5V_OR_12V:

	case USBIN_ADAPTER_ALLOW_9V_TO_12V:

	case USBIN_ADAPTER_ALLOW_5V_OR_9V_TO_12V:

	case USBIN_ADAPTER_ALLOW_5V_TO_12V:

		/* PM660 only support max. 9V */

		if (chg->smb_version == PM660_SUBTYPE) {

			smblib_dbg(chg, PR_MISC, "voltage not supported=%d\n",

					allowed_voltage);

			allowed_voltage = USBIN_ADAPTER_ALLOW_5V_TO_9V;

		}

		break;

	}



	rc = smblib_write(chg, USBIN_ADAPTER_ALLOW_CFG_REG, allowed_voltage);

	if (rc < 0) {

		smblib_err(chg, "Couldn't write 0x%02x to USBIN_ADAPTER_ALLOW_CFG rc=%d\n",

			allowed_voltage, rc);

		return rc;

	}



	return rc;

}



#define MICRO_5V	5000000

#define MICRO_9V	9000000

#define MICRO_12V	12000000
@@ -503,10 +533,10 @@ static int smblib_set_usb_pd_allowed_voltage(struct smb_charger *chg, 
		return -EINVAL;

	}



	rc = smblib_write(chg, USBIN_ADAPTER_ALLOW_CFG_REG, allowed_voltage);

	rc = smblib_set_adapter_allowance(chg, allowed_voltage);

	if (rc < 0) {

		smblib_err(chg, "Couldn't write 0x%02x to USBIN_ADAPTER_ALLOW_CFG rc=%d\n",

			allowed_voltage, rc);

		smblib_err(chg, "Couldn't configure adapter allowance rc=%d\n",

				rc);

		return rc;

	}
@@ -649,7 +679,7 @@ static void smblib_uusb_removal(struct smb_charger *chg) 
	}



	/* reconfigure allowed voltage for HVDCP */

	rc = smblib_write(chg, USBIN_ADAPTER_ALLOW_CFG_REG,

	rc = smblib_set_adapter_allowance(chg,

			USBIN_ADAPTER_ALLOW_5V_OR_9V_TO_12V);

	if (rc < 0)

		smblib_err(chg, "Couldn't set USBIN_ADAPTER_ALLOW_5V_OR_9V_TO_12V rc=%d\n",
@@ -3408,7 +3438,7 @@ static void typec_source_removal(struct smb_charger *chg) 
	}



	/* reconfigure allowed voltage for HVDCP */

	rc = smblib_write(chg, USBIN_ADAPTER_ALLOW_CFG_REG,

	rc = smblib_set_adapter_allowance(chg,

			USBIN_ADAPTER_ALLOW_5V_OR_9V_TO_12V);

	if (rc < 0)

		smblib_err(chg, "Couldn't set USBIN_ADAPTER_ALLOW_5V_OR_9V_TO_12V rc=%d\n",