From patchwork Tue Oct 9 12:30:25 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomi Valkeinen X-Patchwork-Id: 1569921 Return-Path: X-Original-To: patchwork-linux-fbdev@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id 6319ADFFAD for ; Tue, 9 Oct 2012 12:30:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754394Ab2JIMaq (ORCPT ); Tue, 9 Oct 2012 08:30:46 -0400 Received: from na3sys009aog109.obsmtp.com ([74.125.149.201]:38879 "EHLO na3sys009aog109.obsmtp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754317Ab2JIMap (ORCPT ); Tue, 9 Oct 2012 08:30:45 -0400 Received: from mail-lb0-f174.google.com ([209.85.217.174]) (using TLSv1) by na3sys009aob109.postini.com ([74.125.148.12]) with SMTP ID DSNKUHQY87l58Yge/M0u79FWW6zWG9djzt4G@postini.com; Tue, 09 Oct 2012 05:30:45 PDT Received: by mail-lb0-f174.google.com with SMTP id n3so3680934lbo.19 for ; Tue, 09 Oct 2012 05:30:42 -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=pHgNSXBAjeRcAb0sTe/zzvJ1zX2agx/bTquLJi0q/N8=; b=PDK2Y5HTiVR3oNF4HYQ4gLLOI1cAzfB3d9XgdV+7t8MtWqAxN5owbMGq8Dz5Nhxvx7 owEI4Nb4I++hfjBWBHisbnmNn7s6xj9khaHfskKcd24CrYkikE1U0ss/ppJ1sK7G33eX IhpNOIf6LGC3WlNRgsYjHmf0tdoviQ+dl8jT03URT4hYJCcvTZhKPNckP6c/6iDd2zZq foEV3II99lmNyGYnjT4Qh3p6nBMjFfiMLBahzdMIo8ejRZfxxGUHXlF161rKkJVTjRc9 YefdAcH0NqNjDD/vuBhyXKLHdzDwWrBIyxiuicWVFIqVLh70p8JcGL/ugBPa/uPi+9aD Ef+g== Received: by 10.152.105.68 with SMTP id gk4mr6609391lab.48.1349785842522; Tue, 09 Oct 2012 05:30:42 -0700 (PDT) Received: from deskari.tieu.ti.com (a91-156-160-115.elisa-laajakaista.fi. [91.156.160.115]) by mx.google.com with ESMTPS id d7sm6312142lbn.3.2012.10.09.05.30.39 (version=SSLv3 cipher=OTHER); Tue, 09 Oct 2012 05:30:41 -0700 (PDT) From: Tomi Valkeinen To: linux-omap@vger.kernel.org, linux-fbdev@vger.kernel.org, Tony Lindgren Cc: Archit Taneja , Tomi Valkeinen , Vaibhav Hiremath Subject: [PATCHv2 2/3] OMAP: move arch/arm/plat-omap/include/plat/vrfb.h Date: Tue, 9 Oct 2012 15:30:25 +0300 Message-Id: <1349785827-27055-3-git-send-email-tomi.valkeinen@ti.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1349785827-27055-1-git-send-email-tomi.valkeinen@ti.com> References: <1349785827-27055-1-git-send-email-tomi.valkeinen@ti.com> X-Gm-Message-State: ALoCoQl6OOu+gaCdAnKy0HJzxGy9nDcAlU5ms+DkRVx1XCHbhT8SaaSPQHwMk027BwfSQvuouCOa Sender: linux-fbdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fbdev@vger.kernel.org Now that vrfb driver is not omap dependent anymore, we can move vrfb.h from arch/arm/plat-omap/include/plat to include/video/omapvrfb.h. Signed-off-by: Tomi Valkeinen Cc: Tony Lindgren Cc: Vaibhav Hiremath --- arch/arm/plat-omap/include/plat/vrfb.h | 66 ----------------------------- drivers/media/video/omap/omap_vout.c | 2 +- drivers/media/video/omap/omap_vout_vrfb.c | 2 +- drivers/media/video/omap/omap_voutdef.h | 2 +- drivers/video/omap2/omapfb/omapfb-ioctl.c | 2 +- drivers/video/omap2/omapfb/omapfb-main.c | 2 +- drivers/video/omap2/omapfb/omapfb-sysfs.c | 2 +- drivers/video/omap2/vrfb.c | 2 +- include/video/omapvrfb.h | 66 +++++++++++++++++++++++++++++ 9 files changed, 73 insertions(+), 73 deletions(-) delete mode 100644 arch/arm/plat-omap/include/plat/vrfb.h create mode 100644 include/video/omapvrfb.h diff --git a/arch/arm/plat-omap/include/plat/vrfb.h b/arch/arm/plat-omap/include/plat/vrfb.h deleted file mode 100644 index dafbb77..0000000 --- a/arch/arm/plat-omap/include/plat/vrfb.h +++ /dev/null @@ -1,66 +0,0 @@ -/* - * VRFB Rotation Engine - * - * Copyright (C) 2009 Nokia Corporation - * Author: Tomi Valkeinen - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - */ - -#ifndef __OMAP_VRFB_H__ -#define __OMAP_VRFB_H__ - -#define OMAP_VRFB_LINE_LEN 2048 - -struct vrfb { - u8 context; - void __iomem *vaddr[4]; - unsigned long paddr[4]; - u16 xres; - u16 yres; - u16 xoffset; - u16 yoffset; - u8 bytespp; - bool yuv_mode; -}; - -#if defined(CONFIG_OMAP2_VRFB) || defined(CONFIG_OMAP2_VRFB_MODULE) -extern int omap_vrfb_request_ctx(struct vrfb *vrfb); -extern void omap_vrfb_release_ctx(struct vrfb *vrfb); -extern void omap_vrfb_adjust_size(u16 *width, u16 *height, - u8 bytespp); -extern u32 omap_vrfb_min_phys_size(u16 width, u16 height, u8 bytespp); -extern u16 omap_vrfb_max_height(u32 phys_size, u16 width, u8 bytespp); -extern void omap_vrfb_setup(struct vrfb *vrfb, unsigned long paddr, - u16 width, u16 height, - unsigned bytespp, bool yuv_mode); -extern int omap_vrfb_map_angle(struct vrfb *vrfb, u16 height, u8 rot); -extern void omap_vrfb_restore_context(void); - -#else -static inline int omap_vrfb_request_ctx(struct vrfb *vrfb) { return 0; } -static inline void omap_vrfb_release_ctx(struct vrfb *vrfb) {} -static inline void omap_vrfb_adjust_size(u16 *width, u16 *height, - u8 bytespp) {} -static inline u32 omap_vrfb_min_phys_size(u16 width, u16 height, u8 bytespp) - { return 0; } -static inline u16 omap_vrfb_max_height(u32 phys_size, u16 width, u8 bytespp) - { return 0; } -static inline void omap_vrfb_setup(struct vrfb *vrfb, unsigned long paddr, - u16 width, u16 height, unsigned bytespp, bool yuv_mode) {} -static inline int omap_vrfb_map_angle(struct vrfb *vrfb, u16 height, u8 rot) - { return 0; } -static inline void omap_vrfb_restore_context(void) {} -#endif -#endif /* __VRFB_H */ diff --git a/drivers/media/video/omap/omap_vout.c b/drivers/media/video/omap/omap_vout.c index f721fd2..940f39f 100644 --- a/drivers/media/video/omap/omap_vout.c +++ b/drivers/media/video/omap/omap_vout.c @@ -45,7 +45,7 @@ #include #include -#include +#include