diff options
| author | Shawn Nematbakhsh <shawnn@chromium.org> | 2017-11-06 10:07:15 -0800 |
|---|---|---|
| committer | chrome-bot <chrome-bot@chromium.org> | 2017-11-07 12:17:43 -0800 |
| commit | f4ee6caa665009ca3306f61706074b82e1e2c347 (patch) | |
| tree | c61dd1cd667f35324443a64c1d540d67e6ee5ed9 /board/kevin | |
| parent | fca1b7b710898ff347465d839c14164d610f140d (diff) | |
| download | chrome-ec-f4ee6caa665009ca3306f61706074b82e1e2c347.tar.gz | |
bd9995x: Use fixed PD-port-to-VBUS/VCC mapping
The bd9995x driver was written to allow any PD port # to be VBUS or VCC,
but the mapping is broken in a few places. Since all boards use VBUS =
port 0, remove the conversion entirely.
BUG=chromium:781849
BRANCH=kevin
TEST=Verify PD and BC1.2 charging still works on kevin.
Change-Id: I3687866835d1684342d9f746d91b3a6079ab5cc4
Signed-off-by: Shawn Nematbakhsh <shawnn@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/755000
Commit-Ready: Shawn N <shawnn@chromium.org>
Tested-by: Shawn N <shawnn@chromium.org>
Reviewed-by: Aseda Aboagye <aaboagye@chromium.org>
Diffstat (limited to 'board/kevin')
| -rw-r--r-- | board/kevin/board.c | 17 | ||||
| -rw-r--r-- | board/kevin/usb_pd_policy.c | 2 |
2 files changed, 5 insertions, 14 deletions
diff --git a/board/kevin/board.c b/board/kevin/board.c index 41d987597d..a15fd63bea 100644 --- a/board/kevin/board.c +++ b/board/kevin/board.c @@ -215,7 +215,7 @@ int board_set_active_charge_port(int charge_port) if (board_vbus_source_enabled(charge_port)) return -1; - bd9995x_port = bd9995x_pd_port_to_chg_port(charge_port); + bd9995x_port = charge_port; break; case CHARGE_PORT_NONE: bd9995x_port_select = 0; @@ -253,26 +253,17 @@ int extpower_is_present(void) else if (!p0_src && !p1_src) port = BD9995X_CHARGE_PORT_BOTH; else - port = bd9995x_pd_port_to_chg_port(p0_src); + port = p0_src; return bd9995x_is_vbus_provided(port); } int pd_snk_is_vbus_provided(int port) { - enum bd9995x_charge_port bd9995x_port; - - switch (port) { - case 0: - case 1: - bd9995x_port = bd9995x_pd_port_to_chg_port(port); - break; - default: + if (port != 0 && port != 1) panic("Invalid charge port\n"); - break; - } - return bd9995x_is_vbus_provided(bd9995x_port); + return bd9995x_is_vbus_provided(port); } static void board_spi_enable(void) diff --git a/board/kevin/usb_pd_policy.c b/board/kevin/usb_pd_policy.c index 8e1c8da7a8..b8a4766984 100644 --- a/board/kevin/usb_pd_policy.c +++ b/board/kevin/usb_pd_policy.c @@ -90,7 +90,7 @@ static void board_vbus_update_source_current(int port) int pd_set_power_supply_ready(int port) { /* Ensure we're not charging from this port */ - bd9995x_select_input_port(bd9995x_pd_port_to_chg_port(port), 0); + bd9995x_select_input_port(port, 0); /* Ensure we advertise the proper available current quota */ charge_manager_source_port(port, 1); |