From 0c9ca7b1352ef5e3c067a2128c199cafbf39c6fe Mon Sep 17 00:00:00 2001 From: Heikki Krogerus Date: Mon, 4 Oct 2010 10:51:37 +0300 Subject: [PATCH] --- yaml --- r: 217406 b: refs/heads/master c: 85efc8a18cedf70e55acd0c825e2d9d2f3b19999 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/power/power_supply_sysfs.c | 3 ++- trunk/include/linux/power_supply.h | 5 ++++- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 7780441e35c4..e88d6cb3e98a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 353f867b5536e55e46801562987d605778cf262b +refs/heads/master: 85efc8a18cedf70e55acd0c825e2d9d2f3b19999 diff --git a/trunk/drivers/power/power_supply_sysfs.c b/trunk/drivers/power/power_supply_sysfs.c index 9d30eeb8c810..88f5e43100c2 100644 --- a/trunk/drivers/power/power_supply_sysfs.c +++ b/trunk/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" diff --git a/trunk/include/linux/power_supply.h b/trunk/include/linux/power_supply.h index 30083a896f36..d37fef67ece2 100644 --- a/trunk/include/linux/power_supply.h +++ b/trunk/include/linux/power_supply.h @@ -125,7 +125,10 @@ enum power_supply_type { POWER_SUPPLY_TYPE_BATTERY = 0, POWER_SUPPLY_TYPE_UPS, 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 {