lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

omap iommu: support for OMAP4

Browse Source 
This patch provides the iommu support for OMAP4 co-processors.

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:09 +00:00
committed by Hiroshi DOYU
parent 44da397fad
commit f779f9235f
2 changed files with 57 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
arch/arm/mach-omap2/omap-iommu.c
View File

@@ -13,6 +13,7 @@
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <plat/iommu.h> #include <plat/iommu.h>
#include <plat/irqs.h>
struct iommu_device { struct iommu_device {
resource_size_t base; resource_size_t base;
@@ -20,9 +21,11 @@ struct iommu_device {
struct iommu_platform_data pdata; struct iommu_platform_data pdata;
struct resource res[2]; struct resource res[2];
}; };
static struct iommu_device *devices;
static int num_iommu_devices;
#ifdef CONFIG_ARCH_OMAP3 #ifdef CONFIG_ARCH_OMAP3
static struct iommu_device devices[] = { static struct iommu_device omap3_devices[] = {
{ {
.base = 0x480bd400, .base = 0x480bd400,
.irq = 24, .irq = 24,
@@ -44,11 +47,46 @@ static struct iommu_device devices[] = {
}, },
#endif #endif
}; };
#define NR_OMAP3_IOMMU_DEVICES ARRAY_SIZE(omap3_devices)
static struct platform_device *omap3_iommu_pdev[NR_OMAP3_IOMMU_DEVICES];
#else
#define omap3_devices NULL
#define NR_OMAP3_IOMMU_DEVICES 0
#define omap3_iommu_pdev NULL
#endif #endif
#define NR_IOMMU_DEVICES ARRAY_SIZE(devices) #ifdef CONFIG_ARCH_OMAP4
static struct iommu_device omap4_devices[] = {
{
.base = OMAP4_MMU1_BASE,
.irq = INT_44XX_DUCATI_MMU_IRQ,
.pdata = {
.name = "ducati",
.nr_tlb_entries = 32,
.clk_name = "ducati_ick",
},
},
#if defined(CONFIG_MPU_TESLA_IOMMU)
{
.base = OMAP4_MMU2_BASE,
.irq = INT_44XX_DSP_MMU,
.pdata = {
.name = "tesla",
.nr_tlb_entries = 32,
.clk_name = "tesla_ick",
},
},
#endif
};
#define NR_OMAP4_IOMMU_DEVICES ARRAY_SIZE(omap4_devices)
static struct platform_device *omap4_iommu_pdev[NR_OMAP4_IOMMU_DEVICES];
#else
#define omap4_devices NULL
#define NR_OMAP4_IOMMU_DEVICES 0
#define omap4_iommu_pdev NULL
#endif
static struct platform_device *omap_iommu_pdev[NR_IOMMU_DEVICES]; static struct platform_device **omap_iommu_pdev;
static int __init omap_iommu_init(void) static int __init omap_iommu_init(void)
{ {
@@ -58,7 +96,18 @@ static int __init omap_iommu_init(void)
{ .flags = IORESOURCE_IRQ }, { .flags = IORESOURCE_IRQ },
}; };
for (i = 0; i < NR_IOMMU_DEVICES; i++) { if (cpu_is_omap34xx()) {
devices = omap3_devices;
omap_iommu_pdev = omap3_iommu_pdev;
num_iommu_devices = NR_OMAP3_IOMMU_DEVICES;
} else if (cpu_is_omap44xx()) {
devices = omap4_devices;
omap_iommu_pdev = omap4_iommu_pdev;
num_iommu_devices = NR_OMAP4_IOMMU_DEVICES;
} else
return -ENODEV;
for (i = 0; i < num_iommu_devices; i++) {
struct platform_device *pdev; struct platform_device *pdev;
const struct iommu_device *d = &devices[i]; const struct iommu_device *d = &devices[i];
@@ -98,7 +147,7 @@ static void __exit omap_iommu_exit(void)
{ {
int i; int i;
for (i = 0; i < NR_IOMMU_DEVICES; i++) for (i = 0; i < num_iommu_devices; i++)
platform_device_unregister(omap_iommu_pdev[i]); platform_device_unregister(omap_iommu_pdev[i]);
} }
module_exit(omap_iommu_exit); module_exit(omap_iommu_exit);

3
arch/arm/plat-omap/include/plat/omap44xx.h
View File

@@ -48,5 +48,8 @@
#define OMAP44XX_MAILBOX_BASE (L4_44XX_BASE + 0xF4000) #define OMAP44XX_MAILBOX_BASE (L4_44XX_BASE + 0xF4000)
#define OMAP44XX_HSUSB_OTG_BASE (L4_44XX_BASE + 0xAB000) #define OMAP44XX_HSUSB_OTG_BASE (L4_44XX_BASE + 0xAB000)
#define OMAP4_MMU1_BASE 0x55082000
#define OMAP4_MMU2_BASE 0x4A066000
#endif /* __ASM_ARCH_OMAP44XX_H */ #endif /* __ASM_ARCH_OMAP44XX_H */