lkml.org 
[lkml]   [2012]   [Nov]   [2]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Subject[PATCH 6/6] ARM: OMAP2+: Move iommu/iovmm headers to platform_data
    From
    Date
    Move iommu/iovmm headers from plat/ to platform_data/ as part of the
    single zImage work.

    Partially based on an earlier version by Ido Yariv <ido@wizery.com>.

    Cc: Joerg Roedel <joro@8bytes.org>
    Cc: Ohad Ben-Cohen <ohad@wizery.com>
    Cc: Ido Yariv <ido@wizery.com>
    Cc: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
    Cc: Omar Ramirez Luna <omar.luna@linaro.org>
    Acked-by: Mauro Carvalho Chehab <mchehab@redhat.com>
    Signed-off-by: Tony Lindgren <tony@atomide.com>
    ---
    arch/arm/mach-omap2/devices.c | 2 +-
    arch/arm/mach-omap2/omap-iommu.c | 2 +-
    arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | 2 +-
    arch/arm/mach-omap2/omap_hwmod_44xx_data.c | 2 +-
    drivers/iommu/omap-iommu-debug.c | 3 +--
    drivers/iommu/omap-iommu.c | 2 +-
    drivers/iommu/omap-iommu2.c | 2 +-
    drivers/iommu/omap-iovmm.c | 3 +--
    drivers/media/platform/omap3isp/ispvideo.c | 1 -
    include/linux/platform_data/iommu-omap.h | 0
    10 files changed, 8 insertions(+), 11 deletions(-)
    rename arch/arm/plat-omap/include/plat/iommu.h => include/linux/platform_data/iommu-omap.h (100%)

    diff --git a/arch/arm/mach-omap2/devices.c b/arch/arm/mach-omap2/devices.c
    index cba60e0..1002ff8 100644
    --- a/arch/arm/mach-omap2/devices.c
    +++ b/arch/arm/mach-omap2/devices.c
    @@ -126,7 +126,7 @@ static struct platform_device omap2cam_device = {

    #if defined(CONFIG_IOMMU_API)

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

    static struct resource omap3isp_resources[] = {
    {
    diff --git a/arch/arm/mach-omap2/omap-iommu.c b/arch/arm/mach-omap2/omap-iommu.c
    index df298d4..a6a4ff8 100644
    --- a/arch/arm/mach-omap2/omap-iommu.c
    +++ b/arch/arm/mach-omap2/omap-iommu.c
    @@ -13,7 +13,7 @@
    #include <linux/module.h>
    #include <linux/platform_device.h>

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

    #include "soc.h"
    #include "common.h"
    diff --git a/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c b/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
    index f67b7ee..621bc71 100644
    --- a/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
    +++ b/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
    @@ -26,8 +26,8 @@
    #include <plat/mmc.h>
    #include <linux/platform_data/asoc-ti-mcbsp.h>
    #include <linux/platform_data/spi-omap2-mcspi.h>
    +#include <linux/platform_data/iommu-omap.h>
    #include <plat/dmtimer.h>
    -#include <plat/iommu.h>

    #include "am35xx.h"

    diff --git a/arch/arm/mach-omap2/omap_hwmod_44xx_data.c b/arch/arm/mach-omap2/omap_hwmod_44xx_data.c
    index 652d028..5850b3e 100644
    --- a/arch/arm/mach-omap2/omap_hwmod_44xx_data.c
    +++ b/arch/arm/mach-omap2/omap_hwmod_44xx_data.c
    @@ -27,10 +27,10 @@
    #include <plat/dma.h>
    #include <linux/platform_data/spi-omap2-mcspi.h>
    #include <linux/platform_data/asoc-ti-mcbsp.h>
    +#include <linux/platform_data/iommu-omap.h>
    #include <plat/mmc.h>
    #include <plat/dmtimer.h>
    #include <plat/common.h>
    -#include <plat/iommu.h>

    #include "omap_hwmod_common_data.h"
    #include "cm1_44xx.h"
    diff --git a/drivers/iommu/omap-iommu-debug.c b/drivers/iommu/omap-iommu-debug.c
    index d0427bd..d97fbe4 100644
    --- a/drivers/iommu/omap-iommu-debug.c
    +++ b/drivers/iommu/omap-iommu-debug.c
    @@ -19,8 +19,7 @@
    #include <linux/platform_device.h>
    #include <linux/debugfs.h>
    #include <linux/omap-iommu.h>
    -
    -#include <plat/iommu.h>
    +#include <linux/platform_data/iommu-omap.h>

    #include "omap-iopgtable.h"
    #include "omap-iommu.h"
    diff --git a/drivers/iommu/omap-iommu.c b/drivers/iommu/omap-iommu.c
    index df84087..badc17c 100644
    --- a/drivers/iommu/omap-iommu.c
    +++ b/drivers/iommu/omap-iommu.c
    @@ -26,7 +26,7 @@

    #include <asm/cacheflush.h>

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

    #include "omap-iopgtable.h"
    #include "omap-iommu.h"
    diff --git a/drivers/iommu/omap-iommu2.c b/drivers/iommu/omap-iommu2.c
    index 29e98a2..c020202 100644
    --- a/drivers/iommu/omap-iommu2.c
    +++ b/drivers/iommu/omap-iommu2.c
    @@ -19,8 +19,8 @@
    #include <linux/omap-iommu.h>
    #include <linux/slab.h>
    #include <linux/stringify.h>
    +#include <linux/platform_data/iommu-omap.h>

    -#include <plat/iommu.h>
    #include "omap-iommu.h"

    /*
    diff --git a/drivers/iommu/omap-iovmm.c b/drivers/iommu/omap-iovmm.c
    index 3e3b242..46d87569 100644
    --- a/drivers/iommu/omap-iovmm.c
    +++ b/drivers/iommu/omap-iovmm.c
    @@ -18,12 +18,11 @@
    #include <linux/scatterlist.h>
    #include <linux/iommu.h>
    #include <linux/omap-iommu.h>
    +#include <linux/platform_data/iommu-omap.h>

    #include <asm/cacheflush.h>
    #include <asm/mach/map.h>

    -#include <plat/iommu.h>
    -
    #include "omap-iopgtable.h"
    #include "omap-iommu.h"

    diff --git a/drivers/media/platform/omap3isp/ispvideo.c b/drivers/media/platform/omap3isp/ispvideo.c
    index a4b8290..21f7313 100644
    --- a/drivers/media/platform/omap3isp/ispvideo.c
    +++ b/drivers/media/platform/omap3isp/ispvideo.c
    @@ -35,7 +35,6 @@
    #include <linux/vmalloc.h>
    #include <media/v4l2-dev.h>
    #include <media/v4l2-ioctl.h>
    -#include <plat/iommu.h>
    #include <plat/omap-pm.h>

    #include "ispvideo.h"
    diff --git a/arch/arm/plat-omap/include/plat/iommu.h b/include/linux/platform_data/iommu-omap.h
    similarity index 100%
    rename from arch/arm/plat-omap/include/plat/iommu.h
    rename to include/linux/platform_data/iommu-omap.h


    \
     
     \ /
      Last update: 2012-11-02 20:41    [W:3.032 / U:0.056 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site