diff options
| author | Wonjoon Lee <woojoo.lee@samsung.com> | 2016-10-17 13:02:57 -0700 |
|---|---|---|
| committer | chrome-bot <chrome-bot@chromium.org> | 2016-11-08 02:53:54 -0800 |
| commit | b044fba33c4dc63c138876aa080c632015cae6f7 (patch) | |
| tree | 1aa9f031a31dc10372cb16a02fc99915ec34bde1 | |
| parent | c335895df7b436ff2076a191f9e6310b9ddf4792 (diff) | |
| download | chrome-ec-b044fba33c4dc63c138876aa080c632015cae6f7.tar.gz | |
bd9995*: maintain VBAT voltage as battery maximum
BUG=chrome-os-partner:54248
BRANCH=gru
TEST=Manual on kevin, high temperature chamber(60C),
battery will require 0 voltage because of high temp,
then check 'chgstate' vbat maintained at 8688 mV.
Change-Id: I3b5835701c42a0cd861400ba921b3d3797152bbd
Signed-off-by: Wonjoon Lee <woojoo.lee@samsung.com>
Reviewed-on: https://chromium-review.googlesource.com/400088
Commit-Ready: Shawn N <shawnn@chromium.org>
Tested-by: Vijay P Hiremath <vijay.p.hiremath@intel.com>
Reviewed-by: Vijay P Hiremath <vijay.p.hiremath@intel.com>
Reviewed-by: Aseda Aboagye <aaboagye@chromium.org>
| -rw-r--r-- | board/eve/board.h | 1 | ||||
| -rw-r--r-- | board/kevin/board.h | 1 | ||||
| -rw-r--r-- | board/pyro/board.h | 1 | ||||
| -rw-r--r-- | board/reef/board.h | 1 | ||||
| -rw-r--r-- | board/snappy/board.h | 1 | ||||
| -rw-r--r-- | driver/charger/bd9995x.c | 3 |
6 files changed, 2 insertions, 6 deletions
diff --git a/board/eve/board.h b/board/eve/board.h index a891f7f2b6..05a451c9a8 100644 --- a/board/eve/board.h +++ b/board/eve/board.h @@ -71,7 +71,6 @@ #define CONFIG_CHARGER_LIMIT_POWER_THRESH_BAT_PCT 1 #define CONFIG_CHARGER_LIMIT_POWER_THRESH_CHG_MW 15000 #define CONFIG_CHARGER_MIN_BAT_PCT_FOR_POWER_ON 1 -#define CONFIG_CHARGER_NARROW_VDC #define CONFIG_CHARGER_SENSE_RESISTOR 10 #define CONFIG_CHARGER_SENSE_RESISTOR_AC 10 #define BD9995X_IOUT_GAIN_SELECT \ diff --git a/board/kevin/board.h b/board/kevin/board.h index ecf8cb7e33..5d14aad4dd 100644 --- a/board/kevin/board.h +++ b/board/kevin/board.h @@ -61,7 +61,6 @@ #define CONFIG_CHARGER_BD99956 #define CONFIG_BD9995X_POWER_SAVE_MODE BD9995X_PWR_SAVE_HIGH #define CONFIG_CHARGER_INPUT_CURRENT 512 -#define CONFIG_CHARGER_NARROW_VDC #define CONFIG_CHARGER_V2 #define CONFIG_CHARGER_MIN_BAT_PCT_FOR_POWER_ON 2 #define CONFIG_CHARGER_LIMIT_POWER_THRESH_BAT_PCT 2 diff --git a/board/pyro/board.h b/board/pyro/board.h index f3bf4bcea4..abfd23d3b0 100644 --- a/board/pyro/board.h +++ b/board/pyro/board.h @@ -61,7 +61,6 @@ #define CONFIG_CHARGER_LIMIT_POWER_THRESH_BAT_PCT 1 #define CONFIG_CHARGER_LIMIT_POWER_THRESH_CHG_MW 15000 #define CONFIG_CHARGER_MIN_BAT_PCT_FOR_POWER_ON 1 -#define CONFIG_CHARGER_NARROW_VDC #define CONFIG_USB_CHARGER #define CONFIG_CHARGE_MANAGER_EXTERNAL_POWER_LIMIT diff --git a/board/reef/board.h b/board/reef/board.h index 95b0502d07..5a0ac0f88e 100644 --- a/board/reef/board.h +++ b/board/reef/board.h @@ -61,7 +61,6 @@ #define CONFIG_CHARGER_LIMIT_POWER_THRESH_BAT_PCT 1 #define CONFIG_CHARGER_LIMIT_POWER_THRESH_CHG_MW 15000 #define CONFIG_CHARGER_MIN_BAT_PCT_FOR_POWER_ON 1 -#define CONFIG_CHARGER_NARROW_VDC #define CONFIG_USB_CHARGER #define CONFIG_CHARGE_MANAGER_EXTERNAL_POWER_LIMIT diff --git a/board/snappy/board.h b/board/snappy/board.h index a1bb8a5ccc..53883fbe4b 100644 --- a/board/snappy/board.h +++ b/board/snappy/board.h @@ -61,7 +61,6 @@ #define CONFIG_CHARGER_LIMIT_POWER_THRESH_BAT_PCT 1 #define CONFIG_CHARGER_LIMIT_POWER_THRESH_CHG_MW 15000 #define CONFIG_CHARGER_MIN_BAT_PCT_FOR_POWER_ON 1 -#define CONFIG_CHARGER_NARROW_VDC #define CONFIG_USB_CHARGER #define CONFIG_CHARGE_MANAGER_EXTERNAL_POWER_LIMIT diff --git a/driver/charger/bd9995x.c b/driver/charger/bd9995x.c index 3b91be2425..bfb98a9bef 100644 --- a/driver/charger/bd9995x.c +++ b/driver/charger/bd9995x.c @@ -612,7 +612,8 @@ int charger_set_voltage(int voltage) if (rv) return rv; - if (reg & BD9995X_CMD_CHGOP_SET2_BATT_LEARN || + if (voltage == 0 || + reg & BD9995X_CMD_CHGOP_SET2_BATT_LEARN || battery_is_present() != BP_YES || battery_is_cut_off()) voltage = bi->voltage_max; |