sh3/sh4: rename config option TMU_CLK_DIVIDER to CONFIG_SYS_TMU_CLK_DIV

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Cc: Nobuhiro Iwamatsu <iwamatsu.nobuhiro@renesas.com>
Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>

diff --git a/include/configs/MigoR.h b/include/configs/MigoR.h
index 6ef4c01ec91da8e1e703814fc04ad716cd34173c..3853574fcbe90a3bae708cfe250486f40195e132 100644 (file)
--- a/include/configs/MigoR.h
+++ b/include/configs/MigoR.h
@@ -141,7 +141,7 @@
 
 /* Board Clock */
 #define CONFIG_SYS_CLK_FREQ    33333333
-#define TMU_CLK_DIVIDER                (4)     /* 4 (default), 16, 64, 256 or 1024 */
+#define CONFIG_SYS_TMU_CLK_DIV         (4)     /* 4 (default), 16, 64, 256 or 1024 */
 #define CONFIG_SYS_HZ          1000
 
 #endif /* __MIGO_R_H */

diff --git a/include/configs/ap325rxa.h b/include/configs/ap325rxa.h
index 550d67f9d4cbd9af8e7eacb8e63b3e6e9839250e..6f58a05692ff60eff7e2334334cea504fa834ed0 100644 (file)
--- a/include/configs/ap325rxa.h
+++ b/include/configs/ap325rxa.h
@@ -170,7 +170,7 @@
 
 /* Board Clock */
 #define CONFIG_SYS_CLK_FREQ    33333333
-#define TMU_CLK_DIVIDER                (4)     /* 4 (default), 16, 64, 256 or 1024 */
+#define CONFIG_SYS_TMU_CLK_DIV         (4)     /* 4 (default), 16, 64, 256 or 1024 */
 #define CONFIG_SYS_HZ          1000
 
 #endif /* __AP325RXA_H */

diff --git a/include/configs/mpr2.h b/include/configs/mpr2.h
index c1473373637725398435ffeeb6f2853bcc69d4b2..0a472a65817f1355ebcc1b154a58e4af6ee730a8 100644 (file)
--- a/include/configs/mpr2.h
+++ b/include/configs/mpr2.h
@@ -82,7 +82,7 @@
 
 /* Clocks */
 #define CONFIG_SYS_CLK_FREQ    24000000
-#define TMU_CLK_DIVIDER                4       /* 4 (default), 16, 64, 256 or 1024 */
+#define CONFIG_SYS_TMU_CLK_DIV         4       /* 4 (default), 16, 64, 256 or 1024 */
 #define CONFIG_SYS_HZ          1000
 
 /* UART */

diff --git a/include/configs/ms7720se.h b/include/configs/ms7720se.h
index f2e51220c3c20e5ed4298486572dc3c03131fadd..ba0a3f8043dfd9a6bb037958a9ecda16d3e7e5dc 100644 (file)
--- a/include/configs/ms7720se.h
+++ b/include/configs/ms7720se.h
@@ -101,7 +101,7 @@
 
 /* Board Clock */
 #define CONFIG_SYS_CLK_FREQ    33333333
-#define TMU_CLK_DIVIDER                4       /* 4 (default), 16, 64, 256 or 1024 */
+#define CONFIG_SYS_TMU_CLK_DIV         4       /* 4 (default), 16, 64, 256 or 1024 */
 #define CONFIG_SYS_HZ          1000
 
 /* PCMCIA */

diff --git a/include/configs/ms7722se.h b/include/configs/ms7722se.h
index e83bd0828e6ac26196a0aca52502325adc3183d0..6755af3d5960fd2b941d3f01fef40a49fcb8d8a1 100644 (file)
--- a/include/configs/ms7722se.h
+++ b/include/configs/ms7722se.h
@@ -128,7 +128,7 @@
 
 /* Board Clock */
 #define CONFIG_SYS_CLK_FREQ    33333333
-#define TMU_CLK_DIVIDER                (4)     /* 4 (default), 16, 64, 256 or 1024 */
+#define CONFIG_SYS_TMU_CLK_DIV         (4)     /* 4 (default), 16, 64, 256 or 1024 */
 #define CONFIG_SYS_HZ          1000
 
 #endif /* __MS7722SE_H */

diff --git a/include/configs/ms7750se.h b/include/configs/ms7750se.h
index 67af2099770489a465d513e202b7bf23309e415c..8c06bf27363654593ad09ed8bdecf45182da2199 100644 (file)
--- a/include/configs/ms7750se.h
+++ b/include/configs/ms7750se.h
@@ -101,7 +101,7 @@
 
 /* Board Clock */
 #define CONFIG_SYS_CLK_FREQ    33333333
-#define TMU_CLK_DIVIDER                4
+#define CONFIG_SYS_TMU_CLK_DIV         4
 #define CONFIG_SYS_HZ          1000
 
 #endif /* __MS7750SE_H */

diff --git a/include/configs/r2dplus.h b/include/configs/r2dplus.h
index 804e3b846092dafc36eae5c75b7e5c737b5afdd0..25f50125e7b6ac99ddf0bbaea4fb5229e2770d23 100644 (file)
--- a/include/configs/r2dplus.h
+++ b/include/configs/r2dplus.h
@@ -80,7 +80,7 @@
  * SuperH Clock setting
  */
 #define CONFIG_SYS_CLK_FREQ    60000000
-#define TMU_CLK_DIVIDER                4
+#define CONFIG_SYS_TMU_CLK_DIV         4
 #define CONFIG_SYS_HZ          1000
 #define        CONFIG_SYS_PLL_SETTLING_TIME    100/* in us */
 

diff --git a/include/configs/r7780mp.h b/include/configs/r7780mp.h
index 7b6867d101ecdd2e6de41bb1ebbb547c212d348c..01b64e666d815d1d28883f598a9e1518d4002658 100644 (file)
--- a/include/configs/r7780mp.h
+++ b/include/configs/r7780mp.h
@@ -121,7 +121,7 @@
 
 /* Board Clock */
 #define CONFIG_SYS_CLK_FREQ    33333333
-#define TMU_CLK_DIVIDER                4
+#define CONFIG_SYS_TMU_CLK_DIV         4
 #define CONFIG_SYS_HZ          1000
 
 /* PCI Controller */

diff --git a/include/configs/sh7763rdp.h b/include/configs/sh7763rdp.h
index 79631be58a9fc0f619e4b183d711812dd7d065ce..c8c62ad76e391177482680110fe835a4cc681403 100644 (file)
--- a/include/configs/sh7763rdp.h
+++ b/include/configs/sh7763rdp.h
@@ -114,7 +114,7 @@
 
 /* Clock */
 #define CONFIG_SYS_CLK_FREQ    66666666
-#define TMU_CLK_DIVIDER                (4)     /* 4 (default), 16, 64, 256 or 1024 */
+#define CONFIG_SYS_TMU_CLK_DIV         (4)     /* 4 (default), 16, 64, 256 or 1024 */
 #define CONFIG_SYS_HZ          1000
 
 /* Ether */

diff --git a/include/configs/sh7785lcr.h b/include/configs/sh7785lcr.h
index 9b4defd911e9a0516f3311e32294bdcd5469e192..2c18e2f7fdf1e039a0c664740bcd0b00a60cd1ac 100644 (file)
--- a/include/configs/sh7785lcr.h
+++ b/include/configs/sh7785lcr.h
@@ -186,7 +186,7 @@
 /* Board Clock */
 /* The SCIF used external clock. system clock only used timer. */
 #define CONFIG_SYS_CLK_FREQ    50000000
-#define TMU_CLK_DIVIDER                4
+#define CONFIG_SYS_TMU_CLK_DIV         4
 #define CONFIG_SYS_HZ          1000
 
 #endif /* __SH7785LCR_H */

diff --git a/lib_sh/time.c b/lib_sh/time.c
index dc1c57e975151b7cef5d22760df3caf315c60373..52dbcd06116860843a00cdfaf6770f72573be0cc 100644 (file)
--- a/lib_sh/time.c
+++ b/lib_sh/time.c
@@ -69,10 +69,10 @@ static void tmu_timer_stop (unsigned int timer)
 
 int timer_init (void)
 {
-       /* Divide clock by TMU_CLK_DIVIDER */
+       /* Divide clock by CONFIG_SYS_TMU_CLK_DIV */
        u16 bit = 0;
 
-       switch (TMU_CLK_DIVIDER) {
+       switch (CONFIG_SYS_TMU_CLK_DIV) {
        case 1024:
                bit = 4;
                break;