diff options
| author | Sam McNally <sammc@chromium.org> | 2023-02-13 20:31:16 +1100 |
|---|---|---|
| committer | Chromeos LUCI <chromeos-scoped@luci-project-accounts.iam.gserviceaccount.com> | 2023-02-23 00:26:07 +0000 |
| commit | de73d647e61fc7cd7e470d6f1af137c8d294620a (patch) | |
| tree | b6a8b07a1d61392826b7ab60df04adf5b6c549e5 | |
| parent | 251a4a31e51688a565215f07297232dc54b4ae4d (diff) | |
| download | chrome-ec-de73d647e61fc7cd7e470d6f1af137c8d294620a.tar.gz | |
dibbi: Always enable EN_PP5000.
BUG=b:269050050
TEST=Boot to OS on USB-C power
BRANCH=none
Change-Id: If2334dc5408fd0f86c7ae2880168e3653dfa22bc
Signed-off-by: Sam McNally <sammc@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/4240913
Reviewed-by: Peter Marheine <pmarheine@chromium.org>
| -rw-r--r-- | board/dibbi/board.c | 11 | ||||
| -rw-r--r-- | board/dibbi/gpio.inc | 2 |
2 files changed, 2 insertions, 11 deletions
diff --git a/board/dibbi/board.c b/board/dibbi/board.c index ed3b16b554..86830d5aa5 100644 --- a/board/dibbi/board.c +++ b/board/dibbi/board.c @@ -156,17 +156,10 @@ BUILD_ASSERT(ARRAY_SIZE(temp_sensors) == TEMP_SENSOR_COUNT); void board_init(void) { - int on; - gpio_enable_interrupt(GPIO_BJ_ADP_PRESENT); /* Enable PPC interrupt */ gpio_enable_interrupt(GPIO_USB_C0_FAULT_L); - - /* Turn on 5V if the system is on, otherwise turn it off */ - on = chipset_in_state(CHIPSET_STATE_ON | CHIPSET_STATE_ANY_SUSPEND | - CHIPSET_STATE_SOFT_OFF); - board_power_5v_enable(on); } DECLARE_HOOK(HOOK_INIT, board_init, HOOK_PRIO_DEFAULT); @@ -180,10 +173,8 @@ void board_reset_pd_mcu(void) __override void board_power_5v_enable(int enable) { /* - * Mainboard 5V regulator activated by GPIO. - * USB-A ports are activated by usb_port_power_dumb. + * Nothing to do. 5V should always be enabled while in Z1 or above. */ - gpio_set_level(GPIO_EN_PP5000, !!enable); } void board_set_charge_limit(int port, int supplier, int charge_ma, int max_ma, diff --git a/board/dibbi/gpio.inc b/board/dibbi/gpio.inc index b6af667715..992b015be6 100644 --- a/board/dibbi/gpio.inc +++ b/board/dibbi/gpio.inc @@ -48,7 +48,7 @@ GPIO(EC_AP_WAKE_ODL, PIN(D, 5), GPIO_ODR_HIGH) GPIO(SYS_RST_ODL, PIN(D, 1), GPIO_ODR_HIGH) GPIO(EC_AP_SYS_PWROK, PIN(F, 2), GPIO_OUT_LOW) GPIO(PG_PP5000_U_OD, PIN(J, 0), GPIO_INPUT) -GPIO(EN_PP5000_U, PIN(K, 5), GPIO_OUT_LOW) +GPIO(EN_PP5000_U, PIN(K, 5), GPIO_OUT_HIGH) GPIO(PG_PP3300_A, PIN(B, 5), GPIO_INPUT) GPIO(EN_PP3300_A, PIN(C, 5), GPIO_OUT_LOW) GPIO(EC_AP_PCH_PWROK_OD, PIN(D, 6), GPIO_ODR_LOW) |