Index: kernel/arch/arm32/src/mach/beaglebone/beaglebone.c
===================================================================
--- kernel/arch/arm32/src/mach/beaglebone/beaglebone.c	(revision 550b4e03780e7c78c7808ea1a1011c123231918e)
+++ kernel/arch/arm32/src/mach/beaglebone/beaglebone.c	(revision 313824a3373e4159b53978621bf1d3ece6a5e02f)
@@ -177,5 +177,4 @@
 {
 	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,4 +186,6 @@
 		printf("Spurious interrupt\n");
 	}
+
+	am335x_irc_irq_ack(bbone.irc_addr);
 }
 
Index: kernel/genarch/src/drivers/am335x/timer.c
===================================================================
--- kernel/genarch/src/drivers/am335x/timer.c	(revision 550b4e03780e7c78c7808ea1a1011c123231918e)
+++ kernel/genarch/src/drivers/am335x/timer.c	(revision 313824a3373e4159b53978621bf1d3ece6a5e02f)
@@ -119,7 +119,5 @@
 	/* 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;