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

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

power: smb5-lib: Add DT option to disable LPD feature 



Currently, the Liquid Presence Detection feature is enabled by default
on USB Type-C port. However, it may not be desired on some platforms
that share this driver.

Provide a DT option to switch LPD feature off.

This patch has been updated to reduce the cyclomatic complexity of
smb5_init_hw().

Change-Id: I5c08e9fe8bd1bdc569de8dafdd5f3616edadb629
Signed-off-by: default avatarGuru Das Srinagesh <gurus@codeaurora.org>
parent 31257a5c

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

+190 −147
Original line number Diff line number Diff line
@@ -438,6 +438,8 @@ static int smb5_parse_dt_misc(struct smb5 *chip, struct device_node *node) 
	chg->pd_not_supported = of_property_read_bool(node,

				"qcom,usb-pd-disable");



	chg->lpd_disabled = of_property_read_bool(node, "qcom,lpd-disable");



	rc = of_property_read_u32(node, "qcom,wd-bark-time-secs",

					&chip->dt.wd_bark_time);

	if (rc < 0 || chip->dt.wd_bark_time < MIN_WD_BARK_TIME)
@@ -1833,10 +1835,10 @@ static int smb5_configure_typec(struct smb_charger *chg) 
		return rc;

	}



	val = chg->lpd_disabled ? 0 : TYPEC_WATER_DETECTION_INT_EN_BIT;

	/* Use simple write to enable only required interrupts */

	rc = smblib_write(chg, TYPE_C_INTERRUPT_EN_CFG_2_REG,

				TYPEC_SRC_BATT_HPWR_INT_EN_BIT |

				TYPEC_WATER_DETECTION_INT_EN_BIT);

				TYPEC_SRC_BATT_HPWR_INT_EN_BIT | val);

	if (rc < 0) {

		dev_err(chg->dev,

			"Couldn't configure Type-C interrupts rc=%d\n", rc);
@@ -2094,12 +2096,189 @@ static int smb5_init_dc_peripheral(struct smb_charger *chg) 
	return rc;

}



static int smb5_init_hw(struct smb5 *chip)

static int smb5_configure_recharging(struct smb5 *chip)

{

	int rc = 0;

	struct smb_charger *chg = &chip->chg;

	union power_supply_propval pval;

	/* Configure VBATT-based or automatic recharging */



	rc = smblib_masked_write(chg, CHGR_CFG2_REG, RECHG_MASK,

				(chip->dt.auto_recharge_vbat_mv != -EINVAL) ?

				VBAT_BASED_RECHG_BIT : 0);

	if (rc < 0) {

		dev_err(chg->dev, "Couldn't configure VBAT-rechg CHG_CFG2_REG rc=%d\n",

			rc);

		return rc;

	}



	/* program the auto-recharge VBAT threshold */

	if (chip->dt.auto_recharge_vbat_mv != -EINVAL) {

		u32 temp = VBAT_TO_VRAW_ADC(chip->dt.auto_recharge_vbat_mv);



		temp = ((temp & 0xFF00) >> 8) | ((temp & 0xFF) << 8);

		rc = smblib_batch_write(chg,

			CHGR_ADC_RECHARGE_THRESHOLD_MSB_REG, (u8 *)&temp, 2);

		if (rc < 0) {

			dev_err(chg->dev, "Couldn't configure ADC_RECHARGE_THRESHOLD REG rc=%d\n",

				rc);

			return rc;

		}

		/* Program the sample count for VBAT based recharge to 3 */

		rc = smblib_masked_write(chg, CHGR_NO_SAMPLE_TERM_RCHG_CFG_REG,

					NO_OF_SAMPLE_FOR_RCHG,

					2 << NO_OF_SAMPLE_FOR_RCHG_SHIFT);

		if (rc < 0) {

			dev_err(chg->dev, "Couldn't configure CHGR_NO_SAMPLE_FOR_TERM_RCHG_CFG rc=%d\n",

				rc);

			return rc;

		}

	}



	rc = smblib_masked_write(chg, CHGR_CFG2_REG, RECHG_MASK,

				(chip->dt.auto_recharge_soc != -EINVAL) ?

				SOC_BASED_RECHG_BIT : VBAT_BASED_RECHG_BIT);

	if (rc < 0) {

		dev_err(chg->dev, "Couldn't configure SOC-rechg CHG_CFG2_REG rc=%d\n",

			rc);

		return rc;

	}



	/* program the auto-recharge threshold */

	if (chip->dt.auto_recharge_soc != -EINVAL) {

		pval.intval = chip->dt.auto_recharge_soc;

		rc = smblib_set_prop_rechg_soc_thresh(chg, &pval);

		if (rc < 0) {

			dev_err(chg->dev, "Couldn't configure CHG_RCHG_SOC_REG rc=%d\n",

					rc);

			return rc;

		}



		/* Program the sample count for SOC based recharge to 1 */

		rc = smblib_masked_write(chg, CHGR_NO_SAMPLE_TERM_RCHG_CFG_REG,

						NO_OF_SAMPLE_FOR_RCHG, 0);

		if (rc < 0) {

			dev_err(chg->dev, "Couldn't configure CHGR_NO_SAMPLE_FOR_TERM_RCHG_CFG rc=%d\n",

				rc);

			return rc;

		}

	}



	return 0;

}



static int smb5_configure_float_charger(struct smb5 *chip)

{

	int rc = 0;

	struct smb_charger *chg = &chip->chg;



	/* configure float charger options */

	switch (chip->dt.float_option) {

	case FLOAT_DCP:

		rc = smblib_masked_write(chg, USBIN_OPTIONS_2_CFG_REG,

				FLOAT_OPTIONS_MASK, 0);

		break;

	case FLOAT_SDP:

		rc = smblib_masked_write(chg, USBIN_OPTIONS_2_CFG_REG,

				FLOAT_OPTIONS_MASK, FORCE_FLOAT_SDP_CFG_BIT);

		break;

	case DISABLE_CHARGING:

		rc = smblib_masked_write(chg, USBIN_OPTIONS_2_CFG_REG,

				FLOAT_OPTIONS_MASK, FLOAT_DIS_CHGING_CFG_BIT);

		break;

	case SUSPEND_INPUT:

		rc = smblib_masked_write(chg, USBIN_OPTIONS_2_CFG_REG,

				FLOAT_OPTIONS_MASK, SUSPEND_FLOAT_CFG_BIT);

		break;

	default:

		rc = 0;

		break;

	}



	if (rc < 0) {

		dev_err(chg->dev, "Couldn't configure float charger options rc=%d\n",

			rc);

		return rc;

	}



	rc = smblib_read(chg, USBIN_OPTIONS_2_CFG_REG, &chg->float_cfg);

	if (rc < 0) {

		dev_err(chg->dev, "Couldn't read float charger options rc=%d\n",

			rc);

		return rc;

	}



	return 0;

}



static int smb5_init_connector_type(struct smb_charger *chg)

{

	int rc, type = 0;

	u8 val = 0;



	/*

	 * PMI632 can have the connector type defined by a dedicated register

	 * PMI632_TYPEC_MICRO_USB_MODE_REG or by a common TYPEC_U_USB_CFG_REG.

	 */

	if (chg->smb_version == PMI632_SUBTYPE) {

		rc = smblib_read(chg, PMI632_TYPEC_MICRO_USB_MODE_REG, &val);

		if (rc < 0) {

			dev_err(chg->dev, "Couldn't read USB mode rc=%d\n", rc);

			return rc;

		}

		type = !!(val & MICRO_USB_MODE_ONLY_BIT);

	}



	/*

	 * If PMI632_TYPEC_MICRO_USB_MODE_REG is not set and for all non-PMI632

	 * check the connector type using TYPEC_U_USB_CFG_REG.

	 */

	if (!type) {

		rc = smblib_read(chg, TYPEC_U_USB_CFG_REG, &val);

		if (rc < 0) {

			dev_err(chg->dev, "Couldn't read U_USB config rc=%d\n",

					rc);

			return rc;

		}



		type = !!(val & EN_MICRO_USB_MODE_BIT);

	}



	pr_debug("Connector type=%s\n", type ? "Micro USB" : "TypeC");



	if (type) {

		chg->connector_type = POWER_SUPPLY_CONNECTOR_MICRO_USB;

		rc = smb5_configure_micro_usb(chg);

	} else {

		chg->connector_type = POWER_SUPPLY_CONNECTOR_TYPEC;

		rc = smb5_configure_typec(chg);

	}

	if (rc < 0) {

		dev_err(chg->dev,

			"Couldn't configure TypeC/micro-USB mode rc=%d\n", rc);

		return rc;

	}



	/*

	 * PMI632 based hw init:

	 * - Rerun APSD to ensure proper charger detection if device

	 *   boots with charger connected.

	 * - Initialize flash module for PMI632

	 */

	if (chg->smb_version == PMI632_SUBTYPE) {

		schgm_flash_init(chg);

		smblib_rerun_apsd_if_required(chg);

	}



	return 0;



}



static int smb5_init_hw(struct smb5 *chip)

{

	struct smb_charger *chg = &chip->chg;

	int rc;

	u8 val = 0, mask = 0;

	union power_supply_propval pval;



	if (chip->dt.no_battery)

		chg->fake_capacity = 50;
@@ -2174,60 +2353,13 @@ static int smb5_init_hw(struct smb5 *chip) 
		return rc;

	}



	/*

	 * PMI632 can have the connector type defined by a dedicated register

	 * PMI632_TYPEC_MICRO_USB_MODE_REG or by a common TYPEC_U_USB_CFG_REG.

	 */

	if (chg->smb_version == PMI632_SUBTYPE) {

		rc = smblib_read(chg, PMI632_TYPEC_MICRO_USB_MODE_REG, &val);

		if (rc < 0) {

			dev_err(chg->dev, "Couldn't read USB mode rc=%d\n", rc);

			return rc;

		}

		type = !!(val & MICRO_USB_MODE_ONLY_BIT);

	}



	/*

	 * If PMI632_TYPEC_MICRO_USB_MODE_REG is not set and for all non-PMI632

	 * check the connector type using TYPEC_U_USB_CFG_REG.

	 */

	if (!type) {

		rc = smblib_read(chg, TYPEC_U_USB_CFG_REG, &val);

	rc = smb5_init_connector_type(chg);

	if (rc < 0) {

			dev_err(chg->dev, "Couldn't read U_USB config rc=%d\n",

		dev_err(chg->dev, "Couldn't configure connector type rc=%d\n",

				rc);

		return rc;

	}



		type = !!(val & EN_MICRO_USB_MODE_BIT);

	}



	pr_debug("Connector type=%s\n", type ? "Micro USB" : "TypeC");



	if (type) {

		chg->connector_type = POWER_SUPPLY_CONNECTOR_MICRO_USB;

		rc = smb5_configure_micro_usb(chg);

	} else {

		chg->connector_type = POWER_SUPPLY_CONNECTOR_TYPEC;

		rc = smb5_configure_typec(chg);

	}

	if (rc < 0) {

		dev_err(chg->dev,

			"Couldn't configure TypeC/micro-USB mode rc=%d\n", rc);

		return rc;

	}



	/*

	 * PMI632 based hw init:

	 * - Rerun APSD to ensure proper charger detection if device

	 *   boots with charger connected.

	 * - Initialize flash module for PMI632

	 */

	if (chg->smb_version == PMI632_SUBTYPE) {

		schgm_flash_init(chg);

		smblib_rerun_apsd_if_required(chg);

	}



	/* Use ICL results from HW */

	rc = smblib_icl_override(chg, HW_AUTO_MODE);

	if (rc < 0) {
@@ -2341,41 +2473,9 @@ static int smb5_init_hw(struct smb5 *chip) 
		return rc;

	}



	/* configure float charger options */

	switch (chip->dt.float_option) {

	case FLOAT_DCP:

		rc = smblib_masked_write(chg, USBIN_OPTIONS_2_CFG_REG,

				FLOAT_OPTIONS_MASK, 0);

		break;

	case FLOAT_SDP:

		rc = smblib_masked_write(chg, USBIN_OPTIONS_2_CFG_REG,

				FLOAT_OPTIONS_MASK, FORCE_FLOAT_SDP_CFG_BIT);

		break;

	case DISABLE_CHARGING:

		rc = smblib_masked_write(chg, USBIN_OPTIONS_2_CFG_REG,

				FLOAT_OPTIONS_MASK, FLOAT_DIS_CHGING_CFG_BIT);

		break;

	case SUSPEND_INPUT:

		rc = smblib_masked_write(chg, USBIN_OPTIONS_2_CFG_REG,

				FLOAT_OPTIONS_MASK, SUSPEND_FLOAT_CFG_BIT);

		break;

	default:

		rc = 0;

		break;

	}



	if (rc < 0) {

		dev_err(chg->dev, "Couldn't configure float charger options rc=%d\n",

			rc);

		return rc;

	}



	rc = smblib_read(chg, USBIN_OPTIONS_2_CFG_REG, &chg->float_cfg);

	if (rc < 0) {

		dev_err(chg->dev, "Couldn't read float charger options rc=%d\n",

			rc);

	rc = smb5_configure_float_charger(chip);

	if (rc < 0)

		return rc;

	}



	switch (chip->dt.chg_inhibit_thr_mv) {

	case 50:
@@ -2419,66 +2519,9 @@ static int smb5_init_hw(struct smb5 *chip) 
		return rc;

	}



	rc = smblib_masked_write(chg, CHGR_CFG2_REG, RECHG_MASK,

				(chip->dt.auto_recharge_vbat_mv != -EINVAL) ?

				VBAT_BASED_RECHG_BIT : 0);

	if (rc < 0) {

		dev_err(chg->dev, "Couldn't configure VBAT-rechg CHG_CFG2_REG rc=%d\n",

			rc);

		return rc;

	}



	/* program the auto-recharge VBAT threshold */

	if (chip->dt.auto_recharge_vbat_mv != -EINVAL) {

		u32 temp = VBAT_TO_VRAW_ADC(chip->dt.auto_recharge_vbat_mv);



		temp = ((temp & 0xFF00) >> 8) | ((temp & 0xFF) << 8);

		rc = smblib_batch_write(chg,

			CHGR_ADC_RECHARGE_THRESHOLD_MSB_REG, (u8 *)&temp, 2);

		if (rc < 0) {

			dev_err(chg->dev, "Couldn't configure ADC_RECHARGE_THRESHOLD REG rc=%d\n",

				rc);

			return rc;

		}

		/* Program the sample count for VBAT based recharge to 3 */

		rc = smblib_masked_write(chg, CHGR_NO_SAMPLE_TERM_RCHG_CFG_REG,

					NO_OF_SAMPLE_FOR_RCHG,

					2 << NO_OF_SAMPLE_FOR_RCHG_SHIFT);

		if (rc < 0) {

			dev_err(chg->dev, "Couldn't configure CHGR_NO_SAMPLE_FOR_TERM_RCHG_CFG rc=%d\n",

				rc);

			return rc;

		}

	}



	rc = smblib_masked_write(chg, CHGR_CFG2_REG, RECHG_MASK,

				(chip->dt.auto_recharge_soc != -EINVAL) ?

				SOC_BASED_RECHG_BIT : VBAT_BASED_RECHG_BIT);

	if (rc < 0) {

		dev_err(chg->dev, "Couldn't configure SOC-rechg CHG_CFG2_REG rc=%d\n",

			rc);

		return rc;

	}



	/* program the auto-recharge threshold */

	if (chip->dt.auto_recharge_soc != -EINVAL) {

		pval.intval = chip->dt.auto_recharge_soc;

		rc = smblib_set_prop_rechg_soc_thresh(chg, &pval);

		if (rc < 0) {

			dev_err(chg->dev, "Couldn't configure CHG_RCHG_SOC_REG rc=%d\n",

					rc);

			return rc;

		}



		/* Program the sample count for SOC based recharge to 1 */

		rc = smblib_masked_write(chg, CHGR_NO_SAMPLE_TERM_RCHG_CFG_REG,

						NO_OF_SAMPLE_FOR_RCHG, 0);

		if (rc < 0) {

			dev_err(chg->dev, "Couldn't configure CHGR_NO_SAMPLE_FOR_TERM_RCHG_CFG rc=%d\n",

				rc);

	rc = smb5_configure_recharging(chip);

	if (rc < 0)

		return rc;

		}

	}



	rc = smblib_disable_hw_jeita(chg, true);

	if (rc < 0) {

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

+41 −21
Original line number Diff line number Diff line
@@ -4911,6 +4911,9 @@ static bool smblib_src_lpd(struct smb_charger *chg) 
	u8 stat;

	int rc;



	if (chg->lpd_disabled)

		return false;



	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",
@@ -5153,12 +5156,35 @@ static void smblib_handle_rp_change(struct smb_charger *chg, int typec_mode) 
						chg->typec_mode, typec_mode);

}



static void smblib_lpd_launch_ra_open_work(struct smb_charger *chg)

{

	u8 stat;

	int rc;



	if (chg->lpd_disabled)

		return;



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

	if (rc < 0) {

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

			rc);

		return;

	}



	if (!(stat & TYPEC_TCCDEBOUNCE_DONE_STATUS_BIT)

			&& chg->lpd_stage == LPD_STAGE_NONE) {

		chg->lpd_stage = LPD_STAGE_FLOAT;

		cancel_delayed_work_sync(&chg->lpd_ra_open_work);

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

		schedule_delayed_work(&chg->lpd_ra_open_work,

						msecs_to_jiffies(300));

	}

}



irqreturn_t typec_or_rid_detection_change_irq_handler(int irq, void *data)

{

	struct smb_irq_data *irq_data = data;

	struct smb_charger *chg = irq_data->parent_data;

	u8 stat;

	int rc;



	smblib_dbg(chg, PR_INTERRUPT, "IRQ: %s\n", irq_data->name);
@@ -5190,21 +5216,7 @@ irqreturn_t typec_or_rid_detection_change_irq_handler(int irq, void *data) 
	if (chg->pr_swap_in_progress || chg->pd_hard_reset)

		goto out;



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

	if (rc < 0) {

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

			rc);

		goto out;

	}



	if (!(stat & TYPEC_TCCDEBOUNCE_DONE_STATUS_BIT)

			&& chg->lpd_stage == LPD_STAGE_NONE) {

		chg->lpd_stage = LPD_STAGE_FLOAT;

		cancel_delayed_work_sync(&chg->lpd_ra_open_work);

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

		schedule_delayed_work(&chg->lpd_ra_open_work,

						msecs_to_jiffies(300));

	}

	smblib_lpd_launch_ra_open_work(chg);



	if (chg->usb_psy)

		power_supply_changed(chg->usb_psy);
@@ -5239,6 +5251,16 @@ irqreturn_t typec_state_change_irq_handler(int irq, void *data) 
	return IRQ_HANDLED;

}



static void smblib_lpd_clear_ra_open_work(struct smb_charger *chg)

{

	if (chg->lpd_disabled)

		return;



	cancel_delayed_work_sync(&chg->lpd_detach_work);

	chg->lpd_stage = LPD_STAGE_FLOAT_CANCEL;

	cancel_delayed_work_sync(&chg->lpd_ra_open_work);

	vote(chg->awake_votable, LPD_VOTER, false, 0);

}



irqreturn_t typec_attach_detach_irq_handler(int irq, void *data)

{
@@ -5257,10 +5279,8 @@ irqreturn_t typec_attach_detach_irq_handler(int irq, void *data) 
	}



	if (stat & TYPEC_ATTACH_DETACH_STATE_BIT) {

		cancel_delayed_work_sync(&chg->lpd_detach_work);

		chg->lpd_stage = LPD_STAGE_FLOAT_CANCEL;

		cancel_delayed_work_sync(&chg->lpd_ra_open_work);

		vote(chg->awake_votable, LPD_VOTER, false, 0);



		smblib_lpd_clear_ra_open_work(chg);



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

		if (rc < 0) {

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

+1 −0
Original line number Diff line number Diff line
@@ -463,6 +463,7 @@ struct smb_charger { 
	int			smb_temp_max;

	u8			typec_try_mode;

	enum lpd_stage		lpd_stage;

	bool			lpd_disabled;

	enum lpd_reason		lpd_reason;

	bool			fcc_stepper_enable;

	int			die_temp;