Changeset bdae198 in mainline for kernel

Timestamp:

2013-08-04T12:01:10Z (12 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

ea509069

Parents:

b08879c2 (diff), d856110 (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

Location:

kernel

Files:

• arch/arm32/src/mach/beaglebone/beaglebone.c (modified) (2 diffs)
• genarch/src/drivers/am335x/timer.c (modified) (1 diff)

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

@@ -177 +177 @@
 {
         const unsigned inum = am335x_irc_inum_get(bbone.irc_addr);
-        am335x_irc_irq_ack(bbone.irc_addr);
 
         irq_t *irq = irq_dispatch_and_lock(inum);
@@ -187 +186 @@
                 printf("Spurious interrupt\n");
         }
+
+        am335x_irc_irq_ack(bbone.irc_addr);
 }
 

kernel/genarch/src/drivers/am335x/timer.c

@@ -119 +119 @@
         /* Disable compare mode */
         tclr &= ~AM335x_TIMER_TCLR_CE_FLAG;
-        /* Enable the prescaler, divisor = 2 */
-        tclr |= AM335x_TIMER_TCLR_PRE_FLAG;
-        tclr &= ~(AM335x_TIMER_TCLR_PTV_MASK << AM335x_TIMER_TCLR_PTV_SHIFT);
+
         /* Enable auto-reload mode */
         tclr |= AM335x_TIMER_TCLR_AR_FLAG;