mb/google/zork: Add touchscreen power control

This change adds support for touchscreen power control using:
* GPIO_90 for trembyle based boards
* GPIO_32 for dalboz based boards

By default, baseboard tables configure these GPIOs as PAD_GPO driven
low and override trees expose these pads as enable_gpio to be used by
ACPI power resource.

In order to support pre-v3.6 boards, override tables configure these
pads as PAD_NC and drop the enable_gpio setting from device tree based
on board version.

BUG=b:161935640, b:162747210

Change-Id: Iba5e36b65b44ea11613b4d5fc8f13ce6433f83ab
Signed-off-by: Furquan Shaikh <furquan@google.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/44193
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>

15 files changed, 40 insertions, 4 deletions

diff --git a/src/mainboard/google/zork/variants/baseboard/gpio_baseboard_dalboz.c b/src/mainboard/google/zork/variants/baseboard/gpio_baseboard_dalboz.c
index 268c70fe61..4654ff718a 100644
--- a/src/mainboard/google/zork/variants/baseboard/gpio_baseboard_dalboz.c
+++ b/src/mainboard/google/zork/variants/baseboard/gpio_baseboard_dalboz.c
@@ -65,8 +65,8 @@ static const struct soc_amd_gpio gpio_set_stage_ram[] = {
 	PAD_NF(GPIO_30, ESPI_CS_L, PULL_NONE),
 	/* EC_AP_INT_ODL (Sensor Framesync) */
 	PAD_GPI(GPIO_31, PULL_NONE),
-	/* TP */
-	PAD_NC(GPIO_32),
+	/* EN_PWR_TOUCHSCREEN */
+	PAD_GPO(GPIO_32, LOW),
 	/* GPIO_33 - GPIO_39: Not available */
 	/* NVME_AUX_RESET_L */
 	PAD_GPO(GPIO_40, HIGH),
diff --git a/src/mainboard/google/zork/variants/baseboard/gpio_baseboard_trembyle.c b/src/mainboard/google/zork/variants/baseboard/gpio_baseboard_trembyle.c
index 1fb0cde30a..5e61ad8630 100644
--- a/src/mainboard/google/zork/variants/baseboard/gpio_baseboard_trembyle.c
+++ b/src/mainboard/google/zork/variants/baseboard/gpio_baseboard_trembyle.c
@@ -111,8 +111,8 @@ static const struct soc_amd_gpio gpio_set_stage_ram[] = {
 	PAD_NF(GPIO_88, EMMC_DATA5, PULL_NONE),
 	/*  EN_DEV_BEEP_L */
 	PAD_GPO(GPIO_89, HIGH),
-	/* Testpoint */
-	PAD_NC(GPIO_90),
+	/* EN_PWR_TOUCHSCREEN */
+	PAD_GPO(GPIO_90, LOW),
 	/* EN_SPKR */
 	PAD_GPO(GPIO_91, LOW),
 	/* CLK_REQ0_L - WIFI */
diff --git a/src/mainboard/google/zork/variants/baseboard/ramstage_common.c b/src/mainboard/google/zork/variants/baseboard/ramstage_common.c
index a55bdf2c81..1604588c11 100644
--- a/src/mainboard/google/zork/variants/baseboard/ramstage_common.c
+++ b/src/mainboard/google/zork/variants/baseboard/ramstage_common.c
@@ -251,5 +251,7 @@ void variant_touchscreen_update(void)
 			continue;
 
 		cfg->reset_gpio.active_low = 0;
+		cfg->enable_gpio.pin_count = 0;
+		cfg->enable_gpio.pins[0] = 0;
 	}
 }
diff --git a/src/mainboard/google/zork/variants/berknip/gpio.c b/src/mainboard/google/zork/variants/berknip/gpio.c
index 2a43b5a190..e92bc1742a 100644
--- a/src/mainboard/google/zork/variants/berknip/gpio.c
+++ b/src/mainboard/google/zork/variants/berknip/gpio.c
@@ -27,6 +27,8 @@ static const struct soc_amd_gpio berknip_bid1_gpio_set_stage_ram[] = {
 };
 
 static const struct soc_amd_gpio berknip_bid2_gpio_set_stage_ram[] = {
+	/* TP */
+	PAD_NC(GPIO_90),
 	/* USI_RESET */
 	PAD_GPO(GPIO_140, HIGH),
 };
diff --git a/src/mainboard/google/zork/variants/berknip/overridetree.cb b/src/mainboard/google/zork/variants/berknip/overridetree.cb
index 45b80a2a5c..58f5844ef3 100644
--- a/src/mainboard/google/zork/variants/berknip/overridetree.cb
+++ b/src/mainboard/google/zork/variants/berknip/overridetree.cb
@@ -71,6 +71,8 @@ chip soc/amd/picasso
 			register "desc" = ""Raydium Touchscreen""
 			register "probed" = "1"
 			register "irq_gpio" = "ACPI_GPIO_IRQ_EDGE_LOW(GPIO_12)"
+			register "enable_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_HIGH(GPIO_90)"
+			register "enable_delay_ms" = "1"
 			register "reset_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_HIGH(GPIO_140)"
 			# 32ms: Rise time of the reset line
 			# 20ms: Firmware ready time
@@ -84,6 +86,8 @@ chip soc/amd/picasso
 			register "desc" = ""ELAN Touchscreen""
 			register "probed" = "1"
 			register "irq_gpio" = "ACPI_GPIO_IRQ_EDGE_LOW(GPIO_12)"
+			register "enable_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_HIGH(GPIO_90)"
+			register "enable_delay_ms" = "1"
 			register "reset_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_HIGH(GPIO_140)"
 			register "reset_delay_ms" = "20"
 			register "has_power_resource" = "1"
@@ -94,6 +98,8 @@ chip soc/amd/picasso
 			register "generic.desc" = ""G2TOUCH Touchscreen""
 			register "generic.irq_gpio" = "ACPI_GPIO_IRQ_EDGE_LOW(GPIO_12)"
 			register "generic.probed" = "1"
+			register "generic.enable_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_HIGH(GPIO_90)"
+			register "generic.enable_delay_ms" = "1"
 			register "generic.reset_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_HIGH(GPIO_140)"
 			register "generic.reset_delay_ms" = "50"
 			register "generic.has_power_resource" = "1"
diff --git a/src/mainboard/google/zork/variants/dalboz/gpio.c b/src/mainboard/google/zork/variants/dalboz/gpio.c
index 7b13d839da..20a2fa358e 100644
--- a/src/mainboard/google/zork/variants/dalboz/gpio.c
+++ b/src/mainboard/google/zork/variants/dalboz/gpio.c
@@ -13,6 +13,8 @@ static const struct soc_amd_gpio bid_1_gpio_set_stage_ram[] = {
 	PAD_GPO(GPIO_6, LOW), // Select Camera 1 DMIC
 	/* USB_OC2_L - USB A0 & A1 */
 	PAD_NF(GPIO_18, USB_OC2_L, PULL_NONE),
+	/* TP */
+	PAD_NC(GPIO_32),
 	/* EN_PWR_TOUCHPAD_PS2 */
 	PAD_GPO(GPIO_67, HIGH),
 	/* USI_RESET */
@@ -24,6 +26,8 @@ static const struct soc_amd_gpio bid_1_gpio_set_stage_ram[] = {
 static const struct soc_amd_gpio bid_2_gpio_set_stage_ram[] = {
 	/* DMIC_SEL */
 	PAD_GPO(GPIO_6, LOW), // Select Camera 1 DMIC
+	/* TP */
+	PAD_NC(GPIO_32),
 	/* EN_PWR_TOUCHPAD_PS2 */
 	PAD_GPO(GPIO_67, HIGH),
 	/* USI_RESET */
diff --git a/src/mainboard/google/zork/variants/dirinboz/gpio.c b/src/mainboard/google/zork/variants/dirinboz/gpio.c
index 7269b23db5..b79c1d67dc 100644
--- a/src/mainboard/google/zork/variants/dirinboz/gpio.c
+++ b/src/mainboard/google/zork/variants/dirinboz/gpio.c
@@ -8,6 +8,8 @@
 #include <ec/google/chromeec/ec.h>
 
 static const struct soc_amd_gpio bid_1_gpio_set_stage_ram[] = {
+	/* TP */
+	PAD_NC(GPIO_32),
 	/* USI_RESET */
 	PAD_GPO(GPIO_140, HIGH),
 };
diff --git a/src/mainboard/google/zork/variants/ezkinil/gpio.c b/src/mainboard/google/zork/variants/ezkinil/gpio.c
index b490b3a0ae..1bbc3018e0 100644
--- a/src/mainboard/google/zork/variants/ezkinil/gpio.c
+++ b/src/mainboard/google/zork/variants/ezkinil/gpio.c
@@ -39,6 +39,8 @@ static const struct soc_amd_gpio ezkinil_bid2_gpio_set_stage_ram[] = {
 	PAD_NC(GPIO_69),
 	/* MST_GPIO_2 (Fw Update HDMI hub) Change NC */
 	PAD_NC(GPIO_86),
+	/* TP */
+	PAD_NC(GPIO_90),
 	/* USI_RESET */
 	PAD_GPO(GPIO_140, HIGH),
 };
@@ -48,6 +50,8 @@ static const struct soc_amd_gpio ezkinil_bid3_gpio_set_stage_ram[] = {
 	PAD_NC(GPIO_11),
 	/* FPMCU_BOOT0 Change NC */
 	PAD_NC(GPIO_69),
+	/* TP */
+	PAD_NC(GPIO_90),
 	/* USI_RESET */
 	PAD_GPO(GPIO_140, HIGH),
 };
diff --git a/src/mainboard/google/zork/variants/ezkinil/overridetree.cb b/src/mainboard/google/zork/variants/ezkinil/overridetree.cb
index 1808a0f910..6a88b78201 100644
--- a/src/mainboard/google/zork/variants/ezkinil/overridetree.cb
+++ b/src/mainboard/google/zork/variants/ezkinil/overridetree.cb
@@ -73,6 +73,8 @@ chip soc/amd/picasso
 			register "desc" = ""Raydium Touchscreen""
 			register "probed" = "1"
 			register "irq_gpio" = "ACPI_GPIO_IRQ_EDGE_LOW(GPIO_12)"
+			register "enable_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_HIGH(GPIO_90)"
+			register "enable_delay_ms" = "1"
 			register "reset_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_HIGH(GPIO_140)"
 			# 32ms: Rise time of the reset line
 			# 20ms: Firmware ready time
@@ -86,6 +88,8 @@ chip soc/amd/picasso
 			register "generic.desc" = ""ELAN Touchscreen""
 			register "generic.probed" = "1"
 			register "generic.irq_gpio" = "ACPI_GPIO_IRQ_EDGE_LOW(GPIO_12)"
+			register "generic.enable_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_HIGH(GPIO_90)"
+			register "generic.enable_delay_ms" = "1"
 			register "generic.reset_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_HIGH(GPIO_140)"
 			register "generic.reset_delay_ms" = "20"
 			register "generic.stop_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_LOW(GPIO_144)"
diff --git a/src/mainboard/google/zork/variants/morphius/gpio.c b/src/mainboard/google/zork/variants/morphius/gpio.c
index ece2dd6bf8..8376e8c62c 100644
--- a/src/mainboard/google/zork/variants/morphius/gpio.c
+++ b/src/mainboard/google/zork/variants/morphius/gpio.c
@@ -48,6 +48,8 @@ static const struct soc_amd_gpio morphius_bid2_gpio_set_stage_ram[] = {
 };
 
 static const struct soc_amd_gpio morphius_bid3_gpio_set_stage_ram[] = {
+	/* TP */
+	PAD_NC(GPIO_90),
 	/* USI_RESET */
 	PAD_GPO(GPIO_140, HIGH),
 };
diff --git a/src/mainboard/google/zork/variants/morphius/overridetree.cb b/src/mainboard/google/zork/variants/morphius/overridetree.cb
index caaddb8105..e39596d134 100644
--- a/src/mainboard/google/zork/variants/morphius/overridetree.cb
+++ b/src/mainboard/google/zork/variants/morphius/overridetree.cb
@@ -71,6 +71,8 @@ chip soc/amd/picasso
 			register "generic.desc" = ""Goodix Touchscreen""
 			register "generic.irq_gpio" = "ACPI_GPIO_IRQ_EDGE_LOW(GPIO_12)"
 			register "generic.probed" = "1"
+			register "generic.enable_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_HIGH(GPIO_90)"
+			register "generic.enable_delay_ms" = "10"
 			register "generic.reset_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_HIGH(GPIO_140)"
 			register "generic.reset_delay_ms" = "120"
 			register "generic.reset_off_delay_ms" = "1"
diff --git a/src/mainboard/google/zork/variants/vilboz/gpio.c b/src/mainboard/google/zork/variants/vilboz/gpio.c
index 7269b23db5..b79c1d67dc 100644
--- a/src/mainboard/google/zork/variants/vilboz/gpio.c
+++ b/src/mainboard/google/zork/variants/vilboz/gpio.c
@@ -8,6 +8,8 @@
 #include <ec/google/chromeec/ec.h>
 
 static const struct soc_amd_gpio bid_1_gpio_set_stage_ram[] = {
+	/* TP */
+	PAD_NC(GPIO_32),
 	/* USI_RESET */
 	PAD_GPO(GPIO_140, HIGH),
 };
diff --git a/src/mainboard/google/zork/variants/vilboz/overridetree.cb b/src/mainboard/google/zork/variants/vilboz/overridetree.cb
index fe39d7c377..00adb23e49 100644
--- a/src/mainboard/google/zork/variants/vilboz/overridetree.cb
+++ b/src/mainboard/google/zork/variants/vilboz/overridetree.cb
@@ -96,6 +96,8 @@ chip soc/amd/picasso
 			register "generic.desc" = ""Goodix Touchscreen""
 			register "generic.irq_gpio" = "ACPI_GPIO_IRQ_EDGE_LOW(GPIO_12)"
 			register "generic.probed" = "1"
+			register "generic.enable_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_HIGH(GPIO_32)"
+			register "generic.enable_delay_ms" = "10"
 			register "generic.reset_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_HIGH(GPIO_140)"
 			register "generic.reset_off_delay_ms" = "1"
 			register "generic.reset_delay_ms" = "120"
diff --git a/src/mainboard/google/zork/variants/woomax/gpio.c b/src/mainboard/google/zork/variants/woomax/gpio.c
index 3625a71786..d49388266e 100644
--- a/src/mainboard/google/zork/variants/woomax/gpio.c
+++ b/src/mainboard/google/zork/variants/woomax/gpio.c
@@ -18,6 +18,8 @@ static const struct soc_amd_gpio woomax_gpio_set_stage_ram[] = {
 	PAD_NC(GPIO_69),
 	/* RAM_ID_4  */
 	PAD_NC(GPIO_84),
+	/* TP */
+	PAD_NC(GPIO_90),
 	/* USI_RESET */
 	PAD_GPO(GPIO_140, HIGH),
 	/* GPIO_141 NC */
diff --git a/src/mainboard/google/zork/variants/woomax/overridetree.cb b/src/mainboard/google/zork/variants/woomax/overridetree.cb
index bdcc9bbde9..557e032a49 100644
--- a/src/mainboard/google/zork/variants/woomax/overridetree.cb
+++ b/src/mainboard/google/zork/variants/woomax/overridetree.cb
@@ -69,6 +69,8 @@ chip soc/amd/picasso
 			register "generic.desc" = ""ELAN Touchscreen""
 			register "generic.probed" = "1"
 			register "generic.irq_gpio" = "ACPI_GPIO_IRQ_EDGE_LOW(GPIO_12)"
+			register "generic.enable_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_HIGH(GPIO_90)"
+			register "generic.enable_delay_ms" = "1"
 			register "generic.reset_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_HIGH(GPIO_140)"
 			register "generic.reset_delay_ms" = "20"
 			register "generic.has_power_resource" = "1"