diff options
| author | Zick Wei <zick.wei@quanta.corp-partner.google.com> | 2020-07-01 09:04:59 +0800 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2020-07-01 18:23:09 +0000 |
| commit | eccff54c3a6ae63f77fbc8544f770fae1f100715 (patch) | |
| tree | a02db102f2b8aed473061e91609621fd0e6deb87 /board/morphius | |
| parent | d02c309ae3c1d727c05d004aa62bdc702bef20f8 (diff) | |
| download | chrome-ec-eccff54c3a6ae63f77fbc8544f770fae1f100715.tar.gz | |
morphius: revert gpio S0_PWROK_OD
This patch revert gpio S0_PWROK_OD modified for schematic update.
BUG=b:160105564
BRANCH=none
TEST=DUT can power on normally.
Signed-off-by: Zick Wei <zick.wei@quanta.corp-partner.google.com>
Change-Id: I7bdf391bbf03d1d407e66e3101c0382c82f6f939
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2276120
Reviewed-by: Denis Brockus <dbrockus@chromium.org>
Commit-Queue: Denis Brockus <dbrockus@chromium.org>
Diffstat (limited to 'board/morphius')
| -rw-r--r-- | board/morphius/board.c | 19 | ||||
| -rw-r--r-- | board/morphius/board.h | 4 | ||||
| -rw-r--r-- | board/morphius/gpio.inc | 3 |
3 files changed, 4 insertions, 22 deletions
diff --git a/board/morphius/board.c b/board/morphius/board.c index fac4f5b795..5c44130733 100644 --- a/board/morphius/board.c +++ b/board/morphius/board.c @@ -586,7 +586,7 @@ void ps2_pwr_en_interrupt(enum gpio_signal signal) * Power signals */ -struct power_signal_info power_signal_list[] = { +const struct power_signal_info power_signal_list[] = { [X86_SLP_S3_N] = { .gpio = GPIO_PCH_SLP_S3_L, .flags = POWER_SIGNAL_ACTIVE_HIGH, @@ -598,7 +598,7 @@ struct power_signal_info power_signal_list[] = { .name = "SLP_S5_DEASSERTED", }, [X86_S0_PGOOD] = { - .gpio = GPIO_S0_PWROK_OD_V0, + .gpio = GPIO_S0_PGOOD, .flags = POWER_SIGNAL_ACTIVE_HIGH, .name = "S0_PGOOD", }, @@ -609,18 +609,3 @@ struct power_signal_info power_signal_list[] = { }, }; BUILD_ASSERT(ARRAY_SIZE(power_signal_list) == POWER_SIGNAL_COUNT); - -enum gpio_signal GPIO_S0_PGOOD = GPIO_S0_PWROK_OD_V0; - -void board_version_check(void) -{ - uint32_t board_ver = 0; - - cbi_get_board_version(&board_ver); - - if (board_ver == 3) { - power_signal_list[X86_S0_PGOOD].gpio = GPIO_S0_PWROK_OD_V1; - GPIO_S0_PGOOD = GPIO_S0_PWROK_OD_V1; - } -} -DECLARE_HOOK(HOOK_INIT, board_version_check, HOOK_PRIO_INIT_I2C); diff --git a/board/morphius/board.h b/board/morphius/board.h index 2b9bfcf70b..c176bb4775 100644 --- a/board/morphius/board.h +++ b/board/morphius/board.h @@ -47,7 +47,6 @@ #define CONFIG_LID_ANGLE_SENSOR_BASE BASE_ACCEL #define CONFIG_LID_ANGLE_SENSOR_LID LID_ACCEL -#define CONFIG_POWER_SIGNAL_RUNTIME_CONFIG /* GPIO mapping from board specific name to EC common name. */ #define CONFIG_BATTERY_PRESENT_GPIO GPIO_EC_BATT_PRES_ODL @@ -65,6 +64,7 @@ #define GPIO_PCH_SYS_PWROK GPIO_EC_FCH_PWROK #define GPIO_PCH_WAKE_L GPIO_EC_FCH_WAKE_L #define GPIO_POWER_BUTTON_L GPIO_EC_PWR_BTN_ODL +#define GPIO_S0_PGOOD GPIO_S0_PWROK_OD #define GPIO_S5_PGOOD GPIO_EC_PWROK_OD #define GPIO_SYS_RESET_L GPIO_EC_SYS_RST_L #define GPIO_VOLUME_DOWN_L GPIO_VOLDN_BTN_ODL @@ -77,8 +77,6 @@ #ifndef __ASSEMBLER__ -/* This GPIOs moved. Temporarily detect and support the V0 HW. */ -extern enum gpio_signal GPIO_S0_PGOOD; void ps2_pwr_en_interrupt(enum gpio_signal signal); diff --git a/board/morphius/gpio.inc b/board/morphius/gpio.inc index f8fb0d2c3d..12dd16ca02 100644 --- a/board/morphius/gpio.inc +++ b/board/morphius/gpio.inc @@ -16,8 +16,7 @@ GPIO_INT(USB_C0_BC12_INT_ODL, PIN(9, 3), GPIO_INT_FALLING | GPIO_PULL_UP, bc12_i GPIO_INT(USB_C1_BC12_INT_ODL, PIN(A, 4), GPIO_INT_FALLING | GPIO_PULL_UP, bc12_interrupt) GPIO_INT(SLP_S3_L, PIN(7, 4), GPIO_INT_BOTH, power_signal_interrupt) GPIO_INT(SLP_S5_L, PIN(E, 0), GPIO_INT_BOTH, power_signal_interrupt) -GPIO_INT(S0_PWROK_OD_V0, PIN(5, 6), GPIO_INT_BOTH, power_signal_interrupt) -GPIO_INT(S0_PWROK_OD_V1, PIN(B, 1), GPIO_INT_BOTH, power_signal_interrupt) +GPIO_INT(S0_PWROK_OD, PIN(5, 6), GPIO_INT_BOTH, power_signal_interrupt) GPIO_INT(EC_PWROK_OD, PIN(3, 7), GPIO_INT_BOTH, power_signal_interrupt) GPIO_INT(EC_PWR_BTN_ODL, PIN(0, 1), GPIO_INT_BOTH, power_button_interrupt) GPIO_INT(LID_OPEN, PIN(D, 2), GPIO_INT_BOTH | GPIO_HIB_WAKE_HIGH, lid_interrupt) |