Enable timer interrupt correctly. Kernel now boots.

m-labs · May 22, 2012 · 70e99b2 · 70e99b2
1 parent 8602505
commit 70e99b2
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/arch/lm32/boot/dts/milkymist_one.dts b/arch/lm32/boot/dts/milkymist_one.dts
@@ -75,6 +75,6 @@
 		};
 	};
 	chosen {
-		bootargs = "root=/dev/ram0 rootfstype=ext2";
+		bootargs = "root=/dev/ram0 rootfstype=ext2 console=ttyS0";
 	};
 };
diff --git a/arch/lm32/platforms/milkymist/time.c b/arch/lm32/platforms/milkymist/time.c
@@ -155,5 +155,6 @@ void __init plat_time_init(void)
 
 	clockevents_register_device(&milkymist_clockevent);
 
+	iowrite32be(1, CSR_TIMER0_EV_ENABLE);
 	setup_irq(TIMER0_INTERRUPT, &timer_irqaction);
 }
diff --git a/drivers/tty/serial/Kconfig b/drivers/tty/serial/Kconfig
@@ -1519,7 +1519,7 @@ config SERIAL_MILKYMIST
 	  Enable Milkymist UART driver.
 
 config SERIAL_MILKYMIST_NR_UARTS
-	int "Maximum number of milkymist serial ports"
+	int "Maximum number of Milkymist serial ports"
 	depends on SERIAL_MILKYMIST
 	default "1"