4 files changed, 63 insertions, 22 deletions

diff --git a/drivers/of/base.c b/drivers/of/base.c
index 16ee7a08e044..8b9fa83dc77b 100644
--- a/drivers/of/base.c
+++ b/drivers/of/base.c
@@ -24,33 +24,16 @@
 #include <linux/slab.h>
 #include <linux/proc_fs.h>
 
-/**
- * struct alias_prop - Alias property in 'aliases' node
- * @link:       List node to link the structure in aliases_lookup list
- * @alias:      Alias property name
- * @np:         Pointer to device_node that the alias stands for
- * @id:         Index value from end of alias name
- * @stem:       Alias string without the index
- *
- * The structure represents one alias property of 'aliases' node as
- * an entry in aliases_lookup list.
- */
-struct alias_prop {
-        struct list_head link;
-        const char *alias;
-        struct device_node *np;
-        int id;
-        char stem[0];
-};
+#include "of_private.h"
 
-static LIST_HEAD(aliases_lookup);
+LIST_HEAD(aliases_lookup);
 
 struct device_node *of_allnodes;
 EXPORT_SYMBOL(of_allnodes);
 struct device_node *of_chosen;
 struct device_node *of_aliases;
 
-static DEFINE_MUTEX(of_aliases_mutex);
+DEFINE_MUTEX(of_aliases_mutex);
 
 /* use when traversing tree through the allnext, child, sibling,
  * or parent members of struct device_node.
diff --git a/drivers/of/device.c b/drivers/of/device.c
index 4c74e4fc5a51..f685e55e0717 100644
--- a/drivers/of/device.c
+++ b/drivers/of/device.c
@@ -8,6 +8,7 @@
 #include <linux/slab.h>
 
 #include <asm/errno.h>
+#include "of_private.h"
 
 /**
  * of_match_device - Tell if a struct device matches an of_device_id list
@@ -131,6 +132,7 @@ ssize_t of_device_get_modalias(struct device *dev, char *str, ssize_t len)
 void of_device_uevent(struct device *dev, struct kobj_uevent_env *env)
 {
         const char *compat;
+        struct alias_prop *app;
         int seen = 0, cplen, sl;
 
         if ((!dev) || (!dev->of_node))
@@ -153,6 +155,17 @@ void of_device_uevent(struct device *dev, struct kobj_uevent_env *env)
                 seen++;
         }
         add_uevent_var(env, "OF_COMPATIBLE_N=%d", seen);
+
+        seen = 0;
+        mutex_lock(&of_aliases_mutex);
+        list_for_each_entry(app, &aliases_lookup, link) {
+                if (dev->of_node == app->np) {
+                        add_uevent_var(env, "OF_ALIAS_%d=%s", seen,
+                                       app->alias);
+                        seen++;
+                }
+        }
+        mutex_unlock(&of_aliases_mutex);
 }
 
 int of_device_uevent_modalias(struct device *dev, struct kobj_uevent_env *env)
diff --git a/drivers/of/of_private.h b/drivers/of/of_private.h
new file mode 100644
index 000000000000..ff350c8fa7ac
--- /dev/null
+++ b/drivers/of/of_private.h
@@ -0,0 +1,36 @@
+#ifndef _LINUX_OF_PRIVATE_H
+#define _LINUX_OF_PRIVATE_H
+/*
+ * Private symbols used by OF support code
+ *
+ * Paul Mackerras       August 1996.
+ * Copyright (C) 1996-2005 Paul Mackerras.
+ *
+ * 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.
+ */
+
+/**
+ * struct alias_prop - Alias property in 'aliases' node
+ * @link:       List node to link the structure in aliases_lookup list
+ * @alias:      Alias property name
+ * @np:         Pointer to device_node that the alias stands for
+ * @id:         Index value from end of alias name
+ * @stem:       Alias string without the index
+ *
+ * The structure represents one alias property of 'aliases' node as
+ * an entry in aliases_lookup list.
+ */
+struct alias_prop {
+        struct list_head link;
+        const char *alias;
+        struct device_node *np;
+        int id;
+        char stem[0];
+};
+
+extern struct mutex of_aliases_mutex;
+extern struct list_head aliases_lookup;
+#endif /* _LINUX_OF_PRIVATE_H */
diff --git a/drivers/of/platform.c b/drivers/of/platform.c
index b80891b43816..3c3e3cad3e08 100644
--- a/drivers/of/platform.c
+++ b/drivers/of/platform.c
@@ -203,6 +203,7 @@ struct platform_device *of_platform_device_create_pdata(
                                         struct device *parent)
 {
         struct platform_device *dev;
+        int rc;
 
         if (!of_device_is_available(np))
                 return NULL;
@@ -214,16 +215,24 @@ struct platform_device *of_platform_device_create_pdata(
 #if defined(CONFIG_MICROBLAZE)
         dev->archdata.dma_mask = 0xffffffffUL;
 #endif
+        dev->name = dev_name(&dev->dev);
         dev->dev.coherent_dma_mask = DMA_BIT_MASK(32);
-        dev->dev.bus = &platform_bus_type;
         dev->dev.platform_data = platform_data;
+        dev->dev.id = PLATFORM_DEVID_NONE;
+        /* device_add will assume that this device is on the same node as
+         * the parent. If there is no parent defined, set the node
+         * explicitly */
+        if (!parent)
+                set_dev_node(&dev->dev, of_node_to_nid(np));
 
         /* We do not fill the DMA ops for platform devices by default.
          * This is currently the responsibility of the platform code
          * to do such, possibly using a device notifier
          */
 
-        if (of_device_add(dev) != 0) {
+        rc = platform_device_add(dev);
+        if (rc) {
+                dev_err(&dev->dev, "device registration failed\n");
                 platform_device_put(dev);
                 return NULL;
         }