xilinx/ll_temac: Move the Xilinx drivers

Move the Xilinx drivers into drivers/net/ethernet/xilinx/ and
make the necessary Kconfig and Makefile changes.

CC: John Williams <john.williams@petalogix.com>
CC: "David H. Lynch Jr." <dhlii@dlasys.net>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>

1 files changed, 0 insertions, 122 deletions

diff --git a/drivers/net/ll_temac_mdio.c b/drivers/net/ll_temac_mdio.c
deleted file mode 100644
index 8cf9d4f..0000000
--- a/drivers/net/ll_temac_mdio.c
+++ /dev/null
@@ -1,122 +0,0 @@
-/*
- * MDIO bus driver for the Xilinx TEMAC device
- *
- * Copyright (c) 2009 Secret Lab Technologies, Ltd.
- */
-
-#include <linux/io.h>
-#include <linux/netdevice.h>
-#include <linux/mutex.h>
-#include <linux/phy.h>
-#include <linux/of.h>
-#include <linux/of_device.h>
-#include <linux/of_address.h>
-#include <linux/slab.h>
-#include <linux/of_mdio.h>
-
-#include "ll_temac.h"
-
-/* ---------------------------------------------------------------------
- * MDIO Bus functions
- */
-static int temac_mdio_read(struct mii_bus *bus, int phy_id, int reg)
-{
-	struct temac_local *lp = bus->priv;
-	u32 rc;
-
-	/* Write the PHY address to the MIIM Access Initiator register.
-	 * When the transfer completes, the PHY register value will appear
-	 * in the LSW0 register */
-	mutex_lock(&lp->indirect_mutex);
-	temac_iow(lp, XTE_LSW0_OFFSET, (phy_id << 5) | reg);
-	rc = temac_indirect_in32(lp, XTE_MIIMAI_OFFSET);
-	mutex_unlock(&lp->indirect_mutex);
-
-	dev_dbg(lp->dev, "temac_mdio_read(phy_id=%i, reg=%x) == %x\n",
-		phy_id, reg, rc);
-
-	return rc;
-}
-
-static int temac_mdio_write(struct mii_bus *bus, int phy_id, int reg, u16 val)
-{
-	struct temac_local *lp = bus->priv;
-
-	dev_dbg(lp->dev, "temac_mdio_write(phy_id=%i, reg=%x, val=%x)\n",
-		phy_id, reg, val);
-
-	/* First write the desired value into the write data register
-	 * and then write the address into the access initiator register
-	 */
-	mutex_lock(&lp->indirect_mutex);
-	temac_indirect_out32(lp, XTE_MGTDR_OFFSET, val);
-	temac_indirect_out32(lp, XTE_MIIMAI_OFFSET, (phy_id << 5) | reg);
-	mutex_unlock(&lp->indirect_mutex);
-
-	return 0;
-}
-
-int temac_mdio_setup(struct temac_local *lp, struct device_node *np)
-{
-	struct mii_bus *bus;
-	const u32 *bus_hz;
-	int clk_div;
-	int rc, size;
-	struct resource res;
-
-	/* Calculate a reasonable divisor for the clock rate */
-	clk_div = 0x3f; /* worst-case default setting */
-	bus_hz = of_get_property(np, "clock-frequency", &size);
-	if (bus_hz && size >= sizeof(*bus_hz)) {
-		clk_div = (*bus_hz) / (2500 * 1000 * 2) - 1;
-		if (clk_div < 1)
-			clk_div = 1;
-		if (clk_div > 0x3f)
-			clk_div = 0x3f;
-	}
-
-	/* Enable the MDIO bus by asserting the enable bit and writing
-	 * in the clock config */
-	mutex_lock(&lp->indirect_mutex);
-	temac_indirect_out32(lp, XTE_MC_OFFSET, 1 << 6 | clk_div);
-	mutex_unlock(&lp->indirect_mutex);
-
-	bus = mdiobus_alloc();
-	if (!bus)
-		return -ENOMEM;
-
-	of_address_to_resource(np, 0, &res);
-	snprintf(bus->id, MII_BUS_ID_SIZE, "%.8llx",
-		 (unsigned long long)res.start);
-	bus->priv = lp;
-	bus->name = "Xilinx TEMAC MDIO";
-	bus->read = temac_mdio_read;
-	bus->write = temac_mdio_write;
-	bus->parent = lp->dev;
-	bus->irq = lp->mdio_irqs; /* preallocated IRQ table */
-
-	lp->mii_bus = bus;
-
-	rc = of_mdiobus_register(bus, np);
-	if (rc)
-		goto err_register;
-
-	mutex_lock(&lp->indirect_mutex);
-	dev_dbg(lp->dev, "MDIO bus registered;  MC:%x\n",
-		temac_indirect_in32(lp, XTE_MC_OFFSET));
-	mutex_unlock(&lp->indirect_mutex);
-	return 0;
-
- err_register:
-	mdiobus_free(bus);
-	return rc;
-}
-
-void temac_mdio_teardown(struct temac_local *lp)
-{
-	mdiobus_unregister(lp->mii_bus);
-	kfree(lp->mii_bus->irq);
-	mdiobus_free(lp->mii_bus);
-	lp->mii_bus = NULL;
-}
-