diff options
| author | Cris Jansson <cjansson@ti.com> | 2012-02-02 01:25:24 +0100 |
|---|---|---|
| committer | Andy Green <andy.green@linaro.org> | 2012-03-13 11:20:12 +0800 |
| commit | 28d8ee9833184ea61cd2829c340845975c422ece (patch) | |
| tree | ee3687e78bc0192e6e27e122edb3d42c9b03b292 | |
| parent | 3329245e6597925ed3ef51a719584e7f1b081bd4 (diff) | |
omap: iommu: add support for OMAP5
Added the necessary macros and compiler options to
add support for OMAP5
Signed-off-by: Cris Jansson <cjansson@ti.com>
Signed-off-by: Subramaniam C.A <subramaniam.ca@ti.com>
Signed-off-by: Suman Anna <s-anna@ti.com>
| -rw-r--r-- | arch/arm/mach-omap2/iommu2.c | 2 | ||||
| -rw-r--r-- | arch/arm/mach-omap2/omap-iommu.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-omap2/iommu2.c b/arch/arm/mach-omap2/iommu2.c index 6af3271b509..ac804c363cf 100644 --- a/arch/arm/mach-omap2/iommu2.c +++ b/arch/arm/mach-omap2/iommu2.c @@ -132,7 +132,7 @@ static int omap2_iommu_enable(struct omap_iommu *obj) __iommu_set_twl(obj, true); - if (cpu_is_omap44xx()) + if (cpu_is_omap44xx() || cpu_is_omap54xx()) iommu_write_reg(obj, 0x1, MMU_GP_REG); return 0; diff --git a/arch/arm/mach-omap2/omap-iommu.c b/arch/arm/mach-omap2/omap-iommu.c index c79553a067b..05cc4323d6f 100644 --- a/arch/arm/mach-omap2/omap-iommu.c +++ b/arch/arm/mach-omap2/omap-iommu.c @@ -53,7 +53,7 @@ static struct iommu_platform_data omap3_devices_data[] = { #define NR_OMAP3_IOMMU_DEVICES 0 #endif -#ifdef CONFIG_ARCH_OMAP4 +#if defined(CONFIG_ARCH_OMAP4) || defined(CONFIG_ARCH_OMAP5) static struct iommu_platform_data omap4_devices_data[] = { { .name = "ducati", @@ -105,7 +105,7 @@ static int __init omap_iommu_init(void) if (cpu_is_omap34xx()) { devices_data = omap3_devices_data; num_iommu_devices = NR_OMAP3_IOMMU_DEVICES; - } else if (cpu_is_omap44xx()) { + } else if (cpu_is_omap44xx() || cpu_is_omap54xx()) { devices_data = omap4_devices_data; num_iommu_devices = NR_OMAP4_IOMMU_DEVICES; } else |