| 1 | From 12782c44d0c687b5b0400a8224a9b1bf9eb9a428 Mon Sep 17 00:00:00 2001 |
| 2 | From: Daniel Hellstrom <daniel@gaisler.com> |
| 3 | Date: Tue, 26 Oct 2010 09:59:05 +0200 |
| 4 | Subject: [PATCH] TIMER,IRQCTRL: added raw AMBA vendor/device number to match against. |
| 5 | |
| 6 | Signed-off-by: Daniel Hellstrom <daniel@gaisler.com> |
| 7 | --- |
| 8 | arch/sparc/kernel/leon_kernel.c | 6 ++++-- |
| 9 | 1 files changed, 4 insertions(+), 2 deletions(-) |
| 10 | |
| 11 | --- a/arch/sparc/kernel/leon_kernel.c |
| 12 | +++ b/arch/sparc/kernel/leon_kernel.c |
| 13 | @@ -120,7 +120,8 @@ void __init leon_init_timers(irq_handler |
| 14 | |
| 15 | /* Find IRQMP IRQ Controller Registers base address otherwise bail out. */ |
| 16 | rootnp = of_find_node_by_path("/ambapp0"); |
| 17 | - if (rootnp && (np=of_find_node_by_name(rootnp, "GAISLER_IRQMP"))) { |
| 18 | + if (rootnp && ((np=of_find_node_by_name(rootnp, "GAISLER_IRQMP")) || |
| 19 | + (np=of_find_node_by_name(rootnp, "01_00d")))) { |
| 20 | pp = of_find_property(np, "reg", &len); |
| 21 | if (pp) |
| 22 | leon3_irqctrl_regs = *(struct leon3_irqctrl_regs_map **)pp->value; |
| 23 | @@ -128,7 +129,8 @@ void __init leon_init_timers(irq_handler |
| 24 | |
| 25 | /* Find GPTIMER Timer Registers base address otherwise bail out. */ |
| 26 | np = rootnp; |
| 27 | - while (np && (np=of_find_node_by_name(np, "GAISLER_GPTIMER"))) { |
| 28 | + while (np && ((np=of_find_node_by_name(np, "GAISLER_GPTIMER")) || |
| 29 | + (np=of_find_node_by_name(np, "01_011")))) { |
| 30 | ampopts = 0; |
| 31 | pp = of_find_property(np, "ampopts", &len); |
| 32 | if ( pp && ((ampopts = *(int *)pp->value) == 0) ) { |
| 33 | |
