diff --git a/src/mainboard/google/skyrim/variants/baseboard/devicetree.cb b/src/mainboard/google/skyrim/variants/baseboard/devicetree.cb
index 9d4b12ceb0..81c76b7e0c 100644
--- a/src/mainboard/google/skyrim/variants/baseboard/devicetree.cb
+++ b/src/mainboard/google/skyrim/variants/baseboard/devicetree.cb
@@ -47,6 +47,32 @@ chip soc/amd/mendocino
 	register "i2c_pad[2].rx_level" = "I2C_PAD_RX_1_8V" # Audio/SAR
 	register "i2c_pad[3].rx_level" = "I2C_PAD_RX_1_8V" # GSC
 
+	# I2C Config
+	#+-------------------+----------------------------+
+	#| Field             |  Value                     |
+	#+-------------------+----------------------------+
+	#| I2C0              | Trackpad                   |
+	#| I2C1              | Touchscreen                |
+	#| I2C2              | Speaker, Codec, P-SAR, USB |
+	#| I2C3              | D2 TPM                     |
+	#+-------------------+----------------------------+
+	register "i2c[0]" = "{
+		.speed = I2C_SPEED_FAST,
+	}"
+
+	register "i2c[1]" = "{
+		.speed = I2C_SPEED_FAST,
+	}"
+
+	register "i2c[2]" = "{
+		.speed = I2C_SPEED_FAST,
+	}"
+
+	register "i2c[3]" = "{
+		.speed = I2C_SPEED_FAST,
+		.early_init = true,
+	}"
+
 	# general purpose PCIe clock output configuration
 	register "gpp_clk_config[0]" = "GPP_CLK_REQ"
 	register "gpp_clk_config[1]" = "GPP_CLK_REQ"
diff --git a/src/mainboard/google/skyrim/variants/skyrim/overridetree.cb b/src/mainboard/google/skyrim/variants/skyrim/overridetree.cb
index d8dc59bd45..f59e43e2fa 100644
--- a/src/mainboard/google/skyrim/variants/skyrim/overridetree.cb
+++ b/src/mainboard/google/skyrim/variants/skyrim/overridetree.cb
@@ -91,32 +91,6 @@ chip soc/amd/mendocino
 		end # Internal GPP Bridge 0 to Bus A
 	end # domain
 
-	# I2C Config
-	#+-------------------+----------------------------+
-	#| Field             |  Value                     |
-	#+-------------------+----------------------------+
-	#| I2C0              | Trackpad                   |
-	#| I2C1              | Touchscreen                |
-	#| I2C2              | Speaker, Codec, P-SAR, USB |
-	#| I2C3              | D2 TPM                     |
-	#+-------------------+----------------------------+
-	register "i2c[0]" = "{
-		.speed = I2C_SPEED_FAST,
-	}"
-
-	register "i2c[1]" = "{
-		.speed = I2C_SPEED_FAST,
-	}"
-
-	register "i2c[2]" = "{
-		.speed = I2C_SPEED_FAST,
-	}"
-
-	register "i2c[3]" = "{
-		.speed = I2C_SPEED_FAST,
-		.early_init = true,
-	}"
-
 	device ref i2c_0 on
 		chip drivers/i2c/generic
 			register "hid" = ""ELAN0000""
diff --git a/src/mainboard/google/skyrim/variants/winterhold/overridetree.cb b/src/mainboard/google/skyrim/variants/winterhold/overridetree.cb
index e0becd4173..7a56f93759 100644
--- a/src/mainboard/google/skyrim/variants/winterhold/overridetree.cb
+++ b/src/mainboard/google/skyrim/variants/winterhold/overridetree.cb
@@ -1,32 +1,5 @@
 # SPDX-License-Identifier: GPL-2.0-or-later
 
 chip soc/amd/mendocino
-
-	# I2C Config
-	#+-------------------+----------------------------+
-	#| Field             |  Value                     |
-	#+-------------------+----------------------------+
-	#| I2C0              | Trackpad                   |
-	#| I2C1              | Touchscreen                |
-	#| I2C2              | Speaker, Codec, P-SAR, USB |
-	#| I2C3              | D2 TPM                     |
-	#+-------------------+----------------------------+
-	register "i2c[0]" = "{
-		.speed = I2C_SPEED_FAST,
-	}"
-
-	register "i2c[1]" = "{
-		.speed = I2C_SPEED_FAST,
-	}"
-
-	register "i2c[2]" = "{
-		.speed = I2C_SPEED_FAST,
-	}"
-
-	register "i2c[3]" = "{
-		.speed = I2C_SPEED_FAST,
-		.early_init = true,
-	}"
-
 	device domain 0 on end
 end	# chip soc/amd/mendocino