ucc_geth.c: Fix upsmr setting in RMII mode
authorHeiko Schocher <hs@denx.de>
Mon, 20 Apr 2009 22:36:43 +0000 (22:36 +0000)
committerDavid S. Miller <davem@davemloft.net>
Wed, 22 Apr 2009 07:46:08 +0000 (00:46 -0700)
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>
drivers/net/ucc_geth.c

index d3f39e86eb95a14cb8cad1b1120377fa5a3b80dc..44f8392da11729522a5e809e13f3a782ee03df71 100644 (file)
@@ -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;