diff options
| author | Tom Rini <trini@konsulko.com> | 2020-07-17 08:04:48 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-07-17 08:04:48 -0400 |
| commit | 7c3cc6f106ed1ca13b0ff6eea9f8e1473240aef3 (patch) | |
| tree | 8c67a8ed3ab24b1421161960103d8614cbde659a /arch/x86/cpu/broadwell/power_state.c | |
| parent | 42e7659db0ac7089d3a2f80ee1c3b8eb64d84706 (diff) | |
| parent | d40d2c570600396b54dece16429727ef50cfeef0 (diff) | |
Merge https://gitlab.denx.de/u-boot/custodians/u-boot-x86
- New timer API to allow delays with a 32-bit microsecond timer
- Add dynamic ACPI structs (DSDT/SSDT) generations to the DM core
- x86: Enable ACPI table generation by default
- x86: Enable the copy framebuffer on Coral
- x86: A few fixes to FSP2 with ApolloLake
- x86: Drop setup_pcat_compatibility()
- x86: Primary-to-Sideband Bus minor fixes
Diffstat (limited to 'arch/x86/cpu/broadwell/power_state.c')
| -rw-r--r-- | arch/x86/cpu/broadwell/power_state.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/x86/cpu/broadwell/power_state.c b/arch/x86/cpu/broadwell/power_state.c index 99d6f72cf6..62fd2e8d2c 100644 --- a/arch/x86/cpu/broadwell/power_state.c +++ b/arch/x86/cpu/broadwell/power_state.c @@ -23,11 +23,10 @@ static int prev_sleep_state(struct chipset_power_state *ps) if (ps->pm1_sts & WAK_STS) { switch ((ps->pm1_cnt & SLP_TYP) >> SLP_TYP_SHIFT) { -#if CONFIG_HAVE_ACPI_RESUME case SLP_TYP_S3: - prev_sleep_state = SLEEP_STATE_S3; + if (IS_ENABLED(CONFIG_HAVE_ACPI_RESUME)) + prev_sleep_state = SLEEP_STATE_S3; break; -#endif case SLP_TYP_S5: prev_sleep_state = SLEEP_STATE_S5; break; |