---

yaml --- r: 225718 b: refs/heads/master c: 9742e72 h: refs/heads/master v: v3
git-mirror · Jan 4, 2011 · 14d0675 · 14d0675
1 parent 2fde1e8
commit 14d0675
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e2305e37d4c82ef55be54e9edc8a7e2250739b4f
+refs/heads/master: 9742e72cd1e24ede007daa8f3eb1cece66f0fd0f
diff --git a/trunk/arch/sparc/kernel/leon_kernel.c b/trunk/arch/sparc/kernel/leon_kernel.c
@@ -120,17 +120,23 @@ void __init leon_init_timers(irq_handler_t counter_fn)
 	if (!rootnp)
 		goto bad;
 	np = of_find_node_by_name(rootnp, "GAISLER_IRQMP");
-	if (!np)
-		goto bad;
+	if (!np) {
+		np = of_find_node_by_name(rootnp, "01_00d");
+		if (!np)
+			goto bad;
+	}
 	pp = of_find_property(np, "reg", &len);
 	if (!pp)
 		goto bad;
 	leon3_irqctrl_regs = *(struct leon3_irqctrl_regs_map **)pp->value;
 
 	/* Find GPTIMER Timer Registers base address otherwise bail out. */
 	np = of_find_node_by_name(rootnp, "GAISLER_GPTIMER");
-	if (!np)
-		goto bad;
+	if (!np) {
+		np = of_find_node_by_name(np, "01_011");
+		if (!np)
+			goto bad;
+	}
 	pp = of_find_property(np, "reg", &len);
 	if (!pp)
 		goto bad;