diff --git a/drivers/of/Kconfig b/drivers/of/Kconfig
index 6b893d714..cdf7ac727 100644
--- a/drivers/of/Kconfig
+++ b/drivers/of/Kconfig
@@ -19,6 +19,11 @@ config OF_NET
 	depends on NET
 	def_bool y
 
+config OF_GPIO
+	depends on CONFIG_GPIOLIB
+	depends on CONFIG_OFDEVICE
+	def_bool y
+
 config OF_BAREBOX_DRIVERS
 	depends on OFDEVICE
 	depends on ENV_HANDLING
diff --git a/drivers/of/Makefile b/drivers/of/Makefile
index a19a8af63..c883e516c 100644
--- a/drivers/of/Makefile
+++ b/drivers/of/Makefile
@@ -1,6 +1,6 @@
 obj-y += address.o base.o fdt.o platform.o
 obj-$(CONFIG_OFTREE_MEM_GENERIC) += mem_generic.o
-obj-$(CONFIG_GPIOLIB) += of_gpio.o
+obj-$(CONFIG_OF_GPIO) += of_gpio.o
 obj-y += partition.o
 obj-y += of_net.o
 obj-$(CONFIG_MTD) += of_mtd.o
diff --git a/include/of_gpio.h b/include/of_gpio.h
index 50536a8a3..d42b18e63 100644
--- a/include/of_gpio.h
+++ b/include/of_gpio.h
@@ -21,11 +21,11 @@ enum of_gpio_flags {
 	OF_GPIO_ACTIVE_LOW = 0x1,
 };
 
-#ifdef CONFIG_OFTREE
+#ifdef CONFIG_OF_GPIO
 extern int of_get_named_gpio_flags(struct device_node *np,
 		const char *list_name, int index, enum of_gpio_flags *flags);
 
-#else /* CONFIG_OFTREE */
+#else /* CONFIG_OF_GPIO */
 
 static inline int of_get_named_gpio_flags(struct device_node *np,
 		const char *list_name, int index, enum of_gpio_flags *flags)
@@ -33,7 +33,7 @@ static inline int of_get_named_gpio_flags(struct device_node *np,
 	return -ENOSYS;
 }
 
-#endif /* CONFIG_OFTREE */
+#endif /* CONFIG_OF_GPIO */
 
 static inline int of_get_named_gpio(struct device_node *np,
 				const char *list_name, int index)