diff --git a/baseconfig/arm/aarch64/CONFIG_GPIO_MB86S7X b/baseconfig/arm/aarch64/CONFIG_GPIO_MB86S7X
new file mode 100644
index 000000000..3c4c7370f
--- /dev/null
+++ b/baseconfig/arm/aarch64/CONFIG_GPIO_MB86S7X
@@ -0,0 +1 @@
+CONFIG_GPIO_MB86S7X=m
diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config
index 0c9e5162f..4c4021c56 100644
--- a/kernel-aarch64-debug.config
+++ b/kernel-aarch64-debug.config
@@ -1773,7 +1773,7 @@ CONFIG_GPIOLIB=y
 # CONFIG_GPIO_MAX7301 is not set
 # CONFIG_GPIO_MAX732X is not set
 CONFIG_GPIO_MAX77620=m
-# CONFIG_GPIO_MB86S7X is not set
+CONFIG_GPIO_MB86S7X=m
 # CONFIG_GPIO_MC33880 is not set
 # CONFIG_GPIO_MCP23S08 is not set
 # CONFIG_GPIO_MOCKUP is not set
diff --git a/kernel-aarch64.config b/kernel-aarch64.config
index ecef63636..cb6e7f055 100644
--- a/kernel-aarch64.config
+++ b/kernel-aarch64.config
@@ -1756,7 +1756,7 @@ CONFIG_GPIOLIB=y
 # CONFIG_GPIO_MAX7301 is not set
 # CONFIG_GPIO_MAX732X is not set
 CONFIG_GPIO_MAX77620=m
-# CONFIG_GPIO_MB86S7X is not set
+CONFIG_GPIO_MB86S7X=m
 # CONFIG_GPIO_MC33880 is not set
 # CONFIG_GPIO_MCP23S08 is not set
 # CONFIG_GPIO_MOCKUP is not set