Commit 8327a8ab authored by Marek Vasut's avatar Marek Vasut Committed by Sebastian Reichel
Browse files

power: supply: bq25890: Clean up POWER_SUPPLY_PROP_CONSTANT_CHARGE_CURRENT 



Clean up misuse of POWER_SUPPLY_PROP_CONSTANT_CHARGE_CURRENT and
POWER_SUPPLY_PROP_CONSTANT_CHARGE_CURRENT_MAX and document what
exactly each value means.

The POWER_SUPPLY_PROP_CONSTANT_CHARGE_CURRENT content is newly read
back from hardware, while POWER_SUPPLY_PROP_CONSTANT_CHARGE_CURRENT_MAX
is reported as the maximum value set in DT.

Reviewed-by: default avatarHans de Goede <hdegoede@redhat.com>
Signed-off-by: default avatarMarek Vasut <marex@denx.de>
Signed-off-by: default avatarSebastian Reichel <sebastian.reichel@collabora.com>
parent ef1ca210

drivers/power/supply/bq25890_charger.c

+41 −16
Original line number Diff line number Diff line
@@ -529,22 +529,6 @@ static int bq25890_power_supply_get_property(struct power_supply *psy, 
			val->intval = POWER_SUPPLY_HEALTH_UNSPEC_FAILURE;

		break;



	case POWER_SUPPLY_PROP_CONSTANT_CHARGE_CURRENT_MAX:

		val->intval = bq25890_find_val(bq->init_data.ichg, TBL_ICHG);



		/* When temperature is too low, charge current is decreased */

		if (bq->state.ntc_fault == NTC_FAULT_COOL) {

			ret = bq25890_field_read(bq, F_JEITA_ISET);

			if (ret < 0)

				return ret;



			if (ret)

				val->intval /= 5;

			else

				val->intval /= 2;

		}

		break;



	case POWER_SUPPLY_PROP_CONSTANT_CHARGE_VOLTAGE:

		if (!state.online) {

			val->intval = 0;
@@ -604,6 +588,46 @@ static int bq25890_power_supply_get_property(struct power_supply *psy, 
		val->intval = ret * -50000;

		break;



	case POWER_SUPPLY_PROP_CONSTANT_CHARGE_CURRENT:	/* I_BAT user limit */

		/*

		 * This is user-configured constant charge current supplied

		 * from charger to battery in first phase of charging, when

		 * battery voltage is below constant charge voltage.

		 *

		 * This value reflects the current hardware setting.

		 *

		 * The POWER_SUPPLY_PROP_CONSTANT_CHARGE_CURRENT_MAX is the

		 * maximum value of this property.

		 */

		ret = bq25890_field_read(bq, F_ICHG);

		if (ret < 0)

			return ret;

		val->intval = bq25890_find_val(ret, TBL_ICHG);



		/* When temperature is too low, charge current is decreased */

		if (bq->state.ntc_fault == NTC_FAULT_COOL) {

			ret = bq25890_field_read(bq, F_JEITA_ISET);

			if (ret < 0)

				return ret;



			if (ret)

				val->intval /= 5;

			else

				val->intval /= 2;

		}

		break;



	case POWER_SUPPLY_PROP_CONSTANT_CHARGE_CURRENT_MAX:	/* I_BAT max */

		/*

		 * This is maximum allowed constant charge current supplied

		 * from charger to battery in first phase of charging, when

		 * battery voltage is below constant charge voltage.

		 *

		 * This value is constant for each battery and set from DT.

		 */

		val->intval = bq25890_find_val(bq->init_data.ichg, TBL_ICHG);

		break;



	case POWER_SUPPLY_PROP_TEMP:

		ret = bq25890_field_read(bq, F_TSPCT);

		if (ret < 0)
@@ -887,6 +911,7 @@ static const enum power_supply_property bq25890_power_supply_props[] = { 
	POWER_SUPPLY_PROP_CHARGE_TYPE,

	POWER_SUPPLY_PROP_ONLINE,

	POWER_SUPPLY_PROP_HEALTH,

	POWER_SUPPLY_PROP_CONSTANT_CHARGE_CURRENT,

	POWER_SUPPLY_PROP_CONSTANT_CHARGE_CURRENT_MAX,

	POWER_SUPPLY_PROP_CONSTANT_CHARGE_VOLTAGE,

	POWER_SUPPLY_PROP_CONSTANT_CHARGE_VOLTAGE_MAX,