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: 3624981 Return-Path: X-Original-To: patchwork-linux-fbdev@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 5C105BF418 for ; Tue, 11 Feb 2014 06:49:05 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id B71E720171 for ; Tue, 11 Feb 2014 06:49:04 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 114E620142 for ; Tue, 11 Feb 2014 06:49:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752201AbaBKGst (ORCPT ); Tue, 11 Feb 2014 01:48:49 -0500 Received: from mail-ee0-f51.google.com ([74.125.83.51]:52684 "EHLO mail-ee0-f51.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751590AbaBKGss (ORCPT ); Tue, 11 Feb 2014 01:48:48 -0500 Received: by mail-ee0-f51.google.com with SMTP id b57so3384387eek.38 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=kjAnpTFwqGakNrDZHpRSNyd8YKQB/iTi2j/UEjGtHqMPqM9lF3SXJvcaSabmPZhoH/ Xegvr7OKgpd5CDnnEr5Qzp+yGbL/rFSPLkgBKoTK+A+k1+YwTZkPvVqjAt6y++fhrYQ7 AN5nuAiQg2fMeX6RtrBjP7P6uWpm6gNsoXWpAVcYnu6osGIzZAy5+evXiLGv1E01Jh1F pdGLhGEbtm2+jA24X3PFpne/NXnpU1k1kYl3Zpg32n+JtZlVAt9IG0uWcn+j7Z2lz5OC PBkuE5+QZST3ytY7ExsH8A7p0KgLLxvUfzdBBSqLzbdQ70BdzpbFBgRHL7Y/ee0GOSDu PNkA== X-Gm-Message-State: ALoCoQkunUDhAxZvFyYfSi5KxWAathZtWUdz/MjDYnkS98fOh+JgMViP2/L0e+uGY4ruSaSd8+pt 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 Cc: Jean-Christophe Plagniol-Villard , Tomi Valkeinen , linux-fbdev@vger.kernel.org, linux-arm-kernel@lists.infradead.org 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 Sender: linux-fbdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fbdev@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00, MIME_HEADER_CTYPE_ONLY, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_MIME_NO_TEXT, T_TVD_MIME_EPI, 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__ */