ARM: tegra: convert CONFIG_TEGRA_GPIO to Kconfig

Future chips will contain different GPIO HW. This change will enable
future SoC support to select the appropriate GPIO driver for their HW,
in a future-looking fashion, using Kconfig.

TEGRA_GPIO is not simply selected by TEGRA_COMMON (even though all
current Tegra chips used this GPIO HW) to simplify the later addition
of support for Tegra SoCs that use different GPIO HW.

Signed-off-by: Stephen Warren <swarren@nvidia.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
Signed-off-by: Tom Warren <twarren@nvidia.com>

diff --git a/arch/arm/mach-tegra/Kconfig b/arch/arm/mach-tegra/Kconfig
index ba6983f3dfd3ab7fdbaa88b6ba93994ed96c53c1..616a1c3cf345cc69d8b9e75763a644af09c942e2 100644 (file)
--- a/arch/arm/mach-tegra/Kconfig
+++ b/arch/arm/mach-tegra/Kconfig
@@ -22,6 +22,7 @@ config TEGRA_ARMV7_COMMON
        select SPL
        select SUPPORT_SPL
        select TEGRA_COMMON
+       select TEGRA_GPIO
 
 config TEGRA_ARMV8_COMMON
        bool "Tegra 64-bit common options"
@@ -50,6 +51,7 @@ config TEGRA124
 
 config TEGRA210
        bool "Tegra210 family"
+       select TEGRA_GPIO
        select TEGRA_ARMV8_COMMON
 
 endchoice

diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig
index 93a7e8c6c23088772d5a3848664cd0eb54a38d40..f7307442149af7cac3d864f631c6655039565549 100644 (file)
--- a/drivers/gpio/Kconfig
+++ b/drivers/gpio/Kconfig
@@ -109,6 +109,13 @@ config SANDBOX_GPIO_COUNT
          of 'anonymous' GPIOs that do not belong to any device or bank.
          Select a suitable value depending on your needs.
 
+config TEGRA_GPIO
+       bool "Tegra20..210 GPIO driver"
+       depends on DM_GPIO
+       help
+         Support for the GPIO controller contained in NVIDIA Tegra20 through
+         Tegra210.
+
 config GPIO_UNIPHIER
        bool "UniPhier GPIO"
        depends on ARCH_UNIPHIER

diff --git a/include/configs/tegra-common.h b/include/configs/tegra-common.h
index 92d4dd8e5196a4bbfb79d1f1d48d5b4c18c18177..7b0940a7f20cf9d7f79f972892576d6b3a6b89be 100644 (file)
--- a/include/configs/tegra-common.h
+++ b/include/configs/tegra-common.h
@@ -111,7 +111,6 @@
                                                CONFIG_SYS_INIT_RAM_SIZE - \
                                                GENERATED_GBL_DATA_SIZE)
 
-#define CONFIG_TEGRA_GPIO
 #define CONFIG_CMD_ENTERRCM
 
 /* Defines for SPL */