ARM: tegra: Move AHB Kconfig to drivers/amba

This will allow the Kconfig option to be shared among 32-bit and 64-bit
ARM.

Signed-off-by: Thierry Reding <treding@nvidia.com>

diff --git a/arch/arm/mach-tegra/Kconfig b/arch/arm/mach-tegra/Kconfig
index 095399618ca53e04011c529698373eb31b55350a..d0be9a1ef6b8c136bd873b19242ed4421df3673e 100644 (file)
--- a/arch/arm/mach-tegra/Kconfig
+++ b/arch/arm/mach-tegra/Kconfig
@@ -2,6 +2,7 @@ menuconfig ARCH_TEGRA
        bool "NVIDIA Tegra" if ARCH_MULTI_V7
        select ARCH_REQUIRE_GPIOLIB
        select ARCH_SUPPORTS_TRUSTED_FOUNDATIONS
+       select ARM_AMBA
        select ARM_GIC
        select CLKSRC_MMIO
        select HAVE_ARM_SCU if SMP
@@ -59,12 +60,4 @@ config ARCH_TEGRA_124_SOC
          Support for NVIDIA Tegra T124 processor family, based on the
          ARM CortexA15MP CPU
 
-config TEGRA_AHB
-       bool "Enable AHB driver for NVIDIA Tegra SoCs"
-       default y
-       help
-         Adds AHB configuration functionality for NVIDIA Tegra SoCs,
-         which controls AHB bus master arbitration and some
-         performance parameters(priority, prefech size).
-
 endif

diff --git a/drivers/Kconfig b/drivers/Kconfig
index 1a693d3f9d51b52e116ee3ad76ad30023a2ea49c..af02a8a8ec4ab4bf07f7eb7cccf9cbff2c41a5b3 100644 (file)
--- a/drivers/Kconfig
+++ b/drivers/Kconfig
@@ -1,5 +1,7 @@
 menu "Device Drivers"
 
+source "drivers/amba/Kconfig"
+
 source "drivers/base/Kconfig"
 
 source "drivers/bus/Kconfig"

diff --git a/drivers/amba/Kconfig b/drivers/amba/Kconfig
index d1cba6a9b3b8454d49b9b7946b8d92bd1c3ac5e6..4a5c9d27905900f7bdc1d978f3ef89116e1d83c9 100644 (file)
--- a/drivers/amba/Kconfig
+++ b/drivers/amba/Kconfig
@@ -1,2 +1,14 @@
 config ARM_AMBA
        bool
+
+if ARM_AMBA
+
+config TEGRA_AHB
+       bool "Enable AHB driver for NVIDIA Tegra SoCs"
+       default y if ARCH_TEGRA
+       help
+         Adds AHB configuration functionality for NVIDIA Tegra SoCs,
+         which controls AHB bus master arbitration and some performance
+         parameters (priority, prefetch size).
+
+endif