On 29/07/2022 07:32, Pin-yen Lin wrote:
Switch to SMC watchdog because we need direct control of HW watchdog
registers from kernel. The corresponding firmware was uploaded in
https://review.trustedfirmware.org/c/TF-A/trusted-firmware-a/+/3405.
Signed-off-by: Pin-yen Lin <treapking@xxxxxxxxxxxx>
Applied, sorry for the delay!
Matthias
---
Changes in v5:
- Remove redundant new line.
Changes in v4:
- Rename the watchdog node (smc_watchdog -> watchdog)
- Correct the patch summary (mt8173-oak -> mt8173-elm)
Changes in v3:
- Remove /delete-node/ and create a new node for SMC watchdog.
Changes in v2:
- Move the modifications to mt8173-elm.dtsi and add some comments.
arch/arm64/boot/dts/mediatek/mt8173-elm.dtsi | 12 ++++++++++++
1 file changed, 12 insertions(+)
diff --git a/arch/arm64/boot/dts/mediatek/mt8173-elm.dtsi b/arch/arm64/boot/dts/mediatek/mt8173-elm.dtsi
index e21feb85d822..abe3140cfcc6 100644
--- a/arch/arm64/boot/dts/mediatek/mt8173-elm.dtsi
+++ b/arch/arm64/boot/dts/mediatek/mt8173-elm.dtsi
@@ -161,6 +161,18 @@ hdmi_connector_in: endpoint {
};
};
};
+
+ watchdog {
+ compatible = "arm,smc-wdt";
+ };
+};
+
+/*
+ * Disable the original MMIO watch dog and switch to the SMC watchdog, which
+ * operates on the same MMIO.
+ */
+&watchdog {
+ status = "disabled";
};
&mfg_async {