summaryrefslogtreecommitdiff
path: root/src/mainboard/google/auron/variants
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/variants
parenta2c219a91d41463bf8830b321ee461806f9698da (diff)
downloadcoreboot-a82f991122b199bcdaf51eb93dcdcd81825de2bf.tar.xz
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/variants')
-rw-r--r--src/mainboard/google/auron/variants/buddy/devicetree.cb4
-rw-r--r--src/mainboard/google/auron/variants/buddy/include/variant/acpi/mainboard.asl24
2 files changed, 2 insertions, 26 deletions
diff --git a/src/mainboard/google/auron/variants/buddy/devicetree.cb b/src/mainboard/google/auron/variants/buddy/devicetree.cb
index e6627949b5..f75da84eee 100644
--- a/src/mainboard/google/auron/variants/buddy/devicetree.cb
+++ b/src/mainboard/google/auron/variants/buddy/devicetree.cb
@@ -90,8 +90,8 @@ chip soc/intel/broadwell
device pci 1b.0 off end # High Definition Audio
device pci 1c.0 off end # PCIe Port #1
device pci 1c.1 off end # PCIe Port #2
- device pci 1c.2 on end # PCIe Port #3
- device pci 1c.3 on end # PCIe Port #4
+ device pci 1c.2 on end # PCIe Port #3 - LAN (becomes RP1)
+ device pci 1c.3 on end # PCIe Port #4 - WLAN (becomes RP2)
device pci 1c.4 on end # PCIe Port #5
device pci 1c.5 off end # PCIe Port #6
device pci 1d.0 on end # USB2 EHCI
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 788fbdc61e..e9fd212e8d 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 @@ Scope (\_SB.PCI0.RP01)
}
}
}
-
-/*
- * 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)
- }
- }
- }
-}