All of lore.kernel.org
 help / color / mirror / Atom feed
From: Hari Kanigeri <h-kanigeri2@ti.com>
To: "linux-omap <linux-omap@vger.kernel.org> Tony Lindgren
	<tony@atomide.com> Hiroshi Doyu" <Hiroshi.DOYU@nokia.com>
Cc: Hari Kanigeri <h-kanigeri2@ti.com>
Subject: [PATCH 1/4][v4] OMAP:iommu renamed omap3-iommu to omap-iommu
Date: Thu, 22 Apr 2010 18:26:08 -0500	[thread overview]
Message-ID: <1271978771-26889-2-git-send-email-h-kanigeri2@ti.com> (raw)
In-Reply-To: <1271978771-26889-1-git-send-email-h-kanigeri2@ti.com>

This patch includes changes to omap3-iommu.c file to make it generic
for all OMAPs. Renamed omap3-iommu.c to omap-iommu.c

Signed-off-by: Hari Kanigeri <h-kanigeri2@ti.com>
---
 arch/arm/mach-omap2/Makefile                       |    4 +--
 .../arm/mach-omap2/{omap3-iommu.c => omap-iommu.c} |   23 +++++++++++--------
 2 files changed, 14 insertions(+), 13 deletions(-)
 rename arch/arm/mach-omap2/{omap3-iommu.c => omap-iommu.c} (79%)

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");
-- 
1.7.0


  reply	other threads:[~2010-04-22 23:08 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-04-22 23:26 [PATCH 0/4][v4]OMAP:IOMMU support for OMAP4 and TLB preservation support Hari Kanigeri
2010-04-22 23:26 ` Hari Kanigeri [this message]
2010-04-22 23:26 ` [PATCH 2/4][v4] OMAP:iommu support for OMAP4 Hari Kanigeri
2010-04-22 23:26 ` [PATCH 3/4][v4] OMAP:iommu - missing check for TLB valid entry Hari Kanigeri
2010-04-22 23:26 ` [PATCH 4/4][v4] OMAP:iommu- add TLB preservation support Hari Kanigeri

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1271978771-26889-2-git-send-email-h-kanigeri2@ti.com \
    --to=h-kanigeri2@ti.com \
    --cc=Hiroshi.DOYU@nokia.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.