Commit 03a196f2 authored by Wolfram Sang's avatar Wolfram Sang Committed by Wim Van Sebroeck

watchdog: renesas_wdt: add another divider option

If we set RWTCSRB to 0, we can gain 4096 as another divider value. This
is supported by all R-Car Gen2 and Gen3 devices which we aim to support.
Signed-off-by: default avatarWolfram Sang <wsa+renesas@sang-engineering.com>
Reviewed-by: default avatarGuenter Roeck <linux@roeck-us.net>
Signed-off-by: default avatarGuenter Roeck <linux@roeck-us.net>
Signed-off-by: default avatarWim Van Sebroeck <wim@iguana.be>
parent 82f64cd2
...@@ -23,21 +23,22 @@ ...@@ -23,21 +23,22 @@
#define RWTCSRA_WOVF BIT(4) #define RWTCSRA_WOVF BIT(4)
#define RWTCSRA_WRFLG BIT(5) #define RWTCSRA_WRFLG BIT(5)
#define RWTCSRA_TME BIT(7) #define RWTCSRA_TME BIT(7)
#define RWTCSRB 8
#define RWDT_DEFAULT_TIMEOUT 60U #define RWDT_DEFAULT_TIMEOUT 60U
/* /*
* In probe, clk_rate is checked to be not more than 16 bit * biggest clock * In probe, clk_rate is checked to be not more than 16 bit * biggest clock
* divider (10 bits). d is only a factor to fully utilize the WDT counter and * divider (12 bits). d is only a factor to fully utilize the WDT counter and
* will not exceed its 16 bits. Thus, no overflow, we stay below 32 bits. * will not exceed its 16 bits. Thus, no overflow, we stay below 32 bits.
*/ */
#define MUL_BY_CLKS_PER_SEC(p, d) \ #define MUL_BY_CLKS_PER_SEC(p, d) \
DIV_ROUND_UP((d) * (p)->clk_rate, clk_divs[(p)->cks]) DIV_ROUND_UP((d) * (p)->clk_rate, clk_divs[(p)->cks])
/* d is 16 bit, clk_divs 10 bit -> no 32 bit overflow */ /* d is 16 bit, clk_divs 12 bit -> no 32 bit overflow */
#define DIV_BY_CLKS_PER_SEC(p, d) ((d) * clk_divs[(p)->cks] / (p)->clk_rate) #define DIV_BY_CLKS_PER_SEC(p, d) ((d) * clk_divs[(p)->cks] / (p)->clk_rate)
static const unsigned int clk_divs[] = { 1, 4, 16, 32, 64, 128, 1024 }; static const unsigned int clk_divs[] = { 1, 4, 16, 32, 64, 128, 1024, 4096 };
static bool nowayout = WATCHDOG_NOWAYOUT; static bool nowayout = WATCHDOG_NOWAYOUT;
module_param(nowayout, bool, 0); module_param(nowayout, bool, 0);
...@@ -77,6 +78,7 @@ static int rwdt_start(struct watchdog_device *wdev) ...@@ -77,6 +78,7 @@ static int rwdt_start(struct watchdog_device *wdev)
clk_prepare_enable(priv->clk); clk_prepare_enable(priv->clk);
rwdt_write(priv, 0, RWTCSRB);
rwdt_write(priv, priv->cks, RWTCSRA); rwdt_write(priv, priv->cks, RWTCSRA);
rwdt_init_timeout(wdev); rwdt_init_timeout(wdev);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment