8 files changed, 59 insertions, 354 deletions

diff --git a/drivers/of/Kconfig b/drivers/of/Kconfig
index 8e84ce9765a9..dfba3e64d595 100644
--- a/drivers/of/Kconfig
+++ b/drivers/of/Kconfig
@@ -51,12 +51,6 @@ config OF_IRQ
 config OF_DEVICE
         def_bool y
 
-config OF_GPIO
-        def_bool y
-        depends on GPIOLIB && !SPARC
-        help
-          OpenFirmware GPIO accessors
-
 config OF_I2C
         def_tristate I2C
         depends on I2C && !SPARC
@@ -67,12 +61,6 @@ config OF_NET
         depends on NETDEVICES
         def_bool y
 
-config OF_SPI
-        def_tristate SPI
-        depends on SPI && !SPARC
-        help
-          OpenFirmware SPI accessors
-
 config OF_MDIO
         def_tristate PHYLIB
         depends on PHYLIB
diff --git a/drivers/of/Makefile b/drivers/of/Makefile
index aa90e602c8a7..e027f444d10c 100644
--- a/drivers/of/Makefile
+++ b/drivers/of/Makefile
@@ -4,10 +4,8 @@ obj-$(CONFIG_OF_PROMTREE) += pdt.o
 obj-$(CONFIG_OF_ADDRESS)  += address.o
 obj-$(CONFIG_OF_IRQ)    += irq.o
 obj-$(CONFIG_OF_DEVICE) += device.o platform.o
-obj-$(CONFIG_OF_GPIO)   += gpio.o
 obj-$(CONFIG_OF_I2C)    += of_i2c.o
 obj-$(CONFIG_OF_NET)    += of_net.o
-obj-$(CONFIG_OF_SPI)    += of_spi.o
 obj-$(CONFIG_OF_SELFTEST) += selftest.o
 obj-$(CONFIG_OF_MDIO)   += of_mdio.o
 obj-$(CONFIG_OF_PCI)    += of_pci.o
diff --git a/drivers/of/address.c b/drivers/of/address.c
index 66d96f14c274..7e262a6124c5 100644
--- a/drivers/of/address.c
+++ b/drivers/of/address.c
@@ -1,4 +1,5 @@
 
+#include <linux/device.h>
 #include <linux/io.h>
 #include <linux/ioport.h>
 #include <linux/module.h>
diff --git a/drivers/of/base.c b/drivers/of/base.c
index 580644986945..d9bfd49b1935 100644
--- a/drivers/of/base.c
+++ b/drivers/of/base.c
@@ -1260,3 +1260,44 @@ int of_alias_get_id(struct device_node *np, const char *stem)
         return id;
 }
 EXPORT_SYMBOL_GPL(of_alias_get_id);
+
+const __be32 *of_prop_next_u32(struct property *prop, const __be32 *cur,
+                               u32 *pu)
+{
+        const void *curv = cur;
+
+        if (!prop)
+                return NULL;
+
+        if (!cur) {
+                curv = prop->value;
+                goto out_val;
+        }
+
+        curv += sizeof(*cur);
+        if (curv >= prop->value + prop->length)
+                return NULL;
+
+out_val:
+        *pu = be32_to_cpup(curv);
+        return curv;
+}
+EXPORT_SYMBOL_GPL(of_prop_next_u32);
+
+const char *of_prop_next_string(struct property *prop, const char *cur)
+{
+        const void *curv = cur;
+
+        if (!prop)
+                return NULL;
+
+        if (!cur)
+                return prop->value;
+
+        curv += strlen(cur) + 1;
+        if (curv >= prop->value + prop->length)
+                return NULL;
+
+        return curv;
+}
+EXPORT_SYMBOL_GPL(of_prop_next_string);
diff --git a/drivers/of/gpio.c b/drivers/of/gpio.c
deleted file mode 100644
index bf984b6dc477..000000000000
--- a/drivers/of/gpio.c
+++ /dev/null
@@ -1,240 +0,0 @@
-/*
- * OF helpers for the GPIO API
- *
- * Copyright (c) 2007-2008  MontaVista Software, Inc.
- *
- * Author: Anton Vorontsov <avorontsov@ru.mvista.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- */
-
-#include <linux/device.h>
-#include <linux/errno.h>
-#include <linux/module.h>
-#include <linux/io.h>
-#include <linux/of.h>
-#include <linux/of_address.h>
-#include <linux/of_gpio.h>
-#include <linux/slab.h>
-
-/**
- * of_get_named_gpio_flags() - Get a GPIO number and flags to use with GPIO API
- * @np:         device node to get GPIO from
- * @propname:   property name containing gpio specifier(s)
- * @index:      index of the GPIO
- * @flags:      a flags pointer to fill in
- *
- * Returns GPIO number to use with Linux generic GPIO API, or one of the errno
- * value on the error condition. If @flags is not NULL the function also fills
- * in flags for the GPIO.
- */
-int of_get_named_gpio_flags(struct device_node *np, const char *propname,
-                           int index, enum of_gpio_flags *flags)
-{
-        int ret;
-        struct gpio_chip *gc;
-        struct of_phandle_args gpiospec;
-
-        ret = of_parse_phandle_with_args(np, propname, "#gpio-cells", index,
-                                         &gpiospec);
-        if (ret) {
-                pr_debug("%s: can't parse gpios property\n", __func__);
-                goto err0;
-        }
-
-        gc = of_node_to_gpiochip(gpiospec.np);
-        if (!gc) {
-                pr_debug("%s: gpio controller %s isn't registered\n",
-                         np->full_name, gpiospec.np->full_name);
-                ret = -ENODEV;
-                goto err1;
-        }
-
-        if (gpiospec.args_count != gc->of_gpio_n_cells) {
-                pr_debug("%s: wrong #gpio-cells for %s\n",
-                         np->full_name, gpiospec.np->full_name);
-                ret = -EINVAL;
-                goto err1;
-        }
-
-        /* .xlate might decide to not fill in the flags, so clear it. */
-        if (flags)
-                *flags = 0;
-
-        ret = gc->of_xlate(gc, &gpiospec, flags);
-        if (ret < 0)
-                goto err1;
-
-        ret += gc->base;
-err1:
-        of_node_put(gpiospec.np);
-err0:
-        pr_debug("%s exited with status %d\n", __func__, ret);
-        return ret;
-}
-EXPORT_SYMBOL(of_get_named_gpio_flags);
-
-/**
- * of_gpio_named_count - Count GPIOs for a device
- * @np:         device node to count GPIOs for
- * @propname:   property name containing gpio specifier(s)
- *
- * The function returns the count of GPIOs specified for a node.
- *
- * Note that the empty GPIO specifiers counts too. For example,
- *
- * gpios = <0
- *          &pio1 1 2
- *          0
- *          &pio2 3 4>;
- *
- * defines four GPIOs (so this function will return 4), two of which
- * are not specified.
- */
-unsigned int of_gpio_named_count(struct device_node *np, const char* propname)
-{
-        unsigned int cnt = 0;
-
-        do {
-                int ret;
-
-                ret = of_parse_phandle_with_args(np, propname, "#gpio-cells",
-                                                 cnt, NULL);
-                /* A hole in the gpios = <> counts anyway. */
-                if (ret < 0 && ret != -EEXIST)
-                        break;
-        } while (++cnt);
-
-        return cnt;
-}
-EXPORT_SYMBOL(of_gpio_named_count);
-
-/**
- * of_gpio_simple_xlate - translate gpio_spec to the GPIO number and flags
- * @gc:         pointer to the gpio_chip structure
- * @np:         device node of the GPIO chip
- * @gpio_spec:  gpio specifier as found in the device tree
- * @flags:      a flags pointer to fill in
- *
- * This is simple translation function, suitable for the most 1:1 mapped
- * gpio chips. This function performs only one sanity check: whether gpio
- * is less than ngpios (that is specified in the gpio_chip).
- */
-int of_gpio_simple_xlate(struct gpio_chip *gc,
-                         const struct of_phandle_args *gpiospec, u32 *flags)
-{
-        /*
-         * We're discouraging gpio_cells < 2, since that way you'll have to
-         * write your own xlate function (that will have to retrive the GPIO
-         * number and the flags from a single gpio cell -- this is possible,
-         * but not recommended).
-         */
-        if (gc->of_gpio_n_cells < 2) {
-                WARN_ON(1);
-                return -EINVAL;
-        }
-
-        if (WARN_ON(gpiospec->args_count < gc->of_gpio_n_cells))
-                return -EINVAL;
-
-        if (gpiospec->args[0] >= gc->ngpio)
-                return -EINVAL;
-
-        if (flags)
-                *flags = gpiospec->args[1];
-
-        return gpiospec->args[0];
-}
-EXPORT_SYMBOL(of_gpio_simple_xlate);
-
-/**
- * of_mm_gpiochip_add - Add memory mapped GPIO chip (bank)
- * @np:         device node of the GPIO chip
- * @mm_gc:      pointer to the of_mm_gpio_chip allocated structure
- *
- * To use this function you should allocate and fill mm_gc with:
- *
- * 1) In the gpio_chip structure:
- *    - all the callbacks
- *    - of_gpio_n_cells
- *    - of_xlate callback (optional)
- *
- * 3) In the of_mm_gpio_chip structure:
- *    - save_regs callback (optional)
- *
- * If succeeded, this function will map bank's memory and will
- * do all necessary work for you. Then you'll able to use .regs
- * to manage GPIOs from the callbacks.
- */
-int of_mm_gpiochip_add(struct device_node *np,
-                       struct of_mm_gpio_chip *mm_gc)
-{
-        int ret = -ENOMEM;
-        struct gpio_chip *gc = &mm_gc->gc;
-
-        gc->label = kstrdup(np->full_name, GFP_KERNEL);
-        if (!gc->label)
-                goto err0;
-
-        mm_gc->regs = of_iomap(np, 0);
-        if (!mm_gc->regs)
-                goto err1;
-
-        gc->base = -1;
-
-        if (mm_gc->save_regs)
-                mm_gc->save_regs(mm_gc);
-
-        mm_gc->gc.of_node = np;
-
-        ret = gpiochip_add(gc);
-        if (ret)
-                goto err2;
-
-        return 0;
-err2:
-        iounmap(mm_gc->regs);
-err1:
-        kfree(gc->label);
-err0:
-        pr_err("%s: GPIO chip registration failed with status %d\n",
-               np->full_name, ret);
-        return ret;
-}
-EXPORT_SYMBOL(of_mm_gpiochip_add);
-
-void of_gpiochip_add(struct gpio_chip *chip)
-{
-        if ((!chip->of_node) && (chip->dev))
-                chip->of_node = chip->dev->of_node;
-
-        if (!chip->of_node)
-                return;
-
-        if (!chip->of_xlate) {
-                chip->of_gpio_n_cells = 2;
-                chip->of_xlate = of_gpio_simple_xlate;
-        }
-
-        of_node_get(chip->of_node);
-}
-
-void of_gpiochip_remove(struct gpio_chip *chip)
-{
-        if (chip->of_node)
-                of_node_put(chip->of_node);
-}
-
-/* Private function for resolving node pointer to gpio_chip */
-static int of_gpiochip_is_match(struct gpio_chip *chip, const void *data)
-{
-        return chip->of_node == data;
-}
-
-struct gpio_chip *of_node_to_gpiochip(struct device_node *np)
-{
-        return gpiochip_find(np, of_gpiochip_is_match);
-}
diff --git a/drivers/of/of_i2c.c b/drivers/of/of_i2c.c
index f37fbeb66a44..1e173f357674 100644
--- a/drivers/of/of_i2c.c
+++ b/drivers/of/of_i2c.c
@@ -90,8 +90,22 @@ struct i2c_client *of_find_i2c_device_by_node(struct device_node *node)
         if (!dev)
                 return NULL;
 
-        return to_i2c_client(dev);
+        return i2c_verify_client(dev);
 }
 EXPORT_SYMBOL(of_find_i2c_device_by_node);
 
+/* must call put_device() when done with returned i2c_adapter device */
+struct i2c_adapter *of_find_i2c_adapter_by_node(struct device_node *node)
+{
+        struct device *dev;
+
+        dev = bus_find_device(&i2c_bus_type, NULL, node,
+                                         of_dev_node_match);
+        if (!dev)
+                return NULL;
+
+        return i2c_verify_adapter(dev);
+}
+EXPORT_SYMBOL(of_find_i2c_adapter_by_node);
+
 MODULE_LICENSE("GPL");
diff --git a/drivers/of/of_mdio.c b/drivers/of/of_mdio.c
index 483c0adcad87..2574abde8d99 100644
--- a/drivers/of/of_mdio.c
+++ b/drivers/of/of_mdio.c
@@ -45,6 +45,8 @@ int of_mdiobus_register(struct mii_bus *mdio, struct device_node *np)
                 for (i=0; i<PHY_MAX_ADDR; i++)
                         mdio->irq[i] = PHY_POLL;
 
+        mdio->dev.of_node = np;
+
         /* Register the MDIO bus */
         rc = mdiobus_register(mdio);
         if (rc)
diff --git a/drivers/of/of_spi.c b/drivers/of/of_spi.c
deleted file mode 100644
index 6dbc074e4876..000000000000
--- a/drivers/of/of_spi.c
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
- * SPI OF support routines
- * Copyright (C) 2008 Secret Lab Technologies Ltd.
- *
- * Support routines for deriving SPI device attachments from the device
- * tree.
- */
-
-#include <linux/module.h>
-#include <linux/of.h>
-#include <linux/device.h>
-#include <linux/spi/spi.h>
-#include <linux/of_irq.h>
-#include <linux/of_spi.h>
-
-/**
- * of_register_spi_devices - Register child devices onto the SPI bus
- * @master:     Pointer to spi_master device
- *
- * Registers an spi_device for each child node of master node which has a 'reg'
- * property.
- */
-void of_register_spi_devices(struct spi_master *master)
-{
-        struct spi_device *spi;
-        struct device_node *nc;
-        const __be32 *prop;
-        int rc;
-        int len;
-
-        if (!master->dev.of_node)
-                return;
-
-        for_each_child_of_node(master->dev.of_node, nc) {
-                /* Alloc an spi_device */
-                spi = spi_alloc_device(master);
-                if (!spi) {
-                        dev_err(&master->dev, "spi_device alloc error for %s\n",
-                                nc->full_name);
-                        spi_dev_put(spi);
-                        continue;
-                }
-
-                /* Select device driver */
-                if (of_modalias_node(nc, spi->modalias,
-                                     sizeof(spi->modalias)) < 0) {
-                        dev_err(&master->dev, "cannot find modalias for %s\n",
-                                nc->full_name);
-                        spi_dev_put(spi);
-                        continue;
-                }
-
-                /* Device address */
-                prop = of_get_property(nc, "reg", &len);
-                if (!prop || len < sizeof(*prop)) {
-                        dev_err(&master->dev, "%s has no 'reg' property\n",
-                                nc->full_name);
-                        spi_dev_put(spi);
-                        continue;
-                }
-                spi->chip_select = be32_to_cpup(prop);
-
-                /* Mode (clock phase/polarity/etc.) */
-                if (of_find_property(nc, "spi-cpha", NULL))
-                        spi->mode |= SPI_CPHA;
-                if (of_find_property(nc, "spi-cpol", NULL))
-                        spi->mode |= SPI_CPOL;
-                if (of_find_property(nc, "spi-cs-high", NULL))
-                        spi->mode |= SPI_CS_HIGH;
-
-                /* Device speed */
-                prop = of_get_property(nc, "spi-max-frequency", &len);
-                if (!prop || len < sizeof(*prop)) {
-                        dev_err(&master->dev, "%s has no 'spi-max-frequency' property\n",
-                                nc->full_name);
-                        spi_dev_put(spi);
-                        continue;
-                }
-                spi->max_speed_hz = be32_to_cpup(prop);
-
-                /* IRQ */
-                spi->irq = irq_of_parse_and_map(nc, 0);
-
-                /* Store a pointer to the node in the device structure */
-                of_node_get(nc);
-                spi->dev.of_node = nc;
-
-                /* Register the new device */
-                request_module(spi->modalias);
-                rc = spi_add_device(spi);
-                if (rc) {
-                        dev_err(&master->dev, "spi_device register error %s\n",
-                                nc->full_name);
-                        spi_dev_put(spi);
-                }
-
-        }
-}
-EXPORT_SYMBOL(of_register_spi_devices);