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 eb642969aab494ab5508ce7937448dd9c42be40b..aac79889dc9c8c73df4effa7190513187193d198 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 5cb23482fef4cebe88d7a40f7346f396a4540a21..57e36e86056c49f5eef6a6e8a77b7cab120b3412 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 d44a0b3007e783d0773f99c1908c60d362d7df28..d884831d9628030510c3b93b82805d0d142346e8 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 8680eb6ef5fd8c3b714fa41ab24b233f8b827504..a6e6a436b06398154e17080ff47cb62e14368dc6 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 a4bdd44a9e8c85c6ead7d5880cf623b273eb1724..c8e22de4b8fe10478920c848f0992fe04da3fcdd 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 c0e1740219505b5fca99ac893c4ca3360ec72103..f14ea9a4b1e7436ca015856a1481f9efd644599e 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 6df0e9bcc0989f64ae2c0811bf59284e7a7b97bd..7a5abf99de60972a1b5044da3f7eb3dcfac22f88 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 e99564dbdf72c1257ac2b609eaae47863b72f485..9084d2e4c30759ca29c673f27bd9f92843bc7a73 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 978a9e006bbc22fa886dde649c29f46099266eef..fe8b84c7a5ebc7f96e12f696577f3fec85302b59 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 00523d2fc4c4e48deab4d714de1dd58c96a4f050..53d9322967ea94ce41dcd1c6b4d35d16cd6b52a6 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 e5e667ce331d004916da51763047af8a9caf19fd..2479b7c74ac7c099352c86b7cda32665188cfd21 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 ebcd179ffd7f93d44b31f4778fae3aa1c7de7a85..4bff60fbe3e9ad21801abf84840bc316f4281191 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 c6023a1e1b63f049631d819e525dc322f8e26bf6..762d83c0e5e92d24a8000ae562f84a243bdbc027 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 e7179705c9eca6eccb110636245fd479366f2fa0..60cc3efcdce13686ac7671f21b9bfea53e5e0d49 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 12327641fb71e44d8cdde5a3cae15b69be224d38..8a5fa97b3d92426dbf001dee67501bcd422c673d 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 b2cb6bab7c97eae5fcd3ef7973056a4ae315286b..4cad1672053a8b037a945f9a1808745af8aadac6 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 42b90730064d1ae161bde1465e1371465373f088..be1b5ff7f034d98d45195cf437a951a35eae9c0e 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 523764d8e9307bcceffafb6413cf1f5c8e3016d2..9c4468ce7028096d038e2069a3faa14ab45125eb 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 129dcf33982e7e9ee97b5b34a6efc63a098af321..33a4420cd2f69faafceb32ca68e34be3475d05f4 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 8068ca795754950b4018d2c1001e8ee424137e21..a89e621b866c79ad243d09229d0663f534efbaf6 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 9b40e0f063e4b261dff9f9f23bdbc6022d0a6dce..289630a9eeb95ab93a624d015d73a28243e4f0c4 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 080b4055cfbfb283db6aa650cbdd2815d09bb7bc..b58673a2305b731600816322622fda5355cb2513 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 95d70bc6e7161466d87013d2535b7cd82e956932..78606f3f6c2ed7f93984d0e7a000789e02e1a643 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 4015fb2d2a5d674d95a72a3f74cad815a0b38169..53fe45009eee77666ae4bf176d9348df547dc3aa 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 38ae66b90c244d6b14c1e24d2126c3b08f03f53a..6585298f18b3454e37206b25d9a76d00903e832d 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 aada22df5cea343b7053443d001e28a1d02b6af4..df98f5566c0abce6195ca0a830911c80edb6df64 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 549aa79233a17ab49b8eee18870c3686fcdb5b11..ad14c5ccf27ef3e0a6a088aaef3cfa9494d0d403 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 eab0ef213ac0e991f580136ac2e41d4c580616aa..cc1cc84fc0a72024a2f076faca0850d0766d0a63 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 30c79a643e4b5f71b42146beffb6e789cd94eb5a..94953d87380290504b5d3af1b60ed15c8fe7979f 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