Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

net/phy: Fix 88e1111 copper/fiber selection in RGMII mode

MII_M1111_HWCFG_FIBER_COPPER_RES is a bit of MII_M1111_PHY_EXT_SR, not
MII_M1111_PHY_EXT_CR.

Signed-off-by: Wang Jian <lark@linux.net.cn>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>

authored by

Wang Jian and committed by
Jeff Garzik
7239016d 9cf8fa43

+1 -4
+1 -4
drivers/net/phy/marvell.c
··· 158 158 { 159 159 int err; 160 160 int temp; 161 - int mode; 162 161 163 162 /* Enable Fiber/Copper auto selection */ 164 163 temp = phy_read(phydev, MII_M1111_PHY_EXT_SR); ··· 197 198 198 199 temp &= ~(MII_M1111_HWCFG_MODE_MASK); 199 200 200 - mode = phy_read(phydev, MII_M1111_PHY_EXT_CR); 201 - 202 - if (mode & MII_M1111_HWCFG_FIBER_COPPER_RES) 201 + if (temp & MII_M1111_HWCFG_FIBER_COPPER_RES) 203 202 temp |= MII_M1111_HWCFG_MODE_FIBER_RGMII; 204 203 else 205 204 temp |= MII_M1111_HWCFG_MODE_COPPER_RGMII;