From: Marek Vasut <marek.vasut+renesas@gmail.com>
Date: Fri, 24 Aug 2018 19:20:31 +0000 (+0200)
Subject: sh: tmu: Simplify the tmu_bit math
X-Git-Tag: v2018.11-rc1~120^2~7
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=eb05dcfea29bbafbc9f8ce3b7894e3e53f35d743;p=oweals%2Fu-boot.git

sh: tmu: Simplify the tmu_bit math

The tmu_bit value evaluates to (ffs(4) >> 1) - 1 = (3 >> 1) - 1 = 0.
Just drop the tmu_bit completely as well as CONFIG_SYS_TMU_CLK_DIV.

Signed-off-by: Marek Vasut <marek.vasut+renesas@gmail.com>
---

diff --git a/arch/sh/lib/time.c b/arch/sh/lib/time.c
index aac79889dc..302f6bed83 100644
--- a/arch/sh/lib/time.c
+++ b/arch/sh/lib/time.c
@@ -16,14 +16,12 @@
 #include <sh_tmu.h>
 
 #define TCR_TPSC 0x07
-#define CONFIG_SYS_TMU_CLK_DIV	4
 
 static struct tmu_regs *tmu = (struct tmu_regs *)TMU_BASE;
 
 unsigned long get_tbclk(void)
 {
-	u16 tmu_bit = (ffs(CONFIG_SYS_TMU_CLK_DIV) >> 1) - 1;
-	return get_tmu0_clk_rate() >> ((tmu_bit + 1) * 2);
+	return get_tmu0_clk_rate() >> 2;
 }
 
 unsigned long timer_read_counter(void)
@@ -47,8 +45,7 @@ static void tmu_timer_stop(unsigned int timer)
 
 int timer_init(void)
 {
-	u16 tmu_bit = (ffs(CONFIG_SYS_TMU_CLK_DIV) >> 1) - 1;
-	writew((readw(&tmu->tcr0) & ~TCR_TPSC) | tmu_bit, &tmu->tcr0);
+	writew(readw(&tmu->tcr0) & ~TCR_TPSC, &tmu->tcr0);
 
 	tmu_timer_stop(0);
 	tmu_timer_start(0);