From mboxrd@z Thu Jan 1 00:00:00 1970 From: Andy Shevchenko Date: Wed, 05 Jul 2017 20:50:45 +0300 Subject: [U-Boot] [PATCH v1 3/3] wdt: Unify option of timeout value In-Reply-To: <20170705174408.72891-3-andriy.shevchenko@linux.intel.com> References: <20170705174408.72891-1-andriy.shevchenko@linux.intel.com> <20170705174408.72891-3-andriy.shevchenko@linux.intel.com> Message-ID: <1499277045.22624.274.camel@linux.intel.com> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 8bit To: u-boot@lists.denx.de On Wed, 2017-07-05 at 20:44 +0300, Andy Shevchenko wrote: > There is no need to duplicate same option with different name. > > Kill HW_WATCHDOG_TIMEOUT_MS in favor of WATCHDOG_TIMEOUT_MSECS. > Yes, I know about WATCHDOG_TIMEOUT, I spent too much time already on this crap. Feel free to make a follow up to move from WATCHDOG_TIMEOUT to WATCHDOG_TIMEOUT_MSECS. > Signed-off-by: Andy Shevchenko > --- >  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 -- Andy Shevchenko Intel Finland Oy