From patchwork Mon Sep 17 05:34:43 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shawn Guo X-Patchwork-Id: 184297 Return-Path: X-Original-To: incoming-imx@patchwork.ozlabs.org Delivered-To: patchwork-incoming-imx@bilbo.ozlabs.org Received: from merlin.infradead.org (unknown [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 6A48D2C0093 for ; Mon, 17 Sep 2012 15:46:15 +1000 (EST) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1TDU5a-0004yK-Ru; Mon, 17 Sep 2012 05:41:47 +0000 Received: from mail-pb0-f49.google.com ([209.85.160.49]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1TDTzy-0001e5-Fl for linux-arm-kernel@lists.infradead.org; Mon, 17 Sep 2012 05:35:59 +0000 Received: by mail-pb0-f49.google.com with SMTP id rq8so9280584pbb.36 for ; Sun, 16 Sep 2012 22:35:58 -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=TKCjIIrpbXK9F132+Ccyd1vQSL8T02MAKtn6jkReYLo=; b=KnBWupXxLncHD0AVzkSabiOFcAXxJKwx+98P3R71JpC0cLkP63WAPZo3V1uWxdfj8I GmpBODo3xCRSAvhxq8V4pue/7BcFaTb1wQSq8waewaoVUGfyxPIa3akX2p/P0s0weaEY lrTlqULkkOqp7MuQ6bFe1mIkgJXX0LCyOxSBPafeWkWtwxp1edHuZ+wNIIyOFdQ+oPqt j4bf8xr+9d8yWEmfI+PBNB5g0jTTuP5RkEdsy8XexnPDrOuEkt6KkEcEQaG9Vfn7lk6v yoksVDUP9QKgcPJ50zrnshfRye0+Y1g3YPuEeboVbMN99s9BYLwj6T/2WuSBPCJncaIO j12w== Received: by 10.66.83.9 with SMTP id m9mr18177847pay.22.1347860158152; Sun, 16 Sep 2012 22:35:58 -0700 (PDT) Received: from S2101-09.ap.freescale.net ([221.225.141.190]) by mx.google.com with ESMTPS id it6sm6386097pbc.14.2012.09.16.22.35.52 (version=TLSv1/SSLv3 cipher=OTHER); Sun, 16 Sep 2012 22:35:57 -0700 (PDT) From: Shawn Guo To: linux-arm-kernel@lists.infradead.org Subject: [PATCH 14/34] dma: ipu: rename mach/ipu.h to include/linux/dma/ipu-dma.h Date: Mon, 17 Sep 2012 13:34:43 +0800 Message-Id: <1347860103-4141-15-git-send-email-shawn.guo@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1347860103-4141-1-git-send-email-shawn.guo@linaro.org> References: <1347860103-4141-1-git-send-email-shawn.guo@linaro.org> X-Gm-Message-State: ALoCoQlnIvgCJm0xW+JFfjrqZFEUSsgDqaXbI4OfhxyJIxtFx+Zp/fK8f4mA4u3wbHsy0P24R+n3 X-Spam-Note: CRM114 invocation failed X-Spam-Score: -2.6 (--) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-2.6 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [209.85.160.49 listed in list.dnswl.org] -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: Fabio Estevam , linux-fbdev@vger.kernel.org, Arnd Bergmann , Florian Tobias Schandinat , Vinod Koul , Sascha Hauer , Rob Herring , Shawn Guo , Guennadi Liakhovetski , linux-media@vger.kernel.org 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: , MIME-Version: 1.0 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 The header ipu.h really belongs to dma subsystem rather than imx platform. Rename it to ipu-dma.h and put it into include/linux/dma/. Signed-off-by: Shawn Guo Cc: Vinod Koul Cc: Guennadi Liakhovetski Cc: Florian Tobias Schandinat Cc: linux-media@vger.kernel.org Cc: linux-fbdev@vger.kernel.org Acked-by: Guennadi Liakhovetski Acked-by: Mauro Carvalho Chehab --- drivers/dma/ipu/ipu_idmac.c | 3 +-- drivers/dma/ipu/ipu_irq.c | 3 +-- drivers/media/video/mx3_camera.c | 2 +- drivers/video/mx3fb.c | 2 +- .../mach/ipu.h => include/linux/dma/ipu-dma.h | 6 +++--- 5 files changed, 7 insertions(+), 9 deletions(-) rename arch/arm/mach-imx/include/mach/ipu.h => include/linux/dma/ipu-dma.h (97%) diff --git a/drivers/dma/ipu/ipu_idmac.c b/drivers/dma/ipu/ipu_idmac.c index c7573e5..6585537 100644 --- a/drivers/dma/ipu/ipu_idmac.c +++ b/drivers/dma/ipu/ipu_idmac.c @@ -22,8 +22,7 @@ #include #include #include - -#include +#include #include "../dmaengine.h" #include "ipu_intern.h" diff --git a/drivers/dma/ipu/ipu_irq.c b/drivers/dma/ipu/ipu_irq.c index fa95bcc..a5ee37d 100644 --- a/drivers/dma/ipu/ipu_irq.c +++ b/drivers/dma/ipu/ipu_irq.c @@ -15,8 +15,7 @@ #include #include #include - -#include +#include #include "ipu_intern.h" diff --git a/drivers/media/video/mx3_camera.c b/drivers/media/video/mx3_camera.c index 1481b0d..892cba5 100644 --- a/drivers/media/video/mx3_camera.c +++ b/drivers/media/video/mx3_camera.c @@ -17,6 +17,7 @@ #include #include #include +#include #include #include @@ -24,7 +25,6 @@ #include #include -#include #include #include diff --git a/drivers/video/mx3fb.c b/drivers/video/mx3fb.c index d738108..3b63ad8 100644 --- a/drivers/video/mx3fb.c +++ b/drivers/video/mx3fb.c @@ -26,10 +26,10 @@ #include #include #include +#include #include #include -#include #include #include diff --git a/arch/arm/mach-imx/include/mach/ipu.h b/include/linux/dma/ipu-dma.h similarity index 97% rename from arch/arm/mach-imx/include/mach/ipu.h rename to include/linux/dma/ipu-dma.h index 539e559..1803111 100644 --- a/arch/arm/mach-imx/include/mach/ipu.h +++ b/include/linux/dma/ipu-dma.h @@ -9,8 +9,8 @@ * published by the Free Software Foundation. */ -#ifndef _IPU_H_ -#define _IPU_H_ +#ifndef __LINUX_DMA_IPU_DMA_H +#define __LINUX_DMA_IPU_DMA_H #include #include @@ -174,4 +174,4 @@ struct idmac_channel { #define to_tx_desc(tx) container_of(tx, struct idmac_tx_desc, txd) #define to_idmac_chan(c) container_of(c, struct idmac_channel, dma_chan) -#endif +#endif /* __LINUX_DMA_IPU_DMA_H */