Merge "power: smb-lib: Enable TypeC crude sensor PBS WA based on PMIC type" (881c4c3b) · Commits · e / devices / android_kernel_fairphone_FP3

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

+4 −2

Original line number	Diff line number	Diff line
		@@ -1891,7 +1891,8 @@ static int smb2_chg_config_init(struct smb2 *chip)
		switch (pmic_rev_id->pmic_subtype) {
		case PMI8998_SUBTYPE:
		chip->chg.smb_version = PMI8998_SUBTYPE;
		chip->chg.wa_flags \|= BOOST_BACK_WA \| QC_AUTH_INTERRUPT_WA_BIT;
		chip->chg.wa_flags \|= BOOST_BACK_WA \| QC_AUTH_INTERRUPT_WA_BIT
		\| TYPEC_PBS_WA_BIT;
		if (pmic_rev_id->rev4 == PMI8998_V1P1_REV4) /* PMI rev 1.1 */
		chg->wa_flags \|= QC_CHARGER_DETECTION_WA_BIT;
		if (pmic_rev_id->rev4 == PMI8998_V2P0_REV4) /* PMI rev 2.0 */
		@@ -1906,7 +1907,8 @@ static int smb2_chg_config_init(struct smb2 *chip)
		break;
		case PM660_SUBTYPE:
		chip->chg.smb_version = PM660_SUBTYPE;
		chip->chg.wa_flags \|= BOOST_BACK_WA \| OTG_WA;
		chip->chg.wa_flags \|= BOOST_BACK_WA \| OTG_WA \| OV_IRQ_WA_BIT
		\| TYPEC_PBS_WA_BIT;
		chg->param.freq_buck = pm660_params.freq_buck;
		chg->param.freq_boost = pm660_params.freq_boost;
		chg->chg_freq.freq_5V = 650;

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

+52 −17

Original line number	Diff line number	Diff line
		@@ -689,6 +689,7 @@ static void smblib_uusb_removal(struct smb_charger *chg)
		vote(chg->usb_icl_votable, SW_QC3_VOTER, false, 0);
		vote(chg->usb_icl_votable, USBIN_USBIN_BOOST_VOTER, false, 0);
		vote(chg->usb_icl_votable, HVDCP2_ICL_VOTER, false, 0);
		vote(chg->hvdcp_hw_inov_dis_votable, OV_VOTER, false, 0);

		cancel_delayed_work_sync(&chg->hvdcp_detect_work);

		@@ -1120,6 +1121,7 @@ static int __smblib_set_prop_typec_power_role(struct smb_charger *chg,
		return -EINVAL;
		}

		if (chg->wa_flags & TYPEC_PBS_WA_BIT) {
		if (power_role == UFP_EN_CMD_BIT) {
		/* disable PBS workaround when forcing sink mode */
		rc = smblib_write(chg, TM_IO_DTEST4_SEL, 0x0);
		@@ -1135,6 +1137,7 @@ static int __smblib_set_prop_typec_power_role(struct smb_charger *chg,
		rc);
		}
		}
		}

		rc = smblib_masked_write(chg, TYPE_C_INTRPT_ENB_SOFTWARE_CTRL_REG,
		TYPEC_POWER_ROLE_CMD_MASK, power_role);
		@@ -3638,6 +3641,33 @@ static void smblib_handle_sdp_enumeration_done(struct smb_charger *chg,
		rising ? "rising" : "falling");
		}

		#define MICRO_10P3V 10300000
		static void smblib_check_ov_condition(struct smb_charger *chg)
		{
		union power_supply_propval pval = {0, };
		int rc;

		if (chg->wa_flags & OV_IRQ_WA_BIT) {
		rc = power_supply_get_property(chg->usb_psy,
		POWER_SUPPLY_PROP_VOLTAGE_NOW, &pval);
		if (rc < 0) {
		smblib_err(chg, "Couldn't get current voltage, rc=%d\n",
		rc);
		return;
		}

		if (pval.intval > MICRO_10P3V) {
		smblib_err(chg, "USBIN OV detected\n");
		vote(chg->hvdcp_hw_inov_dis_votable, OV_VOTER, true,
		0);
		pval.intval = POWER_SUPPLY_DP_DM_FORCE_5V;
		rc = power_supply_set_property(chg->batt_psy,
		POWER_SUPPLY_PROP_DP_DM, &pval);
		return;
		}
		}
		}

		#define QC3_PULSES_FOR_6V 5
		#define QC3_PULSES_FOR_9V 20
		#define QC3_PULSES_FOR_12V 35
		@@ -3647,6 +3677,7 @@ static void smblib_hvdcp_adaptive_voltage_change(struct smb_charger *chg)
		u8 stat;
		int pulses;

		smblib_check_ov_condition(chg);
		power_supply_changed(chg->usb_main_psy);
		if (chg->real_charger_type == POWER_SUPPLY_TYPE_USB_HVDCP) {
		rc = smblib_read(chg, QC_CHANGE_STATUS_REG, &stat);
		@@ -4198,6 +4229,7 @@ static void smblib_handle_typec_removal(struct smb_charger *chg)
		/* reset hvdcp voters */
		vote(chg->hvdcp_disable_votable_indirect, VBUS_CC_SHORT_VOTER, true, 0);
		vote(chg->hvdcp_disable_votable_indirect, PD_INACTIVE_VOTER, true, 0);
		vote(chg->hvdcp_hw_inov_dis_votable, OV_VOTER, false, 0);

		/* reset power delivery voters */
		vote(chg->pd_allowed_votable, PD_VOTER, false, 0);
		@@ -4279,10 +4311,13 @@ static void smblib_handle_typec_removal(struct smb_charger *chg)
		if (rc < 0)
		smblib_err(chg, "Couldn't enable HW cc_out rc=%d\n", rc);

		/* restore crude sensor */
		/* restore crude sensor if PM660/PMI8998 */
		if (chg->wa_flags & TYPEC_PBS_WA_BIT) {
		rc = smblib_write(chg, TM_IO_DTEST4_SEL, 0xA5);
		if (rc < 0)
		smblib_err(chg, "Couldn't restore crude sensor rc=%d\n", rc);
		smblib_err(chg, "Couldn't restore crude sensor rc=%d\n",
		rc);
		}

		mutex_lock(&chg->vconn_oc_lock);
		if (!chg->vconn_en)

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

+3 −0

Original line number	Diff line number	Diff line
		@@ -70,6 +70,7 @@ enum print_reason {
		#define WBC_VOTER "WBC_VOTER"
		#define MOISTURE_VOTER "MOISTURE_VOTER"
		#define HVDCP2_ICL_VOTER "HVDCP2_ICL_VOTER"
		#define OV_VOTER "OV_VOTER"

		#define VCONN_MAX_ATTEMPTS 3
		#define OTG_MAX_ATTEMPTS 3
		@@ -88,6 +89,8 @@ enum {
		TYPEC_CC2_REMOVAL_WA_BIT = BIT(2),
		QC_AUTH_INTERRUPT_WA_BIT = BIT(3),
		OTG_WA = BIT(4),
		OV_IRQ_WA_BIT = BIT(5),
		TYPEC_PBS_WA_BIT = BIT(6),
		};

		enum smb_irq_index {