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

Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git

kernel os 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

Linus Torvalds 14 years ago c290b2f2 d6e92d36

2 changed files

expand all

Documentation

devicetree

bindings

vendor-prefixes.txt

drivers

irq.c

Documentation/devicetree/bindings/vendor-prefixes.txt

··· 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

drivers/of/irq.c

··· 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

Configure Feed

Configure Feed