summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/mainboard/google/beltino/acpi/mainboard.asl4
-rw-r--r--src/mainboard/google/slippy/variants/falco/include/variant/acpi/mainboard.asl2
-rw-r--r--src/mainboard/google/slippy/variants/leon/include/variant/acpi/mainboard.asl2
-rw-r--r--src/mainboard/google/slippy/variants/peppy/include/variant/acpi/mainboard.asl6
-rw-r--r--src/mainboard/google/slippy/variants/wolf/include/variant/acpi/mainboard.asl2
-rw-r--r--src/southbridge/intel/lynxpoint/acpi/gpio.asl3
-rw-r--r--src/southbridge/intel/lynxpoint/acpi/lpc.asl3
-rw-r--r--src/southbridge/intel/lynxpoint/acpi/pch.asl1
8 files changed, 11 insertions, 12 deletions
diff --git a/src/mainboard/google/beltino/acpi/mainboard.asl b/src/mainboard/google/beltino/acpi/mainboard.asl
index 10696ff9fc..f6adb63ca5 100644
--- a/src/mainboard/google/beltino/acpi/mainboard.asl
+++ b/src/mainboard/google/beltino/acpi/mainboard.asl
@@ -18,7 +18,7 @@ Scope (\_SB.PCI0.RP01)
If (Arg0 == 1) {
// Enable GPIO as wake source
- \_SB.PCI0.LPCB.GWAK (Local0)
+ \_SB.PCI0.LPCB.GPIO.GWAK (Local0)
}
}
}
@@ -40,7 +40,7 @@ Scope (\_SB.PCI0.RP02)
If (Arg0 == 1) {
// Enable GPIO as wake source
- \_SB.PCI0.LPCB.GWAK (Local0)
+ \_SB.PCI0.LPCB.GPIO.GWAK (Local0)
}
}
}
diff --git a/src/mainboard/google/slippy/variants/falco/include/variant/acpi/mainboard.asl b/src/mainboard/google/slippy/variants/falco/include/variant/acpi/mainboard.asl
index d395a317ed..0ee0eb0796 100644
--- a/src/mainboard/google/slippy/variants/falco/include/variant/acpi/mainboard.asl
+++ b/src/mainboard/google/slippy/variants/falco/include/variant/acpi/mainboard.asl
@@ -40,7 +40,7 @@ Scope (\_SB.PCI0.I2C0)
Store (BOARD_TRACKPAD_WAKE_GPIO, Local0)
If (LEqual (Arg0, 1)) {
// Enable GPIO as wake source
- \_SB.PCI0.LPCB.GWAK (Local0)
+ \_SB.PCI0.LPCB.GPIO.GWAK (Local0)
}
}
diff --git a/src/mainboard/google/slippy/variants/leon/include/variant/acpi/mainboard.asl b/src/mainboard/google/slippy/variants/leon/include/variant/acpi/mainboard.asl
index bf4adfdcbf..e149559a6a 100644
--- a/src/mainboard/google/slippy/variants/leon/include/variant/acpi/mainboard.asl
+++ b/src/mainboard/google/slippy/variants/leon/include/variant/acpi/mainboard.asl
@@ -40,7 +40,7 @@ Scope (\_SB.PCI0.I2C0)
Store (BOARD_TRACKPAD_WAKE_GPIO, Local0)
If (LEqual (Arg0, 1)) {
// Enable GPIO as wake source
- \_SB.PCI0.LPCB.GWAK (Local0)
+ \_SB.PCI0.LPCB.GPIO.GWAK (Local0)
}
}
diff --git a/src/mainboard/google/slippy/variants/peppy/include/variant/acpi/mainboard.asl b/src/mainboard/google/slippy/variants/peppy/include/variant/acpi/mainboard.asl
index 8bbb19a2ed..babf9a0a37 100644
--- a/src/mainboard/google/slippy/variants/peppy/include/variant/acpi/mainboard.asl
+++ b/src/mainboard/google/slippy/variants/peppy/include/variant/acpi/mainboard.asl
@@ -40,7 +40,7 @@ Scope (\_SB.PCI0.I2C0)
Store (BOARD_TRACKPAD_WAKE_GPIO, Local0)
If (LEqual (Arg0, 1)) {
// Enable GPIO as wake source
- \_SB.PCI0.LPCB.GWAK (Local0)
+ \_SB.PCI0.LPCB.GPIO.GWAK (Local0)
}
}
}
@@ -82,7 +82,7 @@ Scope (\_SB.PCI0.I2C0)
Store (BOARD_TRACKPAD_WAKE_GPIO, Local0)
If (LEqual (Arg0, 1)) {
// Enable GPIO as wake source
- \_SB.PCI0.LPCB.GWAK (Local0)
+ \_SB.PCI0.LPCB.GPIO.GWAK (Local0)
}
}
@@ -122,7 +122,7 @@ Scope (\_SB.PCI0.I2C1)
Store (BOARD_TOUCHSCREEN_WAKE_GPIO, Local0)
If (LEqual (Arg0, 1)) {
// Enable GPIO as wake source
- \_SB.PCI0.LPCB.GWAK (Local0)
+ \_SB.PCI0.LPCB.GPIO.GWAK (Local0)
}
}
diff --git a/src/mainboard/google/slippy/variants/wolf/include/variant/acpi/mainboard.asl b/src/mainboard/google/slippy/variants/wolf/include/variant/acpi/mainboard.asl
index bf4adfdcbf..e149559a6a 100644
--- a/src/mainboard/google/slippy/variants/wolf/include/variant/acpi/mainboard.asl
+++ b/src/mainboard/google/slippy/variants/wolf/include/variant/acpi/mainboard.asl
@@ -40,7 +40,7 @@ Scope (\_SB.PCI0.I2C0)
Store (BOARD_TRACKPAD_WAKE_GPIO, Local0)
If (LEqual (Arg0, 1)) {
// Enable GPIO as wake source
- \_SB.PCI0.LPCB.GWAK (Local0)
+ \_SB.PCI0.LPCB.GPIO.GWAK (Local0)
}
}
diff --git a/src/southbridge/intel/lynxpoint/acpi/gpio.asl b/src/southbridge/intel/lynxpoint/acpi/gpio.asl
index 3650b701e3..1eefcdd197 100644
--- a/src/southbridge/intel/lynxpoint/acpi/gpio.asl
+++ b/src/southbridge/intel/lynxpoint/acpi/gpio.asl
@@ -51,10 +51,7 @@ Device (GPIO)
Return (0x0)
}
}
-}
-Scope (\_SB.PCI0.LPCB)
-{
// GWAK: Setup GPIO as ACPI GPE for Wake
// Arg0: GPIO Number
Method (GWAK, 1, NotSerialized)
diff --git a/src/southbridge/intel/lynxpoint/acpi/lpc.asl b/src/southbridge/intel/lynxpoint/acpi/lpc.asl
index b95c2f06b1..8410d7ab39 100644
--- a/src/southbridge/intel/lynxpoint/acpi/lpc.asl
+++ b/src/southbridge/intel/lynxpoint/acpi/lpc.asl
@@ -199,5 +199,8 @@ Device (LPCB)
})
}
+#if CONFIG(INTEL_LYNXPOINT_LP)
+ #include "gpio.asl"
+#endif
#include "acpi/superio.asl"
}
diff --git a/src/southbridge/intel/lynxpoint/acpi/pch.asl b/src/southbridge/intel/lynxpoint/acpi/pch.asl
index 5ac83a4ae7..a3c81887e7 100644
--- a/src/southbridge/intel/lynxpoint/acpi/pch.asl
+++ b/src/southbridge/intel/lynxpoint/acpi/pch.asl
@@ -76,7 +76,6 @@ Scope (\)
// Serial IO
#if CONFIG(INTEL_LYNXPOINT_LP)
#include "serialio.asl"
-#include "gpio.asl"
#endif
Method (_OSC, 4)