nagai/kernel
3
0
Fork 0
forked from mirrors/linux
Code Pull requests Activity

power_supply: Add types for USB chargers

Browse source 
This adds power supply types for USB chargers defined in
Battery Charging Specification 1.1.

Signed-off-by: Heikki Krogerus <ext-heikki.krogerus@nokia.com>
Signed-off-by: Anton Vorontsov <cbouatmailru@gmail.com>
This commit is contained in:
Heikki Krogerus 2010-10-04 10:51:37 +03:00 committed by Anton Vorontsov
parent 353f867b55
commit 85efc8a18c
2 changed files with 6 additions and 2 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

3
drivers/power/power_supply_sysfs.c
View file

@ -42,7 +42,8 @@ static ssize_t power_supply_show_property(struct device *dev,
struct device_attribute *attr, struct device_attribute *attr,
char *buf) { char *buf) {
static char *type_text[] = { static char *type_text[] = {
"Battery", "UPS", "Mains", "USB" "Battery", "UPS", "Mains", "USB",
"USB_DCP", "USB_CDP", "USB_ACA"
}; };
static char *status_text[] = { static char *status_text[] = {
"Unknown", "Charging", "Discharging", "Not charging", "Full" "Unknown", "Charging", "Discharging", "Not charging", "Full"

5
include/linux/power_supply.h
View file

@ -125,7 +125,10 @@ enum power_supply_type {
POWER_SUPPLY_TYPE_BATTERY = 0, POWER_SUPPLY_TYPE_BATTERY = 0,
POWER_SUPPLY_TYPE_UPS, POWER_SUPPLY_TYPE_UPS,
POWER_SUPPLY_TYPE_MAINS, POWER_SUPPLY_TYPE_MAINS,
POWER_SUPPLY_TYPE_USB, POWER_SUPPLY_TYPE_USB, /* Standard Downstream Port */
POWER_SUPPLY_TYPE_USB_DCP, /* Dedicated Charging Port */
POWER_SUPPLY_TYPE_USB_CDP, /* Charging Downstream Port */
POWER_SUPPLY_TYPE_USB_ACA, /* Accessory Charger Adapters */
}; };
union power_supply_propval { union power_supply_propval {