From 19757fc8432ac97a07a890d6310cccc1896a1b36 Mon Sep 17 00:00:00 2001 From: Tomi Valkeinen Date: Thu, 13 Feb 2014 16:24:55 +0200 Subject: [PATCH] fbdev: move fbdev core files to separate directory 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 Acked-by: Daniel Vetter --- Documentation/DocBook/device-drivers.tmpl | 8 ++++---- drivers/video/fbdev/Makefile | 16 +--------------- drivers/video/fbdev/aty/mach64_cursor.c | 2 +- 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 +- 23 files changed, 25 insertions(+), 23 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/Documentation/DocBook/device-drivers.tmpl b/Documentation/DocBook/device-drivers.tmpl index 4d1aa8b..cc63f30 100644 --- a/Documentation/DocBook/device-drivers.tmpl +++ b/Documentation/DocBook/device-drivers.tmpl @@ -276,7 +276,7 @@ X!Isound/sound_firmware.c Frame Buffer Memory -!Edrivers/video/fbdev/fbmem.c +!Edrivers/video/fbdev/core/fbmem.c Frame Buffer Colormap -!Edrivers/video/fbdev/fbcmap.c +!Edrivers/video/fbdev/core/fbcmap.c Frame Buffer Video Mode Database -!Idrivers/video/fbdev/modedb.c -!Edrivers/video/fbdev/modedb.c +!Idrivers/video/fbdev/core/modedb.c +!Edrivers/video/fbdev/core/modedb.c Frame Buffer Macintosh Video Mode Database !Edrivers/video/fbdev/macmodes.c diff --git a/drivers/video/fbdev/Makefile b/drivers/video/fbdev/Makefile index 8a79eec..0284f2a 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/aty/mach64_cursor.c b/drivers/video/fbdev/aty/mach64_cursor.c index 0fe02e2..2fa0317 100644 --- a/drivers/video/fbdev/aty/mach64_cursor.c +++ b/drivers/video/fbdev/aty/mach64_cursor.c @@ -5,7 +5,7 @@ #include #include #include -#include "../fb_draw.h" +#include "../core/fb_draw.h" #include diff --git a/drivers/video/fbdev/core/Makefile b/drivers/video/fbdev/core/Makefile new file mode 100644 index 0000000..fa30653 --- /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 2b106f0..94322cc 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 6103fa6..c204ebe 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 b0a9f34..9df6fe7 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 -- 2.7.4