Commit dd20b0d5 authored by Suman Anna's avatar Suman Anna Committed by Tony Lindgren
Browse files

ARM: OMAP2+: Remove legacy device instantiation of IOMMUs 



The legacy-style IOMMU device creation is maintained currently only
for OMAP3 SoC, as all other SoCs are DT-boot only, and also to ensure
functionality of the OMAP3 ISP driver, the only in-kernel client user
on OMAP3 that supported both modes.

Commit 78c66fbc ("[media] v4l: omap3isp: Drop platform data support")
removed the legacy device support from the OMAP3 ISP driver, so the
legacy device instantiation of OMAP IOMMU devices is no longer
needed, and is cleaned up.

Signed-off-by: default avatarSuman Anna <s-anna@ti.com>
[tony@atomide.com: updated to remove also the Makefile entry]
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent 1539569b

arch/arm/mach-omap2/Makefile

+0 −2
Original line number Diff line number Diff line
@@ -223,8 +223,6 @@ obj-$(CONFIG_SOC_DRA7XX) += omap_hwmod_7xx_data.o 
# EMU peripherals

obj-$(CONFIG_HW_PERF_EVENTS)		+= pmu.o



obj-$(CONFIG_OMAP_IOMMU)		+= omap-iommu.o



# OMAP2420 MSDI controller integration support ("MMC")

obj-$(CONFIG_SOC_OMAP2420)		+= msdi.o

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

deleted100644 → 0
+0 −66
Original line number Diff line number Diff line 
/*

 * omap iommu: omap device registration

 *

 * Copyright (C) 2008-2009 Nokia Corporation

 *

 * Written by Hiroshi DOYU <Hiroshi.DOYU@nokia.com>

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 as

 * published by the Free Software Foundation.

 */



#include <linux/of.h>

#include <linux/platform_device.h>

#include <linux/err.h>

#include <linux/slab.h>



#include <linux/platform_data/iommu-omap.h>

#include "soc.h"

#include "omap_hwmod.h"

#include "omap_device.h"



static int __init omap_iommu_dev_init(struct omap_hwmod *oh, void *unused)

{

	struct platform_device *pdev;

	struct iommu_platform_data *pdata;

	struct omap_mmu_dev_attr *a = (struct omap_mmu_dev_attr *)oh->dev_attr;

	static int i;



	pdata = kzalloc(sizeof(*pdata), GFP_KERNEL);

	if (!pdata)

		return -ENOMEM;



	pdata->name = oh->name;

	pdata->nr_tlb_entries = a->nr_tlb_entries;



	if (oh->rst_lines_cnt == 1) {

		pdata->reset_name = oh->rst_lines->name;

		pdata->assert_reset = omap_device_assert_hardreset;

		pdata->deassert_reset = omap_device_deassert_hardreset;

	}



	pdev = omap_device_build("omap-iommu", i, oh, pdata, sizeof(*pdata));



	kfree(pdata);



	if (IS_ERR(pdev)) {

		pr_err("%s: device build err: %ld\n", __func__, PTR_ERR(pdev));

		return PTR_ERR(pdev);

	}



	i++;



	return 0;

}



static int __init omap_iommu_init(void)

{

	/* If dtb is there, the devices will be created dynamically */

	if (of_have_populated_dt())

		return -ENODEV;



	return omap_hwmod_for_each_by_class("mmu", omap_iommu_dev_init, NULL);

}

omap_subsys_initcall(omap_iommu_init);

/* must be ready before omap3isp is probed */

CRA Git | Maintained and supported by SUSTech CRA and CCSE