Merge branch 'dt-for-linus' of git://sources.calxeda.com/kernel/linux

c290b2f2 · Linus Torvalds <[email protected]> · 2011-11-30 16:24:43 -08:00

* 'dt-for-linus' of git://sources.calxeda.com/kernel/linux:
  of: Add Silicon Image vendor prefix
  of/irq: of_irq_init: add check for parent equal to child node

Commit: c290b2f2b0187b5cd840b2c2803107a0207ebc2f
Parents: d6e92d36 · e43fce14

Merge commit. Changes below are compared with the first parent: d6e92d36.

Changes

2 files changed · +3 −0

File	Status	Add	Del	Content
Documentation/devicetree/bindings/vendor-prefixes.txt	modified	+1	−0	View file
drivers/of/irq.c	modified	+2	−0	View file

Documentation/devicetree/bindings/vendor-prefixes.txt

View file

diff --git a/Documentation/devicetree/bindings/vendor-prefixes.txt b/Documentation/devicetree/bindings/vendor-prefixes.txt
index e855278..874921e 100644
--- a/Documentation/devicetree/bindings/vendor-prefixes.txt
+++ b/Documentation/devicetree/bindings/vendor-prefixes.txt
@@ -33,6 +33,7 @@ qcom	Qualcomm, Inc.
 ramtron	Ramtron International
 samsung	Samsung Semiconductor
 schindler	Schindler
+sil	Silicon Image
 simtek
 sirf	SiRF Technology, Inc.
 stericsson	ST-Ericsson

drivers/of/irq.c

View file

diff --git a/drivers/of/irq.c b/drivers/of/irq.c
index 791270b..19c0115 100644
--- a/drivers/of/irq.c
+++ b/drivers/of/irq.c
@@ -424,6 +424,8 @@ void __init of_irq_init(const struct of_device_id *matches)
 
 		desc->dev = np;
 		desc->interrupt_parent = of_irq_find_parent(np);
+		if (desc->interrupt_parent == np)
+			desc->interrupt_parent = NULL;
 		list_add_tail(&desc->list, &intc_desc_list);
 	}
 