From patchwork Wed Sep 29 19:12:24 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felipe Contreras X-Patchwork-Id: 217902 X-Patchwork-Delegate: tony@atomide.com Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id o8TJCRZJ018698 for ; Wed, 29 Sep 2010 19:12:27 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754201Ab0I2TM0 (ORCPT ); Wed, 29 Sep 2010 15:12:26 -0400 Received: from mail-bw0-f46.google.com ([209.85.214.46]:53743 "EHLO mail-bw0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753249Ab0I2TM0 (ORCPT ); Wed, 29 Sep 2010 15:12:26 -0400 Received: by bwz11 with SMTP id 11so816078bwz.19 for ; Wed, 29 Sep 2010 12:12:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:mime-version:received:received:in-reply-to :references:date:message-id:subject:from:to:cc:content-type; bh=eWNtDBuucUfUujTrkVuzZamXU416TDsm4K6NPGgi0ds=; b=nVlv9zcx18GemSFqGZ147JqheLQ46przIn5p04zRIBgH/9xYCSlVIfxMm29HY6BDgd 3h3qkf4UwFzjX+GScTI9u9ReJv4DvB8cQaCTiBvgiF4IlU8yaoBKSpNpRd8Fg6pmvo1/ vsI0RIiFPreZYvFJBb3RETQaAEHKXUkPJJzAc= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type; b=KYIoFpOr4C1iwx1WTqEish5QD/8wn+196Evlf0IP1SJUDnGGN+qfU3o+ZOlaK8khEC jTdEHaOLflcUZfthgvP0e+bEo5YNryyhfZyQycsecNqqk82XbQf4Q8CLoYAMPWgMfYc2 2h3ITGWTWdLggZJJGqO7i5uBwTdwostZ6RUC4= MIME-Version: 1.0 Received: by 10.204.73.1 with SMTP id o1mr1592037bkj.132.1285787544527; Wed, 29 Sep 2010 12:12:24 -0700 (PDT) Received: by 10.204.152.142 with HTTP; Wed, 29 Sep 2010 12:12:24 -0700 (PDT) In-Reply-To: References: <20100924014938.10325.35279.stgit@baageli.muru.com> <20100924015056.10325.95854.stgit@baageli.muru.com> <8F7AF80515AF0D4D93307E594F3CB40E5F6A365B@dlee03.ent.ti.com> Date: Wed, 29 Sep 2010 22:12:24 +0300 Message-ID: Subject: Re: [PATCH 05/11] omap3: Remove non-existent config option From: Felipe Contreras To: "Marathe, Yogesh" Cc: "Kanigeri, Hari" , "Premi, Sanjeev" , Tony Lindgren , "linux-arm-kernel@lists.infradead.org" , "linux-omap@vger.kernel.org" Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter1.kernel.org [140.211.167.41]); Wed, 29 Sep 2010 19:12:27 +0000 (UTC) From 2795948f11cb218eb7f4be26fd747727ba5c31da Mon Sep 17 00:00:00 2001 From: Felipe Contreras 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 --- 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