summaryrefslogtreecommitdiffstats
path: root/drivers/power
diff options
context:
space:
mode:
authorHeikki Krogerus <ext-heikki.krogerus@nokia.com>2010-10-04 10:51:37 +0300
committerAnton Vorontsov <cbouatmailru@gmail.com>2010-10-06 17:37:09 +0400
commit85efc8a18cedf70e55acd0c825e2d9d2f3b19999 (patch)
tree2d137c74957bae19ecab4fe8d75dbe238184b9b7 /drivers/power
parent353f867b5536e55e46801562987d605778cf262b (diff)
downloadlinux-85efc8a18cedf70e55acd0c825e2d9d2f3b19999.tar.bz2
power_supply: Add types for USB chargers
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>
Diffstat (limited to 'drivers/power')
-rw-r--r--drivers/power/power_supply_sysfs.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/power/power_supply_sysfs.c b/drivers/power/power_supply_sysfs.c
index 9d30eeb8c810..88f5e43100c2 100644
--- a/drivers/power/power_supply_sysfs.c
+++ b/drivers/power/power_supply_sysfs.c
@@ -42,7 +42,8 @@ static ssize_t power_supply_show_property(struct device *dev,
struct device_attribute *attr,
char *buf) {
static char *type_text[] = {
- "Battery", "UPS", "Mains", "USB"
+ "Battery", "UPS", "Mains", "USB",
+ "USB_DCP", "USB_CDP", "USB_ACA"
};
static char *status_text[] = {
"Unknown", "Charging", "Discharging", "Not charging", "Full"