diff --git a/src/mainboard/google/brya/variants/xivu/fw_config.c b/src/mainboard/google/brya/variants/xivu/fw_config.c
index 0bf0626bdb..9008b95d24 100644
--- a/src/mainboard/google/brya/variants/xivu/fw_config.c
+++ b/src/mainboard/google/brya/variants/xivu/fw_config.c
@@ -15,10 +15,6 @@ static const struct pad_config wfc_disable_pads[] = {
 	PAD_NC_LOCK(GPP_D16, NONE, LOCK_CONFIG),
 	/* H22 : WCAM_MCLK_R */
 	PAD_NC(GPP_H22, NONE),
-	/* R6 : DMIC_WCAM_CLK_R */
-	PAD_NC(GPP_R6, NONE),
-	/* R7 : DMIC_WCAM_DATA */
-	PAD_NC(GPP_R7, NONE),
 };
 
 void fw_config_gpio_padbased_override(struct pad_config *padbased_table)
diff --git a/src/mainboard/google/brya/variants/xivu/gpio.c b/src/mainboard/google/brya/variants/xivu/gpio.c
index 12fb39d59f..842699708e 100644
--- a/src/mainboard/google/brya/variants/xivu/gpio.c
+++ b/src/mainboard/google/brya/variants/xivu/gpio.c
@@ -25,6 +25,10 @@ static const struct pad_config override_gpio_table[] = {
 	PAD_NC(GPP_F4, NONE),
 	/* F5  : CRF_XTAL_CLKREQ ==> NC */
 	PAD_NC(GPP_F5, NONE),
+	/* R6 : DMIC_CLK_A_1A ==> NC */
+	PAD_NC(GPP_R6, NONE),
+	/* R7 : DMIC_DATA_1A ==> NC */
+	PAD_NC(GPP_R7, NONE),
 };
 
 /* Early pad configuration in bootblock */