All of lore.kernel.org
 help / color / mirror / Atom feed
* [U-Boot] [PATCH v1 1/3] wdt: Fix spelling Resettting -> Resetting
@ 2017-07-05 17:44 Andy Shevchenko
  2017-07-05 17:44 ` [U-Boot] [PATCH v1 2/3] wdt: Timeout better to be in microseconds Andy Shevchenko
                   ` (5 more replies)
  0 siblings, 6 replies; 16+ messages in thread
From: Andy Shevchenko @ 2017-07-05 17:44 UTC (permalink / raw)
  To: u-boot

Fix spelling Resettting -> Resetting.
No functional change intended.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---
 drivers/watchdog/wdt-uclass.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/watchdog/wdt-uclass.c b/drivers/watchdog/wdt-uclass.c
index ab8a64c354..bb9ae80866 100644
--- a/drivers/watchdog/wdt-uclass.c
+++ b/drivers/watchdog/wdt-uclass.c
@@ -48,7 +48,7 @@ int wdt_expire_now(struct udevice *dev, ulong flags)
 	int ret = 0;
 	const struct wdt_ops *ops;
 
-	debug("WDT Resettting: %lu\n", flags);
+	debug("WDT Resetting: %lu\n", flags);
 	ops = device_get_ops(dev);
 	if (ops->expire_now) {
 		return ops->expire_now(dev, flags);
-- 
2.11.0

^ permalink raw reply related	[flat|nested] 16+ messages in thread

* [U-Boot] [PATCH v1 2/3] wdt: Timeout better to be in microseconds
  2017-07-05 17:44 [U-Boot] [PATCH v1 1/3] wdt: Fix spelling Resettting -> Resetting Andy Shevchenko
@ 2017-07-05 17:44 ` Andy Shevchenko
  2017-07-06  4:16   ` Bin Meng
                     ` (2 more replies)
  2017-07-05 17:44 ` [U-Boot] [PATCH v1 3/3] wdt: Unify option of timeout value Andy Shevchenko
                   ` (4 subsequent siblings)
  5 siblings, 3 replies; 16+ messages in thread
From: Andy Shevchenko @ 2017-07-05 17:44 UTC (permalink / raw)
  To: u-boot

Timeout in some abstract ticks is not what we are applying to get
deterministic behaviour.

Convert name to show explicitly that we are using microseconds (for
watchdog it's more than precise).

No functional change intended.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---
 drivers/watchdog/wdt-uclass.c | 4 ++--
 include/wdt.h                 | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/drivers/watchdog/wdt-uclass.c b/drivers/watchdog/wdt-uclass.c
index bb9ae80866..1715a98452 100644
--- a/drivers/watchdog/wdt-uclass.c
+++ b/drivers/watchdog/wdt-uclass.c
@@ -13,14 +13,14 @@
 
 DECLARE_GLOBAL_DATA_PTR;
 
-int wdt_start(struct udevice *dev, u64 timeout, ulong flags)
+int wdt_start(struct udevice *dev, u64 timeout_us, ulong flags)
 {
 	const struct wdt_ops *ops = device_get_ops(dev);
 
 	if (!ops->start)
 		return -ENOSYS;
 
-	return ops->start(dev, timeout, flags);
+	return ops->start(dev, timeout_us, flags);
 }
 
 int wdt_stop(struct udevice *dev)
diff --git a/include/wdt.h b/include/wdt.h
index 0b5f05851a..115e8c6baf 100644
--- a/include/wdt.h
+++ b/include/wdt.h
@@ -21,12 +21,12 @@
  * Start the timer
  *
  * @dev: WDT Device
- * @timeout: Number of ticks before timer expires
+ * @timeout_us: Number of microseconds before timer expires
  * @flags: Driver specific flags. This might be used to specify
  * which action needs to be executed when the timer expires
  * @return: 0 if OK, -ve on error
  */
-int wdt_start(struct udevice *dev, u64 timeout, ulong flags);
+int wdt_start(struct udevice *dev, u64 timeout_us, ulong flags);
 
 /*
  * Stop the timer, thus disabling the Watchdog. Use wdt_start to start it again.
@@ -67,12 +67,12 @@ struct wdt_ops {
 	 * Start the timer
 	 *
 	 * @dev: WDT Device
-	 * @timeout: Number of ticks before the timer expires
+	 * @timeout_us: Number of microseconds before the timer expires
 	 * @flags: Driver specific flags. This might be used to specify
 	 * which action needs to be executed when the timer expires
 	 * @return: 0 if OK, -ve on error
 	 */
-	int (*start)(struct udevice *dev, u64 timeout, ulong flags);
+	int (*start)(struct udevice *dev, u64 timeout_us, ulong flags);
 	/*
 	 * Stop the timer
 	 *
-- 
2.11.0

^ permalink raw reply related	[flat|nested] 16+ messages in thread

* [U-Boot] [PATCH v1 3/3] wdt: Unify option of timeout value
  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-05 17:44 ` Andy Shevchenko
  2017-07-05 17:50   ` Andy Shevchenko
                     ` (4 more replies)
  2017-07-06  4:15 ` [U-Boot] [PATCH v1 1/3] wdt: Fix spelling Resettting -> Resetting Bin Meng
                   ` (3 subsequent siblings)
  5 siblings, 5 replies; 16+ messages in thread
From: Andy Shevchenko @ 2017-07-05 17:44 UTC (permalink / raw)
  To: u-boot

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

^ permalink raw reply related	[flat|nested] 16+ messages in thread

* [U-Boot] [PATCH v1 3/3] wdt: Unify option of timeout value
  2017-07-05 17:44 ` [U-Boot] [PATCH v1 3/3] wdt: Unify option of timeout value Andy Shevchenko
@ 2017-07-05 17:50   ` Andy Shevchenko
  2017-07-06  4:16   ` Bin Meng
                     ` (3 subsequent siblings)
  4 siblings, 0 replies; 16+ messages in thread
From: Andy Shevchenko @ 2017-07-05 17:50 UTC (permalink / raw)
  To: u-boot

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 <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

-- 
Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Intel Finland Oy

^ permalink raw reply	[flat|nested] 16+ messages in thread

* [U-Boot] [PATCH v1 1/3] wdt: Fix spelling Resettting -> Resetting
  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-05 17:44 ` [U-Boot] [PATCH v1 3/3] wdt: Unify option of timeout value Andy Shevchenko
@ 2017-07-06  4:15 ` Bin Meng
  2017-07-06  4:29 ` Heiko Schocher
                   ` (2 subsequent siblings)
  5 siblings, 0 replies; 16+ messages in thread
From: Bin Meng @ 2017-07-06  4:15 UTC (permalink / raw)
  To: u-boot

On Thu, Jul 6, 2017 at 1:44 AM, Andy Shevchenko
<andriy.shevchenko@linux.intel.com> wrote:
> Fix spelling Resettting -> Resetting.
> No functional change intended.
>
> Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
> ---
>  drivers/watchdog/wdt-uclass.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>

Reviewed-by: Bin Meng <bmeng.cn@gmail.com>

^ permalink raw reply	[flat|nested] 16+ messages in thread

* [U-Boot] [PATCH v1 2/3] wdt: Timeout better to be in microseconds
  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
  2 siblings, 0 replies; 16+ messages in thread
From: Bin Meng @ 2017-07-06  4:16 UTC (permalink / raw)
  To: u-boot

On Thu, Jul 6, 2017 at 1:44 AM, Andy Shevchenko
<andriy.shevchenko@linux.intel.com> wrote:
> Timeout in some abstract ticks is not what we are applying to get
> deterministic behaviour.
>
> Convert name to show explicitly that we are using microseconds (for
> watchdog it's more than precise).
>
> No functional change intended.
>
> Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
> ---
>  drivers/watchdog/wdt-uclass.c | 4 ++--
>  include/wdt.h                 | 8 ++++----
>  2 files changed, 6 insertions(+), 6 deletions(-)
>

Reviewed-by: Bin Meng <bmeng.cn@gmail.com>

^ permalink raw reply	[flat|nested] 16+ messages in thread

* [U-Boot] [PATCH v1 3/3] wdt: Unify option of timeout value
  2017-07-05 17:44 ` [U-Boot] [PATCH v1 3/3] wdt: Unify option of timeout value Andy Shevchenko
  2017-07-05 17:50   ` Andy Shevchenko
@ 2017-07-06  4:16   ` Bin Meng
  2017-07-06  6:07   ` Heiko Schocher
                     ` (2 subsequent siblings)
  4 siblings, 0 replies; 16+ messages in thread
From: Bin Meng @ 2017-07-06  4:16 UTC (permalink / raw)
  To: u-boot

On Thu, Jul 6, 2017 at 1:44 AM, Andy Shevchenko
<andriy.shevchenko@linux.intel.com> wrote:
> 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(-)
>

Reviewed-by: Bin Meng <bmeng.cn@gmail.com>

^ permalink raw reply	[flat|nested] 16+ messages in thread

* [U-Boot] [PATCH v1 1/3] wdt: Fix spelling Resettting -> Resetting
  2017-07-05 17:44 [U-Boot] [PATCH v1 1/3] wdt: Fix spelling Resettting -> Resetting Andy Shevchenko
                   ` (2 preceding siblings ...)
  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
  5 siblings, 0 replies; 16+ messages in thread
From: Heiko Schocher @ 2017-07-06  4:29 UTC (permalink / raw)
  To: u-boot

Hello Andy,

Am 05.07.2017 um 19:44 schrieb Andy Shevchenko:
> Fix spelling Resettting -> Resetting.
> No functional change intended.
>
> Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
> ---
>   drivers/watchdog/wdt-uclass.c | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)

Thanks!

Reviewed-by: Heiko Schocher <hs@denx.de>

bye,
Heiko
>
> diff --git a/drivers/watchdog/wdt-uclass.c b/drivers/watchdog/wdt-uclass.c
> index ab8a64c354..bb9ae80866 100644
> --- a/drivers/watchdog/wdt-uclass.c
> +++ b/drivers/watchdog/wdt-uclass.c
> @@ -48,7 +48,7 @@ int wdt_expire_now(struct udevice *dev, ulong flags)
>   	int ret = 0;
>   	const struct wdt_ops *ops;
>
> -	debug("WDT Resettting: %lu\n", flags);
> +	debug("WDT Resetting: %lu\n", flags);
>   	ops = device_get_ops(dev);
>   	if (ops->expire_now) {
>   		return ops->expire_now(dev, flags);
>

-- 
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany

^ permalink raw reply	[flat|nested] 16+ messages in thread

* [U-Boot] [PATCH v1 2/3] wdt: Timeout better to be in microseconds
  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
  2 siblings, 0 replies; 16+ messages in thread
From: Heiko Schocher @ 2017-07-06  4:34 UTC (permalink / raw)
  To: u-boot

Hello Andy,

Am 05.07.2017 um 19:44 schrieb Andy Shevchenko:
> Timeout in some abstract ticks is not what we are applying to get
> deterministic behaviour.
>
> Convert name to show explicitly that we are using microseconds (for
> watchdog it's more than precise).
>
> No functional change intended.
>
> Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
> ---
>   drivers/watchdog/wdt-uclass.c | 4 ++--
>   include/wdt.h                 | 8 ++++----
>   2 files changed, 6 insertions(+), 6 deletions(-)

Reviewed-by: Heiko Schocher <hs@denx.de>

bye,
Heiko
>
> diff --git a/drivers/watchdog/wdt-uclass.c b/drivers/watchdog/wdt-uclass.c
> index bb9ae80866..1715a98452 100644
> --- a/drivers/watchdog/wdt-uclass.c
> +++ b/drivers/watchdog/wdt-uclass.c
> @@ -13,14 +13,14 @@
>
>   DECLARE_GLOBAL_DATA_PTR;
>
> -int wdt_start(struct udevice *dev, u64 timeout, ulong flags)
> +int wdt_start(struct udevice *dev, u64 timeout_us, ulong flags)
>   {
>   	const struct wdt_ops *ops = device_get_ops(dev);
>
>   	if (!ops->start)
>   		return -ENOSYS;
>
> -	return ops->start(dev, timeout, flags);
> +	return ops->start(dev, timeout_us, flags);
>   }
>
>   int wdt_stop(struct udevice *dev)
> diff --git a/include/wdt.h b/include/wdt.h
> index 0b5f05851a..115e8c6baf 100644
> --- a/include/wdt.h
> +++ b/include/wdt.h
> @@ -21,12 +21,12 @@
>    * Start the timer
>    *
>    * @dev: WDT Device
> - * @timeout: Number of ticks before timer expires
> + * @timeout_us: Number of microseconds before timer expires
>    * @flags: Driver specific flags. This might be used to specify
>    * which action needs to be executed when the timer expires
>    * @return: 0 if OK, -ve on error
>    */
> -int wdt_start(struct udevice *dev, u64 timeout, ulong flags);
> +int wdt_start(struct udevice *dev, u64 timeout_us, ulong flags);
>
>   /*
>    * Stop the timer, thus disabling the Watchdog. Use wdt_start to start it again.
> @@ -67,12 +67,12 @@ struct wdt_ops {
>   	 * Start the timer
>   	 *
>   	 * @dev: WDT Device
> -	 * @timeout: Number of ticks before the timer expires
> +	 * @timeout_us: Number of microseconds before the timer expires
>   	 * @flags: Driver specific flags. This might be used to specify
>   	 * which action needs to be executed when the timer expires
>   	 * @return: 0 if OK, -ve on error
>   	 */
> -	int (*start)(struct udevice *dev, u64 timeout, ulong flags);
> +	int (*start)(struct udevice *dev, u64 timeout_us, ulong flags);
>   	/*
>   	 * Stop the timer
>   	 *
>

-- 
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany

^ permalink raw reply	[flat|nested] 16+ messages in thread

* [U-Boot] [PATCH v1 3/3] wdt: Unify option of timeout value
  2017-07-05 17:44 ` [U-Boot] [PATCH v1 3/3] wdt: Unify option of timeout value Andy Shevchenko
  2017-07-05 17:50   ` 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
  4 siblings, 0 replies; 16+ messages in thread
From: Heiko Schocher @ 2017-07-06  6:07 UTC (permalink / raw)
  To: u-boot

Hello Andy,

Am 05.07.2017 um 19:44 schrieb Andy Shevchenko:
> 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(-)

Good catch!

May I ask, if you find time to move CONFIG_WATCHDOG_TIMEOUT_MSECS
to Kconfig?

Reviewed-by: Heiko Schocher <hs@denx.de>

bye,
Heiko
>
> 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
>

-- 
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany

^ permalink raw reply	[flat|nested] 16+ messages in thread

* [U-Boot] [PATCH v1 1/3] wdt: Fix spelling Resettting -> Resetting
  2017-07-05 17:44 [U-Boot] [PATCH v1 1/3] wdt: Fix spelling Resettting -> Resetting Andy Shevchenko
                   ` (3 preceding siblings ...)
  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
  5 siblings, 0 replies; 16+ messages in thread
From: Simon Glass @ 2017-07-07  3:59 UTC (permalink / raw)
  To: u-boot

On 5 July 2017 at 11:44, Andy Shevchenko
<andriy.shevchenko@linux.intel.com> wrote:
> Fix spelling Resettting -> Resetting.
> No functional change intended.
>
> Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
> ---
>  drivers/watchdog/wdt-uclass.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

Reviewed-by: Simon Glass <sjg@chromium.org>

^ permalink raw reply	[flat|nested] 16+ messages in thread

* [U-Boot] [PATCH v1 2/3] wdt: Timeout better to be in microseconds
  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
  2 siblings, 1 reply; 16+ messages in thread
From: Simon Glass @ 2017-07-07  3:59 UTC (permalink / raw)
  To: u-boot

Hi Andy,

On 5 July 2017 at 11:44, Andy Shevchenko
<andriy.shevchenko@linux.intel.com> wrote:
> Timeout in some abstract ticks is not what we are applying to get
> deterministic behaviour.

A tick is always milliseconds in U-Boot, as I understand it.

>
> Convert name to show explicitly that we are using microseconds (for
> watchdog it's more than precise).

Do you want microseconds, or is milliseconds enough accuracy? I have a
hard time imagining a case where a microsecond watchdog timeout is
useful.

>
> No functional change intended.
>
> Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
> ---
>  drivers/watchdog/wdt-uclass.c | 4 ++--
>  include/wdt.h                 | 8 ++++----
>  2 files changed, 6 insertions(+), 6 deletions(-)
>

Regards,
Simon

^ permalink raw reply	[flat|nested] 16+ messages in thread

* [U-Boot] [PATCH v1 3/3] wdt: Unify option of timeout value
  2017-07-05 17:44 ` [U-Boot] [PATCH v1 3/3] wdt: Unify option of timeout value Andy Shevchenko
                     ` (2 preceding siblings ...)
  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
  4 siblings, 0 replies; 16+ messages in thread
From: Simon Glass @ 2017-07-07  3:59 UTC (permalink / raw)
  To: u-boot

On 5 July 2017 at 11:44, Andy Shevchenko
<andriy.shevchenko@linux.intel.com> wrote:
> 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(-)

Reviewed-by: Simon Glass <sjg@chromium.org>

^ permalink raw reply	[flat|nested] 16+ messages in thread

* [U-Boot] [PATCH v1 2/3] wdt: Timeout better to be in microseconds
  2017-07-07  3:59   ` Simon Glass
@ 2017-07-07 11:15     ` Andy Shevchenko
  0 siblings, 0 replies; 16+ messages in thread
From: Andy Shevchenko @ 2017-07-07 11:15 UTC (permalink / raw)
  To: u-boot

On Thu, 2017-07-06 at 21:59 -0600, Simon Glass wrote:
> Hi Andy,
> 
> On 5 July 2017 at 11:44, Andy Shevchenko
> <andriy.shevchenko@linux.intel.com> wrote:
> > Timeout in some abstract ticks is not what we are applying to get
> > deterministic behaviour.
> 
> A tick is always milliseconds in U-Boot, as I understand it.

You see, there is a confusion.
I would like to see units somewhere there, to make it clear.

> 
> > 
> > Convert name to show explicitly that we are using microseconds (for
> > watchdog it's more than precise).
> 
> Do you want microseconds, or is milliseconds enough accuracy? I have a
> hard time imagining a case where a microsecond watchdog timeout is
> useful.

For me ticks sounded like processor cycles (nanosecond-ish).
So, milliseconds are better.

Since I have not much time, feel free to drop, modify, etc.
Thanks for review.

> 
> > 
> > No functional change intended.
> > 
> > Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
> > ---
> >  drivers/watchdog/wdt-uclass.c | 4 ++--
> >  include/wdt.h                 | 8 ++++----
> >  2 files changed, 6 insertions(+), 6 deletions(-)
> > 
> 
> Regards,
> Simon

-- 
Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Intel Finland Oy

^ permalink raw reply	[flat|nested] 16+ messages in thread

* [U-Boot] [U-Boot, v1, 1/3] wdt: Fix spelling Resettting -> Resetting
  2017-07-05 17:44 [U-Boot] [PATCH v1 1/3] wdt: Fix spelling Resettting -> Resetting Andy Shevchenko
                   ` (4 preceding siblings ...)
  2017-07-07  3:59 ` Simon Glass
@ 2017-07-07 11:42 ` Tom Rini
  5 siblings, 0 replies; 16+ messages in thread
From: Tom Rini @ 2017-07-07 11:42 UTC (permalink / raw)
  To: u-boot

On Wed, Jul 05, 2017 at 08:44:06PM +0300, Andy Shevchenko wrote:

> Fix spelling Resettting -> Resetting.
> No functional change intended.
> 
> Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
> Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
> Reviewed-by: Heiko Schocher <hs@denx.de>

Applied to u-boot/master, thanks!

-- 
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20170707/9d3f56d3/attachment.sig>

^ permalink raw reply	[flat|nested] 16+ messages in thread

* [U-Boot] [U-Boot,v1,3/3] wdt: Unify option of timeout value
  2017-07-05 17:44 ` [U-Boot] [PATCH v1 3/3] wdt: Unify option of timeout value Andy Shevchenko
                     ` (3 preceding siblings ...)
  2017-07-07  3:59   ` Simon Glass
@ 2017-07-07 11:42   ` Tom Rini
  4 siblings, 0 replies; 16+ messages in thread
From: Tom Rini @ 2017-07-07 11:42 UTC (permalink / raw)
  To: u-boot

On Wed, Jul 05, 2017 at 08:44:08PM +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.
> 
> Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
> Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
> Reviewed-by: Heiko Schocher <hs@denx.de>

Applied to u-boot/master, thanks!

-- 
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20170707/9eb6350e/attachment.sig>

^ permalink raw reply	[flat|nested] 16+ messages in thread

end of thread, other threads:[~2017-07-07 11:42 UTC | newest]

Thread overview: 16+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
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 ` [U-Boot] [PATCH v1 3/3] wdt: Unify option of timeout value Andy Shevchenko
2017-07-05 17:50   ` 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

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.