Commit 787fdbcf authored by Sebastian Reichel's avatar Sebastian Reichel Committed by Sebastian Reichel
Browse files

power: supply: sbs-battery: add POWER_SUPPLY_PROP_CONSTANT_CHARGE_CURRENT/VOLTAGE_MAX support 



Expose maximum charge current/voltage information requested
by the battery.

Reviewed-by: default avatarEmil Velikov <emil.velikov@collabora.com>
Signed-off-by: default avatarSebastian Reichel <sebastian.reichel@collabora.com>
parent 3e9544f7

drivers/power/supply/sbs-battery.c

+12 −0
Original line number Diff line number Diff line
@@ -46,6 +46,8 @@ enum { 
	REG_CHEMISTRY,

	REG_MANUFACTURER,

	REG_MODEL_NAME,

	REG_CHARGE_CURRENT,

	REG_CHARGE_VOLTAGE,

};



#define REG_ADDR_SPEC_INFO		0x1A
@@ -114,6 +116,10 @@ static const struct chip_data { 
		SBS_DATA(POWER_SUPPLY_PROP_TIME_TO_EMPTY_AVG, 0x12, 0, 65535),

	[REG_TIME_TO_FULL] =

		SBS_DATA(POWER_SUPPLY_PROP_TIME_TO_FULL_AVG, 0x13, 0, 65535),

	[REG_CHARGE_CURRENT] =

		SBS_DATA(POWER_SUPPLY_PROP_CONSTANT_CHARGE_CURRENT_MAX, 0x14, 0, 65535),

	[REG_CHARGE_VOLTAGE] =

		SBS_DATA(POWER_SUPPLY_PROP_CONSTANT_CHARGE_VOLTAGE_MAX, 0x15, 0, 65535),

	[REG_STATUS] =

		SBS_DATA(POWER_SUPPLY_PROP_STATUS, 0x16, 0, 65535),

	[REG_CAPACITY_LEVEL] =
@@ -163,6 +169,8 @@ static enum power_supply_property sbs_properties[] = { 
	POWER_SUPPLY_PROP_CHARGE_NOW,

	POWER_SUPPLY_PROP_CHARGE_FULL,

	POWER_SUPPLY_PROP_CHARGE_FULL_DESIGN,

	POWER_SUPPLY_PROP_CONSTANT_CHARGE_CURRENT_MAX,

	POWER_SUPPLY_PROP_CONSTANT_CHARGE_VOLTAGE_MAX,

	/* Properties of type `const char *' */

	POWER_SUPPLY_PROP_MANUFACTURER,

	POWER_SUPPLY_PROP_MODEL_NAME
@@ -531,6 +539,8 @@ static void sbs_unit_adjustment(struct i2c_client *client, 
	case POWER_SUPPLY_PROP_CURRENT_NOW:

	case POWER_SUPPLY_PROP_CURRENT_AVG:

	case POWER_SUPPLY_PROP_CHARGE_NOW:

	case POWER_SUPPLY_PROP_CONSTANT_CHARGE_CURRENT_MAX:

	case POWER_SUPPLY_PROP_CONSTANT_CHARGE_VOLTAGE_MAX:

	case POWER_SUPPLY_PROP_CHARGE_FULL:

	case POWER_SUPPLY_PROP_CHARGE_FULL_DESIGN:

		val->intval *= BASE_UNIT_CONVERSION;
@@ -749,6 +759,8 @@ static int sbs_get_property(struct power_supply *psy, 
	case POWER_SUPPLY_PROP_TIME_TO_FULL_AVG:

	case POWER_SUPPLY_PROP_VOLTAGE_MIN_DESIGN:

	case POWER_SUPPLY_PROP_VOLTAGE_MAX_DESIGN:

	case POWER_SUPPLY_PROP_CONSTANT_CHARGE_CURRENT_MAX:

	case POWER_SUPPLY_PROP_CONSTANT_CHARGE_VOLTAGE_MAX:

	case POWER_SUPPLY_PROP_CAPACITY:

	case POWER_SUPPLY_PROP_CAPACITY_ERROR_MARGIN:

		ret = sbs_get_property_index(client, psp);