Merge "power: smb5: Fix TypeC settings for PR_SWAP" into msm-4.14 (64484747) · Commits · e / devices / android_kernel_xiaomi_sm6125

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

+41 −23

Original line number	Diff line number	Diff line
		@@ -3039,12 +3039,6 @@ static void smblib_handle_typec_removal(struct smb_charger *chg)
		smblib_err(chg, "Couldn't write float charger options rc=%d\n",
		rc);

		/* reset back to 103mS tCC debounce */
		rc = smblib_masked_write(chg, TYPE_C_DEBOUNCE_OPTION_REG,
		REDUCE_TCCDEBOUNCE_TO_2MS_BIT, 0);
		if (rc < 0)
		smblib_err(chg, "Couldn't set 120mS tCC debounce rc=%d\n", rc);

		/* reconfigure allowed voltage for HVDCP */
		rc = smblib_set_adapter_allowance(chg,
		USBIN_ADAPTER_ALLOW_5V_OR_9V_TO_12V);
		@@ -3052,18 +3046,6 @@ static void smblib_handle_typec_removal(struct smb_charger *chg)
		smblib_err(chg, "Couldn't set USBIN_ADAPTER_ALLOW_5V_OR_9V_TO_12V rc=%d\n",
		rc);

		/* enable DRP */
		rc = smblib_masked_write(chg, TYPE_C_MODE_CFG_REG,
		TYPEC_POWER_ROLE_CMD_MASK, 0);
		if (rc < 0)
		smblib_err(chg, "Couldn't enable DRP rc=%d\n", rc);

		/* HW controlled CC_OUT */
		rc = smblib_masked_write(chg, TYPE_C_CCOUT_CONTROL_REG,
		TYPEC_CCOUT_SRC_BIT, 0);
		if (rc < 0)
		smblib_err(chg, "Couldn't enable HW cc_out rc=%d\n", rc);

		/* clear exit sink based on cc */
		rc = smblib_masked_write(chg, TYPE_C_EXIT_STATE_CFG_REG,
		EXIT_SNK_BASED_ON_CC_BIT, 0);
		@@ -3371,19 +3353,55 @@ int smblib_set_prop_pr_swap_in_progress(struct smb_charger *chg,
		const union power_supply_propval *val)
		{
		int rc;
		u8 stat, orientation;

		chg->pr_swap_in_progress = val->intval;

		/*
		* call the cc changed irq to handle real removals while
		* PR_SWAP was in progress
		*/
		smblib_usb_typec_change(chg);
		rc = smblib_masked_write(chg, TYPE_C_DEBOUNCE_OPTION_REG,
		REDUCE_TCCDEBOUNCE_TO_2MS_BIT,
		val->intval ? REDUCE_TCCDEBOUNCE_TO_2MS_BIT : 0);
		if (rc < 0)
		smblib_err(chg, "Couldn't set tCC debounce rc=%d\n", rc);

		rc = smblib_masked_write(chg, TYPE_C_EXIT_STATE_CFG_REG,
		BYPASS_VSAFE0V_DURING_ROLE_SWAP_BIT,
		val->intval ? BYPASS_VSAFE0V_DURING_ROLE_SWAP_BIT : 0);
		if (rc < 0)
		smblib_err(chg, "Couldn't set exit state cfg rc=%d\n", rc);

		if (chg->pr_swap_in_progress) {
		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);
		}

		orientation =
		stat & CC_ORIENTATION_BIT ? TYPEC_CCOUT_VALUE_BIT : 0;
		rc = smblib_masked_write(chg, TYPE_C_CCOUT_CONTROL_REG,
		TYPEC_CCOUT_SRC_BIT \| TYPEC_CCOUT_BUFFER_EN_BIT
		\| TYPEC_CCOUT_VALUE_BIT,
		TYPEC_CCOUT_SRC_BIT \| TYPEC_CCOUT_BUFFER_EN_BIT
		\| orientation);
		if (rc < 0) {
		smblib_err(chg, "Couldn't read TYPE_C_CCOUT_CONTROL_REG rc=%d\n",
		rc);
		}
		} else {
		rc = smblib_masked_write(chg, TYPE_C_CCOUT_CONTROL_REG,
		TYPEC_CCOUT_SRC_BIT, 0);
		if (rc < 0) {
		smblib_err(chg, "Couldn't read TYPE_C_CCOUT_CONTROL_REG rc=%d\n",
		rc);
		}

		/* enable DRP */
		rc = smblib_masked_write(chg, TYPE_C_MODE_CFG_REG,
		TYPEC_POWER_ROLE_CMD_MASK, 0);
		if (rc < 0)
		smblib_err(chg, "Couldn't enable DRP rc=%d\n", rc);
		}

		return 0;
		}

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

+2 −0

Original line number	Diff line number	Diff line
		@@ -286,10 +286,12 @@ enum {
		#define VCONN_EN_SRC_BIT BIT(0)

		#define TYPE_C_CCOUT_CONTROL_REG (TYPEC_BASE + 0x48)
		#define TYPEC_CCOUT_BUFFER_EN_BIT BIT(2)
		#define TYPEC_CCOUT_VALUE_BIT BIT(1)
		#define TYPEC_CCOUT_SRC_BIT BIT(0)

		#define TYPE_C_EXIT_STATE_CFG_REG (TYPEC_BASE + 0x50)
		#define BYPASS_VSAFE0V_DURING_ROLE_SWAP_BIT BIT(3)
		#define EXIT_SNK_BASED_ON_CC_BIT BIT(0)

		#define TYPE_C_INTERRUPT_EN_CFG_1_REG (TYPEC_BASE + 0x5E)