/*
* 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
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;
DBG("mii_read: addr=%04x, reg=%04x, value=%04x\n", addr, reg, ret);
-out:
+ out:
return ret;
}
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;
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;
+ snprintf(am->mii_bus.id, MII_BUS_ID_SIZE, "%x", 0);
pdata = pdev->dev.platform_data;
if (pdata)
for (i = 0; i < PHY_MAX_ADDR; i++)
am->mii_irq[i] = PHY_POLL;
+ ag71xx_mdio_wr(am, AG71XX_REG_MAC_CFG1, 0);
+
err = mdiobus_register(&am->mii_bus);
if (err)
goto err_iounmap;
ag71xx_mdio_bus = am;
return 0;
-err_iounmap:
+ err_iounmap:
iounmap(am->mdio_base);
-err_free_mdio:
+ err_free_mdio:
kfree(am);
-err_out:
+ err_out:
return err;
}