Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 518d81ee authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "power: qpnp-smb5: Add support to report HVDCP_3P5 adapter"

parents 201ac5bb 16f1d0f1

drivers/power/supply/qcom/battery.c

+3 −2
Original line number Diff line number Diff line 
/* Copyright (c) 2017-2019 The Linux Foundation. All rights reserved.

/* Copyright (c) 2017-2020 The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -204,7 +204,8 @@ static int get_hvdcp3_icl_limit(struct pl_data *chip) 


	rc = power_supply_get_property(chip->usb_psy,

				POWER_SUPPLY_PROP_REAL_TYPE, &pval);

	if ((rc < 0) || (pval.intval != POWER_SUPPLY_TYPE_USB_HVDCP_3))

	if ((rc < 0) || (pval.intval != POWER_SUPPLY_TYPE_USB_HVDCP_3

			&& pval.intval != POWER_SUPPLY_TYPE_USB_HVDCP_3P5))

		return target_icl;



	/*

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

+4 −2
Original line number Diff line number Diff line 
/* Copyright (c) 2018-2019 The Linux Foundation. All rights reserved.

/* Copyright (c) 2018-2020 The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -1270,6 +1270,7 @@ static int smb5_usb_main_set_prop(struct power_supply *psy, 
	struct smb5 *chip = power_supply_get_drvdata(psy);

	struct smb_charger *chg = &chip->chg;

	union power_supply_propval pval = {0, };

	enum power_supply_type real_chg_type = chg->real_charger_type;

	int rc = 0, offset_ua = 0;



	switch (psp) {
@@ -1339,7 +1340,8 @@ static int smb5_usb_main_set_prop(struct power_supply *psy, 
		vote_override(chg->usb_icl_votable, CC_MODE_VOTER,

				(val->intval < 0) ? false : true, val->intval);

		/* Main ICL updated re-calculate ILIM */

		if (chg->real_charger_type == POWER_SUPPLY_TYPE_USB_HVDCP_3)

		if (real_chg_type == POWER_SUPPLY_TYPE_USB_HVDCP_3 ||

			real_chg_type == POWER_SUPPLY_TYPE_USB_HVDCP_3P5)

			rerun_election(chg->fcc_votable);

		break;

	case POWER_SUPPLY_PROP_COMP_CLAMP_LEVEL:

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

+29 −7
Original line number Diff line number Diff line 
/* Copyright (c) 2018-2019 The Linux Foundation. All rights reserved.

/* Copyright (c) 2018-2020 The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -895,7 +895,8 @@ int smblib_get_qc3_main_icl_offset(struct smb_charger *chg, int *offset_ua) 
	union power_supply_propval pval = {0, };

	int rc;



	if ((chg->real_charger_type != POWER_SUPPLY_TYPE_USB_HVDCP_3)

	if (((chg->real_charger_type != POWER_SUPPLY_TYPE_USB_HVDCP_3)

		&& (chg->real_charger_type != POWER_SUPPLY_TYPE_USB_HVDCP_3P5))

		|| chg->hvdcp3_standalone_config || !is_cp_available(chg)) {

		*offset_ua = 0;

		return 0;
@@ -1045,6 +1046,8 @@ static const struct apsd_result *smblib_update_usb_type(struct smb_charger *chg) 
	/* if PD is active, APSD is disabled so won't have a valid result */

	if (chg->pd_active) {

		chg->real_charger_type = POWER_SUPPLY_TYPE_USB_PD;

	} else if (chg->qc3p5_detected) {

		chg->real_charger_type = POWER_SUPPLY_TYPE_USB_HVDCP_3P5;

	} else {

		/*

		 * Update real charger type only if its not FLOAT
@@ -1055,8 +1058,8 @@ static const struct apsd_result *smblib_update_usb_type(struct smb_charger *chg) 
			chg->real_charger_type = apsd_result->pst;

	}



	smblib_dbg(chg, PR_MISC, "APSD=%s PD=%d\n",

					apsd_result->name, chg->pd_active);

	smblib_dbg(chg, PR_MISC, "APSD=%s PD=%d QC3P5=%d\n",

			apsd_result->name, chg->pd_active, chg->qc3p5_detected);

	return apsd_result;

}
@@ -1238,6 +1241,9 @@ static void smblib_uusb_removal(struct smb_charger *chg) 


		chg->qc2_unsupported_voltage = QC2_COMPLIANT;

	}



	chg->qc3p5_detected = false;

	smblib_update_usb_type(chg);

}



void smblib_suspend_on_debug_battery(struct smb_charger *chg)
@@ -2460,7 +2466,8 @@ static void smblib_hvdcp_adaptive_voltage_change(struct smb_charger *chg) 
		vote(chg->usb_icl_votable, HVDCP2_ICL_VOTER, false, 0);

	}



	if (chg->real_charger_type == POWER_SUPPLY_TYPE_USB_HVDCP_3) {

	if (chg->real_charger_type == POWER_SUPPLY_TYPE_USB_HVDCP_3

		|| chg->real_charger_type == POWER_SUPPLY_TYPE_USB_HVDCP_3P5) {

		rc = smblib_hvdcp3_set_fsw(chg);

		if (rc < 0)

			smblib_err(chg, "Couldn't set QC3.0 Fsw rc=%d\n", rc);
@@ -2593,6 +2600,10 @@ int smblib_dp_dm(struct smb_charger *chg, int val) 
		if (rc < 0)

			pr_err("Failed to force 12V\n");

		break;

	case POWER_SUPPLY_DP_DM_CONFIRMED_HVDCP3P5:

		chg->qc3p5_detected = true;

		smblib_update_usb_type(chg);

		break;

	case POWER_SUPPLY_DP_DM_ICL_UP:

	default:

		break;
@@ -3164,6 +3175,7 @@ int smblib_get_prop_usb_voltage_max_design(struct smb_charger *chg, 
			break;

		}

		/* else, fallthrough */

	case POWER_SUPPLY_TYPE_USB_HVDCP_3P5:

	case POWER_SUPPLY_TYPE_USB_HVDCP_3:

	case POWER_SUPPLY_TYPE_USB_PD:

		if (chg->chg_param.smb_version == PMI632_SUBTYPE)
@@ -3193,6 +3205,7 @@ int smblib_get_prop_usb_voltage_max(struct smb_charger *chg, 
			break;

		}

		/* else, fallthrough */

	case POWER_SUPPLY_TYPE_USB_HVDCP_3P5:

	case POWER_SUPPLY_TYPE_USB_HVDCP_3:

		if (chg->chg_param.smb_version == PMI632_SUBTYPE)

			val->intval = MICRO_9V;
@@ -3211,15 +3224,20 @@ int smblib_get_prop_usb_voltage_max(struct smb_charger *chg, 
}



#define HVDCP3_STEP_UV	200000

#define HVDCP3P5_STEP_UV	20000

static int smblib_estimate_adaptor_voltage(struct smb_charger *chg,

					  union power_supply_propval *val)

{

	int step_uv = HVDCP3_STEP_UV;



	switch (chg->real_charger_type) {

	case POWER_SUPPLY_TYPE_USB_HVDCP:

		val->intval = MICRO_12V;

		break;

	case POWER_SUPPLY_TYPE_USB_HVDCP_3P5:

		step_uv = HVDCP3P5_STEP_UV;

	case POWER_SUPPLY_TYPE_USB_HVDCP_3:

		val->intval = MICRO_5V + (HVDCP3_STEP_UV * chg->pulse_cnt);

		val->intval = MICRO_5V + (step_uv * chg->pulse_cnt);

		break;

	case POWER_SUPPLY_TYPE_USB_PD:

		/* Take the average of min and max values */
@@ -3738,8 +3756,11 @@ int smblib_get_prop_input_voltage_settled(struct smb_charger *chg, 
						union power_supply_propval *val)

{

	int rc, pulses;

	int step_uv = HVDCP3_STEP_UV;



	switch (chg->real_charger_type) {

	case POWER_SUPPLY_TYPE_USB_HVDCP_3P5:

		step_uv = HVDCP3P5_STEP_UV;

	case POWER_SUPPLY_TYPE_USB_HVDCP_3:

		rc = smblib_get_pulse_cnt(chg, &pulses);

		if (rc < 0) {
@@ -3747,7 +3768,7 @@ int smblib_get_prop_input_voltage_settled(struct smb_charger *chg, 
				"Couldn't read QC_PULSE_COUNT rc=%d\n", rc);

			return 0;

		}

		val->intval = MICRO_5V + HVDCP3_STEP_UV * pulses;

		val->intval = MICRO_5V + step_uv * pulses;

		break;

	case POWER_SUPPLY_TYPE_USB_PD:

		val->intval = chg->voltage_min_uv;
@@ -5706,6 +5727,7 @@ static void typec_src_removal(struct smb_charger *chg) 
		dev_err(chg->dev,

			"Couldn't disable secondary charger rc=%d\n", rc);



	chg->qc3p5_detected = false;

	typec_src_fault_condition_cfg(chg, false);

	smblib_hvdcp_detect_enable(chg, false);

	smblib_update_usb_type(chg);

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

+2 −1
Original line number Diff line number Diff line 
/* Copyright (c) 2018-2019 The Linux Foundation. All rights reserved.

/* Copyright (c) 2018-2020 The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -572,6 +572,7 @@ struct smb_charger { 
	int			wls_icl_ua;

	bool			dpdm_enabled;

	bool			apsd_ext_timeout;

	bool			qc3p5_detected;



	/* workaround flag */

	u32			wa_flags;