leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

omap iommu: renamed omap3-iommu to omap-iommu

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

[Hiroshi DOYU: Remove unnecessary "iommu-y" in Makefile]

Signed-off-by: Hari Kanigeri <h-kanigeri2@ti.com>
Signed-off-by: Hiroshi DOYU <Hiroshi.DOYU@nokia.com>
This commit is contained in:
Kanigeri, Hari 2010-04-22 23:26:08 +00:00 committed by Hiroshi DOYU
parent b57f95a382
commit 44da397fad
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
arch/arm/mach-omap2/Makefile
View File

@ -89,10 +89,7 @@ obj-$(CONFIG_OMAP3_EMU) += emu.o
obj-$(CONFIG_OMAP_MBOX_FWK) += mailbox_mach.o
mailbox_mach-objs := mailbox.o
iommu-y += iommu2.o
iommu-$(CONFIG_ARCH_OMAP3) += omap3-iommu.o
obj-$(CONFIG_OMAP_IOMMU) += $(iommu-y)
obj-$(CONFIG_OMAP_IOMMU) := iommu2.o omap-iommu.o
i2c-omap-$(CONFIG_I2C_OMAP) := i2c.o
obj-y += $(i2c-omap-m) $(i2c-omap-y)

23
arch/arm/mach-omap2/omap3-iommu.c → arch/arm/mach-omap2/omap-iommu.c
View File

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