wdt: Unify option of timeout value

There is no need to duplicate same option with different name.

Kill HW_WATCHDOG_TIMEOUT_MS in favor of WATCHDOG_TIMEOUT_MSECS.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
Reviewed-by: Heiko Schocher <hs@denx.de>

diff --git a/drivers/watchdog/designware_wdt.c b/drivers/watchdog/designware_wdt.c
index e788e1b65d0aa4bd549b002bc41a6c2696798a93..8ec094d99448d51d0ca338234c0f5ef9b59e1eb4 100644 (file)
--- a/drivers/watchdog/designware_wdt.c
+++ b/drivers/watchdog/designware_wdt.c
@@ -65,7 +65,7 @@ void hw_watchdog_init(void)
        /* reset to disable the watchdog */
        hw_watchdog_reset();
        /* set timer in miliseconds */
-       designware_wdt_settimeout(CONFIG_HW_WATCHDOG_TIMEOUT_MS);
+       designware_wdt_settimeout(CONFIG_WATCHDOG_TIMEOUT_MSECS);
        /* enable the watchdog */
        designware_wdt_enable();
        /* reset the watchdog */

diff --git a/include/configs/socfpga_common.h b/include/configs/socfpga_common.h
index fd18ae5f5d229766f3e35c8adc14bcb75201c4da..c17814bf01b30e8da62c02a7c79062ae5bec251d 100644 (file)
--- a/include/configs/socfpga_common.h
+++ b/include/configs/socfpga_common.h
@@ -131,7 +131,7 @@
 #define CONFIG_DESIGNWARE_WATCHDOG
 #define CONFIG_DW_WDT_BASE             SOCFPGA_L4WD0_ADDRESS
 #define CONFIG_DW_WDT_CLOCK_KHZ                25000
-#define CONFIG_HW_WATCHDOG_TIMEOUT_MS  30000
+#define CONFIG_WATCHDOG_TIMEOUT_MSECS  30000
 #endif
 
 /*

diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index de4bdb3d37d37c2925f4e393f219c71fb68320a4..54eee53572ef522e26a9b2a786314726ba981c66 100644 (file)
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -1113,7 +1113,6 @@ CONFIG_HUSH_INIT_VAR
 CONFIG_HVBOOT
 CONFIG_HWCONFIG
 CONFIG_HW_ENV_SETTINGS
-CONFIG_HW_WATCHDOG_TIMEOUT_MS
 CONFIG_I2C
 CONFIG_I2C_CHIPADDRESS
 CONFIG_I2C_CMD_TREE