diff -u -r --new-file linux.vanilla/arch/mips/config.in linux/arch/mips/config.in
--- linux.vanilla/arch/mips/config.in	Mon Mar  5 20:59:57 2001
+++ linux/arch/mips/config.in	Mon Jun  4 13:17:27 2001
@@ -254,12 +254,11 @@
   if [ "$CONFIG_PHILIPS_VELO" = "y" ]; then
     define_bool CONFIG_CPU_R39XX y
     int 'Main memory (in megabytes)' CONFIG_MAIN_MEMORY 4
-    int 'Memory on expansion board (0 for none)' CONFIG_EXP_MEMORY 8
-    choice 'Video subsystem' "\
-      4gray			CONFIG_PHILIPS_VELO1_4GRAY \
-      16gray			CONFIG_PHILIPS_VELO1_16GRAY \
-      velo500			CONFIG_PHILIPS_VELO500 \
-      " 16gray
+    int 'Memory on expansion board (0 for none)' CONFIG_EXP_MEMORY 0
+    choice 'Velo model' "\
+	Velo1			CONFIG_PHILIPS_VELO1 \
+	Velo500			CONFIG_PHILIPS_VELO500 \
+	" Velo1
   fi
 
   if [ "$CONFIG_VTECH_HELIO" = "y" ]; then
diff -u -r --new-file linux.vanilla/arch/mips/r39xx/buttons.c linux/arch/mips/r39xx/buttons.c
--- linux.vanilla/arch/mips/r39xx/buttons.c	Wed Nov  1 01:02:27 2000
+++ linux/arch/mips/r39xx/buttons.c	Mon Jun  4 12:43:58 2001
@@ -121,6 +121,7 @@
 			PRESS('S');
 		if (old_intstatus5 & INT5_IONEGINT6)
 			RELEASE('S');
+#ifdef CONFIG_VTECH_HELIO
 		/* Record button */
 		if (old_intstatus3 & MFIO_PIN_IO_KEY8)
 			if (time_before(debounce_record,jiffies)) {
@@ -133,6 +134,7 @@
 				RELEASE('R');
 			}
 		break;
+#endif
 	case 16:
 		/* Power pressed */
 		PRESS('O');
diff -u -r --new-file linux.vanilla/arch/mips/r39xx/kbd_velo.c linux/arch/mips/r39xx/kbd_velo.c
--- linux.vanilla/arch/mips/r39xx/kbd_velo.c	Thu Nov 16 18:41:36 2000
+++ linux/arch/mips/r39xx/kbd_velo.c	Mon Jun  4 13:14:54 2001
@@ -69,9 +69,12 @@
 static void handle(int key)
 {
 	extern int voltage_input;
+
+#ifdef CONFIG_PHILIPS_VELO1
 	if (key == 0x5e) {
 		MFIOOutput ^= MFIO_PIN_BACKLIGHT;
 	}
+#endif
 	if (power_down) {
 		power_down = 2;
 		switch (key) {
@@ -87,6 +90,14 @@
 		case 0x44:	handle_sysrq('k', NULL, NULL, NULL); break;
 #endif
 		case 0x21:	/* space */
+#ifdef CONFIG_PHILIPS_VELO500
+			if (MFIOOutput & MFIO_PIN_BACKLIGHT)
+				MFIOOutput &= ~MFIO_PIN_BACKLIGHT;
+			else
+				MFIOOutput |= MFIO_PIN_BACKLIGHT;
+			break;
+		case 0x51:	/* shift */
+#endif
 			MFIOOutput ^= current_mfio;
 			printk( "MFIOOutput now %08x, MFIOInput is %08x\n", MFIOOutput, MFIOInput );
 			break;
@@ -221,7 +232,6 @@
 		set_cpu_slow();
 	} else {
 		set_cpu_fast();
-		MFIOOutput |= MFIO_PIN_BACKLIGHT;
 		MFIOOutput &= ~MFIO_PIN_LCD_POWER;
 	}
 	return 1;
diff -u -r --new-file linux.vanilla/arch/mips/r39xx/prom/memory.c linux/arch/mips/r39xx/prom/memory.c
--- linux.vanilla/arch/mips/r39xx/prom/memory.c	Sun Jul  9 00:36:18 2000
+++ linux/arch/mips/r39xx/prom/memory.c	Mon Jun  4 12:47:33 2001
@@ -17,6 +17,10 @@
 #include <linux/mm.h>
 #include <linux/bootmem.h>
 
+#ifdef CONFIG_FB
+#include <video/r3912fb.h>
+#endif
+
 #ifdef CONFIG_VTECH_HELIO
 #define PROM_DEBUG
 #endif
@@ -116,25 +120,13 @@
 /*
  * This has to be in line with VIDEORAM_SIZE in r3912fb.c
  */
-	switch (mips_machtype) {
-	case MACH_R39XX_SHARP_MOBILON:
-	case MACH_R39XX_COMPAQ:
-		free_end -= 640*240;
-		videomemory = KSEG0ADDR(free_end);
-		break;
-	case MACH_R39XX_PHILIPS_VELO:
-		free_end -= 480*240/2;	/* Velo has actually 2 different bit depths, this is for 4bit.
-					   It is bigger that's why it is used here. */
-		videomemory = KSEG0ADDR(free_end);
-		break;
-	case MACH_R39XX_PHILIPS_NINO:
-		free_end -= 240*320/2;
-		free_end &= PAGE_MASK;
-		videomemory = KSEG0ADDR(free_end);
-		break;
-	default:
-		break;
-	}
+	if (mips_machtype == MACH_R39XX_SHARP_MOBILON ||
+	    mips_machtype == MACH_R39XX_COMPAQ ||
+	    mips_machtype == MACH_R39XX_PHILIPS_VELO ||
+	    mips_machtype == MACH_R39XX_PHILIPS_NINO) {
+	 	free_end -= VIDEORAM_SIZE;
+ 		videomemory = KSEG0ADDR(free_end);
+ 	}
 #endif
 
 #ifdef PROM_DEBUG
diff -u -r --new-file linux.vanilla/arch/mips/r39xx/velo_500_us_keymap.map linux/arch/mips/r39xx/velo_500_us_keymap.map
--- linux.vanilla/arch/mips/r39xx/velo_500_us_keymap.map	Wed Oct 11 19:32:06 2000
+++ linux/arch/mips/r39xx/velo_500_us_keymap.map	Mon Jun  4 12:37:00 2001
@@ -11,8 +11,6 @@
 #             Normal           Shift            AltGr           shift+altgr	Control ...
 
 # backlight 0x5e
-# power ???
-
 
 # ESC ... 29 13 16 15 25 17 27 2f 37 3f 47 4e 39
 
@@ -29,12 +27,12 @@
 keycode 0x47 = zero             parenright	Console_10
 keycode 0x4e = minus            underscore	asciitilde
 keycode 0x39 = Delete           BackSpace	
-#	altgr keycode 0x29 = Blank_Now
 #	control keycode 0x39 = Blank_Now
+#	alt keycode 0x29 = Blank_Now
 
 # ` ... 31 26 18 28 30 2d 35 3d 45 3e 4d 4f 50 4b
 
-keycode 0x31 = backslash	bar
+keycode 0x31 = grave		tilde
 keycode 0x26 = q
 keycode 0x18 = w
 keycode 0x28 = e
@@ -45,8 +43,8 @@
 keycode 0x45 = i
 keycode 0x3e = o
 keycode 0x4d = p
-keycode 0x4f = bracketleft	braceleft
-keycode 0x50 = bracketright	braceright
+keycode 0x4f = equal		plus
+keycode 0x50 = backslash	bar
 
 # TAB ... 11 14 24 2c 34 38 40 3c 44 36 4c 2e 4b
 
@@ -85,11 +83,11 @@
 # CTRL ... 1 9 19 21 48 46 41 49 32
 
 keycode  0x1 = Control
-#keycode  0x9 = AltGr
+keycode  0x9 = AltGr
 keycode  0x19 = Alt
 keycode 0x21 = space		space
-keycode 0x48 = AltGr	
-keycode 0x46 = equal		plus	
+keycode 0x48 = bracketleft	braceleft
+keycode 0x46 = bracketright	braceright
 keycode 0x41 = Left				Decr_Console
 keycode 0x49 = Down		Next		Scroll_Forward
 keycode 0x32 = Right				Incr_Console
diff -u -r --new-file linux.vanilla/drivers/video/Config.in linux/drivers/video/Config.in
--- linux.vanilla/drivers/video/Config.in	Fri Nov 10 14:40:42 2000
+++ linux/drivers/video/Config.in	Mon Jun  4 12:54:01 2001
@@ -171,6 +171,12 @@
       # Helio-only option, because only the helio code can switch modes now.
       bool '    Force 1bpp mode' CONFIG_FB_R3912_FORCE_MONO
    fi
+   if [ "$CONFIG_PHILIPS_VELO" = "y" -a "$CONFIG_FB_R3912" != "n" ]; then
+      choice 'Velo Bit depth' "\
+      4gray			CONFIG_PHILIPS_VELO_4GRAY \
+      16gray			CONFIG_PHILIPS_VELO_16GRAY \
+      " 16gray
+   fi
    tristate '  NEC VRC4171 LCD Controller' CONFIG_FB_VRC4171
 
 
diff -u -r --new-file linux.vanilla/drivers/video/r3912fb.c linux/drivers/video/r3912fb.c
--- linux.vanilla/drivers/video/r3912fb.c	Wed Nov  1 01:02:27 2000
+++ linux/drivers/video/r3912fb.c	Mon Jun  4 12:52:42 2001
@@ -35,75 +35,7 @@
 #include <video/fbcon-cfb24.h>
 #include <video/fbcon-cfb32.h>
 #include <video/fbcon-mac.h>
-
-/*
- * This can go back into a header file if/when more platforms are defined.
- * For now, it's just Mobilon parameters.
- *
- * VIDEORAM_SIZE     Normally x_res * y_res * (bpp/8) 
- * FB_X_RES          Visible horizontal resolution in pixels
- * FB_X_VIRTUAL_RES  Horizontal resolution of framebuffer memory in pixels
- *                   (default is FB_X_RES)
- * FB_Y_RES          Visible vertical resolution in pixels
- * FB_Y_VIRTUAL_RES  Vertical resolution of framebuffer memory in pixels
- *                   (default FB_Y_RES)
- * FB_BPP            Bits per pixel
- * FB_IS_GREY        1 means greyscale device, otherwise 0
- * FB_IS_INVERSE     1 means pallette 0 is white instead of black
- *
- * FIXME: this has to be set up depending on size and color depth
- */
-
-#ifdef CONFIG_PHILIPS_VELO
-#define FB_X_RES       480
-#define FB_Y_RES       240
-#ifdef CONFIG_PHILIPS_VELO1_4GRAY
-#define FB_BPP         2
-#else
-#ifdef CONFIG_PHILIPS_VELO1_16GRAY
-#define FB_BPP	       4
-#else
-#error velo500 owner, please fix this
-#endif
-#endif
-#define FB_IS_GREY     1
-#define FB_IS_INVERSE  0
-#define VIDEORAM_SIZE  (FB_X_RES * FB_Y_RES * FB_BPP / 8)
-
-#elif defined(CONFIG_VTECH_HELIO)
-#define FB_X_RES       160
-#define FB_Y_RES       160
-#ifdef CONFIG_FB_R3912_FORCE_MONO
-#define FB_BPP 1
-#else
-#define FB_BPP         4
-#endif
-#define FB_IS_GREY     1
-#define FB_IS_INVERSE  0 /* it is inverse, but that gives poor results */
-#define VIDEORAM_SIZE  (FB_X_RES * FB_Y_RES * FB_BPP / 8)
-
- #define LCD_CLK_36M    0
- #define LCD_CLK_18M    1
- #define LCD_CLK_9M     2
- #define LCD_CLK_4M     3
-
- #define VIDEO_RF       LCD_CLK_9M
- #define LCD_CLK        (36864000 / (1 << VIDEO_RF))
- #define LCD_BAUD       0x6               /* for 4.5MHz Lcd Clock only */
- #define LCD_CP         (LCD_CLK / (LCD_BAUD * 2 + 2))
-
- #define LCD_FRAMERATE  70
- #define LCD_LINERATE   (70 * (FB_X_RES + 1))
- #define LCD_VIDRATE    ((LCD_CP / LCD_LINERATE) - 1)
-
-#else
-#define FB_X_RES       640
-#define FB_Y_RES       240
-#define FB_BPP         8
-#define FB_IS_GREY     0
-#define FB_IS_INVERSE  0
-#define VIDEORAM_SIZE  (FB_X_RES * FB_Y_RES * FB_BPP / 8)
-#endif
+#include <video/r3912fb.h>
 
 #define arraysize(x)	(sizeof(x)/sizeof(*(x)))
 
diff -u -r --new-file linux.vanilla/include/video/r3912fb.h linux/include/video/r3912fb.h
--- linux.vanilla/include/video/r3912fb.h	Wed Dec 31 21:00:00 1969
+++ linux/include/video/r3912fb.h	Mon Jun  4 12:50:58 2001
@@ -0,0 +1,66 @@
+/*
+ * This can go back into a header file if/when more platforms are defined.
+ * For now, it's just Mobilon parameters.
+ *
+ * VIDEORAM_SIZE     Normally x_res * y_res * (bpp/8) 
+ * FB_X_RES          Visible horizontal resolution in pixels
+ * FB_X_VIRTUAL_RES  Horizontal resolution of framebuffer memory in pixels
+ *                   (default is FB_X_RES)
+ * FB_Y_RES          Visible vertical resolution in pixels
+ * FB_Y_VIRTUAL_RES  Vertical resolution of framebuffer memory in pixels
+ *                   (default FB_Y_RES)
+ * FB_BPP            Bits per pixel
+ * FB_IS_GREY        1 means greyscale device, otherwise 0
+ * FB_IS_INVERSE     1 means pallette 0 is white instead of black
+ *
+ * FIXME: this has to be set up depending on size and color depth
+ */
+
+#ifdef CONFIG_PHILIPS_VELO
+#	ifdef CONFIG_PHILIPS_VELO1
+#		define FB_X_RES 	480
+#	elif defined(CONFIG_PHILIPS_VELO500)
+#		define FB_X_RES		640
+#	endif
+#	define	FB_Y_RES	240
+#	ifdef CONFIG_PHILIPS_VELO_4GRAY
+#		define FB_BPP	2
+#	else /* CONFIG_PHILIPS_VELO_16GRAY */
+#		define FB_BPP	4
+#	endif
+#	define FB_IS_GREY     1
+#	define FB_IS_INVERSE  0
+#	define VIDEORAM_SIZE  (FB_X_RES * FB_Y_RES * FB_BPP / 8)
+#elif defined(CONFIG_VTECH_HELIO)
+#	define FB_X_RES       160
+#	define FB_Y_RES       160
+#	ifdef CONFIG_FB_R3912_FORCE_MONO
+#		define FB_BPP 1
+#	else
+#		define FB_BPP         4
+#	endif
+#	define FB_IS_GREY     1
+#	define FB_IS_INVERSE  0 /* it is inverse, but that gives poor results */
+#	define VIDEORAM_SIZE  (FB_X_RES * FB_Y_RES * FB_BPP / 8)
+
+#	define LCD_CLK_36M    0
+#	define LCD_CLK_18M    1
+#	define LCD_CLK_9M     2
+#	define LCD_CLK_4M     3
+
+#	define VIDEO_RF       LCD_CLK_9M
+#	define LCD_CLK        (36864000 / (1 << VIDEO_RF))
+#	define LCD_BAUD       0x6               /* for 4.5MHz Lcd Clock only */
+#	define LCD_CP         (LCD_CLK / (LCD_BAUD * 2 + 2))
+
+#	define LCD_FRAMERATE  70
+#	define LCD_LINERATE   (70 * (FB_X_RES + 1))
+#	define LCD_VIDRATE    ((LCD_CP / LCD_LINERATE) - 1)
+#else
+#	define FB_X_RES       640
+#	define FB_Y_RES       240
+#	define FB_BPP         8
+#	define FB_IS_GREY     0
+#	define FB_IS_INVERSE  0
+#	define VIDEORAM_SIZE  (FB_X_RES * FB_Y_RES * FB_BPP / 8)
+#endif