video: move fbdev to drivers/video/fbdev

The drivers/video directory is a mess. It contains generic video related
files, directories for backlight, console, linux logo, lots of fbdev
device drivers, fbdev framework files.

Make some order into the chaos by creating drivers/video/fbdev
directory, and move all fbdev related files there.

No functionality is changed, although I guess it is possible that some
subtle Makefile build order related issue could be created by this
patch.

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>

7 files changed, 0 insertions, 2240 deletions

diff --git a/drivers/video/mb862xx/Makefile b/drivers/video/mb862xx/Makefile
deleted file mode 100644
index 5707ed0e31a..00000000000
--- a/drivers/video/mb862xx/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# Makefile for the MB862xx framebuffer driver
-#
-
-obj-$(CONFIG_FB_MB862XX) += mb862xxfb.o
-
-mb862xxfb-y := mb862xxfbdrv.o mb862xxfb_accel.o
-mb862xxfb-$(CONFIG_FB_MB862XX_I2C) += mb862xx-i2c.o
diff --git a/drivers/video/mb862xx/mb862xx-i2c.c b/drivers/video/mb862xx/mb862xx-i2c.c
deleted file mode 100644
index c87e17afb3e..00000000000
--- a/drivers/video/mb862xx/mb862xx-i2c.c
+++ /dev/null
@@ -1,179 +0,0 @@
-/*
- * Coral-P(A)/Lime I2C adapter driver
- *
- * (C) 2011 DENX Software Engineering, Anatolij Gustschin <agust@denx.de>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- *
- */
-
-#include <linux/fb.h>
-#include <linux/i2c.h>
-#include <linux/io.h>
-#include <linux/delay.h>
-#include <linux/export.h>
-
-#include "mb862xxfb.h"
-#include "mb862xx_reg.h"
-
-static int mb862xx_i2c_wait_event(struct i2c_adapter *adap)
-{
-	struct mb862xxfb_par *par = adap->algo_data;
-	u32 reg;
-
-	do {
-		udelay(10);
-		reg = inreg(i2c, GC_I2C_BCR);
-		if (reg & (I2C_INT | I2C_BER))
-			break;
-	} while (1);
-
-	return (reg & I2C_BER) ? 0 : 1;
-}
-
-static int mb862xx_i2c_do_address(struct i2c_adapter *adap, int addr)
-{
-	struct mb862xxfb_par *par = adap->algo_data;
-
-	outreg(i2c, GC_I2C_DAR, addr);
-	outreg(i2c, GC_I2C_CCR, I2C_CLOCK_AND_ENABLE);
-	outreg(i2c, GC_I2C_BCR, par->i2c_rs ? I2C_REPEATED_START : I2C_START);
-	if (!mb862xx_i2c_wait_event(adap))
-		return -EIO;
-	par->i2c_rs = !(inreg(i2c, GC_I2C_BSR) & I2C_LRB);
-	return par->i2c_rs;
-}
-
-static int mb862xx_i2c_write_byte(struct i2c_adapter *adap, u8 byte)
-{
-	struct mb862xxfb_par *par = adap->algo_data;
-
-	outreg(i2c, GC_I2C_DAR, byte);
-	outreg(i2c, GC_I2C_BCR, I2C_START);
-	if (!mb862xx_i2c_wait_event(adap))
-		return -EIO;
-	return !(inreg(i2c, GC_I2C_BSR) & I2C_LRB);
-}
-
-static int mb862xx_i2c_read_byte(struct i2c_adapter *adap, u8 *byte, int last)
-{
-	struct mb862xxfb_par *par = adap->algo_data;
-
-	outreg(i2c, GC_I2C_BCR, I2C_START | (last ? 0 : I2C_ACK));
-	if (!mb862xx_i2c_wait_event(adap))
-		return 0;
-	*byte = inreg(i2c, GC_I2C_DAR);
-	return 1;
-}
-
-static void mb862xx_i2c_stop(struct i2c_adapter *adap)
-{
-	struct mb862xxfb_par *par = adap->algo_data;
-
-	outreg(i2c, GC_I2C_BCR, I2C_STOP);
-	outreg(i2c, GC_I2C_CCR, I2C_DISABLE);
-	par->i2c_rs = 0;
-}
-
-static int mb862xx_i2c_read(struct i2c_adapter *adap, struct i2c_msg *m)
-{
-	int i, ret = 0;
-	int last = m->len - 1;
-
-	for (i = 0; i < m->len; i++) {
-		if (!mb862xx_i2c_read_byte(adap, &m->buf[i], i == last)) {
-			ret = -EIO;
-			break;
-		}
-	}
-	return ret;
-}
-
-static int mb862xx_i2c_write(struct i2c_adapter *adap, struct i2c_msg *m)
-{
-	int i, ret = 0;
-
-	for (i = 0; i < m->len; i++) {
-		if (!mb862xx_i2c_write_byte(adap, m->buf[i])) {
-			ret = -EIO;
-			break;
-		}
-	}
-	return ret;
-}
-
-static int mb862xx_xfer(struct i2c_adapter *adap, struct i2c_msg *msgs,
-			int num)
-{
-	struct mb862xxfb_par *par = adap->algo_data;
-	struct i2c_msg *m;
-	int addr;
-	int i = 0, err = 0;
-
-	dev_dbg(par->dev, "%s: %d msgs\n", __func__, num);
-
-	for (i = 0; i < num; i++) {
-		m = &msgs[i];
-		if (!m->len) {
-			dev_dbg(par->dev, "%s: null msgs\n", __func__);
-			continue;
-		}
-		addr = m->addr;
-		if (m->flags & I2C_M_RD)
-			addr |= 1;
-
-		err = mb862xx_i2c_do_address(adap, addr);
-		if (err < 0)
-			break;
-		if (m->flags & I2C_M_RD)
-			err = mb862xx_i2c_read(adap, m);
-		else
-			err = mb862xx_i2c_write(adap, m);
-	}
-
-	if (i)
-		mb862xx_i2c_stop(adap);
-
-	return (err < 0) ? err : i;
-}
-
-static u32 mb862xx_func(struct i2c_adapter *adap)
-{
-	return I2C_FUNC_SMBUS_BYTE_DATA;
-}
-
-static const struct i2c_algorithm mb862xx_algo = {
-	.master_xfer	= mb862xx_xfer,
-	.functionality	= mb862xx_func,
-};
-
-static struct i2c_adapter mb862xx_i2c_adapter = {
-	.name		= "MB862xx I2C adapter",
-	.algo		= &mb862xx_algo,
-	.owner		= THIS_MODULE,
-};
-
-int mb862xx_i2c_init(struct mb862xxfb_par *par)
-{
-	int ret;
-
-	mb862xx_i2c_adapter.algo_data = par;
-	par->adap = &mb862xx_i2c_adapter;
-
-	ret = i2c_add_adapter(par->adap);
-	if (ret < 0) {
-		dev_err(par->dev, "failed to add %s\n",
-			mb862xx_i2c_adapter.name);
-	}
-	return ret;
-}
-
-void mb862xx_i2c_exit(struct mb862xxfb_par *par)
-{
-	if (par->adap) {
-		i2c_del_adapter(par->adap);
-		par->adap = NULL;
-	}
-}
diff --git a/drivers/video/mb862xx/mb862xx_reg.h b/drivers/video/mb862xx/mb862xx_reg.h
deleted file mode 100644
index 9df48b8edc9..00000000000
--- a/drivers/video/mb862xx/mb862xx_reg.h
+++ /dev/null
@@ -1,188 +0,0 @@
-/*
- * Fujitsu MB862xx Graphics Controller Registers/Bits
- */
-
-#ifndef _MB862XX_REG_H
-#define _MB862XX_REG_H
-
-#define MB862XX_MMIO_BASE	0x01fc0000
-#define MB862XX_MMIO_HIGH_BASE	0x03fc0000
-#define MB862XX_I2C_BASE	0x0000c000
-#define MB862XX_DISP_BASE	0x00010000
-#define MB862XX_CAP_BASE	0x00018000
-#define MB862XX_DRAW_BASE	0x00030000
-#define MB862XX_GEO_BASE	0x00038000
-#define MB862XX_PIO_BASE	0x00038000
-#define MB862XX_MMIO_SIZE	0x40000
-
-/* Host interface/pio registers */
-#define GC_IST			0x00000020
-#define GC_IMASK		0x00000024
-#define GC_SRST			0x0000002c
-#define GC_CCF			0x00000038
-#define GC_RSW			0x0000005c
-#define GC_CID			0x000000f0
-#define GC_REVISION		0x00000084
-
-#define GC_CCF_CGE_100		0x00000000
-#define GC_CCF_CGE_133		0x00040000
-#define GC_CCF_CGE_166		0x00080000
-#define GC_CCF_COT_100		0x00000000
-#define GC_CCF_COT_133		0x00010000
-#define GC_CID_CNAME_MSK	0x0000ff00
-#define GC_CID_VERSION_MSK	0x000000ff
-
-/* define enabled interrupts hereby */
-#define GC_INT_EN		0x00000000
-
-/* Memory interface mode register */
-#define GC_MMR			0x0000fffc
-
-/* Display Controller registers */
-#define GC_DCM0			0x00000000
-#define GC_HTP			0x00000004
-#define GC_HDB_HDP		0x00000008
-#define GC_VSW_HSW_HSP		0x0000000c
-#define GC_VTR			0x00000010
-#define GC_VDP_VSP		0x00000014
-#define GC_WY_WX		0x00000018
-#define GC_WH_WW		0x0000001c
-#define GC_L0M			0x00000020
-#define GC_L0OA0		0x00000024
-#define GC_L0DA0		0x00000028
-#define GC_L0DY_L0DX		0x0000002c
-#define GC_L1M			0x00000030
-#define GC_L1DA			0x00000034
-#define GC_DCM1			0x00000100
-#define GC_L0EM			0x00000110
-#define GC_L0WY_L0WX		0x00000114
-#define GC_L0WH_L0WW		0x00000118
-#define GC_L1EM			0x00000120
-#define GC_L1WY_L1WX		0x00000124
-#define GC_L1WH_L1WW		0x00000128
-#define GC_DLS			0x00000180
-#define GC_DCM2			0x00000104
-#define GC_DCM3			0x00000108
-#define GC_CPM_CUTC		0x000000a0
-#define GC_CUOA0		0x000000a4
-#define GC_CUY0_CUX0		0x000000a8
-#define GC_CUOA1		0x000000ac
-#define GC_CUY1_CUX1		0x000000b0
-#define GC_L0PAL0		0x00000400
-
-#define GC_CPM_CEN0		0x00100000
-#define GC_CPM_CEN1		0x00200000
-#define GC_DCM1_DEN		0x80000000
-#define GC_DCM1_L1E		0x00020000
-#define GC_L1M_16		0x80000000
-#define GC_L1M_YC		0x40000000
-#define GC_L1M_CS		0x20000000
-
-#define GC_DCM01_ESY		0x00000004
-#define GC_DCM01_SC		0x00003f00
-#define GC_DCM01_RESV		0x00004000
-#define GC_DCM01_CKS		0x00008000
-#define GC_DCM01_L0E		0x00010000
-#define GC_DCM01_DEN		0x80000000
-#define GC_L0M_L0C_8		0x00000000
-#define GC_L0M_L0C_16		0x80000000
-#define GC_L0EM_L0EC_24		0x40000000
-#define GC_L0M_L0W_UNIT		64
-#define GC_L1EM_DM		0x02000000
-
-#define GC_DISP_REFCLK_400	400
-
-/* I2C */
-#define GC_I2C_BSR		0x00000000	/* BSR */
-#define GC_I2C_BCR		0x00000004	/* BCR */
-#define GC_I2C_CCR		0x00000008	/* CCR */
-#define GC_I2C_ADR		0x0000000C	/* ADR */
-#define GC_I2C_DAR		0x00000010	/* DAR */
-
-#define I2C_DISABLE		0x00000000
-#define I2C_STOP		0x00000000
-#define I2C_START		0x00000010
-#define I2C_REPEATED_START	0x00000030
-#define I2C_CLOCK_AND_ENABLE	0x0000003f
-#define I2C_READY		0x01
-#define I2C_INT			0x01
-#define I2C_INTE		0x02
-#define I2C_ACK			0x08
-#define I2C_BER			0x80
-#define I2C_BEIE		0x40
-#define I2C_TRX			0x80
-#define I2C_LRB			0x10
-
-/* Capture registers and bits */
-#define GC_CAP_VCM		0x00000000
-#define GC_CAP_CSC		0x00000004
-#define GC_CAP_VCS		0x00000008
-#define GC_CAP_CBM		0x00000010
-#define GC_CAP_CBOA		0x00000014
-#define GC_CAP_CBLA		0x00000018
-#define GC_CAP_IMG_START	0x0000001C
-#define GC_CAP_IMG_END		0x00000020
-#define GC_CAP_CMSS		0x00000048
-#define GC_CAP_CMDS		0x0000004C
-
-#define GC_VCM_VIE		0x80000000
-#define GC_VCM_CM		0x03000000
-#define GC_VCM_VS_PAL		0x00000002
-#define GC_CBM_OO		0x80000000
-#define GC_CBM_HRV		0x00000010
-#define GC_CBM_CBST		0x00000001
-
-/* Carmine specific */
-#define MB86297_DRAW_BASE		0x00020000
-#define MB86297_DISP0_BASE		0x00100000
-#define MB86297_DISP1_BASE		0x00140000
-#define MB86297_WRBACK_BASE		0x00180000
-#define MB86297_CAP0_BASE		0x00200000
-#define MB86297_CAP1_BASE		0x00280000
-#define MB86297_DRAMCTRL_BASE		0x00300000
-#define MB86297_CTRL_BASE		0x00400000
-#define MB86297_I2C_BASE		0x00500000
-
-#define GC_CTRL_STATUS			0x00000000
-#define GC_CTRL_INT_MASK		0x00000004
-#define GC_CTRL_CLK_ENABLE		0x0000000c
-#define GC_CTRL_SOFT_RST		0x00000010
-
-#define GC_CTRL_CLK_EN_DRAM		0x00000001
-#define GC_CTRL_CLK_EN_2D3D		0x00000002
-#define GC_CTRL_CLK_EN_DISP0		0x00000020
-#define GC_CTRL_CLK_EN_DISP1		0x00000040
-
-#define GC_2D3D_REV			0x000004b4
-#define GC_RE_REVISION			0x24240200
-
-/* define enabled interrupts hereby */
-#define GC_CARMINE_INT_EN		0x00000004
-
-/* DRAM controller */
-#define GC_DCTL_MODE_ADD		0x00000000
-#define GC_DCTL_SETTIME1_EMODE		0x00000004
-#define GC_DCTL_REFRESH_SETTIME2	0x00000008
-#define GC_DCTL_RSV0_STATES		0x0000000C
-#define GC_DCTL_RSV2_RSV1		0x00000010
-#define GC_DCTL_DDRIF2_DDRIF1		0x00000014
-#define GC_DCTL_IOCONT1_IOCONT0		0x00000024
-
-#define GC_DCTL_STATES_MSK		0x0000000f
-#define GC_DCTL_INIT_WAIT_CNT		3000
-#define GC_DCTL_INIT_WAIT_INTERVAL	1
-
-/* DRAM ctrl values for Carmine PCI Eval. board */
-#define GC_EVB_DCTL_MODE_ADD		0x012105c3
-#define GC_EVB_DCTL_MODE_ADD_AFT_RST	0x002105c3
-#define GC_EVB_DCTL_SETTIME1_EMODE	0x47498000
-#define GC_EVB_DCTL_REFRESH_SETTIME2	0x00422a22
-#define GC_EVB_DCTL_RSV0_STATES		0x00200003
-#define GC_EVB_DCTL_RSV0_STATES_AFT_RST	0x00200002
-#define GC_EVB_DCTL_RSV2_RSV1		0x0000000f
-#define GC_EVB_DCTL_DDRIF2_DDRIF1	0x00556646
-#define GC_EVB_DCTL_IOCONT1_IOCONT0	0x05550555
-
-#define GC_DISP_REFCLK_533		533
-
-#endif
diff --git a/drivers/video/mb862xx/mb862xxfb.h b/drivers/video/mb862xx/mb862xxfb.h
deleted file mode 100644
index 8550630c1e0..00000000000
--- a/drivers/video/mb862xx/mb862xxfb.h
+++ /dev/null
@@ -1,121 +0,0 @@
-#ifndef __MB862XX_H__
-#define __MB862XX_H__
-
-struct mb862xx_l1_cfg {
-	unsigned short sx;
-	unsigned short sy;
-	unsigned short sw;
-	unsigned short sh;
-	unsigned short dx;
-	unsigned short dy;
-	unsigned short dw;
-	unsigned short dh;
-	int mirror;
-};
-
-#define MB862XX_BASE		'M'
-#define MB862XX_L1_GET_CFG	_IOR(MB862XX_BASE, 0, struct mb862xx_l1_cfg*)
-#define MB862XX_L1_SET_CFG	_IOW(MB862XX_BASE, 1, struct mb862xx_l1_cfg*)
-#define MB862XX_L1_ENABLE	_IOW(MB862XX_BASE, 2, int)
-#define MB862XX_L1_CAP_CTL	_IOW(MB862XX_BASE, 3, int)
-
-#ifdef __KERNEL__
-
-#define PCI_VENDOR_ID_FUJITSU_LIMITED	0x10cf
-#define PCI_DEVICE_ID_FUJITSU_CORALP	0x2019
-#define PCI_DEVICE_ID_FUJITSU_CORALPA	0x201e
-#define PCI_DEVICE_ID_FUJITSU_CARMINE	0x202b
-
-#define GC_MMR_CORALP_EVB_VAL		0x11d7fa13
-
-enum gdctype {
-	BT_NONE,
-	BT_LIME,
-	BT_MINT,
-	BT_CORAL,
-	BT_CORALP,
-	BT_CARMINE,
-};
-
-struct mb862xx_gc_mode {
-	struct fb_videomode	def_mode;	/* mode of connected display */
-	unsigned int		def_bpp;	/* default depth */
-	unsigned long		max_vram;	/* connected SDRAM size */
-	unsigned long		ccf;		/* gdc clk */
-	unsigned long		mmr;		/* memory mode for SDRAM */
-};
-
-/* private data */
-struct mb862xxfb_par {
-	struct fb_info		*info;		/* fb info head */
-	struct device		*dev;
-	struct pci_dev		*pdev;
-	struct resource		*res;		/* framebuffer/mmio resource */
-
-	resource_size_t		fb_base_phys;	/* fb base, 36-bit PPC440EPx */
-	resource_size_t		mmio_base_phys;	/* io base addr */
-	void __iomem		*fb_base;	/* remapped framebuffer */
-	void __iomem		*mmio_base;	/* remapped registers */
-	size_t			mapped_vram;	/* length of remapped vram */
-	size_t			mmio_len;	/* length of register region */
-	unsigned long		cap_buf;	/* capture buffers offset */
-	size_t			cap_len;	/* length of capture buffers */
-
-	void __iomem		*host;		/* relocatable reg. bases */
-	void __iomem		*i2c;
-	void __iomem		*disp;
-	void __iomem		*disp1;
-	void __iomem		*cap;
-	void __iomem		*cap1;
-	void __iomem		*draw;
-	void __iomem		*geo;
-	void __iomem		*pio;
-	void __iomem		*ctrl;
-	void __iomem		*dram_ctrl;
-	void __iomem		*wrback;
-
-	unsigned int		irq;
-	unsigned int		type;		/* GDC type */
-	unsigned int		refclk;		/* disp. reference clock */
-	struct mb862xx_gc_mode	*gc_mode;	/* GDC mode init data */
-	int			pre_init;	/* don't init display if 1 */
-	struct i2c_adapter	*adap;		/* GDC I2C bus adapter */
-	int			i2c_rs;
-
-	struct mb862xx_l1_cfg	l1_cfg;
-	int			l1_stride;
-
-	u32			pseudo_palette[16];
-};
-
-extern void mb862xxfb_init_accel(struct fb_info *info, int xres);
-#ifdef CONFIG_FB_MB862XX_I2C
-extern int mb862xx_i2c_init(struct mb862xxfb_par *par);
-extern void mb862xx_i2c_exit(struct mb862xxfb_par *par);
-#else
-static inline int mb862xx_i2c_init(struct mb862xxfb_par *par) { return 0; }
-static inline void mb862xx_i2c_exit(struct mb862xxfb_par *par) { }
-#endif
-
-#if defined(CONFIG_FB_MB862XX_LIME) && defined(CONFIG_FB_MB862XX_PCI_GDC)
-#error	"Select Lime GDC or CoralP/Carmine support, but not both together"
-#endif
-#if defined(CONFIG_FB_MB862XX_LIME)
-#define gdc_read	__raw_readl
-#define gdc_write	__raw_writel
-#else
-#define gdc_read	readl
-#define gdc_write	writel
-#endif
-
-#define inreg(type, off)	\
-	gdc_read((par->type + (off)))
-
-#define outreg(type, off, val)	\
-	gdc_write((val), (par->type + (off)))
-
-#define pack(a, b)	(((a) << 16) | (b))
-
-#endif /* __KERNEL__ */
-
-#endif
diff --git a/drivers/video/mb862xx/mb862xxfb_accel.c b/drivers/video/mb862xx/mb862xxfb_accel.c
deleted file mode 100644
index fe92eed6da7..00000000000
--- a/drivers/video/mb862xx/mb862xxfb_accel.c
+++ /dev/null
@@ -1,335 +0,0 @@
-/*
- * drivers/mb862xx/mb862xxfb_accel.c
- *
- * Fujitsu Carmine/Coral-P(A)/Lime framebuffer driver acceleration support
- *
- * (C) 2007 Alexander Shishkin <virtuoso@slind.org>
- * (C) 2009 Valentin Sitdikov <v.sitdikov@gmail.com>
- * (C) 2009 Siemens AG
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- *
- */
-#include <linux/fb.h>
-#include <linux/delay.h>
-#include <linux/init.h>
-#include <linux/interrupt.h>
-#include <linux/module.h>
-#include <linux/pci.h>
-#include <linux/slab.h>
-#if defined(CONFIG_OF)
-#include <linux/of_platform.h>
-#endif
-#include "mb862xxfb.h"
-#include "mb862xx_reg.h"
-#include "mb862xxfb_accel.h"
-
-static void mb862xxfb_write_fifo(u32 count, u32 *data, struct fb_info *info)
-{
-	struct mb862xxfb_par *par = info->par;
-	static u32 free;
-
-	u32 total = 0;
-	while (total < count) {
-		if (free) {
-			outreg(geo, GDC_GEO_REG_INPUT_FIFO, data[total]);
-			total++;
-			free--;
-		} else {
-			free = (u32) inreg(draw, GDC_REG_FIFO_COUNT);
-		}
-	}
-}
-
-static void mb86290fb_copyarea(struct fb_info *info,
-			       const struct fb_copyarea *area)
-{
-	__u32 cmd[6];
-
-	cmd[0] = (GDC_TYPE_SETREGISTER << 24) | (1 << 16) | GDC_REG_MODE_BITMAP;
-	/* Set raster operation */
-	cmd[1] = (2 << 7) | (GDC_ROP_COPY << 9);
-	cmd[2] = GDC_TYPE_BLTCOPYP << 24;
-
-	if (area->sx >= area->dx && area->sy >= area->dy)
-		cmd[2] |= GDC_CMD_BLTCOPY_TOP_LEFT << 16;
-	else if (area->sx >= area->dx && area->sy <= area->dy)
-		cmd[2] |= GDC_CMD_BLTCOPY_BOTTOM_LEFT << 16;
-	else if (area->sx <= area->dx && area->sy >= area->dy)
-		cmd[2] |= GDC_CMD_BLTCOPY_TOP_RIGHT << 16;
-	else
-		cmd[2] |= GDC_CMD_BLTCOPY_BOTTOM_RIGHT << 16;
-
-	cmd[3] = (area->sy << 16) | area->sx;
-	cmd[4] = (area->dy << 16) | area->dx;
-	cmd[5] = (area->height << 16) | area->width;
-	mb862xxfb_write_fifo(6, cmd, info);
-}
-
-/*
- * Fill in the cmd array /GDC FIFO commands/ to draw a 1bit image.
- * Make sure cmd has enough room!
- */
-static void mb86290fb_imageblit1(u32 *cmd, u16 step, u16 dx, u16 dy,
-				 u16 width, u16 height, u32 fgcolor,
-				 u32 bgcolor, const struct fb_image *image,
-				 struct fb_info *info)
-{
-	int i;
-	unsigned const char *line;
-	u16 bytes;
-
-	/* set colors and raster operation regs */
-	cmd[0] = (GDC_TYPE_SETREGISTER << 24) | (1 << 16) | GDC_REG_MODE_BITMAP;
-	/* Set raster operation */
-	cmd[1] = (2 << 7) | (GDC_ROP_COPY << 9);
-	cmd[2] =
-	    (GDC_TYPE_SETCOLORREGISTER << 24) | (GDC_CMD_BODY_FORE_COLOR << 16);
-	cmd[3] = fgcolor;
-	cmd[4] =
-	    (GDC_TYPE_SETCOLORREGISTER << 24) | (GDC_CMD_BODY_BACK_COLOR << 16);
-	cmd[5] = bgcolor;
-
-	i = 0;
-	line = image->data;
-	bytes = (image->width + 7) >> 3;
-
-	/* and the image */
-	cmd[6] = (GDC_TYPE_DRAWBITMAPP << 24) |
-	    (GDC_CMD_BITMAP << 16) | (2 + (step * height));
-	cmd[7] = (dy << 16) | dx;
-	cmd[8] = (height << 16) | width;
-
-	while (i < height) {
-		memcpy(&cmd[9 + i * step], line, step << 2);
-#ifdef __LITTLE_ENDIAN
-		{
-			int k = 0;
-			for (k = 0; k < step; k++)
-				cmd[9 + i * step + k] =
-				    cpu_to_be32(cmd[9 + i * step + k]);
-		}
-#endif
-		line += bytes;
-		i++;
-	}
-}
-
-/*
- * Fill in the cmd array /GDC FIFO commands/ to draw a 8bit image.
- * Make sure cmd has enough room!
- */
-static void mb86290fb_imageblit8(u32 *cmd, u16 step, u16 dx, u16 dy,
-				 u16 width, u16 height, u32 fgcolor,
-				 u32 bgcolor, const struct fb_image *image,
-				 struct fb_info *info)
-{
-	int i, j;
-	unsigned const char *line, *ptr;
-	u16 bytes;
-
-	cmd[0] = (GDC_TYPE_DRAWBITMAPP << 24) |
-	    (GDC_CMD_BLT_DRAW << 16) | (2 + (height * step));
-	cmd[1] = (dy << 16) | dx;
-	cmd[2] = (height << 16) | width;
-
-	i = 0;
-	line = ptr = image->data;
-	bytes = image->width;
-
-	while (i < height) {
-		ptr = line;
-		for (j = 0; j < step; j++) {
-			cmd[3 + i * step + j] =
-			    (((u32 *) (info->pseudo_palette))[*ptr]) & 0xffff;
-			ptr++;
-			cmd[3 + i * step + j] |=
-			    ((((u32 *) (info->
-					pseudo_palette))[*ptr]) & 0xffff) << 16;
-			ptr++;
-		}
-
-		line += bytes;
-		i++;
-	}
-}
-
-/*
- * Fill in the cmd array /GDC FIFO commands/ to draw a 16bit image.
- * Make sure cmd has enough room!
- */
-static void mb86290fb_imageblit16(u32 *cmd, u16 step, u16 dx, u16 dy,
-				  u16 width, u16 height, u32 fgcolor,
-				  u32 bgcolor, const struct fb_image *image,
-				  struct fb_info *info)
-{
-	int i;
-	unsigned const char *line;
-	u16 bytes;
-
-	i = 0;
-	line = image->data;
-	bytes = image->width << 1;
-
-	cmd[0] = (GDC_TYPE_DRAWBITMAPP << 24) |
-	    (GDC_CMD_BLT_DRAW << 16) | (2 + step * height);
-	cmd[1] = (dy << 16) | dx;
-	cmd[2] = (height << 16) | width;
-
-	while (i < height) {
-		memcpy(&cmd[3 + i * step], line, step);
-		line += bytes;
-		i++;
-	}
-}
-
-static void mb86290fb_imageblit(struct fb_info *info,
-				const struct fb_image *image)
-{
-	int mdr;
-	u32 *cmd = NULL;
-	void (*cmdfn) (u32 *, u16, u16, u16, u16, u16, u32, u32,
-		       const struct fb_image *, struct fb_info *) = NULL;
-	u32 cmdlen;
-	u32 fgcolor = 0, bgcolor = 0;
-	u16 step;
-
-	u16 width = image->width, height = image->height;
-	u16 dx = image->dx, dy = image->dy;
-	int x2, y2, vxres, vyres;
-
-	mdr = (GDC_ROP_COPY << 9);
-	x2 = image->dx + image->width;
-	y2 = image->dy + image->height;
-	vxres = info->var.xres_virtual;
-	vyres = info->var.yres_virtual;
-	x2 = min(x2, vxres);
-	y2 = min(y2, vyres);
-	width = x2 - dx;
-	height = y2 - dy;
-
-	switch (image->depth) {
-	case 1:
-		step = (width + 31) >> 5;
-		cmdlen = 9 + height * step;
-		cmdfn = mb86290fb_imageblit1;
-		if (info->fix.visual == FB_VISUAL_TRUECOLOR ||
-		    info->fix.visual == FB_VISUAL_DIRECTCOLOR) {
-			fgcolor =
-			    ((u32 *) (info->pseudo_palette))[image->fg_color];
-			bgcolor =
-			    ((u32 *) (info->pseudo_palette))[image->bg_color];
-		} else {
-			fgcolor = image->fg_color;
-			bgcolor = image->bg_color;
-		}
-
-		break;
-
-	case 8:
-		step = (width + 1) >> 1;
-		cmdlen = 3 + height * step;
-		cmdfn = mb86290fb_imageblit8;
-		break;
-
-	case 16:
-		step = (width + 1) >> 1;
-		cmdlen = 3 + height * step;
-		cmdfn = mb86290fb_imageblit16;
-		break;
-
-	default:
-		cfb_imageblit(info, image);
-		return;
-	}
-
-	cmd = kmalloc(cmdlen * 4, GFP_DMA);
-	if (!cmd)
-		return cfb_imageblit(info, image);
-	cmdfn(cmd, step, dx, dy, width, height, fgcolor, bgcolor, image, info);
-	mb862xxfb_write_fifo(cmdlen, cmd, info);
-	kfree(cmd);
-}
-
-static void mb86290fb_fillrect(struct fb_info *info,
-			       const struct fb_fillrect *rect)
-{
-
-	u32 x2, y2, vxres, vyres, height, width, fg;
-	u32 cmd[7];
-
-	vxres = info->var.xres_virtual;
-	vyres = info->var.yres_virtual;
-
-	if (!rect->width || !rect->height || rect->dx > vxres
-	    || rect->dy > vyres)
-		return;
-
-	/* We could use hardware clipping but on many cards you get around
-	 * hardware clipping by writing to framebuffer directly. */
-	x2 = rect->dx + rect->width;
-	y2 = rect->dy + rect->height;
-	x2 = min(x2, vxres);
-	y2 = min(y2, vyres);
-	width = x2 - rect->dx;
-	height = y2 - rect->dy;
-	if (info->fix.visual == FB_VISUAL_TRUECOLOR ||
-	    info->fix.visual == FB_VISUAL_DIRECTCOLOR)
-		fg = ((u32 *) (info->pseudo_palette))[rect->color];
-	else
-		fg = rect->color;
-
-	switch (rect->rop) {
-
-	case ROP_XOR:
-		/* Set raster operation */
-		cmd[1] = (2 << 7) | (GDC_ROP_XOR << 9);
-		break;
-
-	case ROP_COPY:
-		/* Set raster operation */
-		cmd[1] = (2 << 7) | (GDC_ROP_COPY << 9);
-		break;
-
-	}
-
-	cmd[0] = (GDC_TYPE_SETREGISTER << 24) | (1 << 16) | GDC_REG_MODE_BITMAP;
-	/* cmd[1] set earlier */
-	cmd[2] =
-	    (GDC_TYPE_SETCOLORREGISTER << 24) | (GDC_CMD_BODY_FORE_COLOR << 16);
-	cmd[3] = fg;
-	cmd[4] = (GDC_TYPE_DRAWRECTP << 24) | (GDC_CMD_BLT_FILL << 16);
-	cmd[5] = (rect->dy << 16) | (rect->dx);
-	cmd[6] = (height << 16) | width;
-
-	mb862xxfb_write_fifo(7, cmd, info);
-}
-
-void mb862xxfb_init_accel(struct fb_info *info, int xres)
-{
-	struct mb862xxfb_par *par = info->par;
-
-	if (info->var.bits_per_pixel == 32) {
-		info->fbops->fb_fillrect = cfb_fillrect;
-		info->fbops->fb_copyarea = cfb_copyarea;
-		info->fbops->fb_imageblit = cfb_imageblit;
-	} else {
-		outreg(disp, GC_L0EM, 3);
-		info->fbops->fb_fillrect = mb86290fb_fillrect;
-		info->fbops->fb_copyarea = mb86290fb_copyarea;
-		info->fbops->fb_imageblit = mb86290fb_imageblit;
-	}
-	outreg(draw, GDC_REG_DRAW_BASE, 0);
-	outreg(draw, GDC_REG_MODE_MISC, 0x8000);
-	outreg(draw, GDC_REG_X_RESOLUTION, xres);
-
-	info->flags |=
-	    FBINFO_HWACCEL_COPYAREA | FBINFO_HWACCEL_FILLRECT |
-	    FBINFO_HWACCEL_IMAGEBLIT;
-	info->fix.accel = 0xff;	/*FIXME: add right define */
-}
-EXPORT_SYMBOL(mb862xxfb_init_accel);
-
-MODULE_LICENSE("GPL v2");
diff --git a/drivers/video/mb862xx/mb862xxfb_accel.h b/drivers/video/mb862xx/mb862xxfb_accel.h
deleted file mode 100644
index 96a2dfef0f6..00000000000
--- a/drivers/video/mb862xx/mb862xxfb_accel.h
+++ /dev/null
@@ -1,203 +0,0 @@
-#ifndef __MB826XXFB_ACCEL_H__
-#define __MB826XXFB_ACCEL_H__
-
-/* registers */
-#define GDC_GEO_REG_INPUT_FIFO 0x00000400L
-
-/* Special Registers */
-#define GDC_REG_CTRL                0x00000400L
-#define GDC_REG_FIFO_STATUS         0x00000404L
-#define GDC_REG_FIFO_COUNT          0x00000408L
-#define GDC_REG_SETUP_STATUS        0x0000040CL
-#define GDC_REG_DDA_STATUS          0x00000410L
-#define GDC_REG_ENGINE_STATUS       0x00000414L
-#define GDC_REG_ERROR_STATUS        0x00000418L
-#define GDC_REG_MODE_MISC           0x00000420L	/* MDR0 */
-#define GDC_REG_MODE_LINE           0x00000424L	/* MDR1 */
-#define GDC_REG_MODE_POLYGON        0x00000428L	/* MDR2 */
-#define GDC_REG_MODE_TEXTURE        0x0000042CL	/* MDR3 */
-#define GDC_REG_MODE_BITMAP         0x00000430L	/* MDR4 */
-#define GDC_REG_MODE_EXTENSION      0x0000043CL	/* MDR7 */
-
-/* Configuration Registers */
-#define GDC_REG_DRAW_BASE           0x00000440L
-#define GDC_REG_X_RESOLUTION        0x00000444L
-#define GDC_REG_Z_BASE              0x00000448L
-#define GDC_REG_TEXTURE_BASE        0x0000044CL
-#define GDC_REG_POLYGON_FLAG_BASE   0x00000450L
-#define GDC_REG_CLIP_XMIN           0x00000454L
-#define GDC_REG_CLIP_XMAX           0x00000458L
-#define GDC_REG_CLIP_YMIN           0x0000045CL
-#define GDC_REG_CLIP_YMAX           0x00000460L
-#define GDC_REG_TEXURE_SIZE         0x00000464L
-#define GDC_REG_TILE_SIZE           0x00000468L
-#define GDC_REG_TEX_BUF_OFFSET      0x0000046CL
-
-/* for MB86293 or later */
-#define GDC_REG_ALPHA_MAP_BASE      0x00000474L	/* ABR */
-
-/* Constant Registers */
-#define GDC_REG_FOREGROUND_COLOR    0x00000480L
-#define GDC_REG_BACKGROUND_COLOR    0x00000484L
-#define GDC_REG_ALPHA               0x00000488L
-#define GDC_REG_LINE_PATTERN        0x0000048CL
-#define GDC_REG_TEX_BORDER_COLOR    0x00000494L
-#define GDC_REG_LINE_PATTERN_OFFSET 0x000003E0L
-
-/* Coomand Code */
-#define GDC_CMD_PIXEL                   0x00000000L
-#define GDC_CMD_PIXEL_Z                 0x00000001L
-
-#define GDC_CMD_X_VECTOR                0x00000020L
-#define GDC_CMD_Y_VECTOR                0x00000021L
-#define GDC_CMD_X_VECTOR_NOEND          0x00000022L
-#define GDC_CMD_Y_VECTOR_NOEND          0x00000023L
-#define GDC_CMD_X_VECTOR_BLPO           0x00000024L
-#define GDC_CMD_Y_VECTOR_BLPO           0x00000025L
-#define GDC_CMD_X_VECTOR_NOEND_BLPO     0x00000026L
-#define GDC_CMD_Y_VECTOR_NOEND_BLPO     0x00000027L
-#define GDC_CMD_AA_X_VECTOR             0x00000028L
-#define GDC_CMD_AA_Y_VECTOR             0x00000029L
-#define GDC_CMD_AA_X_VECTOR_NOEND       0x0000002AL
-#define GDC_CMD_AA_Y_VECTOR_NOEND       0x0000002BL
-#define GDC_CMD_AA_X_VECTOR_BLPO        0x0000002CL
-#define GDC_CMD_AA_Y_VECTOR_BLPO        0x0000002DL
-#define GDC_CMD_AA_X_VECTOR_NOEND_BLPO  0x0000002EL
-#define GDC_CMD_AA_Y_VECTOR_NOEND_BLPO  0x0000002FL
-
-#define GDC_CMD_0_VECTOR                0x00000030L
-#define GDC_CMD_1_VECTOR                0x00000031L
-#define GDC_CMD_0_VECTOR_NOEND          0x00000032L
-#define GDC_CMD_1_VECTOR_NOEND          0x00000033L
-#define GDC_CMD_0_VECTOR_BLPO           0x00000034L
-#define GDC_CMD_1_VECTOR_BLPO           0x00000035L
-#define GDC_CMD_0_VECTOR_NOEND_BLPO     0x00000036L
-#define GDC_CMD_1_VECTOR_NOEND_BLPO     0x00000037L
-#define GDC_CMD_AA_0_VECTOR             0x00000038L
-#define GDC_CMD_AA_1_VECTOR             0x00000039L
-#define GDC_CMD_AA_0_VECTOR_NOEND       0x0000003AL
-#define GDC_CMD_AA_1_VECTOR_NOEND       0x0000003BL
-#define GDC_CMD_AA_0_VECTOR_BLPO        0x0000003CL
-#define GDC_CMD_AA_1_VECTOR_BLPO        0x0000003DL
-#define GDC_CMD_AA_0_VECTOR_NOEND_BLPO  0x0000003EL
-#define GDC_CMD_AA_1_VECTOR_NOEND_BLPO  0x0000003FL
-
-#define GDC_CMD_BLT_FILL                0x00000041L
-#define GDC_CMD_BLT_DRAW                0x00000042L
-#define GDC_CMD_BITMAP                  0x00000043L
-#define GDC_CMD_BLTCOPY_TOP_LEFT        0x00000044L
-#define GDC_CMD_BLTCOPY_TOP_RIGHT       0x00000045L
-#define GDC_CMD_BLTCOPY_BOTTOM_LEFT     0x00000046L
-#define GDC_CMD_BLTCOPY_BOTTOM_RIGHT    0x00000047L
-#define GDC_CMD_LOAD_TEXTURE            0x00000048L
-#define GDC_CMD_LOAD_TILE               0x00000049L
-
-#define GDC_CMD_TRAP_RIGHT              0x00000060L
-#define GDC_CMD_TRAP_LEFT               0x00000061L
-#define GDC_CMD_TRIANGLE_FAN            0x00000062L
-#define GDC_CMD_FLAG_TRIANGLE_FAN       0x00000063L
-
-#define GDC_CMD_FLUSH_FB                0x000000C1L
-#define GDC_CMD_FLUSH_Z                 0x000000C2L
-
-#define GDC_CMD_POLYGON_BEGIN           0x000000E0L
-#define GDC_CMD_POLYGON_END             0x000000E1L
-#define GDC_CMD_CLEAR_POLY_FLAG         0x000000E2L
-#define GDC_CMD_NORMAL                  0x000000FFL
-
-#define GDC_CMD_VECTOR_BLPO_FLAG        0x00040000L
-#define GDC_CMD_FAST_VECTOR_BLPO_FLAG   0x00000004L
-
-/* for MB86293 or later */
-#define GDC_CMD_MDR1                            0x00000000L
-#define GDC_CMD_MDR1S                           0x00000002L
-#define GDC_CMD_MDR1B                           0x00000004L
-#define GDC_CMD_MDR2                            0x00000001L
-#define GDC_CMD_MDR2S                           0x00000003L
-#define GDC_CMD_MDR2TL                          0x00000007L
-#define GDC_CMD_GMDR1E                          0x00000010L
-#define GDC_CMD_GMDR2E                          0x00000020L
-#define GDC_CMD_OVERLAP_SHADOW_XY               0x00000000L
-#define GDC_CMD_OVERLAP_SHADOW_XY_COMPOSITION   0x00000001L
-#define GDC_CMD_OVERLAP_Z_PACKED_ONBS           0x00000007L
-#define GDC_CMD_OVERLAP_Z_ORIGIN                0x00000000L
-#define GDC_CMD_OVERLAP_Z_NON_TOPLEFT           0x00000001L
-#define GDC_CMD_OVERLAP_Z_BORDER                0x00000002L
-#define GDC_CMD_OVERLAP_Z_SHADOW                0x00000003L
-#define GDC_CMD_BLTCOPY_ALT_ALPHA               0x00000000L	/* Reserverd */
-#define GDC_CMD_DC_LOGOUT                       0x00000000L	/* Reserverd */
-#define GDC_CMD_BODY_FORE_COLOR                 0x00000000L
-#define GDC_CMD_BODY_BACK_COLOR                 0x00000001L
-#define GDC_CMD_SHADOW_FORE_COLOR               0x00000002L
-#define GDC_CMD_SHADOW_BACK_COLOR               0x00000003L
-#define GDC_CMD_BORDER_FORE_COLOR               0x00000004L
-#define GDC_CMD_BORDER_BACK_COLOR               0x00000005L
-
-/* Type Code Table */
-#define GDC_TYPE_G_NOP                                  0x00000020L
-#define GDC_TYPE_G_BEGIN                                0x00000021L
-#define GDC_TYPE_G_BEGINCONT                            0x00000022L
-#define GDC_TYPE_G_END                                  0x00000023L
-#define GDC_TYPE_G_VERTEX                               0x00000030L
-#define GDC_TYPE_G_VERTEXLOG                            0x00000032L
-#define GDC_TYPE_G_VERTEXNOPLOG                         0x00000033L
-#define GDC_TYPE_G_INIT                                 0x00000040L
-#define GDC_TYPE_G_VIEWPORT                             0x00000041L
-#define GDC_TYPE_G_DEPTHRANGE                           0x00000042L
-#define GDC_TYPE_G_LOADMATRIX                           0x00000043L
-#define GDC_TYPE_G_VIEWVOLUMEXYCLIP                     0x00000044L
-#define GDC_TYPE_G_VIEWVOLUMEZCLIP                      0x00000045L
-#define GDC_TYPE_G_VIEWVOLUMEWCLIP                      0x00000046L
-#define GDC_TYPE_SETLVERTEX2I                           0x00000072L
-#define GDC_TYPE_SETLVERTEX2IP                          0x00000073L
-#define GDC_TYPE_SETMODEREGISTER                        0x000000C0L
-#define GDC_TYPE_SETGMODEREGISTER                       0x000000C1L
-#define GDC_TYPE_OVERLAPXYOFFT                          0x000000C8L
-#define GDC_TYPE_OVERLAPZOFFT                           0x000000C9L
-#define GDC_TYPE_DC_LOGOUTADDR                          0x000000CCL
-#define GDC_TYPE_SETCOLORREGISTER                       0x000000CEL
-#define GDC_TYPE_G_BEGINE                               0x000000E1L
-#define GDC_TYPE_G_BEGINCONTE                           0x000000E2L
-#define GDC_TYPE_G_ENDE                                 0x000000E3L
-#define GDC_TYPE_DRAWPIXEL                              0x00000000L
-#define GDC_TYPE_DRAWPIXELZ                             0x00000001L
-#define GDC_TYPE_DRAWLINE                               0x00000002L
-#define GDC_TYPE_DRAWLINE2I                             0x00000003L
-#define GDC_TYPE_DRAWLINE2IP                            0x00000004L
-#define GDC_TYPE_DRAWTRAP                               0x00000005L
-#define GDC_TYPE_DRAWVERTEX2I                           0x00000006L
-#define GDC_TYPE_DRAWVERTEX2IP                          0x