diff options
| author | Heiko Schocher <hs@denx.de> | 2009-04-20 22:36:43 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-04-22 00:46:08 -0700 |
| commit | cef309cf6112f9a44b1ebcefc1641d01d35c83dc (patch) | |
| tree | 3332d36063bd3f605b752f60423361817efc32ae /drivers/net/ucc_geth.c | |
| parent | 3f9738f73ad08ef770df64f145007bd27ac2fa16 (diff) | |
| download | kernel_samsung_smdk4412-cef309cf6112f9a44b1ebcefc1641d01d35c83dc.zip kernel_samsung_smdk4412-cef309cf6112f9a44b1ebcefc1641d01d35c83dc.tar.gz kernel_samsung_smdk4412-cef309cf6112f9a44b1ebcefc1641d01d35c83dc.tar.bz2 | |
ucc_geth.c: Fix upsmr setting in RMII mode
If using the UCC on a MPC8360 in RMII mode, don;t set
UCC_GETH_UPSMR_RPM bit in the upsmr register.
Signed-off-by: Heiko Schocher <hs@denx.de>
Acked-by: Li Yang <leoli@freescale.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ucc_geth.c')
| -rw-r--r-- | drivers/net/ucc_geth.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/ucc_geth.c b/drivers/net/ucc_geth.c index d3f39e8..44f8392 100644 --- a/drivers/net/ucc_geth.c +++ b/drivers/net/ucc_geth.c @@ -1394,7 +1394,8 @@ static int adjust_enet_interface(struct ucc_geth_private *ugeth) (ugeth->phy_interface == PHY_INTERFACE_MODE_RGMII_RXID) || (ugeth->phy_interface == PHY_INTERFACE_MODE_RGMII_TXID) || (ugeth->phy_interface == PHY_INTERFACE_MODE_RTBI)) { - upsmr |= UCC_GETH_UPSMR_RPM; + if (ugeth->phy_interface != PHY_INTERFACE_MODE_RMII) + upsmr |= UCC_GETH_UPSMR_RPM; switch (ugeth->max_speed) { case SPEED_10: upsmr |= UCC_GETH_UPSMR_R10M; |