diff --git a/src/mainboard/google/volteer/variants/baseboard/include/baseboard/ec.h b/src/mainboard/google/volteer/variants/baseboard/include/baseboard/ec.h
index 5ae32faa54..6eca8bc5c2 100644
--- a/src/mainboard/google/volteer/variants/baseboard/include/baseboard/ec.h
+++ b/src/mainboard/google/volteer/variants/baseboard/include/baseboard/ec.h
@@ -56,13 +56,13 @@
 /* Enable EC backed ALS device in ACPI */
 #define EC_ENABLE_ALS_DEVICE
 
+/* Enable MKBP for buttons and switches */
+#define EC_ENABLE_MKBP_DEVICE
+
 /* Enable LID switch and provide wake pin for EC */
 #define EC_ENABLE_LID_SWITCH
 #define EC_ENABLE_WAKE_PIN	GPE_EC_WAKE
 
-/* Enable Tablet switch */
-#define EC_ENABLE_TBMC_DEVICE
-
 #define SIO_EC_MEMMAP_ENABLE	/* EC Memory Map Resources */
 #define SIO_EC_HOST_ENABLE	/* EC Host Interface Resources */
 #define SIO_EC_ENABLE_PS2K	/* Enable PS/2 Keyboard */