charging: remove the vbat condition which enable 33W

As battery can support 33W when vbat > 3V, so remove the vbat
judge condition which enable parallel charging.

Change-Id: Ic8781d1e00b7dce68c1911de33c18d6fa8ceae18
Signed-off-by: mahj8 <mahj8@motorola.com>
Reviewed-on: https://gerrit.mot.com/2181811
SME-Granted: SME Approvals Granted
SLTApproved: Slta Waiver
Tested-by: Jira Key
Reviewed-by: Huosheng Liao <liaohs@motorola.com>
Submit-Approved: Jira Key
This commit is contained in:
mahj8 2022-02-15 11:00:26 +08:00 • committed by Haijian Ma
commit 78f43eae07
4 changed files with 2 additions and 17 deletions

View file

@ -1171,7 +1171,6 @@ static void psy_changed_work_func(struct work_struct *work)
#define DEFAULT_QC3P_VOLT_STEPS 20000
#define DEFAULT_QC3P_VOLT_MAX 11000000
#define DEFAULT_BATT_OVP_LMT 4475000
#define DEFAULT_PL_CHRG_VBATT_MIN 3000000
#define DEFAULT_PPS_VOLT_STEPS 20000
#define DEFAULT_PPS_CURR_STEPS 50000
#define DEFAULT_PPS_VOLT_MAX 11000000
@ -1190,13 +1189,6 @@ static int mmi_chrg_manager_parse_dt(struct mmi_charger_manager *chip)
chip->batt_ovp_lmt =
DEFAULT_BATT_OVP_LMT;
rc = of_property_read_u32(node,
"mmi,pl-chrg-vbatt-min",
&chip->pl_chrg_vbatt_min);
if (rc < 0)
chip->pl_chrg_vbatt_min =
DEFAULT_PL_CHRG_VBATT_MIN;
chip->extrn_fg = of_property_read_bool(node,
"mmi,extrn-fg");

View file

@ -208,7 +208,6 @@ struct mmi_charger_manager {
int pd_volt_max; /*the Maximum request PD Voltage*/
int pd_curr_max; /*the Maximum request PD current*/
int batt_ovp_lmt; /*the battery over current limitation*/
int pl_chrg_vbatt_min; /*the minimum battery voltage to enable parallel charging*/
int typec_middle_current;
int pd_allow_min_current;

View file

@ -490,7 +490,6 @@ void mmi_chrg_sm_work_func(struct work_struct *work)
if (chip->pd_pps_support
&& chrg_list->cp_master
&& vbatt_volt > chip->pl_chrg_vbatt_min
&& chrg_step->pres_chrg_step != chip->chrg_step_nums - 1
&& chrg_step->chrg_step_cc_curr >=
chrg_list->chrg_dev[CP_MASTER]->charging_curr_min
@ -512,10 +511,9 @@ void mmi_chrg_sm_work_func(struct work_struct *work)
} else {
mmi_chrg_dbg(chip, PR_MOTO, "Enter into PMIC switch charging, "
"the reason is : vbatt %d uV, "
"pl chrg vbatt min %d uV, "
"pps support %d, "
"chrg step %d\n",
vbatt_volt, chip->pl_chrg_vbatt_min,
vbatt_volt,
chip->pd_pps_support,
chrg_step->pres_chrg_step);
mmi_chrg_sm_move_state(chip, PM_STATE_SW_ENTRY);
@ -595,7 +593,6 @@ void mmi_chrg_sm_work_func(struct work_struct *work)
case PM_STATE_SW_LOOP:
if (chip->pd_pps_support
&& chip->cp_disable == false
&& vbatt_volt > chip->pl_chrg_vbatt_min
&& chrg_step->pres_chrg_step != chip->chrg_step_nums - 1
&& chrg_step->chrg_step_cc_curr >=
chrg_list->chrg_dev[CP_MASTER]->charging_curr_min

View file

@ -472,7 +472,6 @@ void mmi_qc3p_chrg_sm_work_func(struct work_struct *work)
if (chip->qc3p_active
&& chrg_list->cp_master
&& vbatt_volt > chip->pl_chrg_vbatt_min
&& chrg_step->pres_chrg_step != chip->chrg_step_nums - 1
&& chrg_step->chrg_step_cc_curr >=
chrg_list->chrg_dev[CP_MASTER]->charging_curr_min
@ -494,10 +493,9 @@ void mmi_qc3p_chrg_sm_work_func(struct work_struct *work)
} else {
mmi_chrg_dbg(chip, PR_MOTO, "Enter into PMIC switch charging, "
"the reason is : vbatt %d uV, "
"pl chrg vbatt min %d uV, "
"qc3p support %d, "
"chrg step %d\n",
vbatt_volt, chip->pl_chrg_vbatt_min,
vbatt_volt,
chip->qc3p_active,
chrg_step->pres_chrg_step);
mmi_chrg_qc3p_sm_move_state(chip, PM_QC3P_STATE_SW_ENTRY);
@ -547,7 +545,6 @@ void mmi_qc3p_chrg_sm_work_func(struct work_struct *work)
case PM_QC3P_STATE_SW_LOOP:
if (chip->qc3p_active
&& chip->cp_disable == false
&& vbatt_volt > chip->pl_chrg_vbatt_min
&& chrg_step->pres_chrg_step != chip->chrg_step_nums - 1
&& chrg_step->chrg_step_cc_curr >=
chrg_list->chrg_dev[CP_MASTER]->charging_curr_min