ARM: OMAP2+: change the ISP device archdata MMU name for DT

The IOMMU DT adaptation support uses the device name instead
of an iommu object name. Fixup the ISP device archdata MMU
name at runtime if using DT-boot. This allows the OMAP3 camera
to be functional in both legacy and DT boots. The iommu object
names should eventually vanish when all the IOMMU users have
been converted to DT nodes.

Signed-off-by: Suman Anna <s-anna@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>

diff --git a/arch/arm/mach-omap2/devices.c b/arch/arm/mach-omap2/devices.c
index 0dd6398bade4787510c4d5c62210b7a61cfb7595..e58609b312c7091b5589314fbb4b457b457ccb0f 100644 (file)
--- a/arch/arm/mach-omap2/devices.c
+++ b/arch/arm/mach-omap2/devices.c
@@ -229,6 +229,9 @@ static struct omap_iommu_arch_data omap3_isp_iommu = {
 
 int omap3_init_camera(struct isp_platform_data *pdata)
 {
+       if (of_have_populated_dt())
+               omap3_isp_iommu.name = "480bd400.mmu";
+
        omap3isp_device.dev.platform_data = pdata;
        omap3isp_device.dev.archdata.iommu = &omap3_isp_iommu;