From patchwork Tue Apr 20 22:56:43 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Kanigeri, Hari" X-Patchwork-Id: 93769 X-Patchwork-Delegate: tony@atomide.com Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o3KMtQMX001791 for ; Tue, 20 Apr 2010 22:57:42 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752118Ab0DTW4u (ORCPT ); Tue, 20 Apr 2010 18:56:50 -0400 Received: from bear.ext.ti.com ([192.94.94.41]:35855 "EHLO bear.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751201Ab0DTW4u (ORCPT ); Tue, 20 Apr 2010 18:56:50 -0400 Received: from dlep33.itg.ti.com ([157.170.170.112]) by bear.ext.ti.com (8.13.7/8.13.7) with ESMTP id o3KMujx4003344 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Tue, 20 Apr 2010 17:56:45 -0500 Received: from dlep26.itg.ti.com (localhost [127.0.0.1]) by dlep33.itg.ti.com (8.13.7/8.13.7) with ESMTP id o3KMujFU028171; Tue, 20 Apr 2010 17:56:45 -0500 (CDT) Received: from dlee74.ent.ti.com (localhost [127.0.0.1]) by dlep26.itg.ti.com (8.13.8/8.13.8) with ESMTP id o3KMujRa002601; Tue, 20 Apr 2010 17:56:45 -0500 (CDT) Received: from dlee03.ent.ti.com ([157.170.170.18]) by dlee74.ent.ti.com ([157.170.170.8]) with mapi; Tue, 20 Apr 2010 17:56:44 -0500 From: "Kanigeri, Hari" To: "linux-omap@vger.kernel.org" CC: "Shilimkar, Santosh" , Felipe Contreras , Hiroshi DOYU , "tony@atomide.com" Date: Tue, 20 Apr 2010 17:56:43 -0500 Subject: [PATCH 2/4][v3] OMAP:iommu support for OMAP4 Thread-Topic: [PATCH 2/4][v3] OMAP:iommu support for OMAP4 Thread-Index: Acrg3L9FB3tvhgh+S3+k6XFUt/C09g== Message-ID: <8F7AF80515AF0D4D93307E594F3CB40E4B3BF951@dlee03.ent.ti.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: yes X-MS-TNEF-Correlator: acceptlanguage: en-US MIME-Version: 1.0 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 (demeter.kernel.org [140.211.167.41]); Tue, 20 Apr 2010 22:57:42 +0000 (UTC) diff --git a/arch/arm/mach-omap2/omap-iommu.c b/arch/arm/mach-omap2/omap-iommu.c index 416a65d..f569371 100644 --- a/arch/arm/mach-omap2/omap-iommu.c +++ b/arch/arm/mach-omap2/omap-iommu.c @@ -13,6 +13,7 @@ #include #include +#include struct iommu_device { resource_size_t base; @@ -46,6 +47,31 @@ static struct iommu_device devices[] = { }; #endif +#ifdef CONFIG_ARCH_OMAP4 +static struct iommu_device devices[] = { + { + .base = OMAP4_MMU1_BASE, + .irq = INT_44XX_DUCATI_MMU_IRQ, + .pdata = { + .name = "ducati", + .nr_tlb_entries = 32, + .clk_name = "ducati_ick", + }, + }, +#if defined(CONFIG_MPU_TESLA_IOMMU) + { + .base = OMAP4_MMU2_BASE, + .irq = INT_44XX_DSP_MMU, + .pdata = { + .name = "tesla", + .nr_tlb_entries = 32, + .clk_name = "tesla_ick", + }, + }, +#endif +}; +#endif + #define NR_IOMMU_DEVICES ARRAY_SIZE(devices) static struct platform_device *omap_iommu_pdev[NR_IOMMU_DEVICES]; diff --git a/arch/arm/plat-omap/include/plat/omap44xx.h b/arch/arm/plat-omap/include/plat/omap44xx.h index 9cb1e9d..1b5b786 100644 --- a/arch/arm/plat-omap/include/plat/omap44xx.h +++ b/arch/arm/plat-omap/include/plat/omap44xx.h @@ -47,5 +47,8 @@ #define OMAP44XX_MAILBOX_BASE (L4_44XX_BASE + 0xF4000) #define OMAP44XX_HSUSB_OTG_BASE (L4_44XX_BASE + 0xAB000) +#define OMAP4_MMU1_BASE 0x55082000 +#define OMAP4_MMU2_BASE 0x4A066000 + #endif /* __ASM_ARCH_OMAP44XX_H */