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

Commit 9e1c95d4 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "power: smb135x-charger: Report battery capacity"

parents f4f7ea35 24e3335b

Documentation/devicetree/bindings/power/smb135x-charger.txt

+2 −0
Original line number Diff line number Diff line
@@ -13,6 +13,8 @@ Optional Properties: 


- interrupts			This indicates the IRQ number of the GPIO

				connected to the STAT pin.

- qcom,bms-psy-name	 	the psy name to use for reporting battery capacity. If left

				unspecified it uses a preprogrammed default value.

- qcom,float-voltage-mv	 	Float Voltage in mV - the maximum voltage up to which

				the battery is charged. Supported range 3600mV to 4500mV

- qcom,charging-timeout		Maximum duration in minutes that a single charge

drivers/power/smb135x-charger.c

+29 −0
Original line number Diff line number Diff line
@@ -216,8 +216,10 @@ struct smb135x_chg { 
	struct power_supply		*usb_psy;

	struct power_supply		batt_psy;

	struct power_supply		dc_psy;

	struct power_supply		*bms_psy;

	enum power_supply_type		dc_psy_type;

	int				dc_psy_ma;

	const char			*bms_psy_name;



	/* status tracking */

	bool				chg_done_batt_full;
@@ -380,6 +382,7 @@ static enum power_supply_property smb135x_battery_properties[] = { 
	POWER_SUPPLY_PROP_PRESENT,

	POWER_SUPPLY_PROP_CHARGING_ENABLED,

	POWER_SUPPLY_PROP_CHARGE_TYPE,

	POWER_SUPPLY_PROP_CAPACITY,

	POWER_SUPPLY_PROP_TECHNOLOGY,

};
@@ -468,6 +471,20 @@ static int smb135x_get_prop_charge_type(struct smb135x_chg *chip) 
	return POWER_SUPPLY_CHARGE_TYPE_NONE;

}



#define DEFAULT_BATT_CAPACITY	50

static int smb135x_get_prop_batt_capacity(struct smb135x_chg *chip)

{

	union power_supply_propval ret = {0, };



	if (chip->bms_psy) {

		chip->bms_psy->get_property(chip->bms_psy,

				POWER_SUPPLY_PROP_CAPACITY, &ret);

		return ret.intval;

	}



	return DEFAULT_BATT_CAPACITY;

}



static int smb135x_enable_volatile_writes(struct smb135x_chg *chip)

{

	int rc;
@@ -818,6 +835,9 @@ static int smb135x_battery_get_property(struct power_supply *psy, 
	case POWER_SUPPLY_PROP_CHARGE_TYPE:

		val->intval = smb135x_get_prop_charge_type(chip);

		break;

	case POWER_SUPPLY_PROP_CAPACITY:

		val->intval = smb135x_get_prop_batt_capacity(chip);

		break;

	case POWER_SUPPLY_PROP_TECHNOLOGY:

		val->intval = POWER_SUPPLY_TECHNOLOGY_LION;

		break;
@@ -856,6 +876,10 @@ static void smb135x_external_power_changed(struct power_supply *psy) 
	union power_supply_propval prop = {0,};

	int rc, current_limit = 0, online = 0;



	if (chip->bms_psy_name)

		chip->bms_psy =

			power_supply_get_by_name((char *)chip->bms_psy_name);



	rc = chip->usb_psy->get_property(chip->usb_psy,

				POWER_SUPPLY_PROP_ONLINE, &prop);

	if (rc < 0)
@@ -1808,6 +1832,11 @@ static int smb_parse_dt(struct smb135x_chg *chip) 
	chip->chg_enabled = !(of_property_read_bool(node,

						"qcom,charging-disabled"));



	rc = of_property_read_string(node, "qcom,bms-psy-name",

						&chip->bms_psy_name);

	if (rc)

		chip->bms_psy_name = NULL;



	return 0;

}