summaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
authorMary Ruthven <mruthven@chromium.org>2021-11-12 16:15:50 -0600
committerCommit Bot <commit-bot@chromium.org>2021-11-18 04:56:16 +0000
commit47beba227036943f5d5b929cb88cbf58d4479601 (patch)
tree1f6396b939a9757111db0ed05a959a4a34f5d318 /common
parentc3c0903374335049d54947e2ef440e5b4068ccc5 (diff)
downloadchrome-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>
Diffstat (limited to 'common')
-rw-r--r--common/power_button_x86.c10
1 files changed, 0 insertions, 10 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;