Merge "power: smb5: Disable HVDCP using DT property" (73fcf2d0) · Commits · e / devices / android_kernel_fairphone_FP4

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

+12 −24

Original line number	Diff line number	Diff line
		@@ -330,6 +330,7 @@ static int smb5_chg_config_init(struct smb5 *chip)
		#define MICRO_1P5A 1500000
		#define MICRO_P1A 100000
		#define MICRO_1PA 1000000
		#define MICRO_3PA 3000000
		#define OTG_DEFAULT_DEGLITCH_TIME_MS 50
		#define DEFAULT_WD_BARK_TIME 64
		static int smb5_parse_dt(struct smb5 *chip)
		@@ -386,7 +387,7 @@ static int smb5_parse_dt(struct smb5 *chip)
		"qcom,otg-cl-ua", &chg->otg_cl_ua);
		if (rc < 0)
		chg->otg_cl_ua = (chip->chg.smb_version == PMI632_SUBTYPE) ?
		MICRO_1PA : MICRO_1P5A;
		MICRO_1PA : MICRO_3PA;

		rc = of_property_read_u32(node, "qcom,chg-term-src",
		&chip->dt.term_current_src);
		@@ -438,7 +439,7 @@ static int smb5_parse_dt(struct smb5 *chip)

		chip->dt.hvdcp_disable = of_property_read_bool(node,
		"qcom,hvdcp-disable");

		chg->hvdcp_disable = chip->dt.hvdcp_disable;

		rc = of_property_read_u32(node, "qcom,chg-inhibit-threshold-mv",
		&chip->dt.chg_inhibit_thr_mv);
		@@ -1695,16 +1696,6 @@ static int smb5_configure_micro_usb(struct smb_charger *chg)
		return rc;
		}

		/* Enable HVDCP and BC 1.2 source detection */
		rc = smblib_masked_write(chg, USBIN_OPTIONS_1_CFG_REG,
		HVDCP_EN_BIT \| BC1P2_SRC_DETECT_BIT,
		HVDCP_EN_BIT \| BC1P2_SRC_DETECT_BIT);
		if (rc < 0) {
		dev_err(chg->dev,
		"Couldn't enable HVDCP detection rc=%d\n", rc);
		return rc;
		}

		return rc;
		}

		@@ -1835,10 +1826,16 @@ static int smb5_init_hw(struct smb5 *chip)
		}
		}

		/* Use SW based VBUS control, disable HW autonomous mode */
		/*
		* Disable HVDCP autonomous mode operation by default. Additionally, if
		* specified in DT: disable HVDCP and HVDCP authentication algorithm.
		*/
		val = (chg->hvdcp_disable) ? 0 :
		(HVDCP_AUTH_ALG_EN_CFG_BIT \| HVDCP_EN_BIT);
		rc = smblib_masked_write(chg, USBIN_OPTIONS_1_CFG_REG,
		HVDCP_AUTH_ALG_EN_CFG_BIT \| HVDCP_AUTONOMOUS_MODE_EN_CFG_BIT,
		HVDCP_AUTH_ALG_EN_CFG_BIT);
		(HVDCP_AUTH_ALG_EN_CFG_BIT \| HVDCP_EN_BIT \|
		HVDCP_AUTONOMOUS_MODE_EN_CFG_BIT),
		val);
		if (rc < 0) {
		dev_err(chg->dev, "Couldn't configure HVDCP rc=%d\n", rc);
		return rc;
		@@ -2150,15 +2147,6 @@ static int smb5_init_hw(struct smb5 *chip)
		}
		}

		/* set the Source (OTG) mode current limit */
		rc = smblib_masked_write(chg, DCDC_OTG_CURRENT_LIMIT_CFG_REG,
		OTG_CURRENT_LIMIT_MASK, OTG_CURRENT_LIMIT_3000_MA);
		if (rc < 0) {
		dev_err(chg->dev, "Couldn't configure DCDC_OTG_CURRENT_LIMIT_CFG rc=%d\n",
		rc);
		return rc;
		}

		if (chg->sw_jeita_enabled) {
		rc = smblib_disable_hw_jeita(chg, true);
		if (rc < 0) {

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

+94 −86

Original line number	Diff line number	Diff line
		@@ -169,13 +169,15 @@ int smblib_icl_override(struct smb_charger *chg, bool override)
		return rc;
		}

		static int smblib_select_sec_charger(struct smb_charger *chg, int sec_chg)
		/*
		* This function does smb_en pin access, which is lock protected.
		* It should be called with smb_lock held.
		*/
		static int smblib_select_sec_charger_locked(struct smb_charger *chg,
		int sec_chg)
		{
		int rc;

		if (sec_chg == chg->sec_chg_selected)
		return 0;

		switch (sec_chg) {
		case POWER_SUPPLY_CHARGER_SEC_CP:
		vote(chg->pl_disable_votable, PL_SMB_EN_VOTER, true, 0);
		@@ -231,7 +233,44 @@ static int smblib_select_sec_charger(struct smb_charger *chg, int sec_chg)
		break;
		}

		return rc;
		}

		static int smblib_select_sec_charger(struct smb_charger *chg, int sec_chg,
		int reason, bool toggle)
		{
		int rc;

		mutex_lock(&chg->smb_lock);

		if (toggle && sec_chg == POWER_SUPPLY_CHARGER_SEC_CP) {
		rc = smblib_select_sec_charger_locked(chg,
		POWER_SUPPLY_CHARGER_SEC_NONE);
		if (rc < 0) {
		dev_err(chg->dev, "Couldn't disable secondary charger rc=%d\n",
		rc);
		goto unlock_out;
		}

		/*
		* A minimum of 20us delay is expected before switching on STAT
		* pin.
		*/
		usleep_range(20, 30);
		}

		rc = smblib_select_sec_charger_locked(chg, sec_chg);
		if (rc < 0) {
		dev_err(chg->dev, "Couldn't switch secondary charger rc=%d\n",
		rc);
		goto unlock_out;
		}

		chg->sec_chg_selected = sec_chg;
		chg->cp_reason = reason;

		unlock_out:
		mutex_unlock(&chg->smb_lock);

		return rc;
		}
		@@ -755,13 +794,17 @@ int smblib_get_prop_from_bms(struct smb_charger *chg,
		int smblib_configure_hvdcp_apsd(struct smb_charger *chg, bool enable)
		{
		int rc;
		u8 mask = HVDCP_EN_BIT \| BC1P2_SRC_DETECT_BIT;
		u8 mask = (BC1P2_SRC_DETECT_BIT \| HVDCP_EN_BIT \|
		HVDCP_AUTH_ALG_EN_CFG_BIT);

		u8 val = BC1P2_SRC_DETECT_BIT \| (chg->hvdcp_disable ? 0 :
		(HVDCP_EN_BIT \| HVDCP_AUTH_ALG_EN_CFG_BIT));

		if (chg->pd_not_supported)
		return 0;

		rc = smblib_masked_write(chg, USBIN_OPTIONS_1_CFG_REG, mask,
		enable ? mask : 0);
		enable ? val : 0);
		if (rc < 0)
		smblib_err(chg, "failed to write USBIN_OPTIONS_1_CFG rc=%d\n",
		rc);
		@@ -923,16 +966,12 @@ static void smblib_uusb_removal(struct smb_charger *chg)
		int rc;
		struct smb_irq_data *data;
		struct storm_watch *wdata;
		int sec_charger;

		mutex_lock(&chg->smb_lock);
		chg->cp_reason = POWER_SUPPLY_CP_NONE;
		rc = smblib_select_sec_charger(chg,
		chg->sec_pl_present ? POWER_SUPPLY_CHARGER_SEC_PL :
		POWER_SUPPLY_CHARGER_SEC_NONE);
		if (rc < 0)
		dev_err(chg->dev, "Couldn't disable secondary charger rc=%d\n",
		rc);
		mutex_unlock(&chg->smb_lock);
		sec_charger = chg->sec_pl_present ? POWER_SUPPLY_CHARGER_SEC_PL :
		POWER_SUPPLY_CHARGER_SEC_NONE;
		smblib_select_sec_charger(chg, sec_charger, POWER_SUPPLY_CP_NONE,
		false);

		cancel_delayed_work_sync(&chg->pl_enable_work);

		@@ -1281,36 +1320,8 @@ int smblib_toggle_smb_en(struct smb_charger *chg, int toggle)
		if (!toggle)
		return rc;

		mutex_lock(&chg->smb_lock);

		if (chg->sec_chg_selected == POWER_SUPPLY_CHARGER_SEC_CP) {
		/* Pull down SMB_EN pin */
		rc = smblib_select_sec_charger(chg,
		POWER_SUPPLY_CHARGER_SEC_NONE);
		if (rc < 0) {
		dev_err(chg->dev, "Couldn't disable SMB_EN pin rc=%d\n",
		rc);
		goto out;
		}

		/*
		* A minimum of 20us delay is expected before switching on STAT
		* pin.
		*/
		usleep_range(20, 30);

		/* Pull up SMB_EN pin and enable Charge Pump under HW control */
		rc = smblib_select_sec_charger(chg,
		POWER_SUPPLY_CHARGER_SEC_CP);
		if (rc < 0) {
		dev_err(chg->dev, "Couldn't enable CP rc=%d\n",
		rc);
		goto out;
		}
		}

		out:
		mutex_unlock(&chg->smb_lock);
		rc = smblib_select_sec_charger(chg, chg->sec_chg_selected,
		chg->cp_reason, true);

		return rc;
		}
		@@ -3540,6 +3551,7 @@ int smblib_set_prop_pd_active(struct smb_charger *chg,
		const union power_supply_propval *val)
		{
		int rc = 0;
		int sec_charger;

		chg->pd_active = val->intval;

		@@ -3559,33 +3571,29 @@ int smblib_set_prop_pd_active(struct smb_charger *chg,
		* For PPS, Charge Pump is preferred over parallel charger if
		* present.
		*/
		mutex_lock(&chg->smb_lock);
		if (chg->pd_active == POWER_SUPPLY_PD_PPS_ACTIVE
		&& chg->sec_cp_present) {
		rc = smblib_select_sec_charger(chg,
		POWER_SUPPLY_CHARGER_SEC_CP);
		POWER_SUPPLY_CHARGER_SEC_CP,
		POWER_SUPPLY_CP_PPS, false);
		if (rc < 0)
		dev_err(chg->dev, "Couldn't enable secondary charger rc=%d\n",
		rc);
		else
		chg->cp_reason = POWER_SUPPLY_CP_PPS;
		}
		mutex_unlock(&chg->smb_lock);
		} else {
		vote(chg->usb_icl_votable, SW_ICL_MAX_VOTER, true, SDP_100_MA);
		vote(chg->usb_icl_votable, PD_VOTER, false, 0);
		vote(chg->usb_irq_enable_votable, PD_VOTER, false, 0);

		mutex_lock(&chg->smb_lock);
		chg->cp_reason = POWER_SUPPLY_CP_NONE;
		rc = smblib_select_sec_charger(chg,
		chg->sec_pl_present ? POWER_SUPPLY_CHARGER_SEC_PL :
		POWER_SUPPLY_CHARGER_SEC_NONE);
		sec_charger = chg->sec_pl_present ?
		POWER_SUPPLY_CHARGER_SEC_PL :
		POWER_SUPPLY_CHARGER_SEC_NONE;
		rc = smblib_select_sec_charger(chg, sec_charger,
		POWER_SUPPLY_CP_NONE, false);
		if (rc < 0)
		dev_err(chg->dev,
		"Couldn't enable secondary charger rc=%d\n",
		rc);
		mutex_unlock(&chg->smb_lock);

		/* PD hard resets failed, rerun apsd */
		if (chg->ok_to_pd) {
		@@ -4143,15 +4151,11 @@ static void smblib_handle_hvdcp_3p0_auth_done(struct smb_charger *chg,

		/* for QC3, switch to CP if present */
		if ((apsd_result->bit & QC_3P0_BIT) && chg->sec_cp_present) {
		mutex_lock(&chg->smb_lock);
		rc = smblib_select_sec_charger(chg,
		POWER_SUPPLY_CHARGER_SEC_CP);
		rc = smblib_select_sec_charger(chg, POWER_SUPPLY_CHARGER_SEC_CP,
		POWER_SUPPLY_CP_HVDCP3, false);
		if (rc < 0)
		dev_err(chg->dev,
		"Couldn't enable secondary chargers rc=%d\n", rc);
		else
		chg->cp_reason = POWER_SUPPLY_CP_HVDCP3;
		mutex_unlock(&chg->smb_lock);
		}

		smblib_dbg(chg, PR_INTERRUPT, "IRQ: hvdcp-3p0-auth-done rising; %s detected\n",
		@@ -4189,8 +4193,10 @@ static void smblib_handle_hvdcp_detect_done(struct smb_charger *chg,

		static void update_sw_icl_max(struct smb_charger *chg, int pst)
		{
		union power_supply_propval pval;
		int typec_mode;
		int rp_ua;
		int rc;

		/* while PD is active it should have complete ICL control */
		if (chg->pd_active)
		@@ -4243,9 +4249,15 @@ static void update_sw_icl_max(struct smb_charger *chg, int pst)
		SDP_100_MA);
		break;
		default:
		smblib_err(chg, "Unknown APSD %d; forcing 500mA\n", pst);
		rc = smblib_get_prop_usb_present(chg, &pval);
		if (rc < 0) {
		smblib_err(chg, "Couldn't get usb present rc = %d\n",
		rc);
		return;
		}

		vote(chg->usb_icl_votable, SW_ICL_MAX_VOTER, true,
		SDP_CURRENT_UA);
		pval.intval ? SDP_CURRENT_UA : SDP_100_MA);
		break;
		}
		}
		@@ -4483,16 +4495,16 @@ static void typec_src_removal(struct smb_charger *chg)
		int rc;
		struct smb_irq_data *data;
		struct storm_watch *wdata;
		int sec_charger;

		mutex_lock(&chg->smb_lock);
		chg->cp_reason = POWER_SUPPLY_CP_NONE;
		rc = smblib_select_sec_charger(chg,
		chg->sec_pl_present ? POWER_SUPPLY_CHARGER_SEC_PL :
		POWER_SUPPLY_CHARGER_SEC_NONE);
		sec_charger = chg->sec_pl_present ? POWER_SUPPLY_CHARGER_SEC_PL :
		POWER_SUPPLY_CHARGER_SEC_NONE;

		rc = smblib_select_sec_charger(chg, sec_charger, POWER_SUPPLY_CP_NONE,
		false);
		if (rc < 0)
		dev_err(chg->dev,
		"Couldn't disable secondary charger rc=%d\n", rc);
		mutex_unlock(&chg->smb_lock);

		/* disable apsd */
		rc = smblib_configure_hvdcp_apsd(chg, false);
		@@ -4759,6 +4771,7 @@ irqreturn_t dc_plugin_irq_handler(int irq, void *data)
		int input_present;
		bool dcin_present, vbus_present;
		int rc, wireless_vout = 0;
		int sec_charger;

		rc = iio_read_channel_processed(chg->iio.vph_v_chan,
		&wireless_vout);
		@@ -4784,26 +4797,23 @@ irqreturn_t dc_plugin_irq_handler(int irq, void *data)
		dev_err(chg->dev, "Couldn't set dc voltage to 2*vph rc=%d\n",
		rc);

		mutex_lock(&chg->smb_lock);
		chg->cp_reason = POWER_SUPPLY_CP_WIRELESS;
		rc = smblib_select_sec_charger(chg,
		POWER_SUPPLY_CHARGER_SEC_CP);
		POWER_SUPPLY_CHARGER_SEC_CP,
		POWER_SUPPLY_CP_WIRELESS, false);
		if (rc < 0)
		dev_err(chg->dev, "Couldn't enable secondary chargers rc=%d\n",
		rc);
		mutex_unlock(&chg->smb_lock);
		}
		} else if (chg->cp_reason == POWER_SUPPLY_CP_WIRELESS) {
		mutex_lock(&chg->smb_lock);
		chg->cp_reason = POWER_SUPPLY_CP_NONE;
		rc = smblib_select_sec_charger(chg,
		chg->sec_pl_present ? POWER_SUPPLY_CHARGER_SEC_PL :
		POWER_SUPPLY_CHARGER_SEC_NONE);
		sec_charger = chg->sec_pl_present ?
		POWER_SUPPLY_CHARGER_SEC_PL :
		POWER_SUPPLY_CHARGER_SEC_NONE;
		rc = smblib_select_sec_charger(chg, sec_charger,
		POWER_SUPPLY_CP_NONE, false);
		if (rc < 0)
		dev_err(chg->dev,
		"Couldn't disable secondary charger rc=%d\n",
		rc);
		mutex_unlock(&chg->smb_lock);
		}

		power_supply_changed(chg->dc_psy);
		@@ -5086,9 +5096,8 @@ static void pl_update_work(struct work_struct *work)
		if (chg->sec_chg_selected == POWER_SUPPLY_CHARGER_SEC_CP)
		return;

		mutex_lock(&chg->smb_lock);
		smblib_select_sec_charger(chg, POWER_SUPPLY_CHARGER_SEC_PL);
		mutex_unlock(&chg->smb_lock);
		smblib_select_sec_charger(chg, POWER_SUPPLY_CHARGER_SEC_PL,
		POWER_SUPPLY_CP_NONE, false);
		}

		static void clear_hdc_work(struct work_struct *work)
		@@ -5521,16 +5530,15 @@ int smblib_init(struct smb_charger *chg)
		if (chg->sec_pl_present) {
		chg->pl.psy = power_supply_get_by_name("parallel");
		if (chg->pl.psy) {
		mutex_lock(&chg->smb_lock);
		if (chg->sec_chg_selected
		!= POWER_SUPPLY_CHARGER_SEC_CP) {
		rc = smblib_select_sec_charger(chg,
		POWER_SUPPLY_CHARGER_SEC_PL);
		POWER_SUPPLY_CHARGER_SEC_PL,
		POWER_SUPPLY_CP_NONE, false);
		if (rc < 0)
		smblib_err(chg, "Couldn't config pl charger rc=%d\n",
		rc);
		}
		mutex_unlock(&chg->smb_lock);

		if (chg->smb_temp_max == -EINVAL) {
		rc = smblib_get_thermal_threshold(chg,

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

+1 −0

Original line number	Diff line number	Diff line
		@@ -407,6 +407,7 @@ struct smb_charger {
		u8 float_cfg;
		bool use_extcon;
		bool otg_present;
		bool hvdcp_disable;
		int hw_max_icl_ua;
		int auto_recharge_soc;
		enum sink_src_mode sink_src_mode;

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

+0 −9

Original line number	Diff line number	Diff line
		@@ -133,15 +133,6 @@ enum {
		#define DCDC_FSW_SEL_REG (DCDC_BASE + 0x50)

		#define DCDC_OTG_CURRENT_LIMIT_CFG_REG (DCDC_BASE + 0x52)
		#define OTG_CURRENT_LIMIT_MASK GENMASK(2, 0)
		enum {
		OTG_CURRENT_LIMIT_500_MA,
		OTG_CURRENT_LIMIT_1000_MA,
		OTG_CURRENT_LIMIT_1500_MA,
		OTG_CURRENT_LIMIT_2000_MA,
		OTG_CURRENT_LIMIT_2500_MA,
		OTG_CURRENT_LIMIT_3000_MA
		};

		#define DCDC_OTG_CFG_REG (DCDC_BASE + 0x53)
		#define OTG_EN_SRC_CFG_BIT BIT(1)