From patchwork Fri Jun 10 21:55:45 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ohad Ben Cohen X-Patchwork-Id: 870942 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.4) with ESMTP id p5ALwM6l026561 for ; Fri, 10 Jun 2011 21:58:24 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758171Ab1FJV5a (ORCPT ); Fri, 10 Jun 2011 17:57:30 -0400 Received: from mail-wy0-f174.google.com ([74.125.82.174]:56144 "EHLO mail-wy0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758141Ab1FJV5X (ORCPT ); Fri, 10 Jun 2011 17:57:23 -0400 Received: by mail-wy0-f174.google.com with SMTP id 21so2152395wya.19 for ; Fri, 10 Jun 2011 14:57:22 -0700 (PDT) Received: by 10.227.197.199 with SMTP id el7mr2563711wbb.32.1307743042113; Fri, 10 Jun 2011 14:57:22 -0700 (PDT) Received: from localhost.localdomain (46-116-119-47.bb.netvision.net.il [46.116.119.47]) by mx.google.com with ESMTPS id e1sm2343652wbh.22.2011.06.10.14.57.19 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 10 Jun 2011 14:57:21 -0700 (PDT) From: Ohad Ben-Cohen To: Joerg Roedel Cc: , , , Arnd Bergmann , David Brown , David Woodhouse , , , Ohad Ben-Cohen Subject: [PATCH v2 2/4] msm: iommu: move to drivers/iommu/ Date: Sat, 11 Jun 2011 00:55:45 +0300 Message-Id: <1307742947-32118-3-git-send-email-ohad@wizery.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1307742947-32118-1-git-send-email-ohad@wizery.com> References: <1307742947-32118-1-git-send-email-ohad@wizery.com> 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.6 (demeter1.kernel.org [140.211.167.41]); Fri, 10 Jun 2011 21:58:25 +0000 (UTC) This should ease finding similarities with different platforms, with the intention of solving problems once in a generic framework which everyone can use. Compile-tested for MSM8X60. Signed-off-by: Ohad Ben-Cohen Acked-by: David Brown Acked-by: David Brown --- arch/arm/mach-msm/Kconfig | 16 ---------------- arch/arm/mach-msm/Makefile | 2 +- drivers/iommu/Kconfig | 16 ++++++++++++++++ drivers/iommu/Makefile | 1 + .../mach-msm/iommu.c => drivers/iommu/msm_iommu.c | 0 .../iommu_dev.c => drivers/iommu/msm_iommu_dev.c | 0 6 files changed, 18 insertions(+), 17 deletions(-) rename arch/arm/mach-msm/iommu.c => drivers/iommu/msm_iommu.c (100%) rename arch/arm/mach-msm/iommu_dev.c => drivers/iommu/msm_iommu_dev.c (100%) diff --git a/arch/arm/mach-msm/iommu.c b/drivers/iommu/msm_iommu.c similarity index 100% rename from arch/arm/mach-msm/iommu.c rename to drivers/iommu/msm_iommu.c diff --git a/arch/arm/mach-msm/iommu_dev.c b/drivers/iommu/msm_iommu_dev.c similarity index 100% rename from arch/arm/mach-msm/iommu_dev.c rename to drivers/iommu/msm_iommu_dev.c diff --git a/arch/arm/mach-msm/Kconfig b/arch/arm/mach-msm/Kconfig index efb7b7d..888e925 100644 --- a/arch/arm/mach-msm/Kconfig +++ b/arch/arm/mach-msm/Kconfig @@ -148,22 +148,6 @@ config MACH_MSM8960_RUMI3 endmenu -config MSM_IOMMU - bool "MSM IOMMU Support" - depends on ARCH_MSM8X60 || ARCH_MSM8960 - select IOMMU_API - default n - help - Support for the IOMMUs found on certain Qualcomm SOCs. - These IOMMUs allow virtualization of the address space used by most - cores within the multimedia subsystem. - - If unsure, say N here. - -config IOMMU_PGTABLES_L2 - def_bool y - depends on MSM_IOMMU && MMU && SMP && CPU_DCACHE_DISABLE=n - config MSM_DEBUG_UART int default 1 if MSM_DEBUG_UART1 diff --git a/arch/arm/mach-msm/Makefile b/arch/arm/mach-msm/Makefile index 9519fd2..b70658c 100644 --- a/arch/arm/mach-msm/Makefile +++ b/arch/arm/mach-msm/Makefile @@ -3,7 +3,7 @@ obj-y += clock.o obj-$(CONFIG_DEBUG_FS) += clock-debug.o obj-$(CONFIG_MSM_VIC) += irq-vic.o -obj-$(CONFIG_MSM_IOMMU) += iommu.o iommu_dev.o devices-iommu.o +obj-$(CONFIG_MSM_IOMMU) += devices-iommu.o obj-$(CONFIG_ARCH_MSM7X00A) += dma.o irq.o acpuclock-arm11.o obj-$(CONFIG_ARCH_MSM7X30) += dma.o diff --git a/drivers/iommu/Kconfig b/drivers/iommu/Kconfig index 2c5dfb4..21a80bf 100644 --- a/drivers/iommu/Kconfig +++ b/drivers/iommu/Kconfig @@ -1,3 +1,19 @@ # IOMMU_API always gets selected by whoever wants it. config IOMMU_API bool + +# MSM IOMMU support +config MSM_IOMMU + bool "MSM IOMMU Support" + depends on ARCH_MSM8X60 || ARCH_MSM8960 + select IOMMU_API + help + Support for the IOMMUs found on certain Qualcomm SOCs. + These IOMMUs allow virtualization of the address space used by most + cores within the multimedia subsystem. + + If unsure, say N here. + +config IOMMU_PGTABLES_L2 + def_bool y + depends on MSM_IOMMU && MMU && SMP && CPU_DCACHE_DISABLE=n diff --git a/drivers/iommu/Makefile b/drivers/iommu/Makefile index 241ba4c..1a71c82 100644 --- a/drivers/iommu/Makefile +++ b/drivers/iommu/Makefile @@ -1 +1,2 @@ obj-$(CONFIG_IOMMU_API) += iommu.o +obj-$(CONFIG_MSM_IOMMU) += msm_iommu.o msm_iommu_dev.o