summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZhuohao Lee <zhuohao@chromium.org>2021-01-19 13:06:18 +0800
committerTim Wawrzynczak <twawrzynczak@chromium.org>2021-02-03 17:23:05 +0000
commit275440edf1107143865413631efc3f6aace4e7a5 (patch)
treeaf4daad5e6e3390a525529d98568da7be08ddfbc
parentc5cc741fe99c5f8eb3896ef028207248a1ff1b5e (diff)
mb/google/volteer/variant/copano: support regular/numpad touchpad
Define the 25th bit of the fw_config for the regular touchpad and numpad touchpad selection. BUG=b:174027837 BRANCH=firmware-volteer-13672.B TEST=build pass Change-Id: Ic5d61f19fd385600cfdcdd045dab1e61b06e4663 Signed-off-by: Zhuohao Lee <zhuohao@chromium.org> Reviewed-on: https://review.coreboot.org/c/coreboot/+/50129 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Furquan Shaikh <furquan@google.com> Reviewed-by: Marco Chen <marcochen@google.com> Reviewed-by: Tim Wawrzynczak <twawrzynczak@chromium.org>
-rw-r--r--src/mainboard/google/volteer/variants/baseboard/devicetree.cb4
-rw-r--r--src/mainboard/google/volteer/variants/copano/overridetree.cb16
2 files changed, 18 insertions, 2 deletions
diff --git a/src/mainboard/google/volteer/variants/baseboard/devicetree.cb b/src/mainboard/google/volteer/variants/baseboard/devicetree.cb
index d74476af16..ccde132176 100644
--- a/src/mainboard/google/volteer/variants/baseboard/devicetree.cb
+++ b/src/mainboard/google/volteer/variants/baseboard/devicetree.cb
@@ -58,6 +58,10 @@ fw_config
option BOOT_SATA_DISABLED 0
option BOOT_SATA_ENABLED 1
end
+ field TOUCHPAD 25
+ option REGULAR_TOUCHPAD 0
+ option NUMPAD_TOUCHPAD 1
+ end
end
chip soc/intel/tigerlake
diff --git a/src/mainboard/google/volteer/variants/copano/overridetree.cb b/src/mainboard/google/volteer/variants/copano/overridetree.cb
index d4e07460a2..1192129238 100644
--- a/src/mainboard/google/volteer/variants/copano/overridetree.cb
+++ b/src/mainboard/google/volteer/variants/copano/overridetree.cb
@@ -97,14 +97,26 @@ chip soc/intel/tigerlake
end
end
device ref i2c5 on
+ chip drivers/i2c/generic
+ register "hid" = ""ELAN0000""
+ register "desc" = ""ELAN Touchpad""
+ register "irq" = "ACPI_IRQ_WAKE_LEVEL_LOW(GPP_E15_IRQ)"
+ register "wake" = "GPE0_DW2_15"
+ register "probed" = "1"
+ device i2c 15 on
+ probe TOUCHPAD REGULAR_TOUCHPAD
+ end
+ end
chip drivers/i2c/hid
- register "generic.hid" = ""ELAN0000""
+ register "generic.hid" = ""ELAN2701""
register "generic.desc" = ""ELAN Touchpad""
register "generic.irq" = "ACPI_IRQ_WAKE_LEVEL_LOW(GPP_E15_IRQ)"
register "generic.wake" = "GPE0_DW2_15"
register "generic.probed" = "1"
register "hid_desc_reg_offset" = "0x01"
- device i2c 15 on end
+ device i2c 15 on
+ probe TOUCHPAD NUMPAD_TOUCHPAD
+ end
end
end
device ref pch_espi on