diff --git a/src/mainboard/system76/rpl/devicetree.cb b/src/mainboard/system76/rpl/devicetree.cb
index 6b308ca670..5a58beb7b6 100644
--- a/src/mainboard/system76/rpl/devicetree.cb
+++ b/src/mainboard/system76/rpl/devicetree.cb
@@ -45,26 +45,6 @@ chip soc/intel/alderlake
 				device generic 0 on end
 			end
 		end
-		device ref i2c0 on
-			# Touchpad I2C bus
-			register "serial_io_i2c_mode[PchSerialIoIndexI2C0]" = "PchSerialIoPci"
-			chip drivers/i2c/hid
-				register "generic.hid" = ""ELAN0412""
-				register "generic.desc" = ""ELAN Touchpad""
-				register "generic.irq_gpio" = "ACPI_GPIO_IRQ_LEVEL_LOW(GPP_E7)"
-				register "generic.detect" = "1"
-				register "hid_desc_reg_offset" = "0x01"
-				device i2c 15 on end
-			end
-			chip drivers/i2c/hid
-				register "generic.hid" = ""FTCS1000""
-				register "generic.desc" = ""FocalTech Touchpad""
-				register "generic.irq_gpio" = "ACPI_GPIO_IRQ_LEVEL_LOW(GPP_E7)"
-				register "generic.detect" = "1"
-				register "hid_desc_reg_offset" = "0x01"
-				device i2c 38 on end
-			end
-		end
 		device ref i2c1 on
 			register "serial_io_i2c_mode[PchSerialIoIndexI2C1]" = "PchSerialIoPci"
 		end
diff --git a/src/mainboard/system76/rpl/variants/addw3/overridetree.cb b/src/mainboard/system76/rpl/variants/addw3/overridetree.cb
index 60abbc900e..6c2c2d3246 100644
--- a/src/mainboard/system76/rpl/variants/addw3/overridetree.cb
+++ b/src/mainboard/system76/rpl/variants/addw3/overridetree.cb
@@ -17,6 +17,27 @@ chip soc/intel/alderlake
 			register "usb3_ports[0]" = "USB3_PORT_DEFAULT(OC_SKIP)" # USB-A 3.2 Gen 1 (Left)
 			register "usb3_ports[2]" = "USB3_PORT_DEFAULT(OC_SKIP)" # USB-C 3.2 Gen 2 (Rear)
 		end
+		
+		device ref i2c0 on
+			# Touchpad I2C bus
+			register "serial_io_i2c_mode[PchSerialIoIndexI2C0]" = "PchSerialIoPci"
+			chip drivers/i2c/hid
+				register "generic.hid" = ""ELAN0412""
+				register "generic.desc" = ""ELAN Touchpad""
+				register "generic.irq_gpio" = "ACPI_GPIO_IRQ_LEVEL_LOW(GPP_E7)"
+				register "generic.detect" = "1"
+				register "hid_desc_reg_offset" = "0x01"
+				device i2c 15 on end
+			end
+			chip drivers/i2c/hid
+				register "generic.hid" = ""FTCS1000""
+				register "generic.desc" = ""FocalTech Touchpad""
+				register "generic.irq_gpio" = "ACPI_GPIO_IRQ_LEVEL_LOW(GPP_E7)"
+				register "generic.detect" = "1"
+				register "hid_desc_reg_offset" = "0x01"
+				device i2c 38 on end
+			end
+		end
 
 		#TODO: Reversed
 		device ref pcie5_0 on
diff --git a/src/mainboard/system76/rpl/variants/gaze18/gpio.c b/src/mainboard/system76/rpl/variants/gaze18/gpio.c
index 3c15e835b4..a2ef1f632d 100644
--- a/src/mainboard/system76/rpl/variants/gaze18/gpio.c
+++ b/src/mainboard/system76/rpl/variants/gaze18/gpio.c
@@ -36,7 +36,7 @@ static const struct pad_config gpio_table[] = {
 	// GPP_A14 (DGPU_PWR_EN) configured in bootblock
 	PAD_CFG_NF(GPP_A15, NONE, DEEP, NF2), // MDP_B_HPD
 	PAD_NC(GPP_A16, NONE), // USB_OC3#
-	_PAD_CFG_STRUCT(GPP_A17, 0x80100100, 0x0000), // TP_ATTN#
+	PAD_CFG_GPI_INT(GPP_A17, NONE, PLTRST, LEVEL), // TP_ATTN#
 	PAD_CFG_NF(GPP_A18, NONE, DEEP, NF1), // HDMI_HPD
 	PAD_CFG_GPI(GPP_A19, NONE, DEEP), // DGPU_PWRGD_R
 	PAD_CFG_GPO(GPP_A20, 0, DEEP), // PEX_WAKE#
diff --git a/src/mainboard/system76/rpl/variants/gaze18/overridetree.cb b/src/mainboard/system76/rpl/variants/gaze18/overridetree.cb
index 5d4ef90055..e2625b5604 100644
--- a/src/mainboard/system76/rpl/variants/gaze18/overridetree.cb
+++ b/src/mainboard/system76/rpl/variants/gaze18/overridetree.cb
@@ -18,6 +18,27 @@ chip soc/intel/alderlake
 			register "usb3_ports[3]" = "USB3_PORT_DEFAULT(OC_SKIP)" # J_TYPEC1
 		end
 
+		device ref i2c0 on
+			# Touchpad I2C bus
+			register "serial_io_i2c_mode[PchSerialIoIndexI2C0]" = "PchSerialIoPci"
+			chip drivers/i2c/hid
+				register "generic.hid" = ""ELAN0412""
+				register "generic.desc" = ""ELAN Touchpad""
+				register "generic.irq_gpio" = "ACPI_GPIO_IRQ_LEVEL_LOW(GPP_A17)"
+				register "generic.detect" = "1"
+				register "hid_desc_reg_offset" = "0x01"
+				device i2c 15 on end
+			end
+			chip drivers/i2c/hid
+				register "generic.hid" = ""FTCS1000""
+				register "generic.desc" = ""FocalTech Touchpad""
+				register "generic.irq_gpio" = "ACPI_GPIO_IRQ_LEVEL_LOW(GPP_A17)"
+				register "generic.detect" = "1"
+				register "hid_desc_reg_offset" = "0x01"
+				device i2c 38 on end
+			end
+		end
+
 		device ref pcie5_0 on
 			# CPU PCIe RP#2 x8, Clock 3 (GPU)
 			register "cpu_pcie_rp[CPU_RP(2)]" = "{
diff --git a/src/mainboard/system76/rpl/variants/oryp11/gpio.c b/src/mainboard/system76/rpl/variants/oryp11/gpio.c
index 23c85b05d3..4f15791011 100644
--- a/src/mainboard/system76/rpl/variants/oryp11/gpio.c
+++ b/src/mainboard/system76/rpl/variants/oryp11/gpio.c
@@ -36,7 +36,7 @@ static const struct pad_config gpio_table[] = {
 	// GPP_A14 (DGPU_PWR_EN) configured in bootblock
 	_PAD_CFG_STRUCT(GPP_A15, 0x86880100, 0x0000),
 	PAD_CFG_NF(GPP_A16, NONE, DEEP, NF1),
-	_PAD_CFG_STRUCT(GPP_A17, 0x80100100, 0x0000),
+	PAD_CFG_GPI_INT(GPP_A17, NONE, PLTRST, LEVEL), // TP_ATTN#
 	_PAD_CFG_STRUCT(GPP_A18, 0x86880100, 0x0000),
 	PAD_CFG_GPI(GPP_A19, NONE, DEEP),
 	PAD_CFG_GPO(GPP_A20, 1, DEEP),
diff --git a/src/mainboard/system76/rpl/variants/oryp11/overridetree.cb b/src/mainboard/system76/rpl/variants/oryp11/overridetree.cb
index 75c47114d5..4e703a7bc7 100644
--- a/src/mainboard/system76/rpl/variants/oryp11/overridetree.cb
+++ b/src/mainboard/system76/rpl/variants/oryp11/overridetree.cb
@@ -18,6 +18,27 @@ chip soc/intel/alderlake
 			register "usb3_ports[3]" = "USB3_PORT_DEFAULT(OC_SKIP)" # J_TYPEC2: USB-C 3.2 Gen 2 (Back)
 		end
 
+		device ref i2c0 on
+			# Touchpad I2C bus
+			register "serial_io_i2c_mode[PchSerialIoIndexI2C0]" = "PchSerialIoPci"
+			chip drivers/i2c/hid
+				register "generic.hid" = ""ELAN0412""
+				register "generic.desc" = ""ELAN Touchpad""
+				register "generic.irq_gpio" = "ACPI_GPIO_IRQ_LEVEL_LOW(GPP_A17)"
+				register "generic.detect" = "1"
+				register "hid_desc_reg_offset" = "0x01"
+				device i2c 15 on end
+			end
+			chip drivers/i2c/hid
+				register "generic.hid" = ""FTCS1000""
+				register "generic.desc" = ""FocalTech Touchpad""
+				register "generic.irq_gpio" = "ACPI_GPIO_IRQ_LEVEL_LOW(GPP_A17)"
+				register "generic.detect" = "1"
+				register "hid_desc_reg_offset" = "0x01"
+				device i2c 38 on end
+			end
+		end
+
 		device ref pcie5_0 on
 			# CPU PCIe RP#2 x8, Clock 3 (GPU)
 			register "cpu_pcie_rp[CPU_RP(2)]" = "{
diff --git a/src/mainboard/system76/rpl/variants/serw13/overridetree.cb b/src/mainboard/system76/rpl/variants/serw13/overridetree.cb
index 2e3fbaf17b..5dc40b6d63 100644
--- a/src/mainboard/system76/rpl/variants/serw13/overridetree.cb
+++ b/src/mainboard/system76/rpl/variants/serw13/overridetree.cb
@@ -17,6 +17,27 @@ chip soc/intel/alderlake
 			register "usb3_ports[1]" = "USB3_PORT_DEFAULT(OC_SKIP)" # AJ_USB1 (USB 3.2 Gen2)
 			register "usb3_ports[2]" = "USB3_PORT_DEFAULT(OC_SKIP)" # AJ_USB2 (USB 3.2 Gen2 + charger)
 		end
+		
+		device ref i2c0 on
+			# Touchpad I2C bus
+			register "serial_io_i2c_mode[PchSerialIoIndexI2C0]" = "PchSerialIoPci"
+			chip drivers/i2c/hid
+				register "generic.hid" = ""ELAN0412""
+				register "generic.desc" = ""ELAN Touchpad""
+				register "generic.irq_gpio" = "ACPI_GPIO_IRQ_LEVEL_LOW(GPP_E7)"
+				register "generic.detect" = "1"
+				register "hid_desc_reg_offset" = "0x01"
+				device i2c 15 on end
+			end
+			chip drivers/i2c/hid
+				register "generic.hid" = ""FTCS1000""
+				register "generic.desc" = ""FocalTech Touchpad""
+				register "generic.irq_gpio" = "ACPI_GPIO_IRQ_LEVEL_LOW(GPP_E7)"
+				register "generic.detect" = "1"
+				register "hid_desc_reg_offset" = "0x01"
+				device i2c 38 on end
+			end
+		end
 
 		device ref pcie5_0 on
 			# CPU PCIe RP#2 x8, Clock 14 (DGPU)