diff options
| author | Benoit Cousson | 2011-12-05 15:23:56 +0100 |
|---|---|---|
| committer | Grant Likely | 2012-01-04 08:33:15 +0100 |
| commit | 661db794eb8179c7bea02f159bb691a2fff4a8e0 (patch) | |
| tree | 810f4b85c9089c3fd51dcb1d1f9b872c62972f6c /drivers/of/irq.c | |
| parent | of/address: Add reg-names property to name an iomem resource (diff) | |
| download | kernel-qcow2-linux-661db794eb8179c7bea02f159bb691a2fff4a8e0.tar.gz kernel-qcow2-linux-661db794eb8179c7bea02f159bb691a2fff4a8e0.tar.xz kernel-qcow2-linux-661db794eb8179c7bea02f159bb691a2fff4a8e0.zip | |
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/irq.c')
| -rw-r--r-- | drivers/of/irq.c | 11 |
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) /* Only dereference the resource if both the * resource and the irq are valid. */ if (r && irq) { + const char *name = NULL; + + /* + * Get optional "interrupts-names" property to add a name + * to the resource. + */ + of_property_read_string_index(dev, "interrupt-names", index, + &name); + r->start = r->end = irq; r->flags = IORESOURCE_IRQ; - r->name = dev->full_name; + r->name = name ? name : dev->full_name; } return irq; |