From a82f991122b199bcdaf51eb93dcdcd81825de2bf Mon Sep 17 00:00:00 2001
From: Matt DeVillier <matt.devillier@gmail.com>
Date: Sat, 29 Dec 2018 21:43:11 -0600
Subject: 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>
---
 src/mainboard/google/auron/acpi/mainboard.asl | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'src/mainboard/google/auron/acpi')

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>
 
-- 
cgit v1.2.3