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: 14441 Received: from mail.tu-berlin.de ([130.149.7.33]) by www.linuxtv.org with esmtp (Exim 4.72) (envelope-from ) id 1TDU01-0007sW-Lk for patchwork@linuxtv.org; Mon, 17 Sep 2012 07:36:01 +0200 X-tubIT-Incoming-IP: 209.132.180.67 Received: from vger.kernel.org ([209.132.180.67]) by mail.tu-berlin.de (exim-4.75/mailfrontend-4) with esmtp for id 1TDU00-00052Q-Ck; Mon, 17 Sep 2012 07:36:01 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753271Ab2IQFf7 (ORCPT ); Mon, 17 Sep 2012 01:35:59 -0400 Received: from mail-pb0-f46.google.com ([209.85.160.46]:43358 "EHLO mail-pb0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752674Ab2IQFf6 (ORCPT ); Mon, 17 Sep 2012 01:35:58 -0400 Received: by mail-pb0-f46.google.com with SMTP id rr13so8484957pbb.19 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=VsjhWpDD9toWqt9nJyk+B1fvn4V8KI3fmJxxdagJD6l/3xUO7ztPgNJr8SK3snzQkZ R2TSb4oyWC9kTohj11tsQ5ADyjvhywQb78sUHMkKri3RZDoSkq09gf7t9XLRcqg4xw01 n4l8gdPv26xPHpRrqvs0qxcLTKekkgNuSmZQ9yedg6BZuRxXG31lBD2qXV4uFpOHAfjy uYC+zPXgTNQavEoLu0FERrv1a8PPeMea/MxUZPan97Tb3zyqD0kawFYV6YNy5XMYkJz2 05Qn9CiPRbzFTl5E4GGhZ6x21AuvapA9G90EvTDa0WRLrnOaj8ZfYSIyzn5+HZmzcJnI s+lQ== 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 Cc: Sascha Hauer , Fabio Estevam , Rob Herring , Arnd Bergmann , Shawn Guo , Vinod Koul , Guennadi Liakhovetski , Florian Tobias Schandinat , linux-media@vger.kernel.org, linux-fbdev@vger.kernel.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: ALoCoQnJR6zHL0wi/lQlOcSfw6Xxjal2AdKQi/klFf+hO9IPjST/Hl7owKUKEHVthiYINGS/FLCO Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-PMX-Version: 5.6.1.2065439, Antispam-Engine: 2.7.2.376379, Antispam-Data: 2012.9.17.52726 X-PMX-Spam: Gauge=IIIIIIII, Probability=8%, Report=' MULTIPLE_RCPTS 0.1, HTML_00_01 0.05, HTML_00_10 0.05, BODY_SIZE_3000_3999 0, BODY_SIZE_5000_LESS 0, BODY_SIZE_7000_LESS 0, URI_ENDS_IN_HTML 0, __ANY_URI 0, __CP_MEDIA_BODY 0, __CP_URI_IN_BODY 0, __DATE_TZ_HK 0, __FRAUD_BODY_WEBMAIL 0, __FRAUD_WEBMAIL 0, __HAS_FROM 0, __HAS_MSGID 0, __HAS_X_MAILER 0, __HAS_X_MAILING_LIST 0, __MIME_TEXT_ONLY 0, __MULTIPLE_RCPTS_CC_X2 0, __SANE_MSGID 0, __TO_MALFORMED_2 0, __TO_NO_NAME 0, __URI_NO_WWW 0, __URI_NS ' 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 */