summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFurquan Shaikh <furquan@google.com>2019-07-11 17:46:40 -0700
committerMartin Roth <martinroth@google.com>2019-07-13 18:22:05 +0000
commit328c8bbd23284527a9d54697a4631c8bda95fd89 (patch)
tree7143bbaee6e1918a5236230ed0e631e80be909d2
parent0921962e4410577ffb1b15109ec6dc2deb015d37 (diff)
mb/google/hatch: Fix trackpad configuration in overridetree
Hatch and variants use GPP_A21 for trackpad IRQ and wake. Fix overridetree.cb to advertise the right IRQ. Change-Id: Ib87c858b89e8726c3bc80f83be0729ef4625268e Signed-off-by: Furquan Shaikh <furquan@google.com> Reviewed-on: https://review.coreboot.org/c/coreboot/+/34248 Reviewed-by: Philip Chen <philipchen@google.com> Reviewed-by: Tim Wawrzynczak <twawrzynczak@chromium.org> Reviewed-by: Paul Fagerburg <pfagerburg@chromium.org> Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
-rw-r--r--src/mainboard/google/hatch/variants/hatch/overridetree.cb2
-rw-r--r--src/mainboard/google/hatch/variants/helios/overridetree.cb2
-rw-r--r--src/mainboard/google/hatch/variants/kindred/overridetree.cb4
-rw-r--r--src/mainboard/google/hatch/variants/kohaku/overridetree.cb6
4 files changed, 6 insertions, 8 deletions
diff --git a/src/mainboard/google/hatch/variants/hatch/overridetree.cb b/src/mainboard/google/hatch/variants/hatch/overridetree.cb
index 18878cee4a..e40a566482 100644
--- a/src/mainboard/google/hatch/variants/hatch/overridetree.cb
+++ b/src/mainboard/google/hatch/variants/hatch/overridetree.cb
@@ -63,7 +63,7 @@ chip soc/intel/cannonlake
chip drivers/i2c/generic
register "hid" = ""ELAN0000""
register "desc" = ""ELAN Touchpad""
- register "irq" = "ACPI_IRQ_EDGE_LOW(GPP_A21_IRQ)"
+ register "irq" = "ACPI_IRQ_WAKE_EDGE_LOW(GPP_A21_IRQ)"
register "wake" = "GPE0_DW0_21"
device i2c 15 on end
end
diff --git a/src/mainboard/google/hatch/variants/helios/overridetree.cb b/src/mainboard/google/hatch/variants/helios/overridetree.cb
index 3f71c99db1..1907289621 100644
--- a/src/mainboard/google/hatch/variants/helios/overridetree.cb
+++ b/src/mainboard/google/hatch/variants/helios/overridetree.cb
@@ -72,7 +72,7 @@ chip soc/intel/cannonlake
chip drivers/i2c/generic
register "hid" = ""ELAN0000""
register "desc" = ""ELAN Touchpad""
- register "irq" = "ACPI_IRQ_EDGE_LOW(GPP_A21_IRQ)"
+ register "irq" = "ACPI_IRQ_WAKE_EDGE_LOW(GPP_A21_IRQ)"
register "wake" = "GPE0_DW0_21"
device i2c 15 on end
end
diff --git a/src/mainboard/google/hatch/variants/kindred/overridetree.cb b/src/mainboard/google/hatch/variants/kindred/overridetree.cb
index 89937068d5..becfc49cae 100644
--- a/src/mainboard/google/hatch/variants/kindred/overridetree.cb
+++ b/src/mainboard/google/hatch/variants/kindred/overridetree.cb
@@ -55,7 +55,7 @@ chip soc/intel/cannonlake
chip drivers/i2c/generic
register "hid" = ""ELAN0000""
register "desc" = ""ELAN Touchpad""
- register "irq" = "ACPI_IRQ_EDGE_LOW(GPP_A21_IRQ)"
+ register "irq" = "ACPI_IRQ_WAKE_EDGE_LOW(GPP_A21_IRQ)"
register "wake" = "GPE0_DW0_21"
register "probed" = "1"
device i2c 15 on end
@@ -63,7 +63,7 @@ chip soc/intel/cannonlake
chip drivers/i2c/hid
register "generic.hid" = ""PNP0C50""
register "generic.desc" = ""Synaptics Touchpad""
- register "generic.irq" = "ACPI_IRQ_EDGE_LOW(GPP_A21_IRQ)"
+ register "generic.irq" = "ACPI_IRQ_WAKE_EDGE_LOW(GPP_A21_IRQ)"
register "generic.wake" = "GPE0_DW0_21"
register "generic.probed" = "1"
register "hid_desc_reg_offset" = "0x20"
diff --git a/src/mainboard/google/hatch/variants/kohaku/overridetree.cb b/src/mainboard/google/hatch/variants/kohaku/overridetree.cb
index cf422ed01d..18cc1d4b36 100644
--- a/src/mainboard/google/hatch/variants/kohaku/overridetree.cb
+++ b/src/mainboard/google/hatch/variants/kohaku/overridetree.cb
@@ -64,11 +64,9 @@ chip soc/intel/cannonlake
chip drivers/i2c/hid
register "generic.hid" = ""PNP0C50""
register "generic.desc" = ""Synaptics Touchpad""
- # TODO: enable this when b/123967687 is fixed.
- # register "generic.wake" = "GPE0_DW2_27"
- # also set next line to ACPI_IRQ_WAKE_EDGE_LOW
- register "generic.irq" = "ACPI_IRQ_EDGE_LOW(GPP_D21_IRQ)"
+ register "generic.irq" = "ACPI_IRQ_WAKE_EDGE_LOW(GPP_A21_IRQ)"
register "generic.probed" = "1"
+ register "generic.wake" = "GPE0_DW0_21"
register "hid_desc_reg_offset" = "0x20"
device i2c 0x20 on end
end