2 files changed, 14 insertions, 1 deletions

diff --git a/Documentation/devicetree/bindings/resource-names.txt b/Documentation/devicetree/bindings/resource-names.txt
index 8405b956acaa..e280fef6f265 100644
--- a/Documentation/devicetree/bindings/resource-names.txt
+++ b/Documentation/devicetree/bindings/resource-names.txt
@@ -32,6 +32,8 @@ l4-abe {
                       <1 0x10 0x10>, <1 0x20 0x10>;
                 reg-names = "mpu", "dat",
                             "dma", "dma_dat";
+                interrupts = <11>, <12>;
+                interrupt-names = "rx", "tx";
         };
 
         timer {
@@ -47,4 +49,6 @@ usb {
         reg = <0x4a064000 0x800>, <0x4a064800 0x200>,
               <0x4a064c00 0x200>;
         reg-names = "config", "ohci", "ehci";
+        interrupts = <14>, <15>;
+        interrupt-names = "ohci", "ehci";
 };
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;