patch-2.4.22 linux-2.4.22/include/asm-mips/au1000_pcmcia.h

• Lines: 59
• Date: 2003-08-25 04:44:43.000000000 -0700
• Orig file: linux-2.4.21/include/asm-mips/au1000_pcmcia.h
• Orig date: 2002-11-28 15:53:15.000000000 -0800

diff -urN linux-2.4.21/include/asm-mips/au1000_pcmcia.h linux-2.4.22/include/asm-mips/au1000_pcmcia.h
@@ -33,6 +33,22 @@
 #define AU1000_PCMCIA_IO_SPEED       (255)
 #define AU1000_PCMCIA_MEM_SPEED      (300)
 
+#define AU1X_SOCK0_IO        0xF00000000
+#define AU1X_SOCK0_PHYS_ATTR 0xF40000000
+#define AU1X_SOCK0_PHYS_MEM  0xF80000000
+
+/* pcmcia socket 1 needs external glue logic so the memory map
+ * differs from board to board.
+ */
+#if defined(CONFIG_MIPS_PB1000) || defined(CONFIG_MIPS_PB1100) || defined(CONFIG_MIPS_PB1500)
+#define AU1X_SOCK1_IO        0xF08000000
+#define AU1X_SOCK1_PHYS_ATTR 0xF48000000
+#define AU1X_SOCK1_PHYS_MEM  0xF88000000
+#elif defined(CONFIG_MIPS_DB1000) || defined(CONFIG_MIPS_DB1100) || defined(CONFIG_MIPS_DB1500)
+#define AU1X_SOCK1_IO        0xF04000000
+#define AU1X_SOCK1_PHYS_ATTR 0xF44000000
+#define AU1X_SOCK1_PHYS_MEM  0xF84000000
+#endif
 
 struct pcmcia_state {
   unsigned detect: 1,
@@ -44,7 +60,6 @@
             vs_Xv: 1;
 };
 
-
 struct pcmcia_configure {
   unsigned sock: 8,
             vcc: 8,
@@ -59,7 +74,6 @@
 	unsigned int irq;
 };
 
-typedef u_int memaddr_t;	/* fix me */
 
 struct au1000_pcmcia_socket {
 	socket_state_t        cs_state;
@@ -70,7 +84,7 @@
 	pccard_io_map         io_map[MAX_IO_WIN];
 	pccard_mem_map        mem_map[MAX_WIN];
 	u32                   virt_io;
-	memaddr_t             phys_attr, phys_mem;	/*FIX ME*/
+	ioaddr_t              phys_attr, phys_mem;
 	unsigned short        speed_io, speed_attr, speed_mem;
 };
 
@@ -88,6 +102,10 @@
 
 #if defined(CONFIG_MIPS_PB1000) || defined(CONFIG_MIPS_PB1100) || defined(CONFIG_MIPS_PB1500)
 extern struct pcmcia_low_level pb1x00_pcmcia_ops;
+#elif defined(CONFIG_MIPS_DB1000) || defined(CONFIG_MIPS_DB1100) || defined(CONFIG_MIPS_DB1500)
+extern struct pcmcia_low_level db1x00_pcmcia_ops;
+#elif defined(CONFIG_MIPS_XXS1500)
+extern struct pcmcia_low_level xxs1500_pcmcia_ops;
 #else
 error unknown Au1000 board
 #endif