[Linux-mips-commits]CVS: linux/include/asm-mips vr41xx-platdep.h,1.2,1.3

[Leblanc f. <fle...@us...>]

Update of /cvsroot/linux-mips/linux/include/asm-mips
In directory usw-pr-cvs1:/tmp/cvs-serv14927/include/asm-mips

Modified Files:
	vr41xx-platdep.h 
Log Message:
Casio e15 support improvement.


Index: vr41xx-platdep.h
===================================================================
RCS file: /cvsroot/linux-mips/linux/include/asm-mips/vr41xx-platdep.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- vr41xx-platdep.h	7 Mar 2002 09:15:17 -0000	1.2
+++ vr41xx-platdep.h	23 Apr 2002 13:14:29 -0000	1.3
@@ -1,11 +1,16 @@
-/* $Id$
- *
+/* 
  * This file is subject to the terms and conditions of the GNU General Public
  * License.  See the file "COPYING" in the main directory of this archive
  * for more details.
  *
  * Copyright (C) 1999 by Michael Klar
  */
+/*
+ * Changes:
+ * Francois Leblanc <fra...@ce...> Wed, 27 Mar 2002
+ * - Report hardware description in each corresponding header.
+ * 
+ */
 #ifndef __ASM_MIPS_VR41XX_PLATDEP_H 
 #define __ASM_MIPS_VR41XX_PLATDEP_H 
 
@@ -50,650 +55,14 @@
  * (more to come...)
  */
 
-#ifdef CONFIG_CASIO_E10
-#define VIDEORAM_BASE     (KSEG1 + 0x0a000000)
-#define FB_X_RES          240
-#define FB_X_VIRTUAL_RES  1024
-#define FB_Y_RES          320
-#define FB_BPP            2
-#define FB_IS_GREY        1
-#endif
-
 #ifdef CONFIG_CASIO_E15
-#define VIDEORAM_BASE     (KSEG1 + 0x0a000000)
-#define VIDEORAM_SIZE     (256 * 1024) /* ??? */
-#define FB_X_RES          240
-#define FB_X_VIRTUAL_RES  512
-#define FB_Y_RES          320
-#define FB_BPP            4
-#define FB_IS_GREY        1
-#define FB_IS_INVERSE     0 //1
-
-// GPIO[27] is speaker power on/off bit
-#define VR41XX_ENABLE_SPEAKER()		\
-	{				\
-		int flags;	\
-		save_and_cli(flags);	\
-		*VR41XX_GIUPIODH |= VR41XX_GIUPIODH_GPIO27; \
-		restore_flags(flags);	\
-	}
-#define VR41XX_DISABLE_SPEAKER()		\
-	{				\
-		int flags;	\
-		save_and_cli(flags);	\
-		*VR41XX_GIUPIODH &= ~VR41XX_GIUPIODH_GPIO27; \
-		restore_flags(flags);	\
-	}
-
-/* LCD control management */
-extern void gpiolcd_setup(void);
-extern int gpiolcd_backlight(int n);
-extern int get_gpiolcd_backlight(void);
-extern int gpiolcd_contrast(int n);
-extern int get_gpiolcd_contrast(void);
-extern int gpiolcd_lcdpower(int on);
-#define	LCD_SETUP() gpiolcd_setup()
-#define	LCD_BACKLIGHT(n) gpiolcd_backlight(n) 
-#define	GET_LCD_BACKLIGHT() get_gpiolcd_backlight()
-#define	LCD_CONTRAST(n) gpiolcd_contrast(n)
-#define	GET_LCD_CONTRAST() get_gpiolcd_contrast()
-#define	LCD_POWER(n) gpiolcd_lcdpower(n)
-
-#endif
-
-#ifdef CONFIG_CASIO_E105
-#define VIDEORAM_BASE     (KSEG1 + 0x0a200000)
-#define FB_X_RES          240
-#define FB_X_VIRTUAL_RES  256
-#define FB_Y_RES          320
-#define FB_BPP            16
-#endif
-
-#ifdef CONFIG_COMPAQ_AERO_15XX
-#define VIDEORAM_BASE     (KSEG1 + 0x0a000000)
-#define ADJUSTED_PORT_BASE (VR41XX_PORT_BASE + 0x01000000)
-#define FB_X_RES          320
-#define FB_Y_RES          240
-#define FB_BPP            4
-#define FB_IS_GREY        1
-#define FB_IS_INVERSE     1
-#define GPIO_BTN_MAP { 0, BTN_AP5, 0, 0, 0, 0, 0, \
-               BTN_EXIT, BTN_POWER, BTN_AP4, BTN_AP3, BTN_AP2, BTN_AP1, 0, \
-               0, 0, BTN_UP, BTN_DOWN, BTN_ACTION, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }
-#define VR41XX_ENABLE_SPEAKER()		\
-	{				\
-		unsigned long flags;	\
-		save_and_cli(flags);	\
-		*VR41XX_GIUPODATL |= (VR41XX_GIUPODATL_GPIO33 | \
-				      VR41XX_GIUPODATL_GPIO34); \
-		restore_flags(flags);	\
-	}
-#define VR41XX_DISABLE_SPEAKER()	\
-	{				\
-		unsigned long flags;	\
-		save_and_cli(flags);	\
-		*VR41XX_GIUPODATL &= ~(VR41XX_GIUPODATL_GPIO33 | \
-				       VR41XX_GIUPODATL_GPIO34); \
-		restore_flags(flags);	\
-	}
-#define VR41XX_ENABLE_SERIAL(x)		\
-	*VR41XX_GIUPIODL &= ~VR41XX_GIUPIODL_GPIO15;
-#define VR41XX_DISABLE_SERIAL(x)	\
-	*VR41XX_GIUPIODL |= VR41XX_GIUPIODL_GPIO15;
-#endif
-
-#ifdef CONFIG_COMPAQ_AERO_21XX
-#define VIDEORAM_BASE     (KSEG1 + 0x0a000000)
-#define DEVICE_IRQ_MASKL 0xfffb
-#define DEVICE_IRQ_MASKH 0xffff
-#define ADJUSTED_PORT_BASE (VR41XX_PORT_BASE + 0x01000000)
-#define FB_X_RES          320
-#define FB_Y_RES          240
-#define FB_BPP            8
-#endif
-
-#ifdef CONFIG_EVEREX_FREESTYLE
-#define DEVICE_IRQ_MASKL 0xfffb
-#define DEVICE_IRQ_MASKH 0xffff
-#define ADJUSTED_PORT_BASE (VR41XX_PORT_BASE + 0x01000000)
-#define VIDEORAM_SIZE  (256 * 1024)
-#define FB_X_RES       320
-#define FB_Y_RES       240
-#define FB_BPP         4
-#define FB_IS_GREY     1
-#define FB_IS_INVERSE  1
-#define GPIO_BTN_MAP { 0, BTN_AP5, 0, 0, BTN_UP, BTN_DOWN, BTN_ACTION, \
-		BTN_EXIT, BTN_CONTRAST, BTN_AP1, BTN_AP2, BTN_AP3, BTN_AP4, 0, \
-		0, 0, 0, 0, 0, 0, BTN_BACKLIGHT, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }
-#define GPIO_BTN_PRESS_LOW
-#define VR41XX_ENABLE_SERIAL(x)		\
-	*VR41XX_GIUPODATH |= VR41XX_GIUPODATH_GPIO48;
-#define VR41XX_DISABLE_SERIAL(x)	\
-	*VR41XX_GIUPODATH &= ~VR41XX_GIUPODATH_GPIO48;
-
-#define VR41XX_ENABLE_SPEAKER()		\
-	{				\
-		unsigned long flags;	\
-		save_and_cli(flags);	\
-		*VR41XX_GIUPODATL |= VR41XX_GIUPODATL_GPIO44; \
-		restore_flags(flags);	\
-	}
-#define VR41XX_DISABLE_SPEAKER()		\
-	{				\
-		unsigned long flags;	\
-		save_and_cli(flags);	\
-		*VR41XX_GIUPODATL &= ~VR41XX_GIUPODATL_GPIO44; \
-		restore_flags(flags);	\
-	}
-#endif
-
-#ifdef CONFIG_IBM_WORKPAD
-#define DEVICE_IRQ_MASKL 0xffff
-#define DEVICE_IRQ_MASKH 0x0000
-#define ADJUSTED_PORT_BASE (VR41XX_PORT_BASE + 0x01000000)
-#define VIDEORAM_BASE  (KSEG1 + 0x0a000000)
-#define FB_X_RES       640
-#define FB_Y_RES       480
-#define FB_BPP         16
-#define GPIO_BTN_MAP { 0, BTN_AP5, BTN_NOTIFICATION, 0, 0, 0, 0, 0, 0, 0, 0, 0, \
-		0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }
-#define GPIO_BTN_PRESS_LOW
-#define VR41XX_ENABLE_SPEAKER()		\
-	{				\
-		unsigned long flags;	\
-		save_and_cli(flags);	\
-		*VR41XX_GIUPODATH |= VR41XX_GIUPODATH_GPIO49; \
-		restore_flags(flags);	\
-	}
-#define VR41XX_DISABLE_SPEAKER()		\
-	{				\
-		unsigned long flags;	\
-		save_and_cli(flags);	\
-		*VR41XX_GIUPODATH &= ~VR41XX_GIUPODATH_GPIO49; \
-		restore_flags(flags);	\
-	}
-#endif
-
-#ifdef CONFIG_AGENDA_VR3
-#define GPIO_BTN_MAP { \
-	0, 0, 0, 0, 0, 0, 0, BTN_PEN, \
-	BTN_SYNC, BTN_BATT_DOOR, 0, BTN_POWER_GPIO, 0, 0, 0, 0 \
-}
-#undef GPIO_BTN_PRESS_LOW
-#define VR41XX_ENABLE_IRDA()  irda_power(1);
-#define VR41XX_DISABLE_IRDA() irda_power(0);
-#define VR41XX_ENABLE_SPEAKER()		\
-	{				\
-		unsigned long flags;	\
-		save_and_cli(flags);	\
-		*VR41XX_GPDATHREG |= VR41XX_GPDATHREG_GPIO19; \
-		restore_flags(flags);	\
-	}
-#define VR41XX_DISABLE_SPEAKER()	\
-	{				\
-		unsigned long flags;	\
-		save_and_cli(flags);	\
-		*VR41XX_GPDATHREG &= ~VR41XX_GPDATHREG_GPIO19; \
-		restore_flags(flags);	\
-	}
-#endif
-
-#ifdef CONFIG_NEC_MOBILEPRO_700
-#define VIDEORAM_BASE  (KSEG1 + 0x0a000000)
-#define VIDEORAM_SIZE  (64 * 1024)
-#define FB_X_VIRTUAL_RES  1024
-#define FB_X_RES       640
-#define FB_Y_RES       240
-#define FB_BPP         2
-#define FB_IS_GREY     1
-// GPIO[12] is speaker power on/off bit
-#define VR41XX_ENABLE_SPEAKER()		\
-	{				\
-		unsigned long flags;	\
-		save_and_cli(flags);	\
-		*VR41XX_GIUPIODL |= VR41XX_GIUPIODL_GPIO12; \
-		restore_flags(flags);	\
-	}
-#define VR41XX_DISABLE_SPEAKER()		\
-	{				\
-		unsigned long flags;	\
-		save_and_cli(flags);	\
-		*VR41XX_GIUPIODL &= ~VR41XX_GIUPIODL_GPIO12; \
-		restore_flags(flags);	\
-	}
-#endif
-
-#ifdef CONFIG_NEC_MOBILEPRO_750C
-#define VIDEORAM_BASE  (KSEG1 + 0x13000000)
-#define FB_X_VIRTUAL_RES  1024
-#define FB_X_RES       640
-#define FB_Y_RES       240
-#define FB_BPP         8
-// GPIO[12] is speaker power on/off bit
-#define VR41XX_ENABLE_SPEAKER()		\
-	{				\
-		unsigned long flags;	\
-		save_and_cli(flags);	\
-		*VR41XX_GIUPIODL |= VR41XX_GIUPIODL_GPIO12; \
-		restore_flags(flags);	\
-	}
-#define VR41XX_DISABLE_SPEAKER()		\
-	{				\
-		unsigned long flags;	\
-		save_and_cli(flags);	\
-		*VR41XX_GIUPIODL &= ~VR41XX_GIUPIODL_GPIO12; \
-		restore_flags(flags);	\
-	}
-#endif
-
-#ifdef CONFIG_NEC_MOBILEPRO_770
-// Tested by Jean-Nicolas, thanks!
-#define VIDEORAM_BASE  (KSEG1 + 0x0a000000)
-#define VIDEORAM_SIZE  (640 * 240 * 8)
-#define FB_X_VIRTUAL_RES  800
-#define FB_X_RES       640
-#define FB_Y_RES       240
-#define FB_BPP         16
-// GIUPODAT[12] is speaker power on/off bit confirmed by Checkstuff.exe
-#define VR41XX_ENABLE_SPEAKER()		\
-	{				\
-		unsigned long flags;	\
-		save_and_cli(flags);	\
-		*VR41XX_GIUPODATL |= VR41XX_GIUPODATL_GPIO44; \
-		restore_flags(flags);	\
-	}
-#define VR41XX_DISABLE_SPEAKER()		\
-	{				\
-		unsigned long flags;	\
-		save_and_cli(flags);	\
-		*VR41XX_GIUPODATL &= ~VR41XX_GIUPODATL_GPIO44; \
-		restore_flags(flags);	\
-	}
-#endif
-
-#ifdef CONFIG_NEC_MOBILEPRO_800
-#define VIDEORAM_BASE     (KSEG1 + 0x0a000000)
-#define FB_X_RES          800
-#define FB_Y_RES          600
-#define FB_BPP            16
-// GPIO[12] is speaker power on/off bit
-#define VR41XX_ENABLE_SPEAKER()		\
-	{				\
-		unsigned long flags;	\
-		save_and_cli(flags);	\
-		*VR41XX_GIUPIODL |= VR41XX_GIUPIODL_GPIO12; \
-		restore_flags(flags);	\
-	}
-#define VR41XX_DISABLE_SPEAKER()		\
-	{				\
-		unsigned long flags;	\
-		save_and_cli(flags);	\
-		*VR41XX_GIUPIODL &= ~VR41XX_GIUPIODL_GPIO12; \
-		restore_flags(flags);	\
-	}
-#endif
-
-#ifdef CONFIG_NEC_OSPREY
-// AP4 did strange things, Backlight button GPIO currently used for IOCS16,
-//  AP2 used for debug board Ethernet controller, AP3 just doesn't work
-#define GPIO_BTN_MAP { BTN_CONTRAST, BTN_UP, BTN_DOWN, 0, BTN_AP1, BTN_EXIT, 0, \
-		0, BTN_ACTION, 0, 0, 0, 0, 0, 0, 0 }
-#undef GPIO_BTN_PRESS_LOW
-#endif
-
-#ifdef CONFIG_NEC_UEB30
-#define VIDEORAM_BASE     (KSEG1 + 0x0a000000)
-#define FB_X_RES          640
-#define FB_Y_RES          480
-#define FB_BPP            8
-#endif
-
-#ifdef CONFIG_VADEM_CLIO_1000
-#define VR41XX_ENABLE_SERIAL(x)		\
-	*VR41XX_GIUPODATL |= VR41XX_GIUPODATL_GPIO42;
-#define VR41XX_DISABLE_SERIAL(x)	\
-	*VR41XX_GIUPODATL &= ~VR41XX_GIUPODATL_GPIO42;
-#define KBD_SCANLINES 8
-#endif
-
-#ifdef CONFIG_VADEM_CLIO_1050
-#define KBD_SCANLINES 8
-#define VIDEORAM_BASE   (KSEG1 + 0x0a200000)
-#define FB_X_RES        640
-#define FB_Y_RES        480
-#define FB_BPP          16
-#endif
-
-#ifdef CONFIG_NEC_MOBILEGEAR2_R300
-#define DEVICE_IRQ_MASKH 0x0000
-#define VIDEORAM_BASE  (KSEG1 + 0x0a000000)
-#define VIDEORAM_SIZE  (64 * 1024)
-#define FB_X_VIRTUAL_RES  1024
-#define FB_X_RES       640
-#define FB_Y_RES       240
-#define FB_BPP         2
-#define FB_IS_GREY     1
-// GPIO[12] is speaker power on/off bit
-#define VR41XX_ENABLE_SPEAKER()		\
-	{				\
-		unsigned long flags;	\
-		save_and_cli(flags);	\
-		*VR41XX_GIUPIODL |= VR41XX_GIUPIODL_GPIO12; \
-		restore_flags(flags);	\
-	}
-#define VR41XX_DISABLE_SPEAKER()		\
-	{				\
-		unsigned long flags;	\
-		save_and_cli(flags);	\
-		*VR41XX_GIUPIODL &= ~VR41XX_GIUPIODL_GPIO12; \
-		restore_flags(flags);	\
-	}
-// GPIO[14] is serial power on/off bit
-#define VR41XX_ENABLE_SERIAL(x)		\
-	*VR41XX_GIUPIODL |= VR41XX_GIUPIODL_GPIO14;
-#define VR41XX_DISABLE_SERIAL(x)	\
-	*VR41XX_GIUPIODL &= ~VR41XX_GIUPIODL_GPIO14;
-#endif
-
-#ifdef CONFIG_NEC_MOBILEGEAR2_R320
-#define DEVICE_IRQ_MASKH 0x0000
-#define VIDEORAM_BASE  (KSEG1 + 0x0a000000)
-#define VIDEORAM_SIZE  (64 * 1024)
-#define FB_X_VIRTUAL_RES  640
-#define FB_X_RES       640
-#define FB_Y_RES       240
-#define FB_BPP         2
-#define FB_IS_GREY     1
-// GPIO[12] is speaker power on/off bit
-#define VR41XX_ENABLE_SPEAKER()		\
-	{				\
-		unsigned long flags;	\
-		save_and_cli(flags);	\
-		*VR41XX_GIUPIODL |= VR41XX_GIUPIODL_GPIO12; \
-		restore_flags(flags);	\
-	}
-#define VR41XX_DISABLE_SPEAKER()		\
-	{				\
-		unsigned long flags;	\
-		save_and_cli(flags);	\
-		*VR41XX_GIUPIODL &= ~VR41XX_GIUPIODL_GPIO12; \
-		restore_flags(flags);	\
-	}
-// GPIO[14] is serial power on/off bit
-#define VR41XX_ENABLE_SERIAL(x)		\
-	*VR41XX_GIUPIODL |= VR41XX_GIUPIODL_GPIO14;
-#define VR41XX_DISABLE_SERIAL(x)	\
-	*VR41XX_GIUPIODL &= ~VR41XX_GIUPIODL_GPIO14;
-#endif
-
-#ifdef CONFIG_NEC_MOBILEGEAR2_R430
-#define DEVICE_IRQ_MASKL 0xffff
-#define DEVICE_IRQ_MASKH 0x0000
-#define VIDEORAM_BASE  (KSEG1 + 0x0a180100)
-#define VIDEORAM_SIZE  (640 * 240 * 8)
-#define FB_X_VIRTUAL_RES  640
-#define FB_X_RES       640
-#define FB_Y_RES       240
-#define FB_BPP         16
-// GIUPODAT[12] is speaker power on/off bit confirmed by Checkstuff.exe
-#define VR41XX_ENABLE_SPEAKER()		\
-	{				\
-		unsigned long flags;	\
-		save_and_cli(flags);	\
-		*VR41XX_GIUPODATL |= VR41XX_GIUPODATL_GPIO44; \
-		restore_flags(flags);	\
-	}
-#define VR41XX_DISABLE_SPEAKER()		\
-	{				\
-		unsigned long flags;	\
-		save_and_cli(flags);	\
-		*VR41XX_GIUPODATL &= ~VR41XX_GIUPODATL_GPIO44; \
-		restore_flags(flags);	\
-	}
-// GPIO[14] is serial power on/off bit
-#define VR41XX_ENABLE_SERIAL(x)		\
-	*VR41XX_GIUPIODL |= VR41XX_GIUPODATL_GPIO46;
-#define VR41XX_DISABLE_SERIAL(x)	\
-	*VR41XX_GIUPIODL &= ~VR41XX_GIUPODATL_GPIO46;
-#endif
-
-
-#ifdef CONFIG_NEC_MOBILEGEAR2_R500
-#define DEVICE_IRQ_MASKH 0x0000
-#define VIDEORAM_BASE  (KSEG1 + 0x13000000)
-#define VIDEORAM_SIZE  (640 * 240 * 8)
-#define FB_X_VIRTUAL_RES  1024
-#define FB_X_RES       640
-#define FB_Y_RES       240
-#define FB_BPP         8
-// #define FB_IS_GRAY     1
-// GPIO[12] is speaker power on/off bit
-#define VR41XX_ENABLE_SPEAKER()		\
-	{				\
-		unsigned long flags;	\
-		save_and_cli(flags);	\
-		*VR41XX_GIUPIODL |= VR41XX_GIUPIODL_GPIO12; \
-		restore_flags(flags);	\
-	}
-#define VR41XX_DISABLE_SPEAKER()		\
-	{				\
-		unsigned long flags;	\
-		save_and_cli(flags);	\
-		*VR41XX_GIUPIODL &= ~VR41XX_GIUPIODL_GPIO12; \
-		restore_flags(flags);	\
-	}
-// GPIO[14] is serial power on/off bit
-#define VR41XX_ENABLE_SERIAL(x)		\
-	*VR41XX_GIUPIODL |= VR41XX_GIUPIODL_GPIO14;
-#define VR41XX_DISABLE_SERIAL(x)	\
-	*VR41XX_GIUPIODL &= ~VR41XX_GIUPIODL_GPIO14;
-#endif
-
-#ifdef CONFIG_NEC_MOBILEGEAR2_R510
-#define DEVICE_IRQ_MASKH 0x0000
-#define VIDEORAM_BASE  (KSEG1 + 0x0a000000)
-#define VIDEORAM_SIZE  (640 * 240 * 8)
-#define FB_X_VIRTUAL_RES  1024
-#define FB_X_RES       640
-#define FB_Y_RES       240
-#define FB_BPP         8
-// GIUPODAT[12] is speaker power on/off bit confirmed by Checkstuff.exe
-#define VR41XX_ENABLE_SPEAKER()		\
-	{				\
-		unsigned long flags;	\
-		save_and_cli(flags);	\
-		*VR41XX_GIUPODATL |= VR41XX_GIUPODATL_GPIO44; \
-		restore_flags(flags);	\
-	}
-#define VR41XX_DISABLE_SPEAKER()		\
-	{				\
-		unsigned long flags;	\
-		save_and_cli(flags);	\
-		*VR41XX_GIUPODATL &= ~VR41XX_GIUPODATL_GPIO44; \
-		restore_flags(flags);	\
-	}
-// GPIO[14] is serial power on/off bit
-#define VR41XX_ENABLE_SERIAL(x)		\
-	*VR41XX_GIUPIODL |= VR41XX_GIUPIODL_GPIO14;
-#define VR41XX_DISABLE_SERIAL(x)	\
-	*VR41XX_GIUPIODL &= ~VR41XX_GIUPIODL_GPIO14;
-#endif
-
-#ifdef CONFIG_NEC_MOBILEGEAR2_R520
-#define DEVICE_IRQ_MASKH 0x0000
-#define VIDEORAM_BASE  (KSEG1 + 0x0a000000)
-#define VIDEORAM_SIZE  (640 * 240 * 8)
-#define FB_X_VIRTUAL_RES  800
-#define FB_X_RES       640
-#define FB_Y_RES       240
-#define FB_BPP         16
-// GIUPODAT[12] is speaker power on/off bit confirmed by Checkstuff.exe
-#define VR41XX_ENABLE_SPEAKER()		\
-	{				\
-		unsigned long flags;	\
-		save_and_cli(flags);	\
-		*VR41XX_GIUPODATL |= VR41XX_GIUPODATL_GPIO44; \
-		restore_flags(flags);	\
-	}
-#define VR41XX_DISABLE_SPEAKER()		\
-	{				\
-		unsigned long flags;	\
-		save_and_cli(flags);	\
-		*VR41XX_GIUPODATL &= ~VR41XX_GIUPODATL_GPIO44; \
-		restore_flags(flags);	\
-	}
-// GPIO[14] is serial power on/off bit
-#define VR41XX_ENABLE_SERIAL(x)		\
-	*VR41XX_GIUPIODL |= VR41XX_GIUPIODL_GPIO14;
-#define VR41XX_DISABLE_SERIAL(x)	\
-	*VR41XX_GIUPIODL &= ~VR41XX_GIUPIODL_GPIO14;
-#endif
-
-#ifdef CONFIG_NEC_MOBILEGEAR2_R530
-#define DEVICE_IRQ_MASKL 0xffff
-#define DEVICE_IRQ_MASKH 0x0000
-#define VIDEORAM_BASE  (KSEG1 + 0x0a180100)
-#define VIDEORAM_SIZE  (640 * 240 * 8)
-#define FB_X_VIRTUAL_RES  640
-#define FB_X_RES       640
-#define FB_Y_RES       240
-#define FB_BPP         16
-// GIUPODAT[12] is speaker power on/off bit confirmed by Checkstuff.exe
-#define VR41XX_ENABLE_SPEAKER()		\
-	{				\
-		unsigned long flags;	\
-		save_and_cli(flags);	\
-		*VR41XX_GIUPODATL |= VR41XX_GIUPODATL_GPIO44; \
-		restore_flags(flags);	\
-	}
-#define VR41XX_DISABLE_SPEAKER()		\
-	{				\
-		unsigned long flags;	\
-		save_and_cli(flags);	\
-		*VR41XX_GIUPODATL &= ~VR41XX_GIUPODATL_GPIO44; \
-		restore_flags(flags);	\
-	}
-// GPIO[14] is serial power on/off bit
-#define VR41XX_ENABLE_SERIAL(x)		\
-	*VR41XX_GIUPIODL |= VR41XX_GIUPODATL_GPIO46;
-#define VR41XX_DISABLE_SERIAL(x)	\
-	*VR41XX_GIUPIODL &= ~VR41XX_GIUPODATL_GPIO46;
-#endif
-
-#ifdef CONFIG_DOCOMO_SIGMARION
-#define DEVICE_IRQ_MASKH 0x0000
-#define VIDEORAM_BASE  (KSEG1 + 0x0a000000)
-#define VIDEORAM_SIZE  (640 * 240 * 8)
-#define FB_X_VIRTUAL_RES  640
-#define FB_X_RES       640
-#define FB_Y_RES       240
-#define FB_BPP         16
-// GIUPODAT[12] is speaker power on/off bit confirmed by Checkstuff.exe
-#define VR41XX_ENABLE_SPEAKER()		\
-	{				\
-		unsigned long flags;	\
-		save_and_cli(flags);	\
-		*VR41XX_GIUPODATL |= VR41XX_GIUPODATL_GPIO44; \
-		restore_flags(flags);	\
-	}
-#define VR41XX_DISABLE_SPEAKER()		\
-	{				\
-		unsigned long flags;	\
-		save_and_cli(flags);	\
-		*VR41XX_GIUPODATL &= ~VR41XX_GIUPODATL_GPIO44; \
-		restore_flags(flags);	\
-	}
-// GPIO[14] is serial power on/off bit
-#define VR41XX_ENABLE_SERIAL(x)		\
-	*VR41XX_GIUPIODL |= VR41XX_GIUPODATL_GPIO46;
-#define VR41XX_DISABLE_SERIAL(x)	\
-	*VR41XX_GIUPIODL &= ~VR41XX_GIUPODATL_GPIO46;
-#endif
-
-#ifdef CONFIG_NEC_MOBILEGEAR2_R700
-#define DEVICE_IRQ_MASKH 0x0000
-#define VIDEORAM_BASE  (KSEG1 + 0x0a000000)
-#define VIDEORAM_SIZE  (640 * 240 * 8)
-#define FB_X_VIRTUAL_RES  800
-#define FB_X_RES       800
-#define FB_Y_RES       600
-#define FB_BPP         16
-// GPIO[12] is speaker power on/off bit
-#define VR41XX_ENABLE_SPEAKER()		\
-	{				\
-		unsigned long flags;	\
-		save_and_cli(flags);	\
-		*VR41XX_GIUPIODL |= VR41XX_GIUPIODL_GPIO12; \
-		restore_flags(flags);	\
-	}
-#define VR41XX_DISABLE_SPEAKER()	\
-	{				\
-		unsigned long flags;	\
-		save_and_cli(flags);	\
-		*VR41XX_GIUPIODL &= ~VR41XX_GIUPIODL_GPIO12; \
-		restore_flags(flags);	\
-	}
-// PODAT[14](GPIO[46]) is serial power on/off bit
-#define VR41XX_ENABLE_SERIAL(x)		\
-	*VR41XX_GIUPODATL |= VR41XX_GIUPODATL_GPIO46;
-#define VR41XX_DISABLE_SERIAL(x)	\
-	*VR41XX_GIUPODATL &= ~VR41XX_GIUPODATL_GPIO46;
+#include <asm/vr41xx/e15.h>
 #endif
 
-#ifdef CONFIG_NEC_MOBILEGEAR2_R730
-// Not tested yet
-#define DEVICE_IRQ_MASKH 0x0000
-#define VIDEORAM_BASE	(KSEG1 + 0x0a0ea600)
-#define VIDEORAM_SIZE	(800 * 600 * 16)
-#define FB_X_VIRTUAL_RES	800
-#define FB_X_RES		800
-#define FB_Y_RES		600
-#define FB_BPP			16
-// GPIO[12] is speaker power on/off bit
-#define VR41XX_ENABLE_SPEAKER()		\
-	{				\
-		unsigned long flags;	\
-		save_and_cli(flags);	\
-		*VR41XX_GIUPIODL |= VR41XX_GIUPIODL_GPIO12; \
-		restore_flags(flags);	\
-	}
-#define VR41XX_DISABLE_SPEAKER()	\
-	{				\
-		unsigned long flags;	\
-		save_and_cli(flags);	\
-		*VR41XX_GIUPIODL &= ~VR41XX_GIUPIODL_GPIO12; \
-		restore_flags(flags);	\
-	}
-// PODAT[14](GPIO[46]) is serial power on/off bit
-#define VR41XX_ENABLE_SERIAL(x)		\
-	*VR41XX_GIUPODATL |= VR41XX_GIUPODATL_GPIO46;
-#define VR41XX_DISABLE_SERIAL(x)	\
-	*VR41XX_GIUPODATL &= ~VR41XX_GIUPODATL_GPIO46;
+#ifdef CONFIG_CASIO_E55
+#include <asm/vr41xx/e55.h>
 #endif
 
-#ifdef CONFIG_NEC_HARRIER
-#define VIDEORAMBASE   (KSEG1 + 0x10400000)
-#define FB_X_RES       800
-#define FB_Y_RES       600
-#define FB_BPP         8
-#define VIDEORAM_SIZE (FB_X_RES * FB_Y_RES * FB_BPP / 8)
-#define KBD_SCANLINES 8
-#define GPIO_BTN_MAP { 					\
-	    BTN_AP1, 0, 0, BTN_AP2,			\
-	    0, 0, 0, BTN_BACKLIGHT,			\
-	    0, BTN_AP3, 0, 0,				\
-	    BTN_AP4, 0, 0, 0,				\
-	    0, 0, 0, 0,					\
-	    0, 0, 0, 0,					\
-	    0, 0, 0, 0,					\
-	    0, 0, 0, 0,					\
-	    0, 0, 0, 0, 				\
-	    0, 0, 0, 0, 				\
-	    BTN_AP25, BTN_AP26, BTN_AP27, BTN_AP28,	\
-	    BTN_AP29, BTN_AP30, BTN_AP31, BTN_AP32,	\
-	    BTN_AP33, BTN_AP34, BTN_AP35, BTN_AP36	\
-	}
-#endif
 
 // Some reasonable defaults