From patchwork Thu Jul 16 21:42:25 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wolfgang Denk X-Patchwork-Id: 29883 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 49E7CB7F4D for ; Fri, 17 Jul 2009 07:42:42 +1000 (EST) Received: by ozlabs.org (Postfix) id E7275DDD0B; Fri, 17 Jul 2009 07:42:41 +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 3A5D8DDDA2 for ; Fri, 17 Jul 2009 07:42:41 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932978AbZGPVma (ORCPT ); Thu, 16 Jul 2009 17:42:30 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S932931AbZGPVma (ORCPT ); Thu, 16 Jul 2009 17:42:30 -0400 Received: from mail-out.m-online.net ([212.18.0.10]:44848 "EHLO mail-out.m-online.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932790AbZGPVm3 (ORCPT ); Thu, 16 Jul 2009 17:42:29 -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 DFA041C00210; Thu, 16 Jul 2009 23:42:27 +0200 (CEST) Received: from localhost (dynscan2.mnet-online.de [192.168.1.215]) by mail.m-online.net (Postfix) with ESMTP id BB6A190197; Thu, 16 Jul 2009 23:42:27 +0200 (CEST) X-Virus-Scanned: amavisd-new at mnet-online.de Received: from smtp-auth.mnet-online.de ([192.168.3.149]) by localhost (dynscan2.mnet-online.de [192.168.1.215]) (amavisd-new, port 10024) with ESMTP id MgPPsvkZhFX3; Thu, 16 Jul 2009 23:42:26 +0200 (CEST) X-Auth-Info: C0/i0c+umc4Fq2kaY5rqBCVSLmzTo92nX3WNUkcmY+I= Received: from diddl.denx.de (ppp-88-217-54-40.dynamic.mnet-online.de [88.217.54.40]) by smtp-auth.mnet-online.de (Postfix) with ESMTP; Thu, 16 Jul 2009 23:42:26 +0200 (CEST) Received: from gemini.denx.de (gemini.denx.de [10.0.0.2]) by diddl.denx.de (Postfix) with ESMTP id 34748C913180; Thu, 16 Jul 2009 23:42:26 +0200 (CEST) Received: by gemini.denx.de (Postfix, from userid 500) id 1BA9F832E416; Thu, 16 Jul 2009 23:42:26 +0200 (CEST) From: Wolfgang Denk To: linuxppc-dev@ozlabs.org Cc: Wolfgang Denk , Grant Likely , Kumar Gala , Subject: [PATCH 1/2 v4] fs_enet/mii-fec.c: fix MII speed calculation Date: Thu, 16 Jul 2009 23:42:25 +0200 Message-Id: <1247780546-4426-1-git-send-email-wd@denx.de> X-Mailer: git-send-email 1.6.0.6 In-Reply-To: <1247671133-12148-1-git-send-email-wd@denx.de> References: <1247671133-12148-1-git-send-email-wd@denx.de> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org The MII speed calculation was based on the CPU clock (ppc_proc_freq), but for MPC512x we must use the bus clock instead. This patch makes it use the correct clock and makes sure we don't clobber reserved bits in the MII_SPEED register. Signed-off-by: Wolfgang Denk Cc: Grant Likely Cc: Kumar Gala Cc: Signed-off-by: Wolfgang Denk Acked-by: Grant Likely --- drivers/net/fs_enet/mii-fec.c | 35 +++++++++++++++++++++++++++++++---- 1 files changed, 31 insertions(+), 4 deletions(-) diff --git a/drivers/net/fs_enet/mii-fec.c b/drivers/net/fs_enet/mii-fec.c index 75a0999..62b2d7a 100644 --- a/drivers/net/fs_enet/mii-fec.c +++ b/drivers/net/fs_enet/mii-fec.c @@ -103,11 +103,11 @@ static int fs_enet_fec_mii_reset(struct mii_bus *bus) static int __devinit fs_enet_mdio_probe(struct of_device *ofdev, const struct of_device_id *match) { - struct device_node *np = NULL; struct resource res; struct mii_bus *new_bus; struct fec_info *fec; - int ret = -ENOMEM, i; + int (*get_bus_freq)(struct device_node *) = match->data; + int ret = -ENOMEM, clock, speed; new_bus = mdiobus_alloc(); if (!new_bus) @@ -133,13 +133,34 @@ static int __devinit fs_enet_mdio_probe(struct of_device *ofdev, if (!fec->fecp) goto out_fec; - fec->mii_speed = ((ppc_proc_freq + 4999999) / 5000000) << 1; + if (get_bus_freq) { + clock = get_bus_freq(ofdev->node); + + if (!clock) { + dev_err(&ofdev->dev, "could not determine IPS/IPB clock\n"); + goto out_unmap_regs; + } + } else + clock = ppc_proc_freq; + + /* scale for a MII clock <= 2.5 MHz */ + speed = (clock + 2499999) / 2500000; + + /* only 6 bits (25:30) available for MII speed */ + if (speed > 0x3F) { + speed = 0x3F; + dev_err(&ofdev->dev, + "MII clock (%d Hz) exceeds max (2.5 MHz)\n", + clock / speed); + } + + fec->mii_speed = speed << 1; setbits32(&fec->fecp->fec_r_cntrl, FEC_RCNTRL_MII_MODE); setbits32(&fec->fecp->fec_ecntrl, FEC_ECNTRL_PINMUX | FEC_ECNTRL_ETHER_EN); out_be32(&fec->fecp->fec_ievent, FEC_ENET_MII); - out_be32(&fec->fecp->fec_mii_speed, fec->mii_speed); + clrsetbits_be32(&fec->fecp->fec_mii_speed, 0x7E, fec->mii_speed); new_bus->phy_mask = ~0; new_bus->irq = kmalloc(sizeof(int) * PHY_MAX_ADDR, GFP_KERNEL); @@ -188,6 +209,12 @@ static struct of_device_id fs_enet_mdio_fec_match[] = { { .compatible = "fsl,pq1-fec-mdio", }, +#if defined(CONFIG_PPC_MPC512x) + { + .compatible = "fsl,mpc5121-fec-mdio", + .data = mpc5xxx_get_bus_frequency, + }, +#endif {}, };