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
  ...

4 files changed, 170 insertions, 0 deletions

diff --git a/drivers/of/Kconfig b/drivers/of/Kconfig
index 27f3b81333de..d2fa27c5c1b2 100644
--- a/drivers/of/Kconfig
+++ b/drivers/of/Kconfig
@@ -19,3 +19,9 @@ config OF_SPI
         depends on OF && (PPC_OF || MICROBLAZE) && SPI
         help
           OpenFirmware SPI accessors
+
+config OF_MDIO
+        def_tristate PHYLIB
+        depends on OF && PHYLIB
+        help
+          OpenFirmware MDIO bus (Ethernet PHY) accessors
diff --git a/drivers/of/Makefile b/drivers/of/Makefile
index 4c3c6f8e36f5..bdfb5f5d4b06 100644
--- a/drivers/of/Makefile
+++ b/drivers/of/Makefile
@@ -3,3 +3,4 @@ obj-$(CONFIG_OF_DEVICE) += device.o platform.o
 obj-$(CONFIG_OF_GPIO)   += gpio.o
 obj-$(CONFIG_OF_I2C)    += of_i2c.o
 obj-$(CONFIG_OF_SPI)    += of_spi.o
+obj-$(CONFIG_OF_MDIO)   += of_mdio.o
diff --git a/drivers/of/base.c b/drivers/of/base.c
index 391f91c0bf55..69f85c07d17f 100644
--- a/drivers/of/base.c
+++ b/drivers/of/base.c
@@ -496,6 +496,30 @@ int of_modalias_node(struct device_node *node, char *modalias, int len)
 EXPORT_SYMBOL_GPL(of_modalias_node);
 
 /**
+ * of_parse_phandle - Resolve a phandle property to a device_node pointer
+ * @np: Pointer to device node holding phandle property
+ * @phandle_name: Name of property holding a phandle value
+ * @index: For properties holding a table of phandles, this is the index into
+ *         the table
+ *
+ * Returns the device_node pointer with refcount incremented.  Use
+ * of_node_put() on it when done.
+ */
+struct device_node *
+of_parse_phandle(struct device_node *np, const char *phandle_name, int index)
+{
+        const phandle *phandle;
+        int size;
+
+        phandle = of_get_property(np, phandle_name, &size);
+        if ((!phandle) || (size < sizeof(*phandle) * (index + 1)))
+                return NULL;
+
+        return of_find_node_by_phandle(phandle[index]);
+}
+EXPORT_SYMBOL(of_parse_phandle);
+
+/**
  * of_parse_phandles_with_args - Find a node pointed by phandle in a list
  * @np:         pointer to a device tree node containing a list
  * @list_name:  property name that contains a list
diff --git a/drivers/of/of_mdio.c b/drivers/of/of_mdio.c
new file mode 100644
index 000000000000..aee967d7f760
--- /dev/null
+++ b/drivers/of/of_mdio.c
@@ -0,0 +1,139 @@
+/*
+ * OF helpers for the MDIO (Ethernet PHY) API
+ *
+ * Copyright (c) 2009 Secret Lab Technologies, Ltd.
+ *
+ * This file is released under the GPLv2
+ *
+ * This file provides helper functions for extracting PHY device information
+ * out of the OpenFirmware device tree and using it to populate an mii_bus.
+ */
+
+#include <linux/phy.h>
+#include <linux/of.h>
+#include <linux/of_mdio.h>
+#include <linux/module.h>
+
+MODULE_AUTHOR("Grant Likely <grant.likely@secretlab.ca>");
+MODULE_LICENSE("GPL");
+
+/**
+ * of_mdiobus_register - Register mii_bus and create PHYs from the device tree
+ * @mdio: pointer to mii_bus structure
+ * @np: pointer to device_node of MDIO bus.
+ *
+ * This function registers the mii_bus structure and registers a phy_device
+ * for each child node of @np.
+ */
+int of_mdiobus_register(struct mii_bus *mdio, struct device_node *np)
+{
+        struct phy_device *phy;
+        struct device_node *child;
+        int rc, i;
+
+        /* Mask out all PHYs from auto probing.  Instead the PHYs listed in
+         * the device tree are populated after the bus has been registered */
+        mdio->phy_mask = ~0;
+
+        /* Clear all the IRQ properties */
+        if (mdio->irq)
+                for (i=0; i<PHY_MAX_ADDR; i++)
+                        mdio->irq[i] = PHY_POLL;
+
+        /* Register the MDIO bus */
+        rc = mdiobus_register(mdio);
+        if (rc)
+                return rc;
+
+        /* Loop over the child nodes and register a phy_device for each one */
+        for_each_child_of_node(np, child) {
+                const u32 *addr;
+                int len;
+
+                /* A PHY must have a reg property in the range [0-31] */
+                addr = of_get_property(child, "reg", &len);
+                if (!addr || len < sizeof(*addr) || *addr >= 32 || *addr < 0) {
+                        dev_err(&mdio->dev, "%s has invalid PHY address\n",
+                                child->full_name);
+                        continue;
+                }
+
+                if (mdio->irq) {
+                        mdio->irq[*addr] = irq_of_parse_and_map(child, 0);
+                        if (!mdio->irq[*addr])
+                                mdio->irq[*addr] = PHY_POLL;
+                }
+
+                phy = get_phy_device(mdio, *addr);
+                if (!phy) {
+                        dev_err(&mdio->dev, "error probing PHY at address %i\n",
+                                *addr);
+                        continue;
+                }
+                phy_scan_fixups(phy);
+
+                /* Associate the OF node with the device structure so it
+                 * can be looked up later */
+                of_node_get(child);
+                dev_archdata_set_node(&phy->dev.archdata, child);
+
+                /* All data is now stored in the phy struct; register it */
+                rc = phy_device_register(phy);
+                if (rc) {
+                        phy_device_free(phy);
+                        of_node_put(child);
+                        continue;
+                }
+
+                dev_dbg(&mdio->dev, "registered phy %s at address %i\n",
+                        child->name, *addr);
+        }
+
+        return 0;
+}
+EXPORT_SYMBOL(of_mdiobus_register);
+
+/**
+ * of_phy_find_device - Give a PHY node, find the phy_device
+ * @phy_np: Pointer to the phy's device tree node
+ *
+ * Returns a pointer to the phy_device.
+ */
+struct phy_device *of_phy_find_device(struct device_node *phy_np)
+{
+        struct device *d;
+        int match(struct device *dev, void *phy_np)
+        {
+                return dev_archdata_get_node(&dev->archdata) == phy_np;
+        }
+
+        if (!phy_np)
+                return NULL;
+
+        d = bus_find_device(&mdio_bus_type, NULL, phy_np, match);
+        return d ? to_phy_device(d) : NULL;
+}
+EXPORT_SYMBOL(of_phy_find_device);
+
+/**
+ * of_phy_connect - Connect to the phy described in the device tree
+ * @dev: pointer to net_device claiming the phy
+ * @phy_np: Pointer to device tree node for the PHY
+ * @hndlr: Link state callback for the network device
+ * @iface: PHY data interface type
+ *
+ * Returns a pointer to the phy_device if successfull.  NULL otherwise
+ */
+struct phy_device *of_phy_connect(struct net_device *dev,
+                                  struct device_node *phy_np,
+                                  void (*hndlr)(struct net_device *), u32 flags,
+                                  phy_interface_t iface)
+{
+        struct phy_device *phy = of_phy_find_device(phy_np);
+
+        if (!phy)
+                return NULL;
+
+        return phy_connect_direct(dev, phy, hndlr, flags, iface) ? NULL : phy;
+}
+EXPORT_SYMBOL(of_phy_connect);