omap: iommu: reorganize
This way it's more object oriented and easier to see what is happening. No functional changes. Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
This commit is contained in:
parent
5934ba2dc0
commit
a76e9a90e8
arch/arm/mach-omap2
|
@ -14,47 +14,50 @@
|
||||||
|
|
||||||
#include <plat/iommu.h>
|
#include <plat/iommu.h>
|
||||||
|
|
||||||
#define OMAP3_MMU1_BASE 0x480bd400
|
struct iommu_device {
|
||||||
#define OMAP3_MMU2_BASE 0x5d000000
|
resource_size_t base;
|
||||||
#define OMAP3_MMU1_IRQ 24
|
int irq;
|
||||||
#define OMAP3_MMU2_IRQ 28
|
struct iommu_platform_data pdata;
|
||||||
|
struct resource res[2];
|
||||||
|
|
||||||
static unsigned long iommu_base[] __initdata = {
|
|
||||||
OMAP3_MMU1_BASE,
|
|
||||||
OMAP3_MMU2_BASE,
|
|
||||||
};
|
};
|
||||||
|
|
||||||
static int iommu_irq[] __initdata = {
|
static struct iommu_device devices[] = {
|
||||||
OMAP3_MMU1_IRQ,
|
|
||||||
OMAP3_MMU2_IRQ,
|
|
||||||
};
|
|
||||||
|
|
||||||
static const struct iommu_platform_data omap3_iommu_pdata[] __initconst = {
|
|
||||||
{
|
{
|
||||||
.name = "isp",
|
.base = 0x480bd400,
|
||||||
.nr_tlb_entries = 8,
|
.irq = 24,
|
||||||
.clk_name = "cam_ick",
|
.pdata = {
|
||||||
|
.name = "isp",
|
||||||
|
.nr_tlb_entries = 8,
|
||||||
|
.clk_name = "cam_ick",
|
||||||
|
},
|
||||||
},
|
},
|
||||||
#if defined(CONFIG_MPU_BRIDGE_IOMMU)
|
#if defined(CONFIG_MPU_BRIDGE_IOMMU)
|
||||||
{
|
{
|
||||||
.name = "iva2",
|
.base = 0x5d000000,
|
||||||
.nr_tlb_entries = 32,
|
.irq = 28,
|
||||||
.clk_name = "iva2_ck",
|
.pdata = {
|
||||||
|
.name = "iva2",
|
||||||
|
.nr_tlb_entries = 32,
|
||||||
|
.clk_name = "iva2_ck",
|
||||||
|
},
|
||||||
},
|
},
|
||||||
#endif
|
#endif
|
||||||
};
|
};
|
||||||
#define NR_IOMMU_DEVICES ARRAY_SIZE(omap3_iommu_pdata)
|
#define NR_IOMMU_DEVICES ARRAY_SIZE(devices)
|
||||||
|
|
||||||
static struct platform_device *omap3_iommu_pdev[NR_IOMMU_DEVICES];
|
static struct platform_device *omap3_iommu_pdev[NR_IOMMU_DEVICES];
|
||||||
|
|
||||||
static int __init omap3_iommu_init(void)
|
static int __init omap3_iommu_init(void)
|
||||||
{
|
{
|
||||||
int i, err;
|
int i, err;
|
||||||
|
struct resource res[] = {
|
||||||
|
{ .flags = IORESOURCE_MEM },
|
||||||
|
{ .flags = IORESOURCE_IRQ },
|
||||||
|
};
|
||||||
|
|
||||||
for (i = 0; i < NR_IOMMU_DEVICES; i++) {
|
for (i = 0; i < NR_IOMMU_DEVICES; i++) {
|
||||||
struct platform_device *pdev;
|
struct platform_device *pdev;
|
||||||
struct resource res[2];
|
const struct iommu_device *d = &devices[i];
|
||||||
|
|
||||||
pdev = platform_device_alloc("omap-iommu", i);
|
pdev = platform_device_alloc("omap-iommu", i);
|
||||||
if (!pdev) {
|
if (!pdev) {
|
||||||
|
@ -62,19 +65,16 @@ static int __init omap3_iommu_init(void)
|
||||||
goto err_out;
|
goto err_out;
|
||||||
}
|
}
|
||||||
|
|
||||||
memset(res, 0, sizeof(res));
|
res[0].start = d->base;
|
||||||
res[0].start = iommu_base[i];
|
res[0].end = d->base + MMU_REG_SIZE - 1;
|
||||||
res[0].end = iommu_base[i] + MMU_REG_SIZE - 1;
|
res[1].start = res[1].end = d->irq;
|
||||||
res[0].flags = IORESOURCE_MEM;
|
|
||||||
res[1].start = res[1].end = iommu_irq[i];
|
|
||||||
res[1].flags = IORESOURCE_IRQ;
|
|
||||||
|
|
||||||
err = platform_device_add_resources(pdev, res,
|
err = platform_device_add_resources(pdev, res,
|
||||||
ARRAY_SIZE(res));
|
ARRAY_SIZE(res));
|
||||||
if (err)
|
if (err)
|
||||||
goto err_out;
|
goto err_out;
|
||||||
err = platform_device_add_data(pdev, &omap3_iommu_pdata[i],
|
err = platform_device_add_data(pdev, &d->pdata,
|
||||||
sizeof(omap3_iommu_pdata[0]));
|
sizeof(d->pdata));
|
||||||
if (err)
|
if (err)
|
||||||
goto err_out;
|
goto err_out;
|
||||||
err = platform_device_add(pdev);
|
err = platform_device_add(pdev);
|
||||||
|
|
Loading…
Reference in New Issue