diff mbox

[05/11] omap3: Remove non-existent config option

Message ID AANLkTinZqx2nFuoYoCYpD4+PG7_J=ACLBxAwOvpVm4c9@mail.gmail.com (mailing list archive)
State RFC, archived
Delegated to: Tony Lindgren
Headers show

Commit Message

Felipe Contreras Sept. 29, 2010, 7:12 p.m. UTC
None
diff mbox

Patch

From 2795948f11cb218eb7f4be26fd747727ba5c31da Mon Sep 17 00:00:00 2001
From: Felipe Contreras <felipe.contreras@nokia.com>
Date: Wed, 29 Sep 2010 22:05:46 +0300
Subject: [PATCH] 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.

Signed-off-by: Felipe Contreras <felipe.contreras@nokia.com>
---
 arch/arm/mach-omap2/omap-iommu.c |    2 +-
 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 f5a1aad..adc0904 100644
--- a/arch/arm/mach-omap2/omap-iommu.c
+++ b/arch/arm/mach-omap2/omap-iommu.c
@@ -35,7 +35,7 @@  static struct iommu_device omap3_devices[] = {
 			.clk_name = "cam_ick",
 		},
 	},
-#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 e39a417..e0b41b6 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
-- 
1.7.3.2.g9e605