From 7cca73f9df2d11750b37173e95c015e7c831642b Mon Sep 17 00:00:00 2001 From: Hiroshi DOYU Date: Fri, 11 May 2012 09:56:25 +0300 Subject: [PATCH] --- yaml --- r: 304104 b: refs/heads/master c: 42d1149f75a3d78033f66853796f20340d7b3ee2 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-tegra/Kconfig | 2 -- trunk/drivers/memory/Kconfig | 8 +++++++- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index a78925a9eb65..93766baecc92 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f0e33f9805625d60dc81f34740f16a6db67e8427 +refs/heads/master: 42d1149f75a3d78033f66853796f20340d7b3ee2 diff --git a/trunk/arch/arm/mach-tegra/Kconfig b/trunk/arch/arm/mach-tegra/Kconfig index 271b558a7b1d..d0f2546706ca 100644 --- a/trunk/arch/arm/mach-tegra/Kconfig +++ b/trunk/arch/arm/mach-tegra/Kconfig @@ -41,8 +41,6 @@ config ARCH_TEGRA_3x_SOC select ARM_ERRATA_764369 select PL310_ERRATA_769419 if CACHE_L2X0 select CPU_FREQ_TABLE if CPU_FREQ - select MEMORY - select TEGRA30_MC help Support for NVIDIA Tegra T30 processor family, based on the ARM CortexA9MP CPU and the ARM PL310 L2 cache controller diff --git a/trunk/drivers/memory/Kconfig b/trunk/drivers/memory/Kconfig index efc6b36f28c8..067f31174a0e 100644 --- a/trunk/drivers/memory/Kconfig +++ b/trunk/drivers/memory/Kconfig @@ -31,7 +31,13 @@ config TEGRA20_MC Relocation Table) module. config TEGRA30_MC - bool + bool "Tegra30 Memory Controller(MC) driver" + default y depends on ARCH_TEGRA_3x_SOC + help + This driver is for the Memory Controller(MC) module available + in Tegra30 SoCs, mainly for a address translation fault + analysis, especially for IOMMU/SMMU(System Memory Management + Unit) module. endif