Update of /cvsroot/linux-mips/linux/drivers/video
In directory usw-pr-cvs1:/tmp/cvs-serv6623
Modified Files:
Config.in Makefile epson1356fb.h fbmem.c
Log Message:
Added support for the Pb1100 board and updated the driver to
use the 64BIT I/O support on Alchemy's boards.
Index: Config.in
===================================================================
RCS file: /cvsroot/linux-mips/linux/drivers/video/Config.in,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- Config.in 8 Mar 2002 20:10:51 -0000 1.15
+++ Config.in 2 Apr 2002 22:38:34 -0000 1.16
@@ -155,6 +155,10 @@
bool ' Use CRT on Pb1500 ' CONFIG_PB1500_CRT
bool ' Use TFT Panel on Pb1500 ' CONFIG_PB1500_TFT
fi
+ if [ "$CONFIG_MIPS_PB1100" = "y" -a "$CONFIG_FB_E1356" != "n" ]; then
+ bool ' Use CRT on Pb1100 ' CONFIG_PB1500_CRT
+ bool ' Use TFT Panel on Pb1100 ' CONFIG_PB1500_TFT
+ fi
fi
tristate ' ITE IT8181 framebuffer support' CONFIG_FB_IT8181
tristate ' Simple Frame Buffer support' CONFIG_FB_SIMPLE
Index: Makefile
===================================================================
RCS file: /cvsroot/linux-mips/linux/drivers/video/Makefile,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- Makefile 7 Mar 2002 09:15:16 -0000 1.12
+++ Makefile 2 Apr 2002 22:38:34 -0000 1.13
@@ -115,6 +115,7 @@
obj-$(CONFIG_FB_HIT) += hitfb.o fbgen.o
obj-$(CONFIG_FB_E1355) += epson1355fb.o fbgen.o
obj-$(CONFIG_FB_E1356) += epson1356fb.o
+obj-$(CONFIG_FB_AU1100) += au1100lcd.o
obj-$(CONFIG_FB_IT8181) += it8181fb.o fbgen.o
obj-$(CONFIG_FB_PVR2) += pvr2fb.o
obj-$(CONFIG_FB_VOODOO1) += sstfb.o
Index: epson1356fb.h
===================================================================
RCS file: /cvsroot/linux-mips/linux/drivers/video/epson1356fb.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- epson1356fb.h 7 Mar 2002 23:30:22 -0000 1.6
+++ epson1356fb.h 2 Apr 2002 22:38:34 -0000 1.7
@@ -321,8 +321,8 @@
struct e1356fb_fix {
int system; // the number of a pre-packaged system
- u32 regbase_phys; // phys start address of registers
- u32 membase_phys; // phys start address of fb memory
+ u64 regbase_phys; // phys start address of registers
+ u64 membase_phys; // phys start address of fb memory
// Memory parameters
int mem_speed; // speed: 50, 60, 70, or 80 (nsec)
@@ -493,7 +493,7 @@
* 36-bit physical addresses in linux-mips32 mm, since
* the mips32 specification specifically supports this.
*/
- 0xE0000000, 0xE0200000,
+ 0xE00000000, 0xE00200000,
60, MEM_TYPE_EDO_2CAS, 64, MEM_SMR_CBR,
0, 0, // BUSCLK and MCLK are calculated at run-time
40000, 14318, // CLKI, CLKI2
@@ -550,7 +550,7 @@
* 36-bit physical addresses in linux-mips32 mm, since
* the mips32 specification specifically supports this.
*/
- 0xE0000000, 0xE0200000,
+ 0xE1B000000, 0xE1B200000,
50, MEM_TYPE_EMBEDDED_SDRAM, 64, MEM_SMR_CBR,
0, 0, // BUSCLK and MCLK are calculated at run-time
40000, 14318, // CLKI, CLKI2
Index: fbmem.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/drivers/video/fbmem.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- fbmem.c 18 Mar 2002 22:26:30 -0000 1.19
+++ fbmem.c 2 Apr 2002 22:38:34 -0000 1.20
@@ -130,6 +130,8 @@
extern int e1355fb_setup(char*);
extern int e1356fb_init(void);
extern int e1356fb_setup(char*);
+extern int au1100fb_init(void);
+extern int au1100fb_setup(char*);
extern int it8181fb_init(void);
extern int it8181fb_setup(char*);
extern int pvr2fb_init(void);
@@ -298,6 +300,9 @@
#endif
#ifdef CONFIG_FB_E1356
{ "e1356fb", e1356fb_init, e1356fb_setup },
+#endif
+#ifdef CONFIG_FB_AU1100
+ { "au1100fb", au1100fb_init, au1100fb_setup },
#endif
#ifdef CONFIG_FB_IT8181
{ "it8181fb", it8181fb_init, it8181fb_setup },
|
