mirror of
https://github.com/torvalds/linux.git
synced 2024-12-24 20:01:55 +00:00
6f8c9d2130
Commit 787314c35f ("Merge tag 'iommu-updates-v3.8' of
git://git./linux/kernel/git/joro/iommu") did not account for the changed
header location.
The headers were made local to mach-omap2 as they are specific to omap2+
only, and we wanted to get most of the #include <plat/*.h> headers fixed
up anyways for the ARM multiplatform support.
We attempted to avoid this kind of merge conflict early on by setting up
a minimal git branch shared by the arm-soc tree and the iommu tree, but
looks like we still hit a merge issue there as the branches got merged
as various topic branches.
Cc: Joerg Roedel <joro@8bytes.org>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
75 lines
1.8 KiB
C
75 lines
1.8 KiB
C
/*
|
|
* 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/module.h>
|
|
#include <linux/platform_device.h>
|
|
#include <linux/err.h>
|
|
#include <linux/slab.h>
|
|
|
|
#include <linux/platform_data/iommu-omap.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;
|
|
pdata->da_start = a->da_start;
|
|
pdata->da_end = a->da_end;
|
|
|
|
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),
|
|
NULL, 0, 0);
|
|
|
|
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)
|
|
{
|
|
return omap_hwmod_for_each_by_class("mmu", omap_iommu_dev_init, NULL);
|
|
}
|
|
/* must be ready before omap3isp is probed */
|
|
subsys_initcall(omap_iommu_init);
|
|
|
|
static void __exit omap_iommu_exit(void)
|
|
{
|
|
/* Do nothing */
|
|
}
|
|
module_exit(omap_iommu_exit);
|
|
|
|
MODULE_AUTHOR("Hiroshi DOYU");
|
|
MODULE_DESCRIPTION("omap iommu: omap device registration");
|
|
MODULE_LICENSE("GPL v2");
|