aboutsummaryrefslogtreecommitdiff
path: root/src/mainboard/google/auron/acpi
diff options
context:
space:
mode:
authorMatt DeVillier <matt.devillier@gmail.com>2018-12-29 21:43:11 -0600
committerMatt DeVillier <matt.devillier@gmail.com>2019-06-02 22:26:14 +0000
commita82f991122b199bcdaf51eb93dcdcd81825de2bf (patch)
treea6a11f4ff23f6c5db8d8c6e559361b79d49f3481 /src/mainboard/google/auron/acpi
parenta2c219a91d41463bf8830b321ee461806f9698da (diff)
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> Reviewed-on: https://review.coreboot.org/c/coreboot/+/30523 Reviewed-by: Arthur Heymans <arthur@aheymans.xyz> Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Diffstat (limited to 'src/mainboard/google/auron/acpi')
-rw-r--r--src/mainboard/google/auron/acpi/mainboard.asl9
1 files changed, 7 insertions, 2 deletions
diff --git a/src/mainboard/google/auron/acpi/mainboard.asl b/src/mainboard/google/auron/acpi/mainboard.asl
index a07ce3e7be..cd6a830564 100644
--- a/src/mainboard/google/auron/acpi/mainboard.asl
+++ b/src/mainboard/google/auron/acpi/mainboard.asl
@@ -16,8 +16,14 @@
#include <variant/onboard.h>
-#if !CONFIG(BOARD_GOOGLE_BUDDY)
+/*
+ * WLAN on Buddy connected to RP4, becomes RP2 after coalesce
+ */
+#if CONFIG(BOARD_GOOGLE_BUDDY)
+Scope (\_SB.PCI0.RP02)
+#else
Scope (\_SB.PCI0.RP01)
+#endif
{
Device (WLAN)
{
@@ -35,7 +41,6 @@ Scope (\_SB.PCI0.RP01)
}
}
}
-#endif
#include <variant/acpi/mainboard.asl>