Commit ef6080fe authored by Lad Prabhakar's avatar Lad Prabhakar Committed by Wim Van Sebroeck
Browse files

watchdog: rzv2h: Add support for configurable count clock source 



Add support for selecting the count clock source used by the watchdog
timer. The RZ/V2H(P) SoC uses the LOCO as the count source, whereas on
RZ/T2H and RZ/N2H SoCs, the count source is the peripheral clock (PCLKL).

Introduce a `count_source` field in the SoC-specific data structure and
refactor the clock rate selection logic accordingly. This prepares the
driver for supporting the RZ/T2H and RZ/N2H SoCs, which differ in their
watchdog clocking architecture from RZ/V2H(P).

Signed-off-by: default avatarLad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com>
Reviewed-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@linux-watchdog.org>
parent 6229b352

drivers/watchdog/rzv2h_wdt.c

+20 −1
Original line number Diff line number Diff line
@@ -42,12 +42,18 @@ module_param(nowayout, bool, 0); 
MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default="

		 __MODULE_STRING(WATCHDOG_NOWAYOUT) ")");



enum rzv2h_wdt_count_source {

	COUNT_SOURCE_LOCO,

	COUNT_SOURCE_PCLK,

};



struct rzv2h_of_data {

	u8 cks_min;

	u8 cks_max;

	u16 cks_div;

	u8 tops;

	u16 timeout_cycles;

	enum rzv2h_wdt_count_source count_source;

};



struct rzv2h_wdt_priv {
@@ -214,6 +220,7 @@ static int rzv2h_wdt_probe(struct platform_device *pdev) 
{

	struct device *dev = &pdev->dev;

	struct rzv2h_wdt_priv *priv;

	struct clk *count_clk;

	int ret;



	priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL);
@@ -239,8 +246,19 @@ static int rzv2h_wdt_probe(struct platform_device *pdev) 
		return dev_err_probe(dev, PTR_ERR(priv->rstc),

				     "failed to get cpg reset");



	switch (priv->of_data->count_source) {

	case COUNT_SOURCE_LOCO:

		count_clk = priv->oscclk;

		break;

	case COUNT_SOURCE_PCLK:

		count_clk = priv->pclk;

		break;

	default:

		return dev_err_probe(dev, -EINVAL, "Invalid count source\n");

	}



	priv->wdev.max_hw_heartbeat_ms = (MILLI * priv->of_data->timeout_cycles *

					  priv->of_data->cks_div) / clk_get_rate(priv->oscclk);

					  priv->of_data->cks_div) / clk_get_rate(count_clk);

	dev_dbg(dev, "max hw timeout of %dms\n", priv->wdev.max_hw_heartbeat_ms);



	ret = devm_pm_runtime_enable(dev);
@@ -269,6 +287,7 @@ static const struct rzv2h_of_data rzv2h_wdt_of_data = { 
	.cks_div = 256,

	.tops = WDTCR_TOPS_16384,

	.timeout_cycles = 16384,

	.count_source = COUNT_SOURCE_LOCO,

};



static const struct of_device_id rzv2h_wdt_ids[] = {