diff options
| author | Nicolas Boichat <drinkcat@google.com> | 2017-01-19 21:05:35 +0800 |
|---|---|---|
| committer | chrome-bot <chrome-bot@chromium.org> | 2017-01-24 22:03:50 -0800 |
| commit | 26618037db336045afb1f654f059eb4703696d9f (patch) | |
| tree | eb39e88291ee884c54a3c0dcf959743cbc084113 | |
| parent | 92a79b2bf19df7bad5b25aa36193cd113b9c16a8 (diff) | |
| download | chrome-ec-26618037db336045afb1f654f059eb4703696d9f.tar.gz | |
poppy: Fix ADC_AMON_BMON range
BRANCH=none
BUG=chrome-os-partner:61098
TEST="amon" in EC consoles, values make sense.
Change-Id: Id1299aff3a6a24c306c8990c5eaf523aa0c27e45
Reviewed-on: https://chromium-review.googlesource.com/430475
Commit-Ready: Nicolas Boichat <drinkcat@chromium.org>
Tested-by: Nicolas Boichat <drinkcat@chromium.org>
Reviewed-by: Shawn N <shawnn@chromium.org>
| -rw-r--r-- | board/poppy/board.c | 9 | ||||
| -rw-r--r-- | board/poppy/board.h | 1 |
2 files changed, 6 insertions, 4 deletions
diff --git a/board/poppy/board.c b/board/poppy/board.c index c7b9ca0c30..25c9f0f994 100644 --- a/board/poppy/board.c +++ b/board/poppy/board.c @@ -182,9 +182,12 @@ const struct adc_t adc_channels[] = { ADC_MAX_VOLT, ADC_READ_MAX+1, 0}, /* Vbus sensing (10x voltage divider). */ [ADC_VBUS] = {"VBUS", NPCX_ADC_CH2, ADC_MAX_VOLT*10, ADC_READ_MAX+1, 0}, - /* Adapter current output or battery discharging current */ - /* TODO(crosbug.com/p/61098): verify these values */ - [ADC_AMON_BMON] = {"AMON_BMON", NPCX_ADC_CH1, 55000, 6144, 0}, + /* + * Adapter current output or battery charging/discharging current (uV) + * 18x amplification on charger side. + */ + [ADC_AMON_BMON] = {"AMON_BMON", NPCX_ADC_CH1, ADC_MAX_VOLT*1000/18, + ADC_READ_MAX+1, 0}, }; BUILD_ASSERT(ARRAY_SIZE(adc_channels) == ADC_CH_COUNT); diff --git a/board/poppy/board.h b/board/poppy/board.h index 526cebec4b..abb538b49d 100644 --- a/board/poppy/board.h +++ b/board/poppy/board.h @@ -71,7 +71,6 @@ #define CONFIG_CHARGER_MIN_BAT_PCT_FOR_POWER_ON 1 #define CONFIG_CHARGER_NARROW_VDC #define CONFIG_CHARGER_PROFILE_OVERRIDE -/* TODO(crosbug.com/p/61098): Check the 2 values below */ #define CONFIG_CHARGER_SENSE_RESISTOR 10 #define CONFIG_CHARGER_SENSE_RESISTOR_AC 20 #define CONFIG_CMD_CHARGER_ADC_AMON_BMON |