[realview] update to kernel 3.0

[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 eda0b5e..b2460d7 100644 (file)
--- a/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_mdio.c
+++ b/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_mdio.c
@@ -47,7 +47,7 @@ static void ag71xx_mdio_dump_regs(struct ag71xx_mdio *am)
                ag71xx_mdio_rr(am, AG71XX_REG_MII_IND));
 }
 
                ag71xx_mdio_rr(am, AG71XX_REG_MII_IND));
 }
 

-static int ag71xx_mdio_mii_read(struct ag71xx_mdio *am, int addr, int reg)
+int ag71xx_mdio_mii_read(struct ag71xx_mdio *am, int addr, int reg)

 {
        int ret;
        int i;
 {
        int ret;
        int i;


@@ -73,12 +73,11 @@ 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;
 }
 

-static void ag71xx_mdio_mii_write(struct ag71xx_mdio *am,
-                                 int addr, int reg, u16 val)
+void ag71xx_mdio_mii_write(struct ag71xx_mdio *am, int addr, int reg, u16 val)

 {
        int i;
 
 {
        int i;
 


@@ -122,14 +121,20 @@ static int ag71xx_mdio_read(struct mii_bus *bus, int addr, int reg)
 {
        struct ag71xx_mdio *am = bus->priv;
 
 {
        struct ag71xx_mdio *am = bus->priv;
 

-       return ag71xx_mdio_mii_read(am, addr, reg);
+       if (am->pdata->is_ar7240)
+               return ar7240sw_phy_read(bus, addr, reg);
+       else
+               return ag71xx_mdio_mii_read(am, addr, reg);

 }
 
 static int ag71xx_mdio_write(struct mii_bus *bus, int addr, int reg, u16 val)
 {
        struct ag71xx_mdio *am = bus->priv;
 
 }
 
 static int ag71xx_mdio_write(struct mii_bus *bus, int addr, int reg, u16 val)
 {
        struct ag71xx_mdio *am = bus->priv;
 

-       ag71xx_mdio_mii_write(am, addr, reg, val);
+       if (am->pdata->is_ar7240)
+               ar7240sw_phy_write(bus, addr, reg, val);
+       else
+               ag71xx_mdio_mii_write(am, addr, reg, val);

        return 0;
 }
 
        return 0;
 }
 


@@ -199,13 +204,13 @@ static int __devinit ag71xx_mdio_probe(struct platform_device *pdev)
        platform_set_drvdata(pdev, am);
        return 0;
 
        platform_set_drvdata(pdev, am);
        return 0;
 

- err_free_bus:
+err_free_bus:

        mdiobus_free(am->mii_bus);
        mdiobus_free(am->mii_bus);

- err_iounmap:
+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;
 }