Update ARM related video drivers:

 - cyber2000fb
 - sa1100fb
Add new ARM video drivers:
 - anakinfb
 - clps711xfb

drivers/video/Config.in

@@ -27,13 +27,23 @@ if [ "$CONFIG_FB" = "y" ]; then
 	 fi
       fi
    fi
-   if [ "$CONFIG_ARCH_ACORN" = "y" ]; then
-      bool '  Acorn VIDC support' CONFIG_FB_ACORN
-   fi
-   dep_tristate '  Cyber2000 support' CONFIG_FB_CYBER2000 $CONFIG_PCI
-   if [ "$CONFIG_ARCH_SA1100" = "y" ]; then
-      bool '  SA-1100 LCD support' CONFIG_FB_SA1100
+   if [ "$CONFIG_ARM" = "y" ]; then
+      dep_bool '  Acorn VIDC support' CONFIG_FB_ACORN $CONFIG_ARCH_ACORN
+      dep_bool '  Anakin LCD support' CONFIG_FB_ANAKIN $CONFIG_ARCH_ANAKIN
+      dep_bool '  CLPS711X LCD support' CONFIG_FB_CLPS711X $CONFIG_ARCH_CLPS711X
+      dep_bool '  SA-1100 LCD support' CONFIG_FB_SA1100 $CONFIG_ARCH_SA1100
+      if [ "$CONFIG_FB_SA1100" = "y" -a "$CONFIG_SA1100_CERF" = "y" ]; then
+         choice 'CerfBoard LCD Display Size' \
+		"3.8_Color		CONFIG_CERF_LCD_38_A \
+		 3.8_Mono		CONFIG_CERF_LCD_38_B \
+		 5.7		CONFIG_CERF_LCD_57_A \
+		 7.2		CONFIG_CERF_LCD_72_A" 5.7
+      fi
+      if [ "$CONFIG_FB_SA1100" = "y" -a "$CONFIG_SA1100_CERF_CPLD" = "y" ]; then
+         bool 'Cerfboard Backlight (CerfPDA)' CONFIG_SA1100_CERF_LCD_BACKLIGHT
+      fi
    fi
+   dep_tristate '  CyberPro 2000/2010/5000 support' CONFIG_FB_CYBER2000 $CONFIG_PCI
    if [ "$CONFIG_APOLLO" = "y" ]; then
       define_bool CONFIG_FB_APOLLO y
    fi

drivers/video/Makefile

@@ -55,6 +55,8 @@ obj-$(CONFIG_FB_CONTROL)          += controlfb.o
 obj-$(CONFIG_FB_PLATINUM)         += platinumfb.o
 obj-$(CONFIG_FB_VALKYRIE)         += valkyriefb.o
 obj-$(CONFIG_FB_CT65550)          += chipsfb.o
+obj-$(CONFIG_FB_ANAKIN)           += anakinfb.o
+obj-$(CONFIG_FB_CLPS711X)         += clps711xfb.o
 obj-$(CONFIG_FB_CYBER)            += cyberfb.o
 obj-$(CONFIG_FB_CYBER2000)        += cyber2000fb.o
 obj-$(CONFIG_FB_SGIVW)            += sgivwfb.o

drivers/video/anakinfb.c

+/*
+ *  linux/drivers/video/anakinfb.c
+ *
+ *  Copyright (C) 2001 Aleph One Ltd. for Acunia N.V.
+ *
+ * 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.
+ *
+ *  Changelog:
+ *   23-Apr-2001 TTC	Created
+ */
+
+#include <linux/types.h>
+#include <linux/fb.h>
+#include <linux/string.h>
+#include <linux/errno.h>
+#include <linux/init.h>
+#include <linux/module.h>
+
+#include <asm/io.h>
+
+#include <video/fbcon.h>
+#include <video/fbcon-cfb16.h>
+
+static u16 colreg[16];
+static int currcon = 0;
+static struct fb_info fb_info;
+static struct display display;
+
+static int
+anakinfb_getcolreg(u_int regno, u_int *red, u_int *green, u_int *blue,
+			u_int *transp, struct fb_info *info)
+{
+	if (regno > 15)
+		return 1;
+
+	*red = colreg[regno] & 0xf800;
+	*green = colreg[regno] & 0x7e0 << 5;
+	*blue = colreg[regno] & 0x1f << 11;
+	*transp = 0;
+	return 0;
+}
+
+static int
+anakinfb_setcolreg(u_int regno, u_int red, u_int green, u_int blue,
+			u_int transp, struct fb_info *info)
+{
+	if (regno > 15)
+		return 1;
+
+	colreg[regno] = (red & 0xf800) | (green & 0xfc00 >> 5) |
+			(blue & 0xf800 >> 11);
+	return 0;
+}
+
+static int
+anakinfb_get_fix(struct fb_fix_screeninfo *fix, int con, struct fb_info *info)
+{
+	memset(fix, 0, sizeof(struct fb_fix_screeninfo));
+	strcpy(fix->id, "AnakinFB");
+	fix->smem_start = VGA_START;
+	fix->smem_len = VGA_SIZE;
+	fix->type = FB_TYPE_PACKED_PIXELS;
+	fix->type_aux = 0;
+	fix->visual = FB_VISUAL_TRUECOLOR;
+	fix->xpanstep = 0;
+	fix->ypanstep = 0;
+	fix->ywrapstep = 0;
+        fix->line_length = 400 * 2;
+	fix->accel = FB_ACCEL_NONE;
+	return 0;
+}
+        
+static int
+anakinfb_get_var(struct fb_var_screeninfo *var, int con, struct fb_info *info)
+{
+	memset(var, 0, sizeof(struct fb_var_screeninfo));
+	var->xres = 400;
+	var->yres = 234;
+	var->xres_virtual = 400;
+	var->yres_virtual = 234;
+	var->xoffset = 0;
+	var->yoffset = 0;
+	var->bits_per_pixel = 16;
+	var->grayscale = 0;
+	var->red.offset = 11;
+	var->red.length = 5;
+	var->green.offset = 5;
+	var->green.length = 6;
+	var->blue.offset = 0;
+	var->blue.length = 5;
+	var->transp.offset = 0;
+	var->transp.length = 0;
+	var->nonstd = 0;
+	var->activate = FB_ACTIVATE_NOW;
+	var->height = -1;
+	var->width = -1;
+	var->pixclock = 0;
+	var->left_margin = 0;
+	var->right_margin = 0;
+	var->upper_margin = 0;
+	var->lower_margin = 0;
+	var->hsync_len = 0;
+	var->vsync_len = 0;
+	var->sync = 0;
+	var->vmode = FB_VMODE_NONINTERLACED;
+	return 0;
+}
+
+static int
+anakinfb_set_var(struct fb_var_screeninfo *var, int con, struct fb_info *info)
+{
+	return -EINVAL;
+}
+
+static int
+anakinfb_get_cmap(struct fb_cmap *cmap, int kspc, int con,
+			struct fb_info *info)
+{
+	if (con == currcon)
+		return fb_get_cmap(cmap, kspc, anakinfb_getcolreg, info);
+	else if (fb_display[con].cmap.len)
+		fb_copy_cmap(&fb_display[con].cmap, cmap, kspc ? 0 : 2);
+	else
+		fb_copy_cmap(fb_default_cmap(16), cmap, kspc ? 0 : 2);
+	return 0;
+}
+
+static int
+anakinfb_set_cmap(struct fb_cmap *cmap, int kspc, int con,
+			struct fb_info *info)
+{
+	int err;
+
+	if (!fb_display[con].cmap.len) {
+		if ((err = fb_alloc_cmap(&fb_display[con].cmap, 16, 0)))
+			return err;
+	}
+	if (con == currcon)
+		return fb_set_cmap(cmap, kspc, anakinfb_setcolreg, info);
+	else
+		fb_copy_cmap(cmap, &fb_display[con].cmap, kspc ? 0 : 1);
+	return 0;
+}
+
+static int
+anakinfb_switch_con(int con, struct fb_info *info)
+{ 
+	currcon = con;
+	return 0;
+
+}
+
+static int
+anakinfb_updatevar(int con, struct fb_info *info)
+{
+	return 0;
+}
+
+static void
+anakinfb_blank(int blank, struct fb_info *info)
+{
+	/*
+	 * TODO: use I2C to blank/unblank the screen
+	 */
+}
+
+static struct fb_ops anakinfb_ops = {
+	owner:		THIS_MODULE,
+	fb_get_fix:	anakinfb_get_fix,
+	fb_get_var:	anakinfb_get_var,
+	fb_set_var:	anakinfb_set_var,
+	fb_get_cmap:	anakinfb_get_cmap,
+	fb_set_cmap:	anakinfb_set_cmap,
+};
+
+int __init
+anakinfb_init(void)
+{
+	memset(&fb_info, 0, sizeof(struct fb_info));
+	strcpy(fb_info.modename, "AnakinFB");
+	fb_info.node = -1;
+	fb_info.flags = FBINFO_FLAG_DEFAULT;
+	fb_info.fbops = &anakinfb_ops;
+	fb_info.disp = &display;
+	strcpy(fb_info.fontname, "VGA8x16");
+	fb_info.changevar = NULL;
+	fb_info.switch_con = &anakinfb_switch_con;
+	fb_info.updatevar = &anakinfb_updatevar;
+	fb_info.blank = &anakinfb_blank;
+
+	memset(&display, 0, sizeof(struct display));
+	anakinfb_get_var(&display.var, 0, &fb_info);
+	display.screen_base = ioremap(VGA_START, VGA_SIZE);
+	display.visual = FB_VISUAL_TRUECOLOR;
+	display.type = FB_TYPE_PACKED_PIXELS;
+	display.type_aux = 0;
+	display.ypanstep = 0;
+	display.ywrapstep = 0;
+	display.line_length = 400 * 2;
+	display.can_soft_blank = 1;
+	display.inverse = 0;
+
+#ifdef FBCON_HAS_CFB16
+	display.dispsw = &fbcon_cfb16;
+	display.dispsw_data = colreg;
+#else
+	display.dispsw = &fbcon_dummy;
+#endif
+
+	if (register_framebuffer(&fb_info) < 0)
+		return -EINVAL;
+
+	MOD_INC_USE_COUNT;
+	return 0;
+}
+
+MODULE_AUTHOR("Tak-Shing Chan <chan@aleph1.co.uk>");
+MODULE_DESCRIPTION("Anakin framebuffer driver");
+MODULE_SUPPORTED_DEVICE("fb");

drivers/video/fbmem.c

@@ -52,6 +52,7 @@ extern int acornfb_init(void);
 extern int acornfb_setup(char*);
 extern int amifb_init(void);
 extern int amifb_setup(char*);
+extern int anakinfb_init(void);
 extern int atafb_init(void);
 extern int atafb_setup(char*);
 extern int macfb_init(void);
@@ -60,7 +61,9 @@ extern int cyberfb_init(void);
 extern int cyberfb_setup(char*);
 extern int pm2fb_init(void);
 extern int pm2fb_setup(char*);
+extern int clps711xfb_init(void);
 extern int cyber2000fb_init(void);
+extern int cyber2000fb_setup(char*);
 extern int retz3fb_init(void);
 extern int retz3fb_setup(char*);
 extern int clgenfb_init(void);
@@ -154,11 +157,17 @@ static struct {
 #ifdef CONFIG_FB_AMIGA
 	{ "amifb", amifb_init, amifb_setup },
 #endif
+#ifdef CONFIG_FB_ANAKIN
+	{ "anakinfb", anakinfb_init, NULL },
+#endif
+#ifdef CONFIG_FB_CLPS711X
+	{ "clps711xfb", clps711xfb_init, NULL },
+#endif
 #ifdef CONFIG_FB_CYBER
 	{ "cyber", cyberfb_init, cyberfb_setup },
 #endif
 #ifdef CONFIG_FB_CYBER2000
-	{ "cyber2000", cyber2000fb_init, NULL },
+	{ "cyber2000", cyber2000fb_init, cyber2000fb_setup },
 #endif
 #ifdef CONFIG_FB_PM2
 	{ "pm2fb", pm2fb_init, pm2fb_setup },

drivers/video/sa1100fb.h

@@ -127,6 +127,8 @@ struct sa1100fb_info {
 #define C_DISABLE_CLKCHANGE	(2)
 #define C_ENABLE_CLKCHANGE	(3)
 #define C_REENABLE		(4)
+#define C_DISABLE_PM		(5)
+#define C_ENABLE_PM		(6)
 
 #define SA1100_NAME	"SA1100"