[Linux-mips-commits]CVS: linux/drivers/pcmcia au1000_generic.c,1.6,1.7

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

Update of /cvsroot/linux-mips/linux/drivers/pcmcia
In directory usw-pr-cvs1:/tmp/cvs-serv1948/drivers/pcmcia

Modified Files:
	au1000_generic.c 
Log Message:
Pb1000/Pb1500 pcmcia now uses the new 36 bit support.


Index: au1000_generic.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/drivers/pcmcia/au1000_generic.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- au1000_generic.c	15 Feb 2002 19:47:27 -0000	1.6
+++ au1000_generic.c	9 Mar 2002 01:41:24 -0000	1.7
@@ -141,6 +141,11 @@
 
 	printk("\nAu1x00 PCMCIA (CS release %s)\n", CS_RELEASE);
 
+#ifndef CONFIG_64BIT_PHYS_ADDR
+	printk(KERN_ERR "Au1x00 PCMCIA 36 bit IO support not enabled\n");
+	return -1;
+#endif
+
 	CardServices(GetCardServicesInfo, &info);
 
 	if(info.Revision!=CS_RELEASE_CODE){
@@ -189,10 +194,12 @@
 		pcmcia_socket[i].cs_state.csc_mask=SS_DETECT;
 		
 		if (i == 0) {
+			printk("sizeof(ioaddr_t) %d\n", sizeof(ioaddr_t));
 			pcmcia_socket[i].virt_io = 
-				(u32)ioremap(0xC0000000, 0x1000);
-			pcmcia_socket[i].phys_attr = 0xC4000000;
-			pcmcia_socket[i].phys_mem = 0xC8000000;
+				(u32)ioremap((ioaddr_t)0xF00000000, 0x1000);
+			printk("pcmcia virt io %x\n", pcmcia_socket[i].virt_io);
+			pcmcia_socket[i].phys_attr = (memaddr_t)0xF40000000;
+			pcmcia_socket[i].phys_mem = (memaddr_t)0xF80000000;
 		}
 		else  {
 			printk(KERN_ERR "au1000: socket 1 not supported\n");