ce491cf854
Move the remaining headers under plat-omap/include/mach to plat-omap/include/plat. Also search and replace the files using these headers to include using the right path. This was done with: #!/bin/bash mach_dir_old="arch/arm/plat-omap/include/mach" plat_dir_new="arch/arm/plat-omap/include/plat" headers=$(cd $mach_dir_old && ls *.h) omap_dirs="arch/arm/*omap*/ \ drivers/video/omap \ sound/soc/omap" other_files="drivers/leds/leds-ams-delta.c \ drivers/mfd/menelaus.c \ drivers/mfd/twl4030-core.c \ drivers/mtd/nand/ams-delta.c" for header in $headers; do old="#include <mach\/$header" new="#include <plat\/$header" for dir in $omap_dirs; do find $dir -type f -name \*.[chS] | \ xargs sed -i "s/$old/$new/" done find drivers/ -type f -name \*omap*.[chS] | \ xargs sed -i "s/$old/$new/" for file in $other_files; do sed -i "s/$old/$new/" $file done done for header in $(ls $mach_dir_old/*.h); do git mv $header $plat_dir_new/ done Signed-off-by: Tony Lindgren <tony@atomide.com>
106 lines
2.3 KiB
C
106 lines
2.3 KiB
C
/*
|
|
* omap iommu: omap3 device registration
|
|
*
|
|
* Copyright (C) 2008-2009 Nokia Corporation
|
|
*
|
|
* Written by Hiroshi DOYU <Hiroshi.DOYU@nokia.com>
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License version 2 as
|
|
* published by the Free Software Foundation.
|
|
*/
|
|
|
|
#include <linux/platform_device.h>
|
|
|
|
#include <plat/iommu.h>
|
|
|
|
#define OMAP3_MMU1_BASE 0x480bd400
|
|
#define OMAP3_MMU2_BASE 0x5d000000
|
|
#define OMAP3_MMU1_IRQ 24
|
|
#define OMAP3_MMU2_IRQ 28
|
|
|
|
|
|
static unsigned long iommu_base[] __initdata = {
|
|
OMAP3_MMU1_BASE,
|
|
OMAP3_MMU2_BASE,
|
|
};
|
|
|
|
static int iommu_irq[] __initdata = {
|
|
OMAP3_MMU1_IRQ,
|
|
OMAP3_MMU2_IRQ,
|
|
};
|
|
|
|
static const struct iommu_platform_data omap3_iommu_pdata[] __initconst = {
|
|
{
|
|
.name = "isp",
|
|
.nr_tlb_entries = 8,
|
|
.clk_name = "cam_ick",
|
|
},
|
|
#if defined(CONFIG_MPU_BRIDGE_IOMMU)
|
|
{
|
|
.name = "iva2",
|
|
.nr_tlb_entries = 32,
|
|
.clk_name = "iva2_ck",
|
|
},
|
|
#endif
|
|
};
|
|
#define NR_IOMMU_DEVICES ARRAY_SIZE(omap3_iommu_pdata)
|
|
|
|
static struct platform_device *omap3_iommu_pdev[NR_IOMMU_DEVICES];
|
|
|
|
static int __init omap3_iommu_init(void)
|
|
{
|
|
int i, err;
|
|
|
|
for (i = 0; i < NR_IOMMU_DEVICES; i++) {
|
|
struct platform_device *pdev;
|
|
struct resource res[2];
|
|
|
|
pdev = platform_device_alloc("omap-iommu", i);
|
|
if (!pdev) {
|
|
err = -ENOMEM;
|
|
goto err_out;
|
|
}
|
|
|
|
memset(res, 0, sizeof(res));
|
|
res[0].start = iommu_base[i];
|
|
res[0].end = iommu_base[i] + MMU_REG_SIZE - 1;
|
|
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,
|
|
ARRAY_SIZE(res));
|
|
if (err)
|
|
goto err_out;
|
|
err = platform_device_add_data(pdev, &omap3_iommu_pdata[i],
|
|
sizeof(omap3_iommu_pdata[0]));
|
|
if (err)
|
|
goto err_out;
|
|
err = platform_device_add(pdev);
|
|
if (err)
|
|
goto err_out;
|
|
omap3_iommu_pdev[i] = pdev;
|
|
}
|
|
return 0;
|
|
|
|
err_out:
|
|
while (i--)
|
|
platform_device_put(omap3_iommu_pdev[i]);
|
|
return err;
|
|
}
|
|
module_init(omap3_iommu_init);
|
|
|
|
static void __exit omap3_iommu_exit(void)
|
|
{
|
|
int i;
|
|
|
|
for (i = 0; i < NR_IOMMU_DEVICES; i++)
|
|
platform_device_unregister(omap3_iommu_pdev[i]);
|
|
}
|
|
module_exit(omap3_iommu_exit);
|
|
|
|
MODULE_AUTHOR("Hiroshi DOYU");
|
|
MODULE_DESCRIPTION("omap iommu: omap3 device registration");
|
|
MODULE_LICENSE("GPL v2");
|