summaryrefslogtreecommitdiff
path: root/src/mainboard/google/octopus/variants/bobba
diff options
context:
space:
mode:
authorFurquan Shaikh <furquan@google.com>2018-10-18 16:25:58 -0700
committerFurquan Shaikh <furquan@google.com>2018-10-23 14:36:26 +0000
commit2c2650a3c26def0e740e9e312d4c28c6e46cda90 (patch)
tree7d7756e578186f60651fd890fec0b4b9fdaaeccb /src/mainboard/google/octopus/variants/bobba
parent2c36889437e591bb3389bdf98b53e34082c391c3 (diff)
mb/google/octopus: Use a single GPIO for trackpad wake and IRQ
This change uses the newly added macros for configuring the same GPI pad(GPIO_135) for IRQ (normal interrupt operations) and wake (interrupt for waking from S3/S0ix) for the trackpad device. The other pad GPIO_142 is now configured as not connected. BUG=b:117553222 TEST=Verified that yorp and bobba wake from S3 and S0ix using trackpad. Change-Id: I2b704f1be493141629c647b79723b0025b0f7dd6 Signed-off-by: Furquan Shaikh <furquan@google.com> Reviewed-on: https://review.coreboot.org/29189 Reviewed-by: Aaron Durbin <adurbin@chromium.org> Reviewed-by: Justin TerAvest <teravest@chromium.org> Reviewed-by: Karthik Ramasubramanian <kramasub@google.com> Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Diffstat (limited to 'src/mainboard/google/octopus/variants/bobba')
-rw-r--r--src/mainboard/google/octopus/variants/bobba/overridetree.cb8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/mainboard/google/octopus/variants/bobba/overridetree.cb b/src/mainboard/google/octopus/variants/bobba/overridetree.cb
index 662a3025ba..6ba69ff318 100644
--- a/src/mainboard/google/octopus/variants/bobba/overridetree.cb
+++ b/src/mainboard/google/octopus/variants/bobba/overridetree.cb
@@ -76,16 +76,16 @@ chip soc/intel/apollolake
chip drivers/i2c/generic
register "hid" = ""ELAN0000""
register "desc" = ""ELAN Touchpad""
- register "irq" = "ACPI_IRQ_EDGE_LOW(GPIO_135_IRQ)"
- register "wake" = "GPE0_DW2_02"
+ register "irq" = "ACPI_IRQ_WAKE_EDGE_LOW(GPIO_135_IRQ)"
+ register "wake" = "GPE0_DW3_27"
register "probed" = "1"
device i2c 15 on end
end
chip drivers/i2c/hid
register "generic.hid" = ""PNP0C50""
register "generic.desc" = ""Synaptics Touchpad""
- register "generic.irq" = "ACPI_IRQ_EDGE_LOW(GPIO_135_IRQ)"
- register "generic.wake" = "GPE0_DW2_02"
+ register "generic.irq" = "ACPI_IRQ_WAKE_EDGE_LOW(GPIO_135_IRQ)"
+ register "generic.wake" = "GPE0_DW3_27"
register "generic.probed" = "1"
register "hid_desc_reg_offset" = "0x20"
device i2c 0x2c on end