Changes in kernel/arch/arm32/src/mach/beagleboardxm/beagleboardxm.c [69483af:3c9646b] in mainline

File:

• kernel/arch/arm32/src/mach/beagleboardxm/beagleboardxm.c (modified) (7 diffs)

kernel/arch/arm32/src/mach/beagleboardxm/beagleboardxm.c

@@ -60 +60 @@
 
 static struct beagleboard {
-        amdm37x_irc_regs_t *irc_addr;
+        omap_irc_regs_t *irc_addr;
         omap_uart_t uart;
         amdm37x_gpt_t timer;
@@ -85 +85 @@
 static void bb_timer_irq_handler(irq_t *irq)
 {
+        amdm37x_gpt_irq_ack(&beagleboard.timer);
+
         /*
          * We are holding a lock which prevents preemption.
          * Release the lock, call clock() and reacquire the lock again.
          */
-        amdm37x_gpt_irq_ack(&beagleboard.timer);
         spinlock_unlock(&irq->lock);
         clock();
@@ -102 +103 @@
             PAGE_NOT_CACHEABLE);
         ASSERT(beagleboard.irc_addr);
-        amdm37x_irc_init(beagleboard.irc_addr);
+        omap_irc_init(beagleboard.irc_addr);
 
         /* Initialize timer. Use timer1, because it is in WKUP power domain
@@ -122 +123 @@
 
         /* Enable timer interrupt */
-        amdm37x_irc_enable(beagleboard.irc_addr, AMDM37x_GPT1_IRQ);
+        omap_irc_enable(beagleboard.irc_addr, AMDM37x_GPT1_IRQ);
 
         /* Start timer here */
@@ -146 +147 @@
 static void bbxm_irq_exception(unsigned int exc_no, istate_t *istate)
 {
-        const unsigned inum = amdm37x_irc_inum_get(beagleboard.irc_addr);
-        amdm37x_irc_irq_ack(beagleboard.irc_addr);
+        const unsigned inum = omap_irc_inum_get(beagleboard.irc_addr);
 
         irq_t *irq = irq_dispatch_and_lock(inum);
@@ -159 +159 @@
                     CPU->id, inum);
         }
+        /** amdm37x manual ch. 12.5.2 (p. 2428) places irc ack at the end
+         * of ISR. DO this to avoid strange behavior. */
+        omap_irc_irq_ack(beagleboard.irc_addr);
 }
 
@@ -185 +188 @@
                 indev_t *srln = srln_wire(srln_instance, sink);
                 omap_uart_input_wire(&beagleboard.uart, srln);
-                amdm37x_irc_enable(beagleboard.irc_addr, AMDM37x_UART3_IRQ);
+                omap_irc_enable(beagleboard.irc_addr, AMDM37x_UART3_IRQ);
         }
 #endif