From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail70-dub-R.bigfish.com (mail-dub.bigfish.com [213.199.154.10]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client CN "*.bigfish.com", Issuer "*.bigfish.com" (not verified)) by ozlabs.org (Postfix) with ESMTP id 15A36DE25C for ; Wed, 9 Jan 2008 06:35:27 +1100 (EST) From: Stephen Neuendorffer To: grant.likely@secretlab.ca, linuxppc-dev@ozlabs.org, simekm2@fel.cvut.cz, jwilliams@itee.uq.edu.au Subject: [PATCH 2/7] [POWERPC] Xilinx: update compatible list for interrupt controller Date: Tue, 8 Jan 2008 11:35:04 -0800 In-Reply-To: <1199820909-32341-2-git-send-email-stephen.neuendorffer@xilinx.com> References: <1199820909-32341-1-git-send-email-stephen.neuendorffer@xilinx.com> <1199820909-32341-2-git-send-email-stephen.neuendorffer@xilinx.com> Message-Id: <20080108193520.5EE48B28052@mail70-dub.bigfish.com> List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , These values now match what is generated by the uboot BSP generator. Signed-off-by: Stephen Neuendorffer --- 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 c2f17cc..ba8eea2 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); -- 1.5.3.4-dirty