[PATCH 13/14] spiderpic: enable new style devtree support

Arnd Bergmann
2006-10-04T16:33:29Z

[-- Attachment #1: spider-pic-fix.diff --]
[-- Type: text/plain, Size: 1016 bytes --]

This enables support for new firmware test releases.

Signed-off-by: Arnd Bergmann <arnd.bergmann@de.ibm.com>

Index: linux-2.6/arch/powerpc/platforms/cell/spider-pic.c
===================================================================
--- linux-2.6.orig/arch/powerpc/platforms/cell/spider-pic.c
+++ linux-2.6/arch/powerpc/platforms/cell/spider-pic.c
@@ -244,7 +244,6 @@ static unsigned int __init spider_find_c
int imaplen, intsize, unit;
struct device_node *iic;

-#if 0 /* Enable that when we have a way to retreive the node as well */
/* First, we check wether we have a real "interrupts" in the device
* tree in case the device-tree is ever fixed
*/
@@ -252,9 +251,8 @@ static unsigned int __init spider_find_c
if (of_irq_map_one(pic->of_node, 0, &oirq) == 0) {
virq = irq_create_of_mapping(oirq.controller, oirq.specifier,
oirq.size);
- goto bail;
+ return virq;
}
-#endif

/* Now do the horrible hacks */
tmp = get_property(pic->of_node, "#interrupt-cells", NULL);

--