ewrk3/tulip: Move the DEC - Tulip drivers

Move the DEC - Tulip driver into drivers/net/ethernet/dec/tulip/
and make the necessary Kconfig and Makefile changes.

The Digital Equioment (DEC) driver ewrk3 was moved into
drivers/net/ethernet/dec/ and the remaining drivers (Tulip)
were moved into drivers/net/ethernet/dec/tulip/

CC: Tobias Ringstrom <tori@unhappy.mine.nu>
CC: Grant Grundler <grundler@parisc-linux.org>
CC: David Davies <davies@maniac.ultranet.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Acked-by: Grant Grundler <grundler@parisc-linux.org>

1 files changed, 0 insertions, 173 deletions

diff --git a/drivers/net/tulip/pnic.c b/drivers/net/tulip/pnic.c
deleted file mode 100644
index 52d898bdbeb4..000000000000
--- a/drivers/net/tulip/pnic.c
+++ /dev/null
@@ -1,173 +0,0 @@
-/*
-	drivers/net/tulip/pnic.c
-
-	Copyright 2000,2001  The Linux Kernel Team
-	Written/copyright 1994-2001 by Donald Becker.
-
-	This software may be used and distributed according to the terms
-	of the GNU General Public License, incorporated herein by reference.
-
-	Please refer to Documentation/DocBook/tulip-user.{pdf,ps,html}
-	for more information on this driver.
-
-	Please submit bugs to http://bugzilla.kernel.org/ .
-*/
-
-#include <linux/interrupt.h>
-#include <linux/kernel.h>
-#include <linux/jiffies.h>
-#include "tulip.h"
-
-
-void pnic_do_nway(struct net_device *dev)
-{
-	struct tulip_private *tp = netdev_priv(dev);
-	void __iomem *ioaddr = tp->base_addr;
-	u32 phy_reg = ioread32(ioaddr + 0xB8);
-	u32 new_csr6 = tp->csr6 & ~0x40C40200;
-
-	if (phy_reg & 0x78000000) { /* Ignore baseT4 */
-		if (phy_reg & 0x20000000)		dev->if_port = 5;
-		else if (phy_reg & 0x40000000)	dev->if_port = 3;
-		else if (phy_reg & 0x10000000)	dev->if_port = 4;
-		else if (phy_reg & 0x08000000)	dev->if_port = 0;
-		tp->nwayset = 1;
-		new_csr6 = (dev->if_port & 1) ? 0x01860000 : 0x00420000;
-		iowrite32(0x32 | (dev->if_port & 1), ioaddr + CSR12);
-		if (dev->if_port & 1)
-			iowrite32(0x1F868, ioaddr + 0xB8);
-		if (phy_reg & 0x30000000) {
-			tp->full_duplex = 1;
-			new_csr6 |= 0x00000200;
-		}
-		if (tulip_debug > 1)
-			netdev_dbg(dev, "PNIC autonegotiated status %08x, %s\n",
-				   phy_reg, medianame[dev->if_port]);
-		if (tp->csr6 != new_csr6) {
-			tp->csr6 = new_csr6;
-			/* Restart Tx */
-			tulip_restart_rxtx(tp);
-			dev->trans_start = jiffies;
-		}
-	}
-}
-
-void pnic_lnk_change(struct net_device *dev, int csr5)
-{
-	struct tulip_private *tp = netdev_priv(dev);
-	void __iomem *ioaddr = tp->base_addr;
-	int phy_reg = ioread32(ioaddr + 0xB8);
-
-	if (tulip_debug > 1)
-		netdev_dbg(dev, "PNIC link changed state %08x, CSR5 %08x\n",
-			   phy_reg, csr5);
-	if (ioread32(ioaddr + CSR5) & TPLnkFail) {
-		iowrite32((ioread32(ioaddr + CSR7) & ~TPLnkFail) | TPLnkPass, ioaddr + CSR7);
-		/* If we use an external MII, then we mustn't use the
-		 * internal negotiation.
-		 */
-		if (tulip_media_cap[dev->if_port] & MediaIsMII)
-			return;
-		if (! tp->nwayset || time_after(jiffies, dev_trans_start(dev) + 1*HZ)) {
-			tp->csr6 = 0x00420000 | (tp->csr6 & 0x0000fdff);
-			iowrite32(tp->csr6, ioaddr + CSR6);
-			iowrite32(0x30, ioaddr + CSR12);
-			iowrite32(0x0201F078, ioaddr + 0xB8); /* Turn on autonegotiation. */
-			dev->trans_start = jiffies;
-		}
-	} else if (ioread32(ioaddr + CSR5) & TPLnkPass) {
-		if (tulip_media_cap[dev->if_port] & MediaIsMII) {
-			spin_lock(&tp->lock);
-			tulip_check_duplex(dev);
-			spin_unlock(&tp->lock);
-		} else {
-			pnic_do_nway(dev);
-		}
-		iowrite32((ioread32(ioaddr + CSR7) & ~TPLnkPass) | TPLnkFail, ioaddr + CSR7);
-	}
-}
-
-void pnic_timer(unsigned long data)
-{
-	struct net_device *dev = (struct net_device *)data;
-	struct tulip_private *tp = netdev_priv(dev);
-	void __iomem *ioaddr = tp->base_addr;
-	int next_tick = 60*HZ;
-
-	if(!ioread32(ioaddr + CSR7)) {
-		/* the timer was called due to a work overflow
-		 * in the interrupt handler. Skip the connection
-		 * checks, the nic is definitively speaking with
-		 * his link partner.
-		 */
-		goto too_good_connection;
-	}
-
-	if (tulip_media_cap[dev->if_port] & MediaIsMII) {
-		spin_lock_irq(&tp->lock);
-		if (tulip_check_duplex(dev) > 0)
-			next_tick = 3*HZ;
-		spin_unlock_irq(&tp->lock);
-	} else {
-		int csr12 = ioread32(ioaddr + CSR12);
-		int new_csr6 = tp->csr6 & ~0x40C40200;
-		int phy_reg = ioread32(ioaddr + 0xB8);
-		int csr5 = ioread32(ioaddr + CSR5);
-
-		if (tulip_debug > 1)
-			netdev_dbg(dev, "PNIC timer PHY status %08x, %s CSR5 %08x\n",
-				   phy_reg, medianame[dev->if_port], csr5);
-		if (phy_reg & 0x04000000) {	/* Remote link fault */
-			iowrite32(0x0201F078, ioaddr + 0xB8);
-			next_tick = 1*HZ;
-			tp->nwayset = 0;
-		} else if (phy_reg & 0x78000000) { /* Ignore baseT4 */
-			pnic_do_nway(dev);
-			next_tick = 60*HZ;
-		} else if (csr5 & TPLnkFail) { /* 100baseTx link beat */
-			if (tulip_debug > 1)
-				netdev_dbg(dev, "%s link beat failed, CSR12 %04x, CSR5 %08x, PHY %03x\n",
-					   medianame[dev->if_port],
-					   csr12,
-					   ioread32(ioaddr + CSR5),
-					   ioread32(ioaddr + 0xB8));
-			next_tick = 3*HZ;
-			if (tp->medialock) {
-			} else if (tp->nwayset  &&  (dev->if_port & 1)) {
-				next_tick = 1*HZ;
-			} else if (dev->if_port == 0) {
-				dev->if_port = 3;
-				iowrite32(0x33, ioaddr + CSR12);
-				new_csr6 = 0x01860000;
-				iowrite32(0x1F868, ioaddr + 0xB8);
-			} else {
-				dev->if_port = 0;
-				iowrite32(0x32, ioaddr + CSR12);
-				new_csr6 = 0x00420000;
-				iowrite32(0x1F078, ioaddr + 0xB8);
-			}
-			if (tp->csr6 != new_csr6) {
-				tp->csr6 = new_csr6;
-				/* Restart Tx */
-				tulip_restart_rxtx(tp);
-				dev->trans_start = jiffies;
-				if (tulip_debug > 1)
-					dev_info(&dev->dev,
-						 "Changing PNIC configuration to %s %s-duplex, CSR6 %08x\n",
-						 medianame[dev->if_port],
-						 tp->full_duplex ? "full" : "half",
-						 new_csr6);
-			}
-		}
-	}
-too_good_connection:
-	mod_timer(&tp->timer, RUN_AT(next_tick));
-	if(!ioread32(ioaddr + CSR7)) {
-		if (tulip_debug > 1)
-			dev_info(&dev->dev, "sw timer wakeup\n");
-		disable_irq(dev->irq);
-		tulip_refill_rx(dev);
-		enable_irq(dev->irq);
-		iowrite32(tulip_tbl[tp->chip_id].valid_intrs, ioaddr + CSR7);
-	}
-}