diff --git a/src/mainboard/google/brya/variants/agah/gpio.c b/src/mainboard/google/brya/variants/agah/gpio.c
index fbb9f0fc11..25c20f3335 100644
--- a/src/mainboard/google/brya/variants/agah/gpio.c
+++ b/src/mainboard/google/brya/variants/agah/gpio.c
@@ -34,6 +34,10 @@ static const struct pad_config override_gpio_table[] = {
 	PAD_CFG_NF(GPP_B5, NONE, DEEP, NF2),
 	/* B6  : ISH_I2C0_SDA ==> PCH_I2C_NVDD_GPU_SCL */
 	PAD_CFG_NF(GPP_B6, NONE, DEEP, NF2),
+	/* B7  : ISH_12C1_SDA ==> PCH_I2C_TPM_SDA */
+	PAD_CFG_NF_LOCK(GPP_B7, NONE, NF2, LOCK_CONFIG),
+	/* B8  : ISH_I2C1_SCL ==> PCH_I2C_TPM_SCL */
+	PAD_CFG_NF_LOCK(GPP_B8, NONE, NF2, LOCK_CONFIG),
 	/* B15  : TIME_SYNC0 ==> NC */
 	PAD_NC(GPP_B15, NONE),
 
diff --git a/src/mainboard/google/brya/variants/anahera/gpio.c b/src/mainboard/google/brya/variants/anahera/gpio.c
index 1d15a08e42..ab3ea66f49 100644
--- a/src/mainboard/google/brya/variants/anahera/gpio.c
+++ b/src/mainboard/google/brya/variants/anahera/gpio.c
@@ -70,6 +70,10 @@ static const struct pad_config override_gpio_table[] = {
 	/* F20 : EXT_PWR_GATE# ==> NC */
 	PAD_NC(GPP_F20, NONE),
 
+	/* H6  : ISH_12C1_SDA ==> PCH_I2C_TPM_SDA */
+	PAD_CFG_NF_LOCK(GPP_H6, NONE, NF1, LOCK_CONFIG),
+	/* H7  : ISH_12C1_SCL ==> PCH_I2C_TPM_SCL */
+	PAD_CFG_NF_LOCK(GPP_H7, NONE, NF1, LOCK_CONFIG),
 	/* H20 : IMGCLKOUT1 ==> NC */
 	PAD_NC(GPP_H20, NONE),
 	/* H21 : IMGCLKOUT2 ==> Privacy screen */
diff --git a/src/mainboard/google/brya/variants/anahera4es/gpio.c b/src/mainboard/google/brya/variants/anahera4es/gpio.c
index 40dd56fd37..e7ded6028e 100644
--- a/src/mainboard/google/brya/variants/anahera4es/gpio.c
+++ b/src/mainboard/google/brya/variants/anahera4es/gpio.c
@@ -26,6 +26,10 @@ static const struct pad_config override_gpio_table[] = {
 	PAD_NC(GPP_B5, NONE),
 	/* B6  : ISH_I2C0_SCL ==> NC */
 	PAD_NC(GPP_B6, NONE),
+	/* B7  : ISH_12C1_SDA ==> PCH_I2C_TPM_SDA */
+	PAD_CFG_NF_LOCK(GPP_B7, NONE, NF2, LOCK_CONFIG),
+	/* B8  : ISH_12C1_SCL ==> PCH_I2C_TPM_SCL */
+	PAD_CFG_NF_LOCK(GPP_B8, NONE, NF2, LOCK_CONFIG),
 	/* B15  : TIME_SYNC0 ==> NC */
 	PAD_NC(GPP_B15, NONE),
 
diff --git a/src/mainboard/google/brya/variants/banshee/gpio.c b/src/mainboard/google/brya/variants/banshee/gpio.c
index 8757e40dc2..8ea51d8948 100644
--- a/src/mainboard/google/brya/variants/banshee/gpio.c
+++ b/src/mainboard/google/brya/variants/banshee/gpio.c
@@ -51,8 +51,6 @@ static const struct pad_config override_gpio_table[] = {
 	PAD_NC(GPP_B5, NONE),
 	/* B6  : ISH_I2C0_SCL ==> NC */
 	PAD_NC(GPP_B6, NONE),
-	/* B7  : ISH_12C1_SDA ==> PCH_I2C_TPM_SDA */
-	/* B8  : ISH_I2C1_SCL ==> PCH_I2C_TPM_SCL */
 	/* B9  : NC */
 	/* B10 : NC */
 	/* B11 : PMCALERT# ==> EN_PP3300_WLAN */
@@ -197,8 +195,10 @@ static const struct pad_config override_gpio_table[] = {
 	/* H3  : SX_EXIT_HOLDOFF# ==> WLAN_PCIE_WAKE_ODL */
 	/* H4  : I2C0_SDA ==> PCH_I2C_AUD_SDA */
 	/* H5  : I2C0_SCL ==> PCH_I2C_AUD_SCL */
-	/* H6  : I2C1_SDA ==> PCH_I2C_TCHSCR_SDA */
-	/* H7  : I2C1_SCL ==> PCH_I2C_TCHSCR_SCL */
+	/* H6  : I2C1_SDA ==> PCH_I2C_TPM_SDA */
+	PAD_CFG_NF_LOCK(GPP_H6, NONE, NF1, LOCK_CONFIG),
+	/* H7  : I2C1_SCL ==> PCH_I2C_TPM_SCL */
+	PAD_CFG_NF_LOCK(GPP_H7, NONE, NF1, LOCK_CONFIG),
 	/* H8  : I2C4_SDA ==> NC */
 	PAD_NC(GPP_H8, NONE),
 	/* H9  : I2C4_SCL ==> NC */
diff --git a/src/mainboard/google/brya/variants/baseboard/brask/gpio.c b/src/mainboard/google/brya/variants/baseboard/brask/gpio.c
index 268cddc999..40d73ebb79 100644
--- a/src/mainboard/google/brya/variants/baseboard/brask/gpio.c
+++ b/src/mainboard/google/brya/variants/baseboard/brask/gpio.c
@@ -269,9 +269,9 @@ static const struct pad_config gpio_table[] = {
 	/* H5  : I2C0_SCL ==> PCH_I2C_AUD_SCL */
 	PAD_CFG_NF(GPP_H5, NONE, DEEP, NF1),
 	/* H6  : I2C1_SDA ==> PCH_I2C_TPM_SDA */
-	PAD_CFG_NF(GPP_H6, NONE, DEEP, NF1),
+	PAD_CFG_NF_LOCK(GPP_H6, NONE, NF1, LOCK_CONFIG),
 	/* H7  : I2C1_SCL ==> PCH_I2C_TPM_SCL */
-	PAD_CFG_NF(GPP_H7, NONE, DEEP, NF1),
+	PAD_CFG_NF_LOCK(GPP_H7, NONE, NF1, LOCK_CONFIG),
 	/* H8  : I2C4_SDA ==> WWAN_WLAN_COEX1 */
 	PAD_CFG_NF(GPP_H8, NONE, DEEP, NF2),
 	/* H9  : I2C4_SCL ==> WWAN_WLAN_COEX2 */
diff --git a/src/mainboard/google/brya/variants/baseboard/brya/gpio.c b/src/mainboard/google/brya/variants/baseboard/brya/gpio.c
index 88dbe0e05c..ffc549ece7 100644
--- a/src/mainboard/google/brya/variants/baseboard/brya/gpio.c
+++ b/src/mainboard/google/brya/variants/baseboard/brya/gpio.c
@@ -458,8 +458,6 @@ const struct pad_config *__weak variant_romstage_gpio_table(size_t *num)
 }
 
 static struct gpio_lock_config lockable_brya_gpios[] = {
-	{ GPP_B6, GPIO_LOCK_CONFIG },	/* PCH_I2C_TPM_SCL */
-	{ GPP_B7, GPIO_LOCK_CONFIG },	/* PCH_I2C_TPM_SDA */
 	{ GPP_A13, GPIO_LOCK_CONFIG },	/* GSC_PCH_INT_ODL */
 	{ GPP_E15, GPIO_LOCK_CONFIG },	/* PCH_WP_OD */
 	{ GPP_F11, GPIO_LOCK_CONFIG },	/* GSPI_PCH_CLK_FPMCU_R */
diff --git a/src/mainboard/google/brya/variants/brya0/gpio.c b/src/mainboard/google/brya/variants/brya0/gpio.c
index f6171a6093..4cf99df49f 100644
--- a/src/mainboard/google/brya/variants/brya0/gpio.c
+++ b/src/mainboard/google/brya/variants/brya0/gpio.c
@@ -7,6 +7,10 @@
 static const struct pad_config board_id0_1_overrides[] = {
 	/* B2  : VRALERT# ==> NC */
 	PAD_NC(GPP_B2, NONE),
+	/* B7  : ISH_12C1_SDA ==> PCH_I2C_TPM_SDA */
+	PAD_CFG_NF_LOCK(GPP_B7, NONE, NF2, LOCK_CONFIG),
+	/* B8  : ISH_12C1_SCL ==> PCH_I2C_TPM_SCL */
+	PAD_CFG_NF_LOCK(GPP_B8, NONE, NF2, LOCK_CONFIG),
 	/* B15 : TIME_SYNC0 ==> NC */
 	PAD_NC(GPP_B15, NONE),
 	/* C3  : SML0CLK ==> NC */
diff --git a/src/mainboard/google/brya/variants/brya4es/gpio.c b/src/mainboard/google/brya/variants/brya4es/gpio.c
index f6171a6093..4cf99df49f 100644
--- a/src/mainboard/google/brya/variants/brya4es/gpio.c
+++ b/src/mainboard/google/brya/variants/brya4es/gpio.c
@@ -7,6 +7,10 @@
 static const struct pad_config board_id0_1_overrides[] = {
 	/* B2  : VRALERT# ==> NC */
 	PAD_NC(GPP_B2, NONE),
+	/* B7  : ISH_12C1_SDA ==> PCH_I2C_TPM_SDA */
+	PAD_CFG_NF_LOCK(GPP_B7, NONE, NF2, LOCK_CONFIG),
+	/* B8  : ISH_12C1_SCL ==> PCH_I2C_TPM_SCL */
+	PAD_CFG_NF_LOCK(GPP_B8, NONE, NF2, LOCK_CONFIG),
 	/* B15 : TIME_SYNC0 ==> NC */
 	PAD_NC(GPP_B15, NONE),
 	/* C3  : SML0CLK ==> NC */
diff --git a/src/mainboard/google/brya/variants/felwinter/gpio.c b/src/mainboard/google/brya/variants/felwinter/gpio.c
index 3f09d5b316..186c045c39 100644
--- a/src/mainboard/google/brya/variants/felwinter/gpio.c
+++ b/src/mainboard/google/brya/variants/felwinter/gpio.c
@@ -73,6 +73,10 @@ static const struct pad_config override_gpio_table[] = {
 	PAD_NC(GPP_F20, NONE),
 	/* F21 : EXT_PWR_GATE2# ==> NC */
 	PAD_NC(GPP_F21, NONE),
+	/* H6  : I2C1_SDA ==> PCH_I2C_TPM_SDA */
+	PAD_CFG_NF_LOCK(GPP_H6, NONE, NF1, LOCK_CONFIG),
+	/* H7  : I2C1_SCL ==> PCH_I2C_TPM_SCL */
+	PAD_CFG_NF_LOCK(GPP_H7, NONE, NF1, LOCK_CONFIG),
 	/* H8  : I2C4_SDA ==> NC */
 	PAD_NC(GPP_H8, NONE),
 	/* H9  : I2C4_SCL ==> NC */
diff --git a/src/mainboard/google/brya/variants/gimble/gpio.c b/src/mainboard/google/brya/variants/gimble/gpio.c
index c0749c3d52..fc43e941e8 100644
--- a/src/mainboard/google/brya/variants/gimble/gpio.c
+++ b/src/mainboard/google/brya/variants/gimble/gpio.c
@@ -79,6 +79,10 @@ static const struct pad_config override_gpio_table[] = {
 	/* F21 : EXT_PWR_GATE2# ==> NC */
 	PAD_NC(GPP_F21, NONE),
 
+	/* H6  : I2C1_SDA ==> PCH_I2C_TPM_SDA_P2 */
+	PAD_CFG_NF_LOCK(GPP_H6, NONE, NF1, LOCK_CONFIG),
+	/* H7  : I2C1_SCL ==> PCH_I2C_TPM_SCL_P2 */
+	PAD_CFG_NF_LOCK(GPP_H7, NONE, NF1, LOCK_CONFIG),
 	/* H8  : I2C4_SDA ==> NC */
 	PAD_NC(GPP_H8, NONE),
 	/* H9  : I2C4_SCL ==> NC */
diff --git a/src/mainboard/google/brya/variants/gimble4es/gpio.c b/src/mainboard/google/brya/variants/gimble4es/gpio.c
index 685b37abbb..5606733bd8 100644
--- a/src/mainboard/google/brya/variants/gimble4es/gpio.c
+++ b/src/mainboard/google/brya/variants/gimble4es/gpio.c
@@ -32,6 +32,10 @@ static const struct pad_config override_gpio_table[] = {
 	PAD_NC(GPP_B5, NONE),
 	/* B6  : ISH_I2C0_SCL ==> NC */
 	PAD_NC(GPP_B6, NONE),
+	/* B7  : ISH_12C1_SDA ==> PCH_I2C_TPM_SDA */
+	PAD_CFG_NF_LOCK(GPP_B7, NONE, NF2, LOCK_CONFIG),
+	/* B8  : ISH_12C1_SCL ==> PCH_I2C_TPM_SCL */
+	PAD_CFG_NF_LOCK(GPP_B8, NONE, NF2, LOCK_CONFIG),
 
 	/* C3 : SML0CLK ==> NC */
 	PAD_NC(GPP_C3, NONE),
diff --git a/src/mainboard/google/brya/variants/kano/gpio.c b/src/mainboard/google/brya/variants/kano/gpio.c
index 6f74e25bd6..57975f7040 100644
--- a/src/mainboard/google/brya/variants/kano/gpio.c
+++ b/src/mainboard/google/brya/variants/kano/gpio.c
@@ -63,6 +63,10 @@ static const struct pad_config override_gpio_table[] = {
 	/* F21 : EXT_PWR_GATE2# ==> NC */
 	PAD_NC(GPP_F21, NONE),
 
+	/* H6  : I2C1_SDA ==> PCH_I2C_TPM_SDA */
+	PAD_CFG_NF_LOCK(GPP_H6, NONE, NF1, LOCK_CONFIG),
+	/* H7  : I2C1_SCL ==> PCH_I2C_TPM_SCL */
+	PAD_CFG_NF_LOCK(GPP_H7, NONE, NF1, LOCK_CONFIG),
 	/* H8  : I2C4_SDA ==> NC */
 	PAD_NC(GPP_H8, NONE),
 	/* H9  : I2C4_SCL ==> NC */
diff --git a/src/mainboard/google/brya/variants/primus/gpio.c b/src/mainboard/google/brya/variants/primus/gpio.c
index e30163ca76..36766f488f 100644
--- a/src/mainboard/google/brya/variants/primus/gpio.c
+++ b/src/mainboard/google/brya/variants/primus/gpio.c
@@ -57,6 +57,10 @@ static const struct pad_config override_gpio_table[] = {
 	/* F20 : EXT_PWR_GATE# ==> NC */
 	PAD_NC(GPP_F20, NONE),
 
+	/* H6  : I2C1_SDA ==> PCH_I2C_TPM_SDA */
+	PAD_CFG_NF_LOCK(GPP_H6, NONE, NF1, LOCK_CONFIG),
+	/* H7  : I2C1_SCL ==> PCH_I2C_TPM_SCL */
+	PAD_CFG_NF_LOCK(GPP_H7, NONE, NF1, LOCK_CONFIG),
 	/* H19 : SRCCLKREQ4# ==> NC */
 	PAD_NC(GPP_H19, NONE),
 	/* H21 : IMGCLKOUT2 ==> NC */
diff --git a/src/mainboard/google/brya/variants/primus4es/gpio.c b/src/mainboard/google/brya/variants/primus4es/gpio.c
index f0d1c5d321..42d2bcb4f7 100644
--- a/src/mainboard/google/brya/variants/primus4es/gpio.c
+++ b/src/mainboard/google/brya/variants/primus4es/gpio.c
@@ -24,6 +24,10 @@ static const struct pad_config override_gpio_table[] = {
 	PAD_NC(GPP_B2, NONE),
 	/* B3  : PROC_GP2 ==> eMMC_PERST_L */
 	PAD_CFG_GPO(GPP_B3, 1, DEEP),
+	/* B7  : ISH_12C1_SDA ==> PCH_I2C_TPM_SDA */
+	PAD_CFG_NF_LOCK(GPP_B7, NONE, NF2, LOCK_CONFIG),
+	/* B8  : ISH_12C1_SCL ==> PCH_I2C_TPM_SCL */
+	PAD_CFG_NF_LOCK(GPP_B8, NONE, NF2, LOCK_CONFIG),
 	/* B15 : TIME_SYNC0 ==> NC */
 	PAD_NC(GPP_B15, NONE),
 
diff --git a/src/mainboard/google/brya/variants/redrix/gpio.c b/src/mainboard/google/brya/variants/redrix/gpio.c
index f9fd731a96..854b6ca28f 100644
--- a/src/mainboard/google/brya/variants/redrix/gpio.c
+++ b/src/mainboard/google/brya/variants/redrix/gpio.c
@@ -50,6 +50,10 @@ static const struct pad_config override_gpio_table[] = {
 
 	/* H3  : SX_EXIT_HOLDOFF# ==> NC */
 	PAD_NC(GPP_H3, NONE),
+	/* H6  : I2C1_SDA ==> PCH_I2C_TPM_SDA */
+	PAD_CFG_NF_LOCK(GPP_H6, NONE, NF1, LOCK_CONFIG),
+	/* H7  : I2C1_SCL ==> PCH_I2C_TPM_SCL */
+	PAD_CFG_NF_LOCK(GPP_H7, NONE, NF1, LOCK_CONFIG),
 	/* H20 : IMGCLKOUT1 ==> NC */
 	PAD_NC(GPP_H20, NONE),
 	/* H21 : IMGCLKOUT2 ==> Privacy screen */
diff --git a/src/mainboard/google/brya/variants/redrix4es/gpio.c b/src/mainboard/google/brya/variants/redrix4es/gpio.c
index afcb7e9114..a04ebaff81 100644
--- a/src/mainboard/google/brya/variants/redrix4es/gpio.c
+++ b/src/mainboard/google/brya/variants/redrix4es/gpio.c
@@ -20,6 +20,10 @@ static const struct pad_config override_gpio_table[] = {
 
 	/* B3  : PROC_GP2 ==> NC */
 	PAD_NC(GPP_B3, NONE),
+	/* B7  : ISH_12C1_SDA ==> PCH_I2C_TPM_SDA */
+	PAD_CFG_NF_LOCK(GPP_B7, NONE, NF2, LOCK_CONFIG),
+	/* B8  : ISH_12C1_SCL ==> PCH_I2C_TPM_SCL */
+	PAD_CFG_NF_LOCK(GPP_B8, NONE, NF2, LOCK_CONFIG),
 	/* B15  : TIME_SYNC0 ==> NC */
 	PAD_NC(GPP_B15, NONE),
 
diff --git a/src/mainboard/google/brya/variants/taeko/gpio.c b/src/mainboard/google/brya/variants/taeko/gpio.c
index 4d93e549e1..a97aef8183 100644
--- a/src/mainboard/google/brya/variants/taeko/gpio.c
+++ b/src/mainboard/google/brya/variants/taeko/gpio.c
@@ -97,6 +97,10 @@ static const struct pad_config override_gpio_table[] = {
 	/* F23 : BP105_CTRL ==> PP1050_CTRL */
 	PAD_CFG_NF(GPP_F23, NONE, DEEP, NF1),
 
+	/* H6  : I2C1_SDA ==> PCH_I2C_TPM_SDA */
+	PAD_CFG_NF_LOCK(GPP_H6, NONE, NF1, LOCK_CONFIG),
+	/* H7  : I2C1_SCL ==> PCH_I2C_TPM_SCL */
+	PAD_CFG_NF_LOCK(GPP_H7, NONE, NF1, LOCK_CONFIG),
 	/* H8  : I2C4_SDA ==> NC */
 	PAD_NC(GPP_H8, NONE),
 	/* H9  : I2C4_SCL ==> NC */
diff --git a/src/mainboard/google/brya/variants/taeko4es/gpio.c b/src/mainboard/google/brya/variants/taeko4es/gpio.c
index 5d8badf64b..7105c097b4 100644
--- a/src/mainboard/google/brya/variants/taeko4es/gpio.c
+++ b/src/mainboard/google/brya/variants/taeko4es/gpio.c
@@ -34,6 +34,10 @@ static const struct pad_config override_gpio_table[] = {
 	PAD_NC(GPP_B2, NONE),
 	/* B3  : PROC_GP2 ==> NC */
 	PAD_NC(GPP_B3, NONE),
+	/* B7  : ISH_12C1_SDA ==> PCH_I2C_TPM_SDA */
+	PAD_CFG_NF_LOCK(GPP_B7, NONE, NF2, LOCK_CONFIG),
+	/* B8  : ISH_12C1_SCL ==> PCH_I2C_TPM_SCL */
+	PAD_CFG_NF_LOCK(GPP_B8, NONE, NF2, LOCK_CONFIG),
 	/* B15 : TIME_SYNC0 ==> NC */
 	PAD_NC(GPP_B15, NONE),
 
diff --git a/src/mainboard/google/brya/variants/taniks/gpio.c b/src/mainboard/google/brya/variants/taniks/gpio.c
index 41f080b009..05a68d1777 100644
--- a/src/mainboard/google/brya/variants/taniks/gpio.c
+++ b/src/mainboard/google/brya/variants/taniks/gpio.c
@@ -115,6 +115,10 @@ static const struct pad_config override_gpio_table[] = {
 	/* F23 : BP105_CTRL ==> PP1050_CTRL */
 	PAD_CFG_NF(GPP_F23, NONE, DEEP, NF1),
 
+	/* H6  : I2C1_SDA ==> PCH_I2C_TPM_SDA */
+	PAD_CFG_NF_LOCK(GPP_H6, NONE, NF1, LOCK_CONFIG),
+	/* H7  : I2C1_SCL ==> PCH_I2C_TPM_SCL */
+	PAD_CFG_NF_LOCK(GPP_H7, NONE, NF1, LOCK_CONFIG),
 	/* H8  : I2C4_SDA ==> NC */
 	PAD_NC(GPP_H8, NONE),
 	/* H9  : I2C4_SCL ==> NC */
diff --git a/src/mainboard/google/brya/variants/vell/gpio.c b/src/mainboard/google/brya/variants/vell/gpio.c
index b7ade2e14a..6dbfb69a12 100644
--- a/src/mainboard/google/brya/variants/vell/gpio.c
+++ b/src/mainboard/google/brya/variants/vell/gpio.c
@@ -47,6 +47,10 @@ static const struct pad_config override_gpio_table[] = {
 	/* F19 : NC */
 	PAD_NC(GPP_F19, NONE),
 
+	/* H6  : I2C1_SDA ==> PCH_I2C_TPM_SDA */
+	PAD_CFG_NF_LOCK(GPP_H6, NONE, NF1, LOCK_CONFIG),
+	/* H7  : IC1_SCL ==> PCH_I2C_TPM_SCL */
+	PAD_CFG_NF_LOCK(GPP_H7, NONE, NF1, LOCK_CONFIG),
 	/* H12 : I2C7_SDA ==> UWB_SDA */
 	PAD_CFG_NF(GPP_H12, NONE, DEEP, NF1),
 	/* H13 : I2C7_SCL ==> UWB_SCL */
diff --git a/src/mainboard/google/brya/variants/volmar/gpio.c b/src/mainboard/google/brya/variants/volmar/gpio.c
index 8c13b2faca..3f3a181399 100644
--- a/src/mainboard/google/brya/variants/volmar/gpio.c
+++ b/src/mainboard/google/brya/variants/volmar/gpio.c
@@ -72,6 +72,10 @@ static const struct pad_config override_gpio_table[] = {
 	/* F21 : EXT_PWR_GATE2# ==> NC */
 	PAD_NC(GPP_F21, NONE),
 
+	/* H6  : I2C1_SDA ==> PCH_I2C_TPM_SDA */
+	PAD_CFG_NF_LOCK(GPP_H6, NONE, NF1, LOCK_CONFIG),
+	/* H7  : I2C1_SCL ==> PCH_I2C_TPM_SCL */
+	PAD_CFG_NF_LOCK(GPP_H7, NONE, NF1, LOCK_CONFIG),
 	/* H8  : I2C4_SDA ==> NC */
 	PAD_NC(GPP_H8, NONE),
 	/* H9  : I2C4_SCL ==> NC */