From patchwork Sat May 16 10:41:41 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felipe Contreras X-Patchwork-Id: 24253 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n4GAgUGh003160 for ; Sat, 16 May 2009 10:42:31 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755885AbZEPKls (ORCPT ); Sat, 16 May 2009 06:41:48 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754799AbZEPKls (ORCPT ); Sat, 16 May 2009 06:41:48 -0400 Received: from fg-out-1718.google.com ([72.14.220.159]:53153 "EHLO fg-out-1718.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755885AbZEPKlr (ORCPT ); Sat, 16 May 2009 06:41:47 -0400 Received: by fg-out-1718.google.com with SMTP id 16so836244fgg.17 for ; Sat, 16 May 2009 03:41:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:from:to:cc:subject:date :message-id:x-mailer; bh=72iqVRx2vwns0zBAkfpQSthm9gZP+rq3xgpQsBmPrwc=; b=vkcONy1itUnT2dN8+mTfxY5i2gPXg94DQL1kORKDEuqY78kyULElhe7lYsvws+yjxZ +Wp10HlMGC25361ekI/K0ZM7uiFZQQCEc8aN83E6+VODkf2cViREFd/J3DNBRd9d2kCJ pzlA2Ghzw0rbsvBYOv8D5IehWdizJUOVObtxM= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer; b=s3xFkRHMZM/wk+D4WsuErG1BRTlnRDhDkYmFdX4wkQKQctdBTB/XdyxmCCSVF5yZZT gv9nEuV67PT+YQp2z0A51ysV7EE0y8RdP+Uj5e5Rc+2pAqVqyIOTtVbnSNyKiSGhHw1a 2Khrbm4xTbwoWw+5LmuSZecmebxYPYrhzmRk4= Received: by 10.86.59.2 with SMTP id h2mr4681043fga.73.1242470507376; Sat, 16 May 2009 03:41:47 -0700 (PDT) Received: from localhost (a91-153-253-80.elisa-laajakaista.fi [91.153.253.80]) by mx.google.com with ESMTPS id 4sm976177fge.8.2009.05.16.03.41.46 (version=TLSv1/SSLv3 cipher=RC4-MD5); Sat, 16 May 2009 03:41:47 -0700 (PDT) From: Felipe Contreras To: linux-omap@vger.kernel.org Cc: Hiroshi DOYU , Hari Kanigeri , linux-arm-kernel@lists.arm.linux.org.uk, Felipe Contreras Subject: [RFC/PATCH 1/3] omap3-iommu: reorganize Date: Sat, 16 May 2009 13:41:41 +0300 Message-Id: <1242470501-23400-1-git-send-email-felipe.contreras@gmail.com> X-Mailer: git-send-email 1.6.3.1 Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org No functional changes. Signed-off-by: Felipe Contreras --- arch/arm/mach-omap2/omap3-iommu.c | 72 ++++++++++++++++++------------------ 1 files changed, 36 insertions(+), 36 deletions(-) diff --git a/arch/arm/mach-omap2/omap3-iommu.c b/arch/arm/mach-omap2/omap3-iommu.c index 367f36a..f4232ec 100644 --- a/arch/arm/mach-omap2/omap3-iommu.c +++ b/arch/arm/mach-omap2/omap3-iommu.c @@ -14,43 +14,31 @@ #include -#define OMAP3_MMU1_BASE 0x480bd400 -#define OMAP3_MMU2_BASE 0x5d000000 -#define OMAP3_MMU1_IRQ 24 -#define OMAP3_MMU2_IRQ 28 - -static struct resource omap3_iommu_res[] = { - { /* Camera ISP MMU */ - .start = OMAP3_MMU1_BASE, - .end = OMAP3_MMU1_BASE + MMU_REG_SIZE - 1, - .flags = IORESOURCE_MEM, - }, - { - .start = OMAP3_MMU1_IRQ, - .flags = IORESOURCE_IRQ, - }, - { /* IVA2.2 MMU */ - .start = OMAP3_MMU2_BASE, - .end = OMAP3_MMU2_BASE + MMU_REG_SIZE - 1, - .flags = IORESOURCE_MEM, - }, - { - .start = OMAP3_MMU2_IRQ, - .flags = IORESOURCE_IRQ, - }, +struct iommu_device { + resource_size_t base; + resource_size_t irq; + struct iommu_platform_data pdata; + struct resource res[2]; }; -#define NR_IOMMU_RES (ARRAY_SIZE(omap3_iommu_res) / 2) -static const struct iommu_platform_data omap3_iommu_pdata[] __initconst = { +static struct iommu_device devices[] = { { - .name = "isp", - .nr_tlb_entries = 8, - .clk_name = "cam_ick", + .base = 0x480bd400, + .irq = 24, + .pdata = { + .name = "isp", + .nr_tlb_entries = 8, + .clk_name = "cam_ick", + }, }, { - .name = "iva2", - .nr_tlb_entries = 32, - .clk_name = "iva2_ck", + .base = 0x5d000000, + .irq = 28, + .pdata = { + .name = "iva2", + .nr_tlb_entries = 32, + .clk_name = "iva2_ck", + }, }, }; #define NR_IOMMU_DEVICES ARRAY_SIZE(omap3_iommu_pdata) @@ -63,23 +51,35 @@ static int __init omap3_iommu_init(void) for (i = 0; i < NR_IOMMU_DEVICES; i++) { struct platform_device *pdev; + const struct iommu_device *d = &devices[i]; + struct resource res[] = { + { .flags = IORESOURCE_MEM }, + { .flags = IORESOURCE_IRQ }, + }; pdev = platform_device_alloc("omap-iommu", i + 1); if (!pdev) { err = -ENOMEM; goto err_out; } - err = platform_device_add_resources(pdev, - &omap3_iommu_res[2 * i], NR_IOMMU_RES); + + res[0].start = d->base; + res[0].end = d->base + MMU_REG_SIZE - 1; + + res[1].start = d->irq; + + err = platform_device_add_resources(pdev, res, ARRAY_SIZE(res)); if (err) goto err_out; - err = platform_device_add_data(pdev, &omap3_iommu_pdata[i], - sizeof(omap3_iommu_pdata[0])); + + err = platform_device_add_data(pdev, &d->pdata, sizeof(d->pdata)); if (err) goto err_out; + err = platform_device_add(pdev); if (err) goto err_out; + omap3_iommu_pdev[i] = pdev; } return 0;