diff --git a/src/mainboard/google/fatcat/variants/felino/gpio.c b/src/mainboard/google/fatcat/variants/felino/gpio.c
index 6c75a416b6..e5ca754dea 100644
--- a/src/mainboard/google/fatcat/variants/felino/gpio.c
+++ b/src/mainboard/google/fatcat/variants/felino/gpio.c
@@ -222,10 +222,10 @@ static const struct pad_config gpio_table[] = {
 	PAD_NC(GPP_E10, NONE),
 	/* GPP_E11:     NC */
 	PAD_NC(GPP_E11, NONE),
-	/* GPP_E12:     I2C0_SOC_SCL */
-	PAD_CFG_NF(GPP_E12, NONE, DEEP, NF1),
-	/* GPP_E13:     I2C0_SOC_SDA */
-	PAD_CFG_NF(GPP_E13, NONE, DEEP, NF1),
+	/* GPP_E12:     I2C4_SOC_SCL */
+	PAD_CFG_NF(GPP_E12, NONE, DEEP, NF8),
+	/* GPP_E13:     I2C4_SOC_SDA */
+	PAD_CFG_NF(GPP_E13, NONE, DEEP, NF8),
 	/* GPP_E14:     NC */
 	PAD_NC(GPP_E14, NONE),
 	/* GPP_E15:     NC */
@@ -235,7 +235,7 @@ static const struct pad_config gpio_table[] = {
 	/* GPP_E17:     NC */
 	PAD_NC(GPP_E17, NONE),
 	/* GPP_E18:     TOUCHPAD_INT_N */
-	PAD_CFG_NF(GPP_E18, NONE, DEEP, NF3),
+	PAD_CFG_GPI_APIC(GPP_E18, NONE, PLTRST, LEVEL, NONE),
 	/* GPP_E19:     HW_ID5 */
 	PAD_CFG_GPO(GPP_E19, 1, PLTRST),
 	/* GPP_E20:     HW_ID4 */
diff --git a/src/mainboard/google/fatcat/variants/felino/overridetree.cb b/src/mainboard/google/fatcat/variants/felino/overridetree.cb
index 62b4160b74..6b4d32e0a0 100644
--- a/src/mainboard/google/fatcat/variants/felino/overridetree.cb
+++ b/src/mainboard/google/fatcat/variants/felino/overridetree.cb
@@ -70,6 +70,9 @@ chip soc/intel/pantherlake
 		},
 		.i2c[4] = {
 			.speed = I2C_SPEED_FAST,
+			.rise_time_ns = 650,
+			.fall_time_ns = 350,
+			.data_hold_time_ns = 400,
 		},
 	}"
 
@@ -231,14 +234,13 @@ chip soc/intel/pantherlake
 		end # I2C1
 
 		device ref i2c4 on
-			chip drivers/i2c/hid
-				register "generic.hid" = ""P3840""
-				register "generic.desc" = ""Synaptics TOUCHPAD""
-				register "generic.irq" = "ACPI_IRQ_WAKE_LEVEL_LOW(GPP_E18_IRQ)"
-				register "generic.uid" = "5"
-				register "generic.detect" = "1"
-				register "hid_desc_reg_offset" = "0x20"
-				device i2c 2c on end
+			chip drivers/i2c/generic
+				register "hid" = ""ELAN0000""
+				register "desc" = ""ELAN Touchpad""
+				register "irq" = "ACPI_IRQ_WAKE_EDGE_LOW(GPP_E18_IRQ)"
+				register "wake" = "GPE0_DW2_18"
+				register "detect" = "1"
+				device i2c 0x15 on end
 			end
 		end # I2C4