diff options
| author | Felipe Contreras <felipe.contreras@nokia.com> | 2010-10-11 09:53:49 +0000 |
|---|---|---|
| committer | Hari Kanigeri <h-kanigeri2@ti.com> | 2010-12-15 11:33:31 -0600 |
| commit | 1cd25df4e53b9507f7abbb8aff8ce2ba644a1468 (patch) | |
| tree | 9dba5735200f9cd80e5e0a0941afc0f5d124d045 /arch/arm | |
| parent | c7f4ab26e3bcdaeb3e19ec658e3ad9092f1a6ceb (diff) | |
OMAP: iommu: make iva2 iommu selectable
It seems dsp-link will do this, and tidspbridge too at some point, but
right now it's not possible to select CONFIG_MPU_BRIDGE_IOMMU.
Cc: Fernando Guzman Lugo <fernando.lugo@ti.com>
Cc: Yogesh Marathe <yogesh_marathe@ti.com>
Signed-off-by: Felipe Contreras <felipe.contreras@nokia.com>
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/mach-omap2/omap-iommu.c | 2 | ||||
| -rw-r--r-- | arch/arm/plat-omap/Kconfig | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/omap-iommu.c b/arch/arm/mach-omap2/omap-iommu.c index 6be548cdd80..3fc5dc7233d 100644 --- a/arch/arm/mach-omap2/omap-iommu.c +++ b/arch/arm/mach-omap2/omap-iommu.c @@ -37,7 +37,7 @@ static struct iommu_device omap3_devices[] = { .da_end = 0xFFFFF000, }, }, -#if defined(CONFIG_MPU_BRIDGE_IOMMU) +#if defined(CONFIG_OMAP_IOMMU_IVA2) { .base = 0x5d000000, .irq = 28, diff --git a/arch/arm/plat-omap/Kconfig b/arch/arm/plat-omap/Kconfig index 92c5bb7909f..5e63e5069e0 100644 --- a/arch/arm/plat-omap/Kconfig +++ b/arch/arm/plat-omap/Kconfig @@ -109,6 +109,9 @@ config OMAP_IOMMU_DEBUG Say N unless you know you need this. +config OMAP_IOMMU_IVA2 + bool + choice prompt "System timer" default OMAP_32K_TIMER if !ARCH_OMAP15XX |