diff options
| author | Heikki Krogerus <ext-heikki.krogerus@nokia.com> | 2010-10-04 10:51:37 +0300 |
|---|---|---|
| committer | Anton Vorontsov <cbouatmailru@gmail.com> | 2010-10-06 17:37:09 +0400 |
| commit | 85efc8a18cedf70e55acd0c825e2d9d2f3b19999 (patch) | |
| tree | 2d137c74957bae19ecab4fe8d75dbe238184b9b7 | |
| parent | 353f867b5536e55e46801562987d605778cf262b (diff) | |
| download | linux-stable-85efc8a18cedf70e55acd0c825e2d9d2f3b19999.tar.gz linux-stable-85efc8a18cedf70e55acd0c825e2d9d2f3b19999.tar.bz2 linux-stable-85efc8a18cedf70e55acd0c825e2d9d2f3b19999.zip | |
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>
| -rw-r--r-- | drivers/power/power_supply_sysfs.c | 3 | ||||
| -rw-r--r-- | include/linux/power_supply.h | 5 |
2 files changed, 6 insertions, 2 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" diff --git a/include/linux/power_supply.h b/include/linux/power_supply.h index 30083a896f36..d37fef67ece2 100644 --- a/include/linux/power_supply.h +++ b/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 { |