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

Commit e3cb8400 authored by Hans de Goede's avatar Hans de Goede Committed by Greg Kroah-Hartman
Browse files

power: supply: axp288_charger: Round constant_charge_voltage writes down 



commit 81af7f2342d162e24ac820c10e68684d9f927663 upstream.

Round constant_charge_voltage writes down to the first supported lower
value, rather then rounding them up to the first supported higher value.

This fixes e.g. writing 4250000 resulting in a value of 4350000 which
might be dangerous, instead writing 4250000 will now result in a safe
4200000 value.

Fixes: 843735b7 ("power: axp288_charger: axp288 charger driver")
Cc: stable@vger.kernel.org
Signed-off-by: default avatarHans de Goede <hdegoede@redhat.com>
Link: https://lore.kernel.org/r/20240717200333.56669-2-hdegoede@redhat.com


Signed-off-by: default avatarSebastian Reichel <sebastian.reichel@collabora.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent f1aa9f19

drivers/power/supply/axp288_charger.c

+9 −9
Original line number Diff line number Diff line
@@ -175,18 +175,18 @@ static inline int axp288_charger_set_cv(struct axp288_chrg_info *info, int cv) 
	u8 reg_val;

	int ret;



	if (cv <= CV_4100MV) {

		reg_val = CHRG_CCCV_CV_4100MV;

		cv = CV_4100MV;

	} else if (cv <= CV_4150MV) {

		reg_val = CHRG_CCCV_CV_4150MV;

		cv = CV_4150MV;

	} else if (cv <= CV_4200MV) {

	if (cv >= CV_4350MV) {

		reg_val = CHRG_CCCV_CV_4350MV;

		cv = CV_4350MV;

	} else if (cv >= CV_4200MV) {

		reg_val = CHRG_CCCV_CV_4200MV;

		cv = CV_4200MV;

	} else if (cv >= CV_4150MV) {

		reg_val = CHRG_CCCV_CV_4150MV;

		cv = CV_4150MV;

	} else {

		reg_val = CHRG_CCCV_CV_4350MV;

		cv = CV_4350MV;

		reg_val = CHRG_CCCV_CV_4100MV;

		cv = CV_4100MV;

	}



	reg_val = reg_val << CHRG_CCCV_CV_BIT_POS;