From patchwork Mon Oct 8 12:30:29 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomi Valkeinen X-Patchwork-Id: 1565271 Return-Path: X-Original-To: patchwork-linux-fbdev@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id 7A52740135 for ; Mon, 8 Oct 2012 12:30:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752253Ab2JHMas (ORCPT ); Mon, 8 Oct 2012 08:30:48 -0400 Received: from na3sys009aog102.obsmtp.com ([74.125.149.69]:55199 "EHLO na3sys009aog102.obsmtp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752107Ab2JHMar (ORCPT ); Mon, 8 Oct 2012 08:30:47 -0400 Received: from mail-la0-f46.google.com ([209.85.215.46]) (using TLSv1) by na3sys009aob102.postini.com ([74.125.148.12]) with SMTP ID DSNKUHLHdebQXIafeHpA6q7E4VzD/rb1xXvD@postini.com; Mon, 08 Oct 2012 05:30:46 PDT Received: by mail-la0-f46.google.com with SMTP id h6so2210354lag.19 for ; Mon, 08 Oct 2012 05:30:44 -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=aI/1xsSn54doAQUy8/5YiBSITONK6YzTxrPGNaVEZTU=; b=huNqICziEKIgM4Z5QqHu6M47Mo3d+ernKsVrbJ2n9Q72+QmW+e4jK9MkwMFCIbM11M rx6cqmqUuSIQcRzyEVtUmEmYhMvgO/HyzAu/YpsczcOD5CNIGujL+1ybkU5mL8q36724 3MfMWR4q7vTE9dEmre9CXB2XkPD63aHZXVivBF6OHNUSbEEdqTQli2IgOU3zU8go05Bj Dk/47qxH4H83j0w5wXkazIR1hcdIiRNFky3mpLip54xd6PlNw13akCz2lkVUrE1qqsKB 35pV+en8yHu5ikU1BBv+F0ZTOy/cxU6bx6rvNH7ytsAfjjbHYcHLaKe4EwPaoOovt0Tl Op/w== Received: by 10.152.109.145 with SMTP id hs17mr13422567lab.5.1349699444185; Mon, 08 Oct 2012 05:30:44 -0700 (PDT) Received: from localhost.localdomain (a91-156-160-115.elisa-laajakaista.fi. [91.156.160.115]) by mx.google.com with ESMTPS id o7sm5449447lbg.4.2012.10.08.05.30.41 (version=SSLv3 cipher=OTHER); Mon, 08 Oct 2012 05:30:43 -0700 (PDT) From: Tomi Valkeinen To: linux-omap@vger.kernel.org, linux-fbdev@vger.kernel.org Cc: Archit Taneja , Tony Lindgren , Tomi Valkeinen , Vaibhav Hiremath Subject: [PATCH 2/2] OMAP: move arch/arm/plat-omap/include/plat/vrfb.h Date: Mon, 8 Oct 2012 15:30:29 +0300 Message-Id: <1349699429-12736-2-git-send-email-tomi.valkeinen@ti.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1349699429-12736-1-git-send-email-tomi.valkeinen@ti.com> References: <1349699429-12736-1-git-send-email-tomi.valkeinen@ti.com> X-Gm-Message-State: ALoCoQmjEgUL/owGPZmE/37uM8HYYH9ha5d0XqId8cdkG2l/p68ewDMYJk52QzjJOGROqnuHW7FC 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 Acked-by: Tony Lindgren --- 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 3792bde..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; -}; - -#ifdef CONFIG_OMAP2_VRFB -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