Index: kernel/genarch/include/genarch/drivers/amdm37x/gpt.h
===================================================================
--- kernel/genarch/include/genarch/drivers/amdm37x/gpt.h	(revision b1834a01038fc2eeb50637bb5cb48a741a03b9fb)
+++ kernel/genarch/include/genarch/drivers/amdm37x/gpt.h	(revision 848740c9426c4efa097f990344c896405c19c59d)
@@ -208,5 +208,6 @@
 	// TODO find a nicer way to setup 32kHz clock source for timer1
 	// reg 0x48004C40 is CM_CLKSEL_WKUP see page 485 of the manual
-	ioport32_t *clksel = (void *) km_map(0x48004C40, 4, PAGE_NOT_CACHEABLE);
+	ioport32_t *clksel = (void *) km_map(0x48004C40, 4, PAGE_SIZE,
+	    PAGE_NOT_CACHEABLE);
 	*clksel &= ~1;
 	km_unmap((uintptr_t)clksel, 4);
@@ -214,5 +215,6 @@
 	assert(timer);
 	/* Map control register */
-	timer->regs = (void *) km_map(ioregs, iosize, PAGE_NOT_CACHEABLE);
+	timer->regs = (void *) km_map(ioregs, iosize, KM_NATURAL_ALIGNMENT,
+	    PAGE_NOT_CACHEABLE);
 
 	/* Reset the timer */