diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig
index f8f362aafee948601178c275bc81b4e9c8b51ae5..e9a8fe60791803f0e923e16cf624242af2b2da61 100644
--- a/arch/arm64/Kconfig
+++ b/arch/arm64/Kconfig
@@ -1,6 +1,7 @@
 config ARM64
 	def_bool y
 	select ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE
+	select ARCH_WANT_OPTIONAL_GPIOLIB
 	select ARCH_WANT_COMPAT_IPC_PARSE_VERSION
 	select ARM_AMBA
 	select CLONE_BACKWARDS
@@ -92,7 +93,7 @@ config IOMMU_HELPER
 	def_bool SWIOTLB
 
 config GENERIC_GPIO
-	def_bool y
+	bool
 
 source "init/Kconfig"