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

Commit a1f1cfe0 authored by Guru Das Srinagesh's avatar Guru Das Srinagesh
Browse files

power: smb5: Add moisture detection support for uUSB connector 



Presence of moisture expedites the corrosion of Type-C/uUSB ID pins
due to constant DRP toggling. To reduce the effect of corrosion,
set DRP toggling duty cycle to 1% and suspend USB input on water
detection.

Use property MOISTURE_DETECTED to reflect moisture detection status.

This patch has been updated to reduce the cyclomatic complexity of
smb5_parse_dt() and smb5_usb_get_prop().

Change-Id: I3bb41564cf67127ae2c0bb27089a1e8b5d722df6
Signed-off-by: default avatarUmang Agrawal <uagrawal@codeaurora.org>
Signed-off-by: default avatarGuru Das Srinagesh <gurus@codeaurora.org>
parent 568550b4

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

+155 −103
Original line number Diff line number Diff line
@@ -295,6 +295,8 @@ static int smb5_chg_config_init(struct smb5 *chip) 
		chg->param = smb5_pm8150b_params;

		chg->name = "pm6150_charger";

		chg->wa_flags |= SW_THERM_REGULATION_WA;

		if (pmic_rev_id->rev4 >= 2)

			chg->uusb_moisture_protection_capable = true;

		chg->main_fcc_max = PM6150_MAX_FCC_UA;

		break;

	case PMI632_SUBTYPE:
@@ -334,16 +336,10 @@ static int smb5_chg_config_init(struct smb5 *chip) 
#define MICRO_3PA			3000000

#define OTG_DEFAULT_DEGLITCH_TIME_MS	50

#define DEFAULT_WD_BARK_TIME		64

static int smb5_parse_dt(struct smb5 *chip)

static int smb5_parse_dt_misc(struct smb5 *chip, struct device_node *node)

{

	int rc = 0, byte_len;

	struct smb_charger *chg = &chip->chg;

	struct device_node *node = chg->dev->of_node;

	int rc, byte_len;



	if (!node) {

		pr_err("device tree node missing\n");

		return -EINVAL;

	}



	of_property_read_u32(node, "qcom,sec-charger-config",

					&chip->dt.sec_charger_config);
@@ -369,39 +365,6 @@ static int smb5_parse_dt(struct smb5 *chip) 
	chip->dt.no_battery = of_property_read_bool(node,

						"qcom,batteryless-platform");



	rc = of_property_read_u32(node,

			"qcom,fcc-max-ua", &chip->dt.batt_profile_fcc_ua);

	if (rc < 0)

		chip->dt.batt_profile_fcc_ua = -EINVAL;



	rc = of_property_read_u32(node,

				"qcom,fv-max-uv", &chip->dt.batt_profile_fv_uv);

	if (rc < 0)

		chip->dt.batt_profile_fv_uv = -EINVAL;



	rc = of_property_read_u32(node,

				"qcom,usb-icl-ua", &chip->dt.usb_icl_ua);

	if (rc < 0)

		chip->dt.usb_icl_ua = -EINVAL;



	rc = of_property_read_u32(node,

				"qcom,otg-cl-ua", &chg->otg_cl_ua);

	if (rc < 0)

		chg->otg_cl_ua = (chip->chg.smb_version == PMI632_SUBTYPE) ?

							MICRO_1PA : MICRO_3PA;



	rc = of_property_read_u32(node, "qcom,chg-term-src",

			&chip->dt.term_current_src);

	if (rc < 0)

		chip->dt.term_current_src = ITERM_SRC_UNSPECIFIED;



	rc = of_property_read_u32(node, "qcom,chg-term-current-ma",

			&chip->dt.term_current_thresh_hi_ma);



	if (chip->dt.term_current_src == ITERM_SRC_ADC)

		rc = of_property_read_u32(node, "qcom,chg-term-base-current-ma",

				&chip->dt.term_current_thresh_lo_ma);



	if (of_find_property(node, "qcom,thermal-mitigation", &byte_len)) {

		chg->thermal_mitigation = devm_kzalloc(chg->dev, byte_len,

			GFP_KERNEL);
@@ -442,14 +405,6 @@ static int smb5_parse_dt(struct smb5 *chip) 
						"qcom,hvdcp-disable");

	chg->hvdcp_disable = chip->dt.hvdcp_disable;



	rc = of_property_read_u32(node, "qcom,chg-inhibit-threshold-mv",

				&chip->dt.chg_inhibit_thr_mv);

	if (!rc && (chip->dt.chg_inhibit_thr_mv < 0 ||

				chip->dt.chg_inhibit_thr_mv > 300)) {

		pr_err("qcom,chg-inhibit-threshold-mv is incorrect\n");

		return -EINVAL;

	}



	chip->dt.auto_recharge_soc = -EINVAL;

	rc = of_property_read_u32(node, "qcom,auto-recharge-soc",

				&chip->dt.auto_recharge_soc);
@@ -460,16 +415,6 @@ static int smb5_parse_dt(struct smb5 *chip) 
	}

	chg->auto_recharge_soc = chip->dt.auto_recharge_soc;



	chip->dt.auto_recharge_vbat_mv = -EINVAL;

	rc = of_property_read_u32(node, "qcom,auto-recharge-vbat-mv",

				&chip->dt.auto_recharge_vbat_mv);

	if (!rc && (chip->dt.auto_recharge_vbat_mv < 0)) {

		pr_err("qcom,auto-recharge-vbat-mv is incorrect\n");

		return -EINVAL;

	}



	chg->dcp_icl_ua = chip->dt.usb_icl_ua;



	chg->suspend_input_on_debug_batt = of_property_read_bool(node,

					"qcom,suspend-input-on-debug-batt");
@@ -481,7 +426,21 @@ static int smb5_parse_dt(struct smb5 *chip) 
	chg->fcc_stepper_enable = of_property_read_bool(node,

					"qcom,fcc-stepping-enable");



	/* Extract ADC channels */

	if (chg->uusb_moisture_protection_capable)

		chg->uusb_moisture_protection_enabled =

			of_property_read_bool(node,

					"qcom,uusb-moisture-protection-enable");



	chip->dt.disable_suspend_on_collapse = of_property_read_bool(node,

					"qcom,disable-suspend-on-collapse");



	return 0;

}



static int smb5_parse_dt_adc_channels(struct smb_charger *chg)

{

	int rc = 0;



	rc = smblib_get_iio_channel(chg, "mid_voltage", &chg->iio.mid_chan);

	if (rc < 0)

		return rc;
@@ -532,8 +491,101 @@ static int smb5_parse_dt(struct smb5 *chip) 
	if (rc < 0)

		return rc;



	chip->dt.disable_suspend_on_collapse = of_property_read_bool(node,

					"qcom,disable-suspend-on-collapse");

	return 0;

}



static int smb5_parse_dt_currents(struct smb5 *chip, struct device_node *node)

{

	int rc = 0;

	struct smb_charger *chg = &chip->chg;



	rc = of_property_read_u32(node,

			"qcom,fcc-max-ua", &chip->dt.batt_profile_fcc_ua);

	if (rc < 0)

		chip->dt.batt_profile_fcc_ua = -EINVAL;



	rc = of_property_read_u32(node,

				"qcom,usb-icl-ua", &chip->dt.usb_icl_ua);

	if (rc < 0)

		chip->dt.usb_icl_ua = -EINVAL;

	chg->dcp_icl_ua = chip->dt.usb_icl_ua;



	rc = of_property_read_u32(node,

				"qcom,otg-cl-ua", &chg->otg_cl_ua);

	if (rc < 0)

		chg->otg_cl_ua = (chip->chg.smb_version == PMI632_SUBTYPE) ?

							MICRO_1PA : MICRO_3PA;



	rc = of_property_read_u32(node, "qcom,chg-term-src",

			&chip->dt.term_current_src);

	if (rc < 0)

		chip->dt.term_current_src = ITERM_SRC_UNSPECIFIED;



	if (chip->dt.term_current_src == ITERM_SRC_ADC)

		rc = of_property_read_u32(node, "qcom,chg-term-base-current-ma",

				&chip->dt.term_current_thresh_lo_ma);



	rc = of_property_read_u32(node, "qcom,chg-term-current-ma",

			&chip->dt.term_current_thresh_hi_ma);



	return 0;

}



static int smb5_parse_dt_voltages(struct smb5 *chip, struct device_node *node)

{

	int rc = 0;



	rc = of_property_read_u32(node,

				"qcom,fv-max-uv", &chip->dt.batt_profile_fv_uv);

	if (rc < 0)

		chip->dt.batt_profile_fv_uv = -EINVAL;



	rc = of_property_read_u32(node, "qcom,chg-inhibit-threshold-mv",

				&chip->dt.chg_inhibit_thr_mv);

	if (!rc && (chip->dt.chg_inhibit_thr_mv < 0 ||

				chip->dt.chg_inhibit_thr_mv > 300)) {

		pr_err("qcom,chg-inhibit-threshold-mv is incorrect\n");

		return -EINVAL;

	}



	chip->dt.auto_recharge_vbat_mv = -EINVAL;

	rc = of_property_read_u32(node, "qcom,auto-recharge-vbat-mv",

				&chip->dt.auto_recharge_vbat_mv);

	if (!rc && (chip->dt.auto_recharge_vbat_mv < 0)) {

		pr_err("qcom,auto-recharge-vbat-mv is incorrect\n");

		return -EINVAL;

	}



	return 0;

}



static int smb5_parse_dt(struct smb5 *chip)

{

	struct smb_charger *chg = &chip->chg;

	struct device_node *node = chg->dev->of_node;

	int rc = 0;



	if (!node) {

		pr_err("device tree node missing\n");

		return -EINVAL;

	}



	rc = smb5_parse_dt_voltages(chip, node);

	if (rc < 0)

		return rc;



	rc = smb5_parse_dt_currents(chip, node);

	if (rc < 0)

		return rc;



	rc = smb5_parse_dt_adc_channels(chg);

	if (rc < 0)

		return rc;



	rc = smb5_parse_dt_misc(chip, node);

	if (rc < 0)

		return rc;



	return 0;

}
@@ -567,6 +619,7 @@ static enum power_supply_property smb5_usb_props[] = { 
	POWER_SUPPLY_PROP_SMB_EN_MODE,

	POWER_SUPPLY_PROP_SMB_EN_REASON,

	POWER_SUPPLY_PROP_SCOPE,

	POWER_SUPPLY_PROP_MOISTURE_DETECTED,

};



static int smb5_usb_get_prop(struct power_supply *psy,
@@ -575,7 +628,6 @@ static int smb5_usb_get_prop(struct power_supply *psy, 
{

	struct smb5 *chip = power_supply_get_drvdata(psy);

	struct smb_charger *chg = &chip->chg;

	union power_supply_propval pval;

	int rc = 0;



	switch (psp) {
@@ -583,19 +635,7 @@ static int smb5_usb_get_prop(struct power_supply *psy, 
		rc = smblib_get_prop_usb_present(chg, val);

		break;

	case POWER_SUPPLY_PROP_ONLINE:

		rc = smblib_get_prop_usb_online(chg, val);

		if (!val->intval)

			break;



		if (((chg->typec_mode == POWER_SUPPLY_TYPEC_SOURCE_DEFAULT) ||

		   (chg->connector_type == POWER_SUPPLY_CONNECTOR_MICRO_USB))

			&& (chg->real_charger_type == POWER_SUPPLY_TYPE_USB))

			val->intval = 0;

		else

			val->intval = 1;



		if (chg->real_charger_type == POWER_SUPPLY_TYPE_UNKNOWN)

			val->intval = 0;

		rc = smblib_get_usb_online(chg, val);

		break;

	case POWER_SUPPLY_PROP_VOLTAGE_MAX:

		rc = smblib_get_prop_usb_voltage_max(chg, val);
@@ -616,31 +656,19 @@ static int smb5_usb_get_prop(struct power_supply *psy, 
		val->intval = chg->real_charger_type;

		break;

	case POWER_SUPPLY_PROP_TYPEC_MODE:

		if (chg->connector_type == POWER_SUPPLY_CONNECTOR_MICRO_USB)

			val->intval = POWER_SUPPLY_TYPEC_NONE;

		else

			val->intval = chg->typec_mode;

		rc = smblib_get_usb_prop_typec_mode(chg, val);

		break;

	case POWER_SUPPLY_PROP_TYPEC_POWER_ROLE:

		if (chg->connector_type == POWER_SUPPLY_CONNECTOR_MICRO_USB)

			val->intval = POWER_SUPPLY_TYPEC_PR_NONE;

		else

		rc = smblib_get_prop_typec_power_role(chg, val);

		break;

	case POWER_SUPPLY_PROP_TYPEC_CC_ORIENTATION:

		if (chg->connector_type == POWER_SUPPLY_CONNECTOR_MICRO_USB)

			val->intval = 0;

		else

		rc = smblib_get_prop_typec_cc_orientation(chg, val);

		break;

	case POWER_SUPPLY_PROP_TYPEC_SRC_RP:

		rc = smblib_get_prop_typec_select_rp(chg, val);

		break;

	case POWER_SUPPLY_PROP_LOW_POWER:

		if (chg->sink_src_mode == SRC_MODE)

		rc = smblib_get_prop_low_power(chg, val);

		else

			rc = -ENODATA;

		break;

	case POWER_SUPPLY_PROP_PD_ACTIVE:

		val->intval = chg->pd_active;
@@ -686,19 +714,10 @@ static int smb5_usb_get_prop(struct power_supply *psy, 
		val->intval = chg->connector_type;

		break;

	case POWER_SUPPLY_PROP_CONNECTOR_HEALTH:

		if (chg->connector_health == -EINVAL)

		val->intval = smblib_get_prop_connector_health(chg);

		else

			val->intval = chg->connector_health;

		break;

	case POWER_SUPPLY_PROP_SCOPE:

		val->intval = POWER_SUPPLY_SCOPE_UNKNOWN;

		rc = smblib_get_prop_usb_present(chg, &pval);

		if (rc < 0)

			break;

		val->intval = pval.intval ? POWER_SUPPLY_SCOPE_DEVICE

				: chg->otg_present ? POWER_SUPPLY_SCOPE_SYSTEM

						: POWER_SUPPLY_SCOPE_UNKNOWN;

		rc = smblib_get_prop_scope(chg, val);

		break;

	case POWER_SUPPLY_PROP_SMB_EN_MODE:

		mutex_lock(&chg->smb_lock);
@@ -708,6 +727,9 @@ static int smb5_usb_get_prop(struct power_supply *psy, 
	case POWER_SUPPLY_PROP_SMB_EN_REASON:

		val->intval = chg->cp_reason;

		break;

	case POWER_SUPPLY_PROP_MOISTURE_DETECTED:

		val->intval = chg->moisture_present;

		break;

	default:

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

		rc = -EINVAL;
@@ -1703,6 +1725,36 @@ static int smb5_configure_micro_usb(struct smb_charger *chg) 
		return rc;

	}



	if (chg->uusb_moisture_protection_enabled) {

		/* Enable moisture detection interrupt */

		rc = smblib_masked_write(chg, TYPE_C_INTERRUPT_EN_CFG_2_REG,

				TYPEC_WATER_DETECTION_INT_EN_BIT,

				TYPEC_WATER_DETECTION_INT_EN_BIT);

		if (rc < 0) {

			dev_err(chg->dev, "Couldn't enable moisture detection interrupt rc=%d\n",

				rc);

			return rc;

		}



		/* Enable uUSB factory mode */

		rc = smblib_masked_write(chg, TYPEC_U_USB_CFG_REG,

					EN_MICRO_USB_FACTORY_MODE_BIT,

					EN_MICRO_USB_FACTORY_MODE_BIT);

		if (rc < 0) {

			dev_err(chg->dev, "Couldn't enable uUSB factory mode c=%d\n",

				rc);

			return rc;

		}



		/* Disable periodic monitoring of CC_ID pin */

		rc = smblib_write(chg, TYPEC_U_USB_WATER_PROTECTION_CFG_REG, 0);

		if (rc < 0) {

			dev_err(chg->dev, "Couldn't disable periodic monitoring of CC_ID rc=%d\n",

				rc);

			return rc;

		}

	}



	return rc;

}

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

+289 −5
Original line number Diff line number Diff line
@@ -1315,6 +1315,100 @@ int smblib_toggle_smb_en(struct smb_charger *chg, int toggle) 
	return rc;

}



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

 * uUSB Moisture Protection *

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

#define MICRO_USB_DETECTION_ON_TIME_20_MS 0x08

#define MICRO_USB_DETECTION_PERIOD_X_100 0x03

#define U_USB_STATUS_WATER_PRESENT 0x00

static int smblib_set_moisture_protection(struct smb_charger *chg,

				bool enable)

{

	int rc = 0;



	if (chg->moisture_present == enable) {

		smblib_dbg(chg, PR_MISC, "No change in moisture protection status\n");

		return rc;

	}



	if (enable) {

		chg->moisture_present = true;



		/* Disable uUSB factory mode detection */

		rc = smblib_masked_write(chg, TYPEC_U_USB_CFG_REG,

					EN_MICRO_USB_FACTORY_MODE_BIT, 0);

		if (rc < 0) {

			smblib_err(chg, "Couldn't disable uUSB factory mode detection rc=%d\n",

				rc);

			return rc;

		}



		/* Disable moisture detection and uUSB state change interrupt */

		rc = smblib_masked_write(chg, TYPE_C_INTERRUPT_EN_CFG_2_REG,

					TYPEC_WATER_DETECTION_INT_EN_BIT |

					MICRO_USB_STATE_CHANGE_INT_EN_BIT, 0);

		if (rc < 0) {

			smblib_err(chg, "Couldn't disable moisture detection interrupt rc=%d\n",

			rc);

			return rc;

		}



		/* Set 1% duty cycle on ID detection */

		rc = smblib_masked_write(chg,

					TYPEC_U_USB_WATER_PROTECTION_CFG_REG,

					EN_MICRO_USB_WATER_PROTECTION_BIT |

					MICRO_USB_DETECTION_ON_TIME_CFG_MASK |

					MICRO_USB_DETECTION_PERIOD_CFG_MASK,

					EN_MICRO_USB_WATER_PROTECTION_BIT |

					MICRO_USB_DETECTION_ON_TIME_20_MS |

					MICRO_USB_DETECTION_PERIOD_X_100);

		if (rc < 0) {

			smblib_err(chg, "Couldn't set 1 percent CC_ID duty cycle rc=%d\n",

				rc);

			return rc;

		}



		vote(chg->usb_icl_votable, MOISTURE_VOTER, true, 0);

	} else {

		chg->moisture_present = false;

		vote(chg->usb_icl_votable, MOISTURE_VOTER, false, 0);



		/* Enable moisture detection and uUSB state change interrupt */

		rc = smblib_masked_write(chg, TYPE_C_INTERRUPT_EN_CFG_2_REG,

					TYPEC_WATER_DETECTION_INT_EN_BIT |

					MICRO_USB_STATE_CHANGE_INT_EN_BIT,

					TYPEC_WATER_DETECTION_INT_EN_BIT |

					MICRO_USB_STATE_CHANGE_INT_EN_BIT);

		if (rc < 0) {

			smblib_err(chg, "Couldn't enable moisture detection and uUSB state change interrupt rc=%d\n",

				rc);

			return rc;

		}



		/* Disable periodic monitoring of CC_ID pin */

		rc = smblib_write(chg, TYPEC_U_USB_WATER_PROTECTION_CFG_REG, 0);

		if (rc < 0) {

			smblib_err(chg, "Couldn't disable 1 percent CC_ID duty cycle rc=%d\n",

				rc);

			return rc;

		}



		/* Enable uUSB factory mode detection */

		rc = smblib_masked_write(chg, TYPEC_U_USB_CFG_REG,

					EN_MICRO_USB_FACTORY_MODE_BIT,

					EN_MICRO_USB_FACTORY_MODE_BIT);

		if (rc < 0) {

			smblib_err(chg, "Couldn't disable uUSB factory mode detection rc=%d\n",

				rc);

			return rc;

		}

	}



	smblib_dbg(chg, PR_MISC, "Moisture protection %s\n",

			chg->moisture_present ? "enabled" : "disabled");

	return rc;

}



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

 * VOTABLE CALLBACKS *

 *********************/
@@ -2697,6 +2791,29 @@ int smblib_get_prop_usb_online(struct smb_charger *chg, 
	return rc;

}



int smblib_get_usb_online(struct smb_charger *chg,

			union power_supply_propval *val)

{

	int rc;



	rc = smblib_get_prop_usb_online(chg, val);

	if (!val->intval)

		goto exit;



	if (((chg->typec_mode == POWER_SUPPLY_TYPEC_SOURCE_DEFAULT) ||

		(chg->connector_type == POWER_SUPPLY_CONNECTOR_MICRO_USB))

		&& (chg->real_charger_type == POWER_SUPPLY_TYPE_USB))

		val->intval = 0;

	else

		val->intval = 1;



	if (chg->real_charger_type == POWER_SUPPLY_TYPE_UNKNOWN)

		val->intval = 0;



exit:

	return rc;

}



int smblib_get_prop_usb_voltage_max(struct smb_charger *chg,

				    union power_supply_propval *val)

{
@@ -2921,6 +3038,11 @@ int smblib_get_prop_typec_cc_orientation(struct smb_charger *chg, 
	int rc = 0;

	u8 stat;



	val->intval = 0;



	if (chg->connector_type == POWER_SUPPLY_CONNECTOR_MICRO_USB)

		return 0;



	rc = smblib_read(chg, TYPE_C_MISC_STATUS_REG, &stat);

	if (rc < 0) {

		smblib_err(chg, "Couldn't read TYPE_C_STATUS_4 rc=%d\n", rc);
@@ -2930,8 +3052,6 @@ int smblib_get_prop_typec_cc_orientation(struct smb_charger *chg, 


	if (stat & CC_ATTACHED_BIT)

		val->intval = (bool)(stat & CC_ORIENTATION_BIT) + 1;

	else

		val->intval = 0;



	return rc;

}
@@ -3028,12 +3148,28 @@ static int smblib_get_prop_typec_mode(struct smb_charger *chg) 
		return smblib_get_prop_ufp_mode(chg);

}



inline int smblib_get_usb_prop_typec_mode(struct smb_charger *chg,

				union power_supply_propval *val)

{

	if (chg->connector_type == POWER_SUPPLY_CONNECTOR_MICRO_USB)

		val->intval = POWER_SUPPLY_TYPEC_NONE;

	else

		val->intval = chg->typec_mode;



	return 0;

}



int smblib_get_prop_typec_power_role(struct smb_charger *chg,

				     union power_supply_propval *val)

{

	int rc = 0;

	u8 ctrl;



	if (chg->connector_type == POWER_SUPPLY_CONNECTOR_MICRO_USB) {

		val->intval = POWER_SUPPLY_TYPEC_PR_NONE;

		return 0;

	}



	rc = smblib_read(chg, TYPE_C_MODE_CFG_REG, &ctrl);

	if (rc < 0) {

		smblib_err(chg, "Couldn't read TYPE_C_MODE_CFG_REG rc=%d\n",
@@ -3146,6 +3282,9 @@ int smblib_get_prop_low_power(struct smb_charger *chg, 
	int rc;

	u8 stat;



	if (chg->sink_src_mode != SRC_MODE)

		return -ENODATA;



	rc = smblib_read(chg, TYPE_C_SRC_STATUS_REG, &stat);

	if (rc < 0) {

		smblib_err(chg, "Couldn't read TYPE_C_SRC_STATUS_REG rc=%d\n",
@@ -3263,11 +3402,32 @@ int smblib_get_die_health(struct smb_charger *chg, 
	return 0;

}



int smblib_get_prop_scope(struct smb_charger *chg,

			union power_supply_propval *val)

{

	int rc;

	union power_supply_propval pval;



	val->intval = POWER_SUPPLY_SCOPE_UNKNOWN;

	rc = smblib_get_prop_usb_present(chg, &pval);

	if (rc < 0)

		return rc;



	val->intval = pval.intval ? POWER_SUPPLY_SCOPE_DEVICE

		: chg->otg_present ? POWER_SUPPLY_SCOPE_SYSTEM

		: POWER_SUPPLY_SCOPE_UNKNOWN;



	return 0;

}



int smblib_get_prop_connector_health(struct smb_charger *chg)

{

	int rc;

	u8 stat;



	if (chg->connector_health != -EINVAL)

		return chg->connector_health;



	if (chg->wa_flags & SW_THERM_REGULATION_WA) {

		if (chg->connector_temp == -ENODATA)

			return POWER_SUPPLY_HEALTH_UNKNOWN;
@@ -4766,11 +4926,27 @@ irqreturn_t typec_or_rid_detection_change_irq_handler(int irq, void *data) 
	smblib_dbg(chg, PR_INTERRUPT, "IRQ: %s\n", irq_data->name);



	if (chg->connector_type == POWER_SUPPLY_CONNECTOR_MICRO_USB) {

		if (chg->uusb_moisture_protection_enabled) {

			/*

			 * Adding pm_stay_awake as because pm_relax is called

			 * on exit path from the work routine.

			 */

			pm_stay_awake(chg->dev);

			schedule_work(&chg->moisture_protection_work);

		}



		cancel_delayed_work_sync(&chg->uusb_otg_work);

		/*

		 * Skip OTG enablement if RID interrupt triggers with moisture

		 * protection still enabled.

		 */

		if (!chg->moisture_present) {

			vote(chg->awake_votable, OTG_DELAY_VOTER, true, 0);

			smblib_dbg(chg, PR_INTERRUPT, "Scheduling OTG work\n");

			schedule_delayed_work(&chg->uusb_otg_work,

				msecs_to_jiffies(chg->otg_delay_ms));

		}



		goto out;

	}
@@ -5318,6 +5494,96 @@ static void smblib_thermal_regulation_work(struct work_struct *work) 
					rc);

}



#define MOISTURE_PROTECTION_CHECK_DELAY_MS 300000		/* 5 mins */

static void smblib_moisture_protection_work(struct work_struct *work)

{

	struct smb_charger *chg = container_of(work, struct smb_charger,

						moisture_protection_work);

	int rc;

	bool usb_plugged_in;

	u8 stat;



	/*

	 * Disable 1% duty cycle on CC_ID pin and enable uUSB factory mode

	 * detection to track any change on RID, as interrupts are disable.

	 */

	rc = smblib_write(chg, TYPEC_U_USB_WATER_PROTECTION_CFG_REG, 0);

	if (rc < 0) {

		smblib_err(chg, "Couldn't disable periodic monitoring of CC_ID rc=%d\n",

			rc);

		goto out;

	}



	rc = smblib_masked_write(chg, TYPEC_U_USB_CFG_REG,

					EN_MICRO_USB_FACTORY_MODE_BIT,

					EN_MICRO_USB_FACTORY_MODE_BIT);

	if (rc < 0) {

		smblib_err(chg, "Couldn't enable uUSB factory mode detection rc=%d\n",

			rc);

		goto out;

	}



	/*

	 * Add a delay of 100ms to allow change in rid to reflect on

	 * status registers.

	 */

	msleep(100);



	rc = smblib_read(chg, USBIN_BASE + INT_RT_STS_OFFSET, &stat);

	if (rc < 0) {

		smblib_err(chg, "Couldn't read USB_INT_RT_STS rc=%d\n", rc);

		goto out;

	}

	usb_plugged_in = (bool)(stat & USBIN_PLUGIN_RT_STS_BIT);



	/* Check uUSB status for moisture presence */

	rc = smblib_read(chg, TYPEC_U_USB_STATUS_REG, &stat);

	if (rc < 0) {

		smblib_err(chg, "Couldn't read TYPE_C_U_USB_STATUS_REG rc=%d\n",

				rc);

		goto out;

	}



	/*

	 * Factory mode detection happens in case of USB plugged-in by using

	 * a different current source of 2uA which can hamper moisture

	 * detection. Since factory mode is not supported in kernel, factory

	 * mode detection can be considered as equivalent to presence of

	 * moisture.

	 */

	if (stat == U_USB_STATUS_WATER_PRESENT || stat == U_USB_FMB1_BIT ||

			stat == U_USB_FMB2_BIT || (usb_plugged_in &&

			stat == U_USB_FLOAT1_BIT)) {

		smblib_set_moisture_protection(chg, true);

		alarm_start_relative(&chg->moisture_protection_alarm,

			ms_to_ktime(MOISTURE_PROTECTION_CHECK_DELAY_MS));

	} else {

		smblib_set_moisture_protection(chg, false);

		rc = alarm_cancel(&chg->moisture_protection_alarm);

		if (rc < 0)

			smblib_err(chg, "Couldn't cancel moisture protection alarm\n");

	}



out:

	pm_relax(chg->dev);

}



static enum alarmtimer_restart moisture_protection_alarm_cb(struct alarm *alarm,

							ktime_t now)

{

	struct smb_charger *chg = container_of(alarm, struct smb_charger,

					moisture_protection_alarm);



	smblib_dbg(chg, PR_MISC, "moisture Protection Alarm Triggered %lld\n",

			ktime_to_ms(now));



	/* Atomic context, cannot use voter */

	pm_stay_awake(chg->dev);

	schedule_work(&chg->moisture_protection_work);



	return ALARMTIMER_NORESTART;

}



static void jeita_update_work(struct work_struct *work)

{

	struct smb_charger *chg = container_of(work, struct smb_charger,
@@ -5704,6 +5970,20 @@ int smblib_init(struct smb_charger *chg) 
	INIT_DELAYED_WORK(&chg->lpd_detach_work, smblib_lpd_detach_work);

	INIT_DELAYED_WORK(&chg->thermal_regulation_work,

					smblib_thermal_regulation_work);



	if (chg->uusb_moisture_protection_enabled) {

		INIT_WORK(&chg->moisture_protection_work,

					smblib_moisture_protection_work);



		if (alarmtimer_get_rtcdev()) {

			alarm_init(&chg->moisture_protection_alarm,

				ALARM_BOOTTIME, moisture_protection_alarm_cb);

		} else {

			smblib_err(chg, "Failed to initialize moisture protection alarm\n");

			return -ENODEV;

		}

	}



	chg->fake_capacity = -EINVAL;

	chg->fake_input_current_limited = -EINVAL;

	chg->fake_batt_status = -EINVAL;
@@ -5796,6 +6076,10 @@ int smblib_deinit(struct smb_charger *chg) 
{

	switch (chg->mode) {

	case PARALLEL_MASTER:

		if (chg->uusb_moisture_protection_enabled) {

			alarm_cancel(&chg->moisture_protection_alarm);

			cancel_work_sync(&chg->moisture_protection_work);

		}

		cancel_work_sync(&chg->bms_update_work);

		cancel_work_sync(&chg->jeita_update_work);

		cancel_work_sync(&chg->pl_update_work);

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

+12 −0
Original line number Diff line number Diff line
@@ -61,6 +61,7 @@ enum print_reason { 
#define FCC_STEPPER_VOTER		"FCC_STEPPER_VOTER"

#define SW_THERM_REGULATION_VOTER	"SW_THERM_REGULATION_VOTER"

#define JEITA_ARB_VOTER			"JEITA_ARB_VOTER"

#define MOISTURE_VOTER			"MOISTURE_VOTER"



#define BOOST_BACK_STORM_COUNT	3

#define WEAK_CHG_STORM_COUNT	8
@@ -371,6 +372,7 @@ struct smb_charger { 
	struct work_struct	bms_update_work;

	struct work_struct	pl_update_work;

	struct work_struct	jeita_update_work;

	struct work_struct	moisture_protection_work;

	struct delayed_work	ps_change_timeout_work;

	struct delayed_work	clear_hdc_work;

	struct delayed_work	icl_change_work;
@@ -382,6 +384,7 @@ struct smb_charger { 
	struct delayed_work	thermal_regulation_work;



	struct alarm		lpd_recheck_timer;

	struct alarm		moisture_protection_alarm;



	/* secondary charger config */

	bool			sec_pl_present;
@@ -448,6 +451,9 @@ struct smb_charger { 
	u32			jeita_soft_hys_thlds[2];

	int			jeita_soft_fcc[2];

	int			jeita_soft_fv[2];

	bool			moisture_present;

	bool			uusb_moisture_protection_capable;

	bool			uusb_moisture_protection_enabled;



	/* workaround flag */

	u32			wa_flags;
@@ -584,6 +590,8 @@ int smblib_get_prop_usb_present(struct smb_charger *chg, 
				union power_supply_propval *val);

int smblib_get_prop_usb_online(struct smb_charger *chg,

				union power_supply_propval *val);

int smblib_get_usb_online(struct smb_charger *chg,

				union power_supply_propval *val);

int smblib_get_prop_usb_suspend(struct smb_charger *chg,

				union power_supply_propval *val);

int smblib_get_prop_usb_voltage_max(struct smb_charger *chg,
@@ -594,8 +602,12 @@ int smblib_get_prop_low_power(struct smb_charger *chg, 
				union power_supply_propval *val);

int smblib_get_prop_usb_current_now(struct smb_charger *chg,

				union power_supply_propval *val);

int smblib_get_usb_prop_typec_mode(struct smb_charger *chg,

				union power_supply_propval *val);

int smblib_get_prop_typec_cc_orientation(struct smb_charger *chg,

				union power_supply_propval *val);

int smblib_get_prop_scope(struct smb_charger *chg,

			union power_supply_propval *val);

int smblib_get_prop_typec_select_rp(struct smb_charger *chg,

				union power_supply_propval *val);

int smblib_get_prop_typec_power_role(struct smb_charger *chg,

drivers/power/supply/qcom/smb5-reg.h

+11 −0
Original line number Diff line number Diff line
@@ -130,6 +130,7 @@ enum { 
#define USBIN_SUSPEND_STS_BIT			BIT(6)

#define USE_USBIN_BIT				BIT(4)

#define USE_DCIN_BIT				BIT(3)

#define POWER_PATH_MASK				GENMASK(2, 1)

#define VALID_INPUT_POWER_SOURCE_STS_BIT	BIT(0)



#define DCDC_CMD_OTG_REG			(DCDC_BASE + 0x40)
@@ -334,6 +335,10 @@ enum { 
#define TYPEC_U_USB_STATUS_REG			(TYPEC_BASE + 0x0F)

#define U_USB_GROUND_NOVBUS_BIT			BIT(6)

#define U_USB_GROUND_BIT			BIT(4)

#define U_USB_FMB1_BIT				BIT(3)

#define U_USB_FLOAT1_BIT			BIT(2)

#define U_USB_FMB2_BIT				BIT(1)

#define U_USB_FLOAT2_BIT			BIT(0)



#define TYPE_C_MODE_CFG_REG			(TYPEC_BASE + 0x44)

#define TYPEC_TRY_MODE_MASK			GENMASK(4, 3)
@@ -402,8 +407,14 @@ enum { 
#define SEL_SBU2_ISRC_VAL			0x01



#define TYPEC_U_USB_CFG_REG			(TYPEC_BASE + 0x70)

#define EN_MICRO_USB_FACTORY_MODE_BIT		BIT(1)

#define EN_MICRO_USB_MODE_BIT			BIT(0)



#define TYPEC_U_USB_WATER_PROTECTION_CFG_REG	(TYPEC_BASE + 0x73)

#define EN_MICRO_USB_WATER_PROTECTION_BIT	BIT(4)

#define MICRO_USB_DETECTION_ON_TIME_CFG_MASK	GENMASK(3, 2)

#define MICRO_USB_DETECTION_PERIOD_CFG_MASK	GENMASK(1, 0)



#define TYPEC_MICRO_USB_MODE_REG		(TYPEC_BASE + 0x73)

#define MICRO_USB_MODE_ONLY_BIT			BIT(0)

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