From 0e286c529f395947dbb96da93081883aca40a57f Mon Sep 17 00:00:00 2001
From: Marek Vasut <marek.vasut+renesas@gmail.com>
Date: Fri, 24 Aug 2018 21:52:53 +0200
Subject: [PATCH] sh: tmu: Zap get_tbclk and timer_read_counter

Replace those two functions with generic ones by defining the
timer macros in include/config/*.h .

Signed-off-by: Marek Vasut <marek.vasut+renesas@gmail.com>
---
 arch/sh/include/asm/config.h       |  9 +++++++++
 arch/sh/lib/time.c                 | 16 ----------------
 include/configs/armadillo-800eva.h |  3 +++
 include/configs/rcar-gen2-common.h |  7 ++++++-
 4 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/arch/sh/include/asm/config.h b/arch/sh/include/asm/config.h
index bad0026648..d2862df4a5 100644
--- a/arch/sh/include/asm/config.h
+++ b/arch/sh/include/asm/config.h
@@ -6,4 +6,13 @@
 #ifndef _ASM_CONFIG_H_
 #define _ASM_CONFIG_H_
 
+#if !defined(CONFIG_CPU_SH2)
+#include <asm/processor.h>
+
+/* Timer */
+#define CONFIG_SYS_TIMER_COUNTS_DOWN
+#define CONFIG_SYS_TIMER_COUNTER	(TMU_BASE + 0x8)	/* TCNT0 */
+#define CONFIG_SYS_TIMER_RATE		(CONFIG_SYS_CLK_FREQ / 4)
+#endif
+
 #endif
diff --git a/arch/sh/lib/time.c b/arch/sh/lib/time.c
index d531a4958e..fb317f95d5 100644
--- a/arch/sh/lib/time.c
+++ b/arch/sh/lib/time.c
@@ -16,33 +16,17 @@
 
 #if defined(CONFIG_CPU_SH3)
 #define TSTR	0x2
-#define TCNT0	0x8
 #define TCR0	0xc
 #endif /* CONFIG_CPU_SH3 */
 
 #if defined(CONFIG_CPU_SH4) || defined(CONFIG_ARCH_RMOBILE)
 #define TSTR	0x4
-#define TCNT0	0xc
 #define TCR0	0x10
 #endif /* CONFIG_CPU_SH4 */
 
 #define TCR_TPSC	0x07
 #define TSTR_STR0	BIT(0)
 
-unsigned long get_tbclk(void)
-{
-#ifdef CONFIG_RCAR_GEN2
-	return CONFIG_SYS_CLK_FREQ / 8;
-#else
-	return CONFIG_SYS_CLK_FREQ / 4;
-#endif
-}
-
-unsigned long timer_read_counter(void)
-{
-	return ~readl(TMU_BASE + TCNT0);
-}
-
 int timer_init(void)
 {
 	writew(readw(TMU_BASE + TCR0) & ~TCR_TPSC, TMU_BASE + TCR0);
diff --git a/include/configs/armadillo-800eva.h b/include/configs/armadillo-800eva.h
index b17d597766..3c6b2c3cd7 100644
--- a/include/configs/armadillo-800eva.h
+++ b/include/configs/armadillo-800eva.h
@@ -18,6 +18,9 @@
 
 #define CONFIG_ARCH_CPU_INIT
 #define CONFIG_TMU_TIMER
+#define CONFIG_SYS_TIMER_COUNTS_DOWN
+#define CONFIG_SYS_TIMER_COUNTER	(TMU_BASE + 0xc)	/* TCNT0 */
+#define CONFIG_SYS_TIMER_RATE		(CONFIG_SYS_CLK_FREQ / 4)
 #define CONFIG_SYS_DCACHE_OFF
 
 /* STACK */
diff --git a/include/configs/rcar-gen2-common.h b/include/configs/rcar-gen2-common.h
index 2a5cd6b832..d606da8b0e 100644
--- a/include/configs/rcar-gen2-common.h
+++ b/include/configs/rcar-gen2-common.h
@@ -22,7 +22,6 @@
 
 #define CONFIG_ARCH_CPU_INIT
 
-#define CONFIG_TMU_TIMER
 #ifndef CONFIG_PINCTRL_PFC
 #define CONFIG_SH_GPIO_PFC
 #endif
@@ -57,4 +56,10 @@
 #undef CONFIG_SPI_FLASH_MTD
 #endif
 
+/* Timer */
+#define CONFIG_TMU_TIMER
+#define CONFIG_SYS_TIMER_COUNTS_DOWN
+#define CONFIG_SYS_TIMER_COUNTER	(TMU_BASE + 0xc)	/* TCNT0 */
+#define CONFIG_SYS_TIMER_RATE		(CONFIG_SYS_CLK_FREQ / 8)
+
 #endif	/* __RCAR_GEN2_COMMON_H */