From 3dabaf88683cb59fa34e7cfe0acb9bf591fbfc4b Mon Sep 17 00:00:00 2001
From: John Su <john_su@compal.corp-partner.google.com>
Date: Fri, 24 Jan 2025 21:10:09 +0800
Subject: [PATCH] mb/google/trulo/var/uldrenite: Add fw_config probe for
 touchscreen

Use fw_config to probe touchscreen.

BUG=b:392040004
BRANCH=firmware-trulo-15217.771.B
TEST=emerge-nissa coreboot chromeos-bootimage

Change-Id: I63512e85052bce974ffb0b738164bea440bd413c
Signed-off-by: John Su <john_su@compal.corp-partner.google.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/86144
Reviewed-by: Jayvik Desai <jayvik@google.com>
Reviewed-by: Ian Feng <ian_feng@compal.corp-partner.google.com>
Reviewed-by: Subrata Banik <subratabanik@google.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Frank Wu <frank_wu@compal.corp-partner.google.com>
---
 .../brya/variants/uldrenite/overridetree.cb   | 31 +++++++++++++++----
 .../google/brya/variants/uldrenite/variant.c  | 25 +++++++++++++++
 2 files changed, 50 insertions(+), 6 deletions(-)

diff --git a/src/mainboard/google/brya/variants/uldrenite/overridetree.cb b/src/mainboard/google/brya/variants/uldrenite/overridetree.cb
index d792bc94a2..3c067505fe 100644
--- a/src/mainboard/google/brya/variants/uldrenite/overridetree.cb
+++ b/src/mainboard/google/brya/variants/uldrenite/overridetree.cb
@@ -1,3 +1,10 @@
+fw_config
+	field TOUCHSCREEN 4 4
+		option TOUCHSCREEN_UNKNOWN	0
+		option TOUCHSCREEN_NONE		1
+	end
+end
+
 chip soc/intel/alderlake
 	register "sagv" = "SaGv_Enabled"
 
@@ -348,7 +355,9 @@ chip soc/intel/alderlake
 				register "enable_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_HIGH(GPP_E17)"
 				register "enable_delay_ms" = "1"
 				register "has_power_resource" = "true"
-				device i2c 10 on end
+				device i2c 10 on
+					probe TOUCHSCREEN TOUCHSCREEN_UNKNOWN
+				end
 			end # EKTH5012
 			chip drivers/i2c/hid
 				register "generic.hid" = ""ELAN900C""
@@ -364,7 +373,9 @@ chip soc/intel/alderlake
 				register "generic.stop_delay_ms" = "150"
 				register "generic.has_power_resource" = "1"
 				register "hid_desc_reg_offset" = "0x01"
-				device i2c 16 on end
+				device i2c 16 on
+					probe TOUCHSCREEN TOUCHSCREEN_UNKNOWN
+				end
 			end # EKTH7D18
 			chip drivers/i2c/hid
 				register "generic.hid" = ""GXTP7996""
@@ -379,7 +390,9 @@ chip soc/intel/alderlake
 				register "generic.enable_delay_ms" = "10"
 				register "generic.has_power_resource" = "1"
 				register "hid_desc_reg_offset" = "0x01"
-				device i2c 5d on end
+				device i2c 5d on
+					probe TOUCHSCREEN TOUCHSCREEN_UNKNOWN
+				end
 			end # GXTP7996
 			chip drivers/i2c/hid
 				register "generic.hid" = ""WDHT0002""
@@ -394,7 +407,9 @@ chip soc/intel/alderlake
 				register "generic.enable_delay_ms" = "1"
 				register "generic.has_power_resource" = "1"
 				register "hid_desc_reg_offset" = "0x20"
-				device i2c 2c on end
+				device i2c 2c on
+					probe TOUCHSCREEN TOUCHSCREEN_UNKNOWN
+				end
 			end # WDT8752A
 			chip drivers/i2c/hid
 				register "generic.hid" = ""WDHT2601""
@@ -409,7 +424,9 @@ chip soc/intel/alderlake
 				register "generic.enable_delay_ms" = "1"
 				register "generic.has_power_resource" = "1"
 				register "hid_desc_reg_offset" = "0x20"
-				device i2c 3c on end
+				device i2c 3c on
+					probe TOUCHSCREEN TOUCHSCREEN_UNKNOWN
+				end
 			end # WDT8790A
 			chip drivers/i2c/hid
 				register "generic.hid" = ""GTCH7502""
@@ -424,7 +441,9 @@ chip soc/intel/alderlake
 				register "generic.enable_delay_ms" = "30"
 				register "generic.has_power_resource" = "1"
 				register "hid_desc_reg_offset" = "0x01"
-				device i2c 40 on end
+				device i2c 40 on
+					probe TOUCHSCREEN TOUCHSCREEN_UNKNOWN
+				end
 			end # GTCH7502
 		end # I2C5
 		device ref pcie_rp2 on
diff --git a/src/mainboard/google/brya/variants/uldrenite/variant.c b/src/mainboard/google/brya/variants/uldrenite/variant.c
index 753abb6d02..96b22918f6 100644
--- a/src/mainboard/google/brya/variants/uldrenite/variant.c
+++ b/src/mainboard/google/brya/variants/uldrenite/variant.c
@@ -4,6 +4,7 @@
 #include <baseboard/variants.h>
 #include <console/console.h>
 #include <delay.h>
+#include <fw_config.h>
 
 #define RW350R_RST_DELAY_MS 20
 #define RW350R_PERST_DELAY_MS 30
@@ -21,6 +22,30 @@ static const struct pad_config rw350r_perst_pad[] = {
 	PAD_CFG_GPO(GPP_F13, 1, DEEP),
 };
 
+static const struct pad_config touchscreen_disable_pads[] = {
+	/* A21  : TCHSCR_REPORT_EN */
+	PAD_NC(GPP_A21, NONE),
+	/* B16  : SOC_I2C_TCHSCR_SDA */
+	PAD_NC(GPP_B16, NONE),
+	/* B17  : SOC_I2C_TCHSCR_SCL */
+	PAD_NC(GPP_B17, NONE),
+	/* D15  : TCHSCR_RST_L */
+	PAD_NC(GPP_D15, NONE),
+	/* D16  : TCHSCR_INT_ODL */
+	PAD_NC(GPP_D16, NONE),
+	/* E17  : EN_PP3300_TCHSCR_X */
+	PAD_NC(GPP_E17, NONE),
+};
+
+void fw_config_gpio_padbased_override(struct pad_config *padbased_table)
+{
+	if (fw_config_probe(FW_CONFIG(TOUCHSCREEN, TOUCHSCREEN_NONE))) {
+		printk(BIOS_INFO, "Disable touchscreen GPIO pins.\n");
+		gpio_padbased_override(padbased_table, touchscreen_disable_pads,
+				ARRAY_SIZE(touchscreen_disable_pads));
+	}
+}
+
 void variant_init(void)
 {
 	/*