sh: tmu: Clean up CONFIG_SYS_TMU_CLK_DIV

This constant is always 4 , for all boards that exist. Define it
once in arch/sh/lib/time.c and remove it from the configs.

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 eb64296..aac7988 100644 (file)
--- a/arch/sh/lib/time.c
+++ b/arch/sh/lib/time.c
@@ -16,6 +16,7 @@
 #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;
 

diff --git a/include/configs/MigoR.h b/include/configs/MigoR.h
index 5cb2348..57e36e8 100644 (file)
--- a/include/configs/MigoR.h
+++ b/include/configs/MigoR.h
@@ -93,6 +93,5 @@
 #define CONFIG_SYS_CLK_FREQ    33333333
 #define CONFIG_SH_TMU_CLK_FREQ CONFIG_SYS_CLK_FREQ
 #define CONFIG_SH_SCIF_CLK_FREQ CONFIG_SYS_CLK_FREQ
-#define CONFIG_SYS_TMU_CLK_DIV         (4)     /* 4 (default), 16, 64, 256 or 1024 */
 
 #endif /* __MIGO_R_H */

diff --git a/include/configs/alt.h b/include/configs/alt.h
index d44a0b3..d884831 100644 (file)
--- a/include/configs/alt.h
+++ b/include/configs/alt.h
@@ -39,7 +39,6 @@
 #define CONFIG_SYS_CLK_FREQ    RMOBILE_XTAL_CLK
 #define CONFIG_SH_TMU_CLK_FREQ (CONFIG_SYS_CLK_FREQ / 2)
 
-#define CONFIG_SYS_TMU_CLK_DIV 4
 
 #define CONFIG_EXTRA_ENV_SETTINGS      \
        "fdt_high=0xffffffff\0"         \

diff --git a/include/configs/ap325rxa.h b/include/configs/ap325rxa.h
index 8680eb6..a6e6a43 100644 (file)
--- a/include/configs/ap325rxa.h
+++ b/include/configs/ap325rxa.h
@@ -114,6 +114,5 @@
 #define CONFIG_SYS_CLK_FREQ    33333333
 #define CONFIG_SH_TMU_CLK_FREQ CONFIG_SYS_CLK_FREQ
 #define CONFIG_SH_SCIF_CLK_FREQ CONFIG_SYS_CLK_FREQ
-#define CONFIG_SYS_TMU_CLK_DIV         (4)     /* 4 (default), 16, 64, 256 or 1024 */
 
 #endif /* __AP325RXA_H */

diff --git a/include/configs/ap_sh4a_4a.h b/include/configs/ap_sh4a_4a.h
index a4bdd44..c8e22de 100644 (file)
--- a/include/configs/ap_sh4a_4a.h
+++ b/include/configs/ap_sh4a_4a.h
@@ -102,6 +102,5 @@
 #endif
 #define CONFIG_SH_TMU_CLK_FREQ CONFIG_SYS_CLK_FREQ
 #define CONFIG_SH_SCIF_CLK_FREQ CONFIG_SYS_CLK_FREQ
-#define CONFIG_SYS_TMU_CLK_DIV      4
 
 #endif /* __AP_SH4A_4A_H */

diff --git a/include/configs/armadillo-800eva.h b/include/configs/armadillo-800eva.h
index c0e1740..f14ea9a 100644 (file)
--- a/include/configs/armadillo-800eva.h
+++ b/include/configs/armadillo-800eva.h
@@ -93,6 +93,5 @@
 #define CONFIG_SYS_CLK_FREQ    50000000
 #define CONFIG_SH_TMU_CLK_FREQ CONFIG_SYS_CLK_FREQ
 #define CONFIG_SH_SCIF_CLK_FREQ CONFIG_SYS_CLK_FREQ
-#define CONFIG_SYS_TMU_CLK_DIV 4
 
 #endif /* __ARMADILLO_800EVA_H */

diff --git a/include/configs/blanche.h b/include/configs/blanche.h
index 6df0e9b..7a5abf9 100644 (file)
--- a/include/configs/blanche.h
+++ b/include/configs/blanche.h
@@ -53,7 +53,6 @@
 #define RMOBILE_XTAL_CLK       20000000u
 #define CONFIG_SYS_CLK_FREQ    RMOBILE_XTAL_CLK
 #define CONFIG_SH_TMU_CLK_FREQ (CONFIG_SYS_CLK_FREQ / 2) /* EXT / 2 */
-#define CONFIG_SYS_TMU_CLK_DIV 4
 
 /* ENV setting */
 #if !defined(CONFIG_MTD_NOR_FLASH)

diff --git a/include/configs/ecovec.h b/include/configs/ecovec.h
index e99564d..9084d2e 100644 (file)
--- a/include/configs/ecovec.h
+++ b/include/configs/ecovec.h
@@ -133,6 +133,5 @@
 #define CONFIG_SYS_CLK_FREQ 41666666
 #define CONFIG_SH_TMU_CLK_FREQ CONFIG_SYS_CLK_FREQ
 #define CONFIG_SH_SCIF_CLK_FREQ CONFIG_SYS_CLK_FREQ
-#define CONFIG_SYS_TMU_CLK_DIV      4
 
 #endif /* __ECOVEC_H */

diff --git a/include/configs/espt.h b/include/configs/espt.h
index 978a9e0..fe8b84c 100644 (file)
--- a/include/configs/espt.h
+++ b/include/configs/espt.h
@@ -71,7 +71,6 @@
 #define CONFIG_SYS_CLK_FREQ    66666666
 #define CONFIG_SH_TMU_CLK_FREQ CONFIG_SYS_CLK_FREQ
 #define CONFIG_SH_SCIF_CLK_FREQ CONFIG_SYS_CLK_FREQ
-#define CONFIG_SYS_TMU_CLK_DIV      4
 
 /* Ether */
 #define CONFIG_SH_ETHER_USE_PORT (1)

diff --git a/include/configs/gose.h b/include/configs/gose.h
index 00523d2..53d9322 100644 (file)
--- a/include/configs/gose.h
+++ b/include/configs/gose.h
@@ -35,7 +35,6 @@
 #define CONFIG_SYS_CLK_FREQ    RMOBILE_XTAL_CLK
 #define CONFIG_SH_TMU_CLK_FREQ (CONFIG_SYS_CLK_FREQ / 2)
 
-#define CONFIG_SYS_TMU_CLK_DIV 4
 
 #define CONFIG_EXTRA_ENV_SETTINGS      \
        "fdt_high=0xffffffff\0"         \

diff --git a/include/configs/koelsch.h b/include/configs/koelsch.h
index e5e667c..2479b7c 100644 (file)
--- a/include/configs/koelsch.h
+++ b/include/configs/koelsch.h
@@ -35,7 +35,6 @@
 #define CONFIG_SYS_CLK_FREQ    RMOBILE_XTAL_CLK
 #define CONFIG_SH_TMU_CLK_FREQ (CONFIG_SYS_CLK_FREQ / 2)
 
-#define CONFIG_SYS_TMU_CLK_DIV 4
 
 #define CONFIG_EXTRA_ENV_SETTINGS      \
        "fdt_high=0xffffffff\0"         \

diff --git a/include/configs/lager.h b/include/configs/lager.h
index ebcd179..4bff60f 100644 (file)
--- a/include/configs/lager.h
+++ b/include/configs/lager.h
@@ -36,7 +36,6 @@
 #define CONFIG_SYS_CLK_FREQ    RMOBILE_XTAL_CLK
 #define CONFIG_SH_TMU_CLK_FREQ (CONFIG_SYS_CLK_FREQ / 2)
 
-#define CONFIG_SYS_TMU_CLK_DIV 4
 
 #define CONFIG_EXTRA_ENV_SETTINGS      \
        "fdt_high=0xffffffff\0"         \

diff --git a/include/configs/mpr2.h b/include/configs/mpr2.h
index c6023a1..762d83c 100644 (file)
--- a/include/configs/mpr2.h
+++ b/include/configs/mpr2.h
@@ -51,7 +51,6 @@
 #define CONFIG_SYS_CLK_FREQ    24000000
 #define CONFIG_SH_TMU_CLK_FREQ CONFIG_SYS_CLK_FREQ
 #define CONFIG_SH_SCIF_CLK_FREQ CONFIG_SYS_CLK_FREQ
-#define CONFIG_SYS_TMU_CLK_DIV         4       /* 4 (default), 16, 64, 256 or 1024 */
 
 /* UART */
 #define CONFIG_CONS_SCIF0      1

diff --git a/include/configs/ms7720se.h b/include/configs/ms7720se.h
index e717970..60cc3ef 100644 (file)
--- a/include/configs/ms7720se.h
+++ b/include/configs/ms7720se.h
@@ -62,7 +62,6 @@
 #define CONFIG_SYS_CLK_FREQ    33333333
 #define CONFIG_SH_TMU_CLK_FREQ CONFIG_SYS_CLK_FREQ
 #define CONFIG_SH_SCIF_CLK_FREQ CONFIG_SYS_CLK_FREQ
-#define CONFIG_SYS_TMU_CLK_DIV         4       /* 4 (default), 16, 64, 256 or 1024 */
 
 /* PCMCIA */
 #define CONFIG_IDE_PCMCIA      1

diff --git a/include/configs/ms7722se.h b/include/configs/ms7722se.h
index 1232764..8a5fa97 100644 (file)
--- a/include/configs/ms7722se.h
+++ b/include/configs/ms7722se.h
@@ -84,6 +84,5 @@
 #define CONFIG_SYS_CLK_FREQ    33333333
 #define CONFIG_SH_TMU_CLK_FREQ CONFIG_SYS_CLK_FREQ
 #define CONFIG_SH_SCIF_CLK_FREQ CONFIG_SYS_CLK_FREQ
-#define CONFIG_SYS_TMU_CLK_DIV         (4)     /* 4 (default), 16, 64, 256 or 1024 */
 
 #endif /* __MS7722SE_H */

diff --git a/include/configs/ms7750se.h b/include/configs/ms7750se.h
index b2cb6ba..4cad167 100644 (file)
--- a/include/configs/ms7750se.h
+++ b/include/configs/ms7750se.h
@@ -64,6 +64,5 @@
 #define CONFIG_SYS_CLK_FREQ    33333333
 #define CONFIG_SH_TMU_CLK_FREQ CONFIG_SYS_CLK_FREQ
 #define CONFIG_SH_SCIF_CLK_FREQ CONFIG_SYS_CLK_FREQ
-#define CONFIG_SYS_TMU_CLK_DIV         4
 
 #endif /* __MS7750SE_H */

diff --git a/include/configs/porter.h b/include/configs/porter.h
index 42b9073..be1b5ff 100644 (file)
--- a/include/configs/porter.h
+++ b/include/configs/porter.h
@@ -40,7 +40,6 @@
 #define CONFIG_SYS_CLK_FREQ    RMOBILE_XTAL_CLK
 #define CONFIG_SH_TMU_CLK_FREQ (CONFIG_SYS_CLK_FREQ / 2)
 
-#define CONFIG_SYS_TMU_CLK_DIV 4
 
 #define CONFIG_EXTRA_ENV_SETTINGS      \
        "fdt_high=0xffffffff\0"         \

diff --git a/include/configs/r0p7734.h b/include/configs/r0p7734.h
index 523764d..9c4468c 100644 (file)
--- a/include/configs/r0p7734.h
+++ b/include/configs/r0p7734.h
@@ -100,6 +100,5 @@
 #endif
 #define CONFIG_SH_TMU_CLK_FREQ CONFIG_SYS_CLK_FREQ
 #define CONFIG_SH_SCIF_CLK_FREQ CONFIG_SYS_CLK_FREQ
-#define CONFIG_SYS_TMU_CLK_DIV      4
 
 #endif /* __R0P7734_H */

diff --git a/include/configs/r2dplus.h b/include/configs/r2dplus.h
index 129dcf3..33a4420 100644 (file)
--- a/include/configs/r2dplus.h
+++ b/include/configs/r2dplus.h
@@ -48,7 +48,6 @@
 #define CONFIG_SYS_CLK_FREQ    60000000
 #define CONFIG_SH_TMU_CLK_FREQ CONFIG_SYS_CLK_FREQ
 #define CONFIG_SH_SCIF_CLK_FREQ CONFIG_SYS_CLK_FREQ
-#define CONFIG_SYS_TMU_CLK_DIV         4
 #define        CONFIG_SYS_PLL_SETTLING_TIME    100/* in us */
 
 /*

diff --git a/include/configs/r7780mp.h b/include/configs/r7780mp.h
index 8068ca7..a89e621 100644 (file)
--- a/include/configs/r7780mp.h
+++ b/include/configs/r7780mp.h
@@ -73,7 +73,6 @@
 #define CONFIG_SYS_CLK_FREQ    33333333
 #define CONFIG_SH_TMU_CLK_FREQ CONFIG_SYS_CLK_FREQ
 #define CONFIG_SH_SCIF_CLK_FREQ CONFIG_SYS_CLK_FREQ
-#define CONFIG_SYS_TMU_CLK_DIV         4
 
 /* PCI Controller */
 #if defined(CONFIG_CMD_PCI)

diff --git a/include/configs/sh7752evb.h b/include/configs/sh7752evb.h
index 9b40e0f..289630a 100644 (file)
--- a/include/configs/sh7752evb.h
+++ b/include/configs/sh7752evb.h
@@ -77,5 +77,4 @@
 #define CONFIG_SYS_CLK_FREQ    48000000
 #define CONFIG_SH_TMU_CLK_FREQ CONFIG_SYS_CLK_FREQ
 #define CONFIG_SH_SCIF_CLK_FREQ CONFIG_SYS_CLK_FREQ
-#define CONFIG_SYS_TMU_CLK_DIV 4
 #endif /* __SH7752EVB_H */

diff --git a/include/configs/sh7753evb.h b/include/configs/sh7753evb.h
index 080b405..b58673a 100644 (file)
--- a/include/configs/sh7753evb.h
+++ b/include/configs/sh7753evb.h
@@ -77,5 +77,4 @@
 #define CONFIG_SYS_CLK_FREQ    48000000
 #define CONFIG_SH_TMU_CLK_FREQ CONFIG_SYS_CLK_FREQ
 #define CONFIG_SH_SCIF_CLK_FREQ CONFIG_SYS_CLK_FREQ
-#define CONFIG_SYS_TMU_CLK_DIV 4
 #endif /* __SH7753EVB_H */

diff --git a/include/configs/sh7757lcr.h b/include/configs/sh7757lcr.h
index 95d70bc..78606f3 100644 (file)
--- a/include/configs/sh7757lcr.h
+++ b/include/configs/sh7757lcr.h
@@ -89,5 +89,4 @@
 #define CONFIG_SYS_CLK_FREQ    48000000
 #define CONFIG_SH_TMU_CLK_FREQ CONFIG_SYS_CLK_FREQ
 #define CONFIG_SH_SCIF_CLK_FREQ CONFIG_SYS_CLK_FREQ
-#define CONFIG_SYS_TMU_CLK_DIV 4
 #endif /* __SH7757LCR_H */

diff --git a/include/configs/sh7763rdp.h b/include/configs/sh7763rdp.h
index 4015fb2..53fe450 100644 (file)
--- a/include/configs/sh7763rdp.h
+++ b/include/configs/sh7763rdp.h
@@ -71,7 +71,6 @@
 #define CONFIG_SYS_CLK_FREQ    66666666
 #define CONFIG_SH_TMU_CLK_FREQ CONFIG_SYS_CLK_FREQ
 #define CONFIG_SH_SCIF_CLK_FREQ CONFIG_SYS_CLK_FREQ
-#define CONFIG_SYS_TMU_CLK_DIV         (4)     /* 4 (default), 16, 64, 256 or 1024 */
 
 /* Ether */
 #define CONFIG_SH_ETHER_USE_PORT (1)

diff --git a/include/configs/sh7785lcr.h b/include/configs/sh7785lcr.h
index 38ae66b..6585298 100644 (file)
--- a/include/configs/sh7785lcr.h
+++ b/include/configs/sh7785lcr.h
@@ -128,6 +128,5 @@
 #define CONFIG_SYS_CLK_FREQ    50000000
 #define CONFIG_SH_TMU_CLK_FREQ CONFIG_SYS_CLK_FREQ
 #define CONFIG_SH_SCIF_CLK_FREQ CONFIG_SYS_CLK_FREQ
-#define CONFIG_SYS_TMU_CLK_DIV         4
 
 #endif /* __SH7785LCR_H */

diff --git a/include/configs/shmin.h b/include/configs/shmin.h
index aada22d..df98f55 100644 (file)
--- a/include/configs/shmin.h
+++ b/include/configs/shmin.h
@@ -80,7 +80,6 @@
 #endif /* CONFIG_T_SH7706LSR */
 #define CONFIG_SH_TMU_CLK_FREQ CONFIG_SYS_CLK_FREQ
 #define CONFIG_SH_SCIF_CLK_FREQ CONFIG_SYS_CLK_FREQ
-#define CONFIG_SYS_TMU_CLK_DIV 4
 
 /* Network device */
 #define CONFIG_DRIVER_NE2000

diff --git a/include/configs/silk.h b/include/configs/silk.h
index 549aa79..ad14c5c 100644 (file)
--- a/include/configs/silk.h
+++ b/include/configs/silk.h
@@ -40,7 +40,6 @@
 #define CONFIG_SYS_CLK_FREQ    RMOBILE_XTAL_CLK
 #define CONFIG_SH_TMU_CLK_FREQ (CONFIG_SYS_CLK_FREQ / 2)
 
-#define CONFIG_SYS_TMU_CLK_DIV 4
 
 #define CONFIG_EXTRA_ENV_SETTINGS      \
        "fdt_high=0xffffffff\0"         \

diff --git a/include/configs/stout.h b/include/configs/stout.h
index eab0ef2..cc1cc84 100644 (file)
--- a/include/configs/stout.h
+++ b/include/configs/stout.h
@@ -44,7 +44,6 @@
 #define CONFIG_SYS_CLK_FREQ    RMOBILE_XTAL_CLK
 #define CONFIG_SH_TMU_CLK_FREQ (CONFIG_SYS_CLK_FREQ / 2)
 
-#define CONFIG_SYS_TMU_CLK_DIV 4
 
 #define CONFIG_EXTRA_ENV_SETTINGS      \
        "fdt_high=0xffffffff\0"         \

diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 30c79a6..94953d8 100644 (file)
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -4277,7 +4277,6 @@ CONFIG_SYS_TMRINTR_PEND
 CONFIG_SYS_TMRINTR_PRI
 CONFIG_SYS_TMRPND_REG
 CONFIG_SYS_TMR_BASE
-CONFIG_SYS_TMU_CLK_DIV
 CONFIG_SYS_TSEC1
 CONFIG_SYS_TSEC1_OFFSET
 CONFIG_SYS_TSEC2