From patchwork Tue Feb 11 06:48:32 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michal Simek X-Patchwork-Id: 3624991 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 92E06BF418 for ; Tue, 11 Feb 2014 06:49:26 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id BC9AB201F4 for ; Tue, 11 Feb 2014 06:49:25 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 64CA320171 for ; Tue, 11 Feb 2014 06:49:24 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1WD79f-0004pk-VG; Tue, 11 Feb 2014 06:49:16 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1WD79d-0000AH-Kk; Tue, 11 Feb 2014 06:49:13 +0000 Received: from mail-ee0-f46.google.com ([74.125.83.46]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1WD79Z-00009O-Mi for linux-arm-kernel@lists.infradead.org; Tue, 11 Feb 2014 06:49:10 +0000 Received: by mail-ee0-f46.google.com with SMTP id c13so3302650eek.5 for ; Mon, 10 Feb 2014 22:48:47 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :content-type; bh=RYwvYD6a5r6GEl+jU88cvY7lGCZTy2b/29RYSTTi1VU=; b=dEX63welgAmKpW/5AEnemS5ICj8R6jcavKgsw/j+xfufnKtlmhZYjxg6q5wU9FZJVZ s/cslsm3h9jGojmOhFgIXDQeQvs71eOBpm4w/P6hsSUwVfm9gp4ZxluPTWToj2YzF9GY Wz6+CsRxgeswJtFZggveIMoSU57btXmIsxPf3L9GkCfu2UXK6cWlFoeEDuhzOvu2+Ru5 p7Ol6uQk14TKdRbxtXBK4ZS0G1bq/KCokFNeeE7sYlH6mioDZ7aWQEgJrx214dmStZqK MC4DALzzkq9QJvsHr4rt/apWo0FjFd80VeVol6lcFnveM+OEEg427HDQauO/OeATCrRD PVaA== X-Gm-Message-State: ALoCoQkwl6nFPVnX8NOUzl5Hm/rD1viPl5RxB9uMGguNVW5Df20WO01fGkS+zfO6j4PAMNAtLxIf X-Received: by 10.14.216.3 with SMTP id f3mr740365eep.66.1392101327195; Mon, 10 Feb 2014 22:48:47 -0800 (PST) Received: from localhost (nat-63.starnet.cz. [178.255.168.63]) by mx.google.com with ESMTPSA id d9sm63525869eei.9.2014.02.10.22.48.45 for (version=TLSv1.1 cipher=RC4-SHA bits=128/128); Mon, 10 Feb 2014 22:48:45 -0800 (PST) From: Michal Simek To: linux-kernel@vger.kernel.org, monstr@monstr.eu Subject: [PATCH] video: xilinxfb: Move xilinxfb_platform_data directly to the driver Date: Tue, 11 Feb 2014 07:48:32 +0100 Message-Id: X-Mailer: git-send-email 1.8.2.3 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140211_014909_854809_A715FF75 X-CRM114-Status: GOOD ( 19.57 ) X-Spam-Score: -1.9 (-) Cc: linux-fbdev@vger.kernel.org, Tomi Valkeinen , Jean-Christophe Plagniol-Villard , linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.8 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, T_TVD_MIME_NO_HEADERS, UNPARSEABLE_RELAY autolearn=unavailable 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 No reason to have separate file in header in include/linux folder if this is purely driver specific structure. Signed-off-by: Michal Simek --- I have this patch in my devel tree for a while and would like to hear your opinion. I can't see any reason to have xilinxfb_platform_data in header if this is purely OF driver used on OF archs. --- drivers/video/xilinxfb.c | 15 ++++++++++++++- include/linux/xilinxfb.h | 30 ------------------------------ 2 files changed, 14 insertions(+), 31 deletions(-) delete mode 100644 include/linux/xilinxfb.h -- 1.8.2.3 diff --git a/drivers/video/xilinxfb.c b/drivers/video/xilinxfb.c index 6ff1a91..553cff2 100644 --- a/drivers/video/xilinxfb.c +++ b/drivers/video/xilinxfb.c @@ -33,7 +33,6 @@ #include #include #include -#include #include #ifdef CONFIG_PPC_DCR @@ -84,6 +83,20 @@ #define PALETTE_ENTRIES_NO 16 /* passed to fb_alloc_cmap() */ +/* ML300/403 reference design framebuffer driver platform data struct */ +struct xilinxfb_platform_data { + u32 rotate_screen; /* Flag to rotate display 180 degrees */ + u32 screen_height_mm; /* Physical dimensions of screen in mm */ + u32 screen_width_mm; + u32 xres, yres; /* resolution of screen in pixels */ + u32 xvirt, yvirt; /* resolution of memory buffer */ + + /* Physical address of framebuffer memory; If non-zero, driver + * will use provided memory address instead of allocating one from + * the consistent pool. */ + u32 fb_phys; +}; + /* * Default xilinxfb configuration */ diff --git a/include/linux/xilinxfb.h b/include/linux/xilinxfb.h deleted file mode 100644 index 5a155a9..0000000 --- a/include/linux/xilinxfb.h +++ /dev/null @@ -1,30 +0,0 @@ -/* - * Platform device data for Xilinx Framebuffer device - * - * Copyright 2007 Secret Lab Technologies Ltd. - * - * This file is licensed under the terms of the GNU General Public License - * version 2. This program is licensed "as is" without any warranty of any - * kind, whether express or implied. - */ - -#ifndef __XILINXFB_H__ -#define __XILINXFB_H__ - -#include - -/* ML300/403 reference design framebuffer driver platform data struct */ -struct xilinxfb_platform_data { - u32 rotate_screen; /* Flag to rotate display 180 degrees */ - u32 screen_height_mm; /* Physical dimensions of screen in mm */ - u32 screen_width_mm; - u32 xres, yres; /* resolution of screen in pixels */ - u32 xvirt, yvirt; /* resolution of memory buffer */ - - /* Physical address of framebuffer memory; If non-zero, driver - * will use provided memory address instead of allocating one from - * the consistent pool. */ - u32 fb_phys; -}; - -#endif /* __XILINXFB_H__ */