diff --git a/src/mainboard/google/hatch/variants/nightfury/overridetree.cb b/src/mainboard/google/hatch/variants/nightfury/overridetree.cb
index 0cf18e7db4..6dc3d9f9e1 100644
--- a/src/mainboard/google/hatch/variants/nightfury/overridetree.cb
+++ b/src/mainboard/google/hatch/variants/nightfury/overridetree.cb
@@ -199,47 +199,30 @@ chip soc/intel/cannonlake
 		end
 
 		device pci 15.0 on
-			chip drivers/i2c/hid
-				register "generic.hid" = ""PNP0C50""
-				register "generic.desc" = ""Synaptics Touchpad""
-				register "generic.irq" = "ACPI_IRQ_WAKE_EDGE_LOW(GPP_A21_IRQ)"
-				register "generic.probed" = "1"
-				register "generic.wake" = "GPE0_DW0_21"
-				register "hid_desc_reg_offset" = "0x20"
-				device i2c 0x20 on end
-			end
+			chip drivers/i2c/generic
+                                register "hid" = ""ELAN0000""
+                                register "desc" = ""ELAN Touchpad""
+                                register "irq" = "ACPI_IRQ_WAKE_EDGE_LOW(GPP_A21_IRQ)"
+                                register "probed" = "1"
+                                register "wake" = "GPE0_DW0_21"
+                                device i2c 0x15 on end
+                        end
 		end # I2C 0
 
 		device pci 15.1 on
-			chip drivers/i2c/generic
-				register "hid" = "ACPI_DT_NAMESPACE_HID"
-				register "compat_string" = ""atmel,maxtouch""
-				register "desc" = ""Atmel Touchscreen""
-				register "irq" = "ACPI_IRQ_LEVEL_LOW(GPP_D16_IRQ)"
-				register "reset_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_LOW(GPP_D15)"
-				register "reset_delay_ms" = "91" # 90.5 ms
-				register "enable_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_HIGH(GPP_C12)"
-				register "enable_delay_ms" = "1" # 90 ns
-				register "has_power_resource" = "1"
-				register "disable_gpio_export_in_crs" = "1"
-				register "probed" = "1"
-				device i2c 4b on end
-			end
-
-			chip drivers/i2c/generic
-				register "hid" = ""ELAN0001""
-				register "desc" = ""ELAN Touchscreen""
-				register "irq" = "ACPI_IRQ_EDGE_LOW(GPP_D16_IRQ)"
-				register "probed" = "1"
-				register "enable_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_HIGH(GPP_C12)"
-				register "enable_delay_ms" = "10"
-				register "enable_off_delay_ms" = "100"
-				register "reset_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_LOW(GPP_D15)"
-				register "reset_delay_ms" = "20"
-				register "reset_off_delay_ms" = "2"
-				register "has_power_resource" = "1"
-				device i2c 10 on end
-			end
+			chip drivers/i2c/hid
+                                register "generic.hid" = ""ELAN902C""
+                                register "generic.desc" = ""ELAN Touchscreen""
+                                register "generic.irq" = "ACPI_IRQ_EDGE_LOW(GPP_D16_IRQ)"
+                                register "generic.probed" = "1"
+                                register "generic.enable_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_HIGH(GPP_C12)"
+                                register "generic.reset_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_LOW(GPP_D15)"
+                                register "generic.reset_delay_ms" = "20"
+                                register "generic.has_power_resource" = "1"
+                                register "generic.disable_gpio_export_in_crs" = "1"
+                                register "hid_desc_reg_offset" = "0x01"
+                                device i2c 0x10 on end
+                        end
 		end # I2C #1
 
 		device pci 15.2 off end # I2C #2