diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2017-02-01 19:23:35 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-02-01 19:23:35 -0800 |
| commit | 5e7d38562557ebcfea71a97bcccafd87d12d364b (patch) | |
| tree | e5e7a851c1b0f032d5de3db9ebe58ac8a6c60d6c /include/linux | |
| parent | ffaa506460d58cf093409d0cb790d2e2795114de (diff) | |
| parent | f0cf35f5921410fed20e7d2d5f89ed3326430a08 (diff) | |
Merge "power: qcom-charger: separate parallel code"
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/power_supply.h | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/include/linux/power_supply.h b/include/linux/power_supply.h index de35fe9441fe..6a495ea6c523 100644 --- a/include/linux/power_supply.h +++ b/include/linux/power_supply.h @@ -104,6 +104,12 @@ enum { POWER_SUPPLY_DP_DM_ICL_UP = 12, }; +enum { + POWER_SUPPLY_PARALLEL_NONE, + POWER_SUPPLY_PARALLEL_USBIN_USBIN, + POWER_SUPPLY_PARALLEL_MID_MID, +}; + enum power_supply_property { /* Properties of type `int' */ POWER_SUPPLY_PROP_STATUS = 0, @@ -229,6 +235,9 @@ enum power_supply_property { POWER_SUPPLY_PROP_SET_SHIP_MODE, POWER_SUPPLY_PROP_SOC_REPORTING_READY, POWER_SUPPLY_PROP_DEBUG_BATTERY, + POWER_SUPPLY_PROP_FCC_DELTA, + POWER_SUPPLY_PROP_ICL_REDUCTION, + POWER_SUPPLY_PROP_PARALLEL_MODE, /* Local extensions of type int64_t */ POWER_SUPPLY_PROP_CHARGE_COUNTER_EXT, /* Properties of type `const char *' */ @@ -252,9 +261,10 @@ enum power_supply_type { POWER_SUPPLY_TYPE_USB_PD, /* Power Delivery */ POWER_SUPPLY_TYPE_WIRELESS, /* Accessory Charger Adapters */ POWER_SUPPLY_TYPE_BMS, /* Battery Monitor System */ - POWER_SUPPLY_TYPE_USB_PARALLEL, /* USB Parallel Path */ - POWER_SUPPLY_TYPE_WIPOWER, /* Wipower */ - POWER_SUPPLY_TYPE_TYPEC, /*Type-C */ + POWER_SUPPLY_TYPE_PARALLEL, /* Parallel Path */ + POWER_SUPPLY_TYPE_MAIN, /* Main Path */ + POWER_SUPPLY_TYPE_WIPOWER, /* Wipower */ + POWER_SUPPLY_TYPE_TYPEC, /* Type-C */ POWER_SUPPLY_TYPE_UFP, /* Type-C UFP */ POWER_SUPPLY_TYPE_DFP, /* TYpe-C DFP */ }; |