arm64: dts: renesas: falcon: Move watchdog config to CPU board DTS

The 32 kHz oscillator driving the R-Car V3U watchdog is located on the
Falcon CPU board.  Hence move the watchdog configuration from the main
Falcon DTS file to the DTS file that describes the CPU board.

Fixes: d207dc500bbcf8c6 ("arm64: dts: renesas: falcon: Enable watchdog timer")
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Reviewed-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
Tested-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
Reviewed-by: Niklas Söderlund <niklas.soderlund+renesas@ragnatech.se>
Link: https://lore.kernel.org/r/20210316154705.2433528-3-geert+renesas@glider.be

diff --git a/arch/arm64/boot/dts/renesas/r8a779a0-falcon-cpu.dtsi b/arch/arm64/boot/dts/renesas/r8a779a0-falcon-cpu.dtsi
index 44dbd34eecb43fb4b792fdd3a1c118f7724f9130..97d40e3e05ff3b1b90abd5df2d609b43cea456d7 100644 (file)
--- a/arch/arm64/boot/dts/renesas/r8a779a0-falcon-cpu.dtsi
+++ b/arch/arm64/boot/dts/renesas/r8a779a0-falcon-cpu.dtsi
@@ -186,6 +186,11 @@
        };
 };
 
+&rwdt {
+       timeout-sec = <60>;
+       status = "okay";
+};
+
 &scif0 {
        pinctrl-0 = <&scif0_pins>;
        pinctrl-names = "default";

diff --git a/arch/arm64/boot/dts/renesas/r8a779a0-falcon.dts b/arch/arm64/boot/dts/renesas/r8a779a0-falcon.dts
index d6a9eddb14d9e9cc45b9e69ac291f64fe30d9ae7..04cd2ae5b4f4892e2f51b0eca6b2031335f53059 100644 (file)
--- a/arch/arm64/boot/dts/renesas/r8a779a0-falcon.dts
+++ b/arch/arm64/boot/dts/renesas/r8a779a0-falcon.dts
@@ -27,8 +27,3 @@
                pagesize = <8>;
        };
 };
-
-&rwdt {
-       timeout-sec = <60>;
-       status = "okay";
-};