5 files changed, 397 insertions, 0 deletions

diff --git a/drivers/of/Kconfig b/drivers/of/Kconfig
index c03072b12f42..3a7a11a75fb4 100644
--- a/drivers/of/Kconfig
+++ b/drivers/of/Kconfig
@@ -1,3 +1,15 @@
 config OF_DEVICE
         def_bool y
         depends on OF && (SPARC || PPC_OF)
+
+config OF_GPIO
+        def_bool y
+        depends on OF && PPC_OF && HAVE_GPIO_LIB
+        help
+          OpenFirmware GPIO accessors
+
+config OF_I2C
+        def_tristate I2C
+        depends on PPC_OF && I2C
+        help
+          OpenFirmware I2C accessors
diff --git a/drivers/of/Makefile b/drivers/of/Makefile
index ab9be5d5255b..548772e871fd 100644
--- a/drivers/of/Makefile
+++ b/drivers/of/Makefile
@@ -1,2 +1,4 @@
 obj-y = base.o
 obj-$(CONFIG_OF_DEVICE) += device.o platform.o
+obj-$(CONFIG_OF_GPIO)   += gpio.o
+obj-$(CONFIG_OF_I2C)    += of_i2c.o
diff --git a/drivers/of/base.c b/drivers/of/base.c
index 80c9deca5f35..9bd7c4a31253 100644
--- a/drivers/of/base.c
+++ b/drivers/of/base.c
@@ -117,6 +117,32 @@ int of_device_is_compatible(const struct device_node *device,
 EXPORT_SYMBOL(of_device_is_compatible);
 
 /**
+ *  of_device_is_available - check if a device is available for use
+ *
+ *  @device: Node to check for availability
+ *
+ *  Returns 1 if the status property is absent or set to "okay" or "ok",
+ *  0 otherwise
+ */
+int of_device_is_available(const struct device_node *device)
+{
+        const char *status;
+        int statlen;
+
+        status = of_get_property(device, "status", &statlen);
+        if (status == NULL)
+                return 1;
+
+        if (statlen > 0) {
+                if (!strcmp(status, "okay") || !strcmp(status, "ok"))
+                        return 1;
+        }
+
+        return 0;
+}
+EXPORT_SYMBOL(of_device_is_available);
+
+/**
  *      of_get_parent - Get a node's parent if any
  *      @node:  Node to get parent
  *
diff --git a/drivers/of/gpio.c b/drivers/of/gpio.c
new file mode 100644
index 000000000000..000681e98f2c
--- /dev/null
+++ b/drivers/of/gpio.c
@@ -0,0 +1,242 @@
+/*
+ * 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/kernel.h>
+#include <linux/errno.h>
+#include <linux/io.h>
+#include <linux/of.h>
+#include <linux/of_gpio.h>
+#include <asm/prom.h>
+
+/**
+ * of_get_gpio - Get a GPIO number from the device tree to use with GPIO API
+ * @np:         device node to get GPIO from
+ * @index:      index of the GPIO
+ *
+ * Returns GPIO number to use with Linux generic GPIO API, or one of the errno
+ * value on the error condition.
+ */
+int of_get_gpio(struct device_node *np, int index)
+{
+        int ret = -EINVAL;
+        struct device_node *gc;
+        struct of_gpio_chip *of_gc = NULL;
+        int size;
+        const u32 *gpios;
+        u32 nr_cells;
+        int i;
+        const void *gpio_spec;
+        const u32 *gpio_cells;
+        int gpio_index = 0;
+
+        gpios = of_get_property(np, "gpios", &size);
+        if (!gpios) {
+                ret = -ENOENT;
+                goto err0;
+        }
+        nr_cells = size / sizeof(u32);
+
+        for (i = 0; i < nr_cells; gpio_index++) {
+                const phandle *gpio_phandle;
+
+                gpio_phandle = gpios + i;
+                gpio_spec = gpio_phandle + 1;
+
+                /* one cell hole in the gpios = <>; */
+                if (!*gpio_phandle) {
+                        if (gpio_index == index)
+                                return -ENOENT;
+                        i++;
+                        continue;
+                }
+
+                gc = of_find_node_by_phandle(*gpio_phandle);
+                if (!gc) {
+                        pr_debug("%s: could not find phandle for gpios\n",
+                                 np->full_name);
+                        goto err0;
+                }
+
+                of_gc = gc->data;
+                if (!of_gc) {
+                        pr_debug("%s: gpio controller %s isn't registered\n",
+                                 np->full_name, gc->full_name);
+                        goto err1;
+                }
+
+                gpio_cells = of_get_property(gc, "#gpio-cells", &size);
+                if (!gpio_cells || size != sizeof(*gpio_cells) ||
+                                *gpio_cells != of_gc->gpio_cells) {
+                        pr_debug("%s: wrong #gpio-cells for %s\n",
+                                 np->full_name, gc->full_name);
+                        goto err1;
+                }
+
+                /* Next phandle is at phandle cells + #gpio-cells */
+                i += sizeof(*gpio_phandle) / sizeof(u32) + *gpio_cells;
+                if (i >= nr_cells + 1) {
+                        pr_debug("%s: insufficient gpio-spec length\n",
+                                 np->full_name);
+                        goto err1;
+                }
+
+                if (gpio_index == index)
+                        break;
+
+                of_gc = NULL;
+                of_node_put(gc);
+        }
+
+        if (!of_gc) {
+                ret = -ENOENT;
+                goto err0;
+        }
+
+        ret = of_gc->xlate(of_gc, np, gpio_spec);
+        if (ret < 0)
+                goto err1;
+
+        ret += of_gc->gc.base;
+err1:
+        of_node_put(gc);
+err0:
+        pr_debug("%s exited with status %d\n", __func__, ret);
+        return ret;
+}
+EXPORT_SYMBOL(of_get_gpio);
+
+/**
+ * of_gpio_simple_xlate - translate gpio_spec to the GPIO number
+ * @of_gc:      pointer to the of_gpio_chip structure
+ * @np:         device node of the GPIO chip
+ * @gpio_spec:  gpio specifier as found in the device tree
+ *
+ * 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 of_gpio_chip *of_gc, struct device_node *np,
+                         const void *gpio_spec)
+{
+        const u32 *gpio = gpio_spec;
+
+        if (*gpio > of_gc->gc.ngpio)
+                return -EINVAL;
+
+        return *gpio;
+}
+EXPORT_SYMBOL(of_gpio_simple_xlate);
+
+/* Should be sufficient for now, later we'll use dynamic bases. */
+#if defined(CONFIG_PPC32) || defined(CONFIG_SPARC32)
+#define GPIOS_PER_CHIP 32
+#else
+#define GPIOS_PER_CHIP 64
+#endif
+
+static int of_get_gpiochip_base(struct device_node *np)
+{
+        struct device_node *gc = NULL;
+        int gpiochip_base = 0;
+
+        while ((gc = of_find_all_nodes(gc))) {
+                if (!of_get_property(gc, "gpio-controller", NULL))
+                        continue;
+
+                if (gc != np) {
+                        gpiochip_base += GPIOS_PER_CHIP;
+                        continue;
+                }
+
+                of_node_put(gc);
+
+                if (gpiochip_base >= ARCH_NR_GPIOS)
+                        return -ENOSPC;
+
+                return gpiochip_base;
+        }
+
+        return -ENOENT;
+}
+
+/**
+ * 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
+ *
+ * 2) In the of_gpio_chip structure:
+ *    - gpio_cells
+ *    - 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 of_gpio_chip *of_gc = &mm_gc->of_gc;
+        struct gpio_chip *gc = &of_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 = of_get_gpiochip_base(np);
+        if (gc->base < 0) {
+                ret = gc->base;
+                goto err1;
+        }
+
+        if (!of_gc->xlate)
+                of_gc->xlate = of_gpio_simple_xlate;
+
+        if (mm_gc->save_regs)
+                mm_gc->save_regs(mm_gc);
+
+        np->data = of_gc;
+
+        ret = gpiochip_add(gc);
+        if (ret)
+                goto err2;
+
+        /* We don't want to lose the node and its ->data */
+        of_node_get(np);
+
+        pr_debug("%s: registered as generic GPIO chip, base is %d\n",
+                 np->full_name, gc->base);
+        return 0;
+err2:
+        np->data = NULL;
+        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);
diff --git a/drivers/of/of_i2c.c b/drivers/of/of_i2c.c
new file mode 100644
index 000000000000..631689171159
--- /dev/null
+++ b/drivers/of/of_i2c.c
@@ -0,0 +1,115 @@
+/*
+ * OF helpers for the I2C API
+ *
+ * Copyright (c) 2008 Jochen Friedrich <jochen@scram.de>
+ *
+ * Based on a previous patch from Jon Smirl <jonsmirl@gmail.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/i2c.h>
+#include <linux/of.h>
+
+struct i2c_driver_device {
+        char    *of_device;
+        char    *i2c_type;
+};
+
+static struct i2c_driver_device i2c_devices[] = {
+        { "dallas,ds1374", "rtc-ds1374" },
+};
+
+static int of_find_i2c_driver(struct device_node *node,
+                              struct i2c_board_info *info)
+{
+        int i, cplen;
+        const char *compatible;
+        const char *p;
+
+        /* 1. search for exception list entry */
+        for (i = 0; i < ARRAY_SIZE(i2c_devices); i++) {
+                if (!of_device_is_compatible(node, i2c_devices[i].of_device))
+                        continue;
+                if (strlcpy(info->type, i2c_devices[i].i2c_type,
+                            I2C_NAME_SIZE) >= I2C_NAME_SIZE)
+                        return -ENOMEM;
+
+                return 0;
+        }
+
+        compatible = of_get_property(node, "compatible", &cplen);
+        if (!compatible)
+                return -ENODEV;
+
+        /* 2. search for linux,<i2c-type> entry */
+        p = compatible;
+        while (cplen > 0) {
+                if (!strncmp(p, "linux,", 6)) {
+                        p += 6;
+                        if (strlcpy(info->type, p,
+                                    I2C_NAME_SIZE) >= I2C_NAME_SIZE)
+                                return -ENOMEM;
+                        return 0;
+                }
+
+                i = strlen(p) + 1;
+                p += i;
+                cplen -= i;
+        }
+
+        /* 3. take fist compatible entry and strip manufacturer */
+        p = strchr(compatible, ',');
+        if (!p)
+                return -ENODEV;
+        p++;
+        if (strlcpy(info->type, p, I2C_NAME_SIZE) >= I2C_NAME_SIZE)
+                return -ENOMEM;
+        return 0;
+}
+
+void of_register_i2c_devices(struct i2c_adapter *adap,
+                             struct device_node *adap_node)
+{
+        void *result;
+        struct device_node *node;
+
+        for_each_child_of_node(adap_node, node) {
+                struct i2c_board_info info = {};
+                const u32 *addr;
+                int len;
+
+                addr = of_get_property(node, "reg", &len);
+                if (!addr || len < sizeof(int) || *addr > (1 << 10) - 1) {
+                        printk(KERN_ERR
+                               "of-i2c: invalid i2c device entry\n");
+                        continue;
+                }
+
+                info.irq = irq_of_parse_and_map(node, 0);
+                if (info.irq == NO_IRQ)
+                        info.irq = -1;
+
+                if (of_find_i2c_driver(node, &info) < 0) {
+                        irq_dispose_mapping(info.irq);
+                        continue;
+                }
+
+                info.addr = *addr;
+
+                request_module(info.type);
+
+                result = i2c_new_device(adap, &info);
+                if (result == NULL) {
+                        printk(KERN_ERR
+                               "of-i2c: Failed to load driver for %s\n",
+                               info.type);
+                        irq_dispose_mapping(info.irq);
+                        continue;
+                }
+        }
+}
+EXPORT_SYMBOL(of_register_i2c_devices);