Skip to content

Commit

Permalink
microblaze: Use node name instead of compatible string
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Michal Simek committed Mar 23, 2012
1 parent 7c0d261 commit cc5647a
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions arch/microblaze/kernel/intc.c
Original file line number Diff line number Diff line change
Expand Up @@ -131,8 +131,8 @@ void __init init_IRQ(void)
#ifdef CONFIG_SELFMOD_INTC
selfmod_function((int *) arr_func, intc_baseaddr);
#endif
printk(KERN_INFO "XPS intc #0 at 0x%08x, num_irq=%d, edge=0x%x\n",
intc_baseaddr, nr_irq, intr_mask);
printk(KERN_INFO "%s #0 at 0x%08x, num_irq=%d, edge=0x%x\n",
intc->name, intc_baseaddr, nr_irq, intr_mask);

/*
* Disable all external interrupts until they are
Expand Down
4 changes: 2 additions & 2 deletions arch/microblaze/kernel/timer.c
Original file line number Diff line number Diff line change
Expand Up @@ -274,8 +274,8 @@ void __init time_init(void)
#ifdef CONFIG_SELFMOD_TIMER
selfmod_function((int *) arr_func, timer_baseaddr);
#endif
printk(KERN_INFO "XPS timer #0 at 0x%08x, irq=%d\n",
timer_baseaddr, irq);
printk(KERN_INFO "%s #0 at 0x%08x, irq=%d\n",
timer->name, timer_baseaddr, irq);

/* If there is clock-frequency property than use it */
prop = of_get_property(timer, "clock-frequency", NULL);
Expand Down

0 comments on commit cc5647a

Please sign in to comment.