Re: [PATCH] arm64: dts: renesas: sparrow-hawk: don't reserve SWDT

[Wolfram Sang <wsa+renesas@sang-engineering.com>]

[-- Attachment #1.1: Type: text/plain, Size: 731 bytes --]

Hi Marek,

sorry for the late reply. I am on holiday this week with only limited
time for work and net access.

> I think this can be tested on Sparrow Hawk easily , with and without TFA.
> Wolfram, how do I test the SWDT ?

1) enable the node in DT
2) apply the patch "[PATCH] soc: renesas: rcar-rst: keep RESBAR2S in default state"
3) apply the diff attached to this mail (untested but quite sure that's
   what i did a few days ago) which allows SWDT to reset
4) access it like any other watchdog. IIRC I did this to enforce a reset
   # watchdog -T1 -t3 /dev/watchdog1
   (with busybox watchdog)

I think that's it. It uses the same driver as the RWDT, so you probably
have this activated already.

Happy hacking,

   Wolfram


[-- Attachment #1.2: v4h_allow_swdt_to_reset.diff --]
[-- Type: text/x-diff, Size: 903 bytes --]

diff --git a/drivers/soc/renesas/rcar-rst.c b/drivers/soc/renesas/rcar-rst.c
index 0541990901fc..a78ea77dba16 100644
--- a/drivers/soc/renesas/rcar-rst.c
+++ b/drivers/soc/renesas/rcar-rst.c
@@ -12,7 +12,7 @@
 
 #define WDTRSTCR_RESET		0xA55A0002
 #define WDTRSTCR		0x0054
-#define GEN4_WDTRSTCR_RESET	0xA55A8002
+#define GEN4_WDTRSTCR_RESET	0xA55A8000
 #define GEN4_WDTRSTCR		0x0010
 
 #define CR7BAR			0x0070
@@ -117,7 +117,7 @@ static const struct of_device_id rcar_rst_matches[] __initconst = {
 	/* R-Car Gen4 */
 	{ .compatible = "renesas,r8a779a0-rst", .data = &rcar_rst_v3u },
 	{ .compatible = "renesas,r8a779f0-rst", .data = &rcar_rst_gen4 },
-	{ .compatible = "renesas,r8a779g0-rst", .data = &rcar_rst_gen4 },
+	{ .compatible = "renesas,r8a779g0-rst", .data = &rcar_rst_v3u },
 	{ .compatible = "renesas,r8a779h0-rst", .data = &rcar_rst_gen4 },
 	{ /* sentinel */ }
 };

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]