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

Commit 78bb5759 authored by Tirupathi Reddy's avatar Tirupathi Reddy Committed by Shilpa Suresh
Browse files

power: supply: qpnp-smb2: add support to disable power role switch 



Moisture detection feature requires USB to be configured in SINK mode
until moisture is cleared. Add disable usb power role switch support
using a votable object. Also add support to handle moisture detection
result.

CRs-Fixed: 2102107
Change-Id: I039c6a40665a10036131b45fe61912246264aa98
Signed-off-by: default avatarTirupathi Reddy <tirupath@codeaurora.org>
parent bec03ec9

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

+15 −1
Original line number Diff line number Diff line
@@ -358,6 +358,7 @@ static enum power_supply_property smb2_usb_props[] = { 
	POWER_SUPPLY_PROP_PD_VOLTAGE_MIN,

	POWER_SUPPLY_PROP_SDP_CURRENT_MAX,

	POWER_SUPPLY_PROP_CONNECTOR_TYPE,

	POWER_SUPPLY_PROP_MOISTURE_DETECTED,

};



static int smb2_usb_get_prop(struct power_supply *psy,
@@ -476,6 +477,10 @@ static int smb2_usb_get_prop(struct power_supply *psy, 
	case POWER_SUPPLY_PROP_CONNECTOR_TYPE:

		val->intval = chg->connector_type;

		break;

	case POWER_SUPPLY_PROP_MOISTURE_DETECTED:

		val->intval = get_client_vote(chg->disable_power_role_switch,

					      MOISTURE_VOTER);

		break;

	default:

		pr_err("get prop %d is not supported in usb\n", psp);

		rc = -EINVAL;
@@ -498,7 +503,16 @@ static int smb2_usb_set_prop(struct power_supply *psy, 


	mutex_lock(&chg->lock);

	if (!chg->typec_present) {

		switch (psp) {

		case POWER_SUPPLY_PROP_MOISTURE_DETECTED:

			vote(chg->disable_power_role_switch, MOISTURE_VOTER,

			     val->intval > 0, 0);

			break;

		default:

			rc = -EINVAL;

			break;

		}



		goto unlock;

	}

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

+139 −47
Original line number Diff line number Diff line
@@ -1009,6 +1009,101 @@ int smblib_get_icl_current(struct smb_charger *chg, int *icl_ua) 
	return 0;

}



static int smblib_micro_usb_disable_power_role_switch(struct smb_charger *chg,

				bool disable)

{

	int rc = 0;

	u8 power_role;



	power_role = disable ? TYPEC_DISABLE_CMD_BIT : 0;

	/* Disable pullup on CC1_ID pin and stop detection on CC pins */

	rc = smblib_masked_write(chg, TYPE_C_INTRPT_ENB_SOFTWARE_CTRL_REG,

				 (uint8_t)TYPEC_POWER_ROLE_CMD_MASK,

				 power_role);

	if (rc < 0) {

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

			power_role, rc);

		return rc;

	}



	if (disable) {

		/* configure TypeC mode */

		rc = smblib_masked_write(chg, TYPE_C_CFG_REG,

					 TYPE_C_OR_U_USB_BIT, 0);

		if (rc < 0) {

			smblib_err(chg, "Couldn't configure typec mode rc=%d\n",

				rc);

			return rc;

		}



		/* wait for FSM to enter idle state */

		usleep_range(5000, 5100);



		/* configure micro USB mode */

		rc = smblib_masked_write(chg, TYPE_C_CFG_REG,

					 TYPE_C_OR_U_USB_BIT,

					 TYPE_C_OR_U_USB_BIT);

		if (rc < 0) {

			smblib_err(chg, "Couldn't configure micro USB mode rc=%d\n",

				rc);

			return rc;

		}

	}



	return rc;

}



static int __smblib_set_prop_typec_power_role(struct smb_charger *chg,

				     const union power_supply_propval *val)

{

	int rc = 0;

	u8 power_role;



	switch (val->intval) {

	case POWER_SUPPLY_TYPEC_PR_NONE:

		power_role = TYPEC_DISABLE_CMD_BIT;

		break;

	case POWER_SUPPLY_TYPEC_PR_DUAL:

		power_role = 0;

		break;

	case POWER_SUPPLY_TYPEC_PR_SINK:

		power_role = UFP_EN_CMD_BIT;

		break;

	case POWER_SUPPLY_TYPEC_PR_SOURCE:

		power_role = DFP_EN_CMD_BIT;

		break;

	default:

		smblib_err(chg, "power role %d not supported\n", val->intval);

		return -EINVAL;

	}



	if (power_role == UFP_EN_CMD_BIT) {

		/* disable PBS workaround when forcing sink mode */

		rc = smblib_write(chg, TM_IO_DTEST4_SEL, 0x0);

		if (rc < 0) {

			smblib_err(chg, "Couldn't write to TM_IO_DTEST4_SEL rc=%d\n",

				rc);

		}

	} else {

		/* restore it back to 0xA5 */

		rc = smblib_write(chg, TM_IO_DTEST4_SEL, 0xA5);

		if (rc < 0) {

			smblib_err(chg, "Couldn't write to TM_IO_DTEST4_SEL rc=%d\n",

				rc);

		}

	}



	rc = smblib_masked_write(chg, TYPE_C_INTRPT_ENB_SOFTWARE_CTRL_REG,

				 TYPEC_POWER_ROLE_CMD_MASK, power_role);

	if (rc < 0) {

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

			power_role, rc);

		return rc;

	}



	return rc;

}



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

 * VOTABLE CALLBACKS *

 *********************/
@@ -1249,6 +1344,31 @@ static int smblib_typec_irq_disable_vote_callback(struct votable *votable, 
	return 0;

}



static int smblib_disable_power_role_switch_callback(struct votable *votable,

			void *data, int disable, const char *client)

{

	struct smb_charger *chg = data;

	union power_supply_propval pval;

	int rc = 0;



	if (chg->connector_type == POWER_SUPPLY_CONNECTOR_MICRO_USB) {

		rc = smblib_micro_usb_disable_power_role_switch(chg, disable);

	} else {

		pval.intval = disable ? POWER_SUPPLY_TYPEC_PR_SINK

				      : POWER_SUPPLY_TYPEC_PR_DUAL;

		rc = __smblib_set_prop_typec_power_role(chg, &pval);

	}



	if (rc)

		smblib_err(chg, "power_role_switch = %s failed, rc=%d\n",

				disable ? "disabled" : "enabled", rc);

	else

		smblib_dbg(chg, PR_MISC, "power_role_switch = %s\n",

				disable ? "disabled" : "enabled");



	return rc;

}



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

 * VCONN REGULATOR *

 * *****************/
@@ -2656,52 +2776,11 @@ int smblib_set_prop_boost_current(struct smb_charger *chg, 
int smblib_set_prop_typec_power_role(struct smb_charger *chg,

				     const union power_supply_propval *val)

{

	int rc = 0;

	u8 power_role;



	switch (val->intval) {

	case POWER_SUPPLY_TYPEC_PR_NONE:

		power_role = TYPEC_DISABLE_CMD_BIT;

		break;

	case POWER_SUPPLY_TYPEC_PR_DUAL:

		power_role = 0;

		break;

	case POWER_SUPPLY_TYPEC_PR_SINK:

		power_role = UFP_EN_CMD_BIT;

		break;

	case POWER_SUPPLY_TYPEC_PR_SOURCE:

		power_role = DFP_EN_CMD_BIT;

		break;

	default:

		smblib_err(chg, "power role %d not supported\n", val->intval);

		return -EINVAL;

	}

	/* Check if power role switch is disabled */

	if (!get_effective_result(chg->disable_power_role_switch))

		return __smblib_set_prop_typec_power_role(chg, val);



	if (power_role == UFP_EN_CMD_BIT) {

		/* disable PBS workaround when forcing sink mode */

		rc = smblib_write(chg, TM_IO_DTEST4_SEL, 0x0);

		if (rc < 0) {

			smblib_err(chg, "Couldn't write to TM_IO_DTEST4_SEL rc=%d\n",

				rc);

		}

	} else {

		/* restore it back to 0xA5 */

		rc = smblib_write(chg, TM_IO_DTEST4_SEL, 0xA5);

		if (rc < 0) {

			smblib_err(chg, "Couldn't write to TM_IO_DTEST4_SEL rc=%d\n",

				rc);

		}

	}



	rc = smblib_masked_write(chg, TYPE_C_INTRPT_ENB_SOFTWARE_CTRL_REG,

				 TYPEC_POWER_ROLE_CMD_MASK, power_role);

	if (rc < 0) {

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

			power_role, rc);

		return rc;

	}



	return rc;

	return 0;

}



int smblib_set_prop_pd_voltage_min(struct smb_charger *chg,
@@ -4070,6 +4149,7 @@ static void smblib_handle_typec_removal(struct smb_charger *chg) 
	int rc;

	struct smb_irq_data *data;

	struct storm_watch *wdata;

	union power_supply_propval val;



	chg->cc2_detach_wa_active = false;
@@ -4194,8 +4274,8 @@ static void smblib_handle_typec_removal(struct smb_charger *chg) 
			rc);



	/* enable DRP */

	rc = smblib_masked_write(chg, TYPE_C_INTRPT_ENB_SOFTWARE_CTRL_REG,

				 TYPEC_POWER_ROLE_CMD_MASK, 0);

	val.intval = POWER_SUPPLY_TYPEC_PR_DUAL;

	rc = smblib_set_prop_typec_power_role(chg, &val);

	if (rc < 0)

		smblib_err(chg, "Couldn't enable DRP rc=%d\n", rc);
@@ -5081,6 +5161,16 @@ static int smblib_create_votables(struct smb_charger *chg) 
		return rc;

	}



	chg->disable_power_role_switch

			= create_votable("DISABLE_POWER_ROLE_SWITCH",

				VOTE_SET_ANY,

				smblib_disable_power_role_switch_callback,

				chg);

	if (IS_ERR(chg->disable_power_role_switch)) {

		rc = PTR_ERR(chg->disable_power_role_switch);

		return rc;

	}



	return rc;

}
@@ -5106,6 +5196,8 @@ static void smblib_destroy_votables(struct smb_charger *chg) 
		destroy_votable(chg->hvdcp_hw_inov_dis_votable);

	if (chg->typec_irq_disable_votable)

		destroy_votable(chg->typec_irq_disable_votable);

	if (chg->disable_power_role_switch)

		destroy_votable(chg->disable_power_role_switch);

}



static void smblib_iio_deinit(struct smb_charger *chg)

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

+2 −0
Original line number Diff line number Diff line
@@ -69,6 +69,7 @@ enum print_reason { 
#define PL_FCC_LOW_VOTER		"PL_FCC_LOW_VOTER"

#define WBC_VOTER			"WBC_VOTER"

#define OV_VOTER			"OV_VOTER"

#define MOISTURE_VOTER			"MOISTURE_VOTER"



#define VCONN_MAX_ATTEMPTS	3

#define OTG_MAX_ATTEMPTS	3
@@ -293,6 +294,7 @@ struct smb_charger { 
	struct votable		*hvdcp_hw_inov_dis_votable;

	struct votable		*usb_irq_enable_votable;

	struct votable		*typec_irq_disable_votable;

	struct votable		*disable_power_role_switch;



	/* work */

	struct work_struct	bms_update_work;