From: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH v1 3/3] wdt: Unify option of timeout value
Date: Wed, 5 Jul 2017 20:44:08 +0300 [thread overview]
Message-ID: <20170705174408.72891-3-andriy.shevchenko@linux.intel.com> (raw)
In-Reply-To: <20170705174408.72891-1-andriy.shevchenko@linux.intel.com>
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>
---
drivers/watchdog/designware_wdt.c | 2 +-
include/configs/socfpga_common.h | 2 +-
scripts/config_whitelist.txt | 1 -
3 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/drivers/watchdog/designware_wdt.c b/drivers/watchdog/designware_wdt.c
index e788e1b65d..8ec094d994 100644
--- 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 fd18ae5f5d..c17814bf01 100644
--- 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 95f27b6ead..73701bcaf8 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -1121,7 +1121,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
--
2.11.0
next prev parent reply other threads:[~2017-07-05 17:44 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-07-05 17:44 [U-Boot] [PATCH v1 1/3] wdt: Fix spelling Resettting -> Resetting Andy Shevchenko
2017-07-05 17:44 ` [U-Boot] [PATCH v1 2/3] wdt: Timeout better to be in microseconds Andy Shevchenko
2017-07-06 4:16 ` Bin Meng
2017-07-06 4:34 ` Heiko Schocher
2017-07-07 3:59 ` Simon Glass
2017-07-07 11:15 ` Andy Shevchenko
2017-07-05 17:44 ` Andy Shevchenko [this message]
2017-07-05 17:50 ` [U-Boot] [PATCH v1 3/3] wdt: Unify option of timeout value Andy Shevchenko
2017-07-06 4:16 ` Bin Meng
2017-07-06 6:07 ` Heiko Schocher
2017-07-07 3:59 ` Simon Glass
2017-07-07 11:42 ` [U-Boot] [U-Boot,v1,3/3] " Tom Rini
2017-07-06 4:15 ` [U-Boot] [PATCH v1 1/3] wdt: Fix spelling Resettting -> Resetting Bin Meng
2017-07-06 4:29 ` Heiko Schocher
2017-07-07 3:59 ` Simon Glass
2017-07-07 11:42 ` [U-Boot] [U-Boot, v1, " Tom Rini
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170705174408.72891-3-andriy.shevchenko@linux.intel.com \
--to=andriy.shevchenko@linux.intel.com \
--cc=u-boot@lists.denx.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox