diff options
| author | Mary Ruthven <mruthven@chromium.org> | 2021-11-12 16:15:50 -0600 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2021-11-18 04:56:16 +0000 |
| commit | 47beba227036943f5d5b929cb88cbf58d4479601 (patch) | |
| tree | 1f6396b939a9757111db0ed05a959a4a34f5d318 | |
| parent | c3c0903374335049d54947e2ef440e5b4068ccc5 (diff) | |
| download | chrome-ec-47beba227036943f5d5b929cb88cbf58d4479601.tar.gz | |
Revert "KBL/SKL: Add wait between DSW_PWROK and PWRBTN"
This reverts commit 627f3a8ac28751f549fbdb5266f8ccee417d339d.
BUG=b:200823466
TEST=make buildall -j
Change-Id: Id942eb041f8f28cc4fcf533d720a1c9ee79e92f4
Signed-off-by: Mary Ruthven <mruthven@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3285828
Reviewed-by: Vadim Sukhomlinov <sukhomlinov@chromium.org>
| -rw-r--r-- | common/power_button_x86.c | 10 | ||||
| -rw-r--r-- | include/config.h | 14 | ||||
| -rw-r--r-- | include/power_button.h | 8 |
3 files changed, 0 insertions, 32 deletions
diff --git a/common/power_button_x86.c b/common/power_button_x86.c index 270d1ee2a4..7a380a2f81 100644 --- a/common/power_button_x86.c +++ b/common/power_button_x86.c @@ -353,16 +353,6 @@ static void state_machine(uint64_t tnow) * battery is handled inside set_pwrbtn_to_pch(). */ chipset_exit_hard_off(); -#ifdef CONFIG_DELAY_DSW_PWROK_TO_PWRBTN - /* Check if power button is ready. If not, we'll come back. */ - if (get_time().val - get_time_dsw_pwrok() < - CONFIG_DSW_PWROK_TO_PWRBTN_US) { - tnext_state = get_time_dsw_pwrok() + - CONFIG_DSW_PWROK_TO_PWRBTN_US; - break; - } -#endif - set_pwrbtn_to_pch(0, 1); tnext_state = get_time().val + PWRBTN_INITIAL_US; pwrbtn_state = PWRBTN_STATE_BOOT_KB_RESET; diff --git a/include/config.h b/include/config.h index 86145babd6..620c484466 100644 --- a/include/config.h +++ b/include/config.h @@ -2686,20 +2686,6 @@ /* Timeout before power button task gives up starting system */ #define CONFIG_POWER_BUTTON_INIT_TIMEOUT 1 -/* - * Enable delay between DSW_PWROK and PWRBTN assertion. - * If enabled, DSW_PWROK_TO_PWRBTN_US and get_time_dsw_pwrok must be defined - * as well. - */ -#undef CONFIG_DELAY_DSW_PWROK_TO_PWRBTN - -/* - * The time in usec required for PMC to be ready to detect power button press. - * Refer to the timing diagram for G3 to S0 on PDG for details. - */ -#define CONFIG_DSW_PWROK_TO_PWRBTN_US (95 * MSEC) - - /* Compile common code for AP power state machine */ #undef CONFIG_POWER_COMMON diff --git a/include/power_button.h b/include/power_button.h index 23fd4b1bf4..fb213c6b08 100644 --- a/include/power_button.h +++ b/include/power_button.h @@ -54,12 +54,4 @@ void power_button_pch_release(void); */ void power_button_pch_pulse(void); -/** - * Returns the time when DSW_PWROK was asserted. It should be customized - * by each board. See CONFIG_DELAY_DSW_PWROK_TO_PWRBTN for details. - * - * @return time in usec when DSW_PWROK was asserted. - */ -int64_t get_time_dsw_pwrok(void); - #endif /* __CROS_EC_POWER_BUTTON_H */ |