Tulip fixes for Cobalt Qube/RaQ

Ralf Baechle · Jeff Garzik
1 parent 8b0ee07e10
Showing 3 changed files with 21 additions and 2 deletions Side-by-side Diff
drivers/net/tulip/eeprom.c
drivers/net/tulip/media.c
drivers/net/tulip/tulip_core.c
@@ -63,6 +63,22 @@
 	 */
 	{ 0x1e00, 0x0000, 0x000b, 0x8f01, 0x0103, 0x0300, 0x0821, 0x000, 0x0001, 0x0000, 0x01e1 }
   },
+  {"Cobalt Microserver", 0, 0x10, 0xE0, {0x1e00, /* 0 == controller #, 1e == offset	*/
+					 0x0000, /* 0 == high offset, 0 == gap		*/
+					 0x0800, /* Default Autoselect			*/
+					 0x8001, /* 1 leaf, extended type, bogus len	*/
+					 0x0003, /* Type 3 (MII), PHY #0		*/
+					 0x0400, /* 0 init instr, 4 reset instr		*/
+					 0x0801, /* Set control mode, GP0 output	*/
+					 0x0000, /* Drive GP0 Low (RST is active low)	*/
+					 0x0800, /* control mode, GP0 input (undriven)	*/
+					 0x0000, /* clear control mode			*/
+					 0x7800, /* 100TX FDX + HDX, 10bT FDX + HDX	*/
+					 0x01e0, /* Advertise all above			*/
+					 0x5000, /* FDX all above			*/
+					 0x1800, /* Set fast TTM in 100bt modes		*/
+					 0x0000, /* PHY cannot be unplugged		*/
+  }},
   {NULL}};
  
  
@@ -400,6 +400,9 @@
 	}
  
 	tp->csr6 = new_csr6 | (tp->csr6 & 0xfdff) | (tp->full_duplex ? 0x0200 : 0);
+
+	mdelay(1);
+
 	return;
 }
  
@@ -1514,8 +1514,8 @@
                     (PCI_SLOT(pdev->devfn) == 12))) {
                        /* Cobalt MAC address in first EEPROM locations. */
                        sa_offset = 0;
-                       /* No media table either */
-                       tp->flags &= ~HAS_MEDIA_TABLE;
+		       /* Ensure our media table fixup get's applied */
+		       memcpy(ee_data + 16, ee_data, 8);
                }
 #endif
 #ifdef CONFIG_GSC
...	...	@@ -63,6 +63,22 @@
63	63	*/
64	64	{ 0x1e00, 0x0000, 0x000b, 0x8f01, 0x0103, 0x0300, 0x0821, 0x000, 0x0001, 0x0000, 0x01e1 }
65	65	},
	66	+ {"Cobalt Microserver", 0, 0x10, 0xE0, {0x1e00, /* 0 == controller #, 1e == offset */
	67	+ 0x0000, /* 0 == high offset, 0 == gap */
	68	+ 0x0800, /* Default Autoselect */
	69	+ 0x8001, /* 1 leaf, extended type, bogus len */
	70	+ 0x0003, /* Type 3 (MII), PHY #0 */
	71	+ 0x0400, /* 0 init instr, 4 reset instr */
	72	+ 0x0801, /* Set control mode, GP0 output */
	73	+ 0x0000, /* Drive GP0 Low (RST is active low) */
	74	+ 0x0800, /* control mode, GP0 input (undriven) */
	75	+ 0x0000, /* clear control mode */
	76	+ 0x7800, /* 100TX FDX + HDX, 10bT FDX + HDX */
	77	+ 0x01e0, /* Advertise all above */
	78	+ 0x5000, /* FDX all above */
	79	+ 0x1800, /* Set fast TTM in 100bt modes */
	80	+ 0x0000, /* PHY cannot be unplugged */
	81	+ }},
66	82	{NULL}};
67	83
68	84
...	...	@@ -400,6 +400,9 @@
400	400	}
401	401
402	402	tp->csr6 = new_csr6 \| (tp->csr6 & 0xfdff) \| (tp->full_duplex ? 0x0200 : 0);
	403	+
	404	+ mdelay(1);
	405	+
403	406	return;
404	407	}
405	408
...	...	@@ -1514,8 +1514,8 @@
1514	1514	(PCI_SLOT(pdev->devfn) == 12))) {
1515	1515	/* Cobalt MAC address in first EEPROM locations. */
1516	1516	sa_offset = 0;
1517		- /* No media table either */
1518		- tp->flags &= ~HAS_MEDIA_TABLE;
	1517	+ /* Ensure our media table fixup get's applied */
	1518	+ memcpy(ee_data + 16, ee_data, 8);
1519	1519	}
1520	1520	#endif
1521	1521	#ifdef CONFIG_GSC