diff options
| author | Ayushee <ayushee.shah@intel.com> | 2020-11-06 09:54:17 -0800 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2020-11-07 02:24:59 +0000 |
| commit | 9718b5117d7cce903b56bf9c16aafbaafa5d1d32 (patch) | |
| tree | 0c1b9ae3268cce6caf1c6d79198bb8caa6eadbc4 | |
| parent | 1e7b9ef24e81233ba99c55e435d268cb6be33dbd (diff) | |
| download | chrome-ec-9718b5117d7cce903b56bf9c16aafbaafa5d1d32.tar.gz | |
Intelrvp:Supports boards without DC jack
This commit checks if the dedicated port count is greater than 0 for
the charger specific files while keeping the code common for both DC
jack supported and non DC jack supported boards.
BUG=b:172642304
BRANCH=None
TEST=make buildall -j
Signed-off-by: Ayushee <ayushee.shah@intel.com>
Change-Id: I138d33802c2df586963e244f18b787ccce60b8f8
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2523294
Reviewed-by: Keith Short <keithshort@chromium.org>
| -rw-r--r-- | baseboard/intelrvp/chg_usb_pd.c | 16 | ||||
| -rw-r--r-- | baseboard/intelrvp/chg_usb_pd_mecc_0_9.c | 2 | ||||
| -rw-r--r-- | baseboard/intelrvp/usb_pd_policy_mecc_1_0.c | 4 |
3 files changed, 21 insertions, 1 deletions
diff --git a/baseboard/intelrvp/chg_usb_pd.c b/baseboard/intelrvp/chg_usb_pd.c index c7e0650d5d..fd3f3c9596 100644 --- a/baseboard/intelrvp/chg_usb_pd.c +++ b/baseboard/intelrvp/chg_usb_pd.c @@ -15,14 +15,23 @@ bool is_typec_port(int port) { +#if CONFIG_DEDICATED_CHARGE_PORT_COUNT > 0 return !(port == DEDICATED_CHARGE_PORT || port == CHARGE_PORT_NONE); +#else + return !(port == CHARGE_PORT_NONE); +#endif /* CONFIG_DEDICATED_CHARGE_PORT_COUNT > 0 */ } static inline int board_dc_jack_present(void) { +#if CONFIG_DEDICATED_CHARGE_PORT_COUNT > 0 return gpio_get_level(GPIO_DC_JACK_PRESENT); +#else + return 0; +#endif } +#if CONFIG_DEDICATED_CHARGE_PORT_COUNT > 0 static void board_dc_jack_handle(void) { struct charge_port_info charge_dc_jack; @@ -40,10 +49,13 @@ static void board_dc_jack_handle(void) charge_manager_update_charge(CHARGE_SUPPLIER_DEDICATED, DEDICATED_CHARGE_PORT, &charge_dc_jack); } +#endif void board_dc_jack_interrupt(enum gpio_signal signal) { +#if CONFIG_DEDICATED_CHARGE_PORT_COUNT > 0 board_dc_jack_handle(); +#endif } static void board_charge_init(void) @@ -61,7 +73,9 @@ static void board_charge_init(void) &charge_init); } +#if CONFIG_DEDICATED_CHARGE_PORT_COUNT > 0 board_dc_jack_handle(); +#endif /* CONFIG_DEDICATED_CHARGE_PORT_COUNT > 0 */ } DECLARE_HOOK(HOOK_INIT, board_charge_init, HOOK_PRIO_DEFAULT); @@ -79,6 +93,7 @@ int board_set_active_charge_port(int port) return EC_ERROR_INVAL; } +#if CONFIG_DEDICATED_CHARGE_PORT_COUNT > 0 /* * Do not enable Type-C port if the DC Jack is present. * When the Type-C is active port, hardware circuit will @@ -88,6 +103,7 @@ int board_set_active_charge_port(int port) CPRINTS("DC Jack present, Skip enable p%d", port); return EC_ERROR_INVAL; } +#endif /* CONFIG_DEDICATED_CHARGE_PORT_COUNT */ /* Make sure non-charging ports are disabled */ for (i = 0; i < CONFIG_USB_PD_PORT_MAX_COUNT; i++) { diff --git a/baseboard/intelrvp/chg_usb_pd_mecc_0_9.c b/baseboard/intelrvp/chg_usb_pd_mecc_0_9.c index aafc6eeb44..650fabfedc 100644 --- a/baseboard/intelrvp/chg_usb_pd_mecc_0_9.c +++ b/baseboard/intelrvp/chg_usb_pd_mecc_0_9.c @@ -60,8 +60,10 @@ int pd_snk_is_vbus_provided(int port) { int vbus_intr; +#if CONFIG_DEDICATED_CHARGE_PORT_COUNT > 0 if (port == DEDICATED_CHARGE_PORT) return 1; +#endif vbus_intr = gpio_get_level(tcpc_gpios[port].vbus.pin); diff --git a/baseboard/intelrvp/usb_pd_policy_mecc_1_0.c b/baseboard/intelrvp/usb_pd_policy_mecc_1_0.c index cdad0d3ca8..7df0d56a3e 100644 --- a/baseboard/intelrvp/usb_pd_policy_mecc_1_0.c +++ b/baseboard/intelrvp/usb_pd_policy_mecc_1_0.c @@ -76,5 +76,7 @@ int pd_snk_is_vbus_provided(int port) int board_vbus_source_enabled(int port) { - return (port != DEDICATED_CHARGE_PORT && ppc_is_sourcing_vbus(port)); + if (is_typec_port(port)) + return ppc_is_sourcing_vbus(port); + return 0; } |