Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 44da397f authored by Kanigeri, Hari's avatar Kanigeri, Hari Committed by Hiroshi DOYU
Browse files

omap iommu: renamed omap3-iommu to omap-iommu 



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: default avatarHari Kanigeri <h-kanigeri2@ti.com>
Signed-off-by: default avatarHiroshi DOYU <Hiroshi.DOYU@nokia.com>
parent b57f95a3

arch/arm/mach-omap2/Makefile

+1 −4
Original line number Original line Diff line number Diff line
@@ -89,10 +89,7 @@ obj-$(CONFIG_OMAP3_EMU) += emu.o 
obj-$(CONFIG_OMAP_MBOX_FWK)		+= mailbox_mach.o

obj-$(CONFIG_OMAP_MBOX_FWK)		+= mailbox_mach.o

mailbox_mach-objs			:= mailbox.o

mailbox_mach-objs			:= mailbox.o





iommu-y					+= iommu2.o

obj-$(CONFIG_OMAP_IOMMU)		:= iommu2.o omap-iommu.o

iommu-$(CONFIG_ARCH_OMAP3)		+= omap3-iommu.o



obj-$(CONFIG_OMAP_IOMMU)		+= $(iommu-y)





i2c-omap-$(CONFIG_I2C_OMAP)		:= i2c.o

i2c-omap-$(CONFIG_I2C_OMAP)		:= i2c.o

obj-y					+= $(i2c-omap-m) $(i2c-omap-y)

obj-y					+= $(i2c-omap-m) $(i2c-omap-y)

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

+13 −10
Original line number Original line Diff line number Diff line 
/*

/*

 * omap iommu: omap3 device registration

 * omap iommu: omap device registration

 *

 *

 * Copyright (C) 2008-2009 Nokia Corporation

 * Copyright (C) 2008-2009 Nokia Corporation

 *

 *
@@ -21,6 +21,7 @@ struct iommu_device { 
	struct resource res[2];

	struct resource res[2];

};

};





#ifdef CONFIG_ARCH_OMAP3

static struct iommu_device devices[] = {

static struct iommu_device devices[] = {

	{

	{

		.base = 0x480bd400,

		.base = 0x480bd400,
@@ -43,11 +44,13 @@ static struct iommu_device devices[] = { 
	},

	},

#endif

#endif

};

};

#endif



#define NR_IOMMU_DEVICES ARRAY_SIZE(devices)

#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;

	int i, err;

	struct resource res[] = {

	struct resource res[] = {
@@ -80,26 +83,26 @@ static int __init omap3_iommu_init(void) 
		err = platform_device_add(pdev);

		err = platform_device_add(pdev);

		if (err)

		if (err)

			goto err_out;

			goto err_out;

		omap3_iommu_pdev[i] = pdev;

		omap_iommu_pdev[i] = pdev;

	}

	}

	return 0;

	return 0;





err_out:

err_out:

	while (i--)

	while (i--)

		platform_device_put(omap3_iommu_pdev[i]);

		platform_device_put(omap_iommu_pdev[i]);

	return err;

	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;

	int i;





	for (i = 0; i < NR_IOMMU_DEVICES; 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_AUTHOR("Hiroshi DOYU");

MODULE_DESCRIPTION("omap iommu: omap3 device registration");

MODULE_DESCRIPTION("omap iommu: omap device registration");

MODULE_LICENSE("GPL v2");
 
MODULE_LICENSE("GPL v2");