[Linux-mips-commits]CVS: linux/arch/mips/au1000/pb1100 init.c,1.1,1.2 setup.c,1.4,1.5

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

Update of /cvsroot/linux-mips/linux/arch/mips/au1000/pb1100
In directory usw-pr-cvs1:/tmp/cvs-serv23959/arch/mips/au1000/pb1100

Modified Files:
	init.c setup.c 
Log Message:
Fixed the pcmcia timing so the IBM Microdrive will work
(patch by Alchemy/AMD).  Moved the pcmcia chip select setup to 
setup.c instead of au1000_generic.c, since not all boards will use the
same chip select.


Index: init.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/au1000/pb1100/init.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- init.c	2 Apr 2002 22:59:39 -0000	1.1
+++ init.c	18 Jun 2002 23:07:27 -0000	1.2
@@ -59,7 +59,7 @@
 	prom_envp = envp;
 
 	mips_machgroup = MACH_GROUP_ALCHEMY;
-	mips_machtype = MACH_PB1000;  
+	mips_machtype = MACH_PB1100;  
 
 	prom_init_cmdline();
 	memsize_str = prom_getenv("memsize");

Index: setup.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/au1000/pb1100/setup.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- setup.c	1 May 2002 18:00:30 -0000	1.4
+++ setup.c	18 Jun 2002 23:07:27 -0000	1.5
@@ -173,6 +173,11 @@
 	sys_clksrc |= ((4<<2) | (0<<1) | 0 );
 	au_writel(sys_clksrc, SYS_CLKSRC);
 
+	/* setup the static bus controller */
+	au_writel(0x00000002, MEM_STCFG3);  /* type = PCMCIA */
+	au_writel(0x280E3D07, MEM_STTIME3); /* 250ns cycle time */
+	au_writel(0x10000000, MEM_STADDR3); /* any PCMCIA select */
+
 	// get USB Functionality pin state (device vs host drive pins)	
 	pin_func = au_readl(SYS_PINFUNC) & (u32)(~0x8000);
 #ifndef CONFIG_AU1000_USB_DEVICE