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

Commit 0f0905c6 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "dt-bindings: qpnp-fg-gen4: Add SW ESR control"

parents 6e241247 a1c0d8a9

Documentation/devicetree/bindings/power/supply/qcom/qpnp-fg-gen4.txt

+6 −0
Original line number Diff line number Diff line
@@ -478,6 +478,12 @@ First Level Node - FG Gen4 device 
		    specified. If this is not specified, then the

		    default value is 10000. Unit is in ms.



- qcom,sw-esr-control

	Usage:      optional

	Value type: <empty>

	Definition: A boolean property that when specified enables SW ESR

		    control depending on input presence and user request.



==========================================================

Second Level Nodes - Peripherals managed by FG Gen4 driver

==========================================================

drivers/power/supply/power_supply_sysfs.c

+1 −0
Original line number Diff line number Diff line
@@ -398,6 +398,7 @@ static struct device_attribute power_supply_attrs[] = { 
	POWER_SUPPLY_ATTR(scale_mode_en),

	POWER_SUPPLY_ATTR(voltage_max_limit),

	POWER_SUPPLY_ATTR(real_capacity),

	POWER_SUPPLY_ATTR(esr_sw_control),

	/* Charge pump properties */

	POWER_SUPPLY_ATTR(cp_status1),

	POWER_SUPPLY_ATTR(cp_status2),

include/linux/power_supply.h

+1 −0
Original line number Diff line number Diff line
@@ -336,6 +336,7 @@ enum power_supply_property { 
	POWER_SUPPLY_PROP_SCALE_MODE_EN,

	POWER_SUPPLY_PROP_VOLTAGE_MAX_LIMIT,

	POWER_SUPPLY_PROP_REAL_CAPACITY,

	POWER_SUPPLY_PROP_ESR_SW_CONTROL,

	/* Charge pump properties */

	POWER_SUPPLY_PROP_CP_STATUS1,

	POWER_SUPPLY_PROP_CP_STATUS2,