Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6: (1244 commits)
  pkt_sched: Rename PSCHED_US2NS and PSCHED_NS2US
  ipv4: Fix fib_trie rebalancing
  Bluetooth: Fix issue with uninitialized nsh.type in DTL-1 driver
  Bluetooth: Fix Kconfig issue with RFKILL integration
  PIM-SM: namespace changes
  ipv4: update ARPD help text
  net: use a deferred timer in rt_check_expire
  ieee802154: fix kconfig bool/tristate muckup
  bonding: initialization rework
  bonding: use is_zero_ether_addr
  bonding: network device names are case sensative
  bonding: elminate bad refcount code
  bonding: fix style issues
  bonding: fix destructor
  bonding: remove bonding read/write semaphore
  bonding: initialize before registration
  bonding: bond_create always called with default parameters
  x_tables: Convert printk to pr_err
  netfilter: conntrack: optional reliable conntrack event delivery
  list_nulls: add hlist_nulls_add_head and hlist_nulls_del
  ...

3 files changed, 10 insertions, 33 deletions

diff --git a/arch/powerpc/include/asm/qe.h b/arch/powerpc/include/asm/qe.h
index e0faf332c9c9..157c5ca581c8 100644
--- a/arch/powerpc/include/asm/qe.h
+++ b/arch/powerpc/include/asm/qe.h
@@ -675,6 +675,8 @@ struct ucc_slow_pram {
 #define UCC_GETH_UPSMR_RMM      0x00001000
 #define UCC_GETH_UPSMR_CAM      0x00000400
 #define UCC_GETH_UPSMR_BRO      0x00000200
+#define UCC_GETH_UPSMR_SMM      0x00000080
+#define UCC_GETH_UPSMR_SGMM     0x00000020
 
 /* UCC Transmit On Demand Register (UTODR) */
 #define UCC_SLOW_TOD    0x8000
diff --git a/arch/powerpc/platforms/82xx/ep8248e.c b/arch/powerpc/platforms/82xx/ep8248e.c
index 0eb6d7f62241..51fcae41f08a 100644
--- a/arch/powerpc/platforms/82xx/ep8248e.c
+++ b/arch/powerpc/platforms/82xx/ep8248e.c
@@ -14,6 +14,7 @@
 #include <linux/interrupt.h>
 #include <linux/fsl_devices.h>
 #include <linux/mdio-bitbang.h>
+#include <linux/of_mdio.h>
 #include <linux/of_platform.h>
 
 #include <asm/io.h>
@@ -115,7 +116,7 @@ static int __devinit ep8248e_mdio_probe(struct of_device *ofdev,
         struct mii_bus *bus;
         struct resource res;
         struct device_node *node;
-        int ret, i;
+        int ret;
 
         node = of_get_parent(ofdev->node);
         of_node_put(node);
@@ -130,17 +131,13 @@ static int __devinit ep8248e_mdio_probe(struct of_device *ofdev,
         if (!bus)
                 return -ENOMEM;
 
-        bus->phy_mask = 0;
         bus->irq = kmalloc(sizeof(int) * PHY_MAX_ADDR, GFP_KERNEL);
 
-        for (i = 0; i < PHY_MAX_ADDR; i++)
-                bus->irq[i] = -1;
-
         bus->name = "ep8248e-mdio-bitbang";
         bus->parent = &ofdev->dev;
         snprintf(bus->id, MII_BUS_ID_SIZE, "%x", res.start);
 
-        return mdiobus_register(bus);
+        return of_mdiobus_register(bus, ofdev->node);
 }
 
 static int ep8248e_mdio_remove(struct of_device *ofdev)
diff --git a/arch/powerpc/platforms/pasemi/gpio_mdio.c b/arch/powerpc/platforms/pasemi/gpio_mdio.c
index 75cc165d5bee..3bf546797cbb 100644
--- a/arch/powerpc/platforms/pasemi/gpio_mdio.c
+++ b/arch/powerpc/platforms/pasemi/gpio_mdio.c
@@ -29,7 +29,7 @@
 #include <linux/ioport.h>
 #include <linux/interrupt.h>
 #include <linux/phy.h>
-#include <linux/platform_device.h>
+#include <linux/of_mdio.h>
 #include <linux/of_platform.h>
 
 #define DELAY 1
@@ -39,6 +39,7 @@ static void __iomem *gpio_regs;
 struct gpio_priv {
         int mdc_pin;
         int mdio_pin;
+        int mdio_irqs[PHY_MAX_ADDR];
 };
 
 #define MDC_PIN(bus)    (((struct gpio_priv *)bus->priv)->mdc_pin)
@@ -218,12 +219,11 @@ static int __devinit gpio_mdio_probe(struct of_device *ofdev,
                                      const struct of_device_id *match)
 {
         struct device *dev = &ofdev->dev;
-        struct device_node *phy_dn, *np = ofdev->node;
+        struct device_node *np = ofdev->node;
         struct mii_bus *new_bus;
         struct gpio_priv *priv;
         const unsigned int *prop;
         int err;
-        int i;
 
         err = -ENOMEM;
         priv = kzalloc(sizeof(struct gpio_priv), GFP_KERNEL);
@@ -244,27 +244,7 @@ static int __devinit gpio_mdio_probe(struct of_device *ofdev,
         snprintf(new_bus->id, MII_BUS_ID_SIZE, "%x", *prop);
         new_bus->priv = priv;
 
-        new_bus->phy_mask = 0;
-
-        new_bus->irq = kmalloc(sizeof(int)*PHY_MAX_ADDR, GFP_KERNEL);
-
-        if (!new_bus->irq)
-                goto out_free_bus;
-
-        for (i = 0; i < PHY_MAX_ADDR; i++)
-                new_bus->irq[i] = NO_IRQ;
-
-        for (phy_dn = of_get_next_child(np, NULL);
-             phy_dn != NULL;
-             phy_dn = of_get_next_child(np, phy_dn)) {
-                const unsigned int *ip, *regp;
-
-                ip = of_get_property(phy_dn, "interrupts", NULL);
-                regp = of_get_property(phy_dn, "reg", NULL);
-                if (!ip || !regp || *regp >= PHY_MAX_ADDR)
-                        continue;
-                new_bus->irq[*regp] = irq_create_mapping(NULL, *ip);
-        }
+        new_bus->irq = priv->mdio_irqs;
 
         prop = of_get_property(np, "mdc-pin", NULL);
         priv->mdc_pin = *prop;
@@ -275,7 +255,7 @@ static int __devinit gpio_mdio_probe(struct of_device *ofdev,
         new_bus->parent = dev;
         dev_set_drvdata(dev, new_bus);
 
-        err = mdiobus_register(new_bus);
+        err = of_mdiobus_register(new_bus, np);
 
         if (err != 0) {
                 printk(KERN_ERR "%s: Cannot register as MDIO bus, err %d\n",
@@ -286,8 +266,6 @@ static int __devinit gpio_mdio_probe(struct of_device *ofdev,
         return 0;
 
 out_free_irq:
-        kfree(new_bus->irq);
-out_free_bus:
         kfree(new_bus);
 out_free_priv:
         kfree(priv);