diff --git a/src/mainboard/google/dedede/cfr.c b/src/mainboard/google/dedede/cfr.c
index 63705fcd3d..50f85c90cb 100644
--- a/src/mainboard/google/dedede/cfr.c
+++ b/src/mainboard/google/dedede/cfr.c
@@ -24,21 +24,6 @@ static const struct sm_object touchscreen = SM_DECLARE_ENUM({
 #endif
 });
 
-static const struct sm_object touchpad = SM_DECLARE_ENUM({
-	.opt_name	= "touchpad",
-	.ui_name	= "Touchpad Type",
-	.ui_helptext	= "Select the model of the integrated touchpad device",
-	.default_value	= 0,
-	.values		= (const struct sm_enum_value[]) {
-		{ "Auto-select",	0		},
-		{ "ELAN0000",		1		},
-		{ "ELAN2702",		2		},
-		SM_ENUM_VALUE_END			},
-#if !CONFIG(BOARD_GOOGLE_GALTIC)
-	.flags		= CFR_OPTFLAG_SUPPRESS,
-#endif
-});
-
 static struct sm_obj_form system = {
 	.ui_name = "System",
 	.obj_list = (const struct sm_object *[]) {
@@ -69,7 +54,6 @@ static struct sm_obj_form devices = {
 	.ui_name = "Devices",
 	.obj_list = (const struct sm_object *[]) {
 		&touchscreen,
-		&touchpad,
 		NULL
 	},
 };
diff --git a/src/mainboard/google/dedede/variants/galtic/overridetree.cb b/src/mainboard/google/dedede/variants/galtic/overridetree.cb
index 8fbe6ead57..254d291ed8 100644
--- a/src/mainboard/google/dedede/variants/galtic/overridetree.cb
+++ b/src/mainboard/google/dedede/variants/galtic/overridetree.cb
@@ -150,15 +150,17 @@ chip soc/intel/jasperlake
 				register "desc" = ""ELAN Touchpad""
 				register "irq" = "ACPI_IRQ_WAKE_EDGE_LOW(GPP_B3_IRQ)"
 				register "wake" = "GPE0_DW0_03"
-				device i2c 15 alias elan0000 on end
+				register "detect" = "1"
+				device i2c 15 on end
 			end
 			chip drivers/i2c/hid
 				register "generic.hid" = ""ELAN2702""
 				register "generic.desc" = ""ELAN Touchpad""
 				register "generic.irq" = "ACPI_IRQ_WAKE_LEVEL_LOW(GPP_B3_IRQ)"
 				register "generic.wake" = "GPE0_DW0_03"
+				register "generic.detect" = "1"
 				register "hid_desc_reg_offset" = "0x01"
-				device i2c 15 alias elan2702 on end
+				device i2c 15 on end
 			end
 		end
 		device ref i2c2 on
diff --git a/src/mainboard/google/dedede/variants/galtic/variant.c b/src/mainboard/google/dedede/variants/galtic/variant.c
index a3f91896c0..1e62f0c187 100644
--- a/src/mainboard/google/dedede/variants/galtic/variant.c
+++ b/src/mainboard/google/dedede/variants/galtic/variant.c
@@ -1,12 +1,8 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
-#include <baseboard/variants.h>
-#include <device/device.h>
 #include <ec/google/chromeec/ec.h>
 #include <fw_config.h>
-#include <option.h>
 #include <sar.h>
-#include <static.h>
 
 enum {
 	GALTIC_SKU_START    = 0x120000,
@@ -41,23 +37,3 @@ const char *get_wifi_sar_cbfs_filename(void)
 
 	return WIFI_SAR_CBFS_DEFAULT_FILENAME;
 }
-
-#define TP_TYPE_AUTO_SELECT 0
-#define TP_TYPE_ELAN0000 1
-#define TP_TYPE_ELAN2702 2
-
-void variant_devtree_update(void)
-{
-	struct device *tp_elan0000 = DEV_PTR(elan0000);
-	struct device *tp_elan2702 = DEV_PTR(elan2702);
-
-	/* Update touchpad device */
-	switch (get_uint_option("touchpad", TP_TYPE_AUTO_SELECT)) {
-	case TP_TYPE_ELAN0000:
-		tp_elan2702->enabled = 0;
-		break;
-	case TP_TYPE_ELAN2702:
-		tp_elan0000->enabled = 0;
-		break;
-	}
-}