[adm5120] fix compilation failure of adm5120-dbg.c with the removal of bus_id

[openwrt.git] / 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 b58d3cb..b6fccbb 100644 (file)
--- 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
  *
 /*
  *  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
  *  Copyright (C) 2008 Imre Kaloz <kaloz@openwrt.org>
  *
  *  Based on Atheros' AG7100 driver


@@ -21,23 +21,29 @@ struct ag71xx_mdio *ag71xx_mdio_bus;
 static inline void ag71xx_mdio_wr(struct ag71xx_mdio *am, unsigned reg,
                                  u32 value)
 {
 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)
 {
 }
 
 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",
 }
 
 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",
                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));
                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 +56,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,
 
        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",
        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;
                }
                        ret = 0xffff;
                        goto out;
                }


@@ -69,7 +75,7 @@ static int ag71xx_mdio_mii_read(struct ag71xx_mdio *am, int addr, int reg)
 
        DBG("mii_read: addr=%04x, reg=%04x, value=%04x\n", addr, reg, ret);
 
 
        DBG("mii_read: addr=%04x, reg=%04x, value=%04x\n", addr, reg, ret);
 

-out:
+ out:

        return ret;
 }
 
        return ret;
 }
 


@@ -81,14 +87,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,
        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",
        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);
                        break;
                }
                udelay(AG71XX_MDIO_DELAY);


@@ -98,11 +104,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;
 static int ag71xx_mdio_reset(struct mii_bus *bus)
 {
        struct ag71xx_mdio *am = bus->priv;

+       u32 t;

 
 

-       ag71xx_mdio_wr(am, AG71XX_REG_MII_CFG, MII_CFG_RESET);
+       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, t | MII_CFG_RESET);

        udelay(100);
 
        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;
        udelay(100);
 
        return 0;


@@ -134,12 +146,20 @@ static int __init ag71xx_mdio_probe(struct platform_device *pdev)
        if (ag71xx_mdio_bus)
                return -EBUSY;
 
        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) {
                err = -ENOMEM;
                goto err_out;
        }
 
        am = kzalloc(sizeof(*am), GFP_KERNEL);
        if (!am) {
                err = -ENOMEM;
                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");
        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
        if (!res) {
                dev_err(&pdev->dev, "no iomem resource found\n");


@@ -154,29 +174,30 @@ static int __init ag71xx_mdio_probe(struct platform_device *pdev)
                goto err_free_mdio;
        }
 
                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, "%x", 0);
+       am->mii_bus->phy_mask = pdata->phy_mask;

 
        for (i = 0; i < PHY_MAX_ADDR; i++)
                am->mii_irq[i] = PHY_POLL;
 
 
        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)
        if (err)

-               goto err_iounmap;
+               goto err_free_bus;

 
        ag71xx_mdio_dump_regs(am);
 
 
        ag71xx_mdio_dump_regs(am);
 


@@ -184,11 +205,13 @@ static int __init ag71xx_mdio_probe(struct platform_device *pdev)
        ag71xx_mdio_bus = am;
        return 0;
 
        ag71xx_mdio_bus = am;
        return 0;
 

-err_iounmap:
+ err_free_bus:
+       mdiobus_free(am->mii_bus);
+ err_iounmap:

        iounmap(am->mdio_base);
        iounmap(am->mdio_base);

-err_free_mdio:
+ err_free_mdio:

        kfree(am);
        kfree(am);

-err_out:
+ err_out:

        return err;
 }
 
        return err;
 }
 


@@ -198,7 +221,8 @@ static int __exit ag71xx_mdio_remove(struct platform_device *pdev)
 
        if (am) {
                ag71xx_mdio_bus = NULL;
 
        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);
                iounmap(am->mdio_base);
                kfree(am);
                platform_set_drvdata(pdev, NULL);