From da39686fd72d1c2efc5fbd80a7fd8814805c21d0 Mon Sep 17 00:00:00 2001
From: Benoit Cousson <b-cousson@ti.com>
Date: Mon, 5 Dec 2011 15:23:56 +0100
Subject: [PATCH] --- yaml --- r: 284808 b: refs/heads/master c:
 661db794eb8179c7bea02f159bb691a2fff4a8e0 h: refs/heads/master v: v3

---
 [refs]                                                |  2 +-
 .../devicetree/bindings/resource-names.txt            |  4 ++++
 trunk/drivers/of/irq.c                                | 11 ++++++++++-
 3 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index e022827b9276..b3bf67948645 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 35f3da32af0e8970cc41288d4a7e3bd32399900e
+refs/heads/master: 661db794eb8179c7bea02f159bb691a2fff4a8e0
diff --git a/trunk/Documentation/devicetree/bindings/resource-names.txt b/trunk/Documentation/devicetree/bindings/resource-names.txt
index 8405b956acaa..e280fef6f265 100644
--- a/trunk/Documentation/devicetree/bindings/resource-names.txt
+++ b/trunk/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/trunk/drivers/of/irq.c b/trunk/drivers/of/irq.c
index 0f0cfa3bca30..9cf00602f566 100644
--- a/trunk/drivers/of/irq.c
+++ b/trunk/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;