Changeset dd0c8a0 in mainline for kernel/arch/arm32/src/mach/beagleboardxm/beagleboardxm.c

Timestamp:

2013-09-29T06:56:33Z (12 years ago)

Author:

Beniamino Galvani <b.galvani@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

a9bd960d

Parents:

3deb0155 (diff), 13be2583 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes.

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;
-        amdm37x_uart_t uart;
+        omap_irc_regs_t *irc_addr;
+        omap_uart_t uart;
         amdm37x_gpt_t timer;
 } beagleboard;
@@ -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);
 }
 
@@ -167 +170 @@
 static void bbxm_output_init(void)
 {
+#ifdef CONFIG_OMAP_UART
         /* UART3 is wired to external RS232 connector */
-        const bool ok = amdm37x_uart_init(&beagleboard.uart,
+        const bool ok = omap_uart_init(&beagleboard.uart,
             AMDM37x_UART3_IRQ, AMDM37x_UART3_BASE_ADDRESS, AMDM37x_UART3_SIZE);
         if (ok) {
                 stdout_wire(&beagleboard.uart.outdev);
         }
+#endif
 }
 
 static void bbxm_input_init(void)
 {
+#ifdef CONFIG_OMAP_UART
         srln_instance_t *srln_instance = srln_init();
         if (srln_instance) {
                 indev_t *sink = stdin_wire();
                 indev_t *srln = srln_wire(srln_instance, sink);
-                amdm37x_uart_input_wire(&beagleboard.uart, srln);
-                amdm37x_irc_enable(beagleboard.irc_addr, AMDM37x_UART3_IRQ);
+                omap_uart_input_wire(&beagleboard.uart, srln);
+                omap_irc_enable(beagleboard.irc_addr, AMDM37x_UART3_IRQ);
         }
+#endif
 }