summaryrefslogtreecommitdiff
path: root/src/mainboard/google
diff options
context:
space:
mode:
authorDuncan Laurie <dlaurie@chromium.org>2017-01-31 15:10:10 -0800
committerDuncan Laurie <dlaurie@chromium.org>2017-02-05 22:01:50 +0100
commit649100ad202f681632c6c1a949cb65cbe3fca482 (patch)
tree4f551031eec147d016cd934d0a820364a96d0e1b /src/mainboard/google
parent75e5cb7a74b037ba725480191c683cd8e5fab662 (diff)
downloadcoreboot-649100ad202f681632c6c1a949cb65cbe3fca482.tar.xz
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>
Diffstat (limited to 'src/mainboard/google')
-rw-r--r--src/mainboard/google/eve/bootblock.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mainboard/google/eve/bootblock.c b/src/mainboard/google/eve/bootblock.c
index baca9c895c..872825f408 100644
--- a/src/mainboard/google/eve/bootblock.c
+++ b/src/mainboard/google/eve/bootblock.c
@@ -34,7 +34,7 @@ void bootblock_mainboard_init(void)
uint32_t pm1_sts = inl(ACPI_BASE_ADDRESS + PM1_STS);
/* 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);
early_config_gpio();