From: Thomas Petazzoni Date: Sun, 27 Jul 2014 21:21:35 +0000 (+0200) Subject: net: mvpp2: fix 10 Mbit/s usage X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=2add511e58dc822a4573dd35280750fb3a21a2db;p=openwrt%2Fstaging%2Fblogic.git net: mvpp2: fix 10 Mbit/s usage This commit is similar to commit 4d12bc63ab5e ("net: mvneta: fix operation in 10 Mbit/s mode"), but this time for the mvpp2 driver. The driver was properly taking into account the 1 Gbit/s and 100 Mbit/s speeds, but not the 10 Mbit/s, which was handled as 100 Mbit/s. However, the MVPP2_GMAC_CONFIG_MII_SPEED bit in the MVPP2_GMAC_AUTONEG_CONFIG register must remain cleared to allow 10 Mbit/s operation. This commit therefore fixes 10 Mbit/s operation. Signed-off-by: Thomas Petazzoni Signed-off-by: David S. Miller --- diff --git a/drivers/net/ethernet/marvell/mvpp2.c b/drivers/net/ethernet/marvell/mvpp2.c index 3193a7de7197..3cae3d2abe7e 100644 --- a/drivers/net/ethernet/marvell/mvpp2.c +++ b/drivers/net/ethernet/marvell/mvpp2.c @@ -4842,7 +4842,7 @@ static void mvpp2_link_event(struct net_device *dev) if (phydev->speed == SPEED_1000) val |= MVPP2_GMAC_CONFIG_GMII_SPEED; - else + else if (phydev->speed == SPEED_100) val |= MVPP2_GMAC_CONFIG_MII_SPEED; writel(val, port->base + MVPP2_GMAC_AUTONEG_CONFIG);