diff options
| author | codeworkx <codeworkx@cyanogenmod.com> | 2012-09-22 09:48:20 +0200 |
|---|---|---|
| committer | codeworkx <codeworkx@cyanogenmod.com> | 2012-09-22 14:02:16 +0200 |
| commit | 2489007e7d740ccbc3e0a202914e243ad5178787 (patch) | |
| tree | b8e6380ea7b1da63474ad68a5dba997e01146043 /include/linux/power_supply.h | |
| parent | 5f67568eb31e3a813c7c52461dcf66ade15fc2e7 (diff) | |
| download | kernel_samsung_smdk4412-2489007e7d740ccbc3e0a202914e243ad5178787.zip kernel_samsung_smdk4412-2489007e7d740ccbc3e0a202914e243ad5178787.tar.gz kernel_samsung_smdk4412-2489007e7d740ccbc3e0a202914e243ad5178787.tar.bz2 | |
merge opensource jb u5
Change-Id: I1aaec157aa196f3448eff8636134fce89a814cf2
Diffstat (limited to 'include/linux/power_supply.h')
| -rw-r--r-- | include/linux/power_supply.h | 37 |
1 files changed, 37 insertions, 0 deletions
diff --git a/include/linux/power_supply.h b/include/linux/power_supply.h index 6347fd9..c5b958b 100644 --- a/include/linux/power_supply.h +++ b/include/linux/power_supply.h @@ -110,6 +110,9 @@ enum power_supply_property { POWER_SUPPLY_PROP_ENERGY_NOW, POWER_SUPPLY_PROP_ENERGY_AVG, POWER_SUPPLY_PROP_CAPACITY, /* in percents! */ +#ifdef CONFIG_SLP + POWER_SUPPLY_PROP_CAPACITY_RAW, +#endif POWER_SUPPLY_PROP_CAPACITY_LEVEL, POWER_SUPPLY_PROP_TEMP, POWER_SUPPLY_PROP_TEMP_AMBIENT, @@ -146,6 +149,40 @@ enum { POWER_SUPPLY_VBUS_GOOD, }; +/* + * EXTENDED_ONLINE_TYPE + * - support various charger cable type + * - set type from each accessory driver(muic, host, mhl, etc,,,) + * + * - type format + * | 31-24: RSVD | 23-16: MAIN TYPE | 15-8: SUB TYPE | 7-0: POWER TYPE | + */ +#define ONLINE_TYPE_RSVD_SHIFT 24 +#define ONLINE_TYPE_RSVD_MASK (0xF << ONLINE_TYPE_RSVD_SHIFT) +#define ONLINE_TYPE_MAIN_SHIFT 16 +#define ONLINE_TYPE_MAIN_MASK (0xF << ONLINE_TYPE_MAIN_SHIFT) +#define ONLINE_TYPE_SUB_SHIFT 8 +#define ONLINE_TYPE_SUB_MASK (0xF << ONLINE_TYPE_SUB_SHIFT) +#define ONLINE_TYPE_PWR_SHIFT 0 +#define ONLINE_TYPE_PWR_MASK (0xF << ONLINE_TYPE_PWR_SHIFT) + +enum online_sub_type { + ONLINE_SUB_TYPE_UNKNOWN = 0, + ONLINE_SUB_TYPE_MHL, + ONLINE_SUB_TYPE_AUDIO, + ONLINE_SUB_TYPE_DESK, + ONLINE_SUB_TYPE_SMART_NOTG, + ONLINE_SUB_TYPE_SMART_OTG, +}; + +enum online_power_type { + ONLINE_POWER_TYPE_UNKNOWN = 0, + ONLINE_POWER_TYPE_BATTERY, + ONLINE_POWER_TYPE_TA, + ONLINE_POWER_TYPE_USB, +}; +/* EXTENDED_ONLINE_TYPE */ + union power_supply_propval { int intval; const char *strval; |