google/eve: Fix keyboard backlight enable in wake from G3

The WAK_STS bit is not set in a wake from G3, so the check for this
bit needs to only be done when checking for a wake from S3.

This change correctly enables the keyboard backlight in wake from G3
and only does not enable it during a wake from S3.

BUG=chrome-os-partner:58666
TEST=Use Refresh+Power to issue hard reset and ensure that the keyboard
backlight turns on like it does when waking from S5.  Also force enter
hibernate with Alt+VolumeUp+H and then power back up and ensure that
the keyboard backlight is enabled when booting.

Change-Id: I44045950e38aa5e5ae96a79385d604791852c7e6
Signed-off-by: Duncan Laurie <dlaurie@chromium.org>
Reviewed-on: https://review.coreboot.org/18280
Tested-by: build bot (Jenkins)
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
This commit is contained in:
Duncan Laurie 2017-01-31 15:10:10 -08:00
parent 75e5cb7a74
commit 649100ad20
1 changed files with 1 additions and 1 deletions

View File

@ -34,7 +34,7 @@ void bootblock_mainboard_init(void)
uint32_t pm1_sts = inl(ACPI_BASE_ADDRESS + PM1_STS); uint32_t pm1_sts = inl(ACPI_BASE_ADDRESS + PM1_STS);
/* Turn on keyboard backlight to indicate we are booting */ /* Turn on keyboard backlight to indicate we are booting */
if ((pm1_sts & WAK_STS) && (acpi_sleep_from_pm1(pm1_cnt) != ACPI_S3)) if (!((pm1_sts & WAK_STS) && (acpi_sleep_from_pm1(pm1_cnt) == ACPI_S3)))
google_chromeec_kbbacklight(75); google_chromeec_kbbacklight(75);
early_config_gpio(); early_config_gpio();