From patchwork Wed Nov 21 17:42:33 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Tony Lindgren X-Patchwork-Id: 200818 Return-Path: X-Original-To: incoming-imx@patchwork.ozlabs.org Delivered-To: patchwork-incoming-imx@bilbo.ozlabs.org Received: from merlin.infradead.org (merlin.infradead.org [IPv6:2001:4978:20e::2]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 496702C0098 for ; Thu, 22 Nov 2012 04:47:41 +1100 (EST) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1TbELU-0005HU-2O; Wed, 21 Nov 2012 17:44:20 +0000 Received: from mho-03-ewr.mailhop.org ([204.13.248.66] helo=mho-01-ewr.mailhop.org) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1TbEJy-0004cC-3R; Wed, 21 Nov 2012 17:42:57 +0000 Received: from c-67-169-73-11.hsd1.ca.comcast.net ([67.169.73.11] helo=muffinssi.local) by mho-01-ewr.mailhop.org with esmtpa (Exim 4.72) (envelope-from ) id 1TbEJu-000AJf-M1; Wed, 21 Nov 2012 17:42:43 +0000 X-Mail-Handler: Dyn Standard SMTP by Dyn X-Originating-IP: 67.169.73.11 X-Report-Abuse-To: abuse@dyndns.com (see http://www.dyndns.com/services/sendlabs/outbound_abuse.html for abuse reporting information) X-MHO-User: U2FsdGVkX1/QzGHGVhsrQwq3aoSmu2cD Subject: [PATCH 4/5] ARM: OMAP: Move plat-omap/dma-omap.h to include/linux/omap-dma.h To: linux-arm-kernel@lists.infradead.org From: Tony Lindgren Date: Wed, 21 Nov 2012 09:42:33 -0800 Message-ID: <20121121174233.25576.58781.stgit@muffinssi.local> In-Reply-To: <20121121174201.25576.61961.stgit@muffinssi.local> References: <20121121174201.25576.61961.stgit@muffinssi.local> User-Agent: StGit/0.16-1-ga54b MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20121121_124247_739735_38DEC7BF X-CRM114-Status: GOOD ( 17.67 ) X-Spam-Score: 1.1 (+) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (1.1 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [204.13.248.66 listed in list.dnswl.org] 3.0 KHOP_BIG_TO_CC Sent to 10+ recipients instaed of Bcc or a list -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: linux-fbdev@vger.kernel.org, Lokesh Vutla , Artem Bityutskiy , linux-mtd@lists.infradead.org, Laurent Pinchart , Kevin Hilman , Russell King , Herbert Xu , Florian Tobias Schandinat , Vinod Koul , Vaibhav Hiremath , Tomi Valkeinen , Hans Verkuil , linux-media@vger.kernel.org, Afzal Mohammed , Rusty Russell , Mauro Carvalho Chehab , linux-omap@vger.kernel.org, =?utf-8?q?Beno=C3=AEt?= Cousson , Greg Kroah-Hartman , linux-usb@vger.kernel.org, Felipe Balbi , Guennadi Liakhovetski , Kyungmin Park , linux-crypto@vger.kernel.org, Dan Williams , David Woodhouse , "David S. Miller" X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.14 Precedence: list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+incoming-imx=patchwork.ozlabs.org@lists.infradead.org List-Id: linux-imx-kernel.lists.patchwork.ozlabs.org Based on earlier discussions[1] we attempted to find a suitable location for the omap DMA header in commit 2b6c4e73 (ARM: OMAP: DMA: Move plat/dma.h to plat-omap/dma-omap.h) until the conversion to dmaengine is complete. Unfortunately that was before I was able to try to test compile of the ARM multiplatform builds for omap2+, and the end result was not very good. So I'm creating yet another all over the place patch to cut the last dependency for building omap2+ for ARM multiplatform. After this, we have finally removed the driver dependencies to the arch/arm code, except for few drivers that are being worked on. The other option was to make the path to work, but we'd have to add some new header directory to for multiplatform builds. Or we would have to manually include arch/arm/plat-omap/include again from arch/arm/Makefile for omap2+. Neither of these alternatives sound appealing as they will likely lead addition of various other headers exposed to the drivers, which we want to avoid for the multiplatform kernels. Since we already have a minimal include/linux/omap-dma.h, let's just use that instead and add a note to it to not use the custom omap DMA functions any longer where possible. Note that converting omap DMA to dmaengine depends on dmaengine supporting automatically incrementing the FIFO address at the device end, and converting all the remaining legacy drivers. So it's going to be few more merge windows. [1] https://patchwork.kernel.org/patch/1519591/# cc: Russell King cc: Kevin Hilman cc: "Benoît Cousson" cc: Herbert Xu cc: "David S. Miller" cc: Vinod Koul cc: Dan Williams cc: Mauro Carvalho Chehab cc: Laurent Pinchart cc: Guennadi Liakhovetski cc: David Woodhouse cc: Kyungmin Park cc: Felipe Balbi cc: Greg Kroah-Hartman cc: Tomi Valkeinen cc: Florian Tobias Schandinat cc: Hans Verkuil cc: Vaibhav Hiremath cc: Lokesh Vutla cc: Rusty Russell cc: Artem Bityutskiy cc: Afzal Mohammed cc: linux-crypto@vger.kernel.org cc: linux-media@vger.kernel.org cc: linux-mtd@lists.infradead.org cc: linux-usb@vger.kernel.org cc: linux-fbdev@vger.kernel.org Signed-off-by: Tony Lindgren Acked-by: Felipe Balbi --- arch/arm/mach-omap1/board-h2.c | 2 arch/arm/mach-omap1/board-h3.c | 2 arch/arm/mach-omap1/board-palmte.c | 2 arch/arm/mach-omap1/board-palmtt.c | 2 arch/arm/mach-omap1/board-palmz71.c | 2 arch/arm/mach-omap1/board-sx1.c | 2 arch/arm/mach-omap1/dma.c | 2 arch/arm/mach-omap1/io.c | 2 arch/arm/mach-omap1/lcd_dma.c | 2 arch/arm/mach-omap1/mcbsp.c | 2 arch/arm/mach-omap1/pm.c | 2 arch/arm/mach-omap2/board-3430sdp.c | 2 arch/arm/mach-omap2/board-h4.c | 2 arch/arm/mach-omap2/board-rx51-peripherals.c | 2 arch/arm/mach-omap2/board-rx51.c | 2 arch/arm/mach-omap2/devices.c | 2 arch/arm/mach-omap2/dma.c | 2 arch/arm/mach-omap2/io.c | 2 arch/arm/mach-omap2/mcbsp.c | 2 arch/arm/mach-omap2/omap_hwmod_2420_data.c | 2 arch/arm/mach-omap2/omap_hwmod_2430_data.c | 2 .../mach-omap2/omap_hwmod_2xxx_3xxx_ipblock_data.c | 3 arch/arm/mach-omap2/omap_hwmod_2xxx_ipblock_data.c | 2 arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | 2 arch/arm/mach-omap2/omap_hwmod_44xx_data.c | 2 arch/arm/mach-omap2/pm24xx.c | 2 arch/arm/mach-omap2/pm34xx.c | 3 arch/arm/plat-omap/dma.c | 2 arch/arm/plat-omap/include/plat-omap/dma-omap.h | 377 -------------------- drivers/crypto/omap-aes.c | 2 drivers/crypto/omap-sham.c | 2 drivers/dma/omap-dma.c | 2 drivers/media/platform/omap/omap_vout.c | 2 drivers/media/platform/omap/omap_vout_vrfb.c | 2 drivers/media/platform/omap3isp/ispstat.h | 2 drivers/media/platform/soc_camera/omap1_camera.c | 2 drivers/mtd/nand/omap2.c | 1 drivers/mtd/onenand/omap2.c | 2 drivers/usb/gadget/omap_udc.c | 2 drivers/usb/musb/tusb6010_omap.c | 2 drivers/video/omap/lcdc.c | 2 drivers/video/omap/omapfb_main.c | 2 drivers/video/omap/sossi.c | 2 include/linux/omap-dma.h | 366 +++++++++++++++++++ 44 files changed, 407 insertions(+), 421 deletions(-) delete mode 100644 arch/arm/plat-omap/include/plat-omap/dma-omap.h diff --git a/arch/arm/mach-omap1/board-h2.c b/arch/arm/mach-omap1/board-h2.c index 9134b64..dcf364d 100644 --- a/arch/arm/mach-omap1/board-h2.c +++ b/arch/arm/mach-omap1/board-h2.c @@ -39,7 +39,7 @@ #include #include -#include +#include #include #include #include diff --git a/arch/arm/mach-omap1/board-h3.c b/arch/arm/mach-omap1/board-h3.c index bf213d1..b3fcded 100644 --- a/arch/arm/mach-omap1/board-h3.c +++ b/arch/arm/mach-omap1/board-h3.c @@ -43,7 +43,7 @@ #include #include #include -#include +#include #include #include diff --git a/arch/arm/mach-omap1/board-palmte.c b/arch/arm/mach-omap1/board-palmte.c index 584b6fa..c33dceb 100644 --- a/arch/arm/mach-omap1/board-palmte.c +++ b/arch/arm/mach-omap1/board-palmte.c @@ -37,7 +37,7 @@ #include #include #include -#include +#include #include #include diff --git a/arch/arm/mach-omap1/board-palmtt.c b/arch/arm/mach-omap1/board-palmtt.c index fbc986b..2948b0e 100644 --- a/arch/arm/mach-omap1/board-palmtt.c +++ b/arch/arm/mach-omap1/board-palmtt.c @@ -36,7 +36,7 @@ #include #include -#include +#include #include #include #include diff --git a/arch/arm/mach-omap1/board-palmz71.c b/arch/arm/mach-omap1/board-palmz71.c index 60d917a..7a05895 100644 --- a/arch/arm/mach-omap1/board-palmz71.c +++ b/arch/arm/mach-omap1/board-palmz71.c @@ -38,7 +38,7 @@ #include #include -#include +#include #include #include #include diff --git a/arch/arm/mach-omap1/board-sx1.c b/arch/arm/mach-omap1/board-sx1.c index 1ebc7e0..20ed52a 100644 --- a/arch/arm/mach-omap1/board-sx1.c +++ b/arch/arm/mach-omap1/board-sx1.c @@ -36,7 +36,7 @@ #include #include -#include +#include #include #include #include diff --git a/arch/arm/mach-omap1/dma.c b/arch/arm/mach-omap1/dma.c index 978aed8..e190611 100644 --- a/arch/arm/mach-omap1/dma.c +++ b/arch/arm/mach-omap1/dma.c @@ -25,7 +25,7 @@ #include #include -#include +#include #include #include diff --git a/arch/arm/mach-omap1/io.c b/arch/arm/mach-omap1/io.c index 5a3b806..499b8ac 100644 --- a/arch/arm/mach-omap1/io.c +++ b/arch/arm/mach-omap1/io.c @@ -18,7 +18,7 @@ #include #include -#include +#include #include "iomap.h" #include "common.h" diff --git a/arch/arm/mach-omap1/lcd_dma.c b/arch/arm/mach-omap1/lcd_dma.c index 7ed8c18..77924be 100644 --- a/arch/arm/mach-omap1/lcd_dma.c +++ b/arch/arm/mach-omap1/lcd_dma.c @@ -27,7 +27,7 @@ #include #include -#include +#include #include #include diff --git a/arch/arm/mach-omap1/mcbsp.c b/arch/arm/mach-omap1/mcbsp.c index c6d8fdf..b0d4723 100644 --- a/arch/arm/mach-omap1/mcbsp.c +++ b/arch/arm/mach-omap1/mcbsp.c @@ -19,7 +19,7 @@ #include #include -#include +#include #include #include "soc.h" #include diff --git a/arch/arm/mach-omap1/pm.c b/arch/arm/mach-omap1/pm.c index 66d663a..7a7690a 100644 --- a/arch/arm/mach-omap1/pm.c +++ b/arch/arm/mach-omap1/pm.c @@ -52,7 +52,7 @@ #include #include -#include +#include #include #include diff --git a/arch/arm/mach-omap2/board-3430sdp.c b/arch/arm/mach-omap2/board-3430sdp.c index 6601754..7b20154 100644 --- a/arch/arm/mach-omap2/board-3430sdp.c +++ b/arch/arm/mach-omap2/board-3430sdp.c @@ -31,7 +31,7 @@ #include #include "common.h" -#include +#include #include