Merge commit 'gcl/merge' into next

Manual merge of:
	drivers/net/fec_mpc52xx.c

diff --cc drivers/net/fec_mpc52xx.c
index 7d443405bbe271e6ea47220775e5d42d4955414c,5ddf03325d1634f8ba91176c20c0d96f649f6ff5..cc786333d95c87cd84d34a1b189c43f9b60367c1
--- 1/drivers/net/fec_mpc52xx.c
--- 2/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 fec9f245116b7824c2099ccdecf6d4e2b1597b23,176e9b8d7101fc6bbf6869a8cbb25a1a2be58c06..31e6d62b785d81beb13ea7b4f76792975a385127
--- 1/drivers/net/fec_mpc52xx_phy.c
--- 2/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;