From patchwork Sat Jun 7 21:56:03 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Longerbeam X-Patchwork-Id: 4316441 Return-Path: X-Original-To: patchwork-linux-media@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 9C3E49F170 for ; Sat, 7 Jun 2014 21:59:28 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 918D420225 for ; Sat, 7 Jun 2014 21:59:27 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 6A73920222 for ; Sat, 7 Jun 2014 21:59:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753318AbaFGV5E (ORCPT ); Sat, 7 Jun 2014 17:57:04 -0400 Received: from mail-pd0-f179.google.com ([209.85.192.179]:54300 "EHLO mail-pd0-f179.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753310AbaFGV5B (ORCPT ); Sat, 7 Jun 2014 17:57:01 -0400 Received: by mail-pd0-f179.google.com with SMTP id fp1so3840915pdb.38 for ; Sat, 07 Jun 2014 14:57:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=jqDgytYr2cW06QNM7ssCR5UrQwWK6wcbQUwqteS0Oy0=; b=dS1SseK4c+oaWowjAO79pP8ZJcH/rdL5HLV5V6R3J9c0/Snkf71uvpbad5GBRRO3x7 YM5sCD/8q9IRVp1Z8amL3CxCElYDOYlXS+jpuXn2XOuIhQg1OdeDAVOEyvP2/9HD/rrQ Wl1123LH58iuPFZr0RSP6xr88w39/flmX3btTqfwiGJx0sMHiFgUZtfcNGyUkiMcwp0F C9LtS1jhcOMyXya0zFU5gegbJaZyrWh1rXfLBXYoJpXbKYdr80wu3y34X7X07LJkeCRs PRtFRPcOkHm+BuEq7vjYANc8GYQpJe5jrq+gYxAXq4Tlo4tJzxtGgqV/92N4jUeGeXSP fpRg== X-Received: by 10.68.189.137 with SMTP id gi9mr15609453pbc.79.1402178220646; Sat, 07 Jun 2014 14:57:00 -0700 (PDT) Received: from slongerb-fremont-linux.mgc.mentorg.com (c-98-248-118-71.hsd1.ca.comcast.net. [98.248.118.71]) by mx.google.com with ESMTPSA id fx5sm52769595pbb.62.2014.06.07.14.56.59 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sat, 07 Jun 2014 14:57:00 -0700 (PDT) From: Steve Longerbeam X-Google-Original-From: Steve Longerbeam To: linux-media@vger.kernel.org Cc: Steve Longerbeam Subject: [PATCH 01/43] imx-drm: ipu-v3: Move imx-ipu-v3.h to include/linux/platform_data/ Date: Sat, 7 Jun 2014 14:56:03 -0700 Message-Id: <1402178205-22697-2-git-send-email-steve_longerbeam@mentor.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1402178205-22697-1-git-send-email-steve_longerbeam@mentor.com> References: <1402178205-22697-1-git-send-email-steve_longerbeam@mentor.com> Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-Spam-Status: No, score=-7.4 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP In subsequent patches, the video capture units will be added (csi, smfc, ic, irt). So the IPU prototypes are no longer needed only by imx-drm, so we need to export them to a common include path. Signed-off-by: Steve Longerbeam --- drivers/staging/imx-drm/imx-hdmi.c | 2 +- drivers/staging/imx-drm/imx-tve.c | 2 +- drivers/staging/imx-drm/ipu-v3/ipu-common.c | 2 +- drivers/staging/imx-drm/ipu-v3/ipu-dc.c | 2 +- drivers/staging/imx-drm/ipu-v3/ipu-di.c | 2 +- drivers/staging/imx-drm/ipu-v3/ipu-dmfc.c | 2 +- drivers/staging/imx-drm/ipu-v3/ipu-dp.c | 2 +- drivers/staging/imx-drm/ipu-v3/ipu-prv.h | 2 +- drivers/staging/imx-drm/ipuv3-crtc.c | 2 +- drivers/staging/imx-drm/ipuv3-plane.c | 2 +- .../linux/platform_data}/imx-ipu-v3.h | 9 +++++---- 11 files changed, 15 insertions(+), 14 deletions(-) rename {drivers/staging/imx-drm/ipu-v3 => include/linux/platform_data}/imx-ipu-v3.h (99%) diff --git a/drivers/staging/imx-drm/imx-hdmi.c b/drivers/staging/imx-drm/imx-hdmi.c index d47dedd..f0710a4 100644 --- a/drivers/staging/imx-drm/imx-hdmi.c +++ b/drivers/staging/imx-drm/imx-hdmi.c @@ -28,7 +28,7 @@ #include #include -#include "ipu-v3/imx-ipu-v3.h" +#include #include "imx-hdmi.h" #include "imx-drm.h" diff --git a/drivers/staging/imx-drm/imx-tve.c b/drivers/staging/imx-drm/imx-tve.c index a23f4f7..8b91588 100644 --- a/drivers/staging/imx-drm/imx-tve.c +++ b/drivers/staging/imx-drm/imx-tve.c @@ -31,7 +31,7 @@ #include #include -#include "ipu-v3/imx-ipu-v3.h" +#include #include "imx-drm.h" #define TVE_COM_CONF_REG 0x00 diff --git a/drivers/staging/imx-drm/ipu-v3/ipu-common.c b/drivers/staging/imx-drm/ipu-v3/ipu-common.c index ca85d3d..2aca7dd 100644 --- a/drivers/staging/imx-drm/ipu-v3/ipu-common.c +++ b/drivers/staging/imx-drm/ipu-v3/ipu-common.c @@ -31,7 +31,7 @@ #include -#include "imx-ipu-v3.h" +#include #include "ipu-prv.h" static inline u32 ipu_cm_read(struct ipu_soc *ipu, unsigned offset) diff --git a/drivers/staging/imx-drm/ipu-v3/ipu-dc.c b/drivers/staging/imx-drm/ipu-v3/ipu-dc.c index d5de8bb..e86010b 100644 --- a/drivers/staging/imx-drm/ipu-v3/ipu-dc.c +++ b/drivers/staging/imx-drm/ipu-v3/ipu-dc.c @@ -21,7 +21,7 @@ #include #include "../imx-drm.h" -#include "imx-ipu-v3.h" +#include #include "ipu-prv.h" #define DC_MAP_CONF_PTR(n) (0x108 + ((n) & ~0x1) * 2) diff --git a/drivers/staging/imx-drm/ipu-v3/ipu-di.c b/drivers/staging/imx-drm/ipu-v3/ipu-di.c index 82a9eba..1e54c00 100644 --- a/drivers/staging/imx-drm/ipu-v3/ipu-di.c +++ b/drivers/staging/imx-drm/ipu-v3/ipu-di.c @@ -20,7 +20,7 @@ #include #include -#include "imx-ipu-v3.h" +#include #include "ipu-prv.h" struct ipu_di { diff --git a/drivers/staging/imx-drm/ipu-v3/ipu-dmfc.c b/drivers/staging/imx-drm/ipu-v3/ipu-dmfc.c index 4521301..3c24111 100644 --- a/drivers/staging/imx-drm/ipu-v3/ipu-dmfc.c +++ b/drivers/staging/imx-drm/ipu-v3/ipu-dmfc.c @@ -17,7 +17,7 @@ #include #include -#include "imx-ipu-v3.h" +#include #include "ipu-prv.h" #define DMFC_RD_CHAN 0x0000 diff --git a/drivers/staging/imx-drm/ipu-v3/ipu-dp.c b/drivers/staging/imx-drm/ipu-v3/ipu-dp.c index 58f87c8..27d9a81 100644 --- a/drivers/staging/imx-drm/ipu-v3/ipu-dp.c +++ b/drivers/staging/imx-drm/ipu-v3/ipu-dp.c @@ -19,7 +19,7 @@ #include #include -#include "imx-ipu-v3.h" +#include #include "ipu-prv.h" #define DP_SYNC 0 diff --git a/drivers/staging/imx-drm/ipu-v3/ipu-prv.h b/drivers/staging/imx-drm/ipu-v3/ipu-prv.h index 4df0050..40211f6 100644 --- a/drivers/staging/imx-drm/ipu-v3/ipu-prv.h +++ b/drivers/staging/imx-drm/ipu-v3/ipu-prv.h @@ -22,7 +22,7 @@ struct ipu_soc; #include #include -#include "imx-ipu-v3.h" +#include #define IPUV3_CHANNEL_CSI0 0 #define IPUV3_CHANNEL_CSI1 1 diff --git a/drivers/staging/imx-drm/ipuv3-crtc.c b/drivers/staging/imx-drm/ipuv3-crtc.c index c48f640..9b707aa 100644 --- a/drivers/staging/imx-drm/ipuv3-crtc.c +++ b/drivers/staging/imx-drm/ipuv3-crtc.c @@ -30,7 +30,7 @@ #include #include -#include "ipu-v3/imx-ipu-v3.h" +#include #include "imx-drm.h" #include "ipuv3-plane.h" diff --git a/drivers/staging/imx-drm/ipuv3-plane.c b/drivers/staging/imx-drm/ipuv3-plane.c index 27a8d73..e9e4e7a 100644 --- a/drivers/staging/imx-drm/ipuv3-plane.c +++ b/drivers/staging/imx-drm/ipuv3-plane.c @@ -17,7 +17,7 @@ #include #include -#include "ipu-v3/imx-ipu-v3.h" +#include #include "ipuv3-plane.h" #define to_ipu_plane(x) container_of(x, struct ipu_plane, base) diff --git a/drivers/staging/imx-drm/ipu-v3/imx-ipu-v3.h b/include/linux/platform_data/imx-ipu-v3.h similarity index 99% rename from drivers/staging/imx-drm/ipu-v3/imx-ipu-v3.h rename to include/linux/platform_data/imx-ipu-v3.h index c4d14ea..c083a2a 100644 --- a/drivers/staging/imx-drm/ipu-v3/imx-ipu-v3.h +++ b/include/linux/platform_data/imx-ipu-v3.h @@ -9,8 +9,8 @@ * http://www.gnu.org/copyleft/lgpl.html */ -#ifndef __DRM_IPU_H__ -#define __DRM_IPU_H__ +#ifndef __IMX_IPU_H__ +#define __IMX_IPU_H__ #include #include @@ -230,7 +230,8 @@ struct ipu_ch_param { struct ipu_cpmem_word word[2]; }; -void ipu_ch_param_write_field(struct ipu_ch_param __iomem *base, u32 wbs, u32 v); +void ipu_ch_param_write_field(struct ipu_ch_param __iomem *base, + u32 wbs, u32 v); u32 ipu_ch_param_read_field(struct ipu_ch_param __iomem *base, u32 wbs); struct ipu_ch_param __iomem *ipu_get_cpmem(struct ipuv3_channel *channel); void ipu_ch_param_dump(struct ipu_ch_param __iomem *p); @@ -323,4 +324,4 @@ struct ipu_client_platformdata { int dma[2]; }; -#endif /* __DRM_IPU_H__ */ +#endif /* __IMX_IPU_H__ */