X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/14df5f021d1f166e7dbc87e0f9a82ddda030709f..0b9f62a797253b25939b69b5820a1cc7d89d0220:/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_mdio.c

diff --git a/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_mdio.c b/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_mdio.c
index fb53d9d76..6bc858cf8 100644
--- a/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_mdio.c
+++ b/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_mdio.c
@@ -1,7 +1,7 @@
 /*
  *  Atheros AR71xx built-in ethernet mac driver
  *
- *  Copyright (C) 2008 Gabor Juhos <juhosg@openwrt.org>
+ *  Copyright (C) 2008-2009 Gabor Juhos <juhosg@openwrt.org>
  *  Copyright (C) 2008 Imre Kaloz <kaloz@openwrt.org>
  *
  *  Based on Atheros' AG7100 driver
@@ -16,28 +16,32 @@
 #define AG71XX_MDIO_RETRY	1000
 #define AG71XX_MDIO_DELAY	5
 
-struct ag71xx_mdio *ag71xx_mdio_bus;
-
 static inline void ag71xx_mdio_wr(struct ag71xx_mdio *am, unsigned reg,
 				  u32 value)
 {
-	__raw_writel(value, am->mdio_base + reg - AG71XX_REG_MII_CFG);
+	void __iomem *r;
+
+	r = am->mdio_base + reg;
+	__raw_writel(value, r);
+
+	/* flush write */
+	(void) __raw_readl(r);
 }
 
 static inline u32 ag71xx_mdio_rr(struct ag71xx_mdio *am, unsigned reg)
 {
-	return __raw_readl(am->mdio_base + reg - AG71XX_REG_MII_CFG);
+	return __raw_readl(am->mdio_base + reg);
 }
 
 static void ag71xx_mdio_dump_regs(struct ag71xx_mdio *am)
 {
 	DBG("%s: mii_cfg=%08x, mii_cmd=%08x, mii_addr=%08x\n",
-		am->mii_bus.name,
+		am->mii_bus->name,
 		ag71xx_mdio_rr(am, AG71XX_REG_MII_CFG),
 		ag71xx_mdio_rr(am, AG71XX_REG_MII_CMD),
 		ag71xx_mdio_rr(am, AG71XX_REG_MII_ADDR));
 	DBG("%s: mii_ctrl=%08x, mii_status=%08x, mii_ind=%08x\n",
-		am->mii_bus.name,
+		am->mii_bus->name,
 		ag71xx_mdio_rr(am, AG71XX_REG_MII_CTRL),
 		ag71xx_mdio_rr(am, AG71XX_REG_MII_STATUS),
 		ag71xx_mdio_rr(am, AG71XX_REG_MII_IND));
@@ -50,14 +54,14 @@ static int ag71xx_mdio_mii_read(struct ag71xx_mdio *am, int addr, int reg)
 
 	ag71xx_mdio_wr(am, AG71XX_REG_MII_CMD, MII_CMD_WRITE);
 	ag71xx_mdio_wr(am, AG71XX_REG_MII_ADDR,
-			((addr & 0xff) << MII_ADDR_S) | (reg & 0xff));
+			((addr & 0xff) << MII_ADDR_SHIFT) | (reg & 0xff));
 	ag71xx_mdio_wr(am, AG71XX_REG_MII_CMD, MII_CMD_READ);
 
 	i = AG71XX_MDIO_RETRY;
 	while (ag71xx_mdio_rr(am, AG71XX_REG_MII_IND) & MII_IND_BUSY) {
 		if (i-- == 0) {
 			printk(KERN_ERR "%s: mii_read timed out\n",
-				am->mii_bus.name);
+				am->mii_bus->name);
 			ret = 0xffff;
 			goto out;
 		}
@@ -81,14 +85,14 @@ static void ag71xx_mdio_mii_write(struct ag71xx_mdio *am,
 	DBG("mii_write: addr=%04x, reg=%04x, value=%04x\n", addr, reg, val);
 
 	ag71xx_mdio_wr(am, AG71XX_REG_MII_ADDR,
-			((addr & 0xff) << MII_ADDR_S) | (reg & 0xff));
+			((addr & 0xff) << MII_ADDR_SHIFT) | (reg & 0xff));
 	ag71xx_mdio_wr(am, AG71XX_REG_MII_CTRL, val);
 
 	i = AG71XX_MDIO_RETRY;
 	while (ag71xx_mdio_rr(am, AG71XX_REG_MII_IND) & MII_IND_BUSY) {
 		if (i-- == 0) {
 			printk(KERN_ERR "%s: mii_write timed out\n",
-				am->mii_bus.name);
+				am->mii_bus->name);
 			break;
 		}
 		udelay(AG71XX_MDIO_DELAY);
@@ -98,11 +102,17 @@ static void ag71xx_mdio_mii_write(struct ag71xx_mdio *am,
 static int ag71xx_mdio_reset(struct mii_bus *bus)
 {
 	struct ag71xx_mdio *am = bus->priv;
+	u32 t;
+
+	if (am->pdata->is_ar7240)
+		t = MII_CFG_CLK_DIV_6;
+	else
+		t = MII_CFG_CLK_DIV_28;
 
-	ag71xx_mdio_wr(am, AG71XX_REG_MII_CFG, MII_CFG_RESET);
+	ag71xx_mdio_wr(am, AG71XX_REG_MII_CFG, t | MII_CFG_RESET);
 	udelay(100);
 
-	ag71xx_mdio_wr(am, AG71XX_REG_MII_CFG, MII_CFG_CLK_DIV_28);
+	ag71xx_mdio_wr(am, AG71XX_REG_MII_CFG, t);
 	udelay(100);
 
 	return 0;
@@ -131,8 +141,11 @@ static int __init ag71xx_mdio_probe(struct platform_device *pdev)
 	int i;
 	int err;
 
-	if (ag71xx_mdio_bus)
-		return -EBUSY;
+	pdata = pdev->dev.platform_data;
+	if (!pdata) {
+		dev_err(&pdev->dev, "no platform data specified\n");
+		return -EINVAL;
+	}
 
 	am = kzalloc(sizeof(*am), GFP_KERNEL);
 	if (!am) {
@@ -140,6 +153,8 @@ static int __init ag71xx_mdio_probe(struct platform_device *pdev)
 		goto err_out;
 	}
 
+	am->pdata = pdata;
+
 	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
 	if (!res) {
 		dev_err(&pdev->dev, "no iomem resource found\n");
@@ -154,36 +169,38 @@ static int __init ag71xx_mdio_probe(struct platform_device *pdev)
 		goto err_free_mdio;
 	}
 
-	am->mii_bus.name = "ag71xx_mdio";
-	am->mii_bus.read = ag71xx_mdio_read;
-	am->mii_bus.write = ag71xx_mdio_write;
-	am->mii_bus.reset = ag71xx_mdio_reset;
-	am->mii_bus.irq = am->mii_irq;
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,26))
-	am->mii_bus.id = 0;
-#else
-	snprintf(am->mii_bus.id, MII_BUS_ID_SIZE, "%x", 0);
-#endif
-	am->mii_bus.priv = am;
-	am->mii_bus.dev = &pdev->dev;
+	am->mii_bus = mdiobus_alloc();
+	if (am->mii_bus == NULL) {
+		err = -ENOMEM;
+		goto err_iounmap;
+	}
 
-	pdata = pdev->dev.platform_data;
-	if (pdata)
-		am->mii_bus.phy_mask = pdata->phy_mask;
+	am->mii_bus->name = "ag71xx_mdio";
+	am->mii_bus->read = ag71xx_mdio_read;
+	am->mii_bus->write = ag71xx_mdio_write;
+	am->mii_bus->reset = ag71xx_mdio_reset;
+	am->mii_bus->irq = am->mii_irq;
+	am->mii_bus->priv = am;
+	am->mii_bus->parent = &pdev->dev;
+	snprintf(am->mii_bus->id, MII_BUS_ID_SIZE, "%s", dev_name(&pdev->dev));
+	am->mii_bus->phy_mask = pdata->phy_mask;
 
 	for (i = 0; i < PHY_MAX_ADDR; i++)
 		am->mii_irq[i] = PHY_POLL;
 
-	err = mdiobus_register(&am->mii_bus);
+	ag71xx_mdio_wr(am, AG71XX_REG_MAC_CFG1, 0);
+
+	err = mdiobus_register(am->mii_bus);
 	if (err)
-		goto err_iounmap;
+		goto err_free_bus;
 
 	ag71xx_mdio_dump_regs(am);
 
 	platform_set_drvdata(pdev, am);
-	ag71xx_mdio_bus = am;
 	return 0;
 
+ err_free_bus:
+	mdiobus_free(am->mii_bus);
  err_iounmap:
 	iounmap(am->mdio_base);
  err_free_mdio:
@@ -197,8 +214,8 @@ static int __exit ag71xx_mdio_remove(struct platform_device *pdev)
 	struct ag71xx_mdio *am = platform_get_drvdata(pdev);
 
 	if (am) {
-		ag71xx_mdio_bus = NULL;
-		mdiobus_unregister(&am->mii_bus);
+		mdiobus_unregister(am->mii_bus);
+		mdiobus_free(am->mii_bus);
 		iounmap(am->mdio_base);
 		kfree(am);
 		platform_set_drvdata(pdev, NULL);