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

Timestamp:

2013-12-25T13:05:25Z (10 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

bc54126c

Parents:

f4a47e52 (diff), 6946f23 (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) (6 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;
@@ -103 +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
@@ -123 +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 */
@@ -147 +147 @@
 static void bbxm_irq_exception(unsigned int exc_no, istate_t *istate)
 {
-        const unsigned inum = amdm37x_irc_inum_get(beagleboard.irc_addr);
+        const unsigned inum = omap_irc_inum_get(beagleboard.irc_addr);
 
         irq_t *irq = irq_dispatch_and_lock(inum);
@@ -161 +161 @@
         /** amdm37x manual ch. 12.5.2 (p. 2428) places irc ack at the end
          * of ISR. DO this to avoid strange behavior. */
-        amdm37x_irc_irq_ack(beagleboard.irc_addr);
+        omap_irc_irq_ack(beagleboard.irc_addr);
 }
 
@@ -188 +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