diff --git a/src/mainboard/google/volteer/variants/baseboard/devicetree.cb b/src/mainboard/google/volteer/variants/baseboard/devicetree.cb
index b68966331c..273b7a8ccc 100644
--- a/src/mainboard/google/volteer/variants/baseboard/devicetree.cb
+++ b/src/mainboard/google/volteer/variants/baseboard/devicetree.cb
@@ -243,7 +243,7 @@ chip soc/intel/tigerlake
 				register "hid" = ""10EC5682""
 				register "name" = ""RT58""
 				register "desc" = ""Realtek RT5682""
-				register "irq" = "ACPI_IRQ_EDGE_HIGH(GPP_F8_IRQ)"
+				register "irq_gpio" = "ACPI_GPIO_IRQ_EDGE_BOTH(GPP_F8)"
 				# Set the jd_src to RT5668_JD1 for jack detection
 				register "property_count" = "1"
 				register "property_list[0].type" = "ACPI_DP_TYPE_INTEGER"
diff --git a/src/mainboard/google/volteer/variants/baseboard/gpio.c b/src/mainboard/google/volteer/variants/baseboard/gpio.c
index bff7e3c3ad..2ca59aa29d 100644
--- a/src/mainboard/google/volteer/variants/baseboard/gpio.c
+++ b/src/mainboard/google/volteer/variants/baseboard/gpio.c
@@ -260,7 +260,7 @@ static const struct pad_config gpio_table[] = {
 	/* F7  : GPPF7_STRAP */
 	PAD_NC(GPP_F7, NONE),
 	/* F8  : I2S_MCLK2_INOUT ==> HP_INT_L */
-	PAD_CFG_GPI_APIC(GPP_F8, UP_20K, DEEP, EDGE_BOTH, INVERT),
+	PAD_CFG_GPI_INT(GPP_F8, NONE, PLTRST, EDGE_BOTH),
 	/* F9  : Reserved ==> NC */
 	PAD_NC(GPP_F9, NONE),
 	/* F10 : GPPF10_STRAP */
diff --git a/src/mainboard/google/volteer/variants/malefor/gpio.c b/src/mainboard/google/volteer/variants/malefor/gpio.c
index f02eb09118..bd66acd57c 100644
--- a/src/mainboard/google/volteer/variants/malefor/gpio.c
+++ b/src/mainboard/google/volteer/variants/malefor/gpio.c
@@ -255,7 +255,7 @@ static const struct pad_config gpio_table[] = {
 	/* F7  : GPPF7_STRAP */
 	PAD_NC(GPP_F7, NONE),
 	/* F8  : I2S_MCLK2_INOUT ==> HP_INT_L */
-	PAD_CFG_GPI_APIC(GPP_F8, UP_20K, DEEP, EDGE_BOTH, INVERT),
+	PAD_CFG_GPI_INT(GPP_F8, NONE, PLTRST, EDGE_BOTH),
 	/* F9  : Reserved ==> NC */
 	/* F10 : GPPF10_STRAP */
 	PAD_NC(GPP_F10, DN_20K),
diff --git a/src/mainboard/google/volteer/variants/ripto/gpio.c b/src/mainboard/google/volteer/variants/ripto/gpio.c
index b9041ed263..9a7ca94ebe 100644
--- a/src/mainboard/google/volteer/variants/ripto/gpio.c
+++ b/src/mainboard/google/volteer/variants/ripto/gpio.c
@@ -255,7 +255,7 @@ static const struct pad_config gpio_table[] = {
 	/* F7  : GPPF7_STRAP */
 	PAD_NC(GPP_F7, DN_20K),
 	/* F8  : I2S_MCLK2_INOUT ==> HP_INT_L */
-	PAD_CFG_GPI_APIC(GPP_F8, UP_20K, DEEP, EDGE_BOTH, INVERT),
+	PAD_CFG_GPI_INT(GPP_F8, NONE, PLTRST, EDGE_BOTH),
 	/* F9  : Reserved ==> NC */
 	/* F10 : GPPF10_STRAP */
 	PAD_NC(GPP_F10, DN_20K),