summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-omap2/omap-iommu.c
diff options
context:
space:
mode:
authorJuan Gutierrez <jgutierrez@ti.com>2012-05-13 15:33:07 +0300
committerOhad Ben-Cohen <ohad@wizery.com>2012-05-13 16:09:46 +0300
commit778d02e9b3b7188ce37ff542e54ff5df723659e6 (patch)
treeb5f133f426e39d2dd664599bd6a47246c652a552 /arch/arm/mach-omap2/omap-iommu.c
parent1d8a0e963ac532e038d93ab0d30bbfad072f3bf8 (diff)
downloadlinux-778d02e9b3b7188ce37ff542e54ff5df723659e6.tar.gz
linux-778d02e9b3b7188ce37ff542e54ff5df723659e6.tar.bz2
linux-778d02e9b3b7188ce37ff542e54ff5df723659e6.zip
ARM: OMAP4: fix irq and clock name for dsp-iommu
Irq and clock names were wrong for dsp iommu configuration for omap4. - Renamed tesla_ick to dsp_fck: This is required because the new naming convention introduced by: commit 0e43327 "OMAP4 clock: Fix clock names and align with hwmod names" - Renamed INT_44XX_DSP_MMU to OMAP44XX_IRQ_TESLA_MMU. Naming convention adopted since: commit e927f8d "omap4: Add auto-generated irq and dma headers" - dsp-iommu is enabled by default. Signed-off-by: Juan Gutierrez <jgutierrez@ti.com> Signed-off-by: Ohad Ben-Cohen <ohad@wizery.com>
Diffstat (limited to 'arch/arm/mach-omap2/omap-iommu.c')
-rw-r--r--arch/arm/mach-omap2/omap-iommu.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/arch/arm/mach-omap2/omap-iommu.c b/arch/arm/mach-omap2/omap-iommu.c
index ac49384d0285..1be8bcb52e93 100644
--- a/arch/arm/mach-omap2/omap-iommu.c
+++ b/arch/arm/mach-omap2/omap-iommu.c
@@ -73,19 +73,17 @@ static struct iommu_device omap4_devices[] = {
.da_end = 0xFFFFF000,
},
},
-#if defined(CONFIG_MPU_TESLA_IOMMU)
{
.base = OMAP4_MMU2_BASE,
- .irq = INT_44XX_DSP_MMU,
+ .irq = OMAP44XX_IRQ_TESLA_MMU,
.pdata = {
.name = "tesla",
.nr_tlb_entries = 32,
- .clk_name = "tesla_ick",
+ .clk_name = "dsp_fck",
.da_start = 0x0,
.da_end = 0xFFFFF000,
},
},
-#endif
};
#define NR_OMAP4_IOMMU_DEVICES ARRAY_SIZE(omap4_devices)
static struct platform_device *omap4_iommu_pdev[NR_OMAP4_IOMMU_DEVICES];