From patchwork Fri Sep 21 05:14:08 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ido Yariv X-Patchwork-Id: 1489341 Return-Path: X-Original-To: patchwork-linux-omap@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id 9EBBA3FE65 for ; Fri, 21 Sep 2012 05:14:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753456Ab2IUFO3 (ORCPT ); Fri, 21 Sep 2012 01:14:29 -0400 Received: from mail-qa0-f46.google.com ([209.85.216.46]:58232 "EHLO mail-qa0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752819Ab2IUFO1 (ORCPT ); Fri, 21 Sep 2012 01:14:27 -0400 Received: by qaas11 with SMTP id s11so984712qaa.19 for ; Thu, 20 Sep 2012 22:14:27 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references :x-gm-message-state; bh=wlj/Yks8vfmTpeBZvLHl9ngYCK1Zs/p8CQiXgzYdA78=; b=aY/Andjc9kB9X4ZtiNTiF4mKyAHtU+n/wopi2zjWX3FMb9vcqf/lKIOtGyG1zGldJL szYXMlAUlKoY3TfFgUoBH6zD4OYy0/wgf1dFulKNcdFOQ90h1Ktcss94zTAGrb2LaAkj nwNfdsRqaojTFy4LIN3HVFA3X5eg/EVcxdw5xl9+YPviB2UVR3iF4RoNwPowiVHXaffN sp6CrnajKlJfnU2MrJwzFFpSgPunE7hDWH+oYSZ9ApqTPVsyFtyTz0eX5eygbiHjIG8X I1R8olrT1TWJa17UvYxV9S+WPtOFmlh64EyP5pEJOWsFddjj8mbi9blSz7F1llQEexUd F5iQ== Received: by 10.229.135.149 with SMTP id n21mr2629064qct.131.1348204466861; Thu, 20 Sep 2012 22:14:26 -0700 (PDT) Received: from localhost.localdomain (c-76-24-20-17.hsd1.ma.comcast.net. [76.24.20.17]) by mx.google.com with ESMTPS id b5sm7134328qao.13.2012.09.20.22.14.25 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 20 Sep 2012 22:14:26 -0700 (PDT) From: Ido Yariv To: Tony Lindgren , Russell King , Mauro Carvalho Chehab , linux-arm-kernel@lists.infradead.org, linux-omap@vger.kernel.org, linux-media@vger.kernel.org Cc: Ido Yariv Subject: [PATCH 3/3] arm: omap: Move iommu/iovmm headers to platform_data Date: Fri, 21 Sep 2012 01:14:08 -0400 Message-Id: <1348204448-30855-3-git-send-email-ido@wizery.com> X-Mailer: git-send-email 1.7.11.4 In-Reply-To: <1348204448-30855-1-git-send-email-ido@wizery.com> References: <1348204448-30855-1-git-send-email-ido@wizery.com> X-Gm-Message-State: ALoCoQk7mcDo4RpoJMAQkShW3vxO4ERyoOGXbkl9Ofzy+3paC4wVLgLCkgfDe+ogLsOPFEnjNw8M Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org Move iommu/iovmm headers from plat/ to platform_data/ as part of the single zImage work. Signed-off-by: Ido Yariv Acked-by: Mauro Carvalho Chehab --- arch/arm/mach-omap2/devices.c | 2 +- arch/arm/mach-omap2/iommu2.c | 2 +- arch/arm/mach-omap2/omap-iommu.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 | 6 ++++-- .../plat/iommu.h => include/linux/platform_data/iommu-omap.h | 0 .../plat/iovmm.h => include/linux/platform_data/iovmm-omap.h | 0 10 files changed, 15 insertions(+), 12 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/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 diff --git a/arch/arm/mach-omap2/devices.c b/arch/arm/mach-omap2/devices.c index 1bb2e92..5bde5c2 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 eefc379..cab7acc 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/drivers/iommu/omap-iommu-debug.c b/drivers/iommu/omap-iommu-debug.c index f55fc5d..e6ee7c2 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 d0b1234..298ca19 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 2e10c3e..ade7c6c 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 3a5085e..1093f07 100644 --- a/drivers/media/platform/omap3isp/ispvideo.c +++ b/drivers/media/platform/omap3isp/ispvideo.c @@ -34,8 +34,10 @@ #include #include #include -#include -#include + +#include +#include + #include #include "ispvideo.h"