diff options
| author | Diana Z <dzigterman@chromium.org> | 2020-08-25 11:34:00 -0600 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2020-08-27 17:58:13 +0000 |
| commit | b7707a936c79d86d6e57534ca6125acb7021e2f5 (patch) | |
| tree | 3d599459f43ffe14f613b47d1be99d4657213965 | |
| parent | 40a988f3fa4c259dcba1d2d8fa0ef84c6a867c88 (diff) | |
| download | chrome-ec-b7707a936c79d86d6e57534ca6125acb7021e2f5.tar.gz | |
Dedede: Clean up chg_chip references
Now that the charger_* interfaces take charge indexes appropriately,
clean up the board code to no longer use chg_chip structure directly.
BRANCH=None
BUG=b:147440290
TEST=on drawlat, confirm sourcing out on both ports works
Signed-off-by: Diana Z <dzigterman@chromium.org>
Change-Id: I92925e487f90bc3965b868f3f7fc0d3175dc3df9
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2376470
Reviewed-by: Aseda Aboagye <aaboagye@chromium.org>
| -rw-r--r-- | board/drawcia/board.c | 2 | ||||
| -rw-r--r-- | board/drawcia/usb_pd_policy.c | 7 | ||||
| -rw-r--r-- | board/waddledee/board.c | 2 | ||||
| -rw-r--r-- | board/waddledee/usb_pd_policy.c | 7 |
4 files changed, 8 insertions, 10 deletions
diff --git a/board/drawcia/board.c b/board/drawcia/board.c index 0ba3b5c0b0..4a012aafa8 100644 --- a/board/drawcia/board.c +++ b/board/drawcia/board.c @@ -563,7 +563,7 @@ __override void typec_set_source_current_limit(int port, enum tcpc_rp_value rp) current = (rp == TYPEC_RP_3A0) ? 3000 : 1500; - chg_chips[port].drv->set_otg_current_voltage(port, current, 5000); + charger_set_otg_current_voltage(port, current, 5000); } /* PWM channels. Must be in the exactly same order as in enum pwm_channel. */ diff --git a/board/drawcia/usb_pd_policy.c b/board/drawcia/usb_pd_policy.c index 58b442a0ac..9ead3c9fd1 100644 --- a/board/drawcia/usb_pd_policy.c +++ b/board/drawcia/usb_pd_policy.c @@ -29,11 +29,10 @@ void pd_power_supply_reset(int port) if (port < 0 || port >= board_get_usb_pd_port_count()) return; - /* TODO(b/147440290): charger functions should take chgnum */ - prev_en = chg_chips[port].drv->is_sourcing_otg_power(port, port); + prev_en = charger_is_sourcing_otg_power(port); /* Disable Vbus */ - chg_chips[port].drv->enable_otg_power(port, 0); + charger_enable_otg_power(port, 0); /* Discharge Vbus if previously enabled */ if (prev_en) @@ -61,7 +60,7 @@ int pd_set_power_supply_ready(int port) sm5803_set_vbus_disch(port, 0); /* Provide Vbus */ - chg_chips[port].drv->enable_otg_power(port, 1); + charger_enable_otg_power(port, 1); #ifdef CONFIG_USB_PD_MAX_SINGLE_SOURCE_CURRENT /* Ensure we advertise the proper available current quota */ diff --git a/board/waddledee/board.c b/board/waddledee/board.c index 6e455d2ca1..1cf9c67afd 100644 --- a/board/waddledee/board.c +++ b/board/waddledee/board.c @@ -401,7 +401,7 @@ __override void typec_set_source_current_limit(int port, enum tcpc_rp_value rp) current = (rp == TYPEC_RP_3A0) ? 3000 : 1500; - chg_chips[port].drv->set_otg_current_voltage(port, current, 5000); + charger_set_otg_current_voltage(port, current, 5000); } /* PWM channels. Must be in the exactly same order as in enum pwm_channel. */ diff --git a/board/waddledee/usb_pd_policy.c b/board/waddledee/usb_pd_policy.c index 58b442a0ac..9ead3c9fd1 100644 --- a/board/waddledee/usb_pd_policy.c +++ b/board/waddledee/usb_pd_policy.c @@ -29,11 +29,10 @@ void pd_power_supply_reset(int port) if (port < 0 || port >= board_get_usb_pd_port_count()) return; - /* TODO(b/147440290): charger functions should take chgnum */ - prev_en = chg_chips[port].drv->is_sourcing_otg_power(port, port); + prev_en = charger_is_sourcing_otg_power(port); /* Disable Vbus */ - chg_chips[port].drv->enable_otg_power(port, 0); + charger_enable_otg_power(port, 0); /* Discharge Vbus if previously enabled */ if (prev_en) @@ -61,7 +60,7 @@ int pd_set_power_supply_ready(int port) sm5803_set_vbus_disch(port, 0); /* Provide Vbus */ - chg_chips[port].drv->enable_otg_power(port, 1); + charger_enable_otg_power(port, 1); #ifdef CONFIG_USB_PD_MAX_SINGLE_SOURCE_CURRENT /* Ensure we advertise the proper available current quota */ |