summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-11-30 16:24:43 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2011-11-30 16:24:43 -0800
commitc290b2f2b0187b5cd840b2c2803107a0207ebc2f (patch)
treef4751d34d041e7ed5a30d5c69cdb03de898a6238
parentd6e92d360c21494ed4ce3bcfa7c84b90cb075bba (diff)
parente43fce14088d9910b545c30c9a7127deb289d477 (diff)
downloadop-kernel-dev-c290b2f2b0187b5cd840b2c2803107a0207ebc2f.zip
op-kernel-dev-c290b2f2b0187b5cd840b2c2803107a0207ebc2f.tar.gz
Merge branch 'dt-for-linus' of git://sources.calxeda.com/kernel/linux
* '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
-rw-r--r--Documentation/devicetree/bindings/vendor-prefixes.txt1
-rw-r--r--drivers/of/irq.c2
2 files changed, 3 insertions, 0 deletions
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
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);
}
OpenPOWER on IntegriCloud