[Linux-mips-commits]CVS: linux/include/asm-mips au1000_pcmcia.h,1.2,1.3 pb1000.h,1.3,1.4

[Pete P. <pp...@us...>]

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

Modified Files:
	au1000_pcmcia.h pb1000.h 
Log Message:
* Added pcmcia ide support.
* fixed interrupt handler to work with new pb1000 
pcmcia cpld
* modified pcmcia driver to reflect cpld changes
* hardcoded pcmcia driver to apply 3.3V if XV
is detected, which seems to be a socket/hardware problem.



Index: au1000_pcmcia.h
===================================================================
RCS file: /cvsroot/linux-mips/linux/include/asm-mips/au1000_pcmcia.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- au1000_pcmcia.h	2001/09/25 03:36:35	1.2
+++ au1000_pcmcia.h	2001/10/03 22:49:23	1.3
@@ -1,4 +1,5 @@
 /*
+ *
  * Alchemy Semi Au1000 pcmcia driver include file
  *
  * Copyright 2001 MontaVista Software Inc.
@@ -24,11 +25,12 @@
  *
  * 
  */
+
 #ifndef __ASM_AU1000_PCMCIA_H
 #define __ASM_AU1000_PCMCIA_H
 
 
-#define AU1000_PCMCIA_POLL_PERIOD    (4*HZ)
+#define AU1000_PCMCIA_POLL_PERIOD    (2*HZ)
 #define AU1000_PCMCIA_IO_SPEED       (255)
 #define AU1000_PCMCIA_MEM_SPEED      (300)
 

Index: pb1000.h
===================================================================
RCS file: /cvsroot/linux-mips/linux/include/asm-mips/pb1000.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- pb1000.h	2001/09/25 03:36:36	1.3
+++ pb1000.h	2001/10/03 22:49:23	1.4
@@ -1,4 +1,5 @@
 /*
+ *
  * Alchemy Semi PB1000 Referrence Board
  *
  * Copyright 2001 MontaVista Software Inc.
@@ -24,9 +25,11 @@
  *
  * 
  */
+
 #ifndef __ASM_PB1000_H
 #define __ASM_PB1000_H
 
+
 /* PCMCIA PB1000 specific defines */
 #define PCMCIA_MAX_SOCK 0 /* the second socket, 1, is not supported at this time */
 
@@ -73,6 +76,7 @@
 /* VPPEN1 - VPPEN0 */
 #define VPP_GND ((0<<1) | (0<<0))
 #define VPP_5V  ((1<<1) | (0<<0))
+#define VPP_3V  ((0<<1) | (1<<0))
 #define VPP_12V ((0<<1) | (1<<0))
 #define VPP_HIZ ((1<<1) | (1<<0))