From mboxrd@z Thu Jan 1 00:00:00 1970 From: tony@atomide.com (Tony Lindgren) Date: Mon, 15 Oct 2012 17:38:22 -0700 Subject: [PATCH 3/4] ARM: OMAP2+: Move iommu/iovmm headers to platform_data In-Reply-To: <20121016003640.19701.51749.stgit@muffinssi.local> References: <20121016003513.19701.71718.stgit@muffinssi.local> <20121016003640.19701.51749.stgit@muffinssi.local> Message-ID: <20121016003821.GK15569@atomide.com> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org * Tony Lindgren [121015 17:38]: > From: Ido Yariv > > Move iommu/iovmm headers from plat/ to platform_data/ as part of the > single zImage work. Joerg, I'm planning to apply these four patches against -rc1 into omap-for-v3.8/cleanup-headers-iommu branch if these look OK to you. That branch won't contain other patches and you can pull it in too if needed. Regards, Tony > Cc: Joerg Roedel > Cc: Ohad Ben-Cohen > Signed-off-by: Ido Yariv > Acked-by: Mauro Carvalho Chehab > Signed-off-by: Tony Lindgren > --- > arch/arm/mach-omap2/devices.c | 2 +- > arch/arm/mach-omap2/iommu2.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 | 4 ++-- > drivers/iommu/omap-iommu.c | 2 +- > drivers/iommu/omap-iovmm.c | 4 ++-- > drivers/media/platform/omap3isp/isp.h | 5 +++-- > drivers/media/platform/omap3isp/ispvideo.c | 5 ++--- > include/linux/platform_data/iommu-omap.h | 0 > include/linux/platform_data/iovmm-omap.h | 0 > 12 files changed, 15 insertions(+), 15 deletions(-) > rename arch/arm/plat-omap/include/plat/iommu.h => include/linux/platform_data/iommu-omap.h (100%) > rename arch/arm/plat-omap/include/plat/iovmm.h => include/linux/platform_data/iovmm-omap.h (100%) > > diff --git a/arch/arm/mach-omap2/devices.c b/arch/arm/mach-omap2/devices.c > index c8c2117..6cd0c2a 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 > +#include > > static struct resource omap3isp_resources[] = { > { > diff --git a/arch/arm/mach-omap2/iommu2.c b/arch/arm/mach-omap2/iommu2.c > index c986880..82f9174 100644 > --- a/arch/arm/mach-omap2/iommu2.c > +++ b/arch/arm/mach-omap2/iommu2.c > @@ -18,7 +18,7 @@ > #include > #include > > -#include > +#include > > /* > * omap2 architecture specific register bit definitions > 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 > #include > > -#include > +#include > > #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 > #include > #include > +#include > #include > -#include > > #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 > #include > #include > +#include > #include > #include > #include > -#include > > #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 a0b0309..8c1e30b 100644 > --- a/drivers/iommu/omap-iommu-debug.c > +++ b/drivers/iommu/omap-iommu-debug.c > @@ -19,8 +19,8 @@ > #include > #include > > -#include > -#include > +#include > +#include > > #include > > diff --git a/drivers/iommu/omap-iommu.c b/drivers/iommu/omap-iommu.c > index 80844b3..6100334 100644 > --- a/drivers/iommu/omap-iommu.c > +++ b/drivers/iommu/omap-iommu.c > @@ -24,7 +24,7 @@ > > #include > > -#include > +#include > > #include > > diff --git a/drivers/iommu/omap-iovmm.c b/drivers/iommu/omap-iovmm.c > index b362fb5..b5ac2cd 100644 > --- a/drivers/iommu/omap-iovmm.c > +++ b/drivers/iommu/omap-iovmm.c > @@ -21,8 +21,8 @@ > #include > #include > > -#include > -#include > +#include > +#include > > #include > > diff --git a/drivers/media/platform/omap3isp/isp.h b/drivers/media/platform/omap3isp/isp.h > index 8be7487..62c76f9 100644 > --- a/drivers/media/platform/omap3isp/isp.h > +++ b/drivers/media/platform/omap3isp/isp.h > @@ -34,8 +34,9 @@ > #include > #include > #include > -#include > -#include > + > +#include > +#include > > #include "ispstat.h" > #include "ispccdc.h" > diff --git a/drivers/media/platform/omap3isp/ispvideo.c b/drivers/media/platform/omap3isp/ispvideo.c > index a0b737fe..75ecfc8 100644 > --- a/drivers/media/platform/omap3isp/ispvideo.c > +++ b/drivers/media/platform/omap3isp/ispvideo.c > @@ -34,9 +34,8 @@ > #include > #include > #include > -#include > -#include > -#include > +#include > +#include > > #include "ispvideo.h" > #include "isp.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 > diff --git a/arch/arm/plat-omap/include/plat/iovmm.h b/include/linux/platform_data/iovmm-omap.h > similarity index 100% > rename from arch/arm/plat-omap/include/plat/iovmm.h > rename to include/linux/platform_data/iovmm-omap.h > > -- > To unsubscribe from this list: send the line "unsubscribe linux-omap" in > the body of a message to majordomo at vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html