diff options
| author | Diana Z <dzigterman@chromium.org> | 2020-05-08 16:33:30 -0600 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2020-05-14 18:40:49 +0000 |
| commit | 3d1b60313a4848a4d0fae23cb6b0310a3dddd77c (patch) | |
| tree | a97df8dbb3909044501df264292976687edb73b0 | |
| parent | f94240f0d8b1b73675d0683626bfdabd89e726d5 (diff) | |
| download | chrome-ec-3d1b60313a4848a4d0fae23cb6b0310a3dddd77c.tar.gz | |
Charger: Handle Vbus retrieval from secondary charger chip
When a board is using multiple charger chips, fetch the Vbus level
assuming that the port is the same as the charger number.
When waddledee enables OCPC, the config can be easily changed to follow
CONFIG_OCPC instead.
BRANCH=None
BUG=None
TEST=on waddledee, "ectool usbpdpower 1" gives correct port 1 voltage
Signed-off-by: Diana Z <dzigterman@chromium.org>
Change-Id: I9226b8ffd12c515d2a638236f2e618799637296e
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2191371
Reviewed-by: Aseda Aboagye <aaboagye@chromium.org>
| -rw-r--r-- | common/charger.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/common/charger.c b/common/charger.c index 21320fcd4d..aac623d74a 100644 --- a/common/charger.c +++ b/common/charger.c @@ -444,6 +444,10 @@ enum ec_error_list charger_get_vbus_voltage(int port, int *voltage) int chgnum = 0; int rv = 0; + /* Note: Assumes USBPD port == chgnum on multi-charger systems */ + if (!IS_ENABLED(CONFIG_CHARGER_SINGLE_CHIP)) + chgnum = port; + if ((chgnum < 0) || (chgnum >= chg_cnt)) { CPRINTS("%s(%d) Invalid charger!", __func__, chgnum); return 0; |