提交 12755c16 编写于 作者: R Ralf Baechle 提交者: Jeff Garzik

Tulip fixes for Cobalt Qube/RaQ

上级 8b0ee07e
...@@ -63,6 +63,22 @@ static struct eeprom_fixup eeprom_fixups[] __devinitdata = { ...@@ -63,6 +63,22 @@ static struct eeprom_fixup eeprom_fixups[] __devinitdata = {
*/ */
{ 0x1e00, 0x0000, 0x000b, 0x8f01, 0x0103, 0x0300, 0x0821, 0x000, 0x0001, 0x0000, 0x01e1 } { 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}}; {NULL}};
......
...@@ -400,6 +400,9 @@ void tulip_select_media(struct net_device *dev, int startup) ...@@ -400,6 +400,9 @@ void tulip_select_media(struct net_device *dev, int startup)
} }
tp->csr6 = new_csr6 | (tp->csr6 & 0xfdff) | (tp->full_duplex ? 0x0200 : 0); tp->csr6 = new_csr6 | (tp->csr6 & 0xfdff) | (tp->full_duplex ? 0x0200 : 0);
mdelay(1);
return; return;
} }
......
...@@ -1514,8 +1514,8 @@ static int __devinit tulip_init_one (struct pci_dev *pdev, ...@@ -1514,8 +1514,8 @@ static int __devinit tulip_init_one (struct pci_dev *pdev,
(PCI_SLOT(pdev->devfn) == 12))) { (PCI_SLOT(pdev->devfn) == 12))) {
/* Cobalt MAC address in first EEPROM locations. */ /* Cobalt MAC address in first EEPROM locations. */
sa_offset = 0; sa_offset = 0;
/* No media table either */ /* Ensure our media table fixup get's applied */
tp->flags &= ~HAS_MEDIA_TABLE; memcpy(ee_data + 16, ee_data, 8);
} }
#endif #endif
#ifdef CONFIG_GSC #ifdef CONFIG_GSC
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册