summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/mainboard/google/auron/acpi/mainboard.asl9
-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
3 files changed, 9 insertions, 28 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>
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)
- }
- }
- }
-}