aboutsummaryrefslogtreecommitdiffstats
path: root/arch/microblaze/kernel
diff options
context:
space:
mode:
authorMichal Simek <monstr@monstr.eu>2011-11-07 07:42:12 -0500
committerMichal Simek <monstr@monstr.eu>2012-03-23 04:28:15 -0400
commitcc5647a64e8c6691be87a83632d8b1c78b795023 (patch)
tree4e1923bb7d0ad2c6b07f5ba3f2be4ae4f242af3a /arch/microblaze/kernel
parent7c0d26150781cbd8a522259c9dea9e7ef23df8e3 (diff)
microblaze: Use node name instead of compatible string
Change report in bootlog: Origin: xlnx,xps-intc-1.00.a #0 at 0xc8000000, num_irq=6, edge=0x4 xlnx,xps-timer-1.00.a #0 at 0xc8004000, irq=2 New: interrupt-controller #0 at 0xc8000000, num_irq=6, edge=0x4 system-timer #0 at 0xc8004000, irq=2 Signed-off-by: Michal Simek <monstr@monstr.eu>
Diffstat (limited to 'arch/microblaze/kernel')
-rw-r--r--arch/microblaze/kernel/intc.c4
-rw-r--r--arch/microblaze/kernel/timer.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/arch/microblaze/kernel/intc.c b/arch/microblaze/kernel/intc.c
index 44b177e2ab12..3003d2f9f551 100644
--- a/arch/microblaze/kernel/intc.c
+++ b/arch/microblaze/kernel/intc.c
@@ -131,8 +131,8 @@ void __init init_IRQ(void)
131#ifdef CONFIG_SELFMOD_INTC 131#ifdef CONFIG_SELFMOD_INTC
132 selfmod_function((int *) arr_func, intc_baseaddr); 132 selfmod_function((int *) arr_func, intc_baseaddr);
133#endif 133#endif
134 printk(KERN_INFO "XPS intc #0 at 0x%08x, num_irq=%d, edge=0x%x\n", 134 printk(KERN_INFO "%s #0 at 0x%08x, num_irq=%d, edge=0x%x\n",
135 intc_baseaddr, nr_irq, intr_mask); 135 intc->name, intc_baseaddr, nr_irq, intr_mask);
136 136
137 /* 137 /*
138 * Disable all external interrupts until they are 138 * Disable all external interrupts until they are
diff --git a/arch/microblaze/kernel/timer.c b/arch/microblaze/kernel/timer.c
index 78b82f30bdd5..cadfd5608afb 100644
--- a/arch/microblaze/kernel/timer.c
+++ b/arch/microblaze/kernel/timer.c
@@ -274,8 +274,8 @@ void __init time_init(void)
274#ifdef CONFIG_SELFMOD_TIMER 274#ifdef CONFIG_SELFMOD_TIMER
275 selfmod_function((int *) arr_func, timer_baseaddr); 275 selfmod_function((int *) arr_func, timer_baseaddr);
276#endif 276#endif
277 printk(KERN_INFO "XPS timer #0 at 0x%08x, irq=%d\n", 277 printk(KERN_INFO "%s #0 at 0x%08x, irq=%d\n",
278 timer_baseaddr, irq); 278 timer->name, timer_baseaddr, irq);
279 279
280 /* If there is clock-frequency property than use it */ 280 /* If there is clock-frequency property than use it */
281 prop = of_get_property(timer, "clock-frequency", NULL); 281 prop = of_get_property(timer, "clock-frequency", NULL);