[SPARC]: Add unique device_node IDs and a ".node" property.

Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 35 insertions, 18 deletions

diff --git a/arch/sparc/kernel/prom.c b/arch/sparc/kernel/prom.c
index f3f53f2e0e1e..946ce6d15819 100644
--- a/arch/sparc/kernel/prom.c
+++ b/arch/sparc/kernel/prom.c
@@ -407,7 +407,9 @@ static char * __init build_full_name(struct device_node *dp)
         return n;
 }
 
-static struct property * __init build_one_prop(phandle node, char *prev)
+static unsigned int unique_id;
+
+static struct property * __init build_one_prop(phandle node, char *prev, char *special_name, void *special_val, int special_len)
 {
         static struct property *tmp = NULL;
         struct property *p;
@@ -417,25 +419,34 @@ static struct property * __init build_one_prop(phandle node, char *prev)
                 p = tmp;
                 memset(p, 0, sizeof(*p) + 32);
                 tmp = NULL;
-        } else
+        } else {
                 p = prom_early_alloc(sizeof(struct property) + 32);
+                p->unique_id = unique_id++;
+        }
 
         p->name = (char *) (p + 1);
-        if (prev == NULL) {
-                prom_firstprop(node, p->name);
+        if (special_name) {
+                p->length = special_len;
+                p->value = prom_early_alloc(special_len);
+                memcpy(p->value, special_val, special_len);
         } else {
-                prom_nextprop(node, prev, p->name);
-        }
-        if (strlen(p->name) == 0) {
-                tmp = p;
-                return NULL;
-        }
-        p->length = prom_getproplen(node, p->name);
-        if (p->length <= 0) {
-                p->length = 0;
-        } else {
-                p->value = prom_early_alloc(p->length);
-                len = prom_getproperty(node, p->name, p->value, p->length);
+                if (prev == NULL) {
+                        prom_firstprop(node, p->name);
+                } else {
+                        prom_nextprop(node, prev, p->name);
+                }
+                if (strlen(p->name) == 0) {
+                        tmp = p;
+                        return NULL;
+                }
+                p->length = prom_getproplen(node, p->name);
+                if (p->length <= 0) {
+                        p->length = 0;
+                } else {
+                        p->value = prom_early_alloc(p->length + 1);
+                        prom_getproperty(node, p->name, p->value, p->length);
+                        ((unsigned char *)p->value)[p->length] = '\0';
+                }
         }
         return p;
 }
@@ -444,9 +455,14 @@ static struct property * __init build_prop_list(phandle node)
 {
         struct property *head, *tail;
 
-        head = tail = build_one_prop(node, NULL);
+        head = tail = build_one_prop(node, NULL,
+                                     ".node", &node, sizeof(node));
+
+        tail->next = build_one_prop(node, NULL, NULL, NULL, 0);
+        tail = tail->next;
         while(tail) {
-                tail->next = build_one_prop(node, tail->name);
+                tail->next = build_one_prop(node, tail->name,
+                                            NULL, NULL, 0);
                 tail = tail->next;
         }
 
@@ -475,6 +491,7 @@ static struct device_node * __init create_node(phandle node)
                 return NULL;
 
         dp = prom_early_alloc(sizeof(*dp));
+        dp->unique_id = unique_id++;
 
         kref_init(&dp->kref);