Merge "power: qpnp-smbcharger: do not float DP/DM lines during QC3.0 detection" (fbfa21fe) · Commits · e / devices / android_kernel_xiaomi_markw

drivers/power/qpnp-smbcharger.c

+4 −2

Original line number	Diff line number	Diff line
		@@ -5158,6 +5158,8 @@ static int smbchg_prepare_for_pulsing(struct smbchg_chip *chip)
		goto handle_removal;
		}

		set_usb_psy_dp_dm(chip, POWER_SUPPLY_DP_DM_DP0P6_DMF);

		/* disable APSD */
		pr_smb(PR_MISC, "Disabling APSD\n");
		rc = smbchg_sec_masked_write(chip,
		@@ -5181,7 +5183,6 @@ static int smbchg_prepare_for_pulsing(struct smbchg_chip *chip)
		smbchg_sec_masked_write(chip, chip->usb_chgpth_base + USB_AICL_CFG,
		AICL_EN_BIT, AICL_EN_BIT);

		set_usb_psy_dp_dm(chip, POWER_SUPPLY_DP_DM_DP0P6_DMF);
		/*
		* DCP will switch to HVDCP in this time by removing the short
		* between DP DM
		@@ -6327,7 +6328,8 @@ static irqreturn_t usbin_uv_handler(int irq, void *_chip)
		* set usb_psy's dp=f dm=f if this is a new insertion, i.e. it is
		* not already src_detected and usbin_uv is seen falling
		*/
		if (!(reg & USBIN_UV_BIT) && !(reg & USBIN_SRC_DET_BIT)) {
		if (!(reg & USBIN_UV_BIT) && !(reg & USBIN_SRC_DET_BIT) &&
		!chip->hvdcp_3_det_ignore_uv) {
		pr_smb(PR_MISC, "setting usb psy dp=f dm=f\n");
		power_supply_set_dp_dm(chip->usb_psy,
		POWER_SUPPLY_DP_DM_DPF_DMF);