From: Stephen Neuendorffer Date: Tue, 8 Jan 2008 19:35:04 +0000 (+1100) Subject: [POWERPC] Xilinx: update compatible list for interrupt controller X-Git-Tag: v2.6.25-rc1~1131^2~135^2~4 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=021a607c2fe59cc5c37fd67813b4a61fd2f7e61b;p=linux-2.6-omap-h63xx.git [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 Signed-off-by: Grant Likely --- diff --git a/arch/powerpc/sysdev/xilinx_intc.c b/arch/powerpc/sysdev/xilinx_intc.c index c2f17cc43df..ba8eea2bcce 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);