diff --git a/drivers/amba/Kconfig b/drivers/amba/Kconfig
index de499bb045a9..d6eb19db16c2 100644
--- a/drivers/amba/Kconfig
+++ b/drivers/amba/Kconfig
@@ -6,7 +6,7 @@ if ARM_AMBA
 
 config TEGRA_AHB
 	bool "Enable AHB driver for NVIDIA Tegra SoCs" if COMPILE_TEST
-	default y if ARCH_TEGRA && !GKI_HACKS_TO_FIX
+	default y if (ARCH_TEGRA && ARM) || ARCH_TEGRA_210_SOC
 	help
 	  Adds AHB configuration functionality for NVIDIA Tegra SoCs,
 	  which controls AHB bus master arbitration and some performance