Martin Roth has submitted this change. ( https://review.coreboot.org/c/coreboot/+/51278 )
Change subject: mb/google/zork/var/shuboz: support regular/numpad touchpad ......................................................................
mb/google/zork/var/shuboz: support regular/numpad touchpad
Define the 26th bit of the fw_config for the regular touchpad and numpad touchpad selection.
REGULAR_TOUCHPAD: 1 NUMPAD_TOUCHPAD: 0
BUG=b:174964012 BRANCH=zork TEST=build pass
Signed-off-by: Kane Chen kane_chen@pegatron.corp-partner.google.com Change-Id: Ie2055d6bb45a64bc0e59209cecc0f8a31c0f3718 Reviewed-on: https://review.coreboot.org/c/coreboot/+/51278 Tested-by: build bot (Jenkins) no-reply@coreboot.org Reviewed-by: Kangheui Won khwon@chromium.org --- M src/mainboard/google/zork/variants/baseboard/devicetree_dalboz.cb M src/mainboard/google/zork/variants/shuboz/overridetree.cb 2 files changed, 26 insertions(+), 7 deletions(-)
Approvals: build bot (Jenkins): Verified Kane Chen: Looks good to me, but someone else must approve Kangheui Won: Looks good to me, approved
diff --git a/src/mainboard/google/zork/variants/baseboard/devicetree_dalboz.cb b/src/mainboard/google/zork/variants/baseboard/devicetree_dalboz.cb index c79f362..8245064 100644 --- a/src/mainboard/google/zork/variants/baseboard/devicetree_dalboz.cb +++ b/src/mainboard/google/zork/variants/baseboard/devicetree_dalboz.cb @@ -1,4 +1,11 @@ # SPDX-License-Identifier: GPL-2.0-or-later +fw_config + field TOUCHPAD 26 + option REGULAR_TOUCHPAD 1 + option NUMPAD_TOUCHPAD 0 + end +end + chip soc/amd/picasso
# Set FADT Configuration diff --git a/src/mainboard/google/zork/variants/shuboz/overridetree.cb b/src/mainboard/google/zork/variants/shuboz/overridetree.cb index bfdb735..683cf93 100644 --- a/src/mainboard/google/zork/variants/shuboz/overridetree.cb +++ b/src/mainboard/google/zork/variants/shuboz/overridetree.cb @@ -60,14 +60,26 @@ register "disable_gpio_export_in_crs" = "1" device i2c 10 on end end + chip drivers/i2c/generic + register "hid" = ""ELAN0000"" + register "desc" = ""ELAN Touchpad"" + register "irq_gpio" = "ACPI_GPIO_IRQ_EDGE_LOW(GPIO_9)" + register "wake" = "GEVENT_22" + register "probed" = "1" + device i2c 15 on + probe TOUCHPAD REGULAR_TOUCHPAD + end + end chip drivers/i2c/hid - register "generic.hid" = ""ELAN2702"" - register "generic.desc" = ""ELAN Touchpad"" - register "generic.irq_gpio" = "ACPI_GPIO_IRQ_LEVEL_LOW(GPIO_9)" - register "generic.wake" = "GEVENT_22" - register "generic.probed" = "1" - register "hid_desc_reg_offset" = "0x01" - device i2c 15 on end + register "generic.hid" = ""ELAN2702"" + register "generic.desc" = ""ELAN Touchpad"" + register "generic.irq_gpio" = "ACPI_GPIO_IRQ_LEVEL_LOW(GPIO_9)" + register "generic.wake" = "GEVENT_22" + register "generic.probed" = "1" + register "hid_desc_reg_offset" = "0x01" + device i2c 15 on + probe TOUCHPAD NUMPAD_TOUCHPAD + end end end # device end # chip soc/amd/picasso