From patchwork Thu Apr 22 23:26:08 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Kanigeri, Hari" X-Patchwork-Id: 94556 X-Patchwork-Delegate: hiroshi.doyu@nokia.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 o3MN8Mbg021911 for ; Thu, 22 Apr 2010 23:08:35 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753800Ab0DVXIX (ORCPT ); Thu, 22 Apr 2010 19:08:23 -0400 Received: from arroyo.ext.ti.com ([192.94.94.40]:35270 "EHLO arroyo.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753774Ab0DVXIV (ORCPT ); Thu, 22 Apr 2010 19:08:21 -0400 Received: from dlep35.itg.ti.com ([157.170.170.118]) by arroyo.ext.ti.com (8.13.7/8.13.7) with ESMTP id o3MN8KoW017185 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Thu, 22 Apr 2010 18:08:20 -0500 Received: from legion.dal.design.ti.com (localhost [127.0.0.1]) by dlep35.itg.ti.com (8.13.7/8.13.7) with ESMTP id o3MN8JeE028583; Thu, 22 Apr 2010 18:08:19 -0500 (CDT) Received: from localhost (matrix.am.dhcp.ti.com [128.247.75.166]) by legion.dal.design.ti.com (8.11.7p1+Sun/8.11.7) with ESMTP id o3MN8JZ20601; Thu, 22 Apr 2010 18:08:19 -0500 (CDT) From: Hari Kanigeri To: "linux-omap Tony Lindgren Hiroshi Doyu" Cc: Hari Kanigeri Subject: [PATCH 1/4][v4] OMAP:iommu renamed omap3-iommu to omap-iommu Date: Thu, 22 Apr 2010 18:26:08 -0500 Message-Id: <1271978771-26889-2-git-send-email-h-kanigeri2@ti.com> X-Mailer: git-send-email 1.7.0 In-Reply-To: <1271978771-26889-1-git-send-email-h-kanigeri2@ti.com> References: <1271978771-26889-1-git-send-email-h-kanigeri2@ti.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.3 (demeter.kernel.org [140.211.167.41]); Thu, 22 Apr 2010 23:08:38 +0000 (UTC) diff --git a/arch/arm/mach-omap2/Makefile b/arch/arm/mach-omap2/Makefile index dac3e56..0f616cb 100644 --- a/arch/arm/mach-omap2/Makefile +++ b/arch/arm/mach-omap2/Makefile @@ -88,9 +88,7 @@ obj-$(CONFIG_ARCH_OMAP2) += remoteproc24xx.o obj-$(CONFIG_ARCH_OMAP3) += remoteproc3xxx.o obj-$(CONFIG_ARCH_OMAP4) += remoteproc44xx.o endif -iommu-y += iommu2.o -iommu-$(CONFIG_ARCH_OMAP3) += omap3-iommu.o - +iommu-y += iommu2.o omap-iommu.o obj-$(CONFIG_OMAP_IOMMU) += $(iommu-y) i2c-omap-$(CONFIG_I2C_OMAP) := i2c.o diff --git a/arch/arm/mach-omap2/omap3-iommu.c b/arch/arm/mach-omap2/omap-iommu.c similarity index 79% rename from arch/arm/mach-omap2/omap3-iommu.c rename to arch/arm/mach-omap2/omap-iommu.c index fbbcb5c..416a65d 100644 --- a/arch/arm/mach-omap2/omap3-iommu.c +++ b/arch/arm/mach-omap2/omap-iommu.c @@ -1,5 +1,5 @@ /* - * omap iommu: omap3 device registration + * omap iommu: omap device registration * * Copyright (C) 2008-2009 Nokia Corporation * @@ -21,6 +21,7 @@ struct iommu_device { struct resource res[2]; }; +#ifdef CONFIG_ARCH_OMAP3 static struct iommu_device devices[] = { { .base = 0x480bd400, @@ -43,11 +44,13 @@ static struct iommu_device devices[] = { }, #endif }; +#endif + #define NR_IOMMU_DEVICES ARRAY_SIZE(devices) -static struct platform_device *omap3_iommu_pdev[NR_IOMMU_DEVICES]; +static struct platform_device *omap_iommu_pdev[NR_IOMMU_DEVICES]; -static int __init omap3_iommu_init(void) +static int __init omap_iommu_init(void) { int i, err; struct resource res[] = { @@ -80,26 +83,26 @@ static int __init omap3_iommu_init(void) err = platform_device_add(pdev); if (err) goto err_out; - omap3_iommu_pdev[i] = pdev; + omap_iommu_pdev[i] = pdev; } return 0; err_out: while (i--) - platform_device_put(omap3_iommu_pdev[i]); + platform_device_put(omap_iommu_pdev[i]); return err; } -module_init(omap3_iommu_init); +module_init(omap_iommu_init); -static void __exit omap3_iommu_exit(void) +static void __exit omap_iommu_exit(void) { int i; for (i = 0; i < NR_IOMMU_DEVICES; i++) - platform_device_unregister(omap3_iommu_pdev[i]); + platform_device_unregister(omap_iommu_pdev[i]); } -module_exit(omap3_iommu_exit); +module_exit(omap_iommu_exit); MODULE_AUTHOR("Hiroshi DOYU"); -MODULE_DESCRIPTION("omap iommu: omap3 device registration"); +MODULE_DESCRIPTION("omap iommu: omap device registration"); MODULE_LICENSE("GPL v2");