From: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Date: Thu, 18 Jun 2009 01:22:08 +0000 (+1000)
Subject: Merge commit 'gcl/merge' into next
X-Git-Tag: v2.6.31-rc1~110^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b71a107c66ad952c9d35ec046a803efc89a80556;p=profile%2Fivi%2Fkernel-adaptation-intel-automotive.git

Merge commit 'gcl/merge' into next

Manual merge of:
	drivers/net/fec_mpc52xx.c
---

b71a107c66ad952c9d35ec046a803efc89a80556
diff --cc drivers/net/fec_mpc52xx.c
index 7d44340,5ddf033..cc78633
--- a/drivers/net/fec_mpc52xx.c
+++ b/drivers/net/fec_mpc52xx.c
@@@ -946,9 -1003,14 +946,9 @@@ mpc52xx_fec_probe(struct of_device *op
  	 */
  
  	/* Start with safe defaults for link connection */
 -	priv->phy_addr = FEC5200_PHYADDR_NONE;
  	priv->speed = 100;
  	priv->duplex = DUPLEX_HALF;
- 	priv->mdio_speed = ((mpc52xx_find_ipb_freq(op->node) >> 20) / 5) << 1;
 -	priv->phy_speed = ((mpc5xxx_get_bus_frequency(op->node) >> 20) / 5) << 1;
 -
 -	/* the 7-wire property means don't use MII mode */
 -	if (of_find_property(op->node, "fsl,7-wire-mode", NULL))
 -		priv->phy_addr = FEC5200_PHYADDR_7WIRE;
++	priv->mdio_speed = ((mpc5xxx_get_bus_frequency(op->node) >> 20) / 5) << 1;
  
  	/* The current speed preconfigures the speed of the MII link */
  	prop = of_get_property(op->node, "current-speed", &prop_size);
diff --cc drivers/net/fec_mpc52xx_phy.c
index fec9f245,176e9b8..31e6d62
--- a/drivers/net/fec_mpc52xx_phy.c
+++ b/drivers/net/fec_mpc52xx_phy.c
@@@ -106,9 -120,9 +106,9 @@@ static int mpc52xx_fec_mdio_probe(struc
  
  	/* set MII speed */
  	out_be32(&priv->regs->mii_speed,
- 		((mpc52xx_find_ipb_freq(of->node) >> 20) / 5) << 1);
+ 		((mpc5xxx_get_bus_frequency(of->node) >> 20) / 5) << 1);
  
 -	err = mdiobus_register(bus);
 +	err = of_mdiobus_register(bus, np);
  	if (err)
  		goto out_unmap;