From patchwork Mon Oct 1 22:46:30 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ido Yariv X-Patchwork-Id: 1532861 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 8F0173FE1C for ; Mon, 1 Oct 2012 22:46:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753224Ab2JAWq4 (ORCPT ); Mon, 1 Oct 2012 18:46:56 -0400 Received: from mail-qa0-f46.google.com ([209.85.216.46]:62930 "EHLO mail-qa0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753222Ab2JAWqz (ORCPT ); Mon, 1 Oct 2012 18:46:55 -0400 Received: by mail-qa0-f46.google.com with SMTP id c26so86179qad.19 for ; Mon, 01 Oct 2012 15:46:54 -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=hwSI4f5+/vlhnjA2aWaPiCyA1rOqBm+PLyg2Usncj2E=; b=MH7sIWNvlC/wQ6Wc9OGH4pT7Z0l/gxpznOM+V+Eb+fYmamobblhmmwrIqf1XCgNuHg JrK+VxmHZ6vyRyQ0XDFkx3Pv2bN4WWu+pBLoVTVxMISnY68jrlohf5ACR5q2vVbWVKXf Tx76NvxgcI978BZh4Kf4/gD6VUKRFPHJml8QSl5VnmgwgoR2U5RGzJBW/xoyjV+vtM9o btRPB8InfL3+zS2WzrsxiMpalS0eMDk/aqYyagpKIwQJCBlcC4sL2KuEBl2BJ6SHSeko SueVpuhxesfkxkQAAu8BQMf5O7CTZDsx/LrLJzJxxKXIH1616fv57z/v1Q5/b4cmFosw hDTA== Received: by 10.229.136.208 with SMTP id s16mr11048743qct.112.1349131614570; Mon, 01 Oct 2012 15:46:54 -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 f12sm599020qey.5.2012.10.01.15.46.53 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 01 Oct 2012 15:46:54 -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 v2 4/5] arm: omap: Move iommu/iovmm headers to platform_data Date: Mon, 1 Oct 2012 18:46:30 -0400 Message-Id: <1349131591-10804-4-git-send-email-ido@wizery.com> X-Mailer: git-send-email 1.7.11.4 In-Reply-To: <1349131591-10804-1-git-send-email-ido@wizery.com> References: <20120927195526.GP4840@atomide.com> <1349131591-10804-1-git-send-email-ido@wizery.com> X-Gm-Message-State: ALoCoQlV/LJOjtYPSkENnwlcKwTqEPmx4ol7JDcU95IO6hk+lXm4MDh6/eRzEHNyBKIBh+bP42Ai 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 --- 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 | 6 ++++-- .../plat/iommu.h => include/linux/platform_data/iommu-omap.h | 0 .../plat/iovmm.h => include/linux/platform_data/iovmm-omap.h | 0 12 files changed, 17 insertions(+), 14 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 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 2857772..35ebf14 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 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"