From e11fd5649e1f4bdfcfe8c748346554e94f07dd72 Mon Sep 17 00:00:00 2001 From: Heiko Schocher Date: Mon, 20 Apr 2009 22:36:43 +0000 Subject: [PATCH] --- yaml --- r: 143951 b: refs/heads/master c: cef309cf6112f9a44b1ebcefc1641d01d35c83dc h: refs/heads/master i: 143949: 9da98c4c49629113cd1706b129729bb60fa74b09 143947: ef3ec040495b8abf51ea044797fb42675a070e2b 143943: 83f4a16f69f8192bb8370a5f75f77bf6d75d1274 143935: bab4882468ebee8e17c9229c795753dddbf4a196 v: v3 --- [refs] | 2 +- trunk/drivers/net/ucc_geth.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 1c3c2ad16e83..a9a14db41439 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3f9738f73ad08ef770df64f145007bd27ac2fa16 +refs/heads/master: cef309cf6112f9a44b1ebcefc1641d01d35c83dc diff --git a/trunk/drivers/net/ucc_geth.c b/trunk/drivers/net/ucc_geth.c index d3f39e86eb95..44f8392da117 100644 --- a/trunk/drivers/net/ucc_geth.c +++ b/trunk/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;