aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/of
diff options
context:
space:
mode:
authorBenoit Cousson <b-cousson@ti.com>2011-12-05 09:23:56 -0500
committerGrant Likely <grant.likely@secretlab.ca>2012-01-04 02:33:15 -0500
commit661db794eb8179c7bea02f159bb691a2fff4a8e0 (patch)
tree810f4b85c9089c3fd51dcb1d1f9b872c62972f6c /drivers/of
parent35f3da32af0e8970cc41288d4a7e3bd32399900e (diff)
of/irq: Add interrupts-names property to name an irq resource
Add a interrupts-names property to allow the possibility to provide a name to any interrupts entries. If the name is available, use it to name the resource, otherwise keep the device full name. Signed-off-by: Benoit Cousson <b-cousson@ti.com> Cc: Grant Likely <grant.likely@secretlab.ca> Cc: Rob Herring <rob.herring@calxeda.com> [grant.likely: use "interrupt-names" and tidy documentation] Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
Diffstat (limited to 'drivers/of')
-rw-r--r--drivers/of/irq.c11
1 files changed, 10 insertions, 1 deletions
diff --git a/drivers/of/irq.c b/drivers/of/irq.c
index 0f0cfa3bca30..9cf00602f566 100644
--- a/drivers/of/irq.c
+++ b/drivers/of/irq.c
@@ -341,9 +341,18 @@ int of_irq_to_resource(struct device_node *dev, int index, struct resource *r)
341 /* Only dereference the resource if both the 341 /* Only dereference the resource if both the
342 * resource and the irq are valid. */ 342 * resource and the irq are valid. */
343 if (r && irq) { 343 if (r && irq) {
344 const char *name = NULL;
345
346 /*
347 * Get optional "interrupts-names" property to add a name
348 * to the resource.
349 */
350 of_property_read_string_index(dev, "interrupt-names", index,
351 &name);
352
344 r->start = r->end = irq; 353 r->start = r->end = irq;
345 r->flags = IORESOURCE_IRQ; 354 r->flags = IORESOURCE_IRQ;
346 r->name = dev->full_name; 355 r->name = name ? name : dev->full_name;
347 } 356 }
348 357
349 return irq; 358 return irq;