Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 778d02e9 authored by Juan Gutierrez's avatar Juan Gutierrez Committed by Ohad Ben-Cohen
Browse files

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 0e433271 "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 e927f8d0 "omap4: Add
   auto-generated irq and dma headers"

- dsp-iommu is enabled by default.

Signed-off-by: default avatarJuan Gutierrez <jgutierrez@ti.com>
Signed-off-by: default avatarOhad Ben-Cohen <ohad@wizery.com>
parent 1d8a0e96

arch/arm/mach-omap2/omap-iommu.c

+2 −4
Original line number Diff line number Diff line
@@ -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];