Browse Source

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 <tomi.valkeinen@ti.com>
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
Acked-by: Rob Clark <robdclark@gmail.com>
Acked-by: Jingoo Han <jg1.han@samsung.com>
Acked-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Tomi Valkeinen 11 years ago
parent
commit
19757fc843

+ 4 - 4
Documentation/DocBook/device-drivers.tmpl

@@ -276,7 +276,7 @@ X!Isound/sound_firmware.c
      </para>
 
      <sect1><title>Frame Buffer Memory</title>
-!Edrivers/video/fbdev/fbmem.c
+!Edrivers/video/fbdev/core/fbmem.c
      </sect1>
 <!--
      <sect1><title>Frame Buffer Console</title>
@@ -284,7 +284,7 @@ X!Edrivers/video/console/fbcon.c
      </sect1>
 -->
      <sect1><title>Frame Buffer Colormap</title>
-!Edrivers/video/fbdev/fbcmap.c
+!Edrivers/video/fbdev/core/fbcmap.c
      </sect1>
 <!-- FIXME:
   drivers/video/fbgen.c has no docs, which stuffs up the sgml.  Comment
@@ -294,8 +294,8 @@ X!Idrivers/video/fbgen.c
      </sect1>
 KAO -->
      <sect1><title>Frame Buffer Video Mode Database</title>
-!Idrivers/video/fbdev/modedb.c
-!Edrivers/video/fbdev/modedb.c
+!Idrivers/video/fbdev/core/modedb.c
+!Edrivers/video/fbdev/core/modedb.c
      </sect1>
      <sect1><title>Frame Buffer Macintosh Video Mode Database</title>
 !Edrivers/video/fbdev/macmodes.c

+ 1 - 15
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

+ 1 - 1
drivers/video/fbdev/aty/mach64_cursor.c

@@ -5,7 +5,7 @@
 #include <linux/fb.h>
 #include <linux/init.h>
 #include <linux/string.h>
-#include "../fb_draw.h"
+#include "../core/fb_draw.h"
 
 #include <asm/io.h>
 

+ 16 - 0
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

+ 0 - 0
drivers/video/fbdev/cfbcopyarea.c → drivers/video/fbdev/core/cfbcopyarea.c


+ 0 - 0
drivers/video/fbdev/cfbfillrect.c → drivers/video/fbdev/core/cfbfillrect.c


+ 0 - 0
drivers/video/fbdev/cfbimgblt.c → drivers/video/fbdev/core/cfbimgblt.c


+ 1 - 1
drivers/video/fbdev/fb_ddc.c → drivers/video/fbdev/core/fb_ddc.c

@@ -15,7 +15,7 @@
 #include <linux/i2c-algo-bit.h>
 #include <linux/slab.h>
 
-#include "edid.h"
+#include "../edid.h"
 
 #define DDC_ADDR	0x50
 

+ 0 - 0
drivers/video/fbdev/fb_defio.c → drivers/video/fbdev/core/fb_defio.c


+ 0 - 0
drivers/video/fbdev/fb_draw.h → drivers/video/fbdev/core/fb_draw.h


+ 0 - 0
drivers/video/fbdev/fb_notify.c → drivers/video/fbdev/core/fb_notify.c


+ 0 - 0
drivers/video/fbdev/fb_sys_fops.c → drivers/video/fbdev/core/fb_sys_fops.c


+ 0 - 0
drivers/video/fbdev/fbcmap.c → drivers/video/fbdev/core/fbcmap.c


+ 0 - 0
drivers/video/fbdev/fbcvt.c → drivers/video/fbdev/core/fbcvt.c


+ 0 - 0
drivers/video/fbdev/fbmem.c → drivers/video/fbdev/core/fbmem.c


+ 1 - 1
drivers/video/fbdev/fbmon.c → drivers/video/fbdev/core/fbmon.c

@@ -37,7 +37,7 @@
 #include <asm/prom.h>
 #include <asm/pci-bridge.h>
 #endif
-#include "edid.h"
+#include "../edid.h"
 
 /*
  * EDID parser

+ 0 - 0
drivers/video/fbdev/fbsysfs.c → drivers/video/fbdev/core/fbsysfs.c


+ 0 - 0
drivers/video/fbdev/modedb.c → drivers/video/fbdev/core/modedb.c


+ 0 - 0
drivers/video/fbdev/svgalib.c → drivers/video/fbdev/core/svgalib.c


+ 0 - 0
drivers/video/fbdev/syscopyarea.c → drivers/video/fbdev/core/syscopyarea.c


+ 0 - 0
drivers/video/fbdev/sysfillrect.c → drivers/video/fbdev/core/sysfillrect.c


+ 0 - 0
drivers/video/fbdev/sysimgblt.c → drivers/video/fbdev/core/sysimgblt.c


+ 1 - 1
drivers/video/fbdev/wmt_ge_rops.c

@@ -18,7 +18,7 @@
 #include <linux/module.h>
 #include <linux/fb.h>
 #include <linux/platform_device.h>
-#include "fb_draw.h"
+#include "core/fb_draw.h"
 
 #define GE_COMMAND_OFF		0x00
 #define GE_DEPTH_OFF		0x04