[parisc-linux-cvs] Re: DIFF 2.4.18-pa36 tulip phys reset

[Grant Grundler]

Grant Grundler wrote:
> 2.4.18-pa36
> removing ifdef CONFIG_TULIP_MMIO since IO Port requires this too.
> Changing the udelay(500) seems to help too.


Index: Makefile
===================================================================
RCS file: /var/cvs/linux/Makefile,v
retrieving revision 1.306
diff -u -p -r1.306 Makefile
--- Makefile	2002/06/05 19:34:56	1.306
+++ Makefile	2002/06/13 20:37:05
@@ -1,7 +1,7 @@
 VERSION = 2
 PATCHLEVEL = 4
 SUBLEVEL = 18
-EXTRAVERSION = -pa35
+EXTRAVERSION = -pa36
 
 KERNELRELEASE=$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)
 
Index: drivers/net/tulip/media.c
===================================================================
RCS file: /var/cvs/linux/drivers/net/tulip/media.c,v
retrieving revision 1.10
diff -u -p -r1.10 media.c
--- drivers/net/tulip/media.c	2002/04/23 15:31:17	1.10
+++ drivers/net/tulip/media.c	2002/06/13 20:37:05
@@ -285,10 +285,9 @@ void tulip_select_media(struct net_devic
 					outl(init_sequence[i], ioaddr + CSR12);
 			}
 
-#ifdef CONFIG_TULIP_MMIO
 			inl(ioaddr + CSR6);	/* flush posted writes */
-			udelay(10);
-#endif
+			udelay(500);
+
 			tmp_info = get_u16(&misc_info[1]);
 			if (tmp_info)
 				tp->advertising[phy_num] = tmp_info | 1;