From 14d0675a7fab8de061ccafba3e2ee0e4c503bce7 Mon Sep 17 00:00:00 2001 From: Daniel Hellstrom Date: Tue, 4 Jan 2011 01:41:31 +0000 Subject: [PATCH] --- yaml --- r: 225718 b: refs/heads/master c: 9742e72cd1e24ede007daa8f3eb1cece66f0fd0f h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/sparc/kernel/leon_kernel.c | 14 ++++++++++---- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 3b050409356f..15e739244c7a 100644 --- 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 index 91a978f4d83b..88ade07f976c 100644 --- a/trunk/arch/sparc/kernel/leon_kernel.c +++ b/trunk/arch/sparc/kernel/leon_kernel.c @@ -120,8 +120,11 @@ 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; @@ -129,8 +132,11 @@ void __init leon_init_timers(irq_handler_t counter_fn) /* 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;