Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit c290b2f2b0187b5cd840b2c2803107a0207ebc2f

Authored by Linus Torvalds
2 parents d6e92d360c e43fce1408
Exists in master and in 6 other branches imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

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

Showing 2 changed files Side-by-side Diff

Documentation/devicetree/bindings/vendor-prefixes.txt
Diff comments   View file @ c290b2f
... ... @@ -33,6 +33,7 @@
33 33 ramtron Ramtron International
34 34 samsung Samsung Semiconductor
35 35 schindler Schindler
  36 +sil Silicon Image
36 37 simtek
37 38 sirf SiRF Technology, Inc.
38 39 stericsson ST-Ericsson
... ... @@ -424,6 +424,8 @@
424 424  
425 425 desc->dev = np;
426 426 desc->interrupt_parent = of_irq_find_parent(np);
  427 + if (desc->interrupt_parent == np)
  428 + desc->interrupt_parent = NULL;
427 429 list_add_tail(&desc->list, &intc_desc_list);
428 430 }
429 431