3 files changed, 72 insertions, 53 deletions

diff --git a/drivers/of/device.c b/drivers/of/device.c
index 29681c4b700b..8a1d93a2bb81 100644
--- a/drivers/of/device.c
+++ b/drivers/of/device.c
@@ -48,16 +48,32 @@ void of_dev_put(struct of_device *dev)
 }
 EXPORT_SYMBOL(of_dev_put);
 
-static ssize_t dev_show_devspec(struct device *dev,
+static ssize_t devspec_show(struct device *dev,
                                 struct device_attribute *attr, char *buf)
 {
         struct of_device *ofdev;
 
         ofdev = to_of_device(dev);
-        return sprintf(buf, "%s", ofdev->node->full_name);
+        return sprintf(buf, "%s\n", ofdev->node->full_name);
 }
 
-static DEVICE_ATTR(devspec, S_IRUGO, dev_show_devspec, NULL);
+static ssize_t modalias_show(struct device *dev,
+                                struct device_attribute *attr, char *buf)
+{
+        struct of_device *ofdev = to_of_device(dev);
+        ssize_t len = 0;
+
+        len = of_device_get_modalias(ofdev, buf, PAGE_SIZE - 2);
+        buf[len] = '\n';
+        buf[len+1] = 0;
+        return len+1;
+}
+
+struct device_attribute of_platform_device_attrs[] = {
+        __ATTR_RO(devspec),
+        __ATTR_RO(modalias),
+        __ATTR_NULL
+};
 
 /**
  * of_release_dev - free an of device structure when all users of it are finished.
@@ -78,25 +94,61 @@ EXPORT_SYMBOL(of_release_dev);
 
 int of_device_register(struct of_device *ofdev)
 {
-        int rc;
-
         BUG_ON(ofdev->node == NULL);
-
-        rc = device_register(&ofdev->dev);
-        if (rc)
-                return rc;
-
-        rc = device_create_file(&ofdev->dev, &dev_attr_devspec);
-        if (rc)
-                device_unregister(&ofdev->dev);
-
-        return rc;
+        return device_register(&ofdev->dev);
 }
 EXPORT_SYMBOL(of_device_register);
 
 void of_device_unregister(struct of_device *ofdev)
 {
-        device_remove_file(&ofdev->dev, &dev_attr_devspec);
         device_unregister(&ofdev->dev);
 }
 EXPORT_SYMBOL(of_device_unregister);
+
+ssize_t of_device_get_modalias(struct of_device *ofdev,
+                                char *str, ssize_t len)
+{
+        const char *compat;
+        int cplen, i;
+        ssize_t tsize, csize, repend;
+
+        /* Name & Type */
+        csize = snprintf(str, len, "of:N%sT%s",
+                                ofdev->node->name, ofdev->node->type);
+
+        /* Get compatible property if any */
+        compat = of_get_property(ofdev->node, "compatible", &cplen);
+        if (!compat)
+                return csize;
+
+        /* Find true end (we tolerate multiple \0 at the end */
+        for (i = (cplen - 1); i >= 0 && !compat[i]; i--)
+                cplen--;
+        if (!cplen)
+                return csize;
+        cplen++;
+
+        /* Check space (need cplen+1 chars including final \0) */
+        tsize = csize + cplen;
+        repend = tsize;
+
+        if (csize >= len)               /* @ the limit, all is already filled */
+                return tsize;
+
+        if (tsize >= len) {             /* limit compat list */
+                cplen = len - csize - 1;
+                repend = len;
+        }
+
+        /* Copy and do char replacement */
+        memcpy(&str[csize + 1], compat, cplen);
+        for (i = csize; i < repend; i++) {
+                char c = str[i];
+                if (c == '\0')
+                        str[i] = 'C';
+                else if (c == ' ')
+                        str[i] = '_';
+        }
+
+        return tsize;
+}
diff --git a/drivers/of/gpio.c b/drivers/of/gpio.c
index 000681e98f2c..1c9cab844f10 100644
--- a/drivers/of/gpio.c
+++ b/drivers/of/gpio.c
@@ -137,38 +137,6 @@ int of_gpio_simple_xlate(struct of_gpio_chip *of_gc, struct device_node *np,
 }
 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
@@ -205,11 +173,7 @@ int of_mm_gpiochip_add(struct device_node *np,
         if (!mm_gc->regs)
                 goto err1;
 
-        gc->base = of_get_gpiochip_base(np);
-        if (gc->base < 0) {
-                ret = gc->base;
-                goto err1;
-        }
+        gc->base = -1;
 
         if (!of_gc->xlate)
                 of_gc->xlate = of_gpio_simple_xlate;
diff --git a/drivers/of/platform.c b/drivers/of/platform.c
index ca09a63a64db..298de0f95d70 100644
--- a/drivers/of/platform.c
+++ b/drivers/of/platform.c
@@ -17,6 +17,8 @@
 #include <linux/of_device.h>
 #include <linux/of_platform.h>
 
+extern struct device_attribute of_platform_device_attrs[];
+
 static int of_platform_bus_match(struct device *dev, struct device_driver *drv)
 {
         struct of_device *of_dev = to_of_device(dev);
@@ -103,6 +105,7 @@ int of_bus_type_init(struct bus_type *bus, const char *name)
         bus->suspend = of_platform_device_suspend;
         bus->resume = of_platform_device_resume;
         bus->shutdown = of_platform_device_shutdown;
+        bus->dev_attrs = of_platform_device_attrs;
         return bus_register(bus);
 }