evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

power: Add property CHARGE_COUNTER_EXT and 64-bit precision properties

Browse source 
Add POWER_SUPPLY_PROP_CHARGE_COUNTER_EXT that stores accumulated charge
in nAh units as a signed 64-bit value.

Add generic support for signed 64-bit property values.

Change-Id: I2bd34b1e95ffba24e7bfef81f398f22bd2aaf05e
Signed-off-by: Todd Poynor <toddpoynor@google.com>
This commit is contained in:
Todd Poynor 2013-12-12 15:59:09 -08:00 • committed by John Stultz
parent 4407d13a09
commit 8774e7626b
2 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
drivers/power/power_supply_sysfs.c
View file

@ -106,7 +106,10 @@ static ssize_t power_supply_show_property(struct device *dev,
else if (off >= POWER_SUPPLY_PROP_MODEL_NAME) else if (off >= POWER_SUPPLY_PROP_MODEL_NAME)
return sprintf(buf, "%s\n", value.strval); return sprintf(buf, "%s\n", value.strval);
return sprintf(buf, "%d\n", value.intval); if (off == POWER_SUPPLY_PROP_CHARGE_COUNTER_EXT)
return sprintf(buf, "%lld\n", value.int64val);
else
return sprintf(buf, "%d\n", value.intval);
} }
static ssize_t power_supply_store_property(struct device *dev, static ssize_t power_supply_store_property(struct device *dev,
@ -201,6 +204,8 @@ static struct device_attribute power_supply_attrs[] = {
POWER_SUPPLY_ATTR(usb_hc), POWER_SUPPLY_ATTR(usb_hc),
POWER_SUPPLY_ATTR(usb_otg), POWER_SUPPLY_ATTR(usb_otg),
POWER_SUPPLY_ATTR(charge_enabled), POWER_SUPPLY_ATTR(charge_enabled),
/* Local extensions of type int64_t */
POWER_SUPPLY_ATTR(charge_counter_ext),
/* Properties of type `const char *' */ /* Properties of type `const char *' */
POWER_SUPPLY_ATTR(model_name), POWER_SUPPLY_ATTR(model_name),
POWER_SUPPLY_ATTR(manufacturer), POWER_SUPPLY_ATTR(manufacturer),

4
include/linux/power_supply.h
View file

@ -18,6 +18,7 @@
#include <linux/leds.h> #include <linux/leds.h>
#include <linux/spinlock.h> #include <linux/spinlock.h>
#include <linux/notifier.h> #include <linux/notifier.h>
#include <linux/types.h>
/* /*
* All voltages, currents, charges, energies, time and temperatures in uV, * All voltages, currents, charges, energies, time and temperatures in uV,
@ -152,6 +153,8 @@ enum power_supply_property {
POWER_SUPPLY_PROP_USB_HC, POWER_SUPPLY_PROP_USB_HC,
POWER_SUPPLY_PROP_USB_OTG, POWER_SUPPLY_PROP_USB_OTG,
POWER_SUPPLY_PROP_CHARGE_ENABLED, POWER_SUPPLY_PROP_CHARGE_ENABLED,
/* Local extensions of type int64_t */
POWER_SUPPLY_PROP_CHARGE_COUNTER_EXT,
/* Properties of type `const char *' */ /* Properties of type `const char *' */
POWER_SUPPLY_PROP_MODEL_NAME, POWER_SUPPLY_PROP_MODEL_NAME,
POWER_SUPPLY_PROP_MANUFACTURER, POWER_SUPPLY_PROP_MANUFACTURER,
@ -176,6 +179,7 @@ enum power_supply_notifier_events {
union power_supply_propval { union power_supply_propval {
int intval; int intval;
const char *strval; const char *strval;
int64_t int64val;
}; };
struct device_node; struct device_node;