diff options
| author | Scott Chao <scott_chao@wistron.corp-partner.google.com> | 2021-06-04 10:25:31 +0800 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2021-06-08 08:16:15 +0000 |
| commit | 7d4847ecb12ff8397a197bbc991ddb7e2ddc450d (patch) | |
| tree | 14abecb3f52655b9c4655308cf98c25852ea369d /board/primus | |
| parent | 4fd95d12acb443065832b5eb91d82538d59a7730 (diff) | |
| download | chrome-ec-7d4847ecb12ff8397a197bbc991ddb7e2ddc450d.tar.gz | |
primus: remove checking board_id
Primus don't follow brya board_id, so remove it.
BUG=b:188272162
BRANCH=None
TEST=make -j BOARD=primus
Signed-off-by: Scott Chao <scott_chao@wistron.corp-partner.google.com>
Change-Id: I217bab1439d912100d78943fcdcf3a2f6970edd5
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2939170
Reviewed-by: Boris Mittelberg <bmbm@google.com>
Diffstat (limited to 'board/primus')
| -rw-r--r-- | board/primus/board.c | 50 | ||||
| -rw-r--r-- | board/primus/usbc_config.c | 5 |
2 files changed, 2 insertions, 53 deletions
diff --git a/board/primus/board.c b/board/primus/board.c index eaac2ad278..56c874dfd6 100644 --- a/board/primus/board.c +++ b/board/primus/board.c @@ -105,56 +105,8 @@ enum battery_present battery_hw_present(void) { enum gpio_signal batt_pres; - if (get_board_id() == 1) - batt_pres = GPIO_ID_1_EC_BATT_PRES_ODL; - else - batt_pres = GPIO_EC_BATT_PRES_ODL; + batt_pres = GPIO_EC_BATT_PRES_ODL; /* The GPIO is low when the battery is physically present */ return gpio_get_level(batt_pres) ? BP_NO : BP_YES; } - -/* - * Explicitly apply the board ID 1 *gpio.inc settings to pins that - * were reassigned on current boards. - */ - -static void set_board_id_1_gpios(void) -{ - if (get_board_id() != 1) - return; - - gpio_set_flags(GPIO_ID_1_EC_KB_BL_EN, GPIO_OUT_LOW); -} -DECLARE_HOOK(HOOK_INIT, set_board_id_1_gpios, HOOK_PRIO_FIRST); - -/* - * Reclaim GPIO pins on board ID 1 that are used as ADC inputs on - * current boards. ALT function group MODULE_ADC pins are set in - * HOOK_PRIO_INIT_ADC and can be reclaimed right after the hook runs. - */ - -static void board_id_1_reclaim_adc(void) -{ - if (get_board_id() != 1) - return; - - /* - * GPIO_ID_1_USB_C0_C2_TCPC_RST_ODL is on GPIO34 - * - * The TCPC has already been reset by board_tcpc_init() executed - * from HOOK_PRIO_INIT_CHIPSET. Later, the pin gets set to ADC6 - * in HOOK_PRIO_INIT_ADC, so we simply need to set the pin back - * to GPIO34. - */ - gpio_set_flags(GPIO_ID_1_USB_C0_C2_TCPC_RST_ODL, GPIO_ODR_HIGH); - gpio_set_alternate_function(GPIO_PORT_3, BIT(4), GPIO_ALT_FUNC_NONE); - - /* - * The pin gets set to ADC7 in HOOK_PRIO_INIT_ADC, so we simply - * need to set it back to GPIOE1. - */ - gpio_set_flags(GPIO_ID_1_EC_BATT_PRES_ODL, GPIO_INPUT); - gpio_set_alternate_function(GPIO_PORT_E, BIT(1), GPIO_ALT_FUNC_NONE); -} -DECLARE_HOOK(HOOK_INIT, board_id_1_reclaim_adc, HOOK_PRIO_INIT_ADC + 1); diff --git a/board/primus/usbc_config.c b/board/primus/usbc_config.c index d4759b402e..5fa69121db 100644 --- a/board/primus/usbc_config.c +++ b/board/primus/usbc_config.c @@ -230,10 +230,7 @@ void board_reset_pd_mcu(void) { enum gpio_signal tcpc_rst; - if (get_board_id() == 1) - tcpc_rst = GPIO_ID_1_USB_C0_C2_TCPC_RST_ODL; - else - tcpc_rst = GPIO_USB_C0_C2_TCPC_RST_ODL; + tcpc_rst = GPIO_USB_C0_C2_TCPC_RST_ODL; /* * TODO(b/179648104): figure out correct timing |