diff --git a/kconfig-generic.toml b/kconfig-generic.toml
index d7aa81966..d501ee75b 100644
--- a/kconfig-generic.toml
+++ b/kconfig-generic.toml
@@ -83,6 +83,8 @@ TOUCHSCREEN_S6SY761 = "m"
 TOUCHSCREEN_ZINITIX = "m"
 ["category:input".">=0.0.0"."aarch64"]
 INPUT_MAX77693_HAPTIC = "m"
+SURFACE_HID = "m"
+SURFACE_KBD = "m"
 
 # led and light devices
 ["category:led".">=0.0.0"."all"]
@@ -92,6 +94,12 @@ LEDS_MAX77705 = "m"
 ["category:localversion".">=0.0.0"."all"]
 LOCALVERSION_AUTO = "n"
 
+["category:misc".">=0.0.0"."aarch64"]
+SENSORS_SURFACE_FAN = "m"
+SENSORS_SURFACE_TEMP = "m"
+SURFACE_AGGREGATOR = "m"
+SURFACE_AGGREGATOR_REGISTRY = "m"
+
 # useful ppc64le configs, taken from Alpine
 ["category:misc".">=0.0.0"."ppc64le"]
 OPAL_PRD = "y"
@@ -111,8 +119,10 @@ REGULATOR = "y"
 SPMI = "y"
 ["category:power".">=0.0.0"."aarch64"]
 BATTERY_LENOVO_YOGA_C630 = "m"
+BATTERY_SURFACE = "m"
 CHARGER_BQ25980 = "m"
 CHARGER_QCOM_SMB2 = "m"
+CHARGER_SURFACE = "m"
 MFD_QCOM_RPM = "m"
 MFD_SL28CPLD = "m"
 QCOM_SPMI_RRADC = "m"