lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
* '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
This commit is contained in:
Linus Torvalds
2011-11-30 16:24:43 -08:00
parent d6e92d360c e43fce1408
commit c290b2f2b0
2 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Documentation/devicetree/bindings/vendor-prefixes.txt
View File

@@ -33,6 +33,7 @@ qcom Qualcomm, Inc.
ramtron Ramtron International ramtron Ramtron International
samsung Samsung Semiconductor samsung Samsung Semiconductor
schindler Schindler schindler Schindler
sil Silicon Image
simtek simtek
sirf SiRF Technology, Inc. sirf SiRF Technology, Inc.
stericsson ST-Ericsson stericsson ST-Ericsson

2
drivers/of/irq.c
View File

@@ -424,6 +424,8 @@ void __init of_irq_init(const struct of_device_id *matches)
desc->dev = np; desc->dev = np;
desc->interrupt_parent = of_irq_find_parent(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); list_add_tail(&desc->list, &intc_desc_list);
} }