diff --git a/src/mainboard/google/kahlee/variants/aleena/overridetree.cb b/src/mainboard/google/kahlee/variants/aleena/overridetree.cb
index 93ec1fa50b..357cbdcdcc 100644
--- a/src/mainboard/google/kahlee/variants/aleena/overridetree.cb
+++ b/src/mainboard/google/kahlee/variants/aleena/overridetree.cb
@@ -35,14 +35,6 @@ chip soc/amd/stoneyridge
 	}"
 
 	device ref i2c_2 on
-		chip drivers/i2c/generic
-			register "hid" = ""ELAN0000""
-			register "desc" = ""ELAN Touchpad""
-			register "irq_gpio" = "ACPI_GPIO_IRQ_LEVEL_LOW(GPIO_5)"
-			register "wake" = "7"
-			register "detect" = "1"
-			device i2c 15 on end
-		end
 		chip drivers/i2c/hid
 			register "generic.hid" = ""PNP0C50""
 			register "generic.desc" = ""Synaptics Touchpad""
diff --git a/src/mainboard/google/kahlee/variants/baseboard/devicetree.cb b/src/mainboard/google/kahlee/variants/baseboard/devicetree.cb
index e900acd4fe..2f6e0da4e3 100644
--- a/src/mainboard/google/kahlee/variants/baseboard/devicetree.cb
+++ b/src/mainboard/google/kahlee/variants/baseboard/devicetree.cb
@@ -79,6 +79,7 @@ chip soc/amd/stoneyridge
 			register "desc" = ""ELAN Touchpad""
 			register "irq_gpio" = "ACPI_GPIO_IRQ_LEVEL_LOW(GPIO_5)"
 			register "wake" = "7"
+			register "detect" = "1"
 			device i2c 15 on end
 		end
 	end
diff --git a/src/mainboard/google/kahlee/variants/liara/overridetree.cb b/src/mainboard/google/kahlee/variants/liara/overridetree.cb
index a80229fe10..1d750b8523 100644
--- a/src/mainboard/google/kahlee/variants/liara/overridetree.cb
+++ b/src/mainboard/google/kahlee/variants/liara/overridetree.cb
@@ -40,14 +40,6 @@ chip soc/amd/stoneyridge
 		end
 	end
 	device ref i2c_2 on
-		chip drivers/i2c/generic
-			register "hid" = ""ELAN0000""
-			register "desc" = ""ELAN Touchpad""
-			register "irq_gpio" = "ACPI_GPIO_IRQ_LEVEL_LOW(GPIO_5)"
-			register "wake" = "7"
-			register "detect" = "1"
-			device i2c 15 on end
-		end
 		chip drivers/i2c/hid
 			register "generic.hid" = ""PNP0C50""
 			register "generic.desc" = ""Synaptics Touchpad""
diff --git a/src/mainboard/google/kahlee/variants/nuwani/overridetree.cb b/src/mainboard/google/kahlee/variants/nuwani/overridetree.cb
index 2b4ef55192..9ca19a0528 100644
--- a/src/mainboard/google/kahlee/variants/nuwani/overridetree.cb
+++ b/src/mainboard/google/kahlee/variants/nuwani/overridetree.cb
@@ -48,14 +48,6 @@ chip soc/amd/stoneyridge
 	end #domain
 
 	device ref i2c_2 on
-		chip drivers/i2c/generic
-			register "hid" = ""ELAN0000""
-			register "desc" = ""ELAN Touchpad""
-			register "irq_gpio" = "ACPI_GPIO_IRQ_LEVEL_LOW(GPIO_5)"
-			register "wake" = "7"
-			register "detect" = "1"
-			device i2c 15 on end
-		end
 		chip drivers/i2c/hid
 			register "generic.hid" = ""PNP0C50""
 			register "generic.desc" = ""Synaptics Touchpad""
diff --git a/src/mainboard/google/kahlee/variants/treeya/overridetree.cb b/src/mainboard/google/kahlee/variants/treeya/overridetree.cb
index 2b835ad2c9..a6f7a1db2a 100644
--- a/src/mainboard/google/kahlee/variants/treeya/overridetree.cb
+++ b/src/mainboard/google/kahlee/variants/treeya/overridetree.cb
@@ -65,14 +65,6 @@ chip soc/amd/stoneyridge
 		end
 	end
 	device ref i2c_2 on
-		chip drivers/i2c/generic
-			register "hid" = ""ELAN0000""
-			register "desc" = ""ELAN Touchpad""
-			register "irq_gpio" = "ACPI_GPIO_IRQ_LEVEL_LOW(GPIO_5)"
-			register "wake" = "7"
-			register "detect" = "1"
-			device i2c 15 on end
-		end
 		chip drivers/i2c/hid
 			register "generic.hid" = ""PNP0C50""
 			register "generic.desc" = ""Synaptics Touchpad""