diff options
| author | Ting Shen <phoenixshen@google.com> | 2020-05-06 17:35:41 +0800 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2020-05-07 13:57:33 +0000 |
| commit | 5e0b69a31b5964644693952f52a6339f66c5e260 (patch) | |
| tree | 7c45612a370f4e2d33ba8f0a3a51202f38252923 | |
| parent | 5f04430b37f229869b5afb0f7cee660800970d30 (diff) | |
| download | chrome-ec-5e0b69a31b5964644693952f52a6339f66c5e260.tar.gz | |
rt946x: remove usb_charger_set_switches from board.h
Since all rt946x users do not customize usb_charger_set_switches(),
move this function into rt946x.c for the upcoming bc12 driver refactor.
A board can customize this function using the new bc12_drv if needed.
BUG=b:155611686
TEST=make buildall
BRANCH=none
Signed-off-by: Ting Shen <phoenixshen@google.com>
Change-Id: I8724af15c3508b54dc131a7c99004f3f4b2f893f
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2187079
Tested-by: Ting Shen <phoenixshen@chromium.org>
Auto-Submit: Ting Shen <phoenixshen@chromium.org>
Reviewed-by: Eric Yilun Lin <yllin@chromium.org>
Commit-Queue: Eric Yilun Lin <yllin@chromium.org>
| -rw-r--r-- | board/flapjack/board.c | 4 | ||||
| -rw-r--r-- | board/kakadu/board.c | 4 | ||||
| -rw-r--r-- | board/kodama/board.c | 4 | ||||
| -rw-r--r-- | board/kukui/board.c | 4 | ||||
| -rw-r--r-- | board/scarlet/board.c | 10 | ||||
| -rw-r--r-- | driver/charger/rt946x.c | 4 |
6 files changed, 4 insertions, 26 deletions
diff --git a/board/flapjack/board.c b/board/flapjack/board.c index f15f927840..fc214278ac 100644 --- a/board/flapjack/board.c +++ b/board/flapjack/board.c @@ -626,10 +626,6 @@ int board_allow_i2c_passthru(int port) return (port == I2C_PORT_VIRTUAL_BATTERY); } -void usb_charger_set_switches(int port, enum usb_switch setting) -{ -} - int board_get_fod(uint8_t **fod) { *fod = NULL; diff --git a/board/kakadu/board.c b/board/kakadu/board.c index 1e3b26cfdb..d6d50f8f3a 100644 --- a/board/kakadu/board.c +++ b/board/kakadu/board.c @@ -384,10 +384,6 @@ struct motion_sensor_t motion_sensors[] = { const unsigned int motion_sensor_count = ARRAY_SIZE(motion_sensors); #endif /* VARIANT_KUKUI_NO_SENSORS */ -void usb_charger_set_switches(int port, enum usb_switch setting) -{ -} - /* * Return if VBUS is sagging too low */ diff --git a/board/kodama/board.c b/board/kodama/board.c index 8be6ba345d..fdb40d32b8 100644 --- a/board/kodama/board.c +++ b/board/kodama/board.c @@ -368,10 +368,6 @@ struct motion_sensor_t motion_sensors[] = { const unsigned int motion_sensor_count = ARRAY_SIZE(motion_sensors); #endif /* SECTION_IS_RW */ -void usb_charger_set_switches(int port, enum usb_switch setting) -{ -} - /* * Return if VBUS is sagging too low */ diff --git a/board/kukui/board.c b/board/kukui/board.c index 422c60e123..57ba1e82f7 100644 --- a/board/kukui/board.c +++ b/board/kukui/board.c @@ -560,10 +560,6 @@ const struct motion_sensor_t *motion_als_sensors[] = { }; #endif /* VARIANT_KUKUI_NO_SENSORS */ -void usb_charger_set_switches(int port, enum usb_switch setting) -{ -} - /* * Return if VBUS is sagging too low */ diff --git a/board/scarlet/board.c b/board/scarlet/board.c index 7638bee9cf..97c6f61e10 100644 --- a/board/scarlet/board.c +++ b/board/scarlet/board.c @@ -461,13 +461,3 @@ int board_allow_i2c_passthru(int port) { return (port == I2C_PORT_VIRTUAL_BATTERY); } - -void usb_charger_set_switches(int port, enum usb_switch setting) -{ - /* - * There is no USB2 switch anywhere on this board. But based - * on the discussion in b:65446459, RK3399's USB PHY is powered - * off when USB charging port detection is going on, so things - * should mostly work without a USB2 switch. - */ -} diff --git a/driver/charger/rt946x.c b/driver/charger/rt946x.c index 0cf03196a0..4d0bb39aa2 100644 --- a/driver/charger/rt946x.c +++ b/driver/charger/rt946x.c @@ -1590,6 +1590,10 @@ wait_event: } } +void usb_charger_set_switches(int port, enum usb_switch setting) +{ +} + int usb_charger_ramp_allowed(int supplier) { return supplier == CHARGE_SUPPLIER_BC12_DCP; |