[PATCH] [net, 83xx] ucc_geth.c: Fix upsmr setting in RMII mode

[Li Yang]

On Tue, Apr 21, 2009 at 4:36 PM, Heiko Schocher <hs at denx.de> wrote:
> 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 at denx.de>

Acked-by: Li Yang <leoli at freescale.com>

> ---
>  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;