Changeset 8b863a62 in mainline for kernel/arch/arm32/src/mach/beaglebone/beaglebone.c

Timestamp:

2014-04-16T17:14:06Z (11 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

f857e8b

Parents:

dba3e2c (diff), 70b570c (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/beaglebone/beaglebone.c (modified) (6 diffs)

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

@@ -63 +63 @@
 
 static struct beaglebone {
-        am335x_irc_regs_t *irc_addr;
+        omap_irc_regs_t *irc_addr;
         am335x_cm_per_regs_t *cm_per_addr;
         am335x_cm_dpll_regs_t *cm_dpll_addr;
@@ -104 +104 @@
 
         /* Initialize the interrupt controller */
-        am335x_irc_init(bbone.irc_addr);
+        omap_irc_init(bbone.irc_addr);
 }
 
@@ -153 +153 @@
         }
         /* Enable the interrupt */
-        am335x_irc_enable(bbone.irc_addr, AM335x_DMTIMER2_IRQ);
+        omap_irc_enable(bbone.irc_addr, AM335x_DMTIMER2_IRQ);
         /* Start the timer */
         am335x_timer_start(&bbone.timer);
@@ -176 +176 @@
 static void bbone_irq_exception(unsigned int exc_no, istate_t *istate)
 {
-        const unsigned inum = am335x_irc_inum_get(bbone.irc_addr);
-        am335x_irc_irq_ack(bbone.irc_addr);
+        const unsigned inum = omap_irc_inum_get(bbone.irc_addr);
 
         irq_t *irq = irq_dispatch_and_lock(inum);
@@ -187 +186 @@
                 printf("Spurious interrupt\n");
         }
+
+        omap_irc_irq_ack(bbone.irc_addr);
 }
 
@@ -213 +214 @@
                 indev_t *srln = srln_wire(srln_instance, sink);
                 omap_uart_input_wire(&bbone.uart, srln);
-                am335x_irc_enable(bbone.irc_addr, AM335x_UART0_IRQ);
+                omap_irc_enable(bbone.irc_addr, AM335x_UART0_IRQ);
         }
 #endif