Changeset 19317

Timestamp:

06/02/12 01:03:17 (12 months ago)

Author:

BrainSlayer

Message:

laguna smp kernel running now

Location:

src/linux/universal/linux-3.4/arch/arm/mach-cns3xxx

Files:

• core.c (modified) (5 diffs)
• include/mach/entry-macro.S (modified) (1 diff)

src/linux/universal/linux-3.4/arch/arm/mach-cns3xxx/core.c

@@ -24 +24 @@
 #include "core.h"
 
+
+
 static struct map_desc cns3xxx_io_desc[] __initdata = {
         {
@@ -151 +153 @@
 };
 
+
 static DEFINE_TWD_LOCAL_TIMER(twd_local_timer,
-                              CNS3XXX_TC11MP_TWD_BASE_VIRT,
+                              CNS3XXX_TC11MP_TWD_BASE,
                               IRQ_LOCALTIMER);
-
 
 void __init cns3xxx_common_init(void)
@@ -170 +172 @@
 #ifdef CONFIG_CACHE_L2CC
         l2cc_init((void __iomem *) CNS3XXX_L2C_BASE_VIRT);
-#endif
-#ifdef CONFIG_LOCAL_TIMERS
-        int err = twd_local_timer_register(&twd_local_timer);
-        if (err)
-                pr_err("twd_local_timer_register failed %d\n", err);
-//      twd_base = (void __iomem *) CNS3XXX_TC11MP_TWD_BASE_VIRT;
 #endif
         gpiochip_add(&cns3xxx_gpio_chip);
@@ -322 +318 @@
         clocksource_register(&clocksource_cns3xxx);
 }
-
 /*
  * Set up the clock source and clock events devices
@@ -361 +356 @@
         cns3xxx_clocksource_init();
         cns3xxx_clockevents_init(timer_irq);
+#ifdef CONFIG_LOCAL_TIMERS
+        int err = twd_local_timer_register(&twd_local_timer);
+        if (err)
+                pr_err("twd_local_timer_register failed %d\n", err);
+//      twd_base = (void __iomem *) CNS3XXX_TC11MP_TWD_BASE_VIRT;
+#endif
 }
 

src/linux/universal/linux-3.4/arch/arm/mach-cns3xxx/include/mach/entry-macro.S

@@ -1 @@
-
                 .macro test_for_cache_ipi, irqnr, irqstat, base, tmp
                 bic     \irqnr, \irqstat, #0x1c00