From patchwork Tue Apr 21 08:36:43 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heiko Schocher X-Patchwork-Id: 26228 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@bilbo.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from ozlabs.org (ozlabs.org [203.10.76.45]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client CN "mx.ozlabs.org", Issuer "CA Cert Signing Authority" (verified OK)) by bilbo.ozlabs.org (Postfix) with ESMTPS id CAE83B6F35 for ; Tue, 21 Apr 2009 19:34:28 +1000 (EST) Received: by ozlabs.org (Postfix) id BB906DDFB1; Tue, 21 Apr 2009 19:34:28 +1000 (EST) Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by ozlabs.org (Postfix) with ESMTP id 3D5D5DDFAE for ; Tue, 21 Apr 2009 19:34:28 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752416AbZDUJeV (ORCPT ); Tue, 21 Apr 2009 05:34:21 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751397AbZDUJeV (ORCPT ); Tue, 21 Apr 2009 05:34:21 -0400 Received: from mail-out.m-online.net ([212.18.0.10]:39239 "EHLO mail-out.m-online.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750850AbZDUJeU (ORCPT ); Tue, 21 Apr 2009 05:34:20 -0400 Received: from mail01.m-online.net (mail.m-online.net [192.168.3.149]) by mail-out.m-online.net (Postfix) with ESMTP id B8F6B1C001D6; Tue, 21 Apr 2009 11:34:15 +0200 (CEST) X-Auth-Info: vmtIzf03iIl9ZV0omozNj3S52rL2yXbV7mva0/uUOj4= Received: from [192.168.1.6] (87.97.92.149.pool.invitel.hu [87.97.92.149]) by smtp-auth.mnet-online.de (Postfix) with ESMTP id 6943190136; Tue, 21 Apr 2009 11:34:17 +0200 (CEST) Message-ID: <49ED859B.30904@denx.de> Date: Tue, 21 Apr 2009 10:36:43 +0200 From: Heiko Schocher Reply-To: hs@denx.de Organization: DENX GmbH User-Agent: Thunderbird 2.0.0.6 (X11/20070801) MIME-Version: 1.0 To: Li Yang CC: Shlomi Gridish , Kumar Gala , netdev@vger.kernel.org, linuxppc-dev@ozlabs.org Subject: [PATCH] [net, 83xx] ucc_geth.c: Fix upsmr setting in RMII mode Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org 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 Acked-by: Li Yang --- 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;