aboutsummaryrefslogtreecommitdiffstats
path: root/arch/sparc/kernel/leon_kernel.c
diff options
context:
space:
mode:
authorDaniel Hellstrom <daniel@gaisler.com>2011-01-03 20:41:31 -0500
committerDavid S. Miller <davem@davemloft.net>2011-01-04 14:16:36 -0500
commit9742e72cd1e24ede007daa8f3eb1cece66f0fd0f (patch)
treece9fe2b1d208019f33f3c3531abb15d6f42541f6 /arch/sparc/kernel/leon_kernel.c
parente2305e37d4c82ef55be54e9edc8a7e2250739b4f (diff)
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/kernel/leon_kernel.c')
-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 91a978f4d83b..88ade07f976c 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)
120 if (!rootnp) 120 if (!rootnp)
121 goto bad; 121 goto bad;
122 np = of_find_node_by_name(rootnp, "GAISLER_IRQMP"); 122 np = of_find_node_by_name(rootnp, "GAISLER_IRQMP");
123 if (!np) 123 if (!np) {
124 goto bad; 124 np = of_find_node_by_name(rootnp, "01_00d");
125 if (!np)
126 goto bad;
127 }
125 pp = of_find_property(np, "reg", &len); 128 pp = of_find_property(np, "reg", &len);
126 if (!pp) 129 if (!pp)
127 goto bad; 130 goto bad;
@@ -129,8 +132,11 @@ void __init leon_init_timers(irq_handler_t counter_fn)
129 132
130 /* Find GPTIMER Timer Registers base address otherwise bail out. */ 133 /* Find GPTIMER Timer Registers base address otherwise bail out. */
131 np = of_find_node_by_name(rootnp, "GAISLER_GPTIMER"); 134 np = of_find_node_by_name(rootnp, "GAISLER_GPTIMER");
132 if (!np) 135 if (!np) {
133 goto bad; 136 np = of_find_node_by_name(np, "01_011");
137 if (!np)
138 goto bad;
139 }
134 pp = of_find_property(np, "reg", &len); 140 pp = of_find_property(np, "reg", &len);
135 if (!pp) 141 if (!pp)
136 goto bad; 142 goto bad;