mirror/openwrt
1
0
Fork 0
mirror of https://git.openwrt.org/openwrt/openwrt.git synced 2024-10-03 09:41:18 +02:00
Code Issues

fix wrong logic in MDIO code and second PHY address

Browse Source 
SVN-Revision: 15034
This commit is contained in:
Florian Fainelli 2009-03-25 09:15:30 +00:00
parent 25cf1bc5e4
commit 47a268b30a
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
target/linux/rdc/files/drivers/net/r6040.c
View File

@ -91,7 +91,7 @@ MODULE_PARM_DESC(debug, "debug mask (-1 for all)");
/* PHY CHIP Address */ /* PHY CHIP Address */
#define PHY1_ADDR 1 /* For MAC1 */ #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_MODE 0x3100 /* PHY CHIP Register 0 */
#define PHY_CAP 0x01E1 /* PHY CHIP Register 4 */ #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 */ /* Wait for the read bit to be cleared */
while (limit--) { while (limit--) {
cmd = ioread16(ioaddr + MMDIO); cmd = ioread16(ioaddr + MMDIO);
if (cmd & MDIO_READ) if (!(cmd & MDIO_READ))
break; 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 */ /* Wait for the write bit to be cleared */
while (limit--) { while (limit--) {
cmd = ioread16(ioaddr + MMDIO); cmd = ioread16(ioaddr + MMDIO);
if (cmd & MDIO_WRITE) if (!(cmd & MDIO_WRITE))
break; break;
} }
if (limit <= 0) if (limit <= 0)