aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGrant Likely2010-06-08 07:48:12 -0600
committerGrant Likely2010-07-05 16:14:27 -0600
commitd3571c3acfabb6f3a93b517b75d9b30eb7e8692e (patch)
tree5ab59980b9a07cda8e5e0937b0ea8581a09bc92e
parent3930f294d081c9e2a65f137a7d5fb6c161e4aa94 (diff)
of: Use full node name in resource structures
Resource names appear in human readable output, so when extracting IRQ and address resources from a device tree node, use the full node name to give proper context in places like /proc/iomem. Signed-off-by: Grant Likely <grant.likely@secretlab.ca> CC: Michal Simek <monstr@monstr.eu> CC: Stephen Rothwell <sfr@canb.auug.org.au> CC: Benjamin Herrenschmidt <benh@kernel.crashing.org> CC: microblaze-uclinux@itee.uq.edu.au CC: linuxppc-dev@ozlabs.org
-rw-r--r--drivers/of/address.c2
-rw-r--r--drivers/of/irq.c1
2 files changed, 2 insertions, 1 deletions
diff --git a/drivers/of/address.c b/drivers/of/address.c
index 5c220c3a3acc..fcadb726d4f9 100644
--- a/drivers/of/address.c
+++ b/drivers/of/address.c
@@ -549,7 +549,7 @@ static int __of_address_to_resource(struct device_node *dev, const u32 *addrp,
r->end = taddr + size - 1;
}
r->flags = flags;
- r->name = dev->name;
+ r->name = dev->full_name;
return 0;
}
diff --git a/drivers/of/irq.c b/drivers/of/irq.c
index 623eb661c629..6cfb307204c3 100644
--- a/drivers/of/irq.c
+++ b/drivers/of/irq.c
@@ -340,6 +340,7 @@ int of_irq_to_resource(struct device_node *dev, int index, struct resource *r)
if (r && irq != NO_IRQ) {
r->start = r->end = irq;
r->flags = IORESOURCE_IRQ;
+ r->name = dev->full_name;
}
return irq;