lkml.org 
[lkml]   [2013]   [Dec]   [17]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 7/7] ARM: OMAP2+: Remove platform-specific omap-iommu
    Date
    With full DT boot, the platform specific part of the OMAP iommu
    is not useful anymore.

    Signed-off-by: Florian Vaussard <florian.vaussard@epfl.ch>
    ---
    arch/arm/mach-omap2/Makefile | 3 --
    arch/arm/mach-omap2/omap-iommu.c | 79 ----------------------------------------
    2 files changed, 82 deletions(-)
    delete mode 100644 arch/arm/mach-omap2/omap-iommu.c

    diff --git a/arch/arm/mach-omap2/Makefile b/arch/arm/mach-omap2/Makefile
    index 35be79f..4e01b61 100644
    --- a/arch/arm/mach-omap2/Makefile
    +++ b/arch/arm/mach-omap2/Makefile
    @@ -219,9 +219,6 @@ obj-$(CONFIG_SOC_DRA7XX) += omap_hwmod_7xx_data.o
    obj-$(CONFIG_OMAP3_EMU) += emu.o
    obj-$(CONFIG_HW_PERF_EVENTS) += pmu.o

    -iommu-$(CONFIG_OMAP_IOMMU) := omap-iommu.o
    -obj-y += $(iommu-m) $(iommu-y)
    -
    ifneq ($(CONFIG_TIDSPBRIDGE),)
    obj-y += dsp.o
    endif
    diff --git a/arch/arm/mach-omap2/omap-iommu.c b/arch/arm/mach-omap2/omap-iommu.c
    deleted file mode 100644
    index f1fab56..0000000
    --- a/arch/arm/mach-omap2/omap-iommu.c
    +++ /dev/null
    @@ -1,79 +0,0 @@
    -/*
    - * 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/module.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;
    - 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));
    -
    - 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);
    -}
    -/* must be ready before omap3isp is probed */
    -omap_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");
    --
    1.8.1.2


    \
     
     \ /
      Last update: 2013-12-17 15:41    [W:4.189 / U:0.024 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site