Convert CONFIG_SH_SCIF_CLK_FREQ to Kconfig

This converts the following to Kconfig:
   CONFIG_SH_SCIF_CLK_FREQ

Signed-off-by: Tom Rini <trini@konsulko.com>

diff --git a/configs/stout_defconfig b/configs/stout_defconfig
index 0502ae5d30671f4db40bcb48ed2b872d10a4677d..ea07ceb8f373c7df38c654cb4975ce25d0fd5d5e 100644 (file)
--- a/configs/stout_defconfig
+++ b/configs/stout_defconfig
@@ -88,6 +88,7 @@ CONFIG_DM_REGULATOR=y
 CONFIG_DM_REGULATOR_FIXED=y
 CONFIG_DM_REGULATOR_GPIO=y
 CONFIG_SCIF_CONSOLE=y
+CONFIG_SH_SCIF_CLK_FREQ=52000000
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_SH_QSPI=y

diff --git a/drivers/serial/Kconfig b/drivers/serial/Kconfig
index af01e506d54cf4cac3226c221fe788032c130c94..286c99800f01c5e5920e248043f2e7bbff156c24 100644 (file)
--- a/drivers/serial/Kconfig
+++ b/drivers/serial/Kconfig
@@ -825,6 +825,11 @@ config CONS_SCIFA0
 
 endchoice
 
+config SH_SCIF_CLK_FREQ
+       int "SCIF console clock frequency"
+       depends on SCIF_CONSOLE && (!DM_SERIAL || (SPL && !SPL_DM_SERIAL))
+       default 65000000
+
 config SEMIHOSTING_SERIAL
        bool "Semihosting UART support"
        depends on SEMIHOSTING && !SERIAL_RX_BUFFER

diff --git a/include/configs/alt.h b/include/configs/alt.h
index 1656072ebb4d0b26d49afdcad6b1fc08129b17dc..090bee7d2d662b3e4b07112ec9af991baa52a404 100644 (file)
--- a/include/configs/alt.h
+++ b/include/configs/alt.h
@@ -41,8 +41,5 @@
 /* SPL support */
 #define CONFIG_SPL_STACK               0xe6340000
 #define CONFIG_SPL_MAX_SIZE            0x4000
-#ifdef CONFIG_SPL_BUILD
-#define CONFIG_SH_SCIF_CLK_FREQ                65000000
-#endif
 
 #endif /* __ALT_H */

diff --git a/include/configs/armadillo-800eva.h b/include/configs/armadillo-800eva.h
index f144302a71d23e3397acd0d61ee4c2f1bd015da2..acd140ee35eed2d6149d8b65a5b189ecb0a9f820 100644 (file)
--- a/include/configs/armadillo-800eva.h
+++ b/include/configs/armadillo-800eva.h
@@ -67,7 +67,4 @@
 #define CONFIG_SH_ETHER_SH7734_MII     (0x01)
 #define CONFIG_SH_ETHER_PHY_MODE PHY_INTERFACE_MODE_MII
 
-/* Board Clock */
-#define CONFIG_SH_SCIF_CLK_FREQ get_board_sys_clk()
-
 #endif /* __ARMADILLO_800EVA_H */

diff --git a/include/configs/gose.h b/include/configs/gose.h
index 9015cabc2d17cfa017041f4635ae5005ea06c0c7..4ffa5bea8f83047011ee8181d924f8dfdac4d1ca 100644 (file)
--- a/include/configs/gose.h
+++ b/include/configs/gose.h
@@ -36,8 +36,5 @@
 /* SPL support */
 #define CONFIG_SPL_STACK               0xe6340000
 #define CONFIG_SPL_MAX_SIZE            0x4000
-#ifdef CONFIG_SPL_BUILD
-#define CONFIG_SH_SCIF_CLK_FREQ                65000000
-#endif
 
 #endif /* __GOSE_H */

diff --git a/include/configs/koelsch.h b/include/configs/koelsch.h
index 3fef4150b25c796e5ecd8b52579377c2cd1b9b16..c0997aa3ddd559404dfdf0b10d80c8d3f1de64f9 100644 (file)
--- a/include/configs/koelsch.h
+++ b/include/configs/koelsch.h
@@ -36,8 +36,5 @@
 /* SPL support */
 #define CONFIG_SPL_STACK               0xe6340000
 #define CONFIG_SPL_MAX_SIZE            0x4000
-#ifdef CONFIG_SPL_BUILD
-#define CONFIG_SH_SCIF_CLK_FREQ                65000000
-#endif
 
 #endif /* __KOELSCH_H */

diff --git a/include/configs/kzm9g.h b/include/configs/kzm9g.h
index f35549d95acb8b9b43b92908d6b0ffd903a3a7ed..7e99490e5271f5120acc9162fcf8df928cac718e 100644 (file)
--- a/include/configs/kzm9g.h
+++ b/include/configs/kzm9g.h
@@ -66,7 +66,6 @@
 /* Clock */
 #define CONFIG_GLOBAL_TIMER
 #define CONFIG_SYS_CPU_CLK     (1196000000)
-#define CONFIG_SH_SCIF_CLK_FREQ get_board_sys_clk()
 #define TMU_CLK_DIVIDER                (4)     /* 4 (default), 16, 64, 256 or 1024 */
 
 #endif /* __KZM9G_H */

diff --git a/include/configs/lager.h b/include/configs/lager.h
index df3b4bbce0722766caf40e1fb5662e88a85906f5..a5abbaaeab1fe2561c03aa03ae5afee2b313f0f7 100644 (file)
--- a/include/configs/lager.h
+++ b/include/configs/lager.h
@@ -37,8 +37,5 @@
 /* SPL support */
 #define CONFIG_SPL_STACK               0xe6340000
 #define CONFIG_SPL_MAX_SIZE            0x4000
-#ifdef CONFIG_SPL_BUILD
-#define CONFIG_SH_SCIF_CLK_FREQ                65000000
-#endif
 
 #endif /* __LAGER_H */

diff --git a/include/configs/porter.h b/include/configs/porter.h
index 964ce7def64bb18fbe9a6b57835439d6e153cfc5..bf380ddf05b030c1d8a85c576b774701be2ba514 100644 (file)
--- a/include/configs/porter.h
+++ b/include/configs/porter.h
@@ -41,8 +41,5 @@
 /* SPL support */
 #define CONFIG_SPL_STACK               0xe6340000
 #define CONFIG_SPL_MAX_SIZE            0x4000
-#ifdef CONFIG_SPL_BUILD
-#define CONFIG_SH_SCIF_CLK_FREQ                65000000
-#endif
 
 #endif /* __PORTER_H */

diff --git a/include/configs/rcar-gen3-common.h b/include/configs/rcar-gen3-common.h
index 5bb6bf3d78225bc17b79b5b4e6ecf24a78ea078e..64743382eda1beb7fe40afcdf66c9c20a2542257 100644 (file)
--- a/include/configs/rcar-gen3-common.h
+++ b/include/configs/rcar-gen3-common.h
@@ -59,8 +59,5 @@
 #endif
 #define CONFIG_SPL_STACK               0xe6304000
 #define CONFIG_SPL_MAX_SIZE            0x7000
-#ifdef CONFIG_SPL_BUILD
-#define CONFIG_SH_SCIF_CLK_FREQ                65000000
-#endif
 
 #endif /* __RCAR_GEN3_COMMON_H */

diff --git a/include/configs/silk.h b/include/configs/silk.h
index ec8740b3826d7cdaa64f98a2aee11e5f937cc000..574ba228d8a1fc92a9a9517c49224ef5abcb7df7 100644 (file)
--- a/include/configs/silk.h
+++ b/include/configs/silk.h
@@ -41,8 +41,5 @@
 /* SPL support */
 #define CONFIG_SPL_STACK               0xe6340000
 #define CONFIG_SPL_MAX_SIZE            0x4000
-#ifdef CONFIG_SPL_BUILD
-#define CONFIG_SH_SCIF_CLK_FREQ                65000000
-#endif
 
 #endif /* __SILK_H */

diff --git a/include/configs/stout.h b/include/configs/stout.h
index 4ddbea5b1d061eee975184b44183a52a4d677503..bcc6fcd36b30d02ea350ad3e58d57d9e16c2afe4 100644 (file)
--- a/include/configs/stout.h
+++ b/include/configs/stout.h
@@ -45,8 +45,5 @@
 /* SPL support */
 #define CONFIG_SPL_STACK               0xe6340000
 #define CONFIG_SPL_MAX_SIZE            0x4000
-#ifdef CONFIG_SPL_BUILD
-#define CONFIG_SH_SCIF_CLK_FREQ                52000000
-#endif
 
 #endif /* __STOUT_H */