From 807ce6258a731aa3387359660d29b42cc52b46d3 Mon Sep 17 00:00:00 2001
From: Kane Chen <kane_chen@pegatron.corp-partner.google.com>
Date: Fri, 5 Mar 2021 17:57:21 +0800
Subject: [PATCH] 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>
---
 .../variants/baseboard/devicetree_dalboz.cb   |  7 +++++
 .../zork/variants/shuboz/overridetree.cb      | 26 ++++++++++++++-----
 2 files changed, 26 insertions(+), 7 deletions(-)

diff --git a/src/mainboard/google/zork/variants/baseboard/devicetree_dalboz.cb b/src/mainboard/google/zork/variants/baseboard/devicetree_dalboz.cb
index c79f3629ee..824506437e 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 bfdb7350cd..683cf93318 100644
--- a/src/mainboard/google/zork/variants/shuboz/overridetree.cb
+++ b/src/mainboard/google/zork/variants/shuboz/overridetree.cb
@@ -60,14 +60,26 @@ chip soc/amd/picasso
 			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