aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2009-06-17 02:30:22 -0400
committerGrant Likely <grant.likely@secretlab.ca>2009-06-17 02:30:22 -0400
commit87c441e54dfcf9f45593ecaf68e7e18ea53d5e13 (patch)
tree6a986caab77412a90ffe8c5d8788bc1216b10ed8 /drivers/net
parentc155ee10c212254e9cdfe7b3eab4e8c13990c231 (diff)
powerpc/5xxx: Add common mpc5xxx_get_bus_frequency() function
So far, MPC512x used mpc512x_find_ips_freq() to get the bus frequency, while MPC52xx used mpc52xx_find_ipb_freq(). Despite the different clock names (IPS vs. IPB) the code was identical. Use common code for both processor families. Signed-off-by: Wolfgang Denk <wd@denx.de> Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/fec_mpc52xx.c2
-rw-r--r--drivers/net/fec_mpc52xx_phy.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/fec_mpc52xx.c b/drivers/net/fec_mpc52xx.c
index 8bbe7f617994..5ddf03325d16 100644
--- a/drivers/net/fec_mpc52xx.c
+++ b/drivers/net/fec_mpc52xx.c
@@ -1006,7 +1006,7 @@ mpc52xx_fec_probe(struct of_device *op, const struct of_device_id *match)
1006 priv->phy_addr = FEC5200_PHYADDR_NONE; 1006 priv->phy_addr = FEC5200_PHYADDR_NONE;
1007 priv->speed = 100; 1007 priv->speed = 100;
1008 priv->duplex = DUPLEX_HALF; 1008 priv->duplex = DUPLEX_HALF;
1009 priv->phy_speed = ((mpc52xx_find_ipb_freq(op->node) >> 20) / 5) << 1; 1009 priv->phy_speed = ((mpc5xxx_get_bus_frequency(op->node) >> 20) / 5) << 1;
1010 1010
1011 /* the 7-wire property means don't use MII mode */ 1011 /* the 7-wire property means don't use MII mode */
1012 if (of_find_property(op->node, "fsl,7-wire-mode", NULL)) 1012 if (of_find_property(op->node, "fsl,7-wire-mode", NULL))
diff --git a/drivers/net/fec_mpc52xx_phy.c b/drivers/net/fec_mpc52xx_phy.c
index dd9bfa42ac34..176e9b8d7101 100644
--- a/drivers/net/fec_mpc52xx_phy.c
+++ b/drivers/net/fec_mpc52xx_phy.c
@@ -120,7 +120,7 @@ static int mpc52xx_fec_mdio_probe(struct of_device *of,
120 120
121 /* set MII speed */ 121 /* set MII speed */
122 out_be32(&priv->regs->mii_speed, 122 out_be32(&priv->regs->mii_speed,
123 ((mpc52xx_find_ipb_freq(of->node) >> 20) / 5) << 1); 123 ((mpc5xxx_get_bus_frequency(of->node) >> 20) / 5) << 1);
124 124
125 err = mdiobus_register(bus); 125 err = mdiobus_register(bus);
126 if (err) 126 if (err)