gpio: introduce GPIO_DAVINCI kconfig option

The compatible to Davinci GPIO HW block is used by other TI SoCs, like
Keystone, where GPIO support is declared as optional.

Hence, introduce GPIO_DAVINCI Kconfig option which will allow to enable
Davinci GPIO driver for Keystone SoCs when needed. At same time, kept
Davinci GPIO driver enabled for Davinci SoCs by default.

Signed-off-by: Grygorii Strashko <grygorii.strashko@ti.com>
Acked-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Acked-by: Lad, Prabhakar <prabhakar.csengg@gmail.com>
Signed-off-by: Sekhar Nori <nsekhar@ti.com>

diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig
index 0f0444475bf065e9bc90e9d72ad26fac284ec9f9..7c75f5a442b02cbd450827936787b462a51c4698 100644 (file)
--- a/drivers/gpio/Kconfig
+++ b/drivers/gpio/Kconfig
@@ -115,6 +115,13 @@ config GPIO_CLPS711X
        help
          Say yes here to support GPIO on CLPS711X SoCs.
 
+config GPIO_DAVINCI
+       bool "TI Davinci/Keystone GPIO support"
+       default y if ARCH_DAVINCI
+       depends on ARM && (ARCH_DAVINCI || ARCH_KEYSTONE)
+       help
+         Say yes here to enable GPIO support for TI Davinci/Keystone SoCs.
+
 config GPIO_GENERIC_PLATFORM
        tristate "Generic memory-mapped GPIO controller support (MMIO platform device)"
        select GPIO_GENERIC

diff --git a/drivers/gpio/Makefile b/drivers/gpio/Makefile
index 7971e36b8b1200d354254fb877a0b772a6d28361..28a0ffc12c87e8f250d0470ede444649ff1c5f60 100644 (file)
--- a/drivers/gpio/Makefile
+++ b/drivers/gpio/Makefile
@@ -22,7 +22,7 @@ obj-$(CONFIG_GPIO_CLPS711X)   += gpio-clps711x.o
 obj-$(CONFIG_GPIO_CS5535)      += gpio-cs5535.o
 obj-$(CONFIG_GPIO_DA9052)      += gpio-da9052.o
 obj-$(CONFIG_GPIO_DA9055)      += gpio-da9055.o
-obj-$(CONFIG_ARCH_DAVINCI)     += gpio-davinci.o
+obj-$(CONFIG_GPIO_DAVINCI)     += gpio-davinci.o
 obj-$(CONFIG_GPIO_EM)          += gpio-em.o
 obj-$(CONFIG_GPIO_EP93XX)      += gpio-ep93xx.o
 obj-$(CONFIG_GPIO_F7188X)      += gpio-f7188x.o