mb/google/volteer: Implement touchscreen power sequencing

For touchscreens on volteer variants, drive the enable GPIO high
starting in romstage, then disable the reset GPIO in ramstage. This will
allow coreboot to detect the presence of i2c touchscreens during ACPI
SSDT generation (implemented in a subsequent commit).

BUG=b:121309055
TEST=tested with rest of patch train

Change-Id: Ie4c3b94594253ced6a875af78e6390cda8dcbc7d
Signed-off-by: Matt DeVillier <matt.devillier@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/71181
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>

18 files changed, 289 insertions, 19 deletions

diff --git a/src/mainboard/google/volteer/variants/chronicler/gpio.c b/src/mainboard/google/volteer/variants/chronicler/gpio.c
index 215b760804..d7d3bba9c1 100644
--- a/src/mainboard/google/volteer/variants/chronicler/gpio.c
+++ b/src/mainboard/google/volteer/variants/chronicler/gpio.c
@@ -52,7 +52,7 @@ static const struct pad_config override_gpio_table[] = {
 	/* C5  : SML0ALERT# ==> GPP_C5_BOOT_STRAP_0 */
 	PAD_NC(GPP_C5, DN_20K),
 	/* C10 : UART0_RTS# ==> USI_RST_L */
-	PAD_CFG_GPO(GPP_C10, 0, DEEP),
+	PAD_CFG_GPO(GPP_C10, 1, DEEP),
 	/* C16 : I2C0_SDA ==> PCH_I2C0_1V8_AUDIO_SDA */
 	PAD_CFG_NF(GPP_C16, NONE, DEEP, NF1),
 	/* C17 : I2C0_SCL ==> PCH_I2C0_1V8_AUDIO_SCL */
@@ -224,3 +224,18 @@ const struct pad_config *variant_early_gpio_table(size_t *num)
 	*num = ARRAY_SIZE(early_gpio_table);
 	return early_gpio_table;
 }
+
+/* GPIOs needed to be set in romstage. */
+static const struct pad_config romstage_gpio_table[] = {
+	/* Enable touchscreen, hold in reset */
+	/* A8  : I2S2_SFRM ==> EN_PP3300_TOUCHSCREEN */
+	PAD_CFG_GPO(GPP_A8, 1, DEEP),
+	/* C10 : UART0_RTS# ==> USI_RST_L */
+	PAD_CFG_GPO(GPP_C10, 0, DEEP),
+};
+
+const struct pad_config *variant_romstage_gpio_table(size_t *num)
+{
+	*num = ARRAY_SIZE(romstage_gpio_table);
+	return romstage_gpio_table;
+}
diff --git a/src/mainboard/google/volteer/variants/collis/gpio.c b/src/mainboard/google/volteer/variants/collis/gpio.c
index 86919b90a2..5f2f10c654 100644
--- a/src/mainboard/google/volteer/variants/collis/gpio.c
+++ b/src/mainboard/google/volteer/variants/collis/gpio.c
@@ -214,3 +214,18 @@ const struct pad_config *variant_early_gpio_table(size_t *num)
 	*num = ARRAY_SIZE(early_gpio_table);
 	return early_gpio_table;
 }
+
+/* GPIOs needed to be set in romstage. */
+static const struct pad_config romstage_gpio_table[] = {
+	/* Enable touchscreen, hold in reset */
+	/* F16 : GSXCLK ==> EN_PP3300_TOUCHSCREEN */
+	PAD_CFG_GPO(GPP_F16, 1, DEEP),
+	/* C10 : UART0_RTS# ==> USI_RST_L */
+	PAD_CFG_GPO(GPP_C10, 0, DEEP),
+};
+
+const struct pad_config *variant_romstage_gpio_table(size_t *num)
+{
+	*num = ARRAY_SIZE(romstage_gpio_table);
+	return romstage_gpio_table;
+}
diff --git a/src/mainboard/google/volteer/variants/copano/gpio.c b/src/mainboard/google/volteer/variants/copano/gpio.c
index 933aebb938..5bdeded3e7 100644
--- a/src/mainboard/google/volteer/variants/copano/gpio.c
+++ b/src/mainboard/google/volteer/variants/copano/gpio.c
@@ -230,3 +230,18 @@ const struct pad_config *variant_early_gpio_table(size_t *num)
 	*num = ARRAY_SIZE(early_gpio_table);
 	return early_gpio_table;
 }
+
+/* GPIOs needed to be set in romstage. */
+static const struct pad_config romstage_gpio_table[] = {
+	/* Enable touchscreen, hold in reset */
+	/* F16 : GSXCLK ==> EN_PP3300_TOUCHSCREEN */
+	PAD_CFG_GPO(GPP_F16, 1, DEEP),
+	/* C10 : UART0_RTS# ==> USI_RST_L */
+	PAD_CFG_GPO(GPP_C10, 0, DEEP),
+};
+
+const struct pad_config *variant_romstage_gpio_table(size_t *num)
+{
+	*num = ARRAY_SIZE(romstage_gpio_table);
+	return romstage_gpio_table;
+}
diff --git a/src/mainboard/google/volteer/variants/delbin/gpio.c b/src/mainboard/google/volteer/variants/delbin/gpio.c
index 8c25936507..d776e8163d 100644
--- a/src/mainboard/google/volteer/variants/delbin/gpio.c
+++ b/src/mainboard/google/volteer/variants/delbin/gpio.c
@@ -9,7 +9,7 @@ static const struct pad_config override_gpio_table[] = {
 	/* A7  : I2S2_SCLK ==> EN_PP3300_TRACKPAD */
 	PAD_CFG_GPO(GPP_A7, 1, DEEP),
 	/* A8  : I2S2_SFRM ==> EN_PP3300_TOUCHSCREEN */
-	PAD_CFG_GPO(GPP_A8, 0, DEEP),
+	PAD_CFG_GPO(GPP_A8, 1, DEEP),
 	/* A10 : I2S2_RXD ==> EN_SPKR_PA */
 	PAD_CFG_GPO(GPP_A10, 1, DEEP),
 	/* A13 : PMC_I2C_SCL ==> BT_DISABLE_L */
@@ -39,7 +39,7 @@ static const struct pad_config override_gpio_table[] = {
 	/* C0  : SMBCLK ==> EN_PP3300_WLAN */
 	PAD_CFG_GPO(GPP_C0, 1, DEEP),
 	/* C10 : UART0_RTS# ==> USI_RST_L */
-	PAD_CFG_GPO(GPP_C10, 0, DEEP),
+	PAD_CFG_GPO(GPP_C10, 1, DEEP),
 	/* C16 : I2C0_SDA ==> PCH_I2C0_1V8_AUDIO_SDA */
 	PAD_CFG_NF(GPP_C16, NONE, DEEP, NF1),
 	/* C17 : I2C0_SCL ==> PCH_I2C0_1V8_AUDIO_SCL */
@@ -171,3 +171,18 @@ const struct pad_config *variant_early_gpio_table(size_t *num)
 	*num = ARRAY_SIZE(early_gpio_table);
 	return early_gpio_table;
 }
+
+/* GPIOs needed to be set in romstage. */
+static const struct pad_config romstage_gpio_table[] = {
+	/* Enable touchscreen, hold in reset */
+	/* A8  : I2S2_SFRM ==> EN_PP3300_TOUCHSCREEN */
+	PAD_CFG_GPO(GPP_A8, 1, DEEP),
+	/* C10 : UART0_RTS# ==> USI_RST_L */
+	PAD_CFG_GPO(GPP_C10, 0, DEEP),
+};
+
+const struct pad_config *variant_romstage_gpio_table(size_t *num)
+{
+	*num = ARRAY_SIZE(romstage_gpio_table);
+	return romstage_gpio_table;
+}
diff --git a/src/mainboard/google/volteer/variants/drobit/gpio.c b/src/mainboard/google/volteer/variants/drobit/gpio.c
index f3d8947edf..f7ee4eefbf 100644
--- a/src/mainboard/google/volteer/variants/drobit/gpio.c
+++ b/src/mainboard/google/volteer/variants/drobit/gpio.c
@@ -10,7 +10,7 @@ static const struct pad_config override_gpio_table[] = {
 	/* A7  : I2S2_SCLK ==> EN_PP3300_TRACKPAD */
 	PAD_CFG_GPO(GPP_A7, 1, DEEP),
 	/* A8  : I2S2_SFRM ==> EN_PP3300_TOUCHSCREEN */
-	PAD_CFG_GPO(GPP_A8, 0, DEEP),
+	PAD_CFG_GPO(GPP_A8, 1, DEEP),
 	/* A10 : I2S2_RXD ==> EN_SPKR_PA */
 	PAD_CFG_GPO(GPP_A10, 1, DEEP),
 	/* A13 : PMC_I2C_SCL ==> BT_DISABLE_L */
@@ -40,7 +40,7 @@ static const struct pad_config override_gpio_table[] = {
 	/* C0  : SMBCLK ==> EN_PP3300_WLAN */
 	PAD_CFG_GPO(GPP_C0, 1, DEEP),
 	/* C10 : UART0_RTS# ==> USI_RST_L */
-	PAD_CFG_GPO(GPP_C10, 0, DEEP),
+	PAD_CFG_GPO(GPP_C10, 1, DEEP),
 	/* C13 : UART1_TXD ==> EN_PP5000_TRACKPAD */
 	PAD_CFG_GPO(GPP_C13, 1, DEEP),
 	/* C16 : I2C0_SDA ==> PCH_I2C0_1V8_AUDIO_SDA */
@@ -196,3 +196,18 @@ const struct pad_config *variant_sleep_gpio_table(u8 slp_typ, size_t *num)
 	*num = 0;
 	return NULL;
 }
+
+/* GPIOs needed to be set in romstage. */
+static const struct pad_config romstage_gpio_table[] = {
+	/* Enable touchscreen, hold in reset */
+	/* A8  : I2S2_SFRM ==> EN_PP3300_TOUCHSCREEN */
+	PAD_CFG_GPO(GPP_A8, 1, DEEP),
+	/* C10 : UART0_RTS# ==> USI_RST_L */
+	PAD_CFG_GPO(GPP_C10, 0, DEEP),
+};
+
+const struct pad_config *variant_romstage_gpio_table(size_t *num)
+{
+	*num = ARRAY_SIZE(romstage_gpio_table);
+	return romstage_gpio_table;
+}
diff --git a/src/mainboard/google/volteer/variants/eldrid/gpio.c b/src/mainboard/google/volteer/variants/eldrid/gpio.c
index 47d42afbbc..c01c2b3665 100644
--- a/src/mainboard/google/volteer/variants/eldrid/gpio.c
+++ b/src/mainboard/google/volteer/variants/eldrid/gpio.c
@@ -10,7 +10,7 @@ static const struct pad_config override_gpio_table[] = {
 	/* A7  : I2S2_SCLK ==> EN_PP3300_TRACKPAD */
 	PAD_CFG_GPO(GPP_A7, 1, DEEP),
 	/* A8  : I2S2_SFRM ==> EN_PP3300_TOUCHSCREEN */
-	PAD_CFG_GPO(GPP_A8, 0, DEEP),
+	PAD_CFG_GPO(GPP_A8, 1, DEEP),
 	/* A10 : I2S2_RXD ==> EN_SPKR_PA */
 	PAD_CFG_GPO(GPP_A10, 1, DEEP),
 	/* A13 : PMC_I2C_SCL ==> BT_DISABLE_L */
@@ -44,7 +44,7 @@ static const struct pad_config override_gpio_table[] = {
 	/* C5  : SML0ALERT# ==> GPP_C5_BOOT_STRAP_0 */
 	PAD_CFG_GPI(GPP_C5, NONE, DEEP),
 	/* C10 : UART0_RTS# ==> USI_RST_L */
-	PAD_CFG_GPO(GPP_C10, 0, DEEP),
+	PAD_CFG_GPO(GPP_C10, 1, DEEP),
 	/* C16 : I2C0_SDA ==> PCH_I2C0_1V8_AUDIO_SDA */
 	PAD_CFG_NF(GPP_C16, NONE, DEEP, NF1),
 	/* C17 : I2C0_SCL ==> PCH_I2C0_1V8_AUDIO_SCL */
@@ -233,3 +233,18 @@ const struct pad_config *variant_sleep_gpio_table(u8 slp_typ, size_t *num)
 	*num = 0;
 	return NULL;
 }
+
+/* GPIOs needed to be set in romstage. */
+static const struct pad_config romstage_gpio_table[] = {
+	/* Enable touchscreen, hold in reset */
+	/* A8  : I2S2_SFRM ==> EN_PP3300_TOUCHSCREEN */
+	PAD_CFG_GPO(GPP_A8, 1, DEEP),
+	/* C10 : UART0_RTS# ==> USI_RST_L */
+	PAD_CFG_GPO(GPP_C10, 0, DEEP),
+};
+
+const struct pad_config *variant_romstage_gpio_table(size_t *num)
+{
+	*num = ARRAY_SIZE(romstage_gpio_table);
+	return romstage_gpio_table;
+}
diff --git a/src/mainboard/google/volteer/variants/elemi/gpio.c b/src/mainboard/google/volteer/variants/elemi/gpio.c
index aec2317439..aba059ac39 100644
--- a/src/mainboard/google/volteer/variants/elemi/gpio.c
+++ b/src/mainboard/google/volteer/variants/elemi/gpio.c
@@ -10,7 +10,7 @@ static const struct pad_config override_gpio_table[] = {
 	/* A7  : I2S2_SCLK ==> EN_PP3300_TRACKPAD */
 	PAD_CFG_GPO(GPP_A7, 1, DEEP),
 	/* A8  : I2S2_SFRM ==> EN_PP3300_TOUCHSCREEN */
-	PAD_CFG_GPO(GPP_A8, 0, DEEP),
+	PAD_CFG_GPO(GPP_A8, 1, DEEP),
 	/* A10 : I2S2_RXD ==> EN_SPKR_PA */
 	PAD_CFG_GPO(GPP_A10, 1, DEEP),
 	/* A13 : PMC_I2C_SCL ==> BT_DISABLE_L */
@@ -53,7 +53,7 @@ static const struct pad_config override_gpio_table[] = {
 	/* C5  : SML0ALERT# ==> GPP_C5_BOOT_STRAP_0 */
 	PAD_NC(GPP_C5, DN_20K),
 	/* C10 : UART0_RTS# ==> USI_RST_L */
-	PAD_CFG_GPO(GPP_C10, 0, DEEP),
+	PAD_CFG_GPO(GPP_C10, 1, DEEP),
 	/* C16 : I2C0_SDA ==> PCH_I2C0_1V8_AUDIO_SDA */
 	PAD_CFG_NF(GPP_C16, NONE, DEEP, NF1),
 	/* C17 : I2C0_SCL ==> PCH_I2C0_1V8_AUDIO_SCL */
@@ -241,3 +241,18 @@ const struct pad_config *variant_sleep_gpio_table(u8 slp_typ, size_t *num)
 	*num = 0;
 	return NULL;
 }
+
+/* GPIOs needed to be set in romstage. */
+static const struct pad_config romstage_gpio_table[] = {
+	/* Enable touchscreen, hold in reset */
+	/* A8  : I2S2_SFRM ==> EN_PP3300_TOUCHSCREEN */
+	PAD_CFG_GPO(GPP_A8, 1, DEEP),
+	/* C10 : UART0_RTS# ==> USI_RST_L */
+	PAD_CFG_GPO(GPP_C10, 0, DEEP),
+};
+
+const struct pad_config *variant_romstage_gpio_table(size_t *num)
+{
+	*num = ARRAY_SIZE(romstage_gpio_table);
+	return romstage_gpio_table;
+}
diff --git a/src/mainboard/google/volteer/variants/halvor/gpio.c b/src/mainboard/google/volteer/variants/halvor/gpio.c
index 994df04452..116c885680 100644
--- a/src/mainboard/google/volteer/variants/halvor/gpio.c
+++ b/src/mainboard/google/volteer/variants/halvor/gpio.c
@@ -18,8 +18,8 @@ static const struct pad_config gpio_table[] = {
 	/* A6  : ESPI_RESET# ==> NC(TP764) */
 	/* A7  : I2S2_SCLK ==> I2S1_SCLK */
 	PAD_CFG_NF(GPP_A7, NONE, DEEP, NF1),
-	/* A8  : I2S2_SFRM ==> I2S1_SFRM */
-	PAD_CFG_NF(GPP_A8, NONE, DEEP, NF1),
+	/* A8  : I2S2_SFRM ==> EN_PP3300_TOUCHSCREEN */
+	PAD_CFG_GPO(GPP_A8, 1, DEEP),
 	/* A9  : I2S2_TXD ==> I2S1_TXD */
 	PAD_CFG_NF(GPP_A9, NONE, DEEP, NF1),
 	/* A10 : I2S2_RXD ==> I2S1_RXD */
@@ -261,3 +261,18 @@ const struct pad_config *variant_sleep_gpio_table(u8 slp_typ, size_t *num)
 	*num = 0;
 	return NULL;
 }
+
+/* GPIOs needed to be set in romstage. */
+static const struct pad_config romstage_gpio_table[] = {
+	/* Enable touchscreen, hold in reset */
+	/* A8  : I2S2_SFRM ==> EN_PP3300_TOUCHSCREEN */
+	PAD_CFG_GPO(GPP_A8, 1, DEEP),
+	/* C10 : UART0_RTS# ==> USI_RST_L */
+	PAD_CFG_GPO(GPP_C10, 0, DEEP),
+};
+
+const struct pad_config *variant_romstage_gpio_table(size_t *num)
+{
+	*num = ARRAY_SIZE(romstage_gpio_table);
+	return romstage_gpio_table;
+}
diff --git a/src/mainboard/google/volteer/variants/lindar/gpio.c b/src/mainboard/google/volteer/variants/lindar/gpio.c
index a38f7d753e..9a6f26871a 100644
--- a/src/mainboard/google/volteer/variants/lindar/gpio.c
+++ b/src/mainboard/google/volteer/variants/lindar/gpio.c
@@ -9,7 +9,7 @@ static const struct pad_config override_gpio_table[] = {
 	/* A7  : I2S2_SCLK ==> EN_PP3300_TRACKPAD */
 	PAD_CFG_GPO(GPP_A7, 1, DEEP),
 	/* A8  : I2S2_SFRM ==> EN_PP3300_TOUCHSCREEN */
-	PAD_CFG_GPO(GPP_A8, 0, DEEP),
+	PAD_CFG_GPO(GPP_A8, 1, DEEP),
 	/* A10 : I2S2_RXD ==> EN_SPKR_PA */
 	PAD_CFG_GPO(GPP_A10, 1, DEEP),
 	/* A13 : PMC_I2C_SCL ==> BT_DISABLE_L */
@@ -33,7 +33,7 @@ static const struct pad_config override_gpio_table[] = {
 	PAD_NC(GPP_B22, NONE),
 
 	/* C10 : UART0_RTS# ==> USI_RST_L */
-	PAD_CFG_GPO(GPP_C10, 0, DEEP),
+	PAD_CFG_GPO(GPP_C10, 1, DEEP),
 	/* C16 : I2C0_SDA ==> PCH_I2C0_1V8_AUDIO_SDA */
 	PAD_CFG_NF(GPP_C16, NONE, DEEP, NF1),
 	/* C17 : I2C0_SCL ==> PCH_I2C0_1V8_AUDIO_SCL */
@@ -179,3 +179,18 @@ const struct pad_config *variant_early_gpio_table(size_t *num)
 	*num = ARRAY_SIZE(early_gpio_table);
 	return early_gpio_table;
 }
+
+/* GPIOs needed to be set in romstage. */
+static const struct pad_config romstage_gpio_table[] = {
+	/* Enable touchscreen, hold in reset */
+	/* A8  : I2S2_SFRM ==> EN_PP3300_TOUCHSCREEN */
+	PAD_CFG_GPO(GPP_A8, 1, DEEP),
+	/* C10 : UART0_RTS# ==> USI_RST_L */
+	PAD_CFG_GPO(GPP_C10, 0, DEEP),
+};
+
+const struct pad_config *variant_romstage_gpio_table(size_t *num)
+{
+	*num = ARRAY_SIZE(romstage_gpio_table);
+	return romstage_gpio_table;
+}
diff --git a/src/mainboard/google/volteer/variants/malefor/gpio.c b/src/mainboard/google/volteer/variants/malefor/gpio.c
index af78eff019..2ec043eaf5 100644
--- a/src/mainboard/google/volteer/variants/malefor/gpio.c
+++ b/src/mainboard/google/volteer/variants/malefor/gpio.c
@@ -19,7 +19,7 @@ static const struct pad_config gpio_table[] = {
 	/* A7  : I2S2_SCLK ==> EN_PP3300_TRACKPAD */
 	PAD_CFG_GPO(GPP_A7, 1, DEEP),
 	/* A8  : I2S2_SFRM ==> EN_PP3300_TOUCHSCREEN */
-	PAD_CFG_GPO(GPP_A8, 0, DEEP),
+	PAD_CFG_GPO(GPP_A8, 1, DEEP),
 	/* A10 : I2S2_RXD ==> EN_SPKR_PA */
 	PAD_CFG_GPO(GPP_A10, 1, DEEP),
 	/* A13 : PMC_I2C_SCL ==> BT_DISABLE_L */
@@ -59,7 +59,7 @@ static const struct pad_config gpio_table[] = {
 	/* C7  : SML1DATA ==> EN_USI_CHARGE */
 	PAD_CFG_GPO(GPP_C7, 1, DEEP),
 	/* C10 : UART0_RTS# ==> USI_RST_L */
-	PAD_CFG_GPO(GPP_C10, 0, DEEP),
+	PAD_CFG_GPO(GPP_C10, 1, DEEP),
 	/* C11 : UART0_CTS# ==> NOT USED */
 	PAD_NC(GPP_C11, NONE),
 	/* C16 : I2C0_SDA ==> PCH_I2C0_1V8_AUDIO_SDA */
@@ -221,3 +221,18 @@ const struct pad_config *variant_sleep_gpio_table(u8 slp_typ, size_t *num)
 	*num = 0;
 	return NULL;
 }
+
+/* GPIOs needed to be set in romstage. */
+static const struct pad_config romstage_gpio_table[] = {
+	/* Enable touchscreen, hold in reset */
+	/* A8  : I2S2_SFRM ==> EN_PP3300_TOUCHSCREEN */
+	PAD_CFG_GPO(GPP_A8, 1, DEEP),
+	/* C10 : UART0_RTS# ==> USI_RST_L */
+	PAD_CFG_GPO(GPP_C10, 0, DEEP),
+};
+
+const struct pad_config *variant_romstage_gpio_table(size_t *num)
+{
+	*num = ARRAY_SIZE(romstage_gpio_table);
+	return romstage_gpio_table;
+}
diff --git a/src/mainboard/google/volteer/variants/terrador/gpio.c b/src/mainboard/google/volteer/variants/terrador/gpio.c
index 0febca898f..d18fbe1f96 100644
--- a/src/mainboard/google/volteer/variants/terrador/gpio.c
+++ b/src/mainboard/google/volteer/variants/terrador/gpio.c
@@ -247,3 +247,18 @@ const struct pad_config *variant_sleep_gpio_table(u8 slp_typ, size_t *num)
 	*num = 0;
 	return NULL;
 }
+
+/* GPIOs needed to be set in romstage. */
+static const struct pad_config romstage_gpio_table[] = {
+	/* Enable touchscreen, hold in reset */
+	/* F16 : GSXCLK ==> EN_PP3300_TOUCHSCREEN */
+	PAD_CFG_GPO(GPP_F16, 1, DEEP),
+	/* C10 : UART0_RTS# ==> USI_RST_L */
+	PAD_CFG_GPO(GPP_C10, 0, DEEP),
+};
+
+const struct pad_config *variant_romstage_gpio_table(size_t *num)
+{
+	*num = ARRAY_SIZE(romstage_gpio_table);
+	return romstage_gpio_table;
+}
diff --git a/src/mainboard/google/volteer/variants/todor/gpio.c b/src/mainboard/google/volteer/variants/todor/gpio.c
index e699027320..057d35212f 100644
--- a/src/mainboard/google/volteer/variants/todor/gpio.c
+++ b/src/mainboard/google/volteer/variants/todor/gpio.c
@@ -241,3 +241,18 @@ const struct pad_config *variant_early_gpio_table(size_t *num)
 	*num = ARRAY_SIZE(early_gpio_table);
 	return early_gpio_table;
 }
+
+/* GPIOs needed to be set in romstage. */
+static const struct pad_config romstage_gpio_table[] = {
+	/* Enable touchscreen, hold in reset */
+	/* F16 : GSXCLK ==> EN_PP3300_TOUCHSCREEN */
+	PAD_CFG_GPO(GPP_F16, 1, DEEP),
+	/* C10 : UART0_RTS# ==> USI_RST_L */
+	PAD_CFG_GPO(GPP_C10, 0, DEEP),
+};
+
+const struct pad_config *variant_romstage_gpio_table(size_t *num)
+{
+	*num = ARRAY_SIZE(romstage_gpio_table);
+	return romstage_gpio_table;
+}
diff --git a/src/mainboard/google/volteer/variants/trondo/gpio.c b/src/mainboard/google/volteer/variants/trondo/gpio.c
index 4ec02c5167..b759e3f1e0 100644
--- a/src/mainboard/google/volteer/variants/trondo/gpio.c
+++ b/src/mainboard/google/volteer/variants/trondo/gpio.c
@@ -292,3 +292,18 @@ const struct pad_config *variant_sleep_gpio_table(u8 slp_typ, size_t *num)
 	*num = 0;
 	return NULL;
 }
+
+/* GPIOs needed to be set in romstage. */
+static const struct pad_config romstage_gpio_table[] = {
+	/* Enable touchscreen, hold in reset */
+	/* A8  : I2S2_SFRM ==> EN_PP3300_TOUCHSCREEN */
+	PAD_CFG_GPO(GPP_A8, 1, DEEP),
+	/* C10 : UART0_RTS# ==> USI_RST_L */
+	PAD_CFG_GPO(GPP_C10, 0, DEEP),
+};
+
+const struct pad_config *variant_romstage_gpio_table(size_t *num)
+{
+	*num = ARRAY_SIZE(romstage_gpio_table);
+	return romstage_gpio_table;
+}
diff --git a/src/mainboard/google/volteer/variants/voema/gpio.c b/src/mainboard/google/volteer/variants/voema/gpio.c
index 4f3f799cff..ac5fdcd75d 100644
--- a/src/mainboard/google/volteer/variants/voema/gpio.c
+++ b/src/mainboard/google/volteer/variants/voema/gpio.c
@@ -245,3 +245,18 @@ const struct pad_config *variant_sleep_gpio_table(u8 slp_typ, size_t *num)
 	*num = 0;
 	return NULL;
 }
+
+/* GPIOs needed to be set in romstage. */
+static const struct pad_config romstage_gpio_table[] = {
+	/* Enable touchscreen, hold in reset */
+	/* F16 : GSXCLK ==> EN_PP3300_TOUCHSCREEN */
+	PAD_CFG_GPO(GPP_F16, 1, DEEP),
+	/* C10 : UART0_RTS# ==> USI_RST_L */
+	PAD_CFG_GPO(GPP_C10, 0, DEEP),
+};
+
+const struct pad_config *variant_romstage_gpio_table(size_t *num)
+{
+	*num = ARRAY_SIZE(romstage_gpio_table);
+	return romstage_gpio_table;
+}
diff --git a/src/mainboard/google/volteer/variants/volet/gpio.c b/src/mainboard/google/volteer/variants/volet/gpio.c
index b298c4aaed..4f755bb9b5 100644
--- a/src/mainboard/google/volteer/variants/volet/gpio.c
+++ b/src/mainboard/google/volteer/variants/volet/gpio.c
@@ -291,3 +291,18 @@ const struct pad_config *variant_sleep_gpio_table(u8 slp_typ, size_t *num)
 	*num = 0;
 	return NULL;
 }
+
+/* GPIOs needed to be set in romstage. */
+static const struct pad_config romstage_gpio_table[] = {
+	/* Enable touchscreen, hold in reset */
+	/* A8  : I2S2_SFRM ==> EN_PP3300_TOUCHSCREEN */
+	PAD_CFG_GPO(GPP_A8, 1, DEEP),
+	/* C10 : UART0_RTS# ==> USI_RST_L */
+	PAD_CFG_GPO(GPP_C10, 0, DEEP),
+};
+
+const struct pad_config *variant_romstage_gpio_table(size_t *num)
+{
+	*num = ARRAY_SIZE(romstage_gpio_table);
+	return romstage_gpio_table;
+}
diff --git a/src/mainboard/google/volteer/variants/volteer/gpio.c b/src/mainboard/google/volteer/variants/volteer/gpio.c
index 0dab148cc1..8ed0e18115 100644
--- a/src/mainboard/google/volteer/variants/volteer/gpio.c
+++ b/src/mainboard/google/volteer/variants/volteer/gpio.c
@@ -9,7 +9,7 @@ static const struct pad_config override_gpio_table[] = {
 	/* A7  : I2S2_SCLK ==> EN_PP3300_TRACKPAD */
 	PAD_CFG_GPO(GPP_A7, 1, DEEP),
 	/* A8  : I2S2_SFRM ==> EN_PP3300_TOUCHSCREEN */
-	PAD_CFG_GPO(GPP_A8, 0, DEEP),
+	PAD_CFG_GPO(GPP_A8, 1, DEEP),
 	/* A10 : I2S2_RXD ==> EN_SPKR_PA */
 	PAD_CFG_GPO(GPP_A10, 1, DEEP),
 	/* A13 : PMC_I2C_SCL ==> BT_DISABLE_L */
@@ -55,7 +55,7 @@ static const struct pad_config override_gpio_table[] = {
 	/* C7  : SML1DATA ==> EN_USI_CHARGE */
 	PAD_CFG_GPO(GPP_C7, 1, DEEP),
 	/* C10 : UART0_RTS# ==> USI_RST_L */
-	PAD_CFG_GPO(GPP_C10, 0, DEEP),
+	PAD_CFG_GPO(GPP_C10, 1, DEEP),
 	/* C13 : UART1_TXD ==> EN_PP5000_TRACKPAD */
 	PAD_CFG_GPO(GPP_C13, 1, DEEP),
 	/* C16 : I2C0_SDA ==> PCH_I2C0_1V8_AUDIO_SDA */
@@ -264,3 +264,18 @@ const struct pad_config *variant_early_gpio_table(size_t *num)
 	*num = ARRAY_SIZE(early_gpio_table);
 	return early_gpio_table;
 }
+
+/* GPIOs needed to be set in romstage. */
+static const struct pad_config romstage_gpio_table[] = {
+	/* Enable touchscreen, hold in reset */
+	/* A8  : I2S2_SFRM ==> EN_PP3300_TOUCHSCREEN */
+	PAD_CFG_GPO(GPP_A8, 1, DEEP),
+	/* C10 : UART0_RTS# ==> USI_RST_L */
+	PAD_CFG_GPO(GPP_C10, 0, DEEP),
+};
+
+const struct pad_config *variant_romstage_gpio_table(size_t *num)
+{
+	*num = ARRAY_SIZE(romstage_gpio_table);
+	return romstage_gpio_table;
+}
diff --git a/src/mainboard/google/volteer/variants/volteer2/gpio.c b/src/mainboard/google/volteer/variants/volteer2/gpio.c
index 1bf892570e..445bb8538b 100644
--- a/src/mainboard/google/volteer/variants/volteer2/gpio.c
+++ b/src/mainboard/google/volteer/variants/volteer2/gpio.c
@@ -10,7 +10,7 @@ static const struct pad_config override_gpio_table[] = {
 	/* A7  : I2S2_SCLK ==> EN_PP3300_TRACKPAD */
 	PAD_CFG_GPO(GPP_A7, 1, DEEP),
 	/* A8  : I2S2_SFRM ==> EN_PP3300_TOUCHSCREEN */
-	PAD_CFG_GPO(GPP_A8, 0, DEEP),
+	PAD_CFG_GPO(GPP_A8, 1, DEEP),
 	/* A10 : I2S2_RXD ==> EN_SPKR_PA */
 	PAD_CFG_GPO(GPP_A10, 1, DEEP),
 	/* A13 : PMC_I2C_SCL ==> BT_DISABLE_L */
@@ -56,7 +56,7 @@ static const struct pad_config override_gpio_table[] = {
 	/* C7  : SML1DATA ==> EN_USI_CHARGE */
 	PAD_CFG_GPO(GPP_C7, 1, DEEP),
 	/* C10 : UART0_RTS# ==> USI_RST_L */
-	PAD_CFG_GPO(GPP_C10, 0, DEEP),
+	PAD_CFG_GPO(GPP_C10, 1, DEEP),
 	/* C13 : UART1_TXD ==> EN_PP5000_TRACKPAD */
 	PAD_CFG_GPO(GPP_C13, 1, DEEP),
 	/* C16 : I2C0_SDA ==> PCH_I2C0_1V8_AUDIO_SDA */
@@ -286,3 +286,18 @@ const struct pad_config *variant_sleep_gpio_table(u8 slp_typ, size_t *num)
 	*num = 0;
 	return NULL;
 }
+
+/* GPIOs needed to be set in romstage. */
+static const struct pad_config romstage_gpio_table[] = {
+	/* Enable touchscreen, hold in reset */
+	/* A8  : I2S2_SFRM ==> EN_PP3300_TOUCHSCREEN */
+	PAD_CFG_GPO(GPP_A8, 1, DEEP),
+	/* C10 : UART0_RTS# ==> USI_RST_L */
+	PAD_CFG_GPO(GPP_C10, 0, DEEP),
+};
+
+const struct pad_config *variant_romstage_gpio_table(size_t *num)
+{
+	*num = ARRAY_SIZE(romstage_gpio_table);
+	return romstage_gpio_table;
+}
diff --git a/src/mainboard/google/volteer/variants/voxel/gpio.c b/src/mainboard/google/volteer/variants/voxel/gpio.c
index c74d14d770..fc428b25a3 100644
--- a/src/mainboard/google/volteer/variants/voxel/gpio.c
+++ b/src/mainboard/google/volteer/variants/voxel/gpio.c
@@ -292,3 +292,18 @@ const struct pad_config *variant_sleep_gpio_table(u8 slp_typ, size_t *num)
 	*num = 0;
 	return NULL;
 }
+
+/* GPIOs needed to be set in romstage. */
+static const struct pad_config romstage_gpio_table[] = {
+	/* Enable touchscreen, hold in reset */
+	/* A8  : I2S2_SFRM ==> EN_PP3300_TOUCHSCREEN */
+	PAD_CFG_GPO(GPP_A8, 1, DEEP),
+	/* C10 : UART0_RTS# ==> USI_RST_L */
+	PAD_CFG_GPO(GPP_C10, 0, DEEP),
+};
+
+const struct pad_config *variant_romstage_gpio_table(size_t *num)
+{
+	*num = ARRAY_SIZE(romstage_gpio_table);
+	return romstage_gpio_table;
+}