From db20a08b654ad15715926857dd9c4d52eef0ac45 Mon Sep 17 00:00:00 2001 From: Matt DeVillier Date: Tue, 4 Jul 2017 17:10:37 -0500 Subject: mb/google/cyan: Guard I2C devices as wake sources with CONFIG_CHROMEOS MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The use of a separate _PRW is not necessary when the _CRS interrupt already has the Wake flag set (as these all do). Additionally, Windows does not allow the use of a gpioint for the _PRW source, which results in an ACPI_BIOS_ERROR BSOD. Since ChromeOS builds for CYAN devices use an older kernel and may not make use of _CRS interrupt Wake flag, keep the _PRW around when CONFIG_CHROMEOS is selected. TEST=build/boot Win11 on google/{cyan,edgar} Change-Id: I7d0883e4de9572a14c8bad0ac086370bd00eeb1a Signed-off-by: Matt DeVillier Reviewed-on: https://review.coreboot.org/c/coreboot/+/76798 Reviewed-by: CoolStar Tested-by: build bot (Jenkins) Reviewed-by: Kyösti Mälkki --- src/mainboard/google/cyan/acpi/touchscreen_elan.asl | 4 ++-- src/mainboard/google/cyan/acpi/touchscreen_melfas.asl | 4 ++-- src/mainboard/google/cyan/acpi/touchscreen_synaptics.asl | 4 ++-- src/mainboard/google/cyan/acpi/trackpad_atmel.asl | 3 ++- src/mainboard/google/cyan/acpi/trackpad_elan.asl | 4 ++-- 5 files changed, 10 insertions(+), 9 deletions(-) (limited to 'src') diff --git a/src/mainboard/google/cyan/acpi/touchscreen_elan.asl b/src/mainboard/google/cyan/acpi/touchscreen_elan.asl index 14e5135425..312c1a800d 100644 --- a/src/mainboard/google/cyan/acpi/touchscreen_elan.asl +++ b/src/mainboard/google/cyan/acpi/touchscreen_elan.asl @@ -35,9 +35,9 @@ Scope (\_SB.PCI0.I2C1) Return (0x0) } } - +#if CONFIG(CHROMEOS) Name (_PRW, Package() { BOARD_TOUCHSCREEN_WAKE_GPIO, 0x3 }) - +#endif /* Allow device to power off in S0 */ Name (_S0W, 4) } diff --git a/src/mainboard/google/cyan/acpi/touchscreen_melfas.asl b/src/mainboard/google/cyan/acpi/touchscreen_melfas.asl index 6fc1e107d4..4aa39961b5 100644 --- a/src/mainboard/google/cyan/acpi/touchscreen_melfas.asl +++ b/src/mainboard/google/cyan/acpi/touchscreen_melfas.asl @@ -34,9 +34,9 @@ Scope (\_SB.PCI0.I2C1) Return (0x0) } } - +#if CONFIG(CHROMEOS) Name (_PRW, Package() { BOARD_TOUCHSCREEN_WAKE_GPIO, 0x3 }) - +#endif /* Allow device to power off in S0 */ Name (_S0W, 4) } diff --git a/src/mainboard/google/cyan/acpi/touchscreen_synaptics.asl b/src/mainboard/google/cyan/acpi/touchscreen_synaptics.asl index 02b4db3e9d..aa1446a3e6 100644 --- a/src/mainboard/google/cyan/acpi/touchscreen_synaptics.asl +++ b/src/mainboard/google/cyan/acpi/touchscreen_synaptics.asl @@ -76,9 +76,9 @@ Scope (\_SB.PCI0.I2C1) Return (0x0) } } - +#if CONFIG(CHROMEOS) Name (_PRW, Package() { BOARD_TOUCHSCREEN_WAKE_GPIO, 0x3 }) - +#endif /* Allow device to power off in S0 */ Name (_S0W, 4) } diff --git a/src/mainboard/google/cyan/acpi/trackpad_atmel.asl b/src/mainboard/google/cyan/acpi/trackpad_atmel.asl index 43180a2bea..cc0ecd45f0 100644 --- a/src/mainboard/google/cyan/acpi/trackpad_atmel.asl +++ b/src/mainboard/google/cyan/acpi/trackpad_atmel.asl @@ -8,8 +8,9 @@ Scope (\_SB.PCI0.I2C6) Name (_DDN, "Atmel Touchpad") Name (_UID, 2) Name (ISTP, 1) /* Touchpad */ +#if CONFIG(CHROMEOS) Name (_PRW, Package() { BOARD_TRACKPAD_WAKE_GPIO, 0x3 }) - +#endif Name (_CRS, ResourceTemplate() { I2cSerialBus ( diff --git a/src/mainboard/google/cyan/acpi/trackpad_elan.asl b/src/mainboard/google/cyan/acpi/trackpad_elan.asl index 93cda3477f..b767c372be 100644 --- a/src/mainboard/google/cyan/acpi/trackpad_elan.asl +++ b/src/mainboard/google/cyan/acpi/trackpad_elan.asl @@ -30,9 +30,9 @@ Scope (\_SB.PCI0.I2C6) Return (0x0) } } - +#if CONFIG(CHROMEOS) Name (_PRW, Package() { BOARD_TRACKPAD_WAKE_GPIO, 0x3 }) - +#endif /* Allow device to power off in S0 */ Name (_S0W, 4) } -- cgit v1.2.3