diff options
| author | Stephen Neuendorffer <stephen.neuendorffer@xilinx.com> | 2008-01-08 20:35:04 +0100 |
|---|---|---|
| committer | Grant Likely <grant.likely@secretlab.ca> | 2008-01-09 15:48:31 +0100 |
| commit | 021a607c2fe59cc5c37fd67813b4a61fd2f7e61b (patch) | |
| tree | da63cc040bd9b77b18a659b790b7dd99a3cf99f4 /arch/powerpc/sysdev/xilinx_intc.c | |
| parent | Merge branch 'for-2.6.25' of git://git.kernel.org/pub/scm/linux/kernel/git/ol... (diff) | |
| download | linux-021a607c2fe59cc5c37fd67813b4a61fd2f7e61b.tar.xz linux-021a607c2fe59cc5c37fd67813b4a61fd2f7e61b.zip | |
[POWERPC] Xilinx: update compatible list for interrupt controller
These values now match what is generated by the uboot BSP generator.
Signed-off-by: Stephen Neuendorffer <stephen.neuendorffer@xilinx.com>
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
Diffstat (limited to 'arch/powerpc/sysdev/xilinx_intc.c')
| -rw-r--r-- | arch/powerpc/sysdev/xilinx_intc.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/arch/powerpc/sysdev/xilinx_intc.c b/arch/powerpc/sysdev/xilinx_intc.c index c2f17cc43dfa..ba8eea2bcce0 100644 --- a/arch/powerpc/sysdev/xilinx_intc.c +++ b/arch/powerpc/sysdev/xilinx_intc.c @@ -135,10 +135,16 @@ void __init xilinx_intc_init_tree(void) struct device_node *np; /* find top level interrupt controller */ - for_each_compatible_node(np, NULL, "xilinx,intc") { + for_each_compatible_node(np, NULL, "xlnx,opb-intc-1.00.c") { if (!of_get_property(np, "interrupts", NULL)) break; } + if (!np) { + for_each_compatible_node(np, NULL, "xlnx,xps-intc-1.00.a") { + if (!of_get_property(np, "interrupts", NULL)) + break; + } + } /* xilinx interrupt controller needs to be top level */ BUG_ON(!np); |