diff options
| author | Florian Fainelli <florian@openwrt.org> | 2009-03-25 09:15:30 +0000 |
|---|---|---|
| committer | Florian Fainelli <florian@openwrt.org> | 2009-03-25 09:15:30 +0000 |
| commit | 07a3803bc3812746ae7198b504b3fe04f8fd5d57 (patch) | |
| tree | a0cac13568fe0d73d19484cc33747346960923f9 /target/linux/rdc/files | |
| parent | fc68391494b16024c2ee5a97acfafa55e781b4a2 (diff) | |
| download | upstream-07a3803bc3812746ae7198b504b3fe04f8fd5d57.tar.gz upstream-07a3803bc3812746ae7198b504b3fe04f8fd5d57.tar.bz2 upstream-07a3803bc3812746ae7198b504b3fe04f8fd5d57.zip | |
[rdc] fix wrong logic in MDIO code and second PHY address
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@15034 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/rdc/files')
| -rw-r--r-- | target/linux/rdc/files/drivers/net/r6040.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/rdc/files/drivers/net/r6040.c b/target/linux/rdc/files/drivers/net/r6040.c index 33a7c12d67..0096006197 100644 --- a/target/linux/rdc/files/drivers/net/r6040.c +++ b/target/linux/rdc/files/drivers/net/r6040.c @@ -91,7 +91,7 @@ MODULE_PARM_DESC(debug, "debug mask (-1 for all)"); /* PHY CHIP Address */ #define PHY1_ADDR 1 /* For MAC1 */ -#define PHY2_ADDR 2 /* For MAC2 */ +#define PHY2_ADDR 3 /* For MAC2 */ #define PHY_MODE 0x3100 /* PHY CHIP Register 0 */ #define PHY_CAP 0x01E1 /* PHY CHIP Register 4 */ @@ -305,7 +305,7 @@ STATIC int phy_read(void __iomem *ioaddr, int phy_addr, int reg) /* Wait for the read bit to be cleared */ while (limit--) { cmd = ioread16(ioaddr + MMDIO); - if (cmd & MDIO_READ) + if (!(cmd & MDIO_READ)) break; } @@ -333,7 +333,7 @@ STATIC void phy_write(void __iomem *ioaddr, int phy_addr, int reg, u16 val) /* Wait for the write bit to be cleared */ while (limit--) { cmd = ioread16(ioaddr + MMDIO); - if (cmd & MDIO_WRITE) + if (!(cmd & MDIO_WRITE)) break; } if (limit <= 0) |