From d3571c3acfabb6f3a93b517b75d9b30eb7e8692e Mon Sep 17 00:00:00 2001 From: Grant Likely Date: Tue, 8 Jun 2010 07:48:12 -0600 Subject: 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 CC: Michal Simek CC: Stephen Rothwell CC: Benjamin Herrenschmidt CC: microblaze-uclinux@itee.uq.edu.au CC: linuxppc-dev@ozlabs.org --- drivers/of/address.c | 2 +- drivers/of/irq.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/of/address.c b/drivers/of/address.c index 5c220c3..fcadb72 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 623eb66..6cfb307 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; -- cgit v1.1