diff options
| author | Ting Shen <phoenixshen@google.com> | 2023-02-14 15:56:57 +0800 |
|---|---|---|
| committer | Chromeos LUCI <chromeos-scoped@luci-project-accounts.iam.gserviceaccount.com> | 2023-02-14 10:41:00 +0000 |
| commit | 99ab4a3b1f98f9335656f708e5ab6208553e7611 (patch) | |
| tree | fa3523fc02f09a0a76b9925ad66ddaf5adcda4b5 /driver | |
| parent | 3133ebdd94d74080f8a62d3987da9660f3e26e46 (diff) | |
| download | chrome-ec-99ab4a3b1f98f9335656f708e5ab6208553e7611.tar.gz | |
geralt: disable bc1.2
Remove CONFIG_USB_CHARGER and hide related driver code inside #ifdef.
BUG=b:267989266
TEST=no USB_CHG task in `kernel thread`
BRANCH=none
LOW_COVERAGE_REASON=early bringup
Change-Id: Iebd80267f64149fde148a436212c9998824c6564
Signed-off-by: Ting Shen <phoenixshen@google.com>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/4248932
Tested-by: Ting Shen <phoenixshen@chromium.org>
Reviewed-by: Eric Yilun Lin <yllin@google.com>
Commit-Queue: Ting Shen <phoenixshen@chromium.org>
Diffstat (limited to 'driver')
| -rw-r--r-- | driver/charger/rt9490.c | 2 | ||||
| -rw-r--r-- | driver/ppc/rt1739.c | 6 |
2 files changed, 8 insertions, 0 deletions
diff --git a/driver/charger/rt9490.c b/driver/charger/rt9490.c index 016ef12d44..e37c65dc1c 100644 --- a/driver/charger/rt9490.c +++ b/driver/charger/rt9490.c @@ -635,6 +635,7 @@ const struct charger_drv rt9490_drv = { #endif }; +#ifdef CONFIG_USB_CHARGER /* BC1.2 */ static int rt9490_get_bc12_ilim(enum charge_supplier supplier) { @@ -790,6 +791,7 @@ struct bc12_config bc12_ports[CHARGE_PORT_COUNT] = { }, }; #endif /* CONFIG_BC12_SINGLE_DRIVER */ +#endif /* CONFIG_USB_CHARGER */ int rt9490_get_thermistor_val(const struct temp_sensor_t *sensor, int *temp_ptr) { diff --git a/driver/ppc/rt1739.c b/driver/ppc/rt1739.c index c660320b9b..e85f4f6202 100644 --- a/driver/ppc/rt1739.c +++ b/driver/ppc/rt1739.c @@ -316,6 +316,7 @@ static int rt1739_init(int port) return EC_SUCCESS; } +#ifdef CONFIG_USB_CHARGER static int rt1739_get_bc12_ilim(int charge_supplier) { switch (charge_supplier) { @@ -413,6 +414,7 @@ static void rt1739_usb_charger_task_event(const int port, uint32_t evt) rt1739_enable_bc12_detection(port, false); } } +#endif /* CONFIG_USB_CHARGER */ static atomic_t pending_events; @@ -434,8 +436,10 @@ void rt1739_deferred_interrupt(void) if (read_reg(port, RT1739_REG_INT_EVENT5, &event5)) continue; +#ifdef CONFIG_USB_CHARGER if (event5 & RT1739_BC12_SNK_DONE_INT) usb_charger_task_set_event(port, USB_CHG_EVENT_BC12); +#endif /* CONFIG_USB_CHARGER */ /* write to clear EVENT4 since FRS interrupt has been handled */ write_reg(port, RT1739_REG_INT_EVENT4, event4); @@ -476,6 +480,7 @@ const struct ppc_drv rt1739_ppc_drv = { .interrupt = &rt1739_interrupt, }; +#ifdef CONFIG_USB_CHARGER const struct bc12_drv rt1739_bc12_drv = { .usb_charger_task_init = rt1739_usb_charger_task_init, .usb_charger_task_event = rt1739_usb_charger_task_event, @@ -489,3 +494,4 @@ struct bc12_config bc12_ports[CHARGE_PORT_COUNT] = { }, }; #endif /* CONFIG_BC12_SINGLE_DRIVER */ +#endif /* CONFIG_USB_CHARGER */ |