summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/mainboard/google/samus/acpi/mainboard.asl6
-rw-r--r--src/mainboard/google/samus/gpio.h2
2 files changed, 3 insertions, 5 deletions
diff --git a/src/mainboard/google/samus/acpi/mainboard.asl b/src/mainboard/google/samus/acpi/mainboard.asl
index c6ad278638..feecac3dbb 100644
--- a/src/mainboard/google/samus/acpi/mainboard.asl
+++ b/src/mainboard/google/samus/acpi/mainboard.asl
@@ -122,7 +122,7 @@ Scope (\_SB.PCI0.I2C0)
Name (_UID, 2)
Name (_S0W, 4)
Name (ISTP, 1) /* Touchpad */
- Name (GPIO, 13) /* TRACKPAD_INT_L */
+ Name (GPIO, 9) /* TRACKPAD_INT_L (WAKE) */
Name (_CRS, ResourceTemplate()
{
@@ -140,7 +140,6 @@ Scope (\_SB.PCI0.I2C0)
Name (_PRW, Package() { GPIO, 3 })
-#ifdef ENABLE_TOUCH_WAKE
Method (_DSW, 3, NotSerialized)
{
If (LEqual (Arg0, 1)) {
@@ -148,7 +147,6 @@ Scope (\_SB.PCI0.I2C0)
\_SB.PCI0.LPCB.GPIO.GWAK (^GPIO)
}
}
-#endif
Method (_STA)
{
@@ -304,9 +302,9 @@ Scope (\_SB.PCI0.I2C1)
Interrupt (ResourceConsumer, Edge, ActiveLow) { 28 }
})
+#ifdef ENABLE_TOUCH_WAKE
Name (_PRW, Package() { GPIO, 3 })
-#ifdef ENABLE_TOUCH_WAKE
Method (_DSW, 3, NotSerialized)
{
If (LEqual (Arg0, 1)) {
diff --git a/src/mainboard/google/samus/gpio.h b/src/mainboard/google/samus/gpio.h
index 393a14fe53..9f4031f1d6 100644
--- a/src/mainboard/google/samus/gpio.h
+++ b/src/mainboard/google/samus/gpio.h
@@ -37,7 +37,7 @@ static const struct gpio_config mainboard_gpio_config[] = {
PCH_GPIO_NATIVE, /* 6: NATIVE: I2C1_SDA_GPIO6 */
PCH_GPIO_NATIVE, /* 7: NATIVE: I2C1_SCL_GPIO7 */
PCH_GPIO_ACPI_SCI, /* 8: PCH_LTE_WAKE_L */
- PCH_GPIO_UNUSED, /* 9: UNUSED */
+ PCH_GPIO_INPUT_INVERT, /* 9: TRACKPAD_INT_L (WAKE) */
PCH_GPIO_ACPI_SCI, /* 10: PCH_WLAN_WAKE_L */
PCH_GPIO_UNUSED, /* 11: UNUSED */
PCH_GPIO_UNUSED, /* 12: UNUSED */