X-Git-Url: https://git.kernelconcepts.de/?p=karo-tx-uboot.git;a=blobdiff_plain;f=arch%2Farm%2Fcpu%2Farm926ejs%2Fmxs%2Ftimer.c;h=12789327ccb65dbcb18b5b3c5eb66be53dd17a8e;hp=20693e2a94cd4c1ddf68e3086fce4818ff9606fd;hb=778c3cbd857f4abe54773f399204dd86ffe6516c;hpb=a244997a14c97551196c354f9c1ca1d20fade285

diff --git a/arch/arm/cpu/arm926ejs/mxs/timer.c b/arch/arm/cpu/arm926ejs/mxs/timer.c
index 20693e2a94..12789327cc 100644
--- a/arch/arm/cpu/arm926ejs/mxs/timer.c
+++ b/arch/arm/cpu/arm926ejs/mxs/timer.c
@@ -74,7 +74,7 @@ int timer_init(void)
 		TIMROT_TIMCTRLn_SELECT_1KHZ_XTAL,
 		&timrot_regs->hw_timrot_timctrl0);
 
-	/* Set fixed_count to maximal value */
+	/* Set fixed_count to maximum value */
 #if defined(CONFIG_MX23)
 	writel(TIMER_LOAD_VAL - 1, &timrot_regs->hw_timrot_timcount0);
 #elif defined(CONFIG_MX28)
@@ -89,8 +89,7 @@ int timer_init(void)
 	writel(20 * MXS_INCREMENTER_HZ,
 		&timrot_regs->hw_timrot_fixed_count0);
 	gd->arch.lastinc = TIMER_LOAD_VAL - 20 * MXS_INCREMENTER_HZ;
-#endif
-#ifdef DEBUG_TIMER_WRAP
+
 	/* Make the usec counter roll over 30 seconds after startup */
 	writel(-30000000, MXS_HW_DIGCTL_MICROSECONDS);
 #endif