Merge "power: smb5-lib: Fix incorrect CC-orientation notification to USB" (e318940d) · Commits · e / devices / android_kernel_xiaomi_sm6125

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

+32 −27

Original line number	Diff line number	Diff line
		@@ -5993,6 +5993,26 @@ static void smblib_lpd_clear_ra_open_work(struct smb_charger *chg)
		vote(chg->awake_votable, LPD_VOTER, false, 0);
		}

		static int smblib_role_switch_failure(struct smb_charger *chg)
		{
		int rc = 0;
		union power_supply_propval pval = {0, };

		if (!chg->use_extcon)
		return 0;

		rc = smblib_get_prop_usb_present(chg, &pval);
		if (rc < 0) {
		pr_err("Couldn't get usb presence status rc=%d\n", rc);
		return rc;
		}

		if (pval.intval)
		smblib_notify_device_mode(chg, true);

		return rc;
		}

		irqreturn_t typec_attach_detach_irq_handler(int irq, void *data)
		{
		struct smb_irq_data *irq_data = data;
		@@ -6036,6 +6056,13 @@ irqreturn_t typec_attach_detach_irq_handler(int irq, void *data)
		typec_src_insertion(chg);
		}

		if (chg->typec_role_swap_failed) {
		rc = smblib_role_switch_failure(chg);
		if (rc < 0)
		pr_err("Failed to role switch rc=%d\n", rc);

		chg->typec_role_swap_failed = false;
		}
		} else {
		switch (chg->sink_src_mode) {
		case SRC_MODE:
		@@ -6062,9 +6089,11 @@ irqreturn_t typec_attach_detach_irq_handler(int irq, void *data)
		* swap is not in progress, to ensure forced sink or src
		* mode configuration is reset properly.
		*/
		if (chg->dual_role)
		if (chg->dual_role) {
		smblib_force_dr_mode(chg,
		DUAL_ROLE_PROP_MODE_NONE);
		chg->typec_role_swap_failed = false;
		}
		}

		if (chg->lpd_stage == LPD_STAGE_FLOAT_CANCEL)
		@@ -7335,28 +7364,6 @@ int smblib_force_dr_mode(struct smb_charger *chg, int mode)
		return rc;
		}

		static int smblib_role_switch_failure(struct smb_charger *chg, int mode)
		{
		int rc = 0;
		union power_supply_propval pval = {0, };

		if (!chg->use_extcon)
		return 0;

		rc = smblib_get_prop_usb_present(chg, &pval);
		if (rc < 0) {
		pr_err("Couldn't get usb presence status rc=%d\n", rc);
		return rc;
		}

		if (pval.intval) {
		if (mode == DUAL_ROLE_PROP_MODE_DFP)
		smblib_notify_device_mode(chg, true);
		}

		return rc;
		}

		static void smblib_dual_role_check_work(struct work_struct *work)
		{
		struct smb_charger *chg = container_of(work, struct smb_charger,
		@@ -7383,15 +7390,13 @@ static void smblib_dual_role_check_work(struct work_struct *work)
		chg->typec_mode == POWER_SUPPLY_TYPEC_NONE) {
		smblib_dbg(chg, PR_MISC, "Role reversal not latched to DFP in %d msecs. Resetting to DRP mode\n",
		ROLE_REVERSAL_DELAY_MS);
		chg->pr_swap_in_progress = false;
		chg->typec_role_swap_failed = true;
		rc = smblib_force_dr_mode(chg,
		DUAL_ROLE_PROP_MODE_NONE);
		if (rc < 0)
		pr_err("Failed to set DRP mode, rc=%d\n", rc);

		rc = smblib_role_switch_failure(chg,
		DUAL_ROLE_PROP_MODE_DFP);
		if (rc < 0)
		pr_err("Failed to role switch rc=%d\n", rc);
		}
		chg->pr_swap_in_progress = false;
		break;

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

+1 −0

Original line number	Diff line number	Diff line
		@@ -495,6 +495,7 @@ struct smb_charger {
		bool ok_to_pd;
		bool typec_legacy;
		bool typec_irq_en;
		bool typec_role_swap_failed;

		/* cached status */
		bool system_suspend_supported;