[PATCH 1/2] omap: iommu: make iva2 iommu selectable

[Hiroshi DOYU]

From: ext Felipe Contreras <felipe.contreras at gmail.com>
Subject: [PATCH 1/2] omap: iommu: make iva2 iommu selectable
Date: Mon, 11 Oct 2010 11:53:49 +0200

> From: Felipe Contreras <felipe.contreras at nokia.com>
> 
> 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.

Why does it have to be selectable?

Please Cc: linux-arm-kernel at lists.infradead.org too.

> 
> Cc: Fernando Guzman Lugo <fernando.lugo at ti.com>
> Cc: Yogesh Marathe <yogesh_marathe at ti.com>
> Signed-off-by: Felipe Contreras <felipe.contreras at 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.1.2.g7fe2b
>