renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-17 01:34:00 +08:00
Code

staging: sm7xxfb: merge sm712fb with fbdev

Browse Source 
Now since all cleanups are done and the code is ready to be merged lets
move it out of staging into fbdev location.

Signed-off-by: Sudip Mukherjee <sudip@vectorindia.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Sudip Mukherjee 2015-08-07 18:31:13 +05:30 committed by Greg Kroah-Hartman
parent b96e53df92
commit 1461d66728
9 changed files with 16 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/staging/Kconfig
View File

@ -56,8 +56,6 @@ source "drivers/staging/vt6656/Kconfig"
source "drivers/staging/iio/Kconfig"
source "drivers/staging/sm7xxfb/Kconfig"
source "drivers/staging/sm750fb/Kconfig"
source "drivers/staging/xgifb/Kconfig"

1
drivers/staging/Makefile
View File

@ -22,7 +22,6 @@ obj-$(CONFIG_VT6655) += vt6655/
obj-$(CONFIG_VT6656) += vt6656/
obj-$(CONFIG_VME_BUS) += vme/
obj-$(CONFIG_IIO) += iio/
obj-$(CONFIG_FB_SM7XX) += sm7xxfb/
obj-$(CONFIG_FB_SM750) += sm750fb/
obj-$(CONFIG_FB_XGI) += xgifb/
obj-$(CONFIG_USB_EMXX) += emxx_udc/

13
drivers/staging/sm7xxfb/Kconfig
View File

@ -1,13 +0,0 @@
config FB_SM7XX
tristate "Silicon Motion SM7XX framebuffer support"
depends on FB && PCI
select FB_CFB_FILLRECT
select FB_CFB_COPYAREA
select FB_CFB_IMAGEBLIT
help
Frame buffer driver for the Silicon Motion SM710, SM712, SM721
and SM722 chips.
This driver is also available as a module. The module will be
called sm7xxfb. If you want to compile it as a module, say M
here and read <file:Documentation/kbuild/modules.txt>.

1
drivers/staging/sm7xxfb/Makefile
View File

@ -1 +0,0 @@
obj-$(CONFIG_FB_SM7XX) += sm7xxfb.o

12
drivers/staging/sm7xxfb/TODO
View File

@ -1,12 +0,0 @@
TODO:
- Dual head support
- 2D acceleration support
- use kernel coding style
- refine the code and remove unused code
- move it to drivers/video/fbdev/sm7xxfb.c
Please send any patches to
Greg Kroah-Hartman <greg@kroah.com>
Sudip Mukherjee <sudipm.mukherjee@gmail.com>
Teddy Wang <teddy.wang@siliconmotion.com>
Sudip Mukherjee <sudip@vectorindia.org>

14
drivers/video/fbdev/Kconfig
View File

@ -2475,3 +2475,17 @@ config FB_SSD1307
help
This driver implements support for the Solomon SSD1307
OLED controller over I2C.
config FB_SM712
tristate "Silicon Motion SM712 framebuffer support"
depends on FB && PCI
select FB_CFB_FILLRECT
select FB_CFB_COPYAREA
select FB_CFB_IMAGEBLIT
help
Frame buffer driver for the Silicon Motion SM710, SM712, SM721
and SM722 chips.
This driver is also available as a module. The module will be
called sm712fb. If you want to compile it as a module, say M
here and read <file:Documentation/kbuild/modules.txt>.

1
drivers/video/fbdev/Makefile
View File

@ -131,6 +131,7 @@ obj-$(CONFIG_FB_JZ4740) += jz4740_fb.o
obj-$(CONFIG_FB_PUV3_UNIGFX) += fb-puv3.o
obj-$(CONFIG_FB_HYPERV) += hyperv_fb.o
obj-$(CONFIG_FB_OPENCORES) += ocfb.o
obj-$(CONFIG_FB_SM712) += sm712fb.o
# Platform or fallback drivers go here
obj-$(CONFIG_FB_UVESA) += uvesafb.o

0
drivers/staging/sm7xxfb/sm7xx.h → drivers/video/fbdev/sm712.h
View File

2
drivers/staging/sm7xxfb/sm7xxfb.c → drivers/video/fbdev/sm712fb.c
View File

@ -32,7 +32,7 @@
#include <linux/pm.h>
#endif
#include "sm7xx.h"
#include "sm712.h"
/*
* Private structure