diff options
| author | Sue Chen <sue.chen@quanta.corp-partner.google.com> | 2021-11-02 16:09:27 +0800 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2021-11-24 20:07:40 +0000 |
| commit | 17c9d24d8f95dacd1b684c50466ca2996f7bd9e4 (patch) | |
| tree | b6e210433c9015b9b89f1313c8d16539b7cb47a5 | |
| parent | a12a18e368a28d4cd62e86221404cb4fa55f2d1d (diff) | |
| download | chrome-ec-17c9d24d8f95dacd1b684c50466ca2996f7bd9e4.tar.gz | |
Scout: Add EN_LOAD_SWITCH in S0 rail
Clear ADC alternate pin GPIO42 (ADC3).
Set EN_LOAD_SWITCH (GPIO42) high in S0, set it low when
leave S0.
BUG=b:204384355
BRANCH=puff
TEST=EN_LOAD_SWITCH status is correct in every state.
Signed-off-by: Sue Chen <sue.chen@quanta.corp-partner.google.com>
Change-Id: I5c4414ceaff97cdd3f5ddf14fd578cac66fae192
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3261188
Reviewed-by: Joe Tessler <jrt@chromium.org>
Reviewed-by: Jack Rosenthal <jrosenth@chromium.org>
(cherry picked from commit 9548d4102490b0a80d597499b7f4f3c2f4a3577d)
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3299812
Commit-Queue: Joe Tessler <jrt@chromium.org>
| -rw-r--r-- | board/scout/board.c | 2 | ||||
| -rw-r--r-- | board/scout/gpio.inc | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/board/scout/board.c b/board/scout/board.c index ad2131aa91..2c387afe6e 100644 --- a/board/scout/board.c +++ b/board/scout/board.c @@ -511,6 +511,8 @@ void board_enable_s0_rails(int enable) gpio_set_level(GPIO_EC_CAM_V3P3_EN, enable); gpio_set_level(GPIO_PP3300_TPU_A_EN, enable); + + gpio_set_level(GPIO_EN_LOAD_SWITCH, enable); } int ec_config_get_usb4_present(void) diff --git a/board/scout/gpio.inc b/board/scout/gpio.inc index 583e4159bd..d0e32892a9 100644 --- a/board/scout/gpio.inc +++ b/board/scout/gpio.inc @@ -87,6 +87,7 @@ GPIO(EC_MX8M_ONOFF, PIN(9, 3), GPIO_OUT_LOW) GPIO(EC_SCALER_EN, PIN(E, 0), GPIO_OUT_LOW) GPIO(PP3300_TPU_A_EN, PIN(B, 0), GPIO_OUT_LOW) GPIO(PWR_CTRL, PIN(6, 2), GPIO_OUT_LOW) +GPIO(EN_LOAD_SWITCH, PIN(4, 2), GPIO_OUT_LOW) /* Barreljack */ GPIO(EN_PPVAR_BJ_ADP_L, PIN(0, 4), GPIO_OUT_LOW) @@ -143,7 +144,7 @@ ALTERNATE(PIN_MASK(B, 0x80), 0, MODULE_PWM, 0) /* PWM5 - Fan 1 ALTERNATE(PIN_MASK(7, 0x08), 0, MODULE_PWM, 0) /* TA2 - Fan Tachometer */ /* ADC */ -ALTERNATE(PIN_MASK(4, 0x3E), 0, MODULE_ADC, 0) /* ADC0, ADC1, ADC2, ADC4 */ +ALTERNATE(PIN_MASK(4, 0x3A), 0, MODULE_ADC, 0) /* ADC0, ADC1, ADC2, ADC4 */ ALTERNATE(PIN_MASK(E, 0x02), 0, MODULE_ADC, 0) /* ADC7 */ ALTERNATE(PIN_MASK(F, 0x01), 0, MODULE_ADC, 0) /* ADC9 */ @@ -154,7 +155,6 @@ ALTERNATE(PIN_MASK(6, 0x30), 0, MODULE_UART, 0) /* UART from EC UNUSED(PIN(1, 3)) /* EC_GP_SEL1_ODL */ UNUSED(PIN(C, 0)) /* FAN_PWM_2 */ UNUSED(PIN(8, 0)) /* LED_BLUE_L */ -UNUSED(PIN(4, 2)) /* ADC3/TEMP_SENSOR_3 */ UNUSED(PIN(C, 2)) /* A12 NC */ UNUSED(PIN(1, 2)) /* C6 NC */ UNUSED(PIN(6, 6)) /* H4 NC */ |