linuxppc-dev.lists.ozlabs.org archive mirror
 help / color / mirror / Atom feed
From: Benjamin Herrenschmidt <benh@kernel.crashing.org>
To: <jgarzik@pobox.com>
Cc: netdev@vger.kernel.org, linuxppc-dev@ozlabs.org
Subject: [PATCH 8/11] ibm_newemac: Correct opb_bus_freq value
Date: Fri, 30 Nov 2007 16:40:31 +1100	[thread overview]
Message-ID: <20071130054134.A4322DDE32@ozlabs.org> (raw)
In-Reply-To: <1196401223.5661.297518056501.qpush@grosgo>

From: Valentine Barshak <vbarshak@ru.mvista.com>

The EMAC4_MR1_OBCI(freq) macro expects freg in MHz,
while opb_bus_freq is kept in Hz. Correct this.

Signed-off-by: Valentine Barshak <vbarshak@ru.mvista.com>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
---

diff -pruN linux-2.6.orig/drivers/net/ibm_newemac/core.c linux-2.6/drivers/net/ibm_newemac/core.c
--- linux-2.6.orig/drivers/net/ibm_newemac/core.c	2007-11-23 21:27:57.000000000 +0300
+++ linux-2.6/drivers/net/ibm_newemac/core.c	2007-11-23 21:47:53.000000000 +0300
@@ -402,7 +402,7 @@ static u32 __emac_calc_base_mr1(struct e
 static u32 __emac4_calc_base_mr1(struct emac_instance *dev, int tx_size, int rx_size)
 {
 	u32 ret = EMAC_MR1_VLE | EMAC_MR1_IST | EMAC4_MR1_TR |
-		EMAC4_MR1_OBCI(dev->opb_bus_freq);
+		EMAC4_MR1_OBCI(dev->opb_bus_freq / 1000000);
 
 	DBG2(dev, "__emac4_calc_base_mr1" NL);
 

  parent reply	other threads:[~2007-11-30  5:40 UTC|newest]

Thread overview: 21+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2007-11-30  5:40 [PATCH 0/11] ibm_newemac: Candidate patches for 2.6.25 Benjamin Herrenschmidt
2007-11-30  5:40 ` [PATCH 1/11] ibm_newemac: Add BCM5248 and Marvell 88E1111 PHY support Benjamin Herrenschmidt
2007-11-30  7:56   ` Christoph Hellwig
2007-11-30  8:03     ` Benjamin Herrenschmidt
2007-11-30 14:27   ` Olof Johansson
2007-11-30 14:30     ` Geert Uytterhoeven
2007-11-30  5:40 ` [PATCH 2/11] ibm_newemac: Add ET1011c " Benjamin Herrenschmidt
2007-11-30 14:29   ` Olof Johansson
2007-11-30 20:59     ` Benjamin Herrenschmidt
2007-11-30 21:30       ` Olof Johansson
2007-11-30 21:56       ` Kumar Gala
2007-11-30  5:40 ` [PATCH 3/11] ibm_newemac: Fix ZMII refcounting bug Benjamin Herrenschmidt
2007-11-30  5:40 ` [PATCH 4/11] ibm_newemac: Workaround reset timeout when no link Benjamin Herrenschmidt
2007-11-30  5:40 ` [PATCH 5/11] ibm_newemac: Cleanup/Fix RGMII MDIO support detection Benjamin Herrenschmidt
2007-11-30  5:40 ` [PATCH 6/11] ibm_newemac: Cleanup/fix support for STACR register variants Benjamin Herrenschmidt
2007-11-30  5:40 ` [PATCH 7/11] ibm_newemac: Skip EMACs that are marked unused by the firmware Benjamin Herrenschmidt
2007-11-30  5:40 ` Benjamin Herrenschmidt [this message]
2007-11-30  5:40 ` [PATCH 9/11] ibm_newemac: Fix typo reading TAH channel info Benjamin Herrenschmidt
2007-11-30  5:40 ` [PATCH 10/11] ibm_newemac: Call dev_set_drvdata() before tah_reset() Benjamin Herrenschmidt
2007-11-30  5:40 ` [PATCH 11/11] emac: Update file headers copyright notices Benjamin Herrenschmidt
  -- strict thread matches above, loose matches on Subject: below --
2007-12-05  0:14 [PATCH 8/11] ibm_newemac: Correct opb_bus_freq value Benjamin Herrenschmidt

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20071130054134.A4322DDE32@ozlabs.org \
    --to=benh@kernel.crashing.org \
    --cc=jgarzik@pobox.com \
    --cc=linuxppc-dev@ozlabs.org \
    --cc=netdev@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).