]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
microblaze: Use node name instead of compatible string
authorMichal Simek <monstr@monstr.eu>
Mon, 7 Nov 2011 12:42:12 +0000 (13:42 +0100)
committerMichal Simek <monstr@monstr.eu>
Fri, 23 Mar 2012 08:28:15 +0000 (09:28 +0100)
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>
arch/microblaze/kernel/intc.c
arch/microblaze/kernel/timer.c

index 44b177e2ab124c7338c04eeafb81814bf63177c0..3003d2f9f551e22d333e044acd37be0195c7a6dc 100644 (file)
@@ -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
index 78b82f30bdd5100153671e33de0bc2abc25235ba..cadfd5608afb8026cc3a6f50c44f0d2dbb590cb3 100644 (file)
@@ -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);