From patchwork Thu Feb 27 11:54:45 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomi Valkeinen X-Patchwork-Id: 3732211 Return-Path: X-Original-To: patchwork-linux-fbdev@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 583C69F38C for ; Thu, 27 Feb 2014 11:56:45 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 33D29201FE for ; Thu, 27 Feb 2014 11:56:44 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E9C69201CD for ; Thu, 27 Feb 2014 11:56:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752457AbaB0Lzq (ORCPT ); Thu, 27 Feb 2014 06:55:46 -0500 Received: from arroyo.ext.ti.com ([192.94.94.40]:50199 "EHLO arroyo.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751798AbaB0Lzn (ORCPT ); Thu, 27 Feb 2014 06:55:43 -0500 Received: from dlelxv90.itg.ti.com ([172.17.2.17]) by arroyo.ext.ti.com (8.13.7/8.13.7) with ESMTP id s1RBtSGh009068; Thu, 27 Feb 2014 05:55:28 -0600 Received: from DLEE70.ent.ti.com (dlee70.ent.ti.com [157.170.170.113]) by dlelxv90.itg.ti.com (8.14.3/8.13.8) with ESMTP id s1RBtSj8024169; Thu, 27 Feb 2014 05:55:28 -0600 Received: from dflp32.itg.ti.com (10.64.6.15) by DLEE70.ent.ti.com (157.170.170.113) with Microsoft SMTP Server id 14.3.174.1; Thu, 27 Feb 2014 05:55:27 -0600 Received: from deskari.ti.com (ileax41-snat.itg.ti.com [10.172.224.153]) by dflp32.itg.ti.com (8.14.3/8.13.8) with ESMTP id s1RBtHev004411; Thu, 27 Feb 2014 05:55:25 -0600 From: Tomi Valkeinen To: , , CC: Laurent Pinchart , Geert Uytterhoeven , Jean-Christophe Plagniol-Villard , David Airlie , Andrew Morton , Linus Torvalds , Greg Kroah-Hartman , Tomi Valkeinen Subject: [PATCH 2/3] fbdev: move fbdev core files to separate directory Date: Thu, 27 Feb 2014 13:54:45 +0200 Message-ID: <1393502086-9433-3-git-send-email-tomi.valkeinen@ti.com> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1393502086-9433-1-git-send-email-tomi.valkeinen@ti.com> References: <1393502086-9433-1-git-send-email-tomi.valkeinen@ti.com> MIME-Version: 1.0 Sender: linux-fbdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fbdev@vger.kernel.org X-Spam-Status: No, score=-3.8 required=5.0 tests=BAYES_00,KHOP_BIG_TO_CC, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, 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 Instead of having fbdev framework core files at the root fbdev directory, mixed with random fbdev device drivers, move the fbdev core files to a separate core directory. This makes it much clearer which of the files are actually part of the fbdev framework, and which are part of device drivers. Signed-off-by: Tomi Valkeinen Acked-by: Laurent Pinchart Acked-by: Geert Uytterhoeven Acked-by: Rob Clark Acked-by: Jingoo Han --- drivers/video/fbdev/Makefile | 16 +--------------- drivers/video/fbdev/core/Makefile | 16 ++++++++++++++++ drivers/video/fbdev/{ => core}/cfbcopyarea.c | 0 drivers/video/fbdev/{ => core}/cfbfillrect.c | 0 drivers/video/fbdev/{ => core}/cfbimgblt.c | 0 drivers/video/fbdev/{ => core}/fb_ddc.c | 2 +- drivers/video/fbdev/{ => core}/fb_defio.c | 0 drivers/video/fbdev/{ => core}/fb_draw.h | 0 drivers/video/fbdev/{ => core}/fb_notify.c | 0 drivers/video/fbdev/{ => core}/fb_sys_fops.c | 0 drivers/video/fbdev/{ => core}/fbcmap.c | 0 drivers/video/fbdev/{ => core}/fbcvt.c | 0 drivers/video/fbdev/{ => core}/fbmem.c | 0 drivers/video/fbdev/{ => core}/fbmon.c | 2 +- drivers/video/fbdev/{ => core}/fbsysfs.c | 0 drivers/video/fbdev/{ => core}/modedb.c | 0 drivers/video/fbdev/{ => core}/svgalib.c | 0 drivers/video/fbdev/{ => core}/syscopyarea.c | 0 drivers/video/fbdev/{ => core}/sysfillrect.c | 0 drivers/video/fbdev/{ => core}/sysimgblt.c | 0 drivers/video/fbdev/wmt_ge_rops.c | 2 +- 21 files changed, 20 insertions(+), 18 deletions(-) create mode 100644 drivers/video/fbdev/core/Makefile rename drivers/video/fbdev/{ => core}/cfbcopyarea.c (100%) rename drivers/video/fbdev/{ => core}/cfbfillrect.c (100%) rename drivers/video/fbdev/{ => core}/cfbimgblt.c (100%) rename drivers/video/fbdev/{ => core}/fb_ddc.c (99%) rename drivers/video/fbdev/{ => core}/fb_defio.c (100%) rename drivers/video/fbdev/{ => core}/fb_draw.h (100%) rename drivers/video/fbdev/{ => core}/fb_notify.c (100%) rename drivers/video/fbdev/{ => core}/fb_sys_fops.c (100%) rename drivers/video/fbdev/{ => core}/fbcmap.c (100%) rename drivers/video/fbdev/{ => core}/fbcvt.c (100%) rename drivers/video/fbdev/{ => core}/fbmem.c (100%) rename drivers/video/fbdev/{ => core}/fbmon.c (99%) rename drivers/video/fbdev/{ => core}/fbsysfs.c (100%) rename drivers/video/fbdev/{ => core}/modedb.c (100%) rename drivers/video/fbdev/{ => core}/svgalib.c (100%) rename drivers/video/fbdev/{ => core}/syscopyarea.c (100%) rename drivers/video/fbdev/{ => core}/sysfillrect.c (100%) rename drivers/video/fbdev/{ => core}/sysimgblt.c (100%) diff --git a/drivers/video/fbdev/Makefile b/drivers/video/fbdev/Makefile index 616e0975ae6e..6ef2c66110e3 100644 --- a/drivers/video/fbdev/Makefile +++ b/drivers/video/fbdev/Makefile @@ -4,25 +4,11 @@ # Each configuration option enables a list of files. -obj-y += fb_notify.o -obj-$(CONFIG_FB) += fb.o -fb-y := fbmem.o fbmon.o fbcmap.o fbsysfs.o \ - modedb.o fbcvt.o -fb-objs := $(fb-y) +obj-y += core/ obj-$(CONFIG_EXYNOS_VIDEO) += exynos/ -obj-$(CONFIG_FB_CFB_FILLRECT) += cfbfillrect.o -obj-$(CONFIG_FB_CFB_COPYAREA) += cfbcopyarea.o -obj-$(CONFIG_FB_CFB_IMAGEBLIT) += cfbimgblt.o -obj-$(CONFIG_FB_SYS_FILLRECT) += sysfillrect.o -obj-$(CONFIG_FB_SYS_COPYAREA) += syscopyarea.o -obj-$(CONFIG_FB_SYS_IMAGEBLIT) += sysimgblt.o -obj-$(CONFIG_FB_SYS_FOPS) += fb_sys_fops.o -obj-$(CONFIG_FB_SVGALIB) += svgalib.o obj-$(CONFIG_FB_MACMODES) += macmodes.o -obj-$(CONFIG_FB_DDC) += fb_ddc.o -obj-$(CONFIG_FB_DEFERRED_IO) += fb_defio.o obj-$(CONFIG_FB_WMT_GE_ROPS) += wmt_ge_rops.o # Hardware specific drivers go first diff --git a/drivers/video/fbdev/core/Makefile b/drivers/video/fbdev/core/Makefile new file mode 100644 index 000000000000..fa306538dac2 --- /dev/null +++ b/drivers/video/fbdev/core/Makefile @@ -0,0 +1,16 @@ +obj-y += fb_notify.o +obj-$(CONFIG_FB) += fb.o +fb-y := fbmem.o fbmon.o fbcmap.o fbsysfs.o \ + modedb.o fbcvt.o +fb-objs := $(fb-y) + +obj-$(CONFIG_FB_CFB_FILLRECT) += cfbfillrect.o +obj-$(CONFIG_FB_CFB_COPYAREA) += cfbcopyarea.o +obj-$(CONFIG_FB_CFB_IMAGEBLIT) += cfbimgblt.o +obj-$(CONFIG_FB_SYS_FILLRECT) += sysfillrect.o +obj-$(CONFIG_FB_SYS_COPYAREA) += syscopyarea.o +obj-$(CONFIG_FB_SYS_IMAGEBLIT) += sysimgblt.o +obj-$(CONFIG_FB_SYS_FOPS) += fb_sys_fops.o +obj-$(CONFIG_FB_SVGALIB) += svgalib.o +obj-$(CONFIG_FB_DDC) += fb_ddc.o +obj-$(CONFIG_FB_DEFERRED_IO) += fb_defio.o diff --git a/drivers/video/fbdev/cfbcopyarea.c b/drivers/video/fbdev/core/cfbcopyarea.c similarity index 100% rename from drivers/video/fbdev/cfbcopyarea.c rename to drivers/video/fbdev/core/cfbcopyarea.c diff --git a/drivers/video/fbdev/cfbfillrect.c b/drivers/video/fbdev/core/cfbfillrect.c similarity index 100% rename from drivers/video/fbdev/cfbfillrect.c rename to drivers/video/fbdev/core/cfbfillrect.c diff --git a/drivers/video/fbdev/cfbimgblt.c b/drivers/video/fbdev/core/cfbimgblt.c similarity index 100% rename from drivers/video/fbdev/cfbimgblt.c rename to drivers/video/fbdev/core/cfbimgblt.c diff --git a/drivers/video/fbdev/fb_ddc.c b/drivers/video/fbdev/core/fb_ddc.c similarity index 99% rename from drivers/video/fbdev/fb_ddc.c rename to drivers/video/fbdev/core/fb_ddc.c index 2b106f046fde..94322ccfedde 100644 --- a/drivers/video/fbdev/fb_ddc.c +++ b/drivers/video/fbdev/core/fb_ddc.c @@ -15,7 +15,7 @@ #include #include -#include "edid.h" +#include "../edid.h" #define DDC_ADDR 0x50 diff --git a/drivers/video/fbdev/fb_defio.c b/drivers/video/fbdev/core/fb_defio.c similarity index 100% rename from drivers/video/fbdev/fb_defio.c rename to drivers/video/fbdev/core/fb_defio.c diff --git a/drivers/video/fbdev/fb_draw.h b/drivers/video/fbdev/core/fb_draw.h similarity index 100% rename from drivers/video/fbdev/fb_draw.h rename to drivers/video/fbdev/core/fb_draw.h diff --git a/drivers/video/fbdev/fb_notify.c b/drivers/video/fbdev/core/fb_notify.c similarity index 100% rename from drivers/video/fbdev/fb_notify.c rename to drivers/video/fbdev/core/fb_notify.c diff --git a/drivers/video/fbdev/fb_sys_fops.c b/drivers/video/fbdev/core/fb_sys_fops.c similarity index 100% rename from drivers/video/fbdev/fb_sys_fops.c rename to drivers/video/fbdev/core/fb_sys_fops.c diff --git a/drivers/video/fbdev/fbcmap.c b/drivers/video/fbdev/core/fbcmap.c similarity index 100% rename from drivers/video/fbdev/fbcmap.c rename to drivers/video/fbdev/core/fbcmap.c diff --git a/drivers/video/fbdev/fbcvt.c b/drivers/video/fbdev/core/fbcvt.c similarity index 100% rename from drivers/video/fbdev/fbcvt.c rename to drivers/video/fbdev/core/fbcvt.c diff --git a/drivers/video/fbdev/fbmem.c b/drivers/video/fbdev/core/fbmem.c similarity index 100% rename from drivers/video/fbdev/fbmem.c rename to drivers/video/fbdev/core/fbmem.c diff --git a/drivers/video/fbdev/fbmon.c b/drivers/video/fbdev/core/fbmon.c similarity index 99% rename from drivers/video/fbdev/fbmon.c rename to drivers/video/fbdev/core/fbmon.c index 6103fa6fb54f..c204ebe6187e 100644 --- a/drivers/video/fbdev/fbmon.c +++ b/drivers/video/fbdev/core/fbmon.c @@ -37,7 +37,7 @@ #include #include #endif -#include "edid.h" +#include "../edid.h" /* * EDID parser diff --git a/drivers/video/fbdev/fbsysfs.c b/drivers/video/fbdev/core/fbsysfs.c similarity index 100% rename from drivers/video/fbdev/fbsysfs.c rename to drivers/video/fbdev/core/fbsysfs.c diff --git a/drivers/video/fbdev/modedb.c b/drivers/video/fbdev/core/modedb.c similarity index 100% rename from drivers/video/fbdev/modedb.c rename to drivers/video/fbdev/core/modedb.c diff --git a/drivers/video/fbdev/svgalib.c b/drivers/video/fbdev/core/svgalib.c similarity index 100% rename from drivers/video/fbdev/svgalib.c rename to drivers/video/fbdev/core/svgalib.c diff --git a/drivers/video/fbdev/syscopyarea.c b/drivers/video/fbdev/core/syscopyarea.c similarity index 100% rename from drivers/video/fbdev/syscopyarea.c rename to drivers/video/fbdev/core/syscopyarea.c diff --git a/drivers/video/fbdev/sysfillrect.c b/drivers/video/fbdev/core/sysfillrect.c similarity index 100% rename from drivers/video/fbdev/sysfillrect.c rename to drivers/video/fbdev/core/sysfillrect.c diff --git a/drivers/video/fbdev/sysimgblt.c b/drivers/video/fbdev/core/sysimgblt.c similarity index 100% rename from drivers/video/fbdev/sysimgblt.c rename to drivers/video/fbdev/core/sysimgblt.c diff --git a/drivers/video/fbdev/wmt_ge_rops.c b/drivers/video/fbdev/wmt_ge_rops.c index b0a9f34b2e01..9df6fe78a44b 100644 --- a/drivers/video/fbdev/wmt_ge_rops.c +++ b/drivers/video/fbdev/wmt_ge_rops.c @@ -18,7 +18,7 @@ #include #include #include -#include "fb_draw.h" +#include "core/fb_draw.h" #define GE_COMMAND_OFF 0x00 #define GE_DEPTH_OFF 0x04