ARM: tegra: enable ARCH_REQUIRE_GPIOLIB for Tegra114

CONFIG_ARCH_TEGRA_114_SOC doesn't currently enable gpiolib, which causes
numerous build problems building a Tegra kernel with only Tegra114
enabled, and not Tegra20 or Tegra30. Enable ARCH_REQUIRE_GPIOLIB to
solve this. However, all Tegra will use gpiolib, so select this option
from ARCH_TEGRA rather than each individual ARCH_TEGRA_*_SOC, to
prevent this problem for any future chips.

Signed-off-by: Stephen Warren <swarren@nvidia.com>
Signed-off-by: Olof Johansson <olof@lixom.net>

2 files changed, 1 insertions, 2 deletions

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index eb9fc2f8acf1..25541a1971aa 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -640,6 +640,7 @@ config ARCH_LPC32XX
 config ARCH_TEGRA
         bool "NVIDIA Tegra"
         select ARCH_HAS_CPUFREQ
+        select ARCH_REQUIRE_GPIOLIB
         select CLKDEV_LOOKUP
         select CLKSRC_MMIO
         select CLKSRC_OF
diff --git a/arch/arm/mach-tegra/Kconfig b/arch/arm/mach-tegra/Kconfig
index bde8197c8db8..86543241f5bb 100644
--- a/arch/arm/mach-tegra/Kconfig
+++ b/arch/arm/mach-tegra/Kconfig
@@ -5,7 +5,6 @@ comment "NVIDIA Tegra options"
 config ARCH_TEGRA_2x_SOC
         bool "Enable support for Tegra20 family"
         select ARCH_NEEDS_CPU_IDLE_COUPLED if SMP
-        select ARCH_REQUIRE_GPIOLIB
         select ARM_ERRATA_720789
         select ARM_ERRATA_742230 if SMP
         select ARM_ERRATA_751472
@@ -27,7 +26,6 @@ config ARCH_TEGRA_2x_SOC
 
 config ARCH_TEGRA_3x_SOC
         bool "Enable support for Tegra30 family"
-        select ARCH_REQUIRE_GPIOLIB
         select ARM_ERRATA_743622
         select ARM_ERRATA_751472
         select ARM_ERRATA_754322