images: allow generating .cpio.gz and/or .tar.gz archives whether ramdisk is selected...

[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 5721278..3984840 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-2009 Gabor Juhos <juhosg@openwrt.org>
+ *  Copyright (C) 2008-2010 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


@@ -16,12 +16,16 @@
 #define AG71XX_MDIO_RETRY      1000
 #define AG71XX_MDIO_DELAY      5
 
 #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)
 {
 static inline void ag71xx_mdio_wr(struct ag71xx_mdio *am, unsigned reg,
                                  u32 value)
 {

-       __raw_writel(value, am->mdio_base + reg);
+       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)


@@ -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;
 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;


@@ -131,8 +141,11 @@ static int __init ag71xx_mdio_probe(struct platform_device *pdev)
        int i;
        int err;
 
        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) {
 
        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;
        }
 
                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");


@@ -167,11 +182,8 @@ static int __init ag71xx_mdio_probe(struct platform_device *pdev)
        am->mii_bus->irq = am->mii_irq;
        am->mii_bus->priv = am;
        am->mii_bus->parent = &pdev->dev;
        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);
-
-       pdata = pdev->dev.platform_data;
-       if (pdata)
-               am->mii_bus->phy_mask = pdata->phy_mask;
+       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;
 
        for (i = 0; i < PHY_MAX_ADDR; i++)
                am->mii_irq[i] = PHY_POLL;


@@ -185,7 +197,6 @@ static int __init ag71xx_mdio_probe(struct platform_device *pdev)
        ag71xx_mdio_dump_regs(am);
 
        platform_set_drvdata(pdev, am);
        ag71xx_mdio_dump_regs(am);
 
        platform_set_drvdata(pdev, am);

-       ag71xx_mdio_bus = am;

        return 0;
 
  err_free_bus:
        return 0;
 
  err_free_bus:


@@ -203,7 +214,6 @@ static int __exit ag71xx_mdio_remove(struct platform_device *pdev)
        struct ag71xx_mdio *am = platform_get_drvdata(pdev);
 
        if (am) {
        struct ag71xx_mdio *am = platform_get_drvdata(pdev);
 
        if (am) {

-               ag71xx_mdio_bus = NULL;

                mdiobus_unregister(am->mii_bus);
                mdiobus_free(am->mii_bus);
                iounmap(am->mdio_base);
                mdiobus_unregister(am->mii_bus);
                mdiobus_free(am->mii_bus);
                iounmap(am->mdio_base);