aboutsummaryrefslogtreecommitdiff
path: root/arch/sparc
diff options
context:
space:
mode:
authorDaniel Hellstrom <daniel@gaisler.com>2011-01-04 01:41:31 +0000
committerDavid S. Miller <davem@davemloft.net>2011-01-04 11:16:36 -0800
commit9742e72cd1e24ede007daa8f3eb1cece66f0fd0f (patch)
treece9fe2b1d208019f33f3c3531abb15d6f42541f6 /arch/sparc
parente2305e37d4c82ef55be54e9edc8a7e2250739b4f (diff)
downloadlinux-2.6.38-lt-ux500-9742e72cd1e24ede007daa8f3eb1cece66f0fd0f.tar.gz
LEON: added raw AMBA vendor/device number to find TIMER, IRQCTRL
Signed-off-by: Daniel Hellstrom <daniel@gaisler.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/sparc')
-rw-r--r--arch/sparc/kernel/leon_kernel.c14
1 files changed, 10 insertions, 4 deletions
diff --git a/arch/sparc/kernel/leon_kernel.c b/arch/sparc/kernel/leon_kernel.c
index 91a978f4d83..88ade07f976 100644
--- a/arch/sparc/kernel/leon_kernel.c
+++ b/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;