diff options
| author | Tony Lindgren <tony@atomide.com> | 2012-05-17 16:44:43 -0700 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2012-05-17 16:44:43 -0700 |
| commit | 222e5cec47a54ff3dde72e7dfba10c67da3adca0 (patch) | |
| tree | ab6bfda54629ca8bcc806f8749cefec0751da888 /arch/arm/mach-omap2/omap-iommu.c | |
| parent | d48b97b403d23f6df0b990cee652bdf9a52337a3 (diff) | |
| parent | 7548c09a475039b5e9179615ac4c1c58b930cdb5 (diff) | |
Merge branch 'for-tony' of git://git.kernel.org/pub/scm/linux/kernel/git/ohad/linux into fixes-omap4-dsp
Diffstat (limited to 'arch/arm/mach-omap2/omap-iommu.c')
| -rw-r--r-- | arch/arm/mach-omap2/omap-iommu.c | 6 |
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 ac49384d028..1be8bcb52e9 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]; |