Title: [4071] trunk/drivers/net/bfin_mac.c: Fix bug [#3797], define MDC_CLK=2.
5MHz and caculate mdc_div according to SCLK.
- Revision
- 4071
- Author
- cooloney
- Date
- 2007-12-26 03:01:41 -0600 (Wed, 26 Dec 2007)
Log Message
Fix bug [#3797], define MDC_CLK=2.5MHz and caculate mdc_div according to SCLK.
Diffstat
bfin_mac.c | 16 ++++++++++++----
1 files changed, 12 insertions(+), 4 deletions(-)
Modified Paths
Diff
Modified: trunk/drivers/net/bfin_mac.c (4070 => 4071)
--- trunk/drivers/net/bfin_mac.c 2007-12-26 08:38:28 UTC (rev 4070)
+++ trunk/drivers/net/bfin_mac.c 2007-12-26 09:01:41 UTC (rev 4071)
@@ -417,20 +417,26 @@
spin_unlock_irqrestore(&lp->lock, flags);
}
+/* MDC = 2.5 MHz */
+#define MDC_CLK 2500000
+
static int mii_probe(struct net_device *dev)
{
struct bf537mac_local *lp = netdev_priv(dev);
struct phy_device *phydev = NULL;
unsigned short sysctl;
int i;
+ u32 sclk, mdc_div;
/* Enable PHY output early */
if (!(bfin_read_VR_CTL() & PHYCLKOE))
bfin_write_VR_CTL(bfin_read_VR_CTL() | PHYCLKOE);
- /* MDC = 2.5 MHz */
+ sclk = get_sclk();
+ mdc_div = ((sclk / MDC_CLK) / 2) - 1;
+
sysctl = bfin_read_EMAC_SYSCTL();
- sysctl |= SET_MDCDIV(24);
+ sysctl |= SET_MDCDIV(mdc_div);
bfin_write_EMAC_SYSCTL(sysctl);
/* search for connect PHY device */
@@ -482,8 +488,10 @@
lp->phydev = phydev;
printk(KERN_INFO "%s: attached PHY driver [%s] "
- "(mii_bus:phy_addr=%s, irq=%d)\n",
- DRV_NAME, phydev->drv->name, phydev->dev.bus_id, phydev->irq);
+ "(mii_bus:phy_addr=%s, irq=%d, mdc_clk=%dHz(mdc_div=%d)"
+ "@sclk=%dMHz)\n",
+ DRV_NAME, phydev->drv->name, phydev->dev.bus_id, phydev->irq,
+ MDC_CLK, mdc_div, sclk/1000000);
return 0;
}
_______________________________________________
Linux-kernel-commits mailing list
[email protected]
http://blackfin.uclinux.org/mailman/listinfo/linux-kernel-commits
