Matt DeVillier has uploaded this change for review.
google/buddy: fix Windows ACPI error with WLAN
Buddy's WLAN ACPI code was equivalent to, but formatted
differently from the other auron variants. Since only
differnce is root port used, have buddy use common
WLAN ACPI and use preprocessor guards to set the root
port correctly.
Test: build/boot Buddy, verify Windows 10 boots
without ACPI BIOS ERROR.
Change-Id: I78d994f2bb3981d4d10cb534cd6e0ae673f73527
Signed-off-by: Matt DeVillier <matt.devillier@gmail.com>
---
M src/mainboard/google/auron/acpi/mainboard.asl
M src/mainboard/google/auron/variants/buddy/include/variant/acpi/mainboard.asl
2 files changed, 4 insertions(+), 26 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/23/30523/1
diff --git a/src/mainboard/google/auron/acpi/mainboard.asl b/src/mainboard/google/auron/acpi/mainboard.asl
index 204c1c4..b473362 100644
--- a/src/mainboard/google/auron/acpi/mainboard.asl
+++ b/src/mainboard/google/auron/acpi/mainboard.asl
@@ -16,8 +16,11 @@
#include <variant/onboard.h>
-#if !IS_ENABLED(CONFIG_BOARD_GOOGLE_BUDDY)
+#if IS_ENABLED(CONFIG_BOARD_GOOGLE_BUDDY)
+Scope (\_SB.PCI0.RP02)
+#else
Scope (\_SB.PCI0.RP01)
+#endif
{
Device (WLAN)
{
@@ -35,7 +38,6 @@
}
}
}
-#endif
#include <variant/acpi/mainboard.asl>
diff --git a/src/mainboard/google/auron/variants/buddy/include/variant/acpi/mainboard.asl b/src/mainboard/google/auron/variants/buddy/include/variant/acpi/mainboard.asl
index 788fbdc..e9fd212 100644
--- a/src/mainboard/google/auron/variants/buddy/include/variant/acpi/mainboard.asl
+++ b/src/mainboard/google/auron/variants/buddy/include/variant/acpi/mainboard.asl
@@ -117,27 +117,3 @@
}
}
}
-
-/*
- * WLAN connected to Root Port 4, becomes Root Port 2 after coalesce
- */
-Scope (\_SB.PCI0.RP02)
-{
- Device (WLAN)
- {
- Name (_ADR, 0x00000000)
-
- /* GPIO10 is WLAN_WAKE_L_Q */
- Name (GPIO, BOARD_WLAN_WAKE_GPIO)
-
- Name (_PRW, Package() { GPIO, 3 })
-
- Method (_DSW, 3, NotSerialized)
- {
- If (LEqual (Arg0, 1)) {
- // Enable GPIO as wake source
- \_SB.PCI0.LPCB.GPIO.GWAK (^GPIO)
- }
- }
- }
-}
To view, visit change 30523. To unsubscribe, or for help writing mail filters, visit settings.