RE: [RFC v4 12/26] watchdog: renesas_wdt: Add R-Car Gen2 support
From: Fabrizio Castro <hidden>
Date: 2018-02-05 11:16:40
Also in:
linux-arm-kernel, linux-clk, linux-renesas-soc, linux-watchdog
Hello Guenter, thank you for your feedback.
-----Original Message----- From: devicetree-owner@vger.kernel.org [mailto:devicetree-owner@vger.kernel.org] On Behalf Of Guenter Roeck Sent: 02 February 2018 02:56 To: Fabrizio Castro <redacted>; Philipp Zabel <p.zabel@pengutronix.de>; Rob Herring <robh+dt@kernel.org>; Mark Rutland [off-list ref]; Wim Van Sebroeck [off-list ref]; Russell King [off-list ref]; Catalin Marinas [off-list ref]; Will Deacon [off-list ref]; Michael Turquette [off-list ref]; Stephen Boyd [off-list ref]; Simon Horman [off-list ref]; Magnus Damm [off-list ref]; Geert Uytterhoeven [off-list ref]; Wolfram Sang [off-list ref] Cc: devicetree@vger.kernel.org; linux-watchdog@vger.kernel.org; linux-renesas-soc@vger.kernel.org; linux-arm- kernel@lists.infradead.org; linux-clk@vger.kernel.org; Chris Paterson [off-list ref]; Biju Das [off-list ref]; Ramesh Shanmugasundaram [off-list ref] Subject: Re: [RFC v4 12/26] watchdog: renesas_wdt: Add R-Car Gen2 support On 01/31/2018 10:24 AM, Fabrizio Castro wrote:quoted
Due to commits: * "ARM: shmobile: Add watchdog support", * "ARM: shmobile: rcar-gen2: Add watchdog support", and * "soc: renesas: rcar-rst: Enable watchdog as reset trigger for Gen2", we now have everything we needed for the watchdog to work on Gen2 and RZ/G1. This commit adds "renesas,rcar-gen2-wdt" as compatible string for R-Car Gen2 and RZ/G1, and since on those platforms the rwdt clock needs to be always ON, when suspending to RAM we need to explicitly disable the counting by clearing TME from RWTCSRA. Signed-off-by: Fabrizio Castro <redacted> Signed-off-by: Ramesh Shanmugasundaram <redacted> --- v3->4: * in this new version the changes to the driver have been splitted into two commits, this patch takes care of the basic Gen2 support, patch 13/26 takes care of the restart handler. drivers/watchdog/renesas_wdt.c | 42 +++++++++++++++++++++++++++++++++++++----- 1 file changed, 37 insertions(+), 5 deletions(-)diff --git a/drivers/watchdog/renesas_wdt.c b/drivers/watchdog/renesas_wdt.c index 831ef83..0a1a402 100644 --- a/drivers/watchdog/renesas_wdt.c +++ b/drivers/watchdog/renesas_wdt.c@@ -203,13 +203,42 @@ static int rwdt_remove(struct platform_device *pdev) return 0; } -/* - * This driver does also fit for R-Car Gen2 (r8a779[0-4]) WDT. However, for SMP - * to work there, one also needs a RESET (RST) driver which does not exist yet - * due to HW issues. This needs to be solved before adding compatibles here. - */ +#ifdef CONFIG_PM +static int rwdt_suspend(struct device *dev) +{ +struct platform_device *pdev; +struct rwdt_priv *priv; + +pdev = to_platform_device(dev); +priv = platform_get_drvdata(pdev); +if (watchdog_active(&priv->wdev)) { +rwdt_write(priv, priv->cks, RWTCSRA); +}Unnecessary { }quoted
+return 0; +} + +static int rwdt_resume(struct device *dev) +{ +struct platform_device *pdev; +struct rwdt_priv *priv; + +pdev = to_platform_device(dev); +priv = platform_get_drvdata(pdev); +if (watchdog_active(&priv->wdev)) { +rwdt_write(priv, priv->cks | RWTCSRA_TME, RWTCSRA); +}Same here. FWIW, checkpatch does complain about that.
I will clean this up for the next (and hopefully last) iteration. Thanks, Fabrizio
Guenter -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Renesas Electronics Europe Ltd, Dukes Meadow, Millboard Road, Bourne End, Buckinghamshire, SL8 5FH, UK. Registered in England & Wales under Registered No. 04586709.
N�����r��y���b�X��ǧv�^�){.n�+����{���\�� �{ay�
ʇڙ�,j��f���h�����/oSc��ڳ9�u�����&jw��(�階�ݢj"���m�����z�ޖ���f���h���~�m�